[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-2-gd3eaa6a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94

The branch, maint has been updated
       via  d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94 (commit)
       via  119d65e9e06ffc6e8997d3ba386429db6cc2ef27 (commit)
       via  a18d188cc8e8c0a3f84494a2f1f2df26630f038e (commit)
       via  80526828985bc37e8c682b83c779919fdde78d31 (commit)
       via  f450cd19f4efa6ab3bafa072d7756239b6888ae0 (commit)
       via  f357bed82aed91aa3eef5e157df4814c7fc26028 (commit)
       via  1837e206e69dadeffbf3b1364c468235f19d5815 (commit)
       via  509b231118fff35e8f5dbfa797218265e8bc6acc (commit)
       via  001db08953af104250a2d00f7e46c9b4817d2ced (commit)
       via  64b18e07df13c9cc96232cc77e03f7d31a0b5046 (commit)
       via  f1895f943d9f58e05fbb3f6ba1d3c5e53733a6a9 (commit)
       via  99217a1b31b9a0c78c9f0182bd024ddf0be03030 (commit)
       via  89ba2a738c9eb543d499cc6dabe3341cbb21857a (commit)
       via  fdf80a97edf2cc9b280a3effbe966915a5db77cc (commit)
       via  39b6b7020b31fed668f370cb5d10d45e7de09fa7 (commit)
       via  4c3cf98781f5aad3bacd2e435123ffe65284d0a2 (commit)
       via  5679da20482c59e76003ce14d92792652c44953f (commit)
       via  97f2a6db3379ffaa3a21ea590b09710dc25b264e (commit)
       via  41f418b0787c7b574fa702fb1f14546ada4eadc2 (commit)
       via  127adfb531be729e9747b81cbb4bce243bcc6dd3 (commit)
       via  f46359b42790945e42e78a620e651ce66c2b8833 (commit)
       via  0c2cc2c9d171ef21ef54c87569837ff41cd09a9d (commit)
       via  bee76ca37d0883404302661671567404d9c92917 (commit)
       via  1153b2be217e6acdb547b8c163ba8a3d150353de (commit)
       via  789a7723530968f4da48ed9438961b691cf48cc6 (commit)
       via  36f9451ee076f8e42159b3f6daed972deb60fa9e (commit)
       via  e31e6b51150cc46bcfdcfb7b05e43a6ec7e0f848 (commit)
       via  6f12912a2b1c207e8fb3d45d993cc81edc51be47 (commit)
       via  e0ce774e6927c4e2121fe92ae47a72a24e470d5e (commit)
       via  944ec778e4bb30fed061b86d7859555c7a29fa6f (commit)
       via  c5a1ec04cbd53df049b125a441a49d69b7dcd0f0 (commit)
       via  171a31b10048968c70c963239e40b7a6d5c648de (commit)
       via  9414efaf789cddbb4434aad9218e2b396d8de87d (commit)
       via  f4b8c5856fb76889f8a44287c2bf48256f1a2a00 (commit)
       via  44cae2629df00c7f66138956f8073260f19df051 (commit)
       via  4cc65f752dbf9500bf367db1c19378641a91b5e5 (commit)
       via  da0f9ab4e4b15e9d5ff6f7474ab2c0ea8007f03d (commit)
       via  15d4a60bec70bee6c4ddd4020dc74e669f4d3174 (commit)
       via  47962000102e426ff0f77b34cc8eff98283411c4 (commit)
       via  5c6ca5d71d1f1e707b71275608b6f9a99dddae89 (commit)
       via  326ff45b8da46ab409b4a69d4861ad3211f0e132 (commit)
       via  6e249ed689839eaf9b3ef85b5082f7d8b6815872 (commit)
       via  af779b87d72abcc70a67544b1ad95d342f213747 (commit)
       via  ecd851d12a0b77e9e96f8451db69812735de25c9 (commit)
       via  8036e5a14904b1a0ea97be52cc83a33c9955f3fb (commit)
       via  b35dca6bf9910b3e7ced1ce485772c3336255c24 (commit)
       via  68be923ceda6b4458123bd74c4fb5eb71589db00 (commit)
       via  ee6eb9fa97eab1c826a2501fad564f5b28bc3cb9 (commit)
       via  66cccef3098d034f6c1b271f3c2e7399c5ac72d4 (commit)
       via  66ca4b0c256025a01bc9e3a85df516d02728dd79 (commit)
       via  faffcc8718dbf67e8aa84dda93a13ca3824eafcc (commit)
       via  0d0cafcdcae41ce4d4018448d3f5d95f815111a8 (commit)
       via  3d5d5eace287c0aad4a1e9221dcebc62e2a886ee (commit)
       via  e306fb5d1043c60b46128fb09ee54434340a0d42 (commit)
       via  feea090263edbe06ab791a838b4a3d1fce9fd7e5 (commit)
       via  76f0605a6dd790ab43cc608db11ac2141ddf46c0 (commit)
       via  7f2bc63991aeed6ddec5f28dc2162a281ff8ee3d (commit)
       via  ab1a507e362fabc1b33a4cec1522738948acf800 (commit)
       via  f854b6c0eb7905dc8c9f2899a8f43b94fd6957ff (commit)
       via  2bf9b58d1153cb51be592f009192a48798b5e97e (commit)
       via  cb19500768ac53bd9a9c348a11906a7c000e430c (commit)
       via  c38a2e62f99b2de0d06e438732a3eca4ab5effde (commit)
       via  c0cee9cd9230af78dc2ba70eb12051f5a9fe12bd (commit)
       via  32b8a433f1166b64ac4866b6f9b27284a60c4b52 (commit)
       via  8e02441b00db75f21455edc92191e64cab19b031 (commit)
       via  8a5096d150cf9803b8963768b7366cd68edcce03 (commit)
       via  f8e822bbc197f01fc722aa6def7cddb4182e3c66 (commit)
       via  23f0543ef6113af566b6fc733ee8fa9f461785aa (commit)
       via  a4b0f4b51f8fbf6e5de4ced85b3f7150ec766005 (commit)
       via  a64ef3e48066c9a9dbfd65683cb16a62783df4fc (commit)
       via  97ae26eaa9009e60537dfb18f5f7cd3a412ae7fd (commit)
       via  9fe2ba38429cd307900c785d098f0ee273cc4196 (commit)
       via  24cd4ca144982b8d378cb15023838e301a409f52 (commit)
       via  55c8794d11d2e210aa567306049d2ea34754163b (commit)
       via  2a487237c0614d3dd71298c0c31857b32b818198 (commit)
       via  1e3b481cfa56e5cccf7c1847bbc5c40a9df029bb (commit)
       via  ef6a48297a70b763e9c4b141fcce93a8a9c74c1c (commit)
       via  2d671e11c8574d86c47211cc1bfe680ec8d91957 (commit)
       via  84bf694bcba198d700a3214a0f1be7e24a6c8755 (commit)
       via  2e343fc7c69cee628a83759edc33f336eedfa1d0 (commit)
       via  3856a9405a7c76348b4e5a23a223ca7f7e4a8735 (commit)
       via  e343227a1004122bb3f4b54ed06d00a6927cf7c0 (commit)
       via  5a4a72a6eb2678f226d3bdc66146174a1cf87a39 (commit)
       via  7a56bed0b38cd90b89339b8bd638bfc7e7f6fe29 (commit)
       via  fe6743feae243a6ba0d05ac92221e3996a8e6aa5 (commit)
       via  6f245d7344f5bcc580ca2c27b7a06f4bd6d7598c (commit)
       via  0d1c9547caf5638178dbd99abd8a613f35dd55c9 (commit)
       via  8cbbdb8790d5eb24bb813edb27ecaf9807676890 (commit)
       via  4586d24dc7598c177939df2db65e1b0cbc060757 (commit)
       via  4ef91d38b82d5e380ea258399c31a52dc3f282d6 (commit)
       via  a5062ef4d7b65807bc0dea406e2e7807d83c6a3b (commit)
       via  db1138c5e74d4f5b4713bf29127cb1430c5fc32e (commit)
       via  295c5f26d0646c6f2308fea50899dd961ef87abd (commit)
       via  d1afb320a6bae3b94bfe53c7f6e32bc998bc28cf (commit)
       via  895e13693b56efe2aa2f42bbb673a8ce80819317 (commit)
       via  6a6bc51eebe4c702b1ae26acca79c3b865fd8981 (commit)
       via  28ed42d905141d2ab4f8431b0599c906fe7c6408 (commit)
       via  d63c932a6d73bfa67e76af4bb0a0f1bb07198f1c (commit)
       via  a1fb35adb26eb8ffa57927829dfeeb963a970ff9 (commit)
       via  2141a6b191705f7d4e972e78c341977896fe6fc2 (commit)
       via  188a881ae7d1853c49484a9fe93f46e5f1a764b8 (commit)
       via  a94a662d0da2d9ba84a703ff7c8cee0af0ff5133 (commit)
       via  45fbc8b46dd49a49a1c2f21ffaeffe208bb9ecb5 (commit)
       via  dbeb8d2ff3a11f96358819c282f5444cceb3db24 (commit)
       via  6f4b08da92043093e29deddfec005900d496ff98 (commit)
       via  5f624a6af8abbbd9695bee8d21d0713238ccba03 (commit)
       via  74a7f49212cb3428846da599ac488e4a31ff57ed (commit)
       via  7df05a0b38efdd2e3bc9b3cfeedc3e53616bc71a (commit)
       via  7f9974c75fc6cdd9821b887afac94ef0be415bc2 (commit)
       via  1ac2c3dd535894df514efa06b756162398041eb3 (commit)
       via  ec47213f8b9d1e477845c81b8621fed78f2e99bc (commit)
       via  6f7969a3ce55d811a00896ce50b5d145e039696a (commit)
       via  57d09886b9ed8d37754357eb8d820d5ecad6f29e (commit)
       via  1ca53a79e4904281cf14c78b7b1234819094a3db (commit)
       via  bee6dc63921d05197260c2d4170ca037df803ed4 (commit)
       via  b79511a10c43788dd03a0d32a70b8bf68d9a29a8 (commit)
       via  5aa495f5a2133013ef0adf768974779f517ac34d (commit)
       via  9df2e72d4587b86a5ad49217b11cd8e3d3e63173 (commit)
       via  1da044d6234dba752fbb880180d54ca5fc9a3357 (commit)
       via  8d0391c50b8205ea6388cba13c16c09c18e57974 (commit)
       via  525f16c3a5b0d3141bcd92c5b9d7d715f9feffde (commit)
       via  8bbb1486f1b85239ddfc6ece9a0df289bbbfbfbb (commit)
       via  9b81d15f529aa5a67455d5e56f8e562540f4dba8 (commit)
       via  7828edbe2c2a4a7952d0a4932979eb193c724b14 (commit)
       via  e36f246a790e1856cf6cb5a0aae37296c30d66a9 (commit)
       via  b6e00b6b36a2593bb4afa23dec20c3c57b84db94 (commit)
       via  29158391fa018aba646b8ddd9d2022c5552ebd9f (commit)
       via  bb061d336f318da0adb85ae3002a6e0f4246332f (commit)
       via  68f47e9a04057af10c01af602a0c06353c37ecf3 (commit)
       via  e55116a5eb5071b56bb9c88a620ff65bf3081d4b (commit)
       via  b51a9afe6977b988e5240906d0b0c288bc5b3fad (commit)
       via  3b5f6115437f568a530c9162ede552ad728f0690 (commit)
       via  c99835be113fd4c86ef413993d67e52206a1188d (commit)
       via  040cf12502ba3c57b16e1e0ad899f8ed7b7a1365 (commit)
       via  c5a3d70d9714a4a70901e0a93ae9dc6f09f1ff1f (commit)
       via  1e839f9acc95c0b4c4ab602f28e29d9413e084ce (commit)
       via  06b901795fcb70182e1427b37e104d2a8e1524c4 (commit)
       via  4d2bf42f63624e9db1d83abaf020ca79defefcd7 (commit)
       via  00eb4ac9689ebc593e2d52ec3769e5696f105c35 (commit)
       via  1eaed7c1f2ef3ec73ed0dbc6ee18e0707b3fcc2d (commit)
       via  5d9d10e0806743b0be8e672aeb94c1e67c85c163 (commit)
       via  e99690aa5f91af32ebc78334f687a1737c8ea8e0 (commit)
       via  f6fde80d030fbf2a165e6019bf44010f7a1c6b55 (commit)
       via  f28d4890b7f58f0f6ed1a6209856f6a0d8ff23a0 (commit)
       via  4a38f18045c251a1e73dd499d8bafe186bb0130b (commit)
       via  94259756a34b0010ee9f2e3a0f872eccd0678850 (commit)
       via  c4f2b64c1f74f1bba7762f544cf3b6a703ac0211 (commit)
       via  8153d196fc594a7dc784faf2a26fdc33b8964f13 (commit)
       via  da69976c095bd94513a179b47511a8ede88bd140 (commit)
       via  d3a2a8d0e41397bc86fc35900fc1b99d2d41be2e (commit)
       via  3e887a1324199c11004213b667145e7e5386eaa3 (commit)
       via  f8f22fea98fbaa1dcf0c1a0203063884d4e40f65 (commit)
       via  2d9519836f51f8b4c01d6b134b124f03a51a1ecd (commit)
       via  05613b2e92b791ff19e15680e44070c002f543a2 (commit)
       via  88ac75a642e375a7c3c916b44f7f68d572332517 (commit)
       via  de58d25e3f4b089ccfb0b2b5fc0505602ed70285 (commit)
       via  5b44ce39c6a3648682e241c75be513fb68c42568 (commit)
       via  2dfeef41c3a2045a6f54a75f710b8d7b930d4471 (commit)
       via  66873b596119fc691f1b1c05aa6d09f2ff1b5849 (commit)
       via  e5e6fa03884708e2a48d081a460401c25badfc20 (commit)
       via  db973eaa2be26fcfb523e3bfed65cf466e4946aa (commit)
       via  0f99c10d3f7087f51c84b01e33784d57194afcc4 (commit)
       via  6a53d19c3b85f235a3a272c949d8827355c03061 (commit)
       via  31c621cd079bd5e67e6f5e7841e04f2c4267580c (commit)
       via  a537fbe62988ac551714b8d852dc8e03f1af4f1c (commit)
       via  7488050293d0547cdf67df81e6844e15a3140076 (commit)
       via  c93cb22ead78766bafdf323d52c2ee25a8dcba25 (commit)
       via  deb7773835c02531a7cccc8a7bc7f80959b31872 (commit)
       via  82616f0bc3340449ebb7d5e1e40cca40644e8b74 (commit)
       via  101216cad25855e236e29c73c7d8781c5a94f598 (commit)
       via  86deab4df2aabc9fb23125cff2dd68af7ef963b4 (commit)
       via  72cae0a53cde58c5f5ac1020555a675498191b85 (commit)
       via  0194d5e1e31861fa362b77c5e2dab74cd3e7ecea (commit)
       via  ec94d5945575c6664110cb76e0ff317491c44ec1 (commit)
       via  e1606b320367120dbd9353913bb6f5bf3260c14e (commit)
       via  21af8bfd077dad5411ba07bd2208b6d216ad686f (commit)
       via  0402db9837e0a482a01d0485a5c1c500d26ac6c3 (commit)
       via  8010df5d0a3fd4b93c5aa74ef735128ebff4604e (commit)
       via  c11924b585cd5f626034cfbcb728d43df7e070a5 (commit)
       via  a7cc454dc97c663d03d6abde99724606bc2878ef (commit)
       via  229f7712d48ef7b5f7324dbe66695b88c4f637b8 (commit)
       via  03493884de0181f4a5019885267bde4f215098d8 (commit)
       via  a98e58ffff35f13a61359f3c0aa214ebc6d15922 (commit)
       via  44737ebc42660ec28f8555607ae51d2d355e927a (commit)
       via  b5788178cedf5f6c78d34ff1f3f3c223c41e579d (commit)
       via  622a348efd03f4fe39194f80ef8373cb6686111a (commit)
       via  0f858eabaed9377bb4c0cf62fec44237528f9728 (commit)
       via  e5da4fbf4a1fad91b3b25e1b86b563bfa793ab0e (commit)
       via  22729165f6bb902daeb8a4d8e7cb06982390f327 (commit)
       via  72b68766c275fab8917fba09f90481a96c7a05f6 (commit)
       via  d74d525cfb421ccc8a75cfbc9cc91090a08d1f31 (commit)
       via  a3756f96a3e92ec3e20f6666abfa2e8923ea483c (commit)
       via  3b369e6bbe0fb6d7359398935706c87dd9375cb6 (commit)
       via  85b70d1591f408459996d721eabfe94d8a7bfcb4 (commit)
       via  ea441902e8f6e53f548e7df779d3cd71400929ec (commit)
       via  86e9e0e331e5008ab5ca9db77d74c542042dcfe8 (commit)
       via  0699a84a6f7a085acb76446caa81ce3133dedaf2 (commit)
       via  3614a17db7efbc5ca7929ec66dfe278e94930b68 (commit)
       via  f76cb63c8c775daa81ecad00b0a3ac6019fbebfe (commit)
       via  8817647ecd144e93b74b753ff197bb75c606640d (commit)
       via  4bcab4a0be1fa930be89f1e4b31eb3f98d17f7d0 (commit)
       via  85d414318eddf5ba4f91fe65bdbf4c4e7cdc6e37 (commit)
       via  ab42f4a402242ee6f2b93a92dc133e7ef664b060 (commit)
       via  22b28b638a2d7d9d05bf7f2741367fc36f8bb8c0 (commit)
       via  a0be183729db528716a92665cf4332d616c132a9 (commit)
       via  ba5a89bec39d85b9033b9a2f7193221b7a2ba3db (commit)
       via  acde2706ea7644f16b2c686ce3c0c8cf95774ff5 (commit)
       via  641a5a4bf09cdc07acf1539caa86f6197feb032e (commit)
       via  0313d37bd0f5016e85aaea03bb5b1309cf03db19 (commit)
       via  957b720009f29b248e1c7303bf2d684af75c3a1f (commit)
       via  355e607b4d97870e16c470f273c92b7fad14d81c (commit)
       via  9179b6d0484f7c5535123096fd206dc22019be9b (commit)
       via  e05e1beda210998a42625662b852f995d5b2e82a (commit)
       via  7726b2e999d2064546f258db607233ae3aac04f1 (commit)
       via  fd0ca827e7acbbb89aed74f057e4c23a4223f3b3 (commit)
       via  8f41580e5d039d9549f7e73f51c2e82de4075015 (commit)
       via  f4d2f3b76702ee43025c809d3588662859146943 (commit)
       via  de839e5b0f4a95242f03f731110ac07e72cf146c (commit)
       via  7604b2eede07b84b2f22c81a11db2078f8ffe3da (commit)
       via  b2c1adfe1e118ed8fb5fc68ced68ef69ea39b543 (commit)
       via  02ce5d5a0ce42563e8aa8ea03a977d35f3a30f72 (commit)
       via  ff8269e114bcee4070b8837c1e8715dd5c22d04f (commit)
       via  df79bb4b0414009e212e7189ba732d347ba536ee (commit)
       via  2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f (commit)
       via  b42514b48a5104785737cb4459e177b98d023ed7 (commit)
       via  4933232e195fa4650400990bfba4c88fae9b8a29 (commit)
       via  2c430b160d34f6d27bdbf92dbde3b7fbae8b12a9 (commit)
       via  79b2c6a58577662070f8f8827f5e6f665ebd102a (commit)
       via  ee07d99289e9da3f601fe3f5512d20516fdb4f58 (commit)
       via  36eef89b91db0eff6a1cb9f51df8d50f728e54f0 (commit)
       via  b3f34caa4a4b9ff6862f3b4f1d45560ea4ffee5f (commit)
       via  ee29b576923c240a951b7f0d93b7cb5d6a33face (commit)
       via  a2437fee3612a2186005d361c84d62a9859278d7 (commit)
       via  568a1a5e0bfc5bbe1e6d683fe38871a906c2f2a8 (commit)
       via  dae8578ed1fbdff7e60e4bb069700182d5ede6a5 (commit)
       via  682d5ce5382ab50d63eaf9fe373a1370bb435b6f (commit)
       via  e0906b7e17bc34b1183d273ca0571c10d5619c08 (commit)
       via  0b34421dc2d78a163ce9eaca41348dd672c302ed (commit)
       via  e6c40d4bba3155a8dd2406806a7be51d3ac73ed0 (commit)
       via  abe0587b12ac59561d011640d998e7dd74b1820f (commit)
       via  bdfd2295149398a2872f1794abffd1292f8c0492 (commit)
       via  19bab32531bc8c41e984460a2fa59205ecb623cd (commit)
       via  9ac0278a5ba1b15f790ba146a319212ddf8c3439 (commit)
       via  c1875ea6374417be1b38acb9a4013d6586c9c5c6 (commit)
       via  44d95be08f8d4ee82d34c74e1bcde76460b93ee4 (commit)
       via  b1d998fb6f51d6126bb4f66df7aa323202bbf77e (commit)
       via  9dfdc96a81f384d8cbfb9d87212db1aec0a22d25 (commit)
       via  e36b1ad1209fc6dc7b7128b5baef6fa44fdb5d1f (commit)
       via  0eccd77f93de84c56f5045f8cc5a4fa74c55afe9 (commit)
       via  887ededc571638e14143b478d6683f6ce4e68e29 (commit)
       via  96401cb96cb4494023c59850d9f6a2912df22c24 (commit)
       via  5066c1b5019b7de419a7b4703c26cb79ee9c713d (commit)
       via  818bc406278a138da6480412d3c289f91e6dbfda (commit)
       via  df6841b7d543abc9731b4b42a2392089a41fb838 (commit)
       via  dec3c38232bb9006f02c6ca2a04d62e8f5b01125 (commit)
       via  21f979352aa120457b09e4487f5e23a72d8c3dce (commit)
       via  d7dca5af7aa33024228e7bc21a86383ded4ab2bc (commit)
       via  ce2c543e2ebaf419906073ce3070ce12784e2d64 (commit)
       via  a66a0be80e976b66cd87dbd1aebaf15c3e34068b (commit)
       via  3522166d467ae99be7440f1e4842b9383c3ec736 (commit)
       via  2506b3935b6e890f6d2a5b80234a9a91ab6515e9 (commit)
       via  d029740b347df2f4792b56d402e9368e8b741c2a (commit)
       via  d2d18dca6f34c36881b54f45c598e6bbf622be83 (commit)
       via  6b819187e01cfa365a5bf3b122074c7da28fb8e1 (commit)
       via  87f2058a5d83a1f256eaf95a9e345dd61ff959d9 (commit)
       via  2077a04427bae2945635bf870817b3e21aae5f4d (commit)
       via  dde91c5484e045882198d656fcfda7e9c11d7858 (commit)
       via  3c66523fe55c94b19b5b26e0eae1c8de1d47d0cd (commit)
       via  a6c171136d2086f6c4bc4a50d1771c0e1b58ba10 (commit)
       via  ef20e28bf3b966bf4f0358099f38b70a30c12755 (commit)
       via  25d3adb1b25132d5051dd97dacc707d2f3375a90 (commit)
       via  e508e09d3837c029daf8cd86d7f8925df7872389 (commit)
       via  0da744996cbdf4eab047cd524d76b93d6a483d4a (commit)
       via  925c6bdd0a3f3672edf88e5bad83d099424f4230 (commit)
       via  8727266749d30460457e997723b51151ca29fc76 (commit)
       via  53339f86ceb32ff98b1ccfb05539645cb7e641fe (commit)
       via  bd34a47c51ebc57cce6e9e184630ced52dc71203 (commit)
       via  3794d01e0d62f5f93118ca6b3c75ddc84995d541 (commit)
       via  587ff343ab8d0d7781775eba4e65a4db9d61cc98 (commit)
       via  59c4e1c0d6c687d5f46e2393374db8b98c0a8675 (commit)
       via  6f161e0dfd28854195c9ad6c16219a23ca1097e8 (commit)
       via  7700b7035c6ad8cff1c4fd37d61154f3766b9f09 (commit)
       via  a354283eb7d49574b6c4390fb338b78906a446ed (commit)
       via  8de4149eb90140c81e19b375249cba4659c03f6d (commit)
       via  92174b5abeaa235f97cf65783964ec6d50d43a76 (commit)
       via  98763f1508a86d98b8891ae422dc20315b3a3cbb (commit)
       via  bc940cb035d1ab2eac1b3c353c0516516c145b79 (commit)
       via  8557c8a78b64243b8f64122e8e1b1f8bd72265a0 (commit)
       via  e5ae760b9d7d79839a81d847433d44d5cdb2fef7 (commit)
       via  3a7b60b1ca8a2f2b86acf494d649bff66beb445b (commit)
       via  c45e3c37a9a0e9df08484ba3a6100af9761a2d97 (commit)
       via  b94e8bb67517e6cbfb84a7666e5690d4abc56d97 (commit)
       via  cff337e603794fac08d87e870b5a5cecb0491d40 (commit)
       via  b4ba4e866e1842a7a54b9affceb355b55215c35c (commit)
       via  f4298e61d0d9d2a87e8a43edd4aa7133455c5d7b (commit)
       via  0a9d201ca60b0922a1e822d7dbda478242ee257d (commit)
       via  8d51cdc0d813f09177e07476b45285b8589efe00 (commit)
       via  bb9e2e6271adc481fc2b522ed06dd52f18e0ed45 (commit)
       via  d6a1475034ac4ac85cad9a02b9d97d42fa9821c3 (commit)
       via  d376fb6033bddabf86b91bd5ce58627a91f59fc8 (commit)
       via  30f40f634fd5bc80a9cccbacc383ef1e2b9c153a (commit)
       via  9928ea5c84889026f5800fe4270013791d47f16a (commit)
       via  083a75be98d83517afdaa3da9ada22adb106cb1a (commit)
       via  239a5894acb53e6b72f281699ff20edb60dac7a3 (commit)
       via  086aca14a4442df10002b23f57e57e8526d4a9a1 (commit)
       via  5db22a16ba0a6d2ba01fa8360481d80a0c40c964 (commit)
       via  a23d5bdc04af351b3fde8243b711601d049249d0 (commit)
       via  96fef7a389e922d6d9bd949396be4c76ead7f61d (commit)
       via  fa881fc9b47b27ab0e9c0b81a106a7fb11cd6639 (commit)
       via  8525b870d5caa0a04858aa436ad6949ec277fc0c (commit)
       via  63aa6177cc67ff43bdc4f68769ac8fc6585e31e9 (commit)
       via  7fe475b6ef6dd3e55f609e80f4c203d99c3890c5 (commit)
       via  8a657d5c9587cb9ab6d5299a678aedfaaac8c736 (commit)
       via  08820f0bf86622da770be001392fdda2e792d85d (commit)
       via  e7de1ef89c049e8fe0cbe92921341b9a57867a92 (commit)
       via  61168e3c4c511e71ae8659388fe7ef8293222dbd (commit)
       via  dacb456ac6435c15c1ee230533129e05f7ab06bf (commit)
       via  254227b6d5167a76f7ad96fa8a5657d81a7025c1 (commit)
       via  d1fbc759bfa42e5e0fe5c283dfcf9b642e815393 (commit)
       via  317e6ca3cea900d1f401c27814cf672303aa813a (commit)
       via  8f76fd511ed794810a7cff4d6043e1cdc6255754 (commit)
       via  2365d0885a174f2443c8a3306a7a943a374be4c7 (commit)
       via  53187374a17298a251ef8c0de5fdfa73637044e6 (commit)
       via  509348ecc96e7984f7630cc5f1300e7b174bb133 (commit)
       via  5b13742fa9cb45dd7b616ec54d7cea59a07c0876 (commit)
       via  b190798a1585327e4aa59ddf9af22f160b987c74 (commit)
       via  34b2d5646829ac93ccc78acaaacbd7a4558dea3c (commit)
       via  29ce538b0c32f2295eb8577f5f7af4a5bf8d695f (commit)
       via  104f3027a7f0d0d4dc0f01e786f7deec9707a863 (commit)
       via  02e90723551e707d77fb972aa47b4bc3f0fb0029 (commit)
       via  c1b14e966c2aa929e80bdfb259d0a81813859509 (commit)
       via  5dee15f4684717914cbfbbc2db5fe22e8f5e25e2 (commit)
       via  a07d169a9a0b416ee1637863a02df3f8f807c514 (commit)
       via  9f2642d4f91d5d6191b21ae1df5842b261c0b854 (commit)
       via  47b0a251e64d467cd30b0d3d2210f7a456851c9b (commit)
       via  4eb17acdd0f880faf94ddec41a2c063ebbcf993b (commit)
       via  07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb (commit)
       via  65a1bf9980d62187708f78b53a4e92907677aa99 (commit)
       via  4c38a8cee729ac47aa751364978f8315e1dff1fc (commit)
       via  f0645e2ddf6327fafdd072d1c30d15f48510e605 (commit)
       via  1560265e1ca8d5c542d27a4143e1879379831e12 (commit)
       via  0a8cfb4c59d2523ecd7a8f253afce8f8e436594f (commit)
       via  2fa8a9e975ce30702c87bd827b61f6e59ad98678 (commit)
       via  58f034a3eebeaa1b16415fbb76e02fe378d6413f (commit)
       via  6568eaae2dd2ca448fb2f499e2653d494f57c0a5 (commit)
       via  a3f66de9d0d0126dbefb08a69ea2a326fc6a6649 (commit)
       via  e3351076de09b744d3387699fa20f1ec85f9ba58 (commit)
       via  c3bcf99ccfdb499e0e97128910a5d920ab5338f0 (commit)
       via  ca63bc9fe2331a1d83dc35a3af1efeb64fb204d5 (commit)
       via  2a0534dad9161af0e9dc7fdf5cfc6dba8414c293 (commit)
       via  e3186cb4953d35da93e4648355f60b2efb5ff0d6 (commit)
       via  0886b05af81d5aaa54be74bd72ab503e8bfd4db1 (commit)
       via  8f5274a94fd12afa4fea7b2df4be0f5ca4dce705 (commit)
       via  23acc63042bd7ad7ce81f6b0d6a4437a0712301d (commit)
       via  3749d843083e552232579a85288e7dfee126ad91 (commit)
       via  72c8dcb2f15d3a70fa43b6a8592072ddd22e6bb3 (commit)
       via  c62c2c4ff232215bc37b64c635ecaadb01265828 (commit)
       via  268d66ec2fc3b8525e99b6dcdec2d4d9e3eaa93e (commit)
       via  c5f878aba841b360f499cf528a60ec49064fa269 (commit)
       via  1ca9efa3c2550e2ccc62056cd1add08e9583deae (commit)
       via  18bdec7225f41cda755881f660ea4bea814538fa (commit)
       via  a9edac6c6e0c33d6571d6ef5ce0bbf682459c3bc (commit)
       via  8d3466c80bf79be7770e41fabfb886b0eadd2acb (commit)
       via  47587d15b0749575e95a49443c6b0e17e0722678 (commit)
       via  1a23ff8bad4a1188592a0879f31f0cce0b5201ab (commit)
       via  3ae2d671ab95a7ee0cbc58d0112a24873135188a (commit)
       via  75a11fae8cd4833e121ca0df69ea12796a8a1436 (commit)
       via  68462b1b33810bfe29684fb2163d9dd9ae37e90c (commit)
       via  eb52380d7a7bbedcd10fb9991420ae25ea27520f (commit)
       via  7a7aeb80c90e329f185aed585ffa7420d1d4a8a8 (commit)
       via  972aef02635f1a1e7b60f14a2e0be368f576605a (commit)
       via  206beed99dd1e40efcc55ece553dda07740c41ce (commit)
       via  91ea62abccb87e2a1ae989bae95640d8913d2970 (commit)
       via  8c9642ae03de2291717a327f977b54414e02d7cd (commit)
       via  97cbf15b81c6276cb76eefce4cb15c88e12f9a47 (commit)
       via  8355b2b59221c58b33d686a0a2b4f22a19a3c330 (commit)
       via  8847af0bdaf45429ce32ac13f4201073ffe0d6ee (commit)
       via  5012480bf2586caf6dc642a1883a39991beb0804 (commit)
       via  e79b1bf3d8fa33bb4e2d4d3b6c4b1f90dd65ea40 (commit)
       via  38e1b39d77ad4a22c85d5ad7b2fde4fd51bfd1b5 (commit)
       via  a778e9e1dcf606c9cee31009c982daa748438b39 (commit)
       via  4fdddd150b9bd93072b950ba597e5db73859014b (commit)
       via  cc29c6174a7d68a70d33e5ff5af68e3e0ec0be54 (commit)
       via  76928ddff5b67637db4115c20b68af48a2182149 (commit)
       via  8c695f69de9a6d8114ca3672de5ad303faa2c700 (commit)
       via  80d2ed7a6ad6d8ae22abe4d775da6c3984b53f8d (commit)
       via  b5c39684d50deb95373541d46c4a5f0d0d48c613 (commit)
       via  803f81b6e2370e0f9a95888bbf85b5435a9b0cc6 (commit)
       via  75b82e61cd675689885efe312402033cd77b04b8 (commit)
       via  4b2a828b7a7477ecd984bcf0b7cc2887579bce10 (commit)
       via  3c45ea72003cb51d76ea222d59e2966c18edbf7c (commit)
       via  9579333e603ae57a6b8210f828147cccd53d9276 (commit)
       via  0f3b3e840715c4a287e1f467ce552820d07253fd (commit)
       via  367df29afd3c875da003fb1cd927e3b2f8ae2197 (commit)
       via  b8d6454c2c96ff4d4a9878d382618d72a81a1146 (commit)
       via  58c019e0a6fac0073250402b49931a501063f55c (commit)
       via  6042b46f7dd2541d1432b73039b590267eef1f49 (commit)
       via  d3612a83d0db6f570450da176c828fed0501e8df (commit)
       via  579b15b79bb494f51e44baaaffc18c8c1e636e63 (commit)
       via  b99f7a6a3a364c9db282468ee10baeb072ff1579 (commit)
       via  e6091c2d48557906582cd06eadf8ad08775e6392 (commit)
       via  5b5758acab98fdc4ed99a07cfb3611bf4d26c4bc (commit)
       via  d00899b78a705f0d45cad78f8fcc465275c1aff6 (commit)
       via  f672944356eaaf47b1cdb3a167431ec33a3f6b9c (commit)
       via  75ce360ef4fde820ba6f1f974c6a1a9911b68461 (commit)
       via  7318775d14414207c3254775b4d1232cf09e602b (commit)
       via  6571c2fd4e7eca643f7d994efad52a4120118ccc (commit)
       via  dccae6a9e49b6554b5026883ce0fc38136e59d53 (commit)
       via  851b1ae2eb3b3654c882f59f509ec9d2ac6ebffd (commit)
       via  326ecba2f886bac40063d8d14d99065bc15317af (commit)
       via  33058547a381c93ee594a6b5b9cf53c74f650060 (commit)
       via  a3d1cdbc30755257b4a0f001c4cc8e6acaba72d1 (commit)
       via  64aebd615605c46e9b969aab0e6fbfb58863cb81 (commit)
       via  8356631ecc5304ea01308f92967ece2d10e1bfa2 (commit)
       via  473ea1d1ef00f0f2c537a2e54d5257b2639f3d35 (commit)
       via  80795e05596fa50c395979bf0238d69709297f71 (commit)
       via  30eb17ff6ebb7d3c3904f7f65ded96a9568dbcd7 (commit)
       via  49088d88d626fc63317e0e4dd9d56138336da7c1 (commit)
       via  edbf3610ce57e51a07a3191cb4d436cdc0c3d4a2 (commit)
       via  fc78d517bfd36cff9af5ce8b5f16ad44e94559a3 (commit)
       via  4f2ad33d7b8c47fede24c8661ed4d37f67f567c1 (commit)
       via  0da79637931ff0abeffc3d6b8352e18ef72b3609 (commit)
       via  8b27c5b5678b4502d15c0a6c8fdcda7a45ddbb16 (commit)
       via  6399e59a930314ef6b4945fbcae4d76dfa74af87 (commit)
       via  5014b1c294a4b8982ab3c7c78e2272fdcdff468d (commit)
       via  03ad746590f114984d09c862a7c87e437cb81299 (commit)
       via  c481ac95102bf739e7c95e0ec23a40b24bee7017 (commit)
       via  68b42720afb1bc015592d7b70f0165d01e878b88 (commit)
       via  93fcb730612dee65684862c41de1f287292abd2c (commit)
       via  c6988f3340d0c967b9403f5a2569bec1c8413913 (commit)
       via  e584d6dafc318c328d129c5847d36e47c6463512 (commit)
       via  d47115ec4eeefc243abc3d6abf2b68e17765cb60 (commit)
       via  8ccc53c4c49a7443c4d0a32cb742ec7793cd1cd6 (commit)
       via  f67e562db4a8a4b94af30e30e7f3f709f89bd0e1 (commit)
       via  58d91b7f376198d4a6553ba36f888fe47c2b6003 (commit)
       via  27a399a94c622996b6d2d72ef76e442f532c0be7 (commit)
       via  821be501ceee5c76da4fdcb05b91f32162475597 (commit)
       via  22e59ff1918b4165665d206a311f07dea264c83a (commit)
       via  b9aa65518268f9760e21e7feb46dedf99ab70b09 (commit)
       via  f64cc0d2b2ac5d3579c1916a10999561d2a36a58 (commit)
       via  cb387adeb06f92656007a4983b23c077f7843de7 (commit)
       via  9bb2b6f474d6a1e1371c82323726449ef2daac02 (commit)
       via  60a52756639ead678f500a25c094fd525c9cdef5 (commit)
       via  8f80364582061d4bb13b74de9cd1ad35556a7afe (commit)
       via  f15d31661ef94e5d549dbdfb0f60cea1bc17683a (commit)
       via  d344ff97931dee43c7a1a7f815142042c9813bf8 (commit)
       via  b2b17e15d99b79401b4dee71e6830eed063fa5c7 (commit)
       via  066f495979623f36aafa81a1927130dca7607eaf (commit)
       via  954f7d01cae6475f752b49daabe44f471962c961 (commit)
       via  8ad2fe638cc2e04447ac5b909335a193deaf23da (commit)
       via  b52f63c824a044e8adcde2ffe3640e0074c615a1 (commit)
       via  cd2efb9f05528c9c68e80185b250fe5b0abdec14 (commit)
       via  c31004a89fe50fedbce1b39cc567f06ab1c3a892 (commit)
       via  16912bdf1eeeeac517377e15c6c8bfe7743f9419 (commit)
       via  54942406955b4368104208eadeb55a13a258fa2e (commit)
       via  4f43232f4dc62bd3951cb5fda2bf1933b707902e (commit)
       via  76b756f9a40ca7b086d8239f48b0363e394eda5b (commit)
       via  1e90abcc6da204b8ac0c9b53a5acda75c2b07204 (commit)
       via  fad31722c6a5161fbbfc1e09361a5324569ad67b (commit)
       via  4f797ab76bdc21b4b9916c10f6fdce93c1c4b30c (commit)
       via  8ba5dc71d28e5ceed0486f73c3e9f4c4c2470e1b (commit)
       via  2c27ce38dae5079afd8806cccae2463dc04f9f45 (commit)
       via  6321ad3100fc6a4af0c7c22463ce94bc5c76a493 (commit)
       via  f931b8204aaef964731a49c6b03350dfa9b6a52d (commit)
       via  222c1eedcad11e54037f01b4f9fa54b51389e22d (commit)
       via  fb6591b36efb28d000b0f828b6f4d8a3f19de9e9 (commit)
       via  5f2ec6ccb226272ab94077ab0898af188b5999cf (commit)
       via  df73c36180fe7e822f4dbdfa9de4c460f8c8b795 (commit)
       via  317cf071f3835ef0f36fc3c111a6db7bbdebf644 (commit)
       via  8cee92bd50e2c5ca47029aec11b35817e30b3bf0 (commit)
       via  074b1188ea90da631ead2201ef66c7375d5a1e5c (commit)
       via  efdc3e177d74e62f18dbe6a8c0d3577288e64578 (commit)
       via  2c48a50792d15aec423169163ebd5a99735dbc8c (commit)
       via  b59f2d50f0a61a434e1f17baac336d1f9ead0715 (commit)
       via  861fcc3ef441700d83f1cbd814d69e2f21dace7f (commit)
       via  0ae01e8cce1f89f8e45f621f5aa99cf563c52164 (commit)
       via  e00d6c989d9063d3a86b91c7439ef2bf345d603d (commit)
       via  02aa640410bb9a5106b052d16c7f54f9e926740b (commit)
       via  155f00aa8af0200ee091057f222ad1fc2f6a3395 (commit)
       via  f5f5c23d777f54e5a3cca2ab8be7587ff2750155 (commit)
       via  da414584b7c62f90fa21ad6420cea2ef8553c119 (commit)
       via  428501b438e956a24c4bbbae9cb11efc37497a76 (commit)
       via  95a2d8b3b02c25e64b167223a4b314f8f8d57fa8 (commit)
       via  1aca197ed2b238721b4f47ffdb7e18923e22b329 (commit)
       via  ac2300d4878e0342fb292d9c2fbeaf717c15febb (commit)
       via  2f318014b337e8ef8533a9380341e4ce6568ab0c (commit)
       via  3ceeef44e0de6ea8e42711ec497061d3361f2d48 (commit)
       via  feaefe133a48375a92601320de760d0c1d7e4dbf (commit)
       via  265e7f2373223f95cecd1e193d26c190c329a8fe (commit)
       via  8ab0c9494312a1d33c5a47c5cdcc6831ebab6dfe (commit)
       via  85544c4ecb5ac8e275517e7200b2e9856568e29a (commit)
       via  6cf4d911da8414ffdd161daf7648704fd2beacb6 (commit)
       via  95d11c290f223a8aa3f3e2e3474020e8a10585aa (commit)
       via  eae542988e2cf151abd296864ee12dfee9c74c6d (commit)
       via  03f4a090c023339ed268e5c13c3fab00c37fdb36 (commit)
       via  375f23dfb51caeddc5f0e95d9cf7e2daf8884334 (commit)
       via  e4777b8dc1a2c22247c6fc251bca06ee1d5acefe (commit)
       via  87fdf3a085980e3e7768909301ca2b711d33e429 (commit)
       via  89f4c1c04f55c24daa1e6ff9c029efbc4908010e (commit)
       via  55bada2cf9fb9481fbf24f3205fefe6499433c38 (commit)
       via  858f4d6803b22c3595eb55c62cf2b3f087a32a48 (commit)
       via  3afa5ec6519b96ed601f912418b20c3d2ef13652 (commit)
       via  4e276f34ea4256d27d59f78e6d13c45892a6d182 (commit)
       via  2663d0adb73e47fad7027b665b69478488de3f0c (commit)
       via  78aac33c9a4bcbdb2e8c1ee37c163a548105b258 (commit)
       via  f7f1a89ca12e1218a44db743f9c5c0852dde1b05 (commit)
       via  56aaac9b4e619daaceedfe9f1ca0bbb36937be05 (commit)
       via  829c04e73e888e8d03371f20707a8e993c217d15 (commit)
       via  d1fc9fcd554fccdac65a0e57c067d1fe55ad5cf7 (commit)
       via  af6352fd3d75e92cc9e476a14d902527f67f71ef (commit)
       via  b5f256bcbe38d72d1f69cee806d8714c9c7d0b17 (commit)
       via  c605c816f97609c6b55765a1c8916fdb082dccca (commit)
       via  e1177186ff44b11d6c14d74637bb2564b84151d0 (commit)
       via  9b85896d1902e77dfda90a311e5115078c474c2b (commit)
       via  371bdf6bf8b61c3b78c8915068b5b806ec2b62cf (commit)
       via  8bae346819ce77fa3d653af4abfc6f1da9788303 (commit)
       via  d6c60545ff41d153152c5a542cf723fd163c65ee (commit)
       via  7ce19f110c1420531ff39a97ce710bad972f776d (commit)
       via  d61c64c131b2ac809e7470beac7b48c64c797049 (commit)
       via  6f3695f5fc884861d11e2bfcc8b5582e5e715be2 (commit)
       via  d2db023c9918fa33de85cc818429c8b16f0ae6b9 (commit)
       via  aefdc84817e164be8f27f76b6b6dc76fe355a799 (commit)
       via  8e959b1107f69ac6d85847d5c0f13f4c0a686bcc (commit)
       via  94be2839c1a51f9c47eaf9e0deba79bb59b27dd2 (commit)
       via  1b56fe0cd10a77e329221cad75636588783f1da2 (commit)
       via  f1652f6f8ef9db10cadd41fa77f77a87aed304d2 (commit)
       via  199b9086f51927fb99663cac42934337352cce69 (commit)
       via  b110067c6ec69ac5081a2fc50d1d645d60c73aab (commit)
       via  136b48998f4a5db717e16200fcdf4bb907703646 (commit)
       via  392800a64e30930e8ff3771db6805b1faeb2ce13 (commit)
       via  c8d4c3f4b21b598302f2310f6fcc747cf92f8d64 (commit)
       via  52a55e9881f5f37ac7587312b4e8526f90ab3d5a (commit)
       via  f1c937eee51a6cd5ac651fde70ac285f32419eb6 (commit)
       via  d3334a68d7291428d9c0178b60abe2d9d52c8fd6 (commit)
       via  d4a102bec07f508ba1e509d6ee3ed960e377042b (commit)
       via  a8650c3ed060f496acef2d6dd13b8c67e93dd104 (commit)
       via  5957249003ff8a68044602cf10aaaf31480edb99 (commit)
       via  4bcb63dc17a395e34f7e89d6764e7945c9d14549 (commit)
       via  7dab3a457990b054cb738fe2bb5b2fa12d0b3912 (commit)
       via  027e98e68e9f75ea17cb3510491bdfac11e4f806 (commit)
       via  16f67b47492d97cac0866b02304b08fdde4d069e (commit)
       via  1a1c1339db861cee13ed8b8b05b0c41428214b7a (commit)
       via  0cbcf393dbdaa2ff36b11cf2516675e78eada49f (commit)
       via  9d1fac14e32e056dea67d2beb69f693f5633c16a (commit)
       via  cdddf80e02edd43c5cb6a5dc087e724ebadb7854 (commit)
       via  59ad059649a33886456ddef11d66578e2b6e7dcd (commit)
       via  31b07ed6985969d6d9663a0e9ed51217910dd7c0 (commit)
       via  449a81c2fd090be94d6128aba1dfbcfd9e15e4ae (commit)
       via  85aa4fee2425be149d54a634f7664d70184c5b41 (commit)
       via  93a1c8a908af2ac955405d622abf6d8711ffb522 (commit)
       via  60bd0bf85380e6cabb50ff07cec3366c18f170b2 (commit)
       via  c2ee522f4555e2ac326e5b07c03a2f5b56b556d3 (commit)
       via  a7122ebe28e35ff3d1226ecb2a70520f1bec14bc (commit)
       via  e698ee3ea801e1a02263516d75bc4fb1f25e7b3c (commit)
       via  a5b9cae78ce16229fd1cdc7459b08be60bdd6c72 (commit)
       via  33d456f2f6387bc2ead8fbe16d67a77edc0336eb (commit)
       via  aba3010e83194e2172006059db08f4fd5992f021 (commit)
       via  3cb4cb584d97f56feb7247e9decec70a7d88212e (commit)
       via  4f394b7451ee7defec36e3c3d845d0f932c20cf6 (commit)
       via  a822d925d597c5c0f67e3c9ad9642cfcf70ec7fc (commit)
       via  451ab178e635edec7c320034b47bcd96c770d1a4 (commit)
       via  30913e0eb8ef1f9924b6762d277a561c8de9e622 (commit)
       via  fcab6cddec5f183c7180beb566e83ded67eabf59 (commit)
       via  477abec3777589888ed4a4b4f78d1c13f91cdfcb (commit)
       via  d630a0d4dc7c1af141ab3c61458cdbc690dac88c (commit)
       via  5116cc978798cedd7a522d3fdd3140efde9933b3 (commit)
       via  48b98a63bd53c93a64f43cbcd8ca93f541c7d5ee (commit)
       via  8a4e2afa54cbc1f148d899bd5cea6a2ada39d2e9 (commit)
       via  484ec4ec8d7e07e8a63c920b25f3267754542c8e (commit)
       via  6c20cf0710ef99d0c9b2c1622b18867311cbe78b (commit)
       via  c9ca5f61d87cb0578d32981b2ee32118d934ce21 (commit)
       via  1bc8f828ae07b6a3537ef0ca46cd698ba99659e2 (commit)
       via  fdfe9a1154b9945c71ac92b5c16ffed21e89f2b4 (commit)
       via  82bb64f1d21f6993341a725e75aa5aa00c3e00a1 (commit)
       via  9f833f79c912cef51f4f2f71f2183574cdc43ee4 (commit)
       via  28964e4787b17f0211f9b2aab2776cee163fdb30 (commit)
       via  135cfa3b653af3c4cc9bec95f813237263ae02ef (commit)
       via  38f9c6c7a64a411d2655f985b9929a3bbb2d3beb (commit)
       via  5c74dedc0e0ed50680180259133a02086d5695e6 (commit)
       via  11d8ed522235c2e5c705d6345e7cd55f2a47b316 (commit)
       via  90c6fc18d1b1129e3ced36ddcd7a7ab0899294ad (commit)
       via  40705c5cc5898ff924fea0c6f54f8953205a630d (commit)
       via  31bbce9e64392f9366582d71aeef1805b53208e3 (commit)
       via  82796c70d0a67f9af403fd010add959861c0ba40 (commit)
       via  271343d8ef023b9891d9b06bce5e62268f8b50e5 (commit)
       via  94aa58693d1a6fd09db715524e1785d062f1a252 (commit)
       via  8c4d0f0650486315359a63b2b6a832dcf4986147 (commit)
       via  ebb212043205b4ce9d1ec025e0bd99b4de9cbdb2 (commit)
       via  036767871101be12266ca04f9efe1957727744de (commit)
       via  c8b66be05a6301e5f82ee7b3b7a87727f5cecd9f (commit)
       via  1410d5c0be4283ebb9aba8b472a4c890263ffff4 (commit)
       via  be241ce3cc4fea3e9c3297221958cc8a358f091b (commit)
       via  081e90a8e51099a7513e77329eb604763f6f4df7 (commit)
       via  51f413e99a4254139b40294bc808d614b755a35b (commit)
       via  fb21ed841b61c61d70ac9c370f53d2cf53231764 (commit)
       via  5c210551131a0fc50d0e1af21843b35df46ffdbf (commit)
       via  fa03ed7900f304fca5eb5e277a4f70b01dbd73b7 (commit)
       via  66dc614311f2010c6346a66a41dff14c1c0a8a65 (commit)
       via  f5c5453039bd46bc54023c1f0434c167624aba5b (commit)
       via  08ddfe12f5bb387c4b1adc9e0950cada3ef0cbe0 (commit)
       via  e55b4ab196beaca28331d5bd2da69bc36b2f3f90 (commit)
       via  38f12a3085be683b598be7d10de37eba0b629f28 (commit)
       via  0d8a113dd070db481d0070a48e6577a12d8d7149 (commit)
       via  726540faa1a5136004eb41d5b70f61e8aa2b795f (commit)
       via  836ca56434e2d63b9ad8324a0b551f789878c3f6 (commit)
       via  a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc (commit)
       via  7afca964324add2466d851aa07c3c650f624ed78 (commit)
       via  9e5967708814027981d910e6fed4f7789eba23f8 (commit)
       via  c1d0de60cd864a0bf27df370a9d01640944ed8e2 (commit)
       via  e7ca7771e57e0d02c9dedf0e3bfc5128b397d7f2 (commit)
       via  52a130494d747f224f4d6cc7a487942179857135 (commit)
       via  bf69289c8b6f060de7946fe455c12c2fbdddd053 (commit)
       via  320685333ede68b51e2c720941b4f90010268760 (commit)
       via  d4a752a353c3fd15dbe7cb5d2b5e01996546d75c (commit)
       via  cc485aba6babbe23c0b67eb28eb6181f18fedb98 (commit)
       via  d35cee2a6c394e13b81ebef29fe53eea4e2b533d (commit)
       via  b2d6b49c50859a4b0773f6e20756e2ece20f092c (commit)
       via  7fff2880a5e284f17cd6f0d869b0addeef7e1f55 (commit)
       via  61873d53fea7a1a341bb7234d8428d5aba9ebf3b (commit)
       via  a7cbc8a792ee1a33ab1cedd1d89237487b2c6782 (commit)
       via  1ebdc2c1b9a75420dd7518116a1e70b1ad6d93fc (commit)
       via  89dca9e1858f3734c651a2e49134665dcf8fa606 (commit)
       via  a956d98634008022ff2541b8b9beebae1e025def (commit)
       via  02dfe16d6d4e2738f00e168bc7f5c3a664e02530 (commit)
       via  b3c532b0a3dfb7129bf2119b31e87cc01b49e3d1 (commit)
       via  0bb7fe0d70803fde5fbb818f7c801b2c22d553fd (commit)
       via  1f9b3058c7bb5166dd9f269f7c334797846a67cf (commit)
       via  e61b581a99e7a0af8f8dbb793a707f94b0336395 (commit)
       via  6b5dccd3a8c79a716b25cbda99f555648e898f60 (commit)
       via  1a758e7d0619627aba4f772925154c02e7042f28 (commit)
       via  18fb6351e0d7ffe88aac6043e43bcc5163a1dd53 (commit)
       via  f501499a97946794fe2e5f264e2276ffe826ec07 (commit)
       via  fe1b11ebe22d45eac5625b237d5dd4d20e0d03c8 (commit)
       via  73199a161864ff4f0c692488708c68c22c1c61ea (commit)
       via  6a50baf30f92cdcb393f801e8265eddf17ce00ac (commit)
       via  e171f615247e832582c4806016dc58be7e2f2594 (commit)
       via  b615fcd597e99a8a16cfa873c6848d3c6204f777 (commit)
       via  376293a9ecaf9cc15041260d11e595af867608c8 (commit)
       via  07d9b536830dd8369e500c0b989dffb235cf34f0 (commit)
       via  389bd6b3d947dab08aa7fbce4540d1bd504e2446 (commit)
       via  4c4beef68cf5b0b3ab92e8e41ed322da2d8b21b5 (commit)
       via  9880431627fa196f7f5b4fd20aaeac97bee5cbd2 (commit)
       via  e3b6255fbf58b9120f1df8f91480749def57cec1 (commit)
       via  c463a964bec391ee9c2735801604e96941a1e33f (commit)
       via  53599ad1ee6877116c3ebda34489352cdd15ea24 (commit)
       via  ff1b47682742db4706a523ef90a6f9daec44058c (commit)
       via  0b1c914b122575b00ba3943c57d91b0955581ad5 (commit)
       via  8be644b8612ae1ab23bd9de646991c90e03cdea1 (commit)
       via  150be8ee36697ce014f3431b961be45c4c6a34b8 (commit)
       via  f4896832bde810feb7d329f9674082f2d7fc0996 (commit)
       via  0e6a7aeb46527a4289b1ccefdc05c10cf1197854 (commit)
       via  2ad993189da921058338b2cfdc1897ec7df35354 (commit)
       via  2cf22db73f5374bd0f528abfaf65987eab12a665 (commit)
       via  b1289ad8f1071b2e11325a7afcdc6aed632f07f9 (commit)
       via  f807dd5a843bc219424b3a9f33f2498dbc1c610a (commit)
       via  1e0238adb8510b959bed87c264581e98afea9a92 (commit)
       via  bf15d302c88c7da373b3ad7a4d3cea92620baca8 (commit)
       via  b0a7f1ef5bfbcec5e8942270cdca18b424b5f28f (commit)
       via  f70e8b593f48b302be43800a5886e790b4280f6a (commit)
       via  b9dfd77aa5be5a91bfc82ce398d27e8266733554 (commit)
       via  805b1b3af6307bf6806fe5e77469b30492165fdc (commit)
       via  17ca784b023de76b5fdb2baa50a10982dcb16854 (commit)
       via  232dcc6d2e6c80af70eb72964bfa2c0f08b9de80 (commit)
       via  cc98b9c624d0a07d703d6cf5eabd06fd0bbc34e8 (commit)
       via  a0cd0d4b41b7495d2b8b82c7e8d70a1a07664239 (commit)
       via  fda3de574a6c8398420ad6ae1f456aad368a7193 (commit)
       via  152fcd209b21d8a588e787d60abd59d74bbeb69b (commit)
       via  0ef3ef52079a967a4ef15968fb2054f1b215e7fb (commit)
       via  1072f686df5bb1035620af4a22007feb290d1f12 (commit)
       via  b7e96983128caec94b256760ae9694c262775988 (commit)
       via  42851b794a9bed9fdbb7240b551ebd6bd55f77e7 (commit)
       via  30bef0f3dc2e56b1205e3a1d69f5321a9c7a99e6 (commit)
       via  4740f56e6fe3360fc21e5de68600a777fd046e99 (commit)
       via  e0da0d0740c8174270dae2eb2d5fc1f3e8c6c041 (commit)
       via  5f5b225a674cde633e42bb3ca3f767ca95ffe6a7 (commit)
       via  5c1bb4e240c3538a6bfa7026dfe5f590ac747863 (commit)
       via  3f5dcfb065552773b4b0fe295647a9c16363d180 (commit)
       via  11aa54925224bb51b85655be1f7d46c6cc0fcf2d (commit)
       via  0286308c4923e9b1547811587988fbec73aabf00 (commit)
       via  7fb047693f4f820960605a681e6a8f1687dc4a9f (commit)
       via  297c8cf72445fd026024b963cd5390f6d7345d3c (commit)
       via  45567bd1db489a9745e139dc980a1092624175e7 (commit)
       via  273593955a62bbbd7e20b91367c66b6e547d4882 (commit)
       via  c7fa87264291f611fdc63bd4a49913f98ec5b944 (commit)
       via  9f8d51bd31b870b4af9dac5b4030bf3a5c155262 (commit)
       via  596ae38451e269e40e3b30ab6f6f016bd9076c04 (commit)
       via  ff37c9ba221b5b6e2bb365a438617113c89be6c9 (commit)
       via  265671e4e2cbd32efaf71595db19b37f97290b69 (commit)
       via  0bc42aa61e89dcbde7dc64f932ec795f383f9211 (commit)
       via  bf630c55d292f7b5b668cfbad31e4d61246f64cb (commit)
       via  2a792eb24810033314f675b4e65efbdd9348b706 (commit)
       via  3ea0d41765a7f80a1a75e07151f015b793c363fe (commit)
       via  8b4dfc2d2923fd5d232b4b20ce147168b3532ab3 (commit)
       via  683a7cff745461dbb8851178d37011371ad10ed5 (commit)
       via  0cf750d7143939e1118358557a19012a74fdb9d3 (commit)
       via  3027d901f4c4698241e074be5063df5b18fa7879 (commit)
       via  a3345817c8806193742307561787d74117f4b35f (commit)
       via  144628d7033cdb098cf77fb94fb5204286adf10e (commit)
       via  ccf385b973b8eccce6eb38e3b6a35b8b6beded31 (commit)
       via  cf2e31d3b1f8e7f124c3194417685c0e206fa039 (commit)
       via  f5cb0635a837eb99591ac0356f242f0496f1ad0f (commit)
       via  a0d4d97a740412add8673379f7b36b2a40f6418f (commit)
       via  4839ca9219b95a6155e4161438318ec0aca3aaef (commit)
       via  5e3ae4e14a471a7c61ac75ffd6cd71659e81b07f (commit)
       via  bc5ba174ea24265b6970e9b747c2cf791f203dc2 (commit)
       via  956c58ab490f79be1829ac4fc3a0da58a4b30973 (commit)
       via  0e886a6709d920b1f52f6cc80612db0b9d135cf9 (commit)
       via  0bc3abcb9f34a00010bd600e5999cb01ad4e75c2 (commit)
       via  e842d5f294537308fcce7116074291226806b0bc (commit)
       via  9b967c28de8fe497c043d8f7eb9c5ea871f2e5f2 (commit)
       via  445674ff92cb0929f21627dec0ced4bd05a1c5c8 (commit)
       via  0bc7d68a0b1061e9907b420e61fb043eff8850f7 (commit)
       via  9a3268ca7a4ec184f014a322ee1ffcbf7055dfd1 (commit)
       via  f5c022ededc54e53eb3f8a6702c757015f87e322 (commit)
       via  7d60560fa698363d9b409b35ce55323b55e5c16f (commit)
       via  2815a73e40df4a98c9693c63b071cdf0d8d13d2a (commit)
       via  a5b34b4c6aa1f0d66537c0b4683b6d7dc39a7ffc (commit)
       via  05088171d107f4b904e41c308be493efa4e08670 (commit)
       via  ebb334e7ec6319b36f963143c387c6883e832806 (commit)
       via  dac4d254d1b8d79bd197d4aece6b58b75ad81247 (commit)
       via  b9fc781cf7ddeab662e331c12d664d4b6ec2e8ad (commit)
       via  dffe171f1da9706598d650bf989eb845a9cf275f (commit)
       via  85df5a371a8f3f3b5b5bc81529967772ae836f9a (commit)
       via  9cddc4f56b14502c110b0b1459fa9890c91997ec (commit)
       via  b1a5d2e3e5255e5ff5abda272c985a5d54073ed9 (commit)
       via  c349db06721d376cb70be78450e78d30a476910d (commit)
       via  25903324b11ea930bf6f6107e119158d494a0603 (commit)
       via  a2e67e599367ae14bb69fd99202a136db0ec4762 (commit)
       via  d7fc560de1c1eb43cbdcf68f6a755dbe2ce42adf (commit)
       via  bd4c823784524b079fc6f0b709d80900e62106af (commit)
       via  6d85101e57f1b6a57e317a415b5c46abd35509e4 (commit)
       via  a017bc080e3c36daa7ee0f3e26820d5f8540fe74 (commit)
       via  9fb15f19427bb194feb87c59c52169b2fb9a04d5 (commit)
       via  79ddf6800c051f0b75b0b4115568644c156351c5 (commit)
       via  6483ac07dfcca5ddd282113f23c3771a8027767c (commit)
       via  0c81b43f711fb861f04227ced8dba889596d9c43 (commit)
       via  4014b502e2180c1c1ea501ef77e5f97c186d4cbe (commit)
       via  24dd0449267486b3268ad812c5fda8b60dad1981 (commit)
       via  50c32b61b305cb8c2965470927522ed2f226b917 (commit)
       via  b9e9d546e8ab45139be6d8e939602cd712c36c8c (commit)
       via  3af7ec13fa085bbb532384d6bb7fd01fbd62391d (commit)
       via  2fdeb6bb98b502373fbd7af66fd304724ddc94b6 (commit)
       via  7858f2bbb985536317fe2b5285ea332db96161c9 (commit)
       via  ba5fce66ab2e1892ee7f92cc71cf3f1517f6b5bc (commit)
       via  58c182ae59f585c5687104e0112d163274c6c732 (commit)
       via  1bb5974d3d955590eb771e547a2858430284f477 (commit)
       via  9bf72f7c55c5cc01d443b364bc14994fbb5f91ff (commit)
       via  6b3aabe1ad4acfb83ad68d9768a5e7523886fd37 (commit)
       via  4eb0250df68e50bab8dc608c736769dd9bb3ecbf (commit)
       via  d3176a8a449ed69d06ebac4cf7e097dc8c22f0bd (commit)
       via  c1c1339219159a7e2f224f61d9d695331ffdf9da (commit)
       via  b6a40fa2d2c08f71f9aeced063a36a27f657da6b (commit)
       via  4e0ccf0f434fc0e83d2dd46d2d14791ee86df06b (commit)
       via  eaac33fe13811cf104f45a09a6ece911c135fa83 (commit)
       via  15400bca303910d059f1a68f94b25cffb1a8ac2f (commit)
       via  2b0687bb9db3b34ccb0de7bebd4769f635ae1fd1 (commit)
       via  0ea1177e8ea22fbb74ae1797d743e34f08337508 (commit)
       via  f37035c3296ce3f199d3ea004cc4fe9042359c2d (commit)
       via  bb248782b23aea3db563b9767e26d9ae5c3d7386 (commit)
       via  0933a8cae4c508c19ad9348fb0aa24354bca9207 (commit)
       via  75eb16857bc94aae196be1d74a2eaf9a6a822347 (commit)
       via  650d3ec9072dc8cc1d5169db0cb7b63a9d9c0b40 (commit)
       via  05fa2516353c43dedd289052295abf6b0064e394 (commit)
       via  94f3f898ff4bac2c67c254b7bf933a2698f0115c (commit)
       via  f2f162f5efda16ddb660163f838d27969d1e4025 (commit)
       via  b7d99c63a3bc0de3b8a5dfb71c1132cd94d96a26 (commit)
       via  7450206489bea8b4150d564a70413c541c08596b (commit)
       via  3320c0a504ae23d22bc4d968e0696dc59d036acb (commit)
       via  24cf7efeaa0e139fd49a0589519a15d4da38ec2c (commit)
       via  7883db2175ed3baefd02d3b2e72fb96c25084ee2 (commit)
       via  2497dcb8669fec10310130de1108bc5a278d2114 (commit)
       via  2b1eeec164e79a573ed9b92a1599c0d2a9b7f694 (commit)
       via  61b2bb0d647ea5f192e49f5f5885009ea83968be (commit)
       via  1f45e5fd80fdff25273b44fc01c11460c8d7cefc (commit)
       via  12803f06863ba563237ab2404e28897c07f8b757 (commit)
       via  2b5742a5daa828f441488a07188bae90b2c9eb3e (commit)
       via  1b5e0246957acb4987e12b48d6ffbe9166cb8f82 (commit)
       via  fc8f9d7f9ec4a17be36595a35ec83d441ac2b8cf (commit)
       via  3efb29e48c0721a6d270c3c2a3e91c71792f1e2c (commit)
       via  9a6e17a607c757c323050effe77632a5edd9ac09 (commit)
       via  cd8f7420f78b3d9a9005cd425f6f27545d0f7aaa (commit)
       via  1402741313cf6c2fe8611eb294f9a8111c994a32 (commit)
       via  3605250b571309a41f52ba110c1f14d2a2ca25f7 (commit)
       via  47f596af02a6229dbc87ec1e3317a7a471e0a160 (commit)
       via  3e334a272fa601bebb5896e25cfb63f34822a275 (commit)
       via  69bb25618c4f3a14e5b405822d726620e955b07b (commit)
       via  f2ed2817e85bb9e174889171cbc8d2bcb2694f59 (commit)
       via  1d76d3f56efbaf6152ce5a6795fd0b2a3d0d92dd (commit)
       via  6623ea6120320829ba8eb40dd08535f89ef47793 (commit)
       via  4480d9cf5bae98acd9d08d14d95f0dab149b9e7d (commit)
       via  73c31733ff88493f751938451600d6950f9fb0b7 (commit)
       via  b1109e2f9164e850dea0fea1f009d3265e51e5c8 (commit)
       via  cc9a67f2fd5e0c422fb0bae819cb70708253b030 (commit)
       via  d49776091458ca8affb5defa3c766c354bb09efe (commit)
       via  1ed48303b1c6f7a086a60b3b99bfafc25fbde3aa (commit)
       via  9bee10d186e2c9600f75779a19e03ad3b1a5b283 (commit)
       via  1f2e5599a81965c3d7da88995f70455e8fcb8e30 (commit)
       via  cb3e1296ac8a01fcf4b38d10584f218722655e1c (commit)
       via  c96b881f41b180f6176064cc00fe7af620c24c63 (commit)
       via  79922343073c66c3f8d4692efb1f31fe47c16fa9 (commit)
       via  a27c9c4956fd1643cc3a0b3a553ce40039867680 (commit)
       via  555ce8b7686c798b0cc599b218955147b0d4c5ea (commit)
       via  1e005df1553b0211a1a8c2ef0e6d62eb41ce0ba5 (commit)
       via  e19e13d75dcd1b4fcba1feeeabd77e02ab3932b1 (commit)
       via  975cae17a1626994cde495b6890bbd2481cfeacd (commit)
       via  1429b5682e4c42eda02a884a4d6243ec3b042c5b (commit)
       via  89b9f35abff0facb71f040444ff5653a8e98b58d (commit)
       via  583daa1e655c4b736da5cd47d275ba8defb388dd (commit)
       via  3fbe45da6f388fa7dd9ed2f33f816a118ba4ea6a (commit)
       via  51f59fc244ef6cf13a2784a0ea82ad9ba80a57b4 (commit)
       via  e79aed067f344f7431346ef6d97859abd30e18f4 (commit)
       via  afeb921c579c9d1b75a5ce8aad442f359b51e0c5 (commit)
       via  0e3576c2896b5611ca612b51ee182692622058e1 (commit)
       via  43d62e07f2031f21648e41a233ae3213cf99f1c8 (commit)
       via  52b08141986749bda20ffaf17e6aab145ee6a392 (commit)
       via  a65acce263dd789f004567857ff56d43d2975a35 (commit)
       via  ecebc6c22d7edd81372df837677de4bdce363199 (commit)
       via  b78d98ffcd397aaca323a5b1314e03395391bfeb (commit)
       via  f4057070950a5991a9adbe2e8bc8e78aa16d1895 (commit)
       via  fef8ee88b48851569de5b05768c892914a72b16d (commit)
       via  a25e4646a3563c482cf98e5252c245fbd19c3cbf (commit)
       via  cca31bd5ab44dc0e1bd866e49fcc3354b071718b (commit)
       via  29ca903b799b0a319f881701788f9b350ac50cc8 (commit)
       via  fb4ca27a3992f229def170dffeb2c1c8c23d9478 (commit)
       via  8dbdca111d25761a350c598f7a702c7dc5d3b24b (commit)
       via  1e8dc0f665c2d66d037cbe79c8e036f2d714311e (commit)
       via  5ac7081cc229a57df779a134de5b192c6d3519a7 (commit)
       via  1222bfbc2cbf164f7ece4ff952c6798a1d5eb585 (commit)
       via  4ab114aa1f9dea12007faa55894eb4a8e86afb05 (commit)
       via  5519bd2186f0bc635efe8ea14e8459a14459cc27 (commit)
       via  f52e9abd0c2a4dfaa35993b448d1db5518687243 (commit)
       via  9474426b7637f2d6dcfa454f0e77bb0ebe1fd741 (commit)
       via  2ea2717733324ba9bd261167ea10b7252bdf985e (commit)
       via  a2154d14b618540a8e32f745f0f29ab924de91b2 (commit)
       via  d295932ed40e46b94fe2ce8932a571ebd1e7dc92 (commit)
       via  391f55ae47ddbe43a5fc4524f7ec9bb0d67689c0 (commit)
       via  9f4ddfa921c3bc71a2731ff34ac32e622dcafff8 (commit)
       via  29ce2209d36afba7d2cc672ee86fc00020872005 (commit)
       via  dbd622e2f26758c598d8d7aec3cbf619093ea106 (commit)
       via  88282badbe01d5266de0973298c3adc489dd59e5 (commit)
       via  145b591c8f676257685faf9cd8faffd92e1a9e5d (commit)
       via  7df1a9bd2b5e981e957aaf269fc15f980a993394 (commit)
       via  2838ad57693eec3e8467460e61e1c0d98ec53d3b (commit)
       via  0fe3c3285ba595cf5ce585b61f9f423714a66d96 (commit)
       via  f19880566340ff54f7d66df25a3a235ddee86bed (commit)
       via  9986bd92a59f662ea21a7e734c0556e9756eaa2b (commit)
       via  13c1b9e61bf30678a707229d52e05b3ae6a30f9c (commit)
       via  f977d00e0a3ab9af3555bb3bc8ea78726cb7a143 (commit)
       via  ad5d0be02dd42c200be2ffebb1e062e96a06f80c (commit)
       via  57576b60c67f8c3c69a1724d4f34736f5a9fd3ce (commit)
       via  50036b32c5257c558a28fd054f1d2df6f000ebe2 (commit)
       via  e1017337a19e16c47783405bfe9670f5cf936ffe (commit)
       via  3453b8e73828ecbc96658dbf94ea10885480951c (commit)
       via  8f28c111d5114351e61fde825c65204a52b332ea (commit)
       via  07d878b42df4a4d197d8f586be108666a26a0ba1 (commit)
       via  8217b623472412d35d5b90445dadc3d2e2440aa7 (commit)
       via  5e62b9623217fd5c23934c7d62b0f02ee6829c70 (commit)
       via  1f703d92432c1f6a9014d7f632e06493d4768e22 (commit)
       via  2aa8c8e8829c255a20030cc8dd1e02e930d63698 (commit)
       via  f35c9794b0a98bfe696e4002dc403ea76a9e4d63 (commit)
       via  dc6d8b29da25a935fb8721d1ee6242687fa0eeab (commit)
       via  b1b5ea5c54bfc54a576bf88dd74081f75f66609b (commit)
       via  c6f28c7dae471c56616783952909a64e9543e34a (commit)
       via  851e77acaa6a24bd9a50b5c4dc3923228c265c6c (commit)
       via  908d335c0e02191c46f955fa6c7d6b6497de85e8 (commit)
       via  087f0c707d2337b8d9601a003d0b5fcea7f3160f (commit)
       via  0a73aff7c63518d30b87ed36596c6f25afc01aaa (commit)
       via  3eb059190213c60a9f201f671f1c69d6eed6bd7d (commit)
       via  e5699648000facb8138b594fe271fbb27296fb72 (commit)
       via  2e12798cb90f9d603285c77ee79f5f9ae658abde (commit)
       via  1936aaa83cd7d645155a6e21a68db269d5f68f3f (commit)
       via  1e18d5d0a71ef4152d1a90718ebf4b06b6b5ba56 (commit)
       via  1321be7068464238d1c626abad0f52cb1cd6cba2 (commit)
       via  02742f0f6ee02cec94a033a446b4a36d90859aca (commit)
       via  fc5ac9a1e1573fa286da745491daaf373271578f (commit)
       via  eb147a19783b1cee960502697124e68e4c109df5 (commit)
       via  47fc204c850dd547d8d8dd28bdc07074d9179626 (commit)
       via  a4c93e4ec667745b5e6277c3ae95d5e5b38e52b1 (commit)
       via  7a7fc5659e0be4bbfc4dfb7b3fc9a45e5fb8ef0e (commit)
       via  a2674559c6840338c9591ee26884aac0aad167bb (commit)
       via  680b8fb775c3d68058b58eb5501e232159e92bbc (commit)
       via  ae610ad30c7ae239b046c2ca023c74db5b4dc6c7 (commit)
       via  deb4f3b66a082684da7cca051ce32b80abced2ec (commit)
       via  542a22a1b2f7b6328ce7d9e6892d85f2ae1646b7 (commit)
       via  f570885382e0a37fc8f2c7fd2e63b5321e0b5612 (commit)
       via  6ca5ab0d009ca3edca0c6852e53ccd22c2e900c0 (commit)
       via  9ef5f5ffede710fe01cab5e4a62773a763c2eafd (commit)
       via  30f8ffc019653ba9b0ab47deda155d0efe660c8f (commit)
       via  0f0c60a48899d1328f7094ed135d2a83bc07e27a (commit)
       via  dd424bd7a35c3335a7d96c6f38da5fa1114d73a5 (commit)
       via  e9e5d4ac2d8ba980211303c9b1e16c3199f34478 (commit)
       via  920781c510b0219d44eb3201a9e6373f1c9b50a9 (commit)
       via  bf1d029660136387a9fd4a451b230f954a81db5c (commit)
       via  b50458a6f8766aa2369995f8f664334f97f94a23 (commit)
       via  ab513a9f2bf257fa66a1f6f09f6b6768a216c45e (commit)
       via  2d448707a0b72421a74d4699f951a251d47738ca (commit)
       via  68e69411324c7d79a5c274977785d4b3cdba910f (commit)
       via  670146aeb51fdf3063c3e479c761a921a7053700 (commit)
       via  63796a15ef7d6cbff0fe734f8c293368183d6516 (commit)
       via  fea854ed044c3bdb3f7d85fafa35e1d17a9e63fc (commit)
       via  b67712acad6d2b0be448687c76e69a43b71e27b4 (commit)
       via  68da6ae8ce04258668e63aee320011c8bf130d18 (commit)
       via  1e6914a488ba23c9a098510d100de7cbe6edb79d (commit)
       via  70a9da6a32f9dbb14a7133c341ecc2f1d9b76f59 (commit)
       via  8e4e230f603e689c2415e1a621eafebb7540c6b2 (commit)
       via  7fd7a7d1560a3181a98118d7d8869e8c78ea2e8c (commit)
       via  d6e4affddfacf8be419e64eb7ec50833f695a290 (commit)
       via  6bb66ae324675b21e07c0aca297458ae787c95d3 (commit)
       via  955eccc6c890186b8e94be35911c1dd82da4f6b0 (commit)
       via  dac62e3f0f6a2cfb0e6207dba726a15966523e47 (commit)
       via  d5142f9c881d45e3afbf790b2f9475869fe04b45 (commit)
       via  c92ac83b1329e8e2c24ff25974993cb4d520c2e3 (commit)
       via  dac36d3ce5a0909477fe9c5efeb0199c6631ab1d (commit)
       via  90d328715bac43d0e0568d137602d7dab36c29d1 (commit)
       via  4a187a50b89839f823f174256afa0903e0040a97 (commit)
       via  f88a6ca185c106aecf11953b044acc7ae40599b4 (commit)
       via  5d51a65dcc7087ba2f5db5da3c16efbff3182cdc (commit)
       via  712c0dd4676bff9a47d11825ec59061fcd1e3cfb (commit)
       via  9644ebc6bc45171d97dbbe4477055acbd91a44a0 (commit)
       via  2c2e5b4c334e7af191df3b6dfcc82001030447bc (commit)
       via  83974491df282581b9d5c4ded42153043ee53a8a (commit)
       via  48a53a53adb6deb0246092befc0636b588e8d04d (commit)
       via  0ab2e466557486162d83f9682c035f434a26bdac (commit)
       via  34d2d2f08ed9891e50fd99d35645afdd038c5402 (commit)
       via  54932fd5e6957feb7a29f1e7e2ca68aa3b21ea91 (commit)
       via  afe776121aab4a44fe8dffcb7c8949c015370f90 (commit)
       via  80cafde38274058f6194632d2719e64e9446f488 (commit)
       via  916b5702472d1282c6ef8895503cfb72a71b8113 (commit)
       via  978b6989d59e31c516421f82fbca64b99d48f741 (commit)
       via  bfebbd11f941b2a6c78014d64333a9c3453f62cd (commit)
       via  2733c3b4bdd553e0fac6ae53dc64ab84cfc908a8 (commit)
       via  9dcc72a3121457bad5c01f29bb8ed96a3df34a3c (commit)
       via  968fb0e9528f1bf106838a1d8ca1219fa385df99 (commit)
       via  be569feaa4dcf1eb2b906f730a57fcd1df8ad508 (commit)
       via  6bf2c888e0eeb7db4da4b50eefe055ba8b3060f4 (commit)
       via  8061d84e54c81305fa3ad22e20de9726bec82909 (commit)
       via  7b6ab07442b28a62389fc4dc8f35276f31348c13 (commit)
       via  b96d850ae6e35ecc96babc232aa7622adeece0ee (commit)
       via  6f8f38cfbe6ec39e3677e0276235b9c7a2ac5fbf (commit)
       via  85e0679093b6981aac816f4fe05ebd8b0b654cdc (commit)
       via  0d8a21a9e6d762934a32279c25daaebe1b4eb56f (commit)
       via  34c3fcb525bba3510c5cdd9ebd5311632162a35a (commit)
       via  cbfbccce3e2e56fdf2a5844e6c73db2cb3099a64 (commit)
       via  255e7b7a585001d830e0bc4f69528ee26981103b (commit)
       via  a3988aeac8df3c9b4c1f2ea705ef96f00ab72ce5 (commit)
       via  96f2b96726cf7049e4026f51df52d352809b32a6 (commit)
       via  3c91fc9a36fb802e05d47308b7e0f3ecf3bcf77a (commit)
       via  c348cde4decb1f22a2305742cadafcaf0dd70d63 (commit)
       via  6b7d31cec24b71073920bda28ec5977bed6b8e46 (commit)
       via  4c24b18bf3b985598dc05563de14636a2fb3cd2e (commit)
       via  2c7a5de21fc02b912a508991716fb1c3cbb95a06 (commit)
       via  07fe4bf9d8359ce21ce946602ad63c4f9337200c (commit)
       via  7b4ff744970b3c9cbb162417f60f3085cae75343 (commit)
       via  33bf1903819b83a31fbefe77781b5d187c6f03f7 (commit)
       via  4f73c9f767c8fb623e0afc1b89f775a73734dc76 (commit)
       via  26c19e64489a5cade2aecbfa291176c9db9d250e (commit)
       via  62cb9a4f4be71d740ff412f0ba7c7ef29feaa8a0 (commit)
       via  5a46e0340900136d66dee39450117a70a4190d45 (commit)
       via  aa3ad84fd24967756cb031c4f3529198afdba900 (commit)
       via  59b5f75f6095f40d3316cb2928ba1d1f30ab15ce (commit)
       via  33e8c5aedbcb397954455761bee62715737a309a (commit)
       via  6a5482fcf190641eb46e00fe877ea1e31f241488 (commit)
       via  15a345934695382ae1dccf6f5c70aaceaecd44de (commit)
       via  6af0d20f95e905eef190abf8ea442bbe018171c2 (commit)
       via  49774dc0f635231c09372abff9d8fc31a91e39c0 (commit)
       via  96048c03b654317cc00fbd174c5095ab68ed6a62 (commit)
       via  5ae564e399bec2cd095ecf0adafef168b83b0cc1 (commit)
       via  6b53cb6bfab7d903e5bf72bf2f0697be335707a8 (commit)
       via  01dede4422493957c23b3bc7ecfe596f93a58a54 (commit)
       via  13b8cba6f99cb3cf9c93065832760389a7962963 (commit)
       via  6b22deff997b02052f4315777ca4ab4b64b8d8fe (commit)
       via  0bf20ac342d7d4e2eaede58e110faf356e34e167 (commit)
       via  3b0c8d59b79346861dd48242672b7aed7f863c9f (commit)
       via  942379cc3862ca20003ccea44edff90e6a13b314 (commit)
       via  986c68e702f191e05b09e580e6170502b4acf65a (commit)
       via  2aed42f2d3a4aeb938408ffc64859def583b25d5 (commit)
       via  feed175be52b073541b607f07059b4ea17a6abcd (commit)
       via  d76b503883525aaab6048102cbfe96bbdd9a0a85 (commit)
       via  141f17ca87d007fdfde0da85475dea7556c636a0 (commit)
       via  12f48fafa9643fd497c958545f2990d2bfc6abb1 (commit)
       via  b90c228f7227598bc5b5c5dedc4154189faa9150 (commit)
       via  eeef872d6ada65684fec203c6ce585d5872f8e27 (commit)
       via  0fea91c27930b7d06e2aacc7ddd34420a7665859 (commit)
       via  95bbdf168467b0aff919f3fdb763a9662ecbf634 (commit)
       via  d583aa66634049d78dc6e04e1774bbb4fe437edc (commit)
       via  eb70ceabcc97910c61a93f6597abb4fba60c1a17 (commit)
       via  d15f27e30da26bf6d39538b17d4a8d5560a1551d (commit)
       via  edf2c191790d31a4359b0b380bef351547719ca3 (commit)
       via  25917d6ba3350de974f432498fa82febb10e9e11 (commit)
       via  fb8570413625c417aef963f9ecf6af4bfbc846f7 (commit)
       via  49c6deb45fb4f919428974822a98f06020992c32 (commit)
       via  061cf14019af41062cfaca2ebd97f6a460de3bb2 (commit)
       via  d986a8006ff7ce7fbe6f50b3242167cefa94448b (commit)
       via  92efa457efce86a1b9c4dfa928d6c9e37c0736ea (commit)
       via  8d21bc19ee310898e5823e00de04add96f66c9b3 (commit)
       via  a0e045d60639b630b06214a3f05f9f353ed73a63 (commit)
       via  d6186ffa1f4b9889f2b30fd52fca1b26d2cbf3af (commit)
       via  87918bb4fd5b4a9d93e710454525300f372c9057 (commit)
       via  21e109d87e24c23dc88f39294a8fb0f83151f192 (commit)
       via  69513875e7847a5b6b89ffb58721daee9a49f06b (commit)
       via  2f16c2e9bb84027e6b42d74f7906db5ccdcd086d (commit)
       via  531cc8718179f1bb738d5d1baafdcdfd419b0db3 (commit)
       via  395e5abd368bba4ecd6a1934ad5ceeebc73ba4b3 (commit)
       via  7ad822a39190682bc159c2f9c21c25a4273d037c (commit)
       via  f02ce8d9f9c1c287915a8acef067cc2e30875b05 (commit)
       via  7c0d9cbbffbbe11bf1d863b7fe2c63cd6e86b584 (commit)
       via  2b1609fc05d829fa8bf10dda48de81396515ddc1 (commit)
       via  08ebcd3a83e37fc1522a11bd906e6c802b022468 (commit)
       via  b39dba3923a103103387e099fe4799e080edadf0 (commit)
       via  942e4424d5f3a0d954fd9118e2785bd54fe95aab (commit)
       via  c408beafae2ab5909bfd8b04df1ca93aedc6b5e7 (commit)
       via  4ed586c011158cb60ba310fb20604184c5b25ebc (commit)
       via  0f4005f0838abb58e77a5a352225efebdb28464c (commit)
       via  da7f6125bd8dffa08c10a0fc7baeb812f8c6aada (commit)
       via  fbb398a168fc2387814c419fc44bd24114f10d7e (commit)
       via  475fe6935b26ff42cfe7b88bd87cf0563a7c866e (commit)
       via  9010c3f5eb3b1adb2d1b6b95ea7bb13c2f689287 (commit)
       via  a22e2cddc790290d62d115c5e6b83c5f9186d4e9 (commit)
       via  3dc39576936d18aa897bf955ab55916f61244a36 (commit)
       via  1d6b98c76cd6e64ce1e67303db13d457ae33bc4f (commit)
       via  3a5f0a8b5e9d3116718cb55c1c0e46195b53a2ca (commit)
       via  d555ae188b43938b7d1742164e9ae774382d4edd (commit)
       via  fac422c8914f14acae106338ddd6efc0297c49e9 (commit)
       via  06efe9c467768a25c374b5d47dc8f1412874352d (commit)
       via  5d2a076684b303de8f7ad14506e23d251ce3e5d0 (commit)
       via  3c5d9e8f2d52ee108d6d8d885ce8856da8021917 (commit)
       via  e57541cb67682c1eb6c8874a20a06b6aa9ef1b9d (commit)
       via  1c8d96d3c8aee3c360d860fcfdefa1ba74747055 (commit)
       via  8322f7e252c32fbe5dfac94305415cbe7c73ea34 (commit)
       via  a7d37f153d2f5005c73364500f9fa2bf15e2c464 (commit)
       via  082028c1dbb8e23e3a7b32ebaa3d92321b55cb15 (commit)
       via  fd22dca159cfa10ecbb822d0dd6cc677cf333aab (commit)
       via  95ce684f09a47df6fc165311c5372066e0e28f9f (commit)
       via  95b717e8bd43406afc81bc5f6ebeef8b81da970c (commit)
       via  c0db5be20282013ce1697b8f2512223d75d3efb0 (commit)
       via  1d77ab5edb701607bbea2b8a9ac27d8195ad3e6f (commit)
       via  feac65b70b29c759b99ebdcba81f93b9450f401e (commit)
       via  50427eb4a86f3b9e05ef512f208c8a42a34a0084 (commit)
       via  0fc7e23fe9fb5fcebfb22ff56d5c64c9030b3dc3 (commit)
       via  6d0cfa312e825753c07fbd00aa0da5810302465f (commit)
       via  6366a170d89eaaf6c3f119dc999035eb7d5a5800 (commit)
       via  34ca92b99405c5d0361a64a2eb9a70d0f6f0c3cd (commit)
       via  076f8a295193344e77e1f9e37a908978688c3600 (commit)
       via  05aa7398db64e97090b0ba5fbccd4a31ebaf9c8c (commit)
       via  d47433523cced767f8c48fa39aa0556d552d323d (commit)
       via  478d8f99b33b22809f7e04245869a60507e8207b (commit)
       via  aa9a269b397af1c29de1f1fa40bd36b8d2759699 (commit)
       via  c383211ab93ae36b3d9485da4101852db74ce0cc (commit)
       via  d86a273998952c09a569121c252512556b00d985 (commit)
       via  6050166bf1898b9ef1aa8cd23e2f88255c7d270b (commit)
       via  e9d5de54179ce6d40c62f5bb26e281748b6ea719 (commit)
       via  c23bfd88a1c6098ece130af225b0dc51d69b84cb (commit)
       via  e09e0b9105627b4a855a7df0d41e471ff4b7f6b9 (commit)
       via  1d6463069d5cbdc68ae413ce52947e962183033e (commit)
       via  0283a956cd5f0a4522e2c3f1fa7155944464348e (commit)
       via  0532535cad4197145cef54918b641e373629b264 (commit)
       via  a33290b3dd6726e3d8c09975053e841338ec2b67 (commit)
       via  5640d721dcadaa181d5432bf02bee4064662cb12 (commit)
       via  9dffb4d697a1559646adfaf3b3f51596dcf96359 (commit)
       via  06b839e41b255cee3fdc9eba01d94db888c37181 (commit)
       via  a5e77cacea50a8ff2b9f2805f466d51c2813b449 (commit)
       via  0536a861b2bad9563b729cc36145b2c9796c681e (commit)
       via  d905a94e6c749821aecc889d08e07c94f5354c40 (commit)
       via  7069a8b33278ef1d031a4d25482b3a6767e665b8 (commit)
       via  3474cdc9ff394c7b01db380c4ca2cd42620ff076 (commit)
       via  50fc82ed3e063bc456c491c074bee905f98bd22e (commit)
       via  f20b389a8b3a9378164b57e5681bb0dcf74dc8bc (commit)
       via  80d2f4a1904586949a91228ee811b1470de820ff (commit)
       via  c4c1aa2d708ceb4c0f245a91a0e28a1ddff16c2f (commit)
       via  5fa4dafb2a0b8fc8133697526a869cecccfeceed (commit)
       via  882972f8e2699b5dacc4892ecda43f17d8c1b558 (commit)
       via  a205290825e78479e4202350da867e2efac7b2a9 (commit)
       via  5e706943089ea0d1a9563572d6cf6d869ca0b889 (commit)
       via  ef46fa2f5ad4152075892ec4f6951bf2c918a8b0 (commit)
       via  1456186dab6c7e9384aa54d113b2e1ad0aadc2dd (commit)
       via  a9a3443097080f8f9855382e75683548f9d7a574 (commit)
       via  f4f5bbe6f3094c3817efa63695844a5b1dca2ceb (commit)
       via  cc2bb3af15c46a40753e81cd4a9adebe96e0f164 (commit)
       via  19a272ee9a1c7a1f2a4de9bac8e56f83dcbde06e (commit)
       via  228b82698e108071a053581a17e6b89c58fbf9be (commit)
       via  1c760b1c009b1f474b64bacc2b5e705e237ea198 (commit)
       via  1609491e95df66d8119ada02eeeb4070ca3a9a28 (commit)
       via  f90a06c1eb001d03366b3bd50699d0672ca2cbdb (commit)
       via  2bc047b1d6ba46439219979634a999c3e3be41ce (commit)
       via  9a88bf663b640f2960111b387ad572ee1aa3a7b7 (commit)
       via  b67240eb097e5b1ef2b76492e07dc706ee5103bd (commit)
       via  b638d1355fa5e685e0011196247b81a875dbe523 (commit)
       via  0bdcb49a98a4d57a2daac9945d1623e39c3c8a91 (commit)
       via  b9ddbaa09383161fbf1a35de650abfc19f94f001 (commit)
       via  9217054b5bd016069548688ebce64aa4989a127d (commit)
       via  2f7858071d70af52550fbc3375a7f0eee8a5cfc7 (commit)
       via  6fdad1a63b7c9d47c8d04d563bd19ea1cc2a9ba7 (commit)
       via  51f1b0da3a8d1b976455ca285e03aab7297c7bbe (commit)
       via  c69843e76f44f2ea4e16e5a3f5e81b7ee26705b6 (commit)
       via  c62bac667b522af9bf8b05175278e67e9b073d09 (commit)
       via  2525b56bdeebf8327c49b921b7a1fefaed45d087 (commit)
       via  63c34882ee4216d688f47d8f357d0a75e87fc521 (commit)
       via  0e444f5394c435dc55a9ba061224b6a6040042f9 (commit)
       via  3360a6b0e565e8bd9e1974571730987637140367 (commit)
       via  cdf8817856cdf9a91baa95942241b05fbae452b7 (commit)
       via  e7f1b46eed49a4b5a7d39c86274921e199569290 (commit)
       via  726ecfbcc3b0c3fd29790e351a407fc65190c826 (commit)
       via  b068a03c2cba48e93c50376d02cf6cfb6a70e72e (commit)
       via  2bf3a3f3f7d5108b8b0c6eaa240a3b4c5d1220e7 (commit)
       via  38a9b5f6de49d54651700afd5846016f8a85cb42 (commit)
       via  4c2ac16252f10261ca7aa4db65ee6de881d7cfc2 (commit)
       via  6d02a1ea235fff510c5d022d82a8cb5ecf5d8025 (commit)
       via  066054406dd665a3709c1d187723fc15efb874b3 (commit)
       via  8b419dd7b084dc4481ea7c581c7cd173cd1b7a0f (commit)
       via  a7acd6bbef482c67e03a3c0ac2878ae7af60307e (commit)
       via  7910300390dcdc2a7a4bf67d905f2fe10a7ae588 (commit)
       via  20664697dcf4a2eabba2b1831b68f9a713d106e8 (commit)
       via  85eea96a3159c41b6630fd26d6f090484a131460 (commit)
       via  ad748b8323dd2bac0dd61ac17c72ad363c68055c (commit)
       via  6f00e5383376ff8acf2a571a1a979a4e188fb9b9 (commit)
       via  23b41dc75e1423480e5e40d4076dbd36ab7372ee (commit)
       via  05e77ab564bd7c8ca73962a46818e5ebe4db65d3 (commit)
       via  834dc3a98272e7eb1869e2a1972ac14ea45e0ec0 (commit)
       via  405477b5a2ea6d79c30255db14dbb59b84495fb7 (commit)
       via  3544a43c4923f767467536d02abb511d7e04ab2c (commit)
       via  eb7adcd2b2911e26792000bc89e09894b182f323 (commit)
       via  c5b255bacb70ccb09b923f1a5acb4e6abca88385 (commit)
       via  4cffe41f88d2cdb9df4b0ec04c15fb4d73d93c8a (commit)
       via  a71a5686d83f58b2f50f1fc8b4b005a61d8ab127 (commit)
       via  8c8c974284b0feb9d8f060d12d79d0373bb38dc4 (commit)
       via  a297a16568c8749e770b50a8910ab833d2837592 (commit)
       via  ed2c8bc8d83137428ce1976061d199768c1917eb (commit)
       via  a7d14dfbd4bbf58e03b007cea9e97d1c47f17c7c (commit)
       via  b9ab6dd38be370a76db85c32e0c0ab9e7189eed6 (commit)
       via  48b2ab910b1f7c5ab5a86a428beafcf42b39427b (commit)
       via  3c9e7acc221607e2bfd9121eaccb39b465c8cbc5 (commit)
       via  635a250ce47ad3a967bee1497b66af4fbb96cb60 (commit)
       via  3fe9baba0f1645f69bb5b404d4e580f2dba65bb2 (commit)
       via  d47051ef10f0f2bea552a8084edb70eff779fa72 (commit)
       via  7e7a8a6497cbc2473a3e25dd1067f2d44346325e (commit)
       via  89505905738a5645963b8d0f24daa7a857203aca (commit)
       via  7cd2094693437d3d7fbdb69d577758fe1d6e0900 (commit)
       via  d40b95dca3b7b5f03b17772ad8367690d030e5e8 (commit)
       via  5f2cd97d68da0164a7a58fd30223fb04d639918b (commit)
       via  738d54fdacf323645cd51250fd1a87a9c8fa6038 (commit)
       via  fc322f55a8622fab1650b4587ec35467f1152c2f (commit)
       via  8b89266e7f8b5b1d396c3f6ad4592038f69fd7b9 (commit)
       via  2c97b1b489e0b393a20968af6bbfe4aae163fc0f (commit)
       via  de054cdf2ce074ff005fc03a30169f22f739d68d (commit)
       via  64ef2cf59d363914f995c3b227b21d9dc7210726 (commit)
       via  f9313bc5abd69cbb1d6dea36b8906ff4af1ef822 (commit)
       via  a5a1e7f88b68b4513c12d23051ca84add3c30791 (commit)
       via  28f932436195d91dff2e7c7f3f589b914b55acde (commit)
       via  3d6cd2896c637a24a9c125ef81506d911c3087d4 (commit)
       via  080d362b919118033d054cb80b85cffc6d94cab6 (commit)
       via  3374fa0fcf0cce492762f5bd0d0392102ef36f21 (commit)
       via  0addd6920277f4188380eced71a753c94ed84615 (commit)
       via  a5fd43f68311ac7957f4da83987d245dcd735e26 (commit)
       via  d4dcf5037fd4ed867fc28f2f9f8debc366b742a5 (commit)
       via  c91fd0b7ba8fc6431ccd4e53371b15e2915caaab (commit)
       via  7c88261173f6c8ea1e113d159e04595ddc660626 (commit)
       via  b2e378017346e52a0c0a810fcc2212b0d551b414 (commit)
       via  ed75689e10bfa552c0408754d1b8dde40aa707aa (commit)
       via  488a4f236145085ad98e0e06d7b1bd823be8a8ca (commit)
       via  fb7f5039ab30dace3e73aaac9e2af62926660da1 (commit)
       via  057566d8f0da573e10910c8b5f740e7f8594bcf2 (commit)
       via  c65a679d59426c17fba6e4d2e49f8dabef2b9f26 (commit)
       via  d7d84c92014b480bc8ba11d082efe6131c68d629 (commit)
       via  013981827ffb914bb4d17a198b13ec7fd524d16f (commit)
       via  df9f6bf48ecc1459bb9fe5a1f1921c27669fbba7 (commit)
       via  c712ddd9710cb59565e8802132d1dd387bb05eb6 (commit)
       via  2f89d222178904ce5ec956926db73d0dbd44a21b (commit)
       via  36a58826182f44d25e765816c6a51c3afc8d3f12 (commit)
       via  49ac3def6a658c77b113cca89925ed91700c61c9 (commit)
       via  423f2f8bcbbcc5936341521d9bf9a352cda994c7 (commit)
       via  1b194c5ea3b0535e890406d70967857b7a6b1018 (commit)
       via  12cf69ebc08277cddec64083b5d016099d16d688 (commit)
       via  633f37600999b5736443e6ad3d94edbd29e55184 (commit)
       via  ddc5c084bf1e2736e5c6e600ae40b29d953e84ac (commit)
       via  993c736280f3c499a551b407c856e8548463f5bb (commit)
       via  806be7d035f8b23fad90bca4cee4a5ff76be4576 (commit)
       via  84e5d6d3f2f71b7170893dcf6a5c575134b34f78 (commit)
       via  251226d81592a946acfca6a8ed2265476853fb2b (commit)
       via  ba1e3121c1a3c360150eb2a7cb1d53d879095475 (commit)
       via  ac2652e73581bc8b250e572e13137cf69a3a0968 (commit)
       via  eee3f059062cec0e2c9fcafa8f4ad711ae959509 (commit)
       via  88c5437de865d8d5574d12c1ba6256743987efc0 (commit)
       via  9e44e6449112c79a4fe097854207ba52dd17d391 (commit)
       via  a46eda3752054eccd208f630611fefe0308eafc1 (commit)
       via  1e3fc905b227741b6e96f8d9d11584555a424c50 (commit)
       via  f0b5f34eb1dff040384df17daa92ae95c8464482 (commit)
       via  b205636eebe09a462c7393c691ddc0a53ebd14d1 (commit)
       via  acc93358b841a579393c0e037b2a702952cf82e7 (commit)
       via  80bbbbd980036b67d4c5598c331dbabe94dbfa8a (commit)
       via  a06fad53c65346e8b209de31b3a58c1b3fcba1a2 (commit)
       via  3f8c6cc89903355bf3dbef19a4a94070229c69f3 (commit)
       via  bdbfb77af3c0618b319d328d4af69299182de25c (commit)
       via  edf8133ce62cb049789e34e1eeb611052fb409ec (commit)
       via  317e17b77fc8a3daca57fb4657f7dcc15e7a59f5 (commit)
       via  c29a74309cb1c1eec814a2bd8f453ed6b6bb3b4f (commit)
       via  02a8fc7c5064868abc9fad0a70b9785c6ebaf4bd (commit)
       via  4fa248abc6380eb4d848707c975d633c7c6801db (commit)
       via  bd322a8535f5ff320dc6852765d34a769c2d2140 (commit)
       via  acb5a214c900cbe1bdfcbb59c063db741856e6eb (commit)
       via  deef1c3bc249879e07345f7146ab09231dc65648 (commit)
       via  736bf0144f7b540d391b56990077ae51d193b3c6 (commit)
       via  39a6752f0a0bf9678299f30ec00d0279ef77c8fe (commit)
       via  0b2fe01376047225c0c0fe038baf9db37c1701ba (commit)
       via  fe3444ed758409312652fbea0e115b291591c195 (commit)
       via  5b7e329e406e7b53a555af3fc4b34ec0c3dd42bc (commit)
       via  b32c26f29b7c18814714370b516d6e49cf9f41e9 (commit)
       via  f4e313b305f1975976a608c46bff2e2b07d8c361 (commit)
       via  72e0d8f3b65b2071937e35ba4571684c204f7660 (commit)
       via  3f2d21795e8f70399ea27649ca54cc9080f2825a (commit)
       via  1d9dbc3e8d012c9d023a3ef96cb625d424a6fff0 (commit)
       via  d32c553430f0e2e9807ef7245d26239e075a283a (commit)
       via  1c914a574432d1f86f4f9c80c6c6c112955841ac (commit)
       via  18da293eff7612161d2ae31fddb304d208d2904e (commit)
       via  8781adb9f67b421873e3c4a9a92088f65380ed7f (commit)
       via  a4e89e7dd3f7f4cfad037cd4392b91fc22892f6d (commit)
       via  a190f54853f2c5c4a1d2403ae0b18b588537ae65 (commit)
       via  206f3bf19c4384591b50888bf0d4859ae985ca6b (commit)
       via  58c45a2004c5b4ae96ed4cd5b35785dc22c55875 (commit)
       via  8784d11e9d9675f2d430688165ae0617ed957bfa (commit)
       via  b6ee460304679c2d2f39a28004b9286b8ecbf8ea (commit)
       via  8f357634a0d98258f9419cdecdf208d906cd69b0 (commit)
       via  8b0f11b32ad032af887d3e783f6e01407b96de1f (commit)
       via  37b0aeedba10f06a079228a576a813536d188108 (commit)
       via  77105a60057c789a6c4cdae8c2c44c9960837756 (commit)
       via  2d037407717bd2d4d0a000b72b74887a347073d6 (commit)
       via  7304de33a6e7968779e6a6d9ea04309f53bb8471 (commit)
       via  f3a5d05517c8f60cc515c835cc15cd86e2b39abd (commit)
       via  2e6a7406859301154d81472b4a94f0c17411ba29 (commit)
       via  b5e533390ea8c3d2952f5a5c57a514274dee9fd2 (commit)
       via  cb23608ac99ce2b62f53f5100f19d1cf8607423d (commit)
       via  8664afc28e9ed03e0f50be76d36b010925bd0d6f (commit)
       via  9a68760e4d3651f66080717568f2517dbadb52fd (commit)
       via  0e6c1d223906537af7480bf623904121bf88a0b2 (commit)
       via  b06239692cb5808af5834b71a3acf45a1c763888 (commit)
       via  733cd3d8445f65e25ec8bdb507fa6dda2dbcb985 (commit)
       via  498bb93fe6fcd255959990c411a438a2d0cf1fa3 (commit)
       via  d402d06c01d3f065ce7d2c0d05885d1873dac410 (commit)
       via  bedc81d667c6b0d9dc65875b9d1fa453a134e540 (commit)
       via  928b446009f9c9abd47b41d7075d1113b7d9b369 (commit)
       via  d72613b0ba14ae421daba80b34547e9a970a50b6 (commit)
       via  cdd3cf335605dd91c65c4e6744efe9c94854e9ce (commit)
       via  3dffb015de25fc5cd79134feb9b94cbc8a3f4994 (commit)
       via  1e460312d79fe15170e7519fb785e132ac7293fb (commit)
       via  657ba885946a20a43dd556f45b8583c5bc016ebe (commit)
       via  b191caac0e3ddb749d552565e4804d93a36b470e (commit)
       via  4555c818e5ae6a90a8116e9c5b5b1ff6a65929c0 (commit)
       via  f7adc0f46ecd072da071e5d6f166988e4288285e (commit)
       via  d3369343ca79dd1fd112c35eaa20f65bf43cdc02 (commit)
       via  0c615cdc89beb544dedc7ee665e9e68e86f3468c (commit)
       via  bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f (commit)
       via  c371d52f338cd511361e27347af7ff7678ecabc8 (commit)
       via  e1181261dfd80b3046f1219e8fcfbb99707288f5 (commit)
       via  d3134dcba601c678a932066a99d1c91a56fc190d (commit)
       via  86739cb38ddc8f0c30f51bd24ebf2c45c0584dff (commit)
       via  450bd4552836caf7a3f562532efddf9ac775833b (commit)
       via  6da46f316146c3c6c5ea1741a69e16ecd40620d0 (commit)
       via  98d4fcff80f6cee71067be96f19cafd30c0e005f (commit)
       via  99d9b7eab9d01b4585ddc03c8c99767bb73e061e (commit)
       via  145c2d0d024e2213a5c833427b4281fb55001709 (commit)
       via  f6b05bd1bce89168db265d8464464562c54fa72e (commit)
       via  f19b07647af068030866b7bc94710e930a6fccb9 (commit)
       via  6edafbb503ed5d81f963fb8eeec7595c8158d828 (commit)
       via  f133e575101d91b1160a40c1846ef7bd6d1a6bf2 (commit)
       via  319d2c66df5240c9231f75f40d77c89cda4df87d (commit)
       via  973c5463aa0f8f1eb27cfdb0f358989b704618bb (commit)
       via  333c18a898e9042938be0e5709ec46ff0ead0797 (commit)
       via  c3eab9af747bcb32d477fe242f6fd19d65fca323 (commit)
       via  ea1a4174a8328f0bbd6afa0110ac4e9dfafc1b71 (commit)
       via  7b0ff55f0ba84bbb4fad6e2af4d1c3bf03d6cfb8 (commit)
       via  35597a759c91a414460eb8d4f9e138a64f317944 (commit)
       via  27d06b631ca93d1fb9fc3a21013c8fd096270d9c (commit)
       via  452bfacee9fd543eb87d1bddd4af106142e12778 (commit)
       via  1584b61754dc50232be326972035102bf4c716c5 (commit)
       via  d76d91ae1b12c4730dc897cdb25a1d41af499ac0 (commit)
       via  a5413de9ad483b1094eab71636ce4b6fee3b0218 (commit)
       via  6da812929950242d5647e6e8742653bbb6aaa781 (commit)
       via  f60e9ae2043125f1db170a5dd0e18546bd92303b (commit)
       via  adba8e96113e4883ec568babd14709538fc696c6 (commit)
       via  b30c520ee85b91dd8a5afa5296b83e0ec578c53e (commit)
       via  a70b489a1f96539ce2d19b27f899ad74c04f500f (commit)
       via  521dda8c24be40219aaff2611ec30c8501494389 (commit)
       via  95f2b76562c4358589c9527a622b905d024cad1d (commit)
       via  e1482fda4a5702348a5cfe726c9ea8af476450ad (commit)
       via  d6bb3cf28168727af9abb1546f3bbdc31debe534 (commit)
       via  33a8e710257bdb9a61093172158af3b503febb66 (commit)
       via  81e3ce9548ad55f86b042b0dbb32e62bdf6314d3 (commit)
       via  5b60e261504f2d6b180f14462cb8f37de2844e61 (commit)
       via  409b9c86d93bb42aa73851a48e26c5ef13062acf (commit)
       via  0fded1fbcf17f321ae159aa828dc01da92e49f09 (commit)
       via  eb8aece54c19af2dc88581f549477211b7e3d60c (commit)
       via  f8ba1f4fabc5290d78c10fbaf2d1737939d42242 (commit)
       via  67211bd93c06b64f7a58fc266a8f9dcbbf24b2f5 (commit)
       via  dbbcbfc98b50ea2ad1f3be75e4f3719b316e38fe (commit)
       via  5b76e39c947d9862f786dc0eeb86553f8944dbd9 (commit)
       via  09cbcbb33ae6eb9f72b1857931f4b3879df92514 (commit)
       via  16fef95d4a990935f8257cb89df0d36846d1179b (commit)
       via  8426abf367684205515a97953e862d28855a1749 (commit)
       via  2f9c8a78fa5da49a4974670037e362a77880e6ea (commit)
       via  eacde18ac1599b10a5b4f8fcc8ddb6543186a689 (commit)
       via  dada4b40410bf0a8d00d8b27facec2cd26c8aa39 (commit)
       via  f74062b38c05dcb9c187601ca922d9091ebf7360 (commit)
       via  b0f2ede9807465c3238f40ea00d7355f9de90856 (commit)
       via  dd5ce94c457b8282b2da4ddb5e0fec7b8c9df20f (commit)
       via  ba70e3a70829f51f90848d13fd27c912d3c32b02 (commit)
       via  1eb0eb40db233d19eeaecb1d79eed534f0740ade (commit)
       via  f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e (commit)
       via  4d3079b085f1de75aa9a8bc91d8a63232bd89619 (commit)
       via  ccea7069030cb2c9bf5ea1acb130a645dde36700 (commit)
       via  7365964c1567882cb72a2a53ad58f5f0fb48a545 (commit)
       via  219d3bf74649699272897f51086708454a972186 (commit)
       via  676eddf7d7870f65bd8197febb33124dab5fd189 (commit)
       via  175d84c07fca40170ab83ecccbfa7d4b735f3ef9 (commit)
       via  7924a789a6920a14d1c38b37a1ee45c8e5142e6c (commit)
       via  b5a44609007206e061a2336f23f2b0c028466363 (commit)
       via  6fbb707f188ac2ec7b34d379370d69d80591ad8d (commit)
       via  27ce6dbd200268735631e5f2d10eea2027883257 (commit)
       via  820fb62eff5d8409101d696eb65646a4da6425f9 (commit)
       via  e1f0af0cb15f944d890be560b318a0c13c32f091 (commit)
       via  34605b4dc68eb874a088f094f58f1e4d7c18820b (commit)
       via  54ec22378776eeba17172916006e5b7898e1edc5 (commit)
       via  6fee87c34e45ad9c91444b684d4ccd6c932debd3 (commit)
       via  edb600843bcf2f72fbac10c46e0a920c7e8ed334 (commit)
       via  6421a0c141f2b98e2aa40e2ac2f6e487869d4e86 (commit)
       via  28712ef1ec808de1e3dffcf54671b64be4394626 (commit)
       via  e169272745c2fdc18e1f07cbe3bc5bcdbb5982aa (commit)
       via  afd7cefb2083816ab1e7126e1ed39d2fd9868230 (commit)
       via  6f880d1558d240ba33afd37456755fc382b0f5d2 (commit)
       via  5fabe248b3cd23ebeb3f7382bf7dd2cf7518bcbd (commit)
       via  9d39d3f58880cb285cd35d2f67534aa322d01e58 (commit)
       via  ce6dfb3b0e56e3f742adec8d40f94475066dc553 (commit)
       via  80709460757a0858585e3275e0a06998db635f5b (commit)
       via  c6bbc452fa438f194471788db5a965f4f687840a (commit)
       via  6b824c7d470c71ec0858144ac714572faa81759c (commit)
       via  915d00c655eb3eebc7b9ca7a0b2dfd76ccc87b2a (commit)
       via  1e19bbfdb39202222d68e44db62e1c50ca7cd8bb (commit)
       via  7f4c7a88c00f822e6bbad1bcbe7d14c13b373798 (commit)
       via  73a48a428648913dc2324f8dca1b30fcf33c3902 (commit)
       via  9bd82c3443fe456fc6c81564e13595eab50621bb (commit)
       via  979fc44efcd4dbd42932974772c185bd97ef86cc (commit)
       via  7c96a2cd2144a44cfb326ff56fb8822f5be198a5 (commit)
       via  8479c9adb993b3ce37c8dc112e294a80f82b4f32 (commit)
       via  83d7976fb25025797ed1271c68e5c8c148c40f91 (commit)
       via  a700fa3337c039e8a6dbae44b08a5180713e697a (commit)
       via  057d5e0ea41843dec97359ac8649ebf735804c56 (commit)
       via  d4c5a0072e2825d77f4dc228a2348051518a6692 (commit)
       via  fcad1df725e0a143bd3e8e2f340961145d33b82a (commit)
       via  1655285990bc5ff11335b7a03e683cb4062bf0ef (commit)
       via  f7587e184a52785913eda87fbb6ff6f0bc2aeb29 (commit)
       via  bda8d57b6af0bf3dfe2524514304856a16766b7d (commit)
       via  483b962ed7e87600ee0f1581a15f747ea8195452 (commit)
       via  da765822f02f0e66b6e3b4a01e2ac08f5c837164 (commit)
       via  b853db4ad65aff6affab534a5dffa39a4a07a8bd (commit)
       via  ee2f199f0d34588276ec51af44e991e33eb6a8c8 (commit)
       via  f9dae929647a177ef65edf7113ff16b9fa429993 (commit)
       via  e49997642289f91ff9978cdb3c29ad98431f16e3 (commit)
       via  9e966db97cd932b9e4a11ac260a0c5a49aac9c7f (commit)
       via  59e07285a8e195ac3951208824d93f265ff89259 (commit)
       via  f44f0aa604ce8480eb9fad34c045362e9add012b (commit)
       via  a1d5239b5ea6856725e40d09a5599b1a38409dec (commit)
       via  4147afc1cfed700fbcbefb797ae98a7ee7e5602a (commit)
       via  3c3ff958e5d692ec4ce9b025821abba103cc7b94 (commit)
       via  d3092078407feadbd3d76e4d82c4685467d2e6d2 (commit)
       via  99f8fda56d78602c7b153c4fc823e834699624ae (commit)
       via  e75d52b19b7c2e8ba58c0332b420980f03153503 (commit)
       via  335494d7f1baaeb1ba18c306a36e15dd71659218 (commit)
       via  f68d0155cb558ada12c24fba3da4143755e4f3bf (commit)
       via  7f2d6fb3055fd21c6fbaf12842e52ef418d2b06c (commit)
       via  4eef94925a2068522cc8e1be1f507445743d30b5 (commit)
       via  2eb4dd1be0fe520f77f53be13be5dd3ff7c201ca (commit)
       via  b67ee443339114df67f64ace6b28c7adde4f4965 (commit)
       via  b211937f2106e05d6d3577bf393ae8b4198ce1fb (commit)
       via  df834b02d49220bdb3dcff82f6564d5c2c41e8d6 (commit)
       via  b3f8778bd870913efbf5799cb9a10285a9476b7f (commit)
       via  a943eec8cf4d4e6d5b9141cc06a3a7c4943128ab (commit)
       via  e3ce5eecd485e2428bab8a0c945c420ee555ef04 (commit)
       via  38064da41620ee89312d0bcff1aa5bc26c67cf84 (commit)
       via  c60c117a7868883baae56aa74022eebc3bfa00bf (commit)
       via  5480d706b7a28c1ca585331bea20a05235613ecc (commit)
       via  c0a2114a002397071cc6966d0c8832cf2fae40b6 (commit)
       via  9339323e4bda63b091055ef8dd3ab9d6f34250a9 (commit)
       via  5ce2fb20bbc9297bd7233ba924aa350b7b388be8 (commit)
       via  da66c40c6a67bef52cf4d22fd860c538cdbb61f4 (commit)
       via  ef7869eb56c9ab716dd55788d0efb32a621f32d0 (commit)
       via  b0b4caccba63b9b7b5d5516f2b23e66ac5215847 (commit)
       via  acfd42286515cc0d03df9cf947e7488891dfc2e3 (commit)
       via  9974fc21eb60f211887c7a86e03c6ffab5e8727b (commit)
       via  6893788d4797796817e7f90a6479fecd1ddebcac (commit)
       via  798a232eb5161d88bc4220fff6463f9c935bc587 (commit)
       via  2111d1d663e6a0cc70ae7fa1f95f638fb7bf0c3e (commit)
       via  10091b94bbed06fddb637313f8948b0ee59032f4 (commit)
       via  4ccd9cd4ee2792df53e82570370c96769219e8a6 (commit)
       via  8fef9e8391f113bd733d4b3c3be7140d3d14ae91 (commit)
       via  75a4471072041fdcff422076b8032c3b1dd77a10 (commit)
       via  39880d9d00baa3c8c2352aca688256816e84226c (commit)
       via  2517914f0a62b8fd21d827bb1401157eb02e2d00 (commit)
       via  d3f3013d853f36cd6fbc8f61ebecf91e5bb400ed (commit)
       via  a6a7834f03248dc3b1da1d70b40fcaf37967b4ab (commit)
       via  ba8a10e5e24c4df4bacd072ad755f295596861e0 (commit)
       via  8d685d25fe828400409f024fec00a8b58c54f34e (commit)
       via  7f3cc3e5b880554612020f9c29b04ce316a76b61 (commit)
       via  905414f823682972a515561429abd70ea8e51890 (commit)
       via  4f930f74f1253a37bfd2dcd86c9d3d598721c2c2 (commit)
       via  1333390c0cf27d5ba85192861b0d17c048dbb13f (commit)
       via  c18b90acae69f7b3791d9f26e33298cd28782ed0 (commit)
       via  c1ff56d0a9801ee70533b7f92e09260f341974ca (commit)
       via  2ecb79b74f368b4efe6e89f1b0dd9c2a69af4297 (commit)
       via  2f41d9740ce4765707936475c1c8d6d2eeef7f2f (commit)
       via  ffad481680a4e6a8f220c70f07b105c9f3f2dfdf (commit)
       via  a63fea495db54cfce8f9fbacc039e06090e55928 (commit)
       via  22c13fbd3b8e155d9a4553d7a2cf08cfec4c65e9 (commit)
       via  94121099cfe42ca944eaff6805a5404ee0234060 (commit)
       via  21c537ee7efbb11089416d28ec4bd22423896e94 (commit)
       via  98ab2e93063cda65081e639e7c082fe07790e6f9 (commit)
       via  a0a47d08dd6cc286e91b90ecd7c86ed1dd5ba8a0 (commit)
       via  07255256f4532b8efec024418ab568976bd10439 (commit)
       via  e33c68a07166f4e8d70ae230512a5f8379078455 (commit)
       via  d4c4b5dd1a131392d28d7c77c054f9b4dcc17f82 (commit)
       via  14d89bad6d1de0d8fa66d0474c81024caa0c40f1 (commit)
       via  8c8e4bcee5578658b24d394f1b0f3a39e6cd7a2b (commit)
       via  d52ce1fc9697f651b295cdabd8ebf6cff4ea8916 (commit)
       via  5619672f6719717e799f1839125bd6aff8dc4588 (commit)
      from  e9c2b9e94b0c604e6a57472bb6e7bc3fb91b22ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .autom4te.cfg                                      |    5 +
 .git-log-fix                                       |   13 +
 .gitignore                                         |   64 +-
 ChangeLog.00                                       | 2211 ----
 ChangeLog.01                                       | 4937 --------
 ChangeLog.02                                       | 3225 -----
 ChangeLog.03                                       | 2971 -----
 ChangeLog.04                                       | 1623 ---
 ChangeLog.09                                       | 5524 ---------
 ChangeLog.11                                       | 4995 --------
 ChangeLog.96                                       | 3685 ------
 ChangeLog.98                                       | 2191 ----
 GNUmakefile                                        |   28 +
 HACKING                                            |  189 +-
 INSTALL                                            |    9 +-
 Makefile.am                                        | 1129 +-
 NEWS                                               |  650 +-
 README                                             |   37 +-
 THANKS                                             |   14 +-
 TODO                                               |  582 -
 aclocal.in                                         |   85 +-
 automake.in                                        | 1612 ++--
 bootstrap                                          |   15 +-
 configure.ac                                       |  245 +-
 contrib/Makefile.am                                |   22 -
 contrib/README                                     |    3 +-
 contrib/check-html.am                              |   58 +
 contrib/multilib/README                            |    9 +
 contrib/multilib/config-ml.in                      |  876 ++
 contrib/multilib/multi.m4                          |    3 +-
 contrib/multilib/multilib.am                       |   45 +
 contrib/multilib/symlink-tree                      |   78 +
 defs                                               | 1108 ++
 defs-static.in                                     |  244 +
 doc/Makefile.am                                    |   90 -
 doc/amhello/Makefile.am                            |    2 +-
 doc/amhello/configure.ac                           |    2 +-
 doc/amhello/src/Makefile.am                        |    2 +-
 doc/amhello/src/main.c                             |    2 +-
 doc/automake-history.texi                          | 1214 ++
 doc/automake.texi                                  | 2917 ++---
 doc/fdl.texi                                       |    2 +-
 doc/help2man                                       |  670 +
 gen-testsuite-part                                 |  415 +
 lib/Automake/ChannelDefs.pm                        |   93 +-
 lib/Automake/Channels.pm                           |   41 +-
 lib/Automake/Condition.pm                          |   36 +-
 lib/Automake/Config.in                             |    2 +-
 lib/Automake/Configure_ac.pm                       |   29 +-
 lib/Automake/DisjConditions.pm                     |   13 +-
 lib/Automake/FileUtils.pm                          |   47 +-
 lib/Automake/General.pm                            |    6 +-
 lib/Automake/Getopt.pm                             |    8 +-
 lib/Automake/Item.pm                               |    9 +-
 lib/Automake/ItemDef.pm                            |    4 +-
 lib/Automake/Location.pm                           |   74 +-
 lib/Automake/Options.pm                            |  275 +-
 lib/Automake/Rule.pm                               |  396 +-
 lib/Automake/RuleDef.pm                            |   31 +-
 lib/Automake/Struct.pm                             |  628 -
 lib/Automake/VarDef.pm                             |   22 +-
 lib/Automake/Variable.pm                           |   79 +-
 lib/Automake/Version.pm                            |    6 +-
 lib/Automake/Wrap.pm                               |   17 +-
 lib/Automake/XFile.pm                              |  144 +-
 lib/INSTALL                                        |    8 +-
 lib/Makefile.am                                    |  153 -
 lib/acinstall                                      |   50 -
 lib/am/ansi2knr.am                                 |   77 -
 lib/am/check-html.am                               |   61 -
 lib/am/check.am                                    |  455 +-
 lib/am/check2.am                                   |   39 +-
 lib/am/clean-hdr.am                                |    3 +-
 lib/am/clean.am                                    |    3 +-
 lib/am/compile.am                                  |    3 +-
 lib/am/configure.am                                |    5 +-
 lib/am/dejagnu.am                                  |    7 +-
 lib/am/depend.am                                   |    3 +-
 lib/am/depend2.am                                  |   15 +-
 lib/am/distdir.am                                  |  130 +-
 lib/am/footer.am                                   |    2 +-
 lib/am/header-vars.am                              |    3 +-
 lib/am/header.am                                   |    2 +-
 lib/am/inst-vars.am                                |    6 +-
 lib/am/install.am                                  |   11 +-
 lib/am/lang-compile.am                             |    4 +-
 lib/am/lex.am                                      |    3 +-
 lib/am/library.am                                  |    3 +-
 lib/am/libtool.am                                  |    3 +-
 lib/am/lisp.am                                     |    8 +-
 lib/am/ltlib.am                                    |   16 +-
 lib/am/ltlibrary.am                                |    3 +-
 lib/am/mans-vars.am                                |    2 +-
 lib/am/mans.am                                     |    8 +-
 lib/am/multilib.am                                 |   60 -
 lib/am/program.am                                  |    3 +-
 lib/am/progs.am                                    |   16 +-
 lib/am/remake-hdr.am                               |   11 +-
 lib/am/subdirs.am                                  |   21 +-
 lib/am/tags.am                                     |   61 +-
 lib/am/texi-vers.am                                |    5 +-
 lib/am/texibuild.am                                |   41 +-
 lib/am/texinfos.am                                 |   32 +-
 lib/am/vala.am                                     |    2 +-
 lib/am/yacc.am                                     |   16 +-
 lib/ansi2knr.1                                     |   36 -
 lib/ansi2knr.c                                     |  739 --
 lib/ar-lib                                         |    2 +-
 lib/compile                                        |    3 +-
 lib/config-ml.in                                   |  877 --
 lib/depcomp                                        |    3 +-
 lib/elisp-comp                                     |   11 +-
 lib/install-sh                                     |   14 +-
 lib/mdate-sh                                       |   15 +-
 lib/missing                                        |   99 +-
 lib/mkinstalldirs                                  |    4 +-
 lib/py-compile                                     |    3 +-
 lib/symlink-tree                                   |   78 -
 lib/tap-driver.pl                                  |  564 +
 lib/tap-driver.sh                                  |  652 +
 lib/test-driver                                    |  127 +
 lib/texinfo.tex                                    |   92 +-
 lib/ylwrap                                         |   11 +-
 m4/Makefile.am                                     |   82 -
 m4/acdir/README                                    |    9 +
 m4/acdir/dirlist                                   |    4 -
 m4/amversion.in                                    |    5 +-
 m4/amversion.m4                                    |   11 +-
 m4/ar-lib.m4                                       |    2 +-
 m4/as.m4                                           |    2 +-
 m4/auxdir.m4                                       |   10 +-
 m4/ccstdc.m4                                       |    9 +-
 m4/cond-if.m4                                      |    2 +-
 m4/cond.m4                                         |   11 +-
 m4/depend.m4                                       |   53 +-
 m4/depout.m4                                       |   15 +-
 m4/dmalloc.m4                                      |   18 +-
 m4/gcj.m4                                          |   11 +-
 m4/header.m4                                       |    3 +-
 m4/init.m4                                         |   41 +-
 m4/install-sh.m4                                   |    7 +-
 m4/lead-dot.m4                                     |    2 +-
 m4/lex.m4                                          |    7 +-
 m4/lispdir.m4                                      |    8 +-
 m4/maintainer.m4                                   |   18 +-
 m4/make.m4                                         |    6 +-
 m4/minuso.m4                                       |    3 +-
 m4/missing.m4                                      |    7 +-
 m4/mkdirp.m4                                       |    7 +-
 m4/multi.m4                                        |   68 -
 m4/obsol-gt.m4                                     |    2 +-
 m4/obsol-lt.m4                                     |    2 +-
 m4/obsolete.m4                                     |    2 +-
 m4/options.m4                                      |    7 +-
 m4/protos.m4                                       |   28 +-
 m4/python.m4                                       |   12 +-
 m4/regex.m4                                        |   56 -
 m4/runlog.m4                                       |    2 +-
 m4/sanity.m4                                       |   32 +-
 m4/silent.m4                                       |   29 +-
 m4/strip.m4                                        |   16 +-
 m4/substnot.m4                                     |    2 +-
 m4/tar.m4                                          |    8 +-
 m4/upc.m4                                          |    2 +-
 m4/vala.m4                                         |    8 +-
 old/ChangeLog-tests                                | 1448 +++
 old/ChangeLog.00                                   | 2211 ++++
 old/ChangeLog.01                                   | 4937 ++++++++
 old/ChangeLog.02                                   | 3225 +++++
 old/ChangeLog.03                                   | 2971 +++++
 old/ChangeLog.04                                   | 1623 +++
 old/ChangeLog.09                                   | 5767 +++++++++
 old/ChangeLog.11                                   |13107 ++++++++++++++++++++
 old/ChangeLog.96                                   | 3685 ++++++
 old/ChangeLog.98                                   | 2191 ++++
 old/TODO                                           |  504 +
 syntax-checks.mk                                   |  583 +
 t/CheckListOfTests.am                              |   68 +
 t/README                                           |  289 +
 t/ac-output-old.tap                                |  180 +
 t/acloca10.sh                                      |  100 +
 t/acloca11.sh                                      |   45 +
 t/acloca12.sh                                      |   46 +
 t/acloca13.sh                                      |   69 +
 t/acloca14.sh                                      |  118 +
 t/acloca15.sh                                      |   47 +
 t/acloca16.sh                                      |   36 +
 t/acloca17.sh                                      |   41 +
 t/acloca18.sh                                      |  137 +
 t/acloca19.sh                                      |   49 +
 t/acloca20.sh                                      |   41 +
 t/acloca21.sh                                      |   31 +
 t/acloca22.sh                                      |   53 +
 t/acloca23.sh                                      |   37 +
 t/aclocal-acdir.sh                                 |   95 +
 t/aclocal-install-absdir.sh                        |   33 +
 t/aclocal-install-fail.sh                          |   63 +
 t/aclocal-install-mkdir.sh                         |   70 +
 t/aclocal-no-install-no-mkdir.sh                   |   37 +
 t/aclocal-path-install-serial.sh                   |   86 +
 t/aclocal-path-install.sh                          |   53 +
 t/aclocal-path-nonexistent.sh                      |   34 +
 t/aclocal-path-precedence.sh                       |   91 +
 t/aclocal-path.sh                                  |   56 +
 t/aclocal-print-acdir.sh                           |   34 +
 t/aclocal-verbose-install.sh                       |   52 +
 t/aclocal.sh                                       |   44 +
 t/aclocal3.sh                                      |   41 +
 t/aclocal4.sh                                      |   75 +
 t/aclocal5.sh                                      |   69 +
 t/aclocal6.sh                                      |   74 +
 t/aclocal7.sh                                      |  116 +
 t/aclocal8.sh                                      |   42 +
 t/aclocal9.sh                                      |   49 +
 t/acsilent.sh                                      |   37 +
 t/acsubst.sh                                       |   31 +
 t/acsubst2.sh                                      |   32 +
 t/add-missing.tap                                  |  391 +
 t/all.sh                                           |   33 +
 t/all2.sh                                          |   32 +
 t/alloca.sh                                        |   40 +
 t/alloca2.sh                                       |   40 +
 t/alpha.sh                                         |   70 +
 t/alpha2.sh                                        |   59 +
 t/am-tests-environment.sh                          |   91 +
 t/amassign.sh                                      |   28 +
 t/amhello-binpkg.sh                                |   51 +
 t/amhello-cflags.sh                                |   50 +
 t/amhello-cross-compile.sh                         |   53 +
 t/ammissing.sh                                     |   25 +
 t/amopt.sh                                         |   38 +
 t/amopts-location.sh                               |   83 +
 t/amopts-variable-expansion.sh                     |   52 +
 t/amsubst.sh                                       |   39 +
 t/ansi2knr-no-more.sh                              |   56 +
 t/ar-lib.sh                                        |  113 +
 t/ar-lib2.sh                                       |   38 +
 t/ar-lib3.sh                                       |   44 +
 t/ar-lib4.sh                                       |   55 +
 t/ar-lib5a.sh                                      |   71 +
 t/ar-lib5b.sh                                      |   97 +
 t/ar-lib6a.sh                                      |   37 +
 t/ar-lib6b.sh                                      |   37 +
 t/ar-lib7.sh                                       |   34 +
 t/ar.sh                                            |   44 +
 t/ar2.sh                                           |   38 +
 t/ar3.sh                                           |   41 +
 t/ar4.sh                                           |   37 +
 t/ar5.sh                                           |   40 +
 t/asm.sh                                           |  100 +
 t/asm2.sh                                          |  116 +
 t/asm3.sh                                          |  116 +
 t/autodist-acconfig-no-subdir.sh                   |   56 +
 t/autodist-acconfig.sh                             |   44 +
 t/autodist-aclocal-m4.sh                           |   53 +
 t/autodist-config-headers.sh                       |   59 +
 t/autodist-configure-no-subdir.sh                  |   70 +
 t/autodist-no-duplicate.sh                         |   50 +
 t/autodist-stamp-vti.sh                            |   58 +
 t/autodist-subdir.sh                               |  120 +
 t/autodist.sh                                      |  103 +
 t/autohdr.sh                                       |   30 +
 t/autohdr2.sh                                      |   30 +
 t/autohdr3.sh                                      |   53 +
 t/autohdr4.sh                                      |   82 +
 t/autohdrdry.sh                                    |   42 +
 t/automake-cmdline.tap                             |   63 +
 t/auxdir-autodetect.sh                             |  130 +
 t/auxdir-computed.tap                              |   39 +
 t/auxdir-misplaced.sh                              |   31 +
 t/auxdir-nonexistent.sh                            |   34 +
 t/auxdir-unportable.tap                            |   51 +
 t/auxdir.sh                                        |   42 +
 t/auxdir6.sh                                       |   50 +
 t/auxdir7.sh                                       |   47 +
 t/auxdir8.sh                                       |   46 +
 t/ax/depcomp.sh                                    |  420 +
 t/ax/distcheck-hook-m4.am                          |   30 +
 t/ax/extract-testsuite-summary.pl                  |   30 +
 t/ax/is                                            |   54 +
 t/ax/plain-functions.sh                            |   40 +
 t/ax/tap-functions.sh                              |  239 +
 t/ax/tap-setup.sh                                  |   47 +
 t/ax/tap-summary-aux.sh                            |  359 +
 t/ax/testsuite-summary-checks.sh                   |  106 +
 t/ax/trivial-test-driver                           |  102 +
 t/backcompat.sh                                    |   64 +
 t/backcompat2.sh                                   |   73 +
 t/backcompat3.sh                                   |  152 +
 t/backcompat4.sh                                   |   66 +
 t/backcompat5.sh                                   |  125 +
 t/backcompat6.sh                                   |  104 +
 t/backsl.sh                                        |   34 +
 t/backsl2.sh                                       |   30 +
 t/backsl3.sh                                       |   29 +
 t/backsl4.sh                                       |   45 +
 t/badline.sh                                       |   33 +
 t/badopt.sh                                        |   25 +
 t/badprog.sh                                       |   32 +
 t/block.sh                                         |   34 +
 t/bsource.sh                                       |   32 +
 t/candist.sh                                       |   32 +
 t/canon-name.sh                                    |   38 +
 t/canon.sh                                         |   35 +
 t/canon2.sh                                        |   35 +
 t/canon3.sh                                        |   36 +
 t/canon4.sh                                        |   40 +
 t/canon5.sh                                        |   58 +
 t/canon6.sh                                        |   42 +
 t/canon7.sh                                        |  101 +
 t/canon8.sh                                        |   37 +
 t/ccnoco.sh                                        |   83 +
 t/ccnoco2.sh                                       |   55 +
 t/ccnoco3.sh                                       |   77 +
 t/check-concurrency-bug9245.sh                     |   62 +
 t/check-exported-srcdir.sh                         |   63 +
 t/check-fd-redirect.sh                             |  110 +
 t/check-no-test-driver.sh                          |   35 +
 t/check-subst-prog.sh                              |   81 +
 t/check-subst.sh                                   |   87 +
 t/check-tests-in-builddir.sh                       |   92 +
 t/check.sh                                         |   42 +
 t/check10.sh                                       |   85 +
 t/check11.sh                                       |   60 +
 t/check12.sh                                       |  214 +
 t/check2.sh                                        |   70 +
 t/check3.sh                                        |   79 +
 t/check4.sh                                        |   83 +
 t/check5.sh                                        |   61 +
 t/check6.sh                                        |   53 +
 t/check7.sh                                        |   68 +
 t/check8.sh                                        |   99 +
 t/checkall.sh                                      |   31 +
 t/clean.sh                                         |   26 +
 t/clean2.sh                                        |   68 +
 t/colneq.sh                                        |   32 +
 t/colneq2.sh                                       |   40 +
 t/colneq3.sh                                       |   44 +
 t/colon.sh                                         |   46 +
 t/colon2.sh                                        |   79 +
 t/colon3.sh                                        |   91 +
 t/colon4.sh                                        |   39 +
 t/colon5.sh                                        |   71 +
 t/colon6.sh                                        |  103 +
 t/colon7.sh                                        |   54 +
 t/color.sh                                         |  157 +
 t/color2.sh                                        |  194 +
 t/commen10.sh                                      |   32 +
 t/commen11.sh                                      |   41 +
 t/comment.sh                                       |   27 +
 t/comment2.sh                                      |   34 +
 t/comment3.sh                                      |   31 +
 t/comment4.sh                                      |   39 +
 t/comment5.sh                                      |   85 +
 t/comment6.sh                                      |   68 +
 t/comment7.sh                                      |   53 +
 t/comment8.sh                                      |   48 +
 t/comment9.sh                                      |   53 +
 t/comments-in-var-def.sh                           |   56 +
 t/compile.sh                                       |   45 +
 t/compile2.sh                                      |   84 +
 t/compile3.sh                                      |   58 +
 t/compile4.sh                                      |   93 +
 t/compile5.sh                                      |   85 +
 t/compile6.sh                                      |  105 +
 t/compile_f90_c_cxx.sh                             |   43 +
 t/compile_f_c_cxx.sh                               |   46 +
 t/cond-basic.sh                                    |   42 +
 t/cond.sh                                          |   42 +
 t/cond10.sh                                        |   47 +
 t/cond11.sh                                        |   62 +
 t/cond13.sh                                        |   58 +
 t/cond14.sh                                        |   51 +
 t/cond15.sh                                        |   61 +
 t/cond16.sh                                        |   55 +
 t/cond17.sh                                        |   42 +
 t/cond18.sh                                        |   63 +
 t/cond19.sh                                        |   69 +
 t/cond2.sh                                         |   40 +
 t/cond20.sh                                        |   46 +
 t/cond21.sh                                        |   76 +
 t/cond22.sh                                        |   69 +
 t/cond23.sh                                        |   37 +
 t/cond24.sh                                        |   39 +
 t/cond25.sh                                        |   39 +
 t/cond26.sh                                        |   38 +
 t/cond27.sh                                        |   38 +
 t/cond28.sh                                        |   38 +
 t/cond29.sh                                        |   63 +
 t/cond3.sh                                         |   79 +
 t/cond30.sh                                        |   59 +
 t/cond31.sh                                        |   56 +
 t/cond32.sh                                        |   71 +
 t/cond33.sh                                        |   79 +
 t/cond34.sh                                        |   75 +
 t/cond35.sh                                        |  100 +
 t/cond36.sh                                        |   61 +
 t/cond37.sh                                        |   57 +
 t/cond38.sh                                        |   67 +
 t/cond39.sh                                        |  107 +
 t/cond4.sh                                         |   65 +
 t/cond40.sh                                        |   83 +
 t/cond41.sh                                        |   30 +
 t/cond42.sh                                        |   59 +
 t/cond43.sh                                        |   44 +
 t/cond44.sh                                        |   38 +
 t/cond45.sh                                        |   39 +
 t/cond46.sh                                        |  112 +
 t/cond5.sh                                         |   69 +
 t/cond6.sh                                         |   69 +
 t/cond7.sh                                         |   39 +
 t/cond8.sh                                         |   77 +
 t/cond9.sh                                         |   44 +
 t/condd.sh                                         |   73 +
 t/condhook.sh                                      |   48 +
 t/condhook2.sh                                     |   47 +
 t/condinc.sh                                       |   42 +
 t/condinc2.sh                                      |   59 +
 t/condlib.sh                                       |   44 +
 t/condman2.sh                                      |   33 +
 t/condman3.sh                                      |   74 +
 t/confdeps.sh                                      |   37 +
 t/conff.sh                                         |   94 +
 t/conff2.sh                                        |   36 +
 t/conffile-leading-dot.sh                          |   61 +
 t/confh.sh                                         |   63 +
 t/confh4.sh                                        |   47 +
 t/confh5.sh                                        |   59 +
 t/confh6.sh                                        |   45 +
 t/confh7.sh                                        |   44 +
 t/confh8.sh                                        |   66 +
 t/configure.sh                                     |   54 +
 t/confincl.sh                                      |   36 +
 t/conflnk.sh                                       |   70 +
 t/conflnk2.sh                                      |   57 +
 t/conflnk3.sh                                      |   86 +
 t/conflnk4.sh                                      |   93 +
 t/confsub.sh                                       |   58 +
 t/confvar.sh                                       |   32 +
 t/confvar2.sh                                      |   34 +
 t/copy.sh                                          |  101 +
 t/cscope.tap                                       |  168 +
 t/cscope2.sh                                       |   34 +
 t/cscope3.sh                                       |   39 +
 t/cxx.sh                                           |   34 +
 t/cxx2.sh                                          |   30 +
 t/cxxcpp.sh                                        |   30 +
 t/cxxlibobj.sh                                     |   40 +
 t/cxxlink.sh                                       |   39 +
 t/cxxnoc.sh                                        |   37 +
 t/cxxo.sh                                          |   34 +
 t/cygnus-check-without-all.sh                      |   50 +
 t/cygnus-dependency-tracking.sh                    |   73 +
 t/cygnus-imply-foreign.sh                          |   60 +
 t/cygnus-no-dist.sh                                |   84 +
 t/cygnus-no-installinfo.sh                         |   53 +
 t/cygnus-requires-maintainer-mode.sh               |   53 +
 t/cygwin32.sh                                      |   38 +
 t/dash.sh                                          |   29 +
 t/defun.sh                                         |   35 +
 t/defun2.sh                                        |   40 +
 t/dejagnu-absolute-builddir.sh                     |   60 +
 t/dejagnu-relative-srcdir.sh                       |   84 +
 t/dejagnu-siteexp-append.sh                        |   70 +
 t/dejagnu-siteexp-extend.sh                        |  159 +
 t/dejagnu-siteexp-useredit.sh                      |   67 +
 t/dejagnu.sh                                       |   35 +
 t/dejagnu2.sh                                      |   46 +
 t/dejagnu3.sh                                      |   70 +
 t/dejagnu4.sh                                      |  102 +
 t/dejagnu5.sh                                      |   63 +
 t/dejagnu6.sh                                      |   58 +
 t/dejagnu7.sh                                      |   62 +
 t/deleted-am.sh                                    |   59 +
 t/deleted-m4.sh                                    |   65 +
 t/depacl2.sh                                       |   27 +
 t/depcomp.sh                                       |   48 +
 t/depcomp2.sh                                      |   50 +
 t/depcomp8a.sh                                     |   82 +
 t/depcomp8b.sh                                     |   76 +
 t/depdist.sh                                       |   74 +
 t/depend.sh                                        |   34 +
 t/depend3.sh                                       |   46 +
 t/depend4.sh                                       |   36 +
 t/depend5.sh                                       |   78 +
 t/depend6.sh                                       |   46 +
 t/deprecated-acinit.sh                             |   52 +
 t/destdir.sh                                       |   50 +
 t/dirlist-abspath.sh                               |   42 +
 t/dirlist.sh                                       |   57 +
 t/dirlist2.sh                                      |   60 +
 t/discover.sh                                      |   43 +
 t/dist-auxdir-many-subdirs.sh                      |  140 +
 t/dist-auxfile-2.sh                                |   60 +
 t/dist-auxfile.sh                                  |   95 +
 t/dist-formats.tap                                 |  451 +
 t/dist-included-parent-dir.sh                      |   49 +
 t/dist-missing-am.sh                               |   66 +
 t/dist-missing-included-m4.sh                      |   68 +
 t/dist-missing-m4.sh                               |   70 +
 t/dist-pr109765.sh                                 |   42 +
 t/dist-readonly.sh                                 |   60 +
 t/dist-repeated.sh                                 |  102 +
 t/distcheck-configure-flags-am.sh                  |   68 +
 t/distcheck-configure-flags-subpkg.sh              |   81 +
 t/distcheck-configure-flags.sh                     |   54 +
 t/distcheck-hook.sh                                |   51 +
 t/distcheck-hook2.sh                               |   79 +
 t/distcheck-missing-m4.sh                          |  118 +
 t/distcheck-outdated-m4.sh                         |  137 +
 t/distcheck-override-infodir.sh                    |   61 +
 t/distcheck-pr10470.sh                             |   59 +
 t/distcheck-pr9579.sh                              |   96 +
 t/distcheck-writable-srcdir.sh                     |   48 +
 t/distcleancheck.sh                                |   71 +
 t/distcom-subdir.sh                                |   75 +
 t/distcom2.sh                                      |   82 +
 t/distcom3.sh                                      |   57 +
 t/distcom4.sh                                      |   77 +
 t/distcom5.sh                                      |   84 +
 t/distdir.sh                                       |   82 +
 t/disthook.sh                                      |   89 +
 t/distlinks.sh                                     |   72 +
 t/distlinksbrk.sh                                  |   68 +
 t/distname.sh                                      |   47 +
 t/dmalloc.sh                                       |   59 +
 t/doc-parsing-buglets-colneq-subst.sh              |   37 +
 t/doc-parsing-buglets-tabs.sh                      |   59 +
 t/dollar.sh                                        |   44 +
 t/dollarvar.sh                                     |   63 +
 t/dollarvar2.sh                                    |   91 +
 t/double.sh                                        |   29 +
 t/dup2.sh                                          |   29 +
 t/else.sh                                          |   38 +
 t/empty.sh                                         |   29 +
 t/empty2.sh                                        |   35 +
 t/empty3.sh                                        |   32 +
 t/empty4.sh                                        |   38 +
 t/exdir.sh                                         |   30 +
 t/exdir2.sh                                        |   29 +
 t/exdir3.sh                                        |   35 +
 t/exeext.sh                                        |   88 +
 t/exeext2.sh                                       |   43 +
 t/exeext3.sh                                       |   41 +
 t/exeext4.sh                                       |   69 +
 t/exsource.sh                                      |   37 +
 t/ext.sh                                           |   45 +
 t/ext2.sh                                          |   66 +
 t/ext3.sh                                          |   39 +
 t/extra-portability.sh                             |   96 +
 t/extra-portability2.sh                            |   50 +
 t/extra-portability3.sh                            |   60 +
 t/extra-programs-empty.sh                          |   53 +
 t/extra.sh                                         |   40 +
 t/extra10.sh                                       |   50 +
 t/extra11.sh                                       |   93 +
 t/extra12.sh                                       |   51 +
 t/extra2.sh                                        |   33 +
 t/extra3.sh                                        |   28 +
 t/extra4.sh                                        |   29 +
 t/extra5.sh                                        |   38 +
 t/extra6.sh                                        |   55 +
 t/extra7.sh                                        |   64 +
 t/extra8.sh                                        |   36 +
 t/extra9.sh                                        |   43 +
 t/extradep.sh                                      |  107 +
 t/extradep2.sh                                     |   88 +
 t/f90only.sh                                       |   34 +
 t/flavor.sh                                        |   59 +
 t/flibs.sh                                         |   54 +
 t/fn99.sh                                          |   51 +
 t/fn99subdir.sh                                    |   81 +
 t/fnoc.sh                                          |   39 +
 t/fo.sh                                            |   36 +
 t/fonly.sh                                         |   34 +
 t/forcemiss.sh                                     |   34 +
 t/forcemiss2.sh                                    |   40 +
 t/fort1.sh                                         |   30 +
 t/fort2.sh                                         |   62 +
 t/fort4.sh                                         |   92 +
 t/fort5.sh                                         |  105 +
 t/fortdep.sh                                       |   39 +
 t/gcj.sh                                           |   36 +
 t/gcj2.sh                                          |   33 +
 t/gcj3.sh                                          |   37 +
 t/gcj4.sh                                          |   49 +
 t/gcj5.sh                                          |   32 +
 t/gcj6.sh                                          |   51 +
 t/get-sysconf.sh                                   |   62 +
 t/gettext-macros.sh                                |   98 +
 t/gettext.sh                                       |   87 +
 t/gettext2.sh                                      |   61 +
 t/gettext3.sh                                      |   47 +
 t/gnits.sh                                         |   42 +
 t/gnits2.sh                                        |  114 +
 t/gnits3.sh                                        |  104 +
 t/gnumake.sh                                       |   43 +
 t/gnuwarn.sh                                       |   54 +
 t/gnuwarn2.sh                                      |   42 +
 t/hdr-vars-defined-once.sh                         |   50 +
 t/header.sh                                        |   45 +
 t/help-depend.sh                                   |   37 +
 t/help-depend2.sh                                  |   38 +
 t/help-dmalloc.sh                                  |   32 +
 t/help-init.sh                                     |   37 +
 t/help-lispdir.sh                                  |   37 +
 t/help-multilib.sh                                 |   34 +
 t/help-python.sh                                   |   32 +
 t/help-silent.sh                                   |   43 +
 t/help-upc.sh                                      |   33 +
 t/help.sh                                          |   46 +
 t/help2.sh                                         |   52 +
 t/help3.sh                                         |   60 +
 t/help4.sh                                         |   54 +
 t/hfs.sh                                           |   33 +
 t/implicit.sh                                      |   35 +
 t/info.sh                                          |   44 +
 t/init.sh                                          |   38 +
 t/init2.sh                                         |   30 +
 t/insh2.sh                                         |   40 +
 t/install-info-dir.sh                              |  181 +
 t/install2.sh                                      |   50 +
 t/installdir.sh                                    |   64 +
 t/instdat.sh                                       |   32 +
 t/instdat2.sh                                      |   89 +
 t/instdir-cond.sh                                  |   48 +
 t/instdir-cond2.sh                                 |   51 +
 t/instdir-java.sh                                  |   59 +
 t/instdir-lisp.sh                                  |   57 +
 t/instdir-ltlib.sh                                 |   87 +
 t/instdir-no-empty.sh                              |  121 +
 t/instdir-prog.sh                                  |   86 +
 t/instdir-python.sh                                |   61 +
 t/instdir-texi.sh                                  |   71 +
 t/instdir.sh                                       |   70 +
 t/instdir2.sh                                      |   92 +
 t/instexec.sh                                      |   27 +
 t/instfail-info.sh                                 |   63 +
 t/instfail-java.sh                                 |   57 +
 t/instfail-libtool.sh                              |   81 +
 t/instfail.sh                                      |   95 +
 t/insthook.sh                                      |   77 +
 t/instman.sh                                       |   34 +
 t/instman2.sh                                      |   33 +
 t/instmany-mans.sh                                 |  141 +
 t/instmany-python.sh                               |  130 +
 t/instmany.sh                                      |  185 +
 t/instsh.sh                                        |   39 +
 t/instsh2.sh                                       |  118 +
 t/instsh3.sh                                       |   43 +
 t/instspc.tap                                      |  335 +
 t/interp.sh                                        |   38 +
 t/interp2.sh                                       |   37 +
 t/java-check.sh                                    |   64 +
 t/java-clean.sh                                    |   66 +
 t/java-compile-install.sh                          |   97 +
 t/java-compile-run-flat.sh                         |  241 +
 t/java-compile-run-nested.sh                       |  251 +
 t/java-empty-classpath.sh                          |   88 +
 t/java-extra.sh                                    |   73 +
 t/java-mix.sh                                      |   68 +
 t/java-no-duplicate.sh                             |   45 +
 t/java-nobase.sh                                   |   65 +
 t/java-noinst.sh                                   |   55 +
 t/java-rebuild.sh                                  |  124 +
 t/java-sources.sh                                  |   65 +
 t/java-uninstall.sh                                |   97 +
 t/java.sh                                          |   52 +
 t/java2.sh                                         |   47 +
 t/java3.sh                                         |   57 +
 t/javadir-undefined.sh                             |   35 +
 t/javaflags.sh                                     |   60 +
 t/javaprim.sh                                      |   36 +
 t/javasubst.sh                                     |   36 +
 t/ldadd.sh                                         |   46 +
 t/ldflags.sh                                       |   50 +
 t/lex-clean-cxx.sh                                 |  127 +
 t/lex-clean.sh                                     |  114 +
 t/lex-depend-cxx.sh                                |   96 +
 t/lex-depend-grep.sh                               |   46 +
 t/lex-depend.sh                                    |   89 +
 t/lex-lib-external.sh                              |   79 +
 t/lex-lib.sh                                       |   72 +
 t/lex-libobj.sh                                    |   83 +
 t/lex-line.sh                                      |  123 +
 t/lex-nodist.sh                                    |   90 +
 t/lex-noyywrap.sh                                  |   75 +
 t/lex-pr204.sh                                     |   89 +
 t/lex-subobj-nodep.sh                              |   74 +
 t/lex.sh                                           |   40 +
 t/lex2.sh                                          |   35 +
 t/lex3.sh                                          |   91 +
 t/lex5.sh                                          |   98 +
 t/lexcpp.sh                                        |   44 +
 t/lexvpath.sh                                      |  128 +
 t/lflags.sh                                        |   73 +
 t/lflags2.sh                                       |   72 +
 t/libexec.sh                                       |   35 +
 t/libobj-basic.sh                                  |  112 +
 t/libobj10.sh                                      |   56 +
 t/libobj12.sh                                      |   77 +
 t/libobj13.sh                                      |   51 +
 t/libobj14.sh                                      |   44 +
 t/libobj15a.sh                                     |   40 +
 t/libobj15b.sh                                     |   43 +
 t/libobj15c.sh                                     |   50 +
 t/libobj16a.sh                                     |  139 +
 t/libobj16b.sh                                     |  140 +
 t/libobj17.sh                                      |   72 +
 t/libobj18.sh                                      |   45 +
 t/libobj19.sh                                      |   96 +
 t/libobj2.sh                                       |   68 +
 t/libobj20a.sh                                     |   45 +
 t/libobj20b.sh                                     |   57 +
 t/libobj20c.sh                                     |   54 +
 t/libobj3.sh                                       |   39 +
 t/libobj4.sh                                       |   34 +
 t/libobj5.sh                                       |   39 +
 t/libobj7.sh                                       |   72 +
 t/library.sh                                       |   38 +
 t/library2.sh                                      |   31 +
 t/library3.sh                                      |   52 +
 t/libtoo10.sh                                      |   60 +
 t/libtoo11.sh                                      |   38 +
 t/libtool-macros.sh                                |   60 +
 t/libtool.sh                                       |   41 +
 t/libtool2.sh                                      |   49 +
 t/libtool3.sh                                      |   90 +
 t/libtool4.sh                                      |   37 +
 t/libtool5.sh                                      |   44 +
 t/libtool6.sh                                      |   45 +
 t/libtool7.sh                                      |  108 +
 t/libtool8.sh                                      |   53 +
 t/libtool9.sh                                      |  102 +
 t/license.sh                                       |   61 +
 t/license2.sh                                      |   39 +
 t/link_c_cxx.sh                                    |   45 +
 t/link_cond.sh                                     |   88 +
 t/link_dist.sh                                     |   47 +
 t/link_f90_only.sh                                 |   44 +
 t/link_f_only.sh                                   |   44 +
 t/link_fc.sh                                       |   46 +
 t/link_fccxx.sh                                    |   46 +
 t/link_fcxx.sh                                     |   45 +
 t/link_override.sh                                 |   44 +
 t/lisp2.sh                                         |   75 +
 t/lisp3.sh                                         |   94 +
 t/lisp4.sh                                         |   80 +
 t/lisp5.sh                                         |   79 +
 t/lisp6.sh                                         |  105 +
 t/lisp7.sh                                         |   51 +
 t/lisp8.sh                                         |   63 +
 t/lispdry.sh                                       |   58 +
 t/list-of-tests.mk                                 | 1279 ++
 t/listval.sh                                       |   46 +
 t/location.sh                                      |   97 +
 t/longlin2.sh                                      |   48 +
 t/longline.sh                                      |   30 +
 t/ltcond.sh                                        |  105 +
 t/ltcond2.sh                                       |   97 +
 t/ltconv.sh                                        |  156 +
 t/ltdeps.sh                                        |   61 +
 t/ltinit.sh                                        |   67 +
 t/ltinstloc.sh                                     |   68 +
 t/ltlibobjs.sh                                     |   43 +
 t/ltlibsrc.sh                                      |   74 +
 t/ltorder.sh                                       |   62 +
 t/lzma.sh                                          |   41 +
 t/m4-inclusion.sh                                  |   56 +
 t/maintclean-vpath.sh                              |  104 +
 t/maintclean.sh                                    |   96 +
 t/maintmode-configure-msg.sh                       |   73 +
 t/make-dryrun.tap                                  |  125 +
 t/make.sh                                          |   52 +
 t/makefile-deps.sh                                 |   29 +
 t/makej.sh                                         |   53 +
 t/makej2.sh                                        |   44 +
 t/maken.sh                                         |   62 +
 t/maken3.sh                                        |  190 +
 t/makevars.sh                                      |   33 +
 t/man.sh                                           |   33 +
 t/man2.sh                                          |   53 +
 t/man3.sh                                          |   44 +
 t/man4.sh                                          |  105 +
 t/man5.sh                                          |   67 +
 t/man6.sh                                          |  101 +
 t/man7.sh                                          |   59 +
 t/man8.sh                                          |   61 +
 t/mdate.sh                                         |   37 +
 t/mdate2.sh                                        |   40 +
 t/mdate3.sh                                        |   49 +
 t/mdate4.sh                                        |   46 +
 t/mdate5.sh                                        |   45 +
 t/mdate6.sh                                        |   36 +
 t/missing-auxfile-stops-makefiles-creation.sh      |   65 +
 t/missing.sh                                       |   66 +
 t/missing2.sh                                      |   58 +
 t/missing3.sh                                      |   53 +
 t/missing4.sh                                      |   47 +
 t/missing5.sh                                      |   64 +
 t/missing6.sh                                      |   51 +
 t/mkinst2.sh                                       |   36 +
 t/mkinst3.sh                                       |   65 +
 t/mkinstall.sh                                     |   31 +
 t/mmode.sh                                         |   64 +
 t/mmodely.sh                                       |   93 +
 t/multlib.sh                                       |  162 +
 t/no-extra-makefile-code.sh                        |   36 +
 t/no-outdir-option.sh                              |   29 +
 t/nobase-libtool.sh                                |   95 +
 t/nobase-nodist.sh                                 |   60 +
 t/nobase-python.sh                                 |   79 +
 t/nobase.sh                                        |  147 +
 t/nodef.sh                                         |   58 +
 t/nodef2.sh                                        |   54 +
 t/nodep.sh                                         |   40 +
 t/nodep2.sh                                        |   44 +
 t/nodepcomp.sh                                     |   26 +
 t/nodist.sh                                        |   40 +
 t/nodist2.sh                                       |   38 +
 t/nodist3.sh                                       |   37 +
 t/noinst.sh                                        |   32 +
 t/noinstdir.sh                                     |   49 +
 t/nolink.sh                                        |   36 +
 t/nostdinc.sh                                      |   56 +
 t/notrans.sh                                       |  131 +
 t/number.sh                                        |   37 +
 t/objc.sh                                          |   36 +
 t/objc2.sh                                         |   31 +
 t/objext-pr10128.sh                                |   58 +
 t/obsolete.sh                                      |   57 +
 t/oldvars.sh                                       |   35 +
 t/order.sh                                         |   32 +
 t/output-order.sh                                  |   53 +
 t/output.sh                                        |   35 +
 t/output10.sh                                      |   61 +
 t/output11.sh                                      |   63 +
 t/output12.sh                                      |   60 +
 t/output13.sh                                      |   50 +
 t/output2.sh                                       |   38 +
 t/output3.sh                                       |   38 +
 t/output4.sh                                       |   35 +
 t/output5.sh                                       |   31 +
 t/output6.sh                                       |   72 +
 t/output7.sh                                       |   72 +
 t/output8.sh                                       |   52 +
 t/output9.sh                                       |   52 +
 t/override-conditional-1.sh                        |   53 +
 t/override-conditional-2.sh                        |   39 +
 t/override-html.sh                                 |   33 +
 t/override-suggest-local.sh                        |   44 +
 t/parallel-am.sh                                   |  103 +
 t/parallel-am2.sh                                  |   77 +
 t/parallel-am3.sh                                  |   74 +
 t/parallel-tests-cmdline-override.sh               |   84 +
 t/parallel-tests-console-output.sh                 |  104 +
 t/parallel-tests-driver-install.sh                 |   93 +
 t/parallel-tests-dry-run-1.sh                      |   93 +
 t/parallel-tests-dry-run-2.sh                      |  113 +
 t/parallel-tests-empty-testlogs.sh                 |   95 +
 t/parallel-tests-exeext.sh                         |   67 +
 t/parallel-tests-exit-statuses.sh                  |  102 +
 t/parallel-tests-extra-programs.sh                 |  182 +
 t/parallel-tests-fd-redirect-exeext.sh             |  118 +
 t/parallel-tests-fd-redirect.sh                    |   70 +
 t/parallel-tests-fork-bomb.sh                      |  144 +
 t/parallel-tests-harderror.sh                      |   96 +
 t/parallel-tests-interrupt.tap                     |  117 +
 t/parallel-tests-log-compiler-1.sh                 |  126 +
 t/parallel-tests-log-compiler-2.sh                 |   96 +
 t/parallel-tests-log-compiler-example.sh           |   69 +
 t/parallel-tests-log-override-1.sh                 |  110 +
 t/parallel-tests-log-override-2.sh                 |   85 +
 t/parallel-tests-log-override-recheck.sh           |   99 +
 t/parallel-tests-many.sh                           |  190 +
 t/parallel-tests-no-color-in-log.sh                |   63 +
 t/parallel-tests-no-spurious-summary.sh            |   68 +
 t/parallel-tests-once.sh                           |   48 +
 t/parallel-tests-recheck-depends-on-all.sh         |   93 +
 t/parallel-tests-reset-term.sh                     |   89 +
 t/parallel-tests-subdir.sh                         |   51 +
 t/parallel-tests-suffix-prog.sh                    |   77 +
 t/parallel-tests-suffix.sh                         |   63 +
 t/parallel-tests-trailing-bslash.sh                |  114 +
 t/parallel-tests-unreadable.sh                     |   76 +
 t/parallel-tests.sh                                |  152 +
 t/parallel-tests10.sh                              |   47 +
 t/parallel-tests2.sh                               |  149 +
 t/parallel-tests3.sh                               |  116 +
 t/parallel-tests5.sh                               |   66 +
 t/parallel-tests6.sh                               |   43 +
 t/parallel-tests8.sh                               |   75 +
 t/parallel-tests9.sh                               |   80 +
 t/parse.sh                                         |   36 +
 t/percent.sh                                       |   36 +
 t/percent2.sh                                      |   39 +
 t/phony.sh                                         |   29 +
 t/pluseq.sh                                        |   30 +
 t/pluseq10.sh                                      |   55 +
 t/pluseq11.sh                                      |   52 +
 t/pluseq2.sh                                       |   46 +
 t/pluseq3.sh                                       |   50 +
 t/pluseq4.sh                                       |   34 +
 t/pluseq5.sh                                       |   60 +
 t/pluseq6.sh                                       |   38 +
 t/pluseq7.sh                                       |   38 +
 t/pluseq8.sh                                       |   43 +
 t/pluseq9.sh                                       |   71 +
 t/pm/Cond2.pl                                      |   22 +
 t/pm/Cond3.pl                                      |   22 +
 t/pm/Condition-t.pl                                |  327 +
 t/pm/Condition.pl                                  |  277 +
 t/pm/DisjCon2.pl                                   |   24 +
 t/pm/DisjCon3.pl                                   |   23 +
 t/pm/DisjConditions-t.pl                           |  461 +
 t/pm/DisjConditions.pl                             |  404 +
 t/pm/Version.pl                                    |  129 +
 t/pm/Version2.pl                                   |   20 +
 t/pm/Version3.pl                                   |   20 +
 t/pm/Wrap.pl                                       |  112 +
 t/posixsubst-data.sh                               |   74 +
 t/posixsubst-extradist.sh                          |   54 +
 t/posixsubst-ldadd.sh                              |   78 +
 t/posixsubst-libraries.sh                          |   65 +
 t/posixsubst-ltlibraries.sh                        |   66 +
 t/posixsubst-programs.sh                           |   63 +
 t/posixsubst-scripts.sh                            |   99 +
 t/posixsubst-sources.sh                            |   81 +
 t/posixsubst-tests.sh                              |   68 +
 t/postproc.sh                                      |   48 +
 t/ppf77.sh                                         |   34 +
 t/pr2.sh                                           |   51 +
 t/pr211.sh                                         |   51 +
 t/pr220.sh                                         |   58 +
 t/pr224.sh                                         |   64 +
 t/pr229.sh                                         |   35 +
 t/pr243.sh                                         |   57 +
 t/pr266.sh                                         |   46 +
 t/pr279-2.sh                                       |   51 +
 t/pr279.sh                                         |   50 +
 t/pr287.sh                                         |   48 +
 t/pr300-lib.sh                                     |   76 +
 t/pr300-ltlib.sh                                   |   84 +
 t/pr300-prog.sh                                    |   72 +
 t/pr307.sh                                         |   93 +
 t/pr401.sh                                         |  189 +
 t/pr401b.sh                                        |  189 +
 t/pr401c.sh                                        |  192 +
 t/pr72.sh                                          |   44 +
 t/pr8365-remake-timing.sh                          |  107 +
 t/pr87.sh                                          |   71 +
 t/pr9.sh                                           |   58 +
 t/prefix.sh                                        |   33 +
 t/primary-prefix-couples-documented-valid.sh       |   87 +
 t/primary-prefix-couples-force-valid.sh            |   87 +
 t/primary-prefix-invalid-couples.tap               |  194 +
 t/primary-prefix-valid-couples.sh                  |   88 +
 t/primary.sh                                       |   30 +
 t/primary2.sh                                      |   32 +
 t/primary3.sh                                      |   43 +
 t/print-libdir.sh                                  |   46 +
 t/proginst.sh                                      |   29 +
 t/programs-primary-rewritten.sh                    |   61 +
 t/py-compile-basedir.sh                            |   50 +
 t/py-compile-basic.sh                              |   63 +
 t/py-compile-basic2.sh                             |   70 +
 t/py-compile-destdir.sh                            |   43 +
 t/py-compile-env.sh                                |   59 +
 t/py-compile-option-terminate.sh                   |   43 +
 t/py-compile-usage.sh                              |   75 +
 t/python-dist.sh                                   |   78 +
 t/python-pr10995.sh                                |   58 +
 t/python-vars.sh                                   |  107 +
 t/python-virtualenv.sh                             |  187 +
 t/python.sh                                        |   60 +
 t/python10.sh                                      |   85 +
 t/python11.sh                                      |   55 +
 t/python12.sh                                      |   56 +
 t/python2.sh                                       |  106 +
 t/python3.sh                                       |   49 +
 t/python4.sh                                       |   43 +
 t/python5.sh                                       |   45 +
 t/python5b.sh                                      |   53 +
 t/python6.sh                                       |   38 +
 t/python7.sh                                       |   38 +
 t/python8.sh                                       |   37 +
 t/python9.sh                                       |   38 +
 t/recurs.sh                                        |   36 +
 t/recurs2.sh                                       |   29 +
 t/relativize.tap                                   |   96 +
 t/remake-all-1.sh                                  |   67 +
 t/remake-all-2.sh                                  |   75 +
 t/remake-am-pr10111.sh                             |   62 +
 t/remake-deleted-am-2.sh                           |   75 +
 t/remake-deleted-am-subdir.sh                      |   77 +
 t/remake-deleted-am.sh                             |   67 +
 t/remake-deleted-m4-file.sh                        |   74 +
 t/remake-gnulib-add-acsubst.sh                     |  133 +
 t/remake-gnulib-add-header.sh                      |  109 +
 t/remake-gnulib-remove-header.sh                   |  136 +
 t/remake-m4-pr10111.sh                             |   60 +
 t/remake-moved-m4-file.sh                          |   76 +
 t/remake-renamed-am.sh                             |   58 +
 t/remake-renamed-m4-file.sh                        |   83 +
 t/remake-renamed-m4-macro-and-file.sh              |   86 +
 t/remake-renamed-m4-macro.sh                       |   72 +
 t/remake-subdir-from-subdir.sh                     |   56 +
 t/remake-subdir-gnu.sh                             |   80 +
 t/remake-subdir-long-time.sh                       |  114 +
 t/remake-subdir.sh                                 |   81 +
 t/remake-subdir2.sh                                |   82 +
 t/remake.sh                                        |   38 +
 t/remake10a.sh                                     |  111 +
 t/remake10b.sh                                     |  110 +
 t/remake10c.sh                                     |  114 +
 t/remake11.sh                                      |   81 +
 t/remake12.sh                                      |  146 +
 t/remake1a.sh                                      |   55 +
 t/remake2.sh                                       |   38 +
 t/remake3.sh                                       |   38 +
 t/remake3a.sh                                      |   73 +
 t/remake4.sh                                       |   56 +
 t/remake5.sh                                       |   80 +
 t/remake6.sh                                       |   64 +
 t/remake7.sh                                       |   69 +
 t/remake8a.sh                                      |  190 +
 t/remake8b.sh                                      |  192 +
 t/remake9a.sh                                      |  109 +
 t/remake9b.sh                                      |  111 +
 t/remake9c.sh                                      |  112 +
 t/remake9d.sh                                      |  112 +
 t/repeated-options.sh                              |   82 +
 t/req.sh                                           |   39 +
 t/reqd.sh                                          |   45 +
 t/reqd2.sh                                         |   57 +
 t/rst-formatting.sh                                |   93 +
 t/rulepat.sh                                       |   30 +
 t/sanity.sh                                        |   43 +
 t/scripts.sh                                       |   27 +
 t/seenc.sh                                         |   43 +
 t/self-check-cleanup.tap                           |  192 +
 t/self-check-configure-help.sh                     |  274 +
 t/self-check-dir.tap                               |   74 +
 t/self-check-env-sanitize.tap                      |   57 +
 t/self-check-exit.tap                              |  112 +
 t/self-check-explicit-skips.sh                     |   56 +
 t/self-check-is-blocked-signal.tap                 |   29 +
 t/self-check-is_newest.tap                         |   80 +
 t/self-check-me.tap                                |   73 +
 t/self-check-reexec.tap                            |  205 +
 t/self-check-report.sh                             |   54 +
 t/self-check-sanity.sh                             |   77 +
 t/self-check-seq.tap                               |   75 +
 t/self-check-tap.sh                                |   43 +
 t/self-check-unindent.tap                          |  255 +
 t/serial-tests.sh                                  |   86 +
 t/silent-amopts.sh                                 |   28 +
 t/silent-configsite.sh                             |   84 +
 t/silent-lex.sh                                    |  139 +
 t/silent-many-gcc.sh                               |  241 +
 t/silent-many-generic.sh                           |  266 +
 t/silent-nested-vars.sh                            |  147 +
 t/silent-nowarn.sh                                 |   44 +
 t/silent-yacc-headers.sh                           |  173 +
 t/silent-yacc.sh                                   |  136 +
 t/silent.sh                                        |   83 +
 t/silent2.sh                                       |   84 +
 t/silent3.sh                                       |   87 +
 t/silent4.sh                                       |   88 +
 t/silent6.sh                                       |  107 +
 t/silent7.sh                                       |   92 +
 t/silent8.sh                                       |   66 +
 t/silent9.sh                                       |   87 +
 t/silentcxx-gcc.sh                                 |  109 +
 t/silentcxx.sh                                     |  110 +
 t/silentf77.sh                                     |   92 +
 t/silentf90.sh                                     |   92 +
 t/space.sh                                         |   29 +
 t/specflg-dummy.sh                                 |  247 +
 t/specflg.sh                                       |   51 +
 t/specflg10.sh                                     |   87 +
 t/specflg2.sh                                      |   59 +
 t/specflg3.sh                                      |   43 +
 t/specflg6.sh                                      |   56 +
 t/specflg7.sh                                      |   65 +
 t/specflg8.sh                                      |   64 +
 t/specflg9.sh                                      |   45 +
 t/spell.sh                                         |   29 +
 t/spell2.sh                                        |   31 +
 t/spell3.sh                                        |   31 +
 t/spelling.sh                                      |   30 +
 t/spy-rm.tap                                       |   48 +
 t/spy.sh                                           |  106 +
 t/srcsub.sh                                        |   33 +
 t/srcsub2.sh                                       |   36 +
 t/stamph2.sh                                       |   69 +
 t/stdinc.sh                                        |   62 +
 t/stdlib.sh                                        |   52 +
 t/stdlib2.sh                                       |   94 +
 t/strictness-override.sh                           |  123 +
 t/strictness-precedence.sh                         |   77 +
 t/strip.sh                                         |   50 +
 t/strip2.sh                                        |   53 +
 t/strip3.sh                                        |   53 +
 t/subcond.sh                                       |   42 +
 t/subcond2.sh                                      |   89 +
 t/subcond3.sh                                      |   90 +
 t/subdir.sh                                        |   40 +
 t/subdir10.sh                                      |   37 +
 t/subdir2.sh                                       |   52 +
 t/subdir3.sh                                       |   36 +
 t/subdir4.sh                                       |   70 +
 t/subdir5.sh                                       |   95 +
 t/subdir6.sh                                       |   40 +
 t/subdir7.sh                                       |   45 +
 t/subdir8.sh                                       |   97 +
 t/subdir9.sh                                       |   55 +
 t/subdirbuiltsources.sh                            |   71 +
 t/subobj.sh                                        |   45 +
 t/subobj10.sh                                      |   55 +
 t/subobj11a.sh                                     |   81 +
 t/subobj11b.sh                                     |   85 +
 t/subobj11c.sh                                     |   51 +
 t/subobj2.sh                                       |   38 +
 t/subobj4.sh                                       |   52 +
 t/subobj5.sh                                       |   70 +
 t/subobj6.sh                                       |   85 +
 t/subobj7.sh                                       |   38 +
 t/subobj8.sh                                       |   47 +
 t/subobj9.sh                                       |   89 +
 t/subobjname.sh                                    |   72 +
 t/subpkg-yacc.sh                                   |  129 +
 t/subpkg.sh                                        |  113 +
 t/subpkg2.sh                                       |   66 +
 t/subpkg3.sh                                       |   55 +
 t/subpkg4.sh                                       |   71 +
 t/subst-no-trailing-empty-line.sh                  |   97 +
 t/subst.sh                                         |   39 +
 t/subst3.sh                                        |  177 +
 t/subst4.sh                                        |   44 +
 t/subst5.sh                                        |   40 +
 t/substre2.sh                                      |   50 +
 t/substref.sh                                      |   54 +
 t/substtarg.sh                                     |   50 +
 t/suffix-chain.tap                                 |   64 +
 t/suffix.sh                                        |   57 +
 t/suffix10.tap                                     |   71 +
 t/suffix11.tap                                     |   82 +
 t/suffix12.sh                                      |   59 +
 t/suffix13.sh                                      |   72 +
 t/suffix2.sh                                       |   54 +
 t/suffix3.tap                                      |   82 +
 t/suffix4.sh                                       |   39 +
 t/suffix5.sh                                       |   66 +
 t/suffix6.sh                                       |   63 +
 t/suffix6b.sh                                      |   75 +
 t/suffix6c.sh                                      |   92 +
 t/suffix7.sh                                       |   37 +
 t/suffix8.tap                                      |   94 +
 t/suffix9.sh                                       |   64 +
 t/symlink.sh                                       |   40 +
 t/symlink2.sh                                      |   32 +
 t/syntax.sh                                        |   31 +
 t/tags.sh                                          |   29 +
 t/tags2.sh                                         |   42 +
 t/tagsub.sh                                        |   46 +
 t/tap-ambiguous-directive.sh                       |   56 +
 t/tap-autonumber.sh                                |   75 +
 t/tap-bad-prog.tap                                 |  113 +
 t/tap-bailout-and-logging.sh                       |   49 +
 t/tap-bailout-leading-space.sh                     |   72 +
 t/tap-bailout-suppress-badexit.sh                  |   65 +
 t/tap-bailout-suppress-later-diagnostic.sh         |   45 +
 t/tap-bailout-suppress-later-errors.sh             |   74 +
 t/tap-bailout.sh                                   |  138 +
 t/tap-basic.sh                                     |  175 +
 t/tap-color.sh                                     |  173 +
 t/tap-common-setup.sh                              |   43 +
 t/tap-deps.sh                                      |   87 +
 t/tap-diagnostic-custom.sh                         |   94 +
 t/tap-diagnostic.sh                                |  124 +
 t/tap-doc.sh                                       |   98 +
 t/tap-doc2.sh                                      |  142 +
 t/tap-driver-stderr.sh                             |   50 +
 t/tap-empty-diagnostic.sh                          |   41 +
 t/tap-empty.sh                                     |   55 +
 t/tap-escape-directive-2.sh                        |   55 +
 t/tap-escape-directive.sh                          |   39 +
 t/tap-exit.sh                                      |   54 +
 t/tap-fancy.sh                                     |  133 +
 t/tap-fancy2.sh                                    |  138 +
 t/tap-global-log.sh                                |  122 +
 t/tap-global-result.sh                             |  187 +
 t/tap-log.sh                                       |  164 +
 t/tap-merge-stdout-stderr.sh                       |   72 +
 t/tap-missing-plan-and-bad-exit.sh                 |   43 +
 t/tap-more.sh                                      |  162 +
 t/tap-more2.sh                                     |   91 +
 t/tap-msg0-bailout.sh                              |   38 +
 t/tap-msg0-directive.sh                            |   41 +
 t/tap-msg0-misc.sh                                 |   82 +
 t/tap-msg0-planskip.sh                             |   37 +
 t/tap-msg0-result.sh                               |   63 +
 t/tap-negative-numbers.sh                          |   58 +
 t/tap-no-disable-hard-error.sh                     |   50 +
 t/tap-no-merge-stdout-stderr.sh                    |   53 +
 t/tap-no-spurious-numbers.sh                       |   99 +
 t/tap-no-spurious-summary.sh                       |   47 +
 t/tap-no-spurious.sh                               |  114 +
 t/tap-not-ok-skip.sh                               |   39 +
 t/tap-number-wordboundary.sh                       |  112 +
 t/tap-numbers-leading-zero.sh                      |  109 +
 t/tap-numeric-description.sh                       |   69 +
 t/tap-out-of-order.sh                              |   81 +
 t/tap-passthrough-exit.sh                          |   59 +
 t/tap-passthrough.sh                               |  166 +
 t/tap-plan-corner.sh                               |  198 +
 t/tap-plan-errors.sh                               |  114 +
 t/tap-plan-leading-zero.sh                         |   57 +
 t/tap-plan-malformed.sh                            |   60 +
 t/tap-plan-middle.sh                               |   83 +
 t/tap-plan-whitespace.sh                           |   41 +
 t/tap-plan.sh                                      |   52 +
 t/tap-planskip-and-logging.sh                      |   74 +
 t/tap-planskip-badexit.sh                          |   52 +
 t/tap-planskip-bailout.sh                          |   36 +
 t/tap-planskip-case-insensitive.sh                 |   46 +
 t/tap-planskip-late.sh                             |   44 +
 t/tap-planskip-later-errors.sh                     |   40 +
 t/tap-planskip-unplanned-corner.sh                 |   48 +
 t/tap-planskip-unplanned.sh                        |   73 +
 t/tap-planskip-whitespace.sh                       |   48 +
 t/tap-planskip.sh                                  |   78 +
 t/tap-realtime.sh                                  |  126 +
 t/tap-recheck-logs.sh                              |  119 +
 t/tap-recheck.sh                                   |  215 +
 t/tap-result-comment.sh                            |   54 +
 t/tap-signal.tap                                   |  140 +
 t/tap-summary-color.sh                             |   23 +
 t/tap-summary.sh                                   |   23 +
 t/tap-test-number-0.sh                             |   86 +
 t/tap-todo-skip-together.sh                        |   40 +
 t/tap-todo-skip-whitespace.sh                      |  100 +
 t/tap-todo-skip.sh                                 |   91 +
 t/tap-unplanned.sh                                 |  159 +
 t/tap-whitespace-normalization.sh                  |  165 +
 t/tap-with-and-without-number.sh                   |   50 +
 t/tap-xfail-tests.sh                               |   68 +
 t/tar-override.sh                                  |   65 +
 t/tar.sh                                           |   40 +
 t/tar2.sh                                          |   40 +
 t/tar3.sh                                          |   52 +
 t/target-cflags.sh                                 |   76 +
 t/targetclash.sh                                   |   33 +
 t/test-driver-acsubst.sh                           |   88 +
 t/test-driver-cond.sh                              |  119 +
 t/test-driver-create-log-dir.sh                    |   83 +
 t/test-driver-custom-multitest-recheck.sh          |  214 +
 t/test-driver-custom-multitest-recheck2.sh         |  188 +
 t/test-driver-custom-multitest.sh                  |  172 +
 t/test-driver-custom-no-extra-driver.sh            |   64 +
 t/test-driver-custom-xfail-tests.sh                |  166 +
 t/test-driver-custom.sh                            |  144 +
 t/test-driver-fail.sh                              |   65 +
 t/test-driver-is-distributed.sh                    |   94 +
 t/test-driver-strip-vpath.sh                       |   98 +
 t/test-driver-trs-suffix-registered.sh             |   58 +
 t/test-extensions-cond.sh                          |   70 +
 t/test-extensions.sh                               |   72 +
 t/test-harness-vpath-rewrite.sh                    |   58 +
 t/test-log.sh                                      |  178 +
 t/test-logs-repeated.sh                            |   45 +
 t/test-metadata-global-log.sh                      |  147 +
 t/test-metadata-global-result.sh                   |  196 +
 t/test-metadata-recheck.sh                         |  164 +
 t/test-metadata-results.sh                         |  176 +
 t/test-missing.sh                                  |   72 +
 t/test-missing2.sh                                 |   54 +
 t/test-trs-basic.sh                                |  158 +
 t/test-trs-recover.sh                              |  167 +
 t/test-trs-recover2.sh                             |  133 +
 t/tests-environment-and-log-compiler.sh            |   75 +
 t/tests-environment-backcompat.sh                  |   59 +
 t/tests-environment-fd-redirect.sh                 |   94 +
 t/tests-environment.sh                             |   45 +
 t/testsuite-summary-color.sh                       |  199 +
 t/testsuite-summary-count-many.sh                  |  105 +
 t/testsuite-summary-count.sh                       |  161 +
 t/testsuite-summary-reference-log.sh               |   88 +
 t/transform.sh                                     |   65 +
 t/transform2.sh                                    |   95 +
 t/transform3.sh                                    |   92 +
 t/txinfo-no-clutter.sh                             |  102 +
 t/txinfo-unrecognized-extension.sh                 |   38 +
 t/txinfo.sh                                        |   47 +
 t/txinfo10.sh                                      |   39 +
 t/txinfo13.sh                                      |   65 +
 t/txinfo16.sh                                      |   91 +
 t/txinfo17.sh                                      |   39 +
 t/txinfo19.sh                                      |   72 +
 t/txinfo2.sh                                       |   45 +
 t/txinfo20.sh                                      |   76 +
 t/txinfo21.sh                                      |  176 +
 t/txinfo22.sh                                      |   68 +
 t/txinfo23.sh                                      |   66 +
 t/txinfo24.sh                                      |   83 +
 t/txinfo25.sh                                      |  111 +
 t/txinfo26.sh                                      |   67 +
 t/txinfo27.sh                                      |   46 +
 t/txinfo28.sh                                      |   89 +
 t/txinfo29.sh                                      |   62 +
 t/txinfo3.sh                                       |   53 +
 t/txinfo30.sh                                      |   63 +
 t/txinfo31.sh                                      |   29 +
 t/txinfo32.sh                                      |   40 +
 t/txinfo33.sh                                      |  126 +
 t/txinfo4.sh                                       |   32 +
 t/txinfo5.sh                                       |   38 +
 t/txinfo5b.sh                                      |   41 +
 t/txinfo6.sh                                       |   33 +
 t/txinfo7.sh                                       |   33 +
 t/txinfo8.sh                                       |   62 +
 t/txinfo9.sh                                       |   41 +
 t/uninstall-fail.sh                                |   96 +
 t/uninstall-pr9578.sh                              |   67 +
 t/unused.sh                                        |   35 +
 t/upc.sh                                           |   50 +
 t/upc2.sh                                          |   31 +
 t/upc3.sh                                          |   65 +
 t/vala-headers.sh                                  |   87 +
 t/vala-libs.sh                                     |  102 +
 t/vala-mix.sh                                      |  124 +
 t/vala-mix2.sh                                     |  120 +
 t/vala-parallel.sh                                 |   74 +
 t/vala-vapi.sh                                     |   89 +
 t/vala-vpath.sh                                    |   91 +
 t/vala.sh                                          |   86 +
 t/vala2.sh                                         |  110 +
 t/vala3.sh                                         |   98 +
 t/vala4.sh                                         |   64 +
 t/vala5.sh                                         |  103 +
 t/vars.sh                                          |   36 +
 t/vars3.sh                                         |   72 +
 t/vartar.sh                                        |   39 +
 t/vartypo2.sh                                      |   70 +
 t/vartypos.sh                                      |   89 +
 t/version.sh                                       |   41 +
 t/version2.sh                                      |   41 +
 t/version3.sh                                      |   27 +
 t/version4.sh                                      |   26 +
 t/version6.sh                                      |   36 +
 t/version7.sh                                      |   67 +
 t/version8.sh                                      |   24 +
 t/vpath.sh                                         |   33 +
 t/vtexi.sh                                         |   62 +
 t/vtexi2.sh                                        |   42 +
 t/vtexi3.sh                                        |  124 +
 t/vtexi4.sh                                        |  113 +
 t/warning-groups-win-over-strictness.sh            |   64 +
 t/warnings-override.sh                             |  111 +
 t/warnings-precedence.sh                           |   77 +
 t/warnings-strictness-interactions.sh              |   59 +
 t/warnings-unknown.sh                              |   48 +
 t/warnings-win-over-strictness.sh                  |   90 +
 t/warnopts.sh                                      |   73 +
 t/werror.sh                                        |   26 +
 t/werror2.sh                                       |   48 +
 t/werror3.sh                                       |   48 +
 t/werror4.sh                                       |   66 +
 t/whoami.sh                                        |   27 +
 t/wrap/aclocal.in                                  |   32 +
 t/wrap/automake.in                                 |   30 +
 t/xsource.sh                                       |   38 +
 t/yacc-auxdir.sh                                   |   56 +
 t/yacc-basic.sh                                    |  108 +
 t/yacc-bison-skeleton-cxx.sh                       |   98 +
 t/yacc-bison-skeleton.sh                           |   72 +
 t/yacc-clean-cxx.sh                                |  163 +
 t/yacc-clean.sh                                    |  147 +
 t/yacc-cxx.sh                                      |  139 +
 t/yacc-d-basic.sh                                  |  154 +
 t/yacc-d-cxx.sh                                    |  232 +
 t/yacc-d-vpath.sh                                  |  108 +
 t/yacc-deleted-headers.sh                          |  163 +
 t/yacc-depend.sh                                   |   82 +
 t/yacc-depend2.sh                                  |   86 +
 t/yacc-dist-nobuild-subdir.sh                      |   93 +
 t/yacc-dist-nobuild.sh                             |   90 +
 t/yacc-line.sh                                     |  113 +
 t/yacc-mix-c-cxx.sh                                |  206 +
 t/yacc-nodist.sh                                   |  104 +
 t/yacc-pr204.sh                                    |   84 +
 t/yacc-weirdnames.sh                               |   54 +
 t/yacc.sh                                          |   37 +
 t/yacc2.sh                                         |   72 +
 t/yacc4.sh                                         |   86 +
 t/yacc5.sh                                         |   80 +
 t/yacc7.sh                                         |   89 +
 t/yacc8.sh                                         |  109 +
 t/yaccdry.sh                                       |   58 +
 t/yaccpp.sh                                        |   81 +
 t/yaccvpath.sh                                     |   97 +
 t/yflags-cmdline-override.sh                       |   88 +
 t/yflags-conditional.sh                            |  143 +
 t/yflags-d-false-positives.sh                      |   41 +
 t/yflags-force-conditional.sh                      |   85 +
 t/yflags-force-override.sh                         |   62 +
 t/yflags-var-expand.sh                             |   61 +
 t/yflags.sh                                        |   70 +
 t/yflags2.sh                                       |   70 +
 tests/ChangeLog-old                                | 1441 ---
 tests/CheckListOfTests.am                          |   67 -
 tests/Makefile.am                                  |  137 -
 tests/README                                       |  197 -
 tests/aclibobj.test                                |   51 -
 tests/acloca10.test                                |   96 -
 tests/acloca11.test                                |   44 -
 tests/acloca12.test                                |   45 -
 tests/acloca13.test                                |   71 -
 tests/acloca14.test                                |  121 -
 tests/acloca15.test                                |   45 -
 tests/acloca16.test                                |   36 -
 tests/acloca17.test                                |   39 -
 tests/acloca18.test                                |  121 -
 tests/acloca19.test                                |   51 -
 tests/acloca20.test                                |   53 -
 tests/acloca21.test                                |   32 -
 tests/acloca22.test                                |   49 -
 tests/aclocal-acdir.test                           |   97 -
 tests/aclocal-install-absdir.test                  |   35 -
 tests/aclocal-install-fail.test                    |   65 -
 tests/aclocal-install-mkdir.test                   |   72 -
 tests/aclocal-no-install-no-mkdir.test             |   39 -
 tests/aclocal-path-install-serial.test             |   88 -
 tests/aclocal-path-install.test                    |   55 -
 tests/aclocal-path-nonexistent.test                |   36 -
 tests/aclocal-path-precedence.test                 |   93 -
 tests/aclocal-path.test                            |   58 -
 tests/aclocal-print-acdir.test                     |   35 -
 tests/aclocal-verbose-install.test                 |   54 -
 tests/aclocal.in                                   |   17 -
 tests/aclocal.test                                 |   44 -
 tests/aclocal3.test                                |   34 -
 tests/aclocal4.test                                |   76 -
 tests/aclocal5.test                                |   74 -
 tests/aclocal6.test                                |   77 -
 tests/aclocal7.test                                |  118 -
 tests/aclocal8.test                                |   42 -
 tests/aclocal9.test                                |   49 -
 tests/acoutbs.test                                 |   43 -
 tests/acoutbs2.test                                |   48 -
 tests/acoutnoq.test                                |   37 -
 tests/acoutpt.test                                 |   34 -
 tests/acoutpt2.test                                |   46 -
 tests/acoutqnl.test                                |   34 -
 tests/acsilent.test                                |   40 -
 tests/acsubst.test                                 |   33 -
 tests/acsubst2.test                                |   34 -
 tests/all.test                                     |   36 -
 tests/all2.test                                    |   34 -
 tests/alloca.test                                  |   42 -
 tests/alloca2.test                                 |   42 -
 tests/alpha.test                                   |   72 -
 tests/alpha2.test                                  |   61 -
 tests/amassign.test                                |   30 -
 tests/amhello-binpkg.test                          |   52 -
 tests/amhello-cflags.test                          |   51 -
 tests/amhello-cross-compile.test                   |   54 -
 tests/ammissing.test                               |   27 -
 tests/amopt.test                                   |   41 -
 tests/amsubst.test                                 |   41 -
 tests/ansi.test                                    |   53 -
 tests/ansi10.test                                  |   75 -
 tests/ansi2.test                                   |   40 -
 tests/ansi2knr-deprecation.test                    |   69 -
 tests/ansi3.test                                   |   60 -
 tests/ansi3b.test                                  |   61 -
 tests/ansi4.test                                   |   42 -
 tests/ansi5.test                                   |   91 -
 tests/ansi6.test                                   |   85 -
 tests/ansi7.test                                   |   87 -
 tests/ansi8.test                                   |   30 -
 tests/ansi9.test                                   |   62 -
 tests/ar-lib.test                                  |  113 -
 tests/ar-lib2.test                                 |   40 -
 tests/ar-lib3.test                                 |   46 -
 tests/ar-lib4.test                                 |   57 -
 tests/ar-lib5a.test                                |   75 -
 tests/ar-lib5b.test                                |   99 -
 tests/ar-lib6a.test                                |   39 -
 tests/ar-lib6b.test                                |   39 -
 tests/ar-lib7.test                                 |   36 -
 tests/ar.test                                      |   46 -
 tests/ar2.test                                     |   40 -
 tests/ar3.test                                     |   43 -
 tests/ar4.test                                     |   39 -
 tests/ar5.test                                     |   42 -
 tests/asm.test                                     |  102 -
 tests/asm2.test                                    |  119 -
 tests/asm3.test                                    |  119 -
 tests/autodist-acconfig-no-subdir.test             |   58 -
 tests/autodist-acconfig.test                       |   46 -
 tests/autodist-aclocal-m4.test                     |   55 -
 tests/autodist-config-headers.test                 |   61 -
 tests/autodist-configure-no-subdir.test            |   72 -
 tests/autodist-no-duplicate.test                   |   52 -
 tests/autodist-stamp-vti.test                      |   60 -
 tests/autodist-subdir.test                         |  122 -
 tests/autodist.test                                |  109 -
 tests/autohdr.test                                 |   32 -
 tests/autohdr2.test                                |   32 -
 tests/autohdr3.test                                |   48 -
 tests/autohdr4.test                                |   69 -
 tests/autohdrdry.test                              |   45 -
 tests/automake.in                                  |   15 -
 tests/automake.test                                |   41 -
 tests/auxdir.test                                  |   40 -
 tests/auxdir2.test                                 |   33 -
 tests/auxdir3.test                                 |   31 -
 tests/auxdir4.test                                 |   35 -
 tests/backsl.test                                  |   36 -
 tests/backsl2.test                                 |   33 -
 tests/backsl3.test                                 |   31 -
 tests/backsl4.test                                 |   47 -
 tests/badline.test                                 |   35 -
 tests/badopt.test                                  |   27 -
 tests/badprog.test                                 |   34 -
 tests/block.test                                   |   36 -
 tests/bsource.test                                 |   33 -
 tests/canon-name.test                              |   38 -
 tests/canon.test                                   |   32 -
 tests/canon2.test                                  |   38 -
 tests/canon3.test                                  |   37 -
 tests/canon4.test                                  |   40 -
 tests/canon5.test                                  |   56 -
 tests/ccnoco.test                                  |   97 -
 tests/ccnoco2.test                                 |   55 -
 tests/ccnoco3.test                                 |   81 -
 tests/check-concurrency-bug9245.test               |   62 -
 tests/check-exported-srcdir.test                   |   65 -
 tests/check-tests-in-builddir.test                 |   94 -
 tests/check-tests_environment.test                 |   47 -
 tests/check.test                                   |   40 -
 tests/check10.test                                 |   85 -
 tests/check11.test                                 |   51 -
 tests/check12.test                                 |  206 -
 tests/check2.test                                  |   64 -
 tests/check3.test                                  |   77 -
 tests/check4.test                                  |   84 -
 tests/check5.test                                  |   57 -
 tests/check6.test                                  |   54 -
 tests/check7.test                                  |   66 -
 tests/check8.test                                  |  100 -
 tests/check9.test                                  |   78 -
 tests/checkall.test                                |   34 -
 tests/clean.test                                   |   28 -
 tests/clean2.test                                  |   53 -
 tests/colneq.test                                  |   34 -
 tests/colneq2.test                                 |   33 -
 tests/colon.test                                   |   36 -
 tests/colon2.test                                  |   41 -
 tests/colon3.test                                  |   61 -
 tests/colon4.test                                  |   42 -
 tests/colon5.test                                  |   51 -
 tests/colon6.test                                  |   53 -
 tests/colon7.test                                  |   50 -
 tests/color.test                                   |   99 -
 tests/color2.test                                  |  139 -
 tests/commen10.test                                |   34 -
 tests/commen11.test                                |   42 -
 tests/comment.test                                 |   29 -
 tests/comment2.test                                |   36 -
 tests/comment3.test                                |   33 -
 tests/comment4.test                                |   40 -
 tests/comment5.test                                |   86 -
 tests/comment6.test                                |   66 -
 tests/comment7.test                                |   55 -
 tests/comment8.test                                |   49 -
 tests/comment9.test                                |   53 -
 tests/comments-in-var-def.test                     |   58 -
 tests/compile.test                                 |   44 -
 tests/compile2.test                                |   81 -
 tests/compile3.test                                |   59 -
 tests/compile4.test                                |   93 -
 tests/compile5.test                                |   86 -
 tests/compile6.test                                |  106 -
 tests/compile_f90_c_cxx.test                       |   52 -
 tests/compile_f_c_cxx.test                         |   54 -
 tests/cond.test                                    |   42 -
 tests/cond10.test                                  |   47 -
 tests/cond11.test                                  |   64 -
 tests/cond13.test                                  |   58 -
 tests/cond14.test                                  |   54 -
 tests/cond15.test                                  |   63 -
 tests/cond16.test                                  |   64 -
 tests/cond17.test                                  |   44 -
 tests/cond18.test                                  |   70 -
 tests/cond19.test                                  |   84 -
 tests/cond2.test                                   |   43 -
 tests/cond20.test                                  |   50 -
 tests/cond21.test                                  |   76 -
 tests/cond22.test                                  |   69 -
 tests/cond23.test                                  |   37 -
 tests/cond24.test                                  |   38 -
 tests/cond25.test                                  |   39 -
 tests/cond26.test                                  |   38 -
 tests/cond27.test                                  |   38 -
 tests/cond28.test                                  |   38 -
 tests/cond29.test                                  |   53 -
 tests/cond3.test                                   |   82 -
 tests/cond30.test                                  |   57 -
 tests/cond31.test                                  |   55 -
 tests/cond32.test                                  |   69 -
 tests/cond33.test                                  |   69 -
 tests/cond34.test                                  |   68 -
 tests/cond35.test                                  |   96 -
 tests/cond36.test                                  |   62 -
 tests/cond37.test                                  |   59 -
 tests/cond38.test                                  |   67 -
 tests/cond39.test                                  |  111 -
 tests/cond4.test                                   |   79 -
 tests/cond40.test                                  |   87 -
 tests/cond41.test                                  |   33 -
 tests/cond42.test                                  |   59 -
 tests/cond43.test                                  |   45 -
 tests/cond44.test                                  |   40 -
 tests/cond45.test                                  |   41 -
 tests/cond5.test                                   |   72 -
 tests/cond6.test                                   |   43 -
 tests/cond7.test                                   |   41 -
 tests/cond8.test                                   |   38 -
 tests/cond9.test                                   |   43 -
 tests/condd.test                                   |   72 -
 tests/condhook.test                                |   50 -
 tests/condhook2.test                               |   49 -
 tests/condinc.test                                 |   44 -
 tests/condinc2.test                                |   43 -
 tests/condlib.test                                 |   46 -
 tests/condman.test                                 |   38 -
 tests/condman2.test                                |   35 -
 tests/condman3.test                                |   65 -
 tests/confdeps.test                                |   39 -
 tests/conff.test                                   |   97 -
 tests/conff2.test                                  |   38 -
 tests/conffile-leading-dot.test                    |   63 -
 tests/confh.test                                   |   65 -
 tests/confh4.test                                  |   50 -
 tests/confh5.test                                  |   61 -
 tests/confh6.test                                  |   49 -
 tests/confh7.test                                  |   47 -
 tests/confh8.test                                  |   68 -
 tests/configure.test                               |   56 -
 tests/confincl.test                                |   38 -
 tests/conflnk.test                                 |   72 -
 tests/conflnk2.test                                |   59 -
 tests/conflnk3.test                                |   88 -
 tests/conflnk4.test                                |   99 -
 tests/confsub.test                                 |   61 -
 tests/confvar.test                                 |   34 -
 tests/confvar2.test                                |   36 -
 tests/copy.test                                    |   25 -
 tests/ctarget1.test                                |   44 -
 tests/cxx.test                                     |   36 -
 tests/cxx2.test                                    |   32 -
 tests/cxxansi.test                                 |   47 -
 tests/cxxcpp.test                                  |   32 -
 tests/cxxlibobj.test                               |   42 -
 tests/cxxlink.test                                 |   41 -
 tests/cxxnoc.test                                  |   39 -
 tests/cxxo.test                                    |   36 -
 tests/cygwin32.test                                |   41 -
 tests/dash.test                                    |   31 -
 tests/defs.in                                      |  601 -
 tests/defun.test                                   |   28 -
 tests/defun2.test                                  |   40 -
 tests/dejagnu-absolute-builddir.test               |   62 -
 tests/dejagnu-relative-srcdir.test                 |   86 -
 tests/dejagnu-siteexp-append.test                  |   72 -
 tests/dejagnu-siteexp-extend.test                  |  161 -
 tests/dejagnu-siteexp-useredit.test                |   69 -
 tests/dejagnu.test                                 |   35 -
 tests/dejagnu2.test                                |   48 -
 tests/dejagnu3.test                                |   72 -
 tests/dejagnu4.test                                |   98 -
 tests/dejagnu5.test                                |   65 -
 tests/dejagnu6.test                                |   60 -
 tests/dejagnu7.test                                |   64 -
 tests/deleted-am.test                              |   61 -
 tests/deleted-m4.test                              |   67 -
 tests/depacl2.test                                 |   34 -
 tests/depcomp.test                                 |   50 -
 tests/depcomp10.test                               |   90 -
 tests/depcomp2.test                                |   54 -
 tests/depcomp3.test                                |   65 -
 tests/depcomp4.test                                |   61 -
 tests/depcomp5.test                                |   71 -
 tests/depcomp6.test                                |  112 -
 tests/depcomp7.test                                |  128 -
 tests/depcomp8a.test                               |   83 -
 tests/depcomp8b.test                               |   78 -
 tests/depcomp9.test                                |   92 -
 tests/depdist.test                                 |   56 -
 tests/depend.test                                  |   36 -
 tests/depend2.test                                 |   60 -
 tests/depend3.test                                 |   49 -
 tests/depend4.test                                 |   39 -
 tests/depend5.test                                 |   78 -
 tests/depend6.test                                 |   47 -
 tests/destdir.test                                 |   51 -
 tests/dirlist.test                                 |   59 -
 tests/dirlist2.test                                |   57 -
 tests/discover.test                                |   44 -
 tests/dist-auxfile-2.test                          |   62 -
 tests/dist-auxfile.test                            |   96 -
 tests/dist-included-parent-dir.test                |   51 -
 tests/dist-missing-am.test                         |   68 -
 tests/dist-missing-included-m4.test                |   70 -
 tests/dist-missing-m4.test                         |   72 -
 tests/dist-pr109765.test                           |   44 -
 tests/distcheck-configure-flags-am.test            |   70 -
 tests/distcheck-configure-flags-subpkg.test        |   83 -
 tests/distcheck-configure-flags.test               |   56 -
 tests/distcheck-hook-m4.am                         |   30 -
 tests/distcheck-hook.test                          |   53 -
 tests/distcheck-hook2.test                         |   81 -
 tests/distcheck-missing-m4.test                    |  120 -
 tests/distcheck-outdated-m4.test                   |  139 -
 tests/distcheck-override-infodir.test              |   63 -
 tests/distcheck-pr10470.test                       |   61 -
 tests/distcheck-pr9579.test                        |   98 -
 tests/distcleancheck.test                          |   72 -
 tests/distcom2.test                                |   71 -
 tests/distcom3.test                                |   60 -
 tests/distcom4.test                                |   79 -
 tests/distcom5.test                                |   86 -
 tests/distcom6.test                                |   72 -
 tests/distcom7.test                                |   47 -
 tests/distdir.test                                 |   85 -
 tests/distlinks.test                               |   77 -
 tests/distlinksbrk.test                            |   73 -
 tests/distname.test                                |   48 -
 tests/dmalloc.test                                 |   61 -
 tests/doc-parsing-buglets-colneq-subst.test        |   39 -
 tests/doc-parsing-buglets-tabs.test                |   61 -
 tests/dollar.test                                  |   46 -
 tests/dollarvar.test                               |   65 -
 tests/dollarvar2.test                              |   93 -
 tests/double.test                                  |   31 -
 tests/dup2.test                                    |   31 -
 tests/else.test                                    |   39 -
 tests/empty.test                                   |   32 -
 tests/empty2.test                                  |   37 -
 tests/empty3.test                                  |   34 -
 tests/empty4.test                                  |   40 -
 tests/exdir.test                                   |   32 -
 tests/exdir2.test                                  |   31 -
 tests/exdir3.test                                  |   37 -
 tests/exeext.test                                  |   89 -
 tests/exeext2.test                                 |   45 -
 tests/exeext3.test                                 |   43 -
 tests/exeext4.test                                 |   81 -
 tests/exsource.test                                |   40 -
 tests/ext.test                                     |   48 -
 tests/ext2.test                                    |   68 -
 tests/extra-portability.test                       |  105 -
 tests/extra-portability2.test                      |   57 -
 tests/extra-portability3.test                      |   63 -
 tests/extra.test                                   |   42 -
 tests/extra10.test                                 |   44 -
 tests/extra11.test                                 |   73 -
 tests/extra12.test                                 |   53 -
 tests/extra2.test                                  |   35 -
 tests/extra3.test                                  |   30 -
 tests/extra4.test                                  |   32 -
 tests/extra5.test                                  |   40 -
 tests/extra6.test                                  |   57 -
 tests/extra7.test                                  |   66 -
 tests/extra8.test                                  |   42 -
 tests/extradep.test                                |  109 -
 tests/extradep2.test                               |   90 -
 tests/f90only.test                                 |   37 -
 tests/flavor.test                                  |   61 -
 tests/flibs.test                                   |   57 -
 tests/fn99.test                                    |   57 -
 tests/fn99subdir.test                              |   83 -
 tests/fnoc.test                                    |   42 -
 tests/fo.test                                      |   39 -
 tests/fonly.test                                   |   37 -
 tests/forcemiss.test                               |   36 -
 tests/forcemiss2.test                              |   45 -
 tests/fort1.test                                   |   32 -
 tests/fort2.test                                   |   63 -
 tests/fort4.test                                   |   94 -
 tests/fort5.test                                   |  108 -
 tests/fortdep.test                                 |   41 -
 tests/gcj.test                                     |   34 -
 tests/gcj2.test                                    |   35 -
 tests/gcj3.test                                    |   35 -
 tests/gcj4.test                                    |   49 -
 tests/gcj5.test                                    |   34 -
 tests/gcj6.test                                    |   53 -
 tests/gen-parallel-tests                           |   49 -
 tests/get-sysconf.test                             |   65 -
 tests/gettext-macros.test                          |   94 -
 tests/gettext.test                                 |   89 -
 tests/gettext2.test                                |   63 -
 tests/gettext3.test                                |   49 -
 tests/gnits.test                                   |   44 -
 tests/gnits2.test                                  |  110 -
 tests/gnits3.test                                  |   96 -
 tests/gnumake.test                                 |   45 -
 tests/gnuwarn.test                                 |   51 -
 tests/gnuwarn2.test                                |   44 -
 tests/hdr-vars-defined-once.test                   |   47 -
 tests/header.test                                  |   38 -
 tests/help-depend.test                             |   41 -
 tests/help-depend2.test                            |   42 -
 tests/help-dmalloc.test                            |   39 -
 tests/help-init.test                               |   39 -
 tests/help-lispdir.test                            |   42 -
 tests/help-multilib.test                           |   38 -
 tests/help-python.test                             |   37 -
 tests/help-regex.test                              |   38 -
 tests/help-silent.test                             |   45 -
 tests/help-upc.test                                |   38 -
 tests/help.test                                    |   47 -
 tests/help2.test                                   |   53 -
 tests/help3.test                                   |   61 -
 tests/help4.test                                   |   55 -
 tests/hfs.test                                     |   35 -
 tests/hosts.test                                   |   55 -
 tests/implicit.test                                |   33 -
 tests/info.test                                    |   43 -
 tests/init.test                                    |   33 -
 tests/init2.test                                   |   32 -
 tests/insh2.test                                   |   32 -
 tests/install-info-dir.test                        |  178 -
 tests/install2.test                                |   53 -
 tests/installdir.test                              |   61 -
 tests/instdat.test                                 |   30 -
 tests/instdat2.test                                |   90 -
 tests/instdir-cond.test                            |   50 -
 tests/instdir-cond2.test                           |   53 -
 tests/instdir-java.test                            |   60 -
 tests/instdir-lisp.test                            |   58 -
 tests/instdir-ltlib.test                           |   75 -
 tests/instdir-no-empty.test                        |  123 -
 tests/instdir-prog.test                            |   73 -
 tests/instdir-python.test                          |   62 -
 tests/instdir-texi.test                            |   71 -
 tests/instdir.test                                 |   71 -
 tests/instdir2.test                                |   93 -
 tests/instexec.test                                |   29 -
 tests/instfail-info.test                           |   65 -
 tests/instfail-java.test                           |   63 -
 tests/instfail-libtool.test                        |   83 -
 tests/instfail.test                                |   96 -
 tests/insthook.test                                |   79 -
 tests/instman.test                                 |   37 -
 tests/instman2.test                                |   31 -
 tests/instmany-mans.test                           |  150 -
 tests/instmany-python.test                         |  138 -
 tests/instmany.test                                |  194 -
 tests/instsh.test                                  |   41 -
 tests/instsh2.test                                 |  117 -
 tests/instsh3.test                                 |   40 -
 tests/instspc.test                                 |  192 -
 tests/interp.test                                  |   40 -
 tests/interp2.test                                 |   35 -
 tests/java-check.test                              |   66 -
 tests/java-clean.test                              |   68 -
 tests/java-compile-install.test                    |   99 -
 tests/java-empty-classpath.test                    |   90 -
 tests/java-mix.test                                |   69 -
 tests/java-no-duplicate.test                       |   47 -
 tests/java-nobase.test                             |   67 -
 tests/java-sources.test                            |   67 -
 tests/java.test                                    |   55 -
 tests/java2.test                                   |   49 -
 tests/java3.test                                   |   59 -
 tests/javadir-undefined.test                       |   37 -
 tests/javaprim.test                                |   29 -
 tests/javasubst.test                               |   31 -
 tests/ldadd.test                                   |   48 -
 tests/ldflags.test                                 |   47 -
 tests/lex-subobj-nodep.test                        |   73 -
 tests/lex.test                                     |   47 -
 tests/lex2.test                                    |   36 -
 tests/lex3.test                                    |   89 -
 tests/lex4.test                                    |   40 -
 tests/lex5.test                                    |   99 -
 tests/lflags.test                                  |   75 -
 tests/lflags2.test                                 |   76 -
 tests/libexec.test                                 |   37 -
 tests/libobj10.test                                |   45 -
 tests/libobj11.test                                |   41 -
 tests/libobj12.test                                |   71 -
 tests/libobj13.test                                |   51 -
 tests/libobj14.test                                |   45 -
 tests/libobj2.test                                 |   47 -
 tests/libobj3.test                                 |   39 -
 tests/libobj4.test                                 |   32 -
 tests/libobj5.test                                 |   37 -
 tests/libobj7.test                                 |   52 -
 tests/libobj8.test                                 |   52 -
 tests/library.test                                 |   37 -
 tests/library2.test                                |   33 -
 tests/library3.test                                |   54 -
 tests/libtoo10.test                                |   61 -
 tests/libtoo11.test                                |   38 -
 tests/libtool-macros.test                          |   60 -
 tests/libtool.test                                 |   38 -
 tests/libtool2.test                                |   53 -
 tests/libtool3.test                                |   90 -
 tests/libtool4.test                                |   39 -
 tests/libtool5.test                                |   46 -
 tests/libtool6.test                                |   47 -
 tests/libtool7.test                                |  101 -
 tests/libtool8.test                                |   55 -
 tests/libtool9.test                                |  104 -
 tests/license.test                                 |   63 -
 tests/license2.test                                |   41 -
 tests/link_c_cxx.test                              |   47 -
 tests/link_cond.test                               |   90 -
 tests/link_dist.test                               |   49 -
 tests/link_f90_only.test                           |   47 -
 tests/link_f_only.test                             |   47 -
 tests/link_fc.test                                 |   49 -
 tests/link_fccxx.test                              |   49 -
 tests/link_fcxx.test                               |   48 -
 tests/lisp2.test                                   |   69 -
 tests/lisp3.test                                   |   69 -
 tests/lisp4.test                                   |   80 -
 tests/lisp5.test                                   |   71 -
 tests/lisp6.test                                   |  104 -
 tests/lisp7.test                                   |   52 -
 tests/lisp8.test                                   |   63 -
 tests/lispdry.test                                 |   60 -
 tests/list-of-tests.mk                             |  973 --
 tests/listval.test                                 |   43 -
 tests/location.test                                |   76 -
 tests/longlin2.test                                |   50 -
 tests/longline.test                                |   32 -
 tests/ltcond.test                                  |  105 -
 tests/ltcond2.test                                 |   78 -
 tests/ltconv.test                                  |  156 -
 tests/ltdeps.test                                  |   63 -
 tests/ltinit.test                                  |   65 -
 tests/ltinstloc.test                               |   69 -
 tests/ltlibobjs.test                               |   41 -
 tests/ltlibsrc.test                                |   71 -
 tests/ltorder.test                                 |   63 -
 tests/lzip.test                                    |   43 -
 tests/lzma.test                                    |   56 -
 tests/m4-inclusion.test                            |   55 -
 tests/maintclean-vpath.test                        |  106 -
 tests/maintclean.test                              |   98 -
 tests/maintmode-configure-msg.test                 |   79 -
 tests/make-dryrun.test                             |   67 -
 tests/make.test                                    |   59 -
 tests/makefile-deps.test                           |   31 -
 tests/makej.test                                   |   53 -
 tests/makej2.test                                  |   46 -
 tests/maken.test                                   |   64 -
 tests/maken3.test                                  |  181 -
 tests/makevars.test                                |   33 -
 tests/man.test                                     |   31 -
 tests/man2.test                                    |   51 -
 tests/man3.test                                    |   44 -
 tests/man4.test                                    |  109 -
 tests/man5.test                                    |   67 -
 tests/mdate.test                                   |   40 -
 tests/mdate2.test                                  |   38 -
 tests/mdate3.test                                  |   51 -
 tests/mdate4.test                                  |   45 -
 tests/mdate5.test                                  |   44 -
 tests/mdate6.test                                  |   35 -
 tests/missing.test                                 |   66 -
 tests/missing2.test                                |   57 -
 tests/missing3.test                                |   52 -
 tests/missing4.test                                |   49 -
 tests/missing5.test                                |   63 -
 tests/missing6.test                                |   51 -
 tests/mkinst2.test                                 |   38 -
 tests/mkinst3.test                                 |   66 -
 tests/mkinstall.test                               |   31 -
 tests/mmode.test                                   |   66 -
 tests/mmodely.test                                 |   95 -
 tests/multlib.test                                 |  159 -
 tests/nobase-libtool.test                          |   94 -
 tests/nobase-nodist.test                           |   62 -
 tests/nobase-python.test                           |   81 -
 tests/nobase.test                                  |  146 -
 tests/nodef.test                                   |   59 -
 tests/nodef2.test                                  |   55 -
 tests/nodep.test                                   |   42 -
 tests/nodep2.test                                  |   52 -
 tests/nodepcomp.test                               |   28 -
 tests/nodist.test                                  |   42 -
 tests/nodist2.test                                 |   38 -
 tests/nodist3.test                                 |   37 -
 tests/nogzip.test                                  |   41 -
 tests/nogzip2.test                                 |   37 -
 tests/noinst.test                                  |   30 -
 tests/noinstdir.test                               |   48 -
 tests/nolink.test                                  |   38 -
 tests/nostdinc.test                                |   53 -
 tests/notrans.test                                 |  133 -
 tests/number.test                                  |   34 -
 tests/objc.test                                    |   34 -
 tests/objc2.test                                   |   33 -
 tests/objext-pr10128.test                          |   60 -
 tests/obsolete.test                                |   51 -
 tests/order.test                                   |   34 -
 tests/outdir.test                                  |   32 -
 tests/output-order.test                            |   55 -
 tests/output.test                                  |   33 -
 tests/output10.test                                |   63 -
 tests/output11.test                                |   65 -
 tests/output12.test                                |   62 -
 tests/output13.test                                |   52 -
 tests/output2.test                                 |   38 -
 tests/output3.test                                 |   36 -
 tests/output4.test                                 |   35 -
 tests/output5.test                                 |   34 -
 tests/output6.test                                 |   70 -
 tests/output7.test                                 |   74 -
 tests/output8.test                                 |   54 -
 tests/output9.test                                 |   54 -
 tests/overrid.test                                 |   67 -
 tests/parallel-am.test                             |  104 -
 tests/parallel-am2.test                            |   78 -
 tests/parallel-am3.test                            |   75 -
 tests/parallel-tests-dryrun.test                   |   93 -
 tests/parallel-tests-harderror.test                |   98 -
 tests/parallel-tests-log-compiler-example.test     |   71 -
 tests/parallel-tests-log-override-1.test           |  112 -
 tests/parallel-tests-log-override-2.test           |   88 -
 tests/parallel-tests-log-override-recheck.test     |   92 -
 tests/parallel-tests-subdir.test                   |   51 -
 tests/parallel-tests-unreadable-log.test           |   60 -
 tests/parallel-tests.test                          |  154 -
 tests/parallel-tests10.test                        |   48 -
 tests/parallel-tests2.test                         |  124 -
 tests/parallel-tests3.test                         |   91 -
 tests/parallel-tests4.test                         |   69 -
 tests/parallel-tests5.test                         |   67 -
 tests/parallel-tests6.test                         |   43 -
 tests/parallel-tests7.test                         |   90 -
 tests/parallel-tests8.test                         |   77 -
 tests/parallel-tests9.test                         |   88 -
 tests/parse.test                                   |   40 -
 tests/percent.test                                 |   38 -
 tests/percent2.test                                |   41 -
 tests/phony.test                                   |   31 -
 tests/pluseq.test                                  |   30 -
 tests/pluseq10.test                                |   57 -
 tests/pluseq11.test                                |   54 -
 tests/pluseq2.test                                 |   49 -
 tests/pluseq3.test                                 |   53 -
 tests/pluseq4.test                                 |   36 -
 tests/pluseq5.test                                 |   63 -
 tests/pluseq6.test                                 |   40 -
 tests/pluseq7.test                                 |   41 -
 tests/pluseq8.test                                 |   46 -
 tests/pluseq9.test                                 |   73 -
 tests/pm/Condition-t.pl                            |  301 -
 tests/pm/Condition.pl                              |  260 -
 tests/pm/DisjConditions-t.pl                       |  436 -
 tests/pm/DisjConditions.pl                         |  383 -
 tests/pm/Version.pl                                |   99 -
 tests/pm/Wrap.pl                                   |   80 -
 tests/postproc.test                                |   49 -
 tests/ppf77.test                                   |   35 -
 tests/pr2.test                                     |   54 -
 tests/pr204.test                                   |   81 -
 tests/pr211.test                                   |   53 -
 tests/pr220.test                                   |   69 -
 tests/pr224.test                                   |   63 -
 tests/pr229.test                                   |   37 -
 tests/pr243.test                                   |   59 -
 tests/pr266.test                                   |   48 -
 tests/pr279-2.test                                 |   53 -
 tests/pr279.test                                   |   52 -
 tests/pr287.test                                   |   51 -
 tests/pr300-lib.test                               |   77 -
 tests/pr300-ltlib.test                             |   86 -
 tests/pr300-prog.test                              |   74 -
 tests/pr307.test                                   |   94 -
 tests/pr401.test                                   |  183 -
 tests/pr401b.test                                  |  184 -
 tests/pr401c.test                                  |  186 -
 tests/pr72.test                                    |   46 -
 tests/pr8365-remake-timing.test                    |  110 -
 tests/pr87.test                                    |   74 -
 tests/pr9.test                                     |   60 -
 tests/prefix.test                                  |   35 -
 tests/primary-prefix-couples-documented-valid.test |   89 -
 tests/primary-prefix-couples-force-valid.test      |   89 -
 tests/primary-prefix-invalid-couples.test          |  189 -
 tests/primary-prefix-valid-couples.test            |   90 -
 tests/primary.test                                 |   33 -
 tests/primary2.test                                |   35 -
 tests/primary3.test                                |   42 -
 tests/proginst.test                                |   32 -
 tests/py-compile-basedir.test                      |   51 -
 tests/py-compile-basic.test                        |   64 -
 tests/py-compile-basic2.test                       |   71 -
 tests/py-compile-destdir.test                      |   44 -
 tests/py-compile-env.test                          |   60 -
 tests/py-compile-option-terminate.test             |   44 -
 tests/py-compile-usage.test                        |   75 -
 tests/python-pr10995.test                          |   60 -
 tests/python.test                                  |   58 -
 tests/python10.test                                |   83 -
 tests/python11.test                                |   55 -
 tests/python12.test                                |   58 -
 tests/python2.test                                 |  106 -
 tests/python3.test                                 |   49 -
 tests/python4.test                                 |   38 -
 tests/python5.test                                 |   39 -
 tests/python6.test                                 |   41 -
 tests/python7.test                                 |   41 -
 tests/python8.test                                 |   39 -
 tests/python9.test                                 |   40 -
 tests/recurs.test                                  |   39 -
 tests/recurs2.test                                 |   31 -
 tests/regex-obsolete.test                          |   32 -
 tests/regex.test                                   |   30 -
 tests/remake-am-pr10111.test                       |   64 -
 tests/remake-deleted-am-2.test                     |   77 -
 tests/remake-deleted-am-subdir.test                |   79 -
 tests/remake-deleted-am.test                       |   69 -
 tests/remake-m4-pr10111.test                       |   62 -
 tests/remake-renamed-am.test                       |   60 -
 tests/remake-subdir-from-subdir.test               |   56 -
 tests/remake-subdir-gnu.test                       |   80 -
 tests/remake-subdir-long-time.test                 |  116 -
 tests/remake-subdir.test                           |   81 -
 tests/remake-subdir2.test                          |   82 -
 tests/remake.test                                  |   33 -
 tests/remake2.test                                 |   33 -
 tests/remake3.test                                 |   35 -
 tests/remake4.test                                 |   56 -
 tests/remake5.test                                 |   72 -
 tests/remake6.test                                 |   64 -
 tests/remake7.test                                 |   70 -
 tests/req.test                                     |   37 -
 tests/reqd.test                                    |   47 -
 tests/reqd2.test                                   |   59 -
 tests/rulepat.test                                 |   28 -
 tests/sanity.test                                  |   45 -
 tests/scripts.test                                 |   30 -
 tests/seenc.test                                   |   41 -
 tests/self-check-env-sanitize.test                 |   30 -
 tests/self-check-report.test                       |   47 -
 tests/silent-configsite.test                       |   86 -
 tests/silent-lex-gcc.test                          |  146 -
 tests/silent-lex-generic.test                      |  150 -
 tests/silent-many-gcc.test                         |  225 -
 tests/silent-many-generic.test                     |  227 -
 tests/silent-nested-vars.test                      |  149 -
 tests/silent-yacc-gcc.test                         |  145 -
 tests/silent-yacc-generic.test                     |  145 -
 tests/silent.test                                  |   84 -
 tests/silent2.test                                 |   86 -
 tests/silent3.test                                 |   89 -
 tests/silent4.test                                 |   90 -
 tests/silent6.test                                 |  109 -
 tests/silent7.test                                 |   94 -
 tests/silent9.test                                 |   89 -
 tests/silentcxx.test                               |  105 -
 tests/silentf77.test                               |   94 -
 tests/silentf90.test                               |   94 -
 tests/space.test                                   |   29 -
 tests/specflg-dummy.test                           |  249 -
 tests/specflg.test                                 |   53 -
 tests/specflg10.test                               |   89 -
 tests/specflg2.test                                |   61 -
 tests/specflg3.test                                |   48 -
 tests/specflg6.test                                |   54 -
 tests/specflg7.test                                |   64 -
 tests/specflg8.test                                |   66 -
 tests/specflg9.test                                |   47 -
 tests/spell.test                                   |   31 -
 tests/spell2.test                                  |   33 -
 tests/spell3.test                                  |   29 -
 tests/spelling.test                                |   29 -
 tests/spy.test                                     |  108 -
 tests/srcsub.test                                  |   35 -
 tests/srcsub2.test                                 |   38 -
 tests/stamph2.test                                 |   71 -
 tests/stdinc.test                                  |   63 -
 tests/stdlib.test                                  |   55 -
 tests/stdlib2.test                                 |   96 -
 tests/strip.test                                   |   51 -
 tests/strip2.test                                  |   55 -
 tests/strip3.test                                  |   55 -
 tests/subcond.test                                 |   44 -
 tests/subcond2.test                                |   91 -
 tests/subcond3.test                                |   92 -
 tests/subdir.test                                  |   43 -
 tests/subdir10.test                                |   39 -
 tests/subdir2.test                                 |   55 -
 tests/subdir3.test                                 |   38 -
 tests/subdir4.test                                 |   72 -
 tests/subdir5.test                                 |  116 -
 tests/subdir6.test                                 |   42 -
 tests/subdir7.test                                 |   47 -
 tests/subdir8.test                                 |  118 -
 tests/subdir9.test                                 |   57 -
 tests/subdirbuiltsources.test                      |   72 -
 tests/subobj.test                                  |   48 -
 tests/subobj10.test                                |   57 -
 tests/subobj11a.test                               |   82 -
 tests/subobj11b.test                               |   87 -
 tests/subobj11c.test                               |   53 -
 tests/subobj2.test                                 |   40 -
 tests/subobj3.test                                 |   68 -
 tests/subobj4.test                                 |   54 -
 tests/subobj5.test                                 |   48 -
 tests/subobj6.test                                 |   88 -
 tests/subobj7.test                                 |   40 -
 tests/subobj8.test                                 |   49 -
 tests/subobj9.test                                 |   86 -
 tests/subobjname.test                              |   74 -
 tests/subpkg-yacc.test                             |  151 -
 tests/subpkg.test                                  |  115 -
 tests/subpkg2.test                                 |   68 -
 tests/subpkg3.test                                 |   57 -
 tests/subpkg4.test                                 |   73 -
 tests/subst.test                                   |   42 -
 tests/subst2.test                                  |   53 -
 tests/subst3.test                                  |  178 -
 tests/subst4.test                                  |   46 -
 tests/substre2.test                                |   53 -
 tests/substref.test                                |   71 -
 tests/substtarg.test                               |   53 -
 tests/suffix.test                                  |   39 -
 tests/suffix10.test                                |   56 -
 tests/suffix11.test                                |   65 -
 tests/suffix12.test                                |   56 -
 tests/suffix13.test                                |   78 -
 tests/suffix2.test                                 |   50 -
 tests/suffix3.test                                 |   45 -
 tests/suffix4.test                                 |   39 -
 tests/suffix5.test                                 |   48 -
 tests/suffix6.test                                 |   46 -
 tests/suffix7.test                                 |   39 -
 tests/suffix8.test                                 |   85 -
 tests/suffix9.test                                 |   66 -
 tests/symlink.test                                 |   38 -
 tests/symlink2.test                                |   37 -
 tests/syntax.test                                  |   34 -
 tests/tags.test                                    |   31 -
 tests/tagsub.test                                  |   49 -
 tests/tar-override.test                            |   67 -
 tests/tar.test                                     |   40 -
 tests/tar2.test                                    |   40 -
 tests/tar3.test                                    |   48 -
 tests/target-cflags.test                           |   74 -
 tests/targetclash.test                             |   35 -
 tests/test-extensions-cond.test                    |   72 -
 tests/test-extensions.test                         |   74 -
 tests/tests-environment-backcompat.test            |   61 -
 tests/transform.test                               |   66 -
 tests/transform2.test                              |   97 -
 tests/txinfo.test                                  |   50 -
 tests/txinfo10.test                                |   41 -
 tests/txinfo13.test                                |   67 -
 tests/txinfo16.test                                |   93 -
 tests/txinfo17.test                                |   41 -
 tests/txinfo18.test                                |   77 -
 tests/txinfo19.test                                |   72 -
 tests/txinfo2.test                                 |   48 -
 tests/txinfo20.test                                |   78 -
 tests/txinfo21.test                                |  176 -
 tests/txinfo22.test                                |   71 -
 tests/txinfo23.test                                |   68 -
 tests/txinfo24.test                                |   85 -
 tests/txinfo25.test                                |  113 -
 tests/txinfo26.test                                |   69 -
 tests/txinfo27.test                                |   48 -
 tests/txinfo28.test                                |   90 -
 tests/txinfo29.test                                |   64 -
 tests/txinfo3.test                                 |   56 -
 tests/txinfo30.test                                |   59 -
 tests/txinfo31.test                                |   31 -
 tests/txinfo32.test                                |   42 -
 tests/txinfo33.test                                |  128 -
 tests/txinfo4.test                                 |   35 -
 tests/txinfo5.test                                 |   41 -
 tests/txinfo5b.test                                |   44 -
 tests/txinfo6.test                                 |   35 -
 tests/txinfo7.test                                 |   35 -
 tests/txinfo8.test                                 |   65 -
 tests/txinfo9.test                                 |   43 -
 tests/uninstall-fail.test                          |   98 -
 tests/uninstall-pr9578.test                        |   69 -
 tests/unused.test                                  |   38 -
 tests/upc.test                                     |   49 -
 tests/upc2.test                                    |   33 -
 tests/upc3.test                                    |   64 -
 tests/vala-mix.test                                |  126 -
 tests/vala-mix2.test                               |  121 -
 tests/vala-vapi.test                               |   91 -
 tests/vala-vpath.test                              |   72 -
 tests/vala.test                                    |   93 -
 tests/vala1.test                                   |   59 -
 tests/vala2.test                                   |   94 -
 tests/vala3.test                                   |  103 -
 tests/vala4.test                                   |   66 -
 tests/vala5.test                                   |   90 -
 tests/vars.test                                    |   32 -
 tests/vars3.test                                   |   84 -
 tests/vartar.test                                  |   39 -
 tests/version.test                                 |   43 -
 tests/version2.test                                |   43 -
 tests/version3.test                                |   29 -
 tests/version4.test                                |   28 -
 tests/version6.test                                |   30 -
 tests/version7.test                                |   67 -
 tests/version8.test                                |   25 -
 tests/vpath.test                                   |   32 -
 tests/vtexi.test                                   |   65 -
 tests/vtexi2.test                                  |   45 -
 tests/vtexi3.test                                  |  126 -
 tests/vtexi4.test                                  |  118 -
 tests/warnopts.test                                |   74 -
 tests/werror.test                                  |   28 -
 tests/werror2.test                                 |   51 -
 tests/werror3.test                                 |   49 -
 tests/whoami.test                                  |   29 -
 tests/xsource.test                                 |   41 -
 tests/xz.test                                      |   41 -
 tests/yacc-dist-nobuild-subdir.test                |   93 -
 tests/yacc.test                                    |   37 -
 tests/yacc2.test                                   |   86 -
 tests/yacc3.test                                   |   53 -
 tests/yacc4.test                                   |   91 -
 tests/yacc5.test                                   |   85 -
 tests/yacc6.test                                   |  108 -
 tests/yacc7.test                                   |   90 -
 tests/yacc8.test                                   |  112 -
 tests/yaccdry.test                                 |   60 -
 tests/yaccpp.test                                  |   36 -
 tests/yaccvpath.test                               |  106 -
 tests/yflags.test                                  |   73 -
 tests/yflags2.test                                 |   74 -
 2349 files changed, 143751 insertions(+), 102066 deletions(-)
 create mode 100644 .autom4te.cfg
 create mode 100644 .git-log-fix
 delete mode 100644 ChangeLog.00
 delete mode 100644 ChangeLog.01
 delete mode 100644 ChangeLog.02
 delete mode 100644 ChangeLog.03
 delete mode 100644 ChangeLog.04
 delete mode 100644 ChangeLog.09
 delete mode 100644 ChangeLog.11
 delete mode 100644 ChangeLog.96
 delete mode 100644 ChangeLog.98
 create mode 100644 GNUmakefile
 delete mode 100644 TODO
 delete mode 100644 contrib/Makefile.am
 create mode 100644 contrib/check-html.am
 create mode 100644 contrib/multilib/README
 create mode 100644 contrib/multilib/config-ml.in
 create mode 100644 contrib/multilib/multilib.am
 create mode 100755 contrib/multilib/symlink-tree
 create mode 100644 defs
 create mode 100644 defs-static.in
 delete mode 100644 doc/Makefile.am
 create mode 100644 doc/automake-history.texi
 create mode 100755 doc/help2man
 create mode 100755 gen-testsuite-part
 delete mode 100644 lib/Automake/Struct.pm
 delete mode 100644 lib/Makefile.am
 delete mode 100755 lib/acinstall
 delete mode 100644 lib/am/ansi2knr.am
 delete mode 100644 lib/am/check-html.am
 delete mode 100644 lib/am/multilib.am
 delete mode 100644 lib/ansi2knr.1
 delete mode 100644 lib/ansi2knr.c
 delete mode 100644 lib/config-ml.in
 delete mode 100755 lib/symlink-tree
 create mode 100755 lib/tap-driver.pl
 create mode 100755 lib/tap-driver.sh
 create mode 100755 lib/test-driver
 delete mode 100644 m4/Makefile.am
 create mode 100644 m4/acdir/README
 delete mode 100644 m4/acdir/dirlist
 delete mode 100644 m4/multi.m4
 delete mode 100644 m4/regex.m4
 create mode 100644 old/ChangeLog-tests
 create mode 100644 old/ChangeLog.00
 create mode 100644 old/ChangeLog.01
 create mode 100644 old/ChangeLog.02
 create mode 100644 old/ChangeLog.03
 create mode 100644 old/ChangeLog.04
 create mode 100644 old/ChangeLog.09
 create mode 100644 old/ChangeLog.11
 create mode 100644 old/ChangeLog.96
 create mode 100644 old/ChangeLog.98
 create mode 100644 old/TODO
 create mode 100644 syntax-checks.mk
 create mode 100644 t/CheckListOfTests.am
 create mode 100644 t/README
 create mode 100755 t/ac-output-old.tap
 create mode 100755 t/acloca10.sh
 create mode 100755 t/acloca11.sh
 create mode 100755 t/acloca12.sh
 create mode 100755 t/acloca13.sh
 create mode 100755 t/acloca14.sh
 create mode 100755 t/acloca15.sh
 create mode 100755 t/acloca16.sh
 create mode 100755 t/acloca17.sh
 create mode 100755 t/acloca18.sh
 create mode 100755 t/acloca19.sh
 create mode 100755 t/acloca20.sh
 create mode 100755 t/acloca21.sh
 create mode 100755 t/acloca22.sh
 create mode 100755 t/acloca23.sh
 create mode 100755 t/aclocal-acdir.sh
 create mode 100755 t/aclocal-install-absdir.sh
 create mode 100755 t/aclocal-install-fail.sh
 create mode 100755 t/aclocal-install-mkdir.sh
 create mode 100755 t/aclocal-no-install-no-mkdir.sh
 create mode 100755 t/aclocal-path-install-serial.sh
 create mode 100755 t/aclocal-path-install.sh
 create mode 100755 t/aclocal-path-nonexistent.sh
 create mode 100755 t/aclocal-path-precedence.sh
 create mode 100755 t/aclocal-path.sh
 create mode 100755 t/aclocal-print-acdir.sh
 create mode 100755 t/aclocal-verbose-install.sh
 create mode 100755 t/aclocal.sh
 create mode 100755 t/aclocal3.sh
 create mode 100755 t/aclocal4.sh
 create mode 100755 t/aclocal5.sh
 create mode 100755 t/aclocal6.sh
 create mode 100755 t/aclocal7.sh
 create mode 100755 t/aclocal8.sh
 create mode 100755 t/aclocal9.sh
 create mode 100755 t/acsilent.sh
 create mode 100755 t/acsubst.sh
 create mode 100755 t/acsubst2.sh
 create mode 100755 t/add-missing.tap
 create mode 100755 t/all.sh
 create mode 100755 t/all2.sh
 create mode 100755 t/alloca.sh
 create mode 100755 t/alloca2.sh
 create mode 100755 t/alpha.sh
 create mode 100755 t/alpha2.sh
 create mode 100755 t/am-tests-environment.sh
 create mode 100755 t/amassign.sh
 create mode 100755 t/amhello-binpkg.sh
 create mode 100755 t/amhello-cflags.sh
 create mode 100755 t/amhello-cross-compile.sh
 create mode 100755 t/ammissing.sh
 create mode 100755 t/amopt.sh
 create mode 100755 t/amopts-location.sh
 create mode 100755 t/amopts-variable-expansion.sh
 create mode 100755 t/amsubst.sh
 create mode 100755 t/ansi2knr-no-more.sh
 create mode 100755 t/ar-lib.sh
 create mode 100755 t/ar-lib2.sh
 create mode 100755 t/ar-lib3.sh
 create mode 100755 t/ar-lib4.sh
 create mode 100755 t/ar-lib5a.sh
 create mode 100755 t/ar-lib5b.sh
 create mode 100755 t/ar-lib6a.sh
 create mode 100755 t/ar-lib6b.sh
 create mode 100755 t/ar-lib7.sh
 create mode 100755 t/ar.sh
 create mode 100755 t/ar2.sh
 create mode 100755 t/ar3.sh
 create mode 100755 t/ar4.sh
 create mode 100755 t/ar5.sh
 create mode 100755 t/asm.sh
 create mode 100755 t/asm2.sh
 create mode 100755 t/asm3.sh
 create mode 100755 t/autodist-acconfig-no-subdir.sh
 create mode 100755 t/autodist-acconfig.sh
 create mode 100755 t/autodist-aclocal-m4.sh
 create mode 100755 t/autodist-config-headers.sh
 create mode 100755 t/autodist-configure-no-subdir.sh
 create mode 100755 t/autodist-no-duplicate.sh
 create mode 100755 t/autodist-stamp-vti.sh
 create mode 100755 t/autodist-subdir.sh
 create mode 100755 t/autodist.sh
 create mode 100755 t/autohdr.sh
 create mode 100755 t/autohdr2.sh
 create mode 100755 t/autohdr3.sh
 create mode 100755 t/autohdr4.sh
 create mode 100755 t/autohdrdry.sh
 create mode 100755 t/automake-cmdline.tap
 create mode 100755 t/auxdir-autodetect.sh
 create mode 100755 t/auxdir-computed.tap
 create mode 100755 t/auxdir-misplaced.sh
 create mode 100755 t/auxdir-nonexistent.sh
 create mode 100755 t/auxdir-unportable.tap
 create mode 100755 t/auxdir.sh
 create mode 100755 t/auxdir6.sh
 create mode 100755 t/auxdir7.sh
 create mode 100755 t/auxdir8.sh
 create mode 100644 t/ax/depcomp.sh
 create mode 100644 t/ax/distcheck-hook-m4.am
 create mode 100644 t/ax/extract-testsuite-summary.pl
 create mode 100755 t/ax/is
 create mode 100644 t/ax/plain-functions.sh
 create mode 100644 t/ax/tap-functions.sh
 create mode 100644 t/ax/tap-setup.sh
 create mode 100644 t/ax/tap-summary-aux.sh
 create mode 100644 t/ax/testsuite-summary-checks.sh
 create mode 100644 t/ax/trivial-test-driver
 create mode 100755 t/backcompat.sh
 create mode 100755 t/backcompat2.sh
 create mode 100755 t/backcompat3.sh
 create mode 100755 t/backcompat4.sh
 create mode 100755 t/backcompat5.sh
 create mode 100755 t/backcompat6.sh
 create mode 100755 t/backsl.sh
 create mode 100755 t/backsl2.sh
 create mode 100755 t/backsl3.sh
 create mode 100755 t/backsl4.sh
 create mode 100755 t/badline.sh
 create mode 100755 t/badopt.sh
 create mode 100755 t/badprog.sh
 create mode 100755 t/block.sh
 create mode 100755 t/bsource.sh
 create mode 100755 t/candist.sh
 create mode 100755 t/canon-name.sh
 create mode 100755 t/canon.sh
 create mode 100755 t/canon2.sh
 create mode 100755 t/canon3.sh
 create mode 100755 t/canon4.sh
 create mode 100755 t/canon5.sh
 create mode 100755 t/canon6.sh
 create mode 100755 t/canon7.sh
 create mode 100755 t/canon8.sh
 create mode 100755 t/ccnoco.sh
 create mode 100755 t/ccnoco2.sh
 create mode 100755 t/ccnoco3.sh
 create mode 100755 t/check-concurrency-bug9245.sh
 create mode 100755 t/check-exported-srcdir.sh
 create mode 100755 t/check-fd-redirect.sh
 create mode 100755 t/check-no-test-driver.sh
 create mode 100755 t/check-subst-prog.sh
 create mode 100755 t/check-subst.sh
 create mode 100755 t/check-tests-in-builddir.sh
 create mode 100755 t/check.sh
 create mode 100755 t/check10.sh
 create mode 100755 t/check11.sh
 create mode 100755 t/check12.sh
 create mode 100755 t/check2.sh
 create mode 100755 t/check3.sh
 create mode 100755 t/check4.sh
 create mode 100755 t/check5.sh
 create mode 100755 t/check6.sh
 create mode 100755 t/check7.sh
 create mode 100755 t/check8.sh
 create mode 100755 t/checkall.sh
 create mode 100755 t/clean.sh
 create mode 100755 t/clean2.sh
 create mode 100755 t/colneq.sh
 create mode 100755 t/colneq2.sh
 create mode 100755 t/colneq3.sh
 create mode 100755 t/colon.sh
 create mode 100755 t/colon2.sh
 create mode 100755 t/colon3.sh
 create mode 100755 t/colon4.sh
 create mode 100755 t/colon5.sh
 create mode 100755 t/colon6.sh
 create mode 100755 t/colon7.sh
 create mode 100755 t/color.sh
 create mode 100755 t/color2.sh
 create mode 100755 t/commen10.sh
 create mode 100755 t/commen11.sh
 create mode 100755 t/comment.sh
 create mode 100755 t/comment2.sh
 create mode 100755 t/comment3.sh
 create mode 100755 t/comment4.sh
 create mode 100755 t/comment5.sh
 create mode 100755 t/comment6.sh
 create mode 100755 t/comment7.sh
 create mode 100755 t/comment8.sh
 create mode 100755 t/comment9.sh
 create mode 100755 t/comments-in-var-def.sh
 create mode 100755 t/compile.sh
 create mode 100755 t/compile2.sh
 create mode 100755 t/compile3.sh
 create mode 100755 t/compile4.sh
 create mode 100755 t/compile5.sh
 create mode 100755 t/compile6.sh
 create mode 100755 t/compile_f90_c_cxx.sh
 create mode 100755 t/compile_f_c_cxx.sh
 create mode 100755 t/cond-basic.sh
 create mode 100755 t/cond.sh
 create mode 100755 t/cond10.sh
 create mode 100755 t/cond11.sh
 create mode 100755 t/cond13.sh
 create mode 100755 t/cond14.sh
 create mode 100755 t/cond15.sh
 create mode 100755 t/cond16.sh
 create mode 100755 t/cond17.sh
 create mode 100755 t/cond18.sh
 create mode 100755 t/cond19.sh
 create mode 100755 t/cond2.sh
 create mode 100755 t/cond20.sh
 create mode 100755 t/cond21.sh
 create mode 100755 t/cond22.sh
 create mode 100755 t/cond23.sh
 create mode 100755 t/cond24.sh
 create mode 100755 t/cond25.sh
 create mode 100755 t/cond26.sh
 create mode 100755 t/cond27.sh
 create mode 100755 t/cond28.sh
 create mode 100755 t/cond29.sh
 create mode 100755 t/cond3.sh
 create mode 100755 t/cond30.sh
 create mode 100755 t/cond31.sh
 create mode 100755 t/cond32.sh
 create mode 100755 t/cond33.sh
 create mode 100755 t/cond34.sh
 create mode 100755 t/cond35.sh
 create mode 100755 t/cond36.sh
 create mode 100755 t/cond37.sh
 create mode 100755 t/cond38.sh
 create mode 100755 t/cond39.sh
 create mode 100755 t/cond4.sh
 create mode 100755 t/cond40.sh
 create mode 100755 t/cond41.sh
 create mode 100755 t/cond42.sh
 create mode 100755 t/cond43.sh
 create mode 100755 t/cond44.sh
 create mode 100755 t/cond45.sh
 create mode 100755 t/cond46.sh
 create mode 100755 t/cond5.sh
 create mode 100755 t/cond6.sh
 create mode 100755 t/cond7.sh
 create mode 100755 t/cond8.sh
 create mode 100755 t/cond9.sh
 create mode 100755 t/condd.sh
 create mode 100755 t/condhook.sh
 create mode 100755 t/condhook2.sh
 create mode 100755 t/condinc.sh
 create mode 100755 t/condinc2.sh
 create mode 100755 t/condlib.sh
 create mode 100755 t/condman2.sh
 create mode 100755 t/condman3.sh
 create mode 100755 t/confdeps.sh
 create mode 100755 t/conff.sh
 create mode 100755 t/conff2.sh
 create mode 100755 t/conffile-leading-dot.sh
 create mode 100755 t/confh.sh
 create mode 100755 t/confh4.sh
 create mode 100755 t/confh5.sh
 create mode 100755 t/confh6.sh
 create mode 100755 t/confh7.sh
 create mode 100755 t/confh8.sh
 create mode 100755 t/configure.sh
 create mode 100755 t/confincl.sh
 create mode 100755 t/conflnk.sh
 create mode 100755 t/conflnk2.sh
 create mode 100755 t/conflnk3.sh
 create mode 100755 t/conflnk4.sh
 create mode 100755 t/confsub.sh
 create mode 100755 t/confvar.sh
 create mode 100755 t/confvar2.sh
 create mode 100755 t/copy.sh
 create mode 100755 t/cscope.tap
 create mode 100755 t/cscope2.sh
 create mode 100755 t/cscope3.sh
 create mode 100755 t/cxx.sh
 create mode 100755 t/cxx2.sh
 create mode 100755 t/cxxcpp.sh
 create mode 100755 t/cxxlibobj.sh
 create mode 100755 t/cxxlink.sh
 create mode 100755 t/cxxnoc.sh
 create mode 100755 t/cxxo.sh
 create mode 100755 t/cygnus-check-without-all.sh
 create mode 100755 t/cygnus-dependency-tracking.sh
 create mode 100755 t/cygnus-imply-foreign.sh
 create mode 100755 t/cygnus-no-dist.sh
 create mode 100755 t/cygnus-no-installinfo.sh
 create mode 100755 t/cygnus-requires-maintainer-mode.sh
 create mode 100755 t/cygwin32.sh
 create mode 100755 t/dash.sh
 create mode 100755 t/defun.sh
 create mode 100755 t/defun2.sh
 create mode 100755 t/dejagnu-absolute-builddir.sh
 create mode 100755 t/dejagnu-relative-srcdir.sh
 create mode 100755 t/dejagnu-siteexp-append.sh
 create mode 100755 t/dejagnu-siteexp-extend.sh
 create mode 100755 t/dejagnu-siteexp-useredit.sh
 create mode 100755 t/dejagnu.sh
 create mode 100755 t/dejagnu2.sh
 create mode 100755 t/dejagnu3.sh
 create mode 100755 t/dejagnu4.sh
 create mode 100755 t/dejagnu5.sh
 create mode 100755 t/dejagnu6.sh
 create mode 100755 t/dejagnu7.sh
 create mode 100755 t/deleted-am.sh
 create mode 100755 t/deleted-m4.sh
 create mode 100755 t/depacl2.sh
 create mode 100755 t/depcomp.sh
 create mode 100755 t/depcomp2.sh
 create mode 100755 t/depcomp8a.sh
 create mode 100755 t/depcomp8b.sh
 create mode 100755 t/depdist.sh
 create mode 100755 t/depend.sh
 create mode 100755 t/depend3.sh
 create mode 100755 t/depend4.sh
 create mode 100755 t/depend5.sh
 create mode 100755 t/depend6.sh
 create mode 100755 t/deprecated-acinit.sh
 create mode 100755 t/destdir.sh
 create mode 100755 t/dirlist-abspath.sh
 create mode 100755 t/dirlist.sh
 create mode 100755 t/dirlist2.sh
 create mode 100755 t/discover.sh
 create mode 100755 t/dist-auxdir-many-subdirs.sh
 create mode 100755 t/dist-auxfile-2.sh
 create mode 100755 t/dist-auxfile.sh
 create mode 100755 t/dist-formats.tap
 create mode 100755 t/dist-included-parent-dir.sh
 create mode 100755 t/dist-missing-am.sh
 create mode 100755 t/dist-missing-included-m4.sh
 create mode 100755 t/dist-missing-m4.sh
 create mode 100755 t/dist-pr109765.sh
 create mode 100755 t/dist-readonly.sh
 create mode 100755 t/dist-repeated.sh
 create mode 100755 t/distcheck-configure-flags-am.sh
 create mode 100755 t/distcheck-configure-flags-subpkg.sh
 create mode 100755 t/distcheck-configure-flags.sh
 create mode 100755 t/distcheck-hook.sh
 create mode 100755 t/distcheck-hook2.sh
 create mode 100755 t/distcheck-missing-m4.sh
 create mode 100755 t/distcheck-outdated-m4.sh
 create mode 100755 t/distcheck-override-infodir.sh
 create mode 100755 t/distcheck-pr10470.sh
 create mode 100755 t/distcheck-pr9579.sh
 create mode 100755 t/distcheck-writable-srcdir.sh
 create mode 100755 t/distcleancheck.sh
 create mode 100755 t/distcom-subdir.sh
 create mode 100755 t/distcom2.sh
 create mode 100755 t/distcom3.sh
 create mode 100755 t/distcom4.sh
 create mode 100755 t/distcom5.sh
 create mode 100755 t/distdir.sh
 create mode 100755 t/disthook.sh
 create mode 100755 t/distlinks.sh
 create mode 100755 t/distlinksbrk.sh
 create mode 100755 t/distname.sh
 create mode 100755 t/dmalloc.sh
 create mode 100755 t/doc-parsing-buglets-colneq-subst.sh
 create mode 100755 t/doc-parsing-buglets-tabs.sh
 create mode 100755 t/dollar.sh
 create mode 100755 t/dollarvar.sh
 create mode 100755 t/dollarvar2.sh
 create mode 100755 t/double.sh
 create mode 100755 t/dup2.sh
 create mode 100755 t/else.sh
 create mode 100755 t/empty.sh
 create mode 100755 t/empty2.sh
 create mode 100755 t/empty3.sh
 create mode 100755 t/empty4.sh
 create mode 100755 t/exdir.sh
 create mode 100755 t/exdir2.sh
 create mode 100755 t/exdir3.sh
 create mode 100755 t/exeext.sh
 create mode 100755 t/exeext2.sh
 create mode 100755 t/exeext3.sh
 create mode 100755 t/exeext4.sh
 create mode 100755 t/exsource.sh
 create mode 100755 t/ext.sh
 create mode 100755 t/ext2.sh
 create mode 100755 t/ext3.sh
 create mode 100755 t/extra-portability.sh
 create mode 100755 t/extra-portability2.sh
 create mode 100755 t/extra-portability3.sh
 create mode 100755 t/extra-programs-empty.sh
 create mode 100755 t/extra.sh
 create mode 100755 t/extra10.sh
 create mode 100755 t/extra11.sh
 create mode 100755 t/extra12.sh
 create mode 100755 t/extra2.sh
 create mode 100755 t/extra3.sh
 create mode 100755 t/extra4.sh
 create mode 100755 t/extra5.sh
 create mode 100755 t/extra6.sh
 create mode 100755 t/extra7.sh
 create mode 100755 t/extra8.sh
 create mode 100755 t/extra9.sh
 create mode 100755 t/extradep.sh
 create mode 100755 t/extradep2.sh
 create mode 100755 t/f90only.sh
 create mode 100755 t/flavor.sh
 create mode 100755 t/flibs.sh
 create mode 100755 t/fn99.sh
 create mode 100755 t/fn99subdir.sh
 create mode 100755 t/fnoc.sh
 create mode 100755 t/fo.sh
 create mode 100755 t/fonly.sh
 create mode 100755 t/forcemiss.sh
 create mode 100755 t/forcemiss2.sh
 create mode 100755 t/fort1.sh
 create mode 100755 t/fort2.sh
 create mode 100755 t/fort4.sh
 create mode 100755 t/fort5.sh
 create mode 100755 t/fortdep.sh
 create mode 100755 t/gcj.sh
 create mode 100755 t/gcj2.sh
 create mode 100755 t/gcj3.sh
 create mode 100755 t/gcj4.sh
 create mode 100755 t/gcj5.sh
 create mode 100755 t/gcj6.sh
 create mode 100755 t/get-sysconf.sh
 create mode 100755 t/gettext-macros.sh
 create mode 100755 t/gettext.sh
 create mode 100755 t/gettext2.sh
 create mode 100755 t/gettext3.sh
 create mode 100755 t/gnits.sh
 create mode 100755 t/gnits2.sh
 create mode 100755 t/gnits3.sh
 create mode 100755 t/gnumake.sh
 create mode 100755 t/gnuwarn.sh
 create mode 100755 t/gnuwarn2.sh
 create mode 100755 t/hdr-vars-defined-once.sh
 create mode 100755 t/header.sh
 create mode 100755 t/help-depend.sh
 create mode 100755 t/help-depend2.sh
 create mode 100755 t/help-dmalloc.sh
 create mode 100755 t/help-init.sh
 create mode 100755 t/help-lispdir.sh
 create mode 100755 t/help-multilib.sh
 create mode 100755 t/help-python.sh
 create mode 100755 t/help-silent.sh
 create mode 100755 t/help-upc.sh
 create mode 100755 t/help.sh
 create mode 100755 t/help2.sh
 create mode 100755 t/help3.sh
 create mode 100755 t/help4.sh
 create mode 100755 t/hfs.sh
 create mode 100755 t/implicit.sh
 create mode 100755 t/info.sh
 create mode 100755 t/init.sh
 create mode 100755 t/init2.sh
 create mode 100755 t/insh2.sh
 create mode 100755 t/install-info-dir.sh
 create mode 100755 t/install2.sh
 create mode 100755 t/installdir.sh
 create mode 100755 t/instdat.sh
 create mode 100755 t/instdat2.sh
 create mode 100755 t/instdir-cond.sh
 create mode 100755 t/instdir-cond2.sh
 create mode 100755 t/instdir-java.sh
 create mode 100755 t/instdir-lisp.sh
 create mode 100755 t/instdir-ltlib.sh
 create mode 100755 t/instdir-no-empty.sh
 create mode 100755 t/instdir-prog.sh
 create mode 100755 t/instdir-python.sh
 create mode 100755 t/instdir-texi.sh
 create mode 100755 t/instdir.sh
 create mode 100755 t/instdir2.sh
 create mode 100755 t/instexec.sh
 create mode 100755 t/instfail-info.sh
 create mode 100755 t/instfail-java.sh
 create mode 100755 t/instfail-libtool.sh
 create mode 100755 t/instfail.sh
 create mode 100755 t/insthook.sh
 create mode 100755 t/instman.sh
 create mode 100755 t/instman2.sh
 create mode 100755 t/instmany-mans.sh
 create mode 100755 t/instmany-python.sh
 create mode 100755 t/instmany.sh
 create mode 100755 t/instsh.sh
 create mode 100755 t/instsh2.sh
 create mode 100755 t/instsh3.sh
 create mode 100755 t/instspc.tap
 create mode 100755 t/interp.sh
 create mode 100755 t/interp2.sh
 create mode 100755 t/java-check.sh
 create mode 100755 t/java-clean.sh
 create mode 100755 t/java-compile-install.sh
 create mode 100755 t/java-compile-run-flat.sh
 create mode 100755 t/java-compile-run-nested.sh
 create mode 100755 t/java-empty-classpath.sh
 create mode 100755 t/java-extra.sh
 create mode 100755 t/java-mix.sh
 create mode 100755 t/java-no-duplicate.sh
 create mode 100755 t/java-nobase.sh
 create mode 100755 t/java-noinst.sh
 create mode 100755 t/java-rebuild.sh
 create mode 100755 t/java-sources.sh
 create mode 100755 t/java-uninstall.sh
 create mode 100755 t/java.sh
 create mode 100755 t/java2.sh
 create mode 100755 t/java3.sh
 create mode 100755 t/javadir-undefined.sh
 create mode 100755 t/javaflags.sh
 create mode 100755 t/javaprim.sh
 create mode 100755 t/javasubst.sh
 create mode 100755 t/ldadd.sh
 create mode 100755 t/ldflags.sh
 create mode 100755 t/lex-clean-cxx.sh
 create mode 100755 t/lex-clean.sh
 create mode 100755 t/lex-depend-cxx.sh
 create mode 100755 t/lex-depend-grep.sh
 create mode 100755 t/lex-depend.sh
 create mode 100755 t/lex-lib-external.sh
 create mode 100755 t/lex-lib.sh
 create mode 100755 t/lex-libobj.sh
 create mode 100755 t/lex-line.sh
 create mode 100755 t/lex-nodist.sh
 create mode 100755 t/lex-noyywrap.sh
 create mode 100755 t/lex-pr204.sh
 create mode 100755 t/lex-subobj-nodep.sh
 create mode 100755 t/lex.sh
 create mode 100755 t/lex2.sh
 create mode 100755 t/lex3.sh
 create mode 100755 t/lex5.sh
 create mode 100755 t/lexcpp.sh
 create mode 100755 t/lexvpath.sh
 create mode 100755 t/lflags.sh
 create mode 100755 t/lflags2.sh
 create mode 100755 t/libexec.sh
 create mode 100755 t/libobj-basic.sh
 create mode 100755 t/libobj10.sh
 create mode 100755 t/libobj12.sh
 create mode 100755 t/libobj13.sh
 create mode 100755 t/libobj14.sh
 create mode 100755 t/libobj15a.sh
 create mode 100755 t/libobj15b.sh
 create mode 100755 t/libobj15c.sh
 create mode 100755 t/libobj16a.sh
 create mode 100755 t/libobj16b.sh
 create mode 100755 t/libobj17.sh
 create mode 100755 t/libobj18.sh
 create mode 100755 t/libobj19.sh
 create mode 100755 t/libobj2.sh
 create mode 100755 t/libobj20a.sh
 create mode 100755 t/libobj20b.sh
 create mode 100755 t/libobj20c.sh
 create mode 100755 t/libobj3.sh
 create mode 100755 t/libobj4.sh
 create mode 100755 t/libobj5.sh
 create mode 100755 t/libobj7.sh
 create mode 100755 t/library.sh
 create mode 100755 t/library2.sh
 create mode 100755 t/library3.sh
 create mode 100755 t/libtoo10.sh
 create mode 100755 t/libtoo11.sh
 create mode 100755 t/libtool-macros.sh
 create mode 100755 t/libtool.sh
 create mode 100755 t/libtool2.sh
 create mode 100755 t/libtool3.sh
 create mode 100755 t/libtool4.sh
 create mode 100755 t/libtool5.sh
 create mode 100755 t/libtool6.sh
 create mode 100755 t/libtool7.sh
 create mode 100755 t/libtool8.sh
 create mode 100755 t/libtool9.sh
 create mode 100755 t/license.sh
 create mode 100755 t/license2.sh
 create mode 100755 t/link_c_cxx.sh
 create mode 100755 t/link_cond.sh
 create mode 100755 t/link_dist.sh
 create mode 100755 t/link_f90_only.sh
 create mode 100755 t/link_f_only.sh
 create mode 100755 t/link_fc.sh
 create mode 100755 t/link_fccxx.sh
 create mode 100755 t/link_fcxx.sh
 create mode 100755 t/link_override.sh
 create mode 100755 t/lisp2.sh
 create mode 100755 t/lisp3.sh
 create mode 100755 t/lisp4.sh
 create mode 100755 t/lisp5.sh
 create mode 100755 t/lisp6.sh
 create mode 100755 t/lisp7.sh
 create mode 100755 t/lisp8.sh
 create mode 100755 t/lispdry.sh
 create mode 100644 t/list-of-tests.mk
 create mode 100755 t/listval.sh
 create mode 100755 t/location.sh
 create mode 100755 t/longlin2.sh
 create mode 100755 t/longline.sh
 create mode 100755 t/ltcond.sh
 create mode 100755 t/ltcond2.sh
 create mode 100755 t/ltconv.sh
 create mode 100755 t/ltdeps.sh
 create mode 100755 t/ltinit.sh
 create mode 100755 t/ltinstloc.sh
 create mode 100755 t/ltlibobjs.sh
 create mode 100755 t/ltlibsrc.sh
 create mode 100755 t/ltorder.sh
 create mode 100755 t/lzma.sh
 create mode 100755 t/m4-inclusion.sh
 create mode 100755 t/maintclean-vpath.sh
 create mode 100755 t/maintclean.sh
 create mode 100755 t/maintmode-configure-msg.sh
 create mode 100755 t/make-dryrun.tap
 create mode 100755 t/make.sh
 create mode 100755 t/makefile-deps.sh
 create mode 100755 t/makej.sh
 create mode 100755 t/makej2.sh
 create mode 100755 t/maken.sh
 create mode 100755 t/maken3.sh
 create mode 100755 t/makevars.sh
 create mode 100755 t/man.sh
 create mode 100755 t/man2.sh
 create mode 100755 t/man3.sh
 create mode 100755 t/man4.sh
 create mode 100755 t/man5.sh
 create mode 100755 t/man6.sh
 create mode 100755 t/man7.sh
 create mode 100755 t/man8.sh
 create mode 100755 t/mdate.sh
 create mode 100755 t/mdate2.sh
 create mode 100755 t/mdate3.sh
 create mode 100755 t/mdate4.sh
 create mode 100755 t/mdate5.sh
 create mode 100755 t/mdate6.sh
 create mode 100755 t/missing-auxfile-stops-makefiles-creation.sh
 create mode 100755 t/missing.sh
 create mode 100755 t/missing2.sh
 create mode 100755 t/missing3.sh
 create mode 100755 t/missing4.sh
 create mode 100755 t/missing5.sh
 create mode 100755 t/missing6.sh
 create mode 100755 t/mkinst2.sh
 create mode 100755 t/mkinst3.sh
 create mode 100755 t/mkinstall.sh
 create mode 100755 t/mmode.sh
 create mode 100755 t/mmodely.sh
 create mode 100755 t/multlib.sh
 create mode 100755 t/no-extra-makefile-code.sh
 create mode 100755 t/no-outdir-option.sh
 create mode 100755 t/nobase-libtool.sh
 create mode 100755 t/nobase-nodist.sh
 create mode 100755 t/nobase-python.sh
 create mode 100755 t/nobase.sh
 create mode 100755 t/nodef.sh
 create mode 100755 t/nodef2.sh
 create mode 100755 t/nodep.sh
 create mode 100755 t/nodep2.sh
 create mode 100755 t/nodepcomp.sh
 create mode 100755 t/nodist.sh
 create mode 100755 t/nodist2.sh
 create mode 100755 t/nodist3.sh
 create mode 100755 t/noinst.sh
 create mode 100755 t/noinstdir.sh
 create mode 100755 t/nolink.sh
 create mode 100755 t/nostdinc.sh
 create mode 100755 t/notrans.sh
 create mode 100755 t/number.sh
 create mode 100755 t/objc.sh
 create mode 100755 t/objc2.sh
 create mode 100755 t/objext-pr10128.sh
 create mode 100755 t/obsolete.sh
 create mode 100755 t/oldvars.sh
 create mode 100755 t/order.sh
 create mode 100755 t/output-order.sh
 create mode 100755 t/output.sh
 create mode 100755 t/output10.sh
 create mode 100755 t/output11.sh
 create mode 100755 t/output12.sh
 create mode 100755 t/output13.sh
 create mode 100755 t/output2.sh
 create mode 100755 t/output3.sh
 create mode 100755 t/output4.sh
 create mode 100755 t/output5.sh
 create mode 100755 t/output6.sh
 create mode 100755 t/output7.sh
 create mode 100755 t/output8.sh
 create mode 100755 t/output9.sh
 create mode 100755 t/override-conditional-1.sh
 create mode 100755 t/override-conditional-2.sh
 create mode 100755 t/override-html.sh
 create mode 100755 t/override-suggest-local.sh
 create mode 100755 t/parallel-am.sh
 create mode 100755 t/parallel-am2.sh
 create mode 100755 t/parallel-am3.sh
 create mode 100755 t/parallel-tests-cmdline-override.sh
 create mode 100755 t/parallel-tests-console-output.sh
 create mode 100755 t/parallel-tests-driver-install.sh
 create mode 100755 t/parallel-tests-dry-run-1.sh
 create mode 100755 t/parallel-tests-dry-run-2.sh
 create mode 100755 t/parallel-tests-empty-testlogs.sh
 create mode 100755 t/parallel-tests-exeext.sh
 create mode 100755 t/parallel-tests-exit-statuses.sh
 create mode 100755 t/parallel-tests-extra-programs.sh
 create mode 100755 t/parallel-tests-fd-redirect-exeext.sh
 create mode 100755 t/parallel-tests-fd-redirect.sh
 create mode 100755 t/parallel-tests-fork-bomb.sh
 create mode 100755 t/parallel-tests-harderror.sh
 create mode 100755 t/parallel-tests-interrupt.tap
 create mode 100755 t/parallel-tests-log-compiler-1.sh
 create mode 100755 t/parallel-tests-log-compiler-2.sh
 create mode 100755 t/parallel-tests-log-compiler-example.sh
 create mode 100755 t/parallel-tests-log-override-1.sh
 create mode 100755 t/parallel-tests-log-override-2.sh
 create mode 100755 t/parallel-tests-log-override-recheck.sh
 create mode 100755 t/parallel-tests-many.sh
 create mode 100755 t/parallel-tests-no-color-in-log.sh
 create mode 100755 t/parallel-tests-no-spurious-summary.sh
 create mode 100755 t/parallel-tests-once.sh
 create mode 100755 t/parallel-tests-recheck-depends-on-all.sh
 create mode 100755 t/parallel-tests-reset-term.sh
 create mode 100755 t/parallel-tests-subdir.sh
 create mode 100755 t/parallel-tests-suffix-prog.sh
 create mode 100755 t/parallel-tests-suffix.sh
 create mode 100755 t/parallel-tests-trailing-bslash.sh
 create mode 100755 t/parallel-tests-unreadable.sh
 create mode 100755 t/parallel-tests.sh
 create mode 100755 t/parallel-tests10.sh
 create mode 100755 t/parallel-tests2.sh
 create mode 100755 t/parallel-tests3.sh
 create mode 100755 t/parallel-tests5.sh
 create mode 100755 t/parallel-tests6.sh
 create mode 100755 t/parallel-tests8.sh
 create mode 100755 t/parallel-tests9.sh
 create mode 100755 t/parse.sh
 create mode 100755 t/percent.sh
 create mode 100755 t/percent2.sh
 create mode 100755 t/phony.sh
 create mode 100755 t/pluseq.sh
 create mode 100755 t/pluseq10.sh
 create mode 100755 t/pluseq11.sh
 create mode 100755 t/pluseq2.sh
 create mode 100755 t/pluseq3.sh
 create mode 100755 t/pluseq4.sh
 create mode 100755 t/pluseq5.sh
 create mode 100755 t/pluseq6.sh
 create mode 100755 t/pluseq7.sh
 create mode 100755 t/pluseq8.sh
 create mode 100755 t/pluseq9.sh
 create mode 100644 t/pm/Cond2.pl
 create mode 100644 t/pm/Cond3.pl
 create mode 100644 t/pm/Condition-t.pl
 create mode 100644 t/pm/Condition.pl
 create mode 100644 t/pm/DisjCon2.pl
 create mode 100644 t/pm/DisjCon3.pl
 create mode 100644 t/pm/DisjConditions-t.pl
 create mode 100644 t/pm/DisjConditions.pl
 create mode 100644 t/pm/Version.pl
 create mode 100644 t/pm/Version2.pl
 create mode 100644 t/pm/Version3.pl
 create mode 100644 t/pm/Wrap.pl
 create mode 100755 t/posixsubst-data.sh
 create mode 100755 t/posixsubst-extradist.sh
 create mode 100755 t/posixsubst-ldadd.sh
 create mode 100755 t/posixsubst-libraries.sh
 create mode 100755 t/posixsubst-ltlibraries.sh
 create mode 100755 t/posixsubst-programs.sh
 create mode 100755 t/posixsubst-scripts.sh
 create mode 100755 t/posixsubst-sources.sh
 create mode 100755 t/posixsubst-tests.sh
 create mode 100755 t/postproc.sh
 create mode 100755 t/ppf77.sh
 create mode 100755 t/pr2.sh
 create mode 100755 t/pr211.sh
 create mode 100755 t/pr220.sh
 create mode 100755 t/pr224.sh
 create mode 100755 t/pr229.sh
 create mode 100755 t/pr243.sh
 create mode 100755 t/pr266.sh
 create mode 100755 t/pr279-2.sh
 create mode 100755 t/pr279.sh
 create mode 100755 t/pr287.sh
 create mode 100755 t/pr300-lib.sh
 create mode 100755 t/pr300-ltlib.sh
 create mode 100755 t/pr300-prog.sh
 create mode 100755 t/pr307.sh
 create mode 100755 t/pr401.sh
 create mode 100755 t/pr401b.sh
 create mode 100755 t/pr401c.sh
 create mode 100755 t/pr72.sh
 create mode 100755 t/pr8365-remake-timing.sh
 create mode 100755 t/pr87.sh
 create mode 100755 t/pr9.sh
 create mode 100755 t/prefix.sh
 create mode 100755 t/primary-prefix-couples-documented-valid.sh
 create mode 100755 t/primary-prefix-couples-force-valid.sh
 create mode 100755 t/primary-prefix-invalid-couples.tap
 create mode 100755 t/primary-prefix-valid-couples.sh
 create mode 100755 t/primary.sh
 create mode 100755 t/primary2.sh
 create mode 100755 t/primary3.sh
 create mode 100755 t/print-libdir.sh
 create mode 100755 t/proginst.sh
 create mode 100755 t/programs-primary-rewritten.sh
 create mode 100755 t/py-compile-basedir.sh
 create mode 100755 t/py-compile-basic.sh
 create mode 100755 t/py-compile-basic2.sh
 create mode 100755 t/py-compile-destdir.sh
 create mode 100755 t/py-compile-env.sh
 create mode 100755 t/py-compile-option-terminate.sh
 create mode 100755 t/py-compile-usage.sh
 create mode 100755 t/python-dist.sh
 create mode 100755 t/python-pr10995.sh
 create mode 100755 t/python-vars.sh
 create mode 100755 t/python-virtualenv.sh
 create mode 100755 t/python.sh
 create mode 100755 t/python10.sh
 create mode 100755 t/python11.sh
 create mode 100755 t/python12.sh
 create mode 100755 t/python2.sh
 create mode 100755 t/python3.sh
 create mode 100755 t/python4.sh
 create mode 100755 t/python5.sh
 create mode 100755 t/python5b.sh
 create mode 100755 t/python6.sh
 create mode 100755 t/python7.sh
 create mode 100755 t/python8.sh
 create mode 100755 t/python9.sh
 create mode 100755 t/recurs.sh
 create mode 100755 t/recurs2.sh
 create mode 100755 t/relativize.tap
 create mode 100755 t/remake-all-1.sh
 create mode 100755 t/remake-all-2.sh
 create mode 100755 t/remake-am-pr10111.sh
 create mode 100755 t/remake-deleted-am-2.sh
 create mode 100755 t/remake-deleted-am-subdir.sh
 create mode 100755 t/remake-deleted-am.sh
 create mode 100755 t/remake-deleted-m4-file.sh
 create mode 100755 t/remake-gnulib-add-acsubst.sh
 create mode 100755 t/remake-gnulib-add-header.sh
 create mode 100755 t/remake-gnulib-remove-header.sh
 create mode 100755 t/remake-m4-pr10111.sh
 create mode 100755 t/remake-moved-m4-file.sh
 create mode 100755 t/remake-renamed-am.sh
 create mode 100755 t/remake-renamed-m4-file.sh
 create mode 100755 t/remake-renamed-m4-macro-and-file.sh
 create mode 100755 t/remake-renamed-m4-macro.sh
 create mode 100755 t/remake-subdir-from-subdir.sh
 create mode 100755 t/remake-subdir-gnu.sh
 create mode 100755 t/remake-subdir-long-time.sh
 create mode 100755 t/remake-subdir.sh
 create mode 100755 t/remake-subdir2.sh
 create mode 100755 t/remake.sh
 create mode 100755 t/remake10a.sh
 create mode 100755 t/remake10b.sh
 create mode 100755 t/remake10c.sh
 create mode 100755 t/remake11.sh
 create mode 100755 t/remake12.sh
 create mode 100755 t/remake1a.sh
 create mode 100755 t/remake2.sh
 create mode 100755 t/remake3.sh
 create mode 100755 t/remake3a.sh
 create mode 100755 t/remake4.sh
 create mode 100755 t/remake5.sh
 create mode 100755 t/remake6.sh
 create mode 100755 t/remake7.sh
 create mode 100755 t/remake8a.sh
 create mode 100755 t/remake8b.sh
 create mode 100755 t/remake9a.sh
 create mode 100755 t/remake9b.sh
 create mode 100755 t/remake9c.sh
 create mode 100755 t/remake9d.sh
 create mode 100755 t/repeated-options.sh
 create mode 100755 t/req.sh
 create mode 100755 t/reqd.sh
 create mode 100755 t/reqd2.sh
 create mode 100755 t/rst-formatting.sh
 create mode 100755 t/rulepat.sh
 create mode 100755 t/sanity.sh
 create mode 100755 t/scripts.sh
 create mode 100755 t/seenc.sh
 create mode 100755 t/self-check-cleanup.tap
 create mode 100755 t/self-check-configure-help.sh
 create mode 100755 t/self-check-dir.tap
 create mode 100755 t/self-check-env-sanitize.tap
 create mode 100755 t/self-check-exit.tap
 create mode 100755 t/self-check-explicit-skips.sh
 create mode 100755 t/self-check-is-blocked-signal.tap
 create mode 100755 t/self-check-is_newest.tap
 create mode 100755 t/self-check-me.tap
 create mode 100755 t/self-check-reexec.tap
 create mode 100755 t/self-check-report.sh
 create mode 100755 t/self-check-sanity.sh
 create mode 100755 t/self-check-seq.tap
 create mode 100755 t/self-check-tap.sh
 create mode 100755 t/self-check-unindent.tap
 create mode 100755 t/serial-tests.sh
 create mode 100755 t/silent-amopts.sh
 create mode 100755 t/silent-configsite.sh
 create mode 100755 t/silent-lex.sh
 create mode 100755 t/silent-many-gcc.sh
 create mode 100755 t/silent-many-generic.sh
 create mode 100755 t/silent-nested-vars.sh
 create mode 100755 t/silent-nowarn.sh
 create mode 100755 t/silent-yacc-headers.sh
 create mode 100755 t/silent-yacc.sh
 create mode 100755 t/silent.sh
 create mode 100755 t/silent2.sh
 create mode 100755 t/silent3.sh
 create mode 100755 t/silent4.sh
 create mode 100755 t/silent6.sh
 create mode 100755 t/silent7.sh
 create mode 100755 t/silent8.sh
 create mode 100755 t/silent9.sh
 create mode 100755 t/silentcxx-gcc.sh
 create mode 100755 t/silentcxx.sh
 create mode 100755 t/silentf77.sh
 create mode 100755 t/silentf90.sh
 create mode 100755 t/space.sh
 create mode 100755 t/specflg-dummy.sh
 create mode 100755 t/specflg.sh
 create mode 100755 t/specflg10.sh
 create mode 100755 t/specflg2.sh
 create mode 100755 t/specflg3.sh
 create mode 100755 t/specflg6.sh
 create mode 100755 t/specflg7.sh
 create mode 100755 t/specflg8.sh
 create mode 100755 t/specflg9.sh
 create mode 100755 t/spell.sh
 create mode 100755 t/spell2.sh
 create mode 100755 t/spell3.sh
 create mode 100755 t/spelling.sh
 create mode 100755 t/spy-rm.tap
 create mode 100755 t/spy.sh
 create mode 100755 t/srcsub.sh
 create mode 100755 t/srcsub2.sh
 create mode 100755 t/stamph2.sh
 create mode 100755 t/stdinc.sh
 create mode 100755 t/stdlib.sh
 create mode 100755 t/stdlib2.sh
 create mode 100755 t/strictness-override.sh
 create mode 100755 t/strictness-precedence.sh
 create mode 100755 t/strip.sh
 create mode 100755 t/strip2.sh
 create mode 100755 t/strip3.sh
 create mode 100755 t/subcond.sh
 create mode 100755 t/subcond2.sh
 create mode 100755 t/subcond3.sh
 create mode 100755 t/subdir.sh
 create mode 100755 t/subdir10.sh
 create mode 100755 t/subdir2.sh
 create mode 100755 t/subdir3.sh
 create mode 100755 t/subdir4.sh
 create mode 100755 t/subdir5.sh
 create mode 100755 t/subdir6.sh
 create mode 100755 t/subdir7.sh
 create mode 100755 t/subdir8.sh
 create mode 100755 t/subdir9.sh
 create mode 100755 t/subdirbuiltsources.sh
 create mode 100755 t/subobj.sh
 create mode 100755 t/subobj10.sh
 create mode 100755 t/subobj11a.sh
 create mode 100755 t/subobj11b.sh
 create mode 100755 t/subobj11c.sh
 create mode 100755 t/subobj2.sh
 create mode 100755 t/subobj4.sh
 create mode 100755 t/subobj5.sh
 create mode 100755 t/subobj6.sh
 create mode 100755 t/subobj7.sh
 create mode 100755 t/subobj8.sh
 create mode 100755 t/subobj9.sh
 create mode 100755 t/subobjname.sh
 create mode 100755 t/subpkg-yacc.sh
 create mode 100755 t/subpkg.sh
 create mode 100755 t/subpkg2.sh
 create mode 100755 t/subpkg3.sh
 create mode 100755 t/subpkg4.sh
 create mode 100755 t/subst-no-trailing-empty-line.sh
 create mode 100755 t/subst.sh
 create mode 100755 t/subst3.sh
 create mode 100755 t/subst4.sh
 create mode 100755 t/subst5.sh
 create mode 100755 t/substre2.sh
 create mode 100755 t/substref.sh
 create mode 100755 t/substtarg.sh
 create mode 100755 t/suffix-chain.tap
 create mode 100755 t/suffix.sh
 create mode 100755 t/suffix10.tap
 create mode 100755 t/suffix11.tap
 create mode 100755 t/suffix12.sh
 create mode 100755 t/suffix13.sh
 create mode 100755 t/suffix2.sh
 create mode 100755 t/suffix3.tap
 create mode 100755 t/suffix4.sh
 create mode 100755 t/suffix5.sh
 create mode 100755 t/suffix6.sh
 create mode 100755 t/suffix6b.sh
 create mode 100755 t/suffix6c.sh
 create mode 100755 t/suffix7.sh
 create mode 100755 t/suffix8.tap
 create mode 100755 t/suffix9.sh
 create mode 100755 t/symlink.sh
 create mode 100755 t/symlink2.sh
 create mode 100755 t/syntax.sh
 create mode 100755 t/tags.sh
 create mode 100755 t/tags2.sh
 create mode 100755 t/tagsub.sh
 create mode 100755 t/tap-ambiguous-directive.sh
 create mode 100755 t/tap-autonumber.sh
 create mode 100755 t/tap-bad-prog.tap
 create mode 100755 t/tap-bailout-and-logging.sh
 create mode 100755 t/tap-bailout-leading-space.sh
 create mode 100755 t/tap-bailout-suppress-badexit.sh
 create mode 100755 t/tap-bailout-suppress-later-diagnostic.sh
 create mode 100755 t/tap-bailout-suppress-later-errors.sh
 create mode 100755 t/tap-bailout.sh
 create mode 100755 t/tap-basic.sh
 create mode 100755 t/tap-color.sh
 create mode 100755 t/tap-common-setup.sh
 create mode 100755 t/tap-deps.sh
 create mode 100755 t/tap-diagnostic-custom.sh
 create mode 100755 t/tap-diagnostic.sh
 create mode 100755 t/tap-doc.sh
 create mode 100755 t/tap-doc2.sh
 create mode 100755 t/tap-driver-stderr.sh
 create mode 100755 t/tap-empty-diagnostic.sh
 create mode 100755 t/tap-empty.sh
 create mode 100755 t/tap-escape-directive-2.sh
 create mode 100755 t/tap-escape-directive.sh
 create mode 100755 t/tap-exit.sh
 create mode 100755 t/tap-fancy.sh
 create mode 100755 t/tap-fancy2.sh
 create mode 100755 t/tap-global-log.sh
 create mode 100755 t/tap-global-result.sh
 create mode 100755 t/tap-log.sh
 create mode 100755 t/tap-merge-stdout-stderr.sh
 create mode 100755 t/tap-missing-plan-and-bad-exit.sh
 create mode 100755 t/tap-more.sh
 create mode 100755 t/tap-more2.sh
 create mode 100755 t/tap-msg0-bailout.sh
 create mode 100755 t/tap-msg0-directive.sh
 create mode 100755 t/tap-msg0-misc.sh
 create mode 100755 t/tap-msg0-planskip.sh
 create mode 100755 t/tap-msg0-result.sh
 create mode 100755 t/tap-negative-numbers.sh
 create mode 100755 t/tap-no-disable-hard-error.sh
 create mode 100755 t/tap-no-merge-stdout-stderr.sh
 create mode 100755 t/tap-no-spurious-numbers.sh
 create mode 100755 t/tap-no-spurious-summary.sh
 create mode 100755 t/tap-no-spurious.sh
 create mode 100755 t/tap-not-ok-skip.sh
 create mode 100755 t/tap-number-wordboundary.sh
 create mode 100755 t/tap-numbers-leading-zero.sh
 create mode 100755 t/tap-numeric-description.sh
 create mode 100755 t/tap-out-of-order.sh
 create mode 100755 t/tap-passthrough-exit.sh
 create mode 100755 t/tap-passthrough.sh
 create mode 100755 t/tap-plan-corner.sh
 create mode 100755 t/tap-plan-errors.sh
 create mode 100755 t/tap-plan-leading-zero.sh
 create mode 100755 t/tap-plan-malformed.sh
 create mode 100755 t/tap-plan-middle.sh
 create mode 100755 t/tap-plan-whitespace.sh
 create mode 100755 t/tap-plan.sh
 create mode 100755 t/tap-planskip-and-logging.sh
 create mode 100755 t/tap-planskip-badexit.sh
 create mode 100755 t/tap-planskip-bailout.sh
 create mode 100755 t/tap-planskip-case-insensitive.sh
 create mode 100755 t/tap-planskip-late.sh
 create mode 100755 t/tap-planskip-later-errors.sh
 create mode 100755 t/tap-planskip-unplanned-corner.sh
 create mode 100755 t/tap-planskip-unplanned.sh
 create mode 100755 t/tap-planskip-whitespace.sh
 create mode 100755 t/tap-planskip.sh
 create mode 100755 t/tap-realtime.sh
 create mode 100755 t/tap-recheck-logs.sh
 create mode 100755 t/tap-recheck.sh
 create mode 100755 t/tap-result-comment.sh
 create mode 100755 t/tap-signal.tap
 create mode 100755 t/tap-summary-color.sh
 create mode 100755 t/tap-summary.sh
 create mode 100755 t/tap-test-number-0.sh
 create mode 100755 t/tap-todo-skip-together.sh
 create mode 100755 t/tap-todo-skip-whitespace.sh
 create mode 100755 t/tap-todo-skip.sh
 create mode 100755 t/tap-unplanned.sh
 create mode 100755 t/tap-whitespace-normalization.sh
 create mode 100755 t/tap-with-and-without-number.sh
 create mode 100755 t/tap-xfail-tests.sh
 create mode 100755 t/tar-override.sh
 create mode 100755 t/tar.sh
 create mode 100755 t/tar2.sh
 create mode 100755 t/tar3.sh
 create mode 100755 t/target-cflags.sh
 create mode 100755 t/targetclash.sh
 create mode 100755 t/test-driver-acsubst.sh
 create mode 100755 t/test-driver-cond.sh
 create mode 100755 t/test-driver-create-log-dir.sh
 create mode 100755 t/test-driver-custom-multitest-recheck.sh
 create mode 100755 t/test-driver-custom-multitest-recheck2.sh
 create mode 100755 t/test-driver-custom-multitest.sh
 create mode 100755 t/test-driver-custom-no-extra-driver.sh
 create mode 100755 t/test-driver-custom-xfail-tests.sh
 create mode 100755 t/test-driver-custom.sh
 create mode 100755 t/test-driver-fail.sh
 create mode 100755 t/test-driver-is-distributed.sh
 create mode 100755 t/test-driver-strip-vpath.sh
 create mode 100755 t/test-driver-trs-suffix-registered.sh
 create mode 100755 t/test-extensions-cond.sh
 create mode 100755 t/test-extensions.sh
 create mode 100755 t/test-harness-vpath-rewrite.sh
 create mode 100755 t/test-log.sh
 create mode 100755 t/test-logs-repeated.sh
 create mode 100755 t/test-metadata-global-log.sh
 create mode 100755 t/test-metadata-global-result.sh
 create mode 100755 t/test-metadata-recheck.sh
 create mode 100755 t/test-metadata-results.sh
 create mode 100755 t/test-missing.sh
 create mode 100755 t/test-missing2.sh
 create mode 100755 t/test-trs-basic.sh
 create mode 100755 t/test-trs-recover.sh
 create mode 100755 t/test-trs-recover2.sh
 create mode 100755 t/tests-environment-and-log-compiler.sh
 create mode 100755 t/tests-environment-backcompat.sh
 create mode 100755 t/tests-environment-fd-redirect.sh
 create mode 100755 t/tests-environment.sh
 create mode 100755 t/testsuite-summary-color.sh
 create mode 100755 t/testsuite-summary-count-many.sh
 create mode 100755 t/testsuite-summary-count.sh
 create mode 100755 t/testsuite-summary-reference-log.sh
 create mode 100755 t/transform.sh
 create mode 100755 t/transform2.sh
 create mode 100755 t/transform3.sh
 create mode 100755 t/txinfo-no-clutter.sh
 create mode 100755 t/txinfo-unrecognized-extension.sh
 create mode 100755 t/txinfo.sh
 create mode 100755 t/txinfo10.sh
 create mode 100755 t/txinfo13.sh
 create mode 100755 t/txinfo16.sh
 create mode 100755 t/txinfo17.sh
 create mode 100755 t/txinfo19.sh
 create mode 100755 t/txinfo2.sh
 create mode 100755 t/txinfo20.sh
 create mode 100755 t/txinfo21.sh
 create mode 100755 t/txinfo22.sh
 create mode 100755 t/txinfo23.sh
 create mode 100755 t/txinfo24.sh
 create mode 100755 t/txinfo25.sh
 create mode 100755 t/txinfo26.sh
 create mode 100755 t/txinfo27.sh
 create mode 100755 t/txinfo28.sh
 create mode 100755 t/txinfo29.sh
 create mode 100755 t/txinfo3.sh
 create mode 100755 t/txinfo30.sh
 create mode 100755 t/txinfo31.sh
 create mode 100755 t/txinfo32.sh
 create mode 100755 t/txinfo33.sh
 create mode 100755 t/txinfo4.sh
 create mode 100755 t/txinfo5.sh
 create mode 100755 t/txinfo5b.sh
 create mode 100755 t/txinfo6.sh
 create mode 100755 t/txinfo7.sh
 create mode 100755 t/txinfo8.sh
 create mode 100755 t/txinfo9.sh
 create mode 100755 t/uninstall-fail.sh
 create mode 100755 t/uninstall-pr9578.sh
 create mode 100755 t/unused.sh
 create mode 100755 t/upc.sh
 create mode 100755 t/upc2.sh
 create mode 100755 t/upc3.sh
 create mode 100755 t/vala-headers.sh
 create mode 100755 t/vala-libs.sh
 create mode 100755 t/vala-mix.sh
 create mode 100755 t/vala-mix2.sh
 create mode 100755 t/vala-parallel.sh
 create mode 100755 t/vala-vapi.sh
 create mode 100755 t/vala-vpath.sh
 create mode 100755 t/vala.sh
 create mode 100755 t/vala2.sh
 create mode 100755 t/vala3.sh
 create mode 100755 t/vala4.sh
 create mode 100755 t/vala5.sh
 create mode 100755 t/vars.sh
 create mode 100755 t/vars3.sh
 create mode 100755 t/vartar.sh
 create mode 100755 t/vartypo2.sh
 create mode 100755 t/vartypos.sh
 create mode 100755 t/version.sh
 create mode 100755 t/version2.sh
 create mode 100755 t/version3.sh
 create mode 100755 t/version4.sh
 create mode 100755 t/version6.sh
 create mode 100755 t/version7.sh
 create mode 100755 t/version8.sh
 create mode 100755 t/vpath.sh
 create mode 100755 t/vtexi.sh
 create mode 100755 t/vtexi2.sh
 create mode 100755 t/vtexi3.sh
 create mode 100755 t/vtexi4.sh
 create mode 100755 t/warning-groups-win-over-strictness.sh
 create mode 100755 t/warnings-override.sh
 create mode 100755 t/warnings-precedence.sh
 create mode 100755 t/warnings-strictness-interactions.sh
 create mode 100755 t/warnings-unknown.sh
 create mode 100755 t/warnings-win-over-strictness.sh
 create mode 100755 t/warnopts.sh
 create mode 100755 t/werror.sh
 create mode 100755 t/werror2.sh
 create mode 100755 t/werror3.sh
 create mode 100755 t/werror4.sh
 create mode 100755 t/whoami.sh
 create mode 100644 t/wrap/aclocal.in
 create mode 100644 t/wrap/automake.in
 create mode 100755 t/xsource.sh
 create mode 100755 t/yacc-auxdir.sh
 create mode 100755 t/yacc-basic.sh
 create mode 100755 t/yacc-bison-skeleton-cxx.sh
 create mode 100755 t/yacc-bison-skeleton.sh
 create mode 100755 t/yacc-clean-cxx.sh
 create mode 100755 t/yacc-clean.sh
 create mode 100755 t/yacc-cxx.sh
 create mode 100755 t/yacc-d-basic.sh
 create mode 100755 t/yacc-d-cxx.sh
 create mode 100755 t/yacc-d-vpath.sh
 create mode 100755 t/yacc-deleted-headers.sh
 create mode 100755 t/yacc-depend.sh
 create mode 100755 t/yacc-depend2.sh
 create mode 100755 t/yacc-dist-nobuild-subdir.sh
 create mode 100755 t/yacc-dist-nobuild.sh
 create mode 100755 t/yacc-line.sh
 create mode 100755 t/yacc-mix-c-cxx.sh
 create mode 100755 t/yacc-nodist.sh
 create mode 100755 t/yacc-pr204.sh
 create mode 100755 t/yacc-weirdnames.sh
 create mode 100755 t/yacc.sh
 create mode 100755 t/yacc2.sh
 create mode 100755 t/yacc4.sh
 create mode 100755 t/yacc5.sh
 create mode 100755 t/yacc7.sh
 create mode 100755 t/yacc8.sh
 create mode 100755 t/yaccdry.sh
 create mode 100755 t/yaccpp.sh
 create mode 100755 t/yaccvpath.sh
 create mode 100755 t/yflags-cmdline-override.sh
 create mode 100755 t/yflags-conditional.sh
 create mode 100755 t/yflags-d-false-positives.sh
 create mode 100755 t/yflags-force-conditional.sh
 create mode 100755 t/yflags-force-override.sh
 create mode 100755 t/yflags-var-expand.sh
 create mode 100755 t/yflags.sh
 create mode 100755 t/yflags2.sh
 delete mode 100644 tests/ChangeLog-old
 delete mode 100644 tests/CheckListOfTests.am
 delete mode 100644 tests/Makefile.am
 delete mode 100644 tests/README
 delete mode 100755 tests/aclibobj.test
 delete mode 100755 tests/acloca10.test
 delete mode 100755 tests/acloca11.test
 delete mode 100755 tests/acloca12.test
 delete mode 100755 tests/acloca13.test
 delete mode 100755 tests/acloca14.test
 delete mode 100755 tests/acloca15.test
 delete mode 100755 tests/acloca16.test
 delete mode 100755 tests/acloca17.test
 delete mode 100755 tests/acloca18.test
 delete mode 100755 tests/acloca19.test
 delete mode 100755 tests/acloca20.test
 delete mode 100755 tests/acloca21.test
 delete mode 100755 tests/acloca22.test
 delete mode 100755 tests/aclocal-acdir.test
 delete mode 100755 tests/aclocal-install-absdir.test
 delete mode 100755 tests/aclocal-install-fail.test
 delete mode 100755 tests/aclocal-install-mkdir.test
 delete mode 100755 tests/aclocal-no-install-no-mkdir.test
 delete mode 100755 tests/aclocal-path-install-serial.test
 delete mode 100755 tests/aclocal-path-install.test
 delete mode 100755 tests/aclocal-path-nonexistent.test
 delete mode 100755 tests/aclocal-path-precedence.test
 delete mode 100755 tests/aclocal-path.test
 delete mode 100755 tests/aclocal-print-acdir.test
 delete mode 100755 tests/aclocal-verbose-install.test
 delete mode 100644 tests/aclocal.in
 delete mode 100755 tests/aclocal.test
 delete mode 100755 tests/aclocal3.test
 delete mode 100755 tests/aclocal4.test
 delete mode 100755 tests/aclocal5.test
 delete mode 100755 tests/aclocal6.test
 delete mode 100755 tests/aclocal7.test
 delete mode 100755 tests/aclocal8.test
 delete mode 100755 tests/aclocal9.test
 delete mode 100755 tests/acoutbs.test
 delete mode 100755 tests/acoutbs2.test
 delete mode 100755 tests/acoutnoq.test
 delete mode 100755 tests/acoutpt.test
 delete mode 100755 tests/acoutpt2.test
 delete mode 100755 tests/acoutqnl.test
 delete mode 100755 tests/acsilent.test
 delete mode 100755 tests/acsubst.test
 delete mode 100755 tests/acsubst2.test
 delete mode 100755 tests/all.test
 delete mode 100755 tests/all2.test
 delete mode 100755 tests/alloca.test
 delete mode 100755 tests/alloca2.test
 delete mode 100755 tests/alpha.test
 delete mode 100755 tests/alpha2.test
 delete mode 100755 tests/amassign.test
 delete mode 100755 tests/amhello-binpkg.test
 delete mode 100755 tests/amhello-cflags.test
 delete mode 100755 tests/amhello-cross-compile.test
 delete mode 100755 tests/ammissing.test
 delete mode 100755 tests/amopt.test
 delete mode 100755 tests/amsubst.test
 delete mode 100755 tests/ansi.test
 delete mode 100755 tests/ansi10.test
 delete mode 100755 tests/ansi2.test
 delete mode 100755 tests/ansi2knr-deprecation.test
 delete mode 100755 tests/ansi3.test
 delete mode 100755 tests/ansi3b.test
 delete mode 100755 tests/ansi4.test
 delete mode 100755 tests/ansi5.test
 delete mode 100755 tests/ansi6.test
 delete mode 100755 tests/ansi7.test
 delete mode 100755 tests/ansi8.test
 delete mode 100755 tests/ansi9.test
 delete mode 100755 tests/ar-lib.test
 delete mode 100755 tests/ar-lib2.test
 delete mode 100755 tests/ar-lib3.test
 delete mode 100755 tests/ar-lib4.test
 delete mode 100755 tests/ar-lib5a.test
 delete mode 100755 tests/ar-lib5b.test
 delete mode 100755 tests/ar-lib6a.test
 delete mode 100755 tests/ar-lib6b.test
 delete mode 100755 tests/ar-lib7.test
 delete mode 100755 tests/ar.test
 delete mode 100755 tests/ar2.test
 delete mode 100755 tests/ar3.test
 delete mode 100755 tests/ar4.test
 delete mode 100755 tests/ar5.test
 delete mode 100755 tests/asm.test
 delete mode 100755 tests/asm2.test
 delete mode 100755 tests/asm3.test
 delete mode 100755 tests/autodist-acconfig-no-subdir.test
 delete mode 100755 tests/autodist-acconfig.test
 delete mode 100755 tests/autodist-aclocal-m4.test
 delete mode 100755 tests/autodist-config-headers.test
 delete mode 100755 tests/autodist-configure-no-subdir.test
 delete mode 100755 tests/autodist-no-duplicate.test
 delete mode 100755 tests/autodist-stamp-vti.test
 delete mode 100755 tests/autodist-subdir.test
 delete mode 100755 tests/autodist.test
 delete mode 100755 tests/autohdr.test
 delete mode 100755 tests/autohdr2.test
 delete mode 100755 tests/autohdr3.test
 delete mode 100755 tests/autohdr4.test
 delete mode 100755 tests/autohdrdry.test
 delete mode 100644 tests/automake.in
 delete mode 100755 tests/automake.test
 delete mode 100755 tests/auxdir.test
 delete mode 100755 tests/auxdir2.test
 delete mode 100755 tests/auxdir3.test
 delete mode 100755 tests/auxdir4.test
 delete mode 100755 tests/backsl.test
 delete mode 100755 tests/backsl2.test
 delete mode 100755 tests/backsl3.test
 delete mode 100755 tests/backsl4.test
 delete mode 100755 tests/badline.test
 delete mode 100755 tests/badopt.test
 delete mode 100755 tests/badprog.test
 delete mode 100755 tests/block.test
 delete mode 100755 tests/bsource.test
 delete mode 100755 tests/canon-name.test
 delete mode 100755 tests/canon.test
 delete mode 100755 tests/canon2.test
 delete mode 100755 tests/canon3.test
 delete mode 100755 tests/canon4.test
 delete mode 100755 tests/canon5.test
 delete mode 100755 tests/ccnoco.test
 delete mode 100755 tests/ccnoco2.test
 delete mode 100755 tests/ccnoco3.test
 delete mode 100755 tests/check-concurrency-bug9245.test
 delete mode 100755 tests/check-exported-srcdir.test
 delete mode 100755 tests/check-tests-in-builddir.test
 delete mode 100755 tests/check-tests_environment.test
 delete mode 100755 tests/check.test
 delete mode 100755 tests/check10.test
 delete mode 100755 tests/check11.test
 delete mode 100755 tests/check12.test
 delete mode 100755 tests/check2.test
 delete mode 100755 tests/check3.test
 delete mode 100755 tests/check4.test
 delete mode 100755 tests/check5.test
 delete mode 100755 tests/check6.test
 delete mode 100755 tests/check7.test
 delete mode 100755 tests/check8.test
 delete mode 100755 tests/check9.test
 delete mode 100755 tests/checkall.test
 delete mode 100755 tests/clean.test
 delete mode 100755 tests/clean2.test
 delete mode 100755 tests/colneq.test
 delete mode 100755 tests/colneq2.test
 delete mode 100755 tests/colon.test
 delete mode 100755 tests/colon2.test
 delete mode 100755 tests/colon3.test
 delete mode 100755 tests/colon4.test
 delete mode 100755 tests/colon5.test
 delete mode 100755 tests/colon6.test
 delete mode 100755 tests/colon7.test
 delete mode 100755 tests/color.test
 delete mode 100755 tests/color2.test
 delete mode 100755 tests/commen10.test
 delete mode 100755 tests/commen11.test
 delete mode 100755 tests/comment.test
 delete mode 100755 tests/comment2.test
 delete mode 100755 tests/comment3.test
 delete mode 100755 tests/comment4.test
 delete mode 100755 tests/comment5.test
 delete mode 100755 tests/comment6.test
 delete mode 100755 tests/comment7.test
 delete mode 100755 tests/comment8.test
 delete mode 100755 tests/comment9.test
 delete mode 100755 tests/comments-in-var-def.test
 delete mode 100755 tests/compile.test
 delete mode 100755 tests/compile2.test
 delete mode 100755 tests/compile3.test
 delete mode 100755 tests/compile4.test
 delete mode 100755 tests/compile5.test
 delete mode 100755 tests/compile6.test
 delete mode 100755 tests/compile_f90_c_cxx.test
 delete mode 100755 tests/compile_f_c_cxx.test
 delete mode 100755 tests/cond.test
 delete mode 100755 tests/cond10.test
 delete mode 100755 tests/cond11.test
 delete mode 100755 tests/cond13.test
 delete mode 100755 tests/cond14.test
 delete mode 100755 tests/cond15.test
 delete mode 100755 tests/cond16.test
 delete mode 100755 tests/cond17.test
 delete mode 100755 tests/cond18.test
 delete mode 100755 tests/cond19.test
 delete mode 100755 tests/cond2.test
 delete mode 100755 tests/cond20.test
 delete mode 100755 tests/cond21.test
 delete mode 100755 tests/cond22.test
 delete mode 100755 tests/cond23.test
 delete mode 100755 tests/cond24.test
 delete mode 100755 tests/cond25.test
 delete mode 100755 tests/cond26.test
 delete mode 100755 tests/cond27.test
 delete mode 100755 tests/cond28.test
 delete mode 100755 tests/cond29.test
 delete mode 100755 tests/cond3.test
 delete mode 100755 tests/cond30.test
 delete mode 100755 tests/cond31.test
 delete mode 100755 tests/cond32.test
 delete mode 100755 tests/cond33.test
 delete mode 100755 tests/cond34.test
 delete mode 100755 tests/cond35.test
 delete mode 100755 tests/cond36.test
 delete mode 100755 tests/cond37.test
 delete mode 100755 tests/cond38.test
 delete mode 100755 tests/cond39.test
 delete mode 100755 tests/cond4.test
 delete mode 100755 tests/cond40.test
 delete mode 100755 tests/cond41.test
 delete mode 100755 tests/cond42.test
 delete mode 100755 tests/cond43.test
 delete mode 100755 tests/cond44.test
 delete mode 100755 tests/cond45.test
 delete mode 100755 tests/cond5.test
 delete mode 100755 tests/cond6.test
 delete mode 100755 tests/cond7.test
 delete mode 100755 tests/cond8.test
 delete mode 100755 tests/cond9.test
 delete mode 100755 tests/condd.test
 delete mode 100755 tests/condhook.test
 delete mode 100755 tests/condhook2.test
 delete mode 100755 tests/condinc.test
 delete mode 100755 tests/condinc2.test
 delete mode 100755 tests/condlib.test
 delete mode 100755 tests/condman.test
 delete mode 100755 tests/condman2.test
 delete mode 100755 tests/condman3.test
 delete mode 100755 tests/confdeps.test
 delete mode 100755 tests/conff.test
 delete mode 100755 tests/conff2.test
 delete mode 100755 tests/conffile-leading-dot.test
 delete mode 100755 tests/confh.test
 delete mode 100755 tests/confh4.test
 delete mode 100755 tests/confh5.test
 delete mode 100755 tests/confh6.test
 delete mode 100755 tests/confh7.test
 delete mode 100755 tests/confh8.test
 delete mode 100755 tests/configure.test
 delete mode 100755 tests/confincl.test
 delete mode 100755 tests/conflnk.test
 delete mode 100755 tests/conflnk2.test
 delete mode 100755 tests/conflnk3.test
 delete mode 100755 tests/conflnk4.test
 delete mode 100755 tests/confsub.test
 delete mode 100755 tests/confvar.test
 delete mode 100755 tests/confvar2.test
 delete mode 100755 tests/copy.test
 delete mode 100755 tests/ctarget1.test
 delete mode 100755 tests/cxx.test
 delete mode 100755 tests/cxx2.test
 delete mode 100755 tests/cxxansi.test
 delete mode 100755 tests/cxxcpp.test
 delete mode 100755 tests/cxxlibobj.test
 delete mode 100755 tests/cxxlink.test
 delete mode 100755 tests/cxxnoc.test
 delete mode 100755 tests/cxxo.test
 delete mode 100755 tests/cygwin32.test
 delete mode 100755 tests/dash.test
 delete mode 100644 tests/defs.in
 delete mode 100755 tests/defun.test
 delete mode 100755 tests/defun2.test
 delete mode 100755 tests/dejagnu-absolute-builddir.test
 delete mode 100755 tests/dejagnu-relative-srcdir.test
 delete mode 100755 tests/dejagnu-siteexp-append.test
 delete mode 100755 tests/dejagnu-siteexp-extend.test
 delete mode 100755 tests/dejagnu-siteexp-useredit.test
 delete mode 100755 tests/dejagnu.test
 delete mode 100755 tests/dejagnu2.test
 delete mode 100755 tests/dejagnu3.test
 delete mode 100755 tests/dejagnu4.test
 delete mode 100755 tests/dejagnu5.test
 delete mode 100755 tests/dejagnu6.test
 delete mode 100755 tests/dejagnu7.test
 delete mode 100755 tests/deleted-am.test
 delete mode 100755 tests/deleted-m4.test
 delete mode 100755 tests/depacl2.test
 delete mode 100755 tests/depcomp.test
 delete mode 100755 tests/depcomp10.test
 delete mode 100755 tests/depcomp2.test
 delete mode 100755 tests/depcomp3.test
 delete mode 100755 tests/depcomp4.test
 delete mode 100755 tests/depcomp5.test
 delete mode 100755 tests/depcomp6.test
 delete mode 100755 tests/depcomp7.test
 delete mode 100755 tests/depcomp8a.test
 delete mode 100755 tests/depcomp8b.test
 delete mode 100755 tests/depcomp9.test
 delete mode 100755 tests/depdist.test
 delete mode 100755 tests/depend.test
 delete mode 100755 tests/depend2.test
 delete mode 100755 tests/depend3.test
 delete mode 100755 tests/depend4.test
 delete mode 100755 tests/depend5.test
 delete mode 100755 tests/depend6.test
 delete mode 100755 tests/destdir.test
 delete mode 100755 tests/dirlist.test
 delete mode 100755 tests/dirlist2.test
 delete mode 100755 tests/discover.test
 delete mode 100755 tests/dist-auxfile-2.test
 delete mode 100755 tests/dist-auxfile.test
 delete mode 100755 tests/dist-included-parent-dir.test
 delete mode 100755 tests/dist-missing-am.test
 delete mode 100755 tests/dist-missing-included-m4.test
 delete mode 100755 tests/dist-missing-m4.test
 delete mode 100755 tests/dist-pr109765.test
 delete mode 100755 tests/distcheck-configure-flags-am.test
 delete mode 100755 tests/distcheck-configure-flags-subpkg.test
 delete mode 100755 tests/distcheck-configure-flags.test
 delete mode 100644 tests/distcheck-hook-m4.am
 delete mode 100755 tests/distcheck-hook.test
 delete mode 100755 tests/distcheck-hook2.test
 delete mode 100755 tests/distcheck-missing-m4.test
 delete mode 100755 tests/distcheck-outdated-m4.test
 delete mode 100755 tests/distcheck-override-infodir.test
 delete mode 100755 tests/distcheck-pr10470.test
 delete mode 100755 tests/distcheck-pr9579.test
 delete mode 100755 tests/distcleancheck.test
 delete mode 100755 tests/distcom2.test
 delete mode 100755 tests/distcom3.test
 delete mode 100755 tests/distcom4.test
 delete mode 100755 tests/distcom5.test
 delete mode 100755 tests/distcom6.test
 delete mode 100755 tests/distcom7.test
 delete mode 100755 tests/distdir.test
 delete mode 100755 tests/distlinks.test
 delete mode 100755 tests/distlinksbrk.test
 delete mode 100755 tests/distname.test
 delete mode 100755 tests/dmalloc.test
 delete mode 100755 tests/doc-parsing-buglets-colneq-subst.test
 delete mode 100755 tests/doc-parsing-buglets-tabs.test
 delete mode 100755 tests/dollar.test
 delete mode 100755 tests/dollarvar.test
 delete mode 100755 tests/dollarvar2.test
 delete mode 100755 tests/double.test
 delete mode 100755 tests/dup2.test
 delete mode 100755 tests/else.test
 delete mode 100755 tests/empty.test
 delete mode 100755 tests/empty2.test
 delete mode 100755 tests/empty3.test
 delete mode 100755 tests/empty4.test
 delete mode 100755 tests/exdir.test
 delete mode 100755 tests/exdir2.test
 delete mode 100755 tests/exdir3.test
 delete mode 100755 tests/exeext.test
 delete mode 100755 tests/exeext2.test
 delete mode 100755 tests/exeext3.test
 delete mode 100755 tests/exeext4.test
 delete mode 100755 tests/exsource.test
 delete mode 100755 tests/ext.test
 delete mode 100755 tests/ext2.test
 delete mode 100755 tests/extra-portability.test
 delete mode 100755 tests/extra-portability2.test
 delete mode 100755 tests/extra-portability3.test
 delete mode 100755 tests/extra.test
 delete mode 100755 tests/extra10.test
 delete mode 100755 tests/extra11.test
 delete mode 100755 tests/extra12.test
 delete mode 100755 tests/extra2.test
 delete mode 100755 tests/extra3.test
 delete mode 100755 tests/extra4.test
 delete mode 100755 tests/extra5.test
 delete mode 100755 tests/extra6.test
 delete mode 100755 tests/extra7.test
 delete mode 100755 tests/extra8.test
 delete mode 100755 tests/extradep.test
 delete mode 100755 tests/extradep2.test
 delete mode 100755 tests/f90only.test
 delete mode 100755 tests/flavor.test
 delete mode 100755 tests/flibs.test
 delete mode 100755 tests/fn99.test
 delete mode 100755 tests/fn99subdir.test
 delete mode 100755 tests/fnoc.test
 delete mode 100755 tests/fo.test
 delete mode 100755 tests/fonly.test
 delete mode 100755 tests/forcemiss.test
 delete mode 100755 tests/forcemiss2.test
 delete mode 100755 tests/fort1.test
 delete mode 100755 tests/fort2.test
 delete mode 100755 tests/fort4.test
 delete mode 100755 tests/fort5.test
 delete mode 100755 tests/fortdep.test
 delete mode 100755 tests/gcj.test
 delete mode 100755 tests/gcj2.test
 delete mode 100755 tests/gcj3.test
 delete mode 100755 tests/gcj4.test
 delete mode 100755 tests/gcj5.test
 delete mode 100755 tests/gcj6.test
 delete mode 100755 tests/gen-parallel-tests
 delete mode 100755 tests/get-sysconf.test
 delete mode 100755 tests/gettext-macros.test
 delete mode 100755 tests/gettext.test
 delete mode 100755 tests/gettext2.test
 delete mode 100755 tests/gettext3.test
 delete mode 100755 tests/gnits.test
 delete mode 100755 tests/gnits2.test
 delete mode 100755 tests/gnits3.test
 delete mode 100755 tests/gnumake.test
 delete mode 100755 tests/gnuwarn.test
 delete mode 100755 tests/gnuwarn2.test
 delete mode 100755 tests/hdr-vars-defined-once.test
 delete mode 100755 tests/header.test
 delete mode 100755 tests/help-depend.test
 delete mode 100755 tests/help-depend2.test
 delete mode 100755 tests/help-dmalloc.test
 delete mode 100755 tests/help-init.test
 delete mode 100755 tests/help-lispdir.test
 delete mode 100755 tests/help-multilib.test
 delete mode 100755 tests/help-python.test
 delete mode 100755 tests/help-regex.test
 delete mode 100755 tests/help-silent.test
 delete mode 100755 tests/help-upc.test
 delete mode 100755 tests/help.test
 delete mode 100755 tests/help2.test
 delete mode 100755 tests/help3.test
 delete mode 100755 tests/help4.test
 delete mode 100755 tests/hfs.test
 delete mode 100755 tests/hosts.test
 delete mode 100755 tests/implicit.test
 delete mode 100755 tests/info.test
 delete mode 100755 tests/init.test
 delete mode 100755 tests/init2.test
 delete mode 100755 tests/insh2.test
 delete mode 100755 tests/install-info-dir.test
 delete mode 100755 tests/install2.test
 delete mode 100755 tests/installdir.test
 delete mode 100755 tests/instdat.test
 delete mode 100755 tests/instdat2.test
 delete mode 100644 tests/instdir-cond.test
 delete mode 100644 tests/instdir-cond2.test
 delete mode 100755 tests/instdir-java.test
 delete mode 100755 tests/instdir-lisp.test
 delete mode 100755 tests/instdir-ltlib.test
 delete mode 100755 tests/instdir-no-empty.test
 delete mode 100755 tests/instdir-prog.test
 delete mode 100755 tests/instdir-python.test
 delete mode 100755 tests/instdir-texi.test
 delete mode 100755 tests/instdir.test
 delete mode 100755 tests/instdir2.test
 delete mode 100755 tests/instexec.test
 delete mode 100755 tests/instfail-info.test
 delete mode 100755 tests/instfail-java.test
 delete mode 100755 tests/instfail-libtool.test
 delete mode 100755 tests/instfail.test
 delete mode 100755 tests/insthook.test
 delete mode 100755 tests/instman.test
 delete mode 100755 tests/instman2.test
 delete mode 100755 tests/instmany-mans.test
 delete mode 100755 tests/instmany-python.test
 delete mode 100755 tests/instmany.test
 delete mode 100755 tests/instsh.test
 delete mode 100755 tests/instsh2.test
 delete mode 100755 tests/instsh3.test
 delete mode 100755 tests/instspc.test
 delete mode 100755 tests/interp.test
 delete mode 100755 tests/interp2.test
 delete mode 100755 tests/java-check.test
 delete mode 100755 tests/java-clean.test
 delete mode 100755 tests/java-compile-install.test
 delete mode 100755 tests/java-empty-classpath.test
 delete mode 100755 tests/java-mix.test
 delete mode 100755 tests/java-no-duplicate.test
 delete mode 100755 tests/java-nobase.test
 delete mode 100755 tests/java-sources.test
 delete mode 100755 tests/java.test
 delete mode 100755 tests/java2.test
 delete mode 100755 tests/java3.test
 delete mode 100755 tests/javadir-undefined.test
 delete mode 100755 tests/javaprim.test
 delete mode 100755 tests/javasubst.test
 delete mode 100755 tests/ldadd.test
 delete mode 100755 tests/ldflags.test
 delete mode 100755 tests/lex-subobj-nodep.test
 delete mode 100755 tests/lex.test
 delete mode 100755 tests/lex2.test
 delete mode 100755 tests/lex3.test
 delete mode 100755 tests/lex4.test
 delete mode 100755 tests/lex5.test
 delete mode 100755 tests/lflags.test
 delete mode 100755 tests/lflags2.test
 delete mode 100755 tests/libexec.test
 delete mode 100755 tests/libobj10.test
 delete mode 100755 tests/libobj11.test
 delete mode 100755 tests/libobj12.test
 delete mode 100755 tests/libobj13.test
 delete mode 100755 tests/libobj14.test
 delete mode 100755 tests/libobj2.test
 delete mode 100755 tests/libobj3.test
 delete mode 100755 tests/libobj4.test
 delete mode 100755 tests/libobj5.test
 delete mode 100755 tests/libobj7.test
 delete mode 100755 tests/libobj8.test
 delete mode 100755 tests/library.test
 delete mode 100755 tests/library2.test
 delete mode 100755 tests/library3.test
 delete mode 100755 tests/libtoo10.test
 delete mode 100755 tests/libtoo11.test
 delete mode 100755 tests/libtool-macros.test
 delete mode 100755 tests/libtool.test
 delete mode 100755 tests/libtool2.test
 delete mode 100755 tests/libtool3.test
 delete mode 100755 tests/libtool4.test
 delete mode 100755 tests/libtool5.test
 delete mode 100755 tests/libtool6.test
 delete mode 100755 tests/libtool7.test
 delete mode 100755 tests/libtool8.test
 delete mode 100755 tests/libtool9.test
 delete mode 100755 tests/license.test
 delete mode 100755 tests/license2.test
 delete mode 100755 tests/link_c_cxx.test
 delete mode 100755 tests/link_cond.test
 delete mode 100755 tests/link_dist.test
 delete mode 100755 tests/link_f90_only.test
 delete mode 100755 tests/link_f_only.test
 delete mode 100755 tests/link_fc.test
 delete mode 100755 tests/link_fccxx.test
 delete mode 100755 tests/link_fcxx.test
 delete mode 100755 tests/lisp2.test
 delete mode 100755 tests/lisp3.test
 delete mode 100755 tests/lisp4.test
 delete mode 100755 tests/lisp5.test
 delete mode 100755 tests/lisp6.test
 delete mode 100755 tests/lisp7.test
 delete mode 100755 tests/lisp8.test
 delete mode 100755 tests/lispdry.test
 delete mode 100644 tests/list-of-tests.mk
 delete mode 100755 tests/listval.test
 delete mode 100755 tests/location.test
 delete mode 100755 tests/longlin2.test
 delete mode 100755 tests/longline.test
 delete mode 100755 tests/ltcond.test
 delete mode 100755 tests/ltcond2.test
 delete mode 100755 tests/ltconv.test
 delete mode 100755 tests/ltdeps.test
 delete mode 100755 tests/ltinit.test
 delete mode 100755 tests/ltinstloc.test
 delete mode 100755 tests/ltlibobjs.test
 delete mode 100755 tests/ltlibsrc.test
 delete mode 100755 tests/ltorder.test
 delete mode 100755 tests/lzip.test
 delete mode 100755 tests/lzma.test
 delete mode 100755 tests/m4-inclusion.test
 delete mode 100755 tests/maintclean-vpath.test
 delete mode 100755 tests/maintclean.test
 delete mode 100755 tests/maintmode-configure-msg.test
 delete mode 100755 tests/make-dryrun.test
 delete mode 100755 tests/make.test
 delete mode 100755 tests/makefile-deps.test
 delete mode 100755 tests/makej.test
 delete mode 100755 tests/makej2.test
 delete mode 100755 tests/maken.test
 delete mode 100755 tests/maken3.test
 delete mode 100755 tests/makevars.test
 delete mode 100755 tests/man.test
 delete mode 100755 tests/man2.test
 delete mode 100755 tests/man3.test
 delete mode 100755 tests/man4.test
 delete mode 100755 tests/man5.test
 delete mode 100755 tests/mdate.test
 delete mode 100755 tests/mdate2.test
 delete mode 100755 tests/mdate3.test
 delete mode 100755 tests/mdate4.test
 delete mode 100755 tests/mdate5.test
 delete mode 100755 tests/mdate6.test
 delete mode 100755 tests/missing.test
 delete mode 100755 tests/missing2.test
 delete mode 100755 tests/missing3.test
 delete mode 100755 tests/missing4.test
 delete mode 100755 tests/missing5.test
 delete mode 100755 tests/missing6.test
 delete mode 100755 tests/mkinst2.test
 delete mode 100755 tests/mkinst3.test
 delete mode 100755 tests/mkinstall.test
 delete mode 100755 tests/mmode.test
 delete mode 100755 tests/mmodely.test
 delete mode 100755 tests/multlib.test
 delete mode 100755 tests/nobase-libtool.test
 delete mode 100755 tests/nobase-nodist.test
 delete mode 100755 tests/nobase-python.test
 delete mode 100755 tests/nobase.test
 delete mode 100755 tests/nodef.test
 delete mode 100755 tests/nodef2.test
 delete mode 100755 tests/nodep.test
 delete mode 100755 tests/nodep2.test
 delete mode 100755 tests/nodepcomp.test
 delete mode 100755 tests/nodist.test
 delete mode 100755 tests/nodist2.test
 delete mode 100755 tests/nodist3.test
 delete mode 100755 tests/nogzip.test
 delete mode 100755 tests/nogzip2.test
 delete mode 100755 tests/noinst.test
 delete mode 100755 tests/noinstdir.test
 delete mode 100755 tests/nolink.test
 delete mode 100755 tests/nostdinc.test
 delete mode 100755 tests/notrans.test
 delete mode 100755 tests/number.test
 delete mode 100755 tests/objc.test
 delete mode 100755 tests/objc2.test
 delete mode 100755 tests/objext-pr10128.test
 delete mode 100755 tests/obsolete.test
 delete mode 100755 tests/order.test
 delete mode 100755 tests/outdir.test
 delete mode 100755 tests/output-order.test
 delete mode 100755 tests/output.test
 delete mode 100755 tests/output10.test
 delete mode 100755 tests/output11.test
 delete mode 100755 tests/output12.test
 delete mode 100755 tests/output13.test
 delete mode 100755 tests/output2.test
 delete mode 100755 tests/output3.test
 delete mode 100755 tests/output4.test
 delete mode 100755 tests/output5.test
 delete mode 100755 tests/output6.test
 delete mode 100755 tests/output7.test
 delete mode 100755 tests/output8.test
 delete mode 100755 tests/output9.test
 delete mode 100755 tests/overrid.test
 delete mode 100755 tests/parallel-am.test
 delete mode 100755 tests/parallel-am2.test
 delete mode 100755 tests/parallel-am3.test
 delete mode 100755 tests/parallel-tests-dryrun.test
 delete mode 100755 tests/parallel-tests-harderror.test
 delete mode 100755 tests/parallel-tests-log-compiler-example.test
 delete mode 100755 tests/parallel-tests-log-override-1.test
 delete mode 100755 tests/parallel-tests-log-override-2.test
 delete mode 100755 tests/parallel-tests-log-override-recheck.test
 delete mode 100755 tests/parallel-tests-subdir.test
 delete mode 100755 tests/parallel-tests-unreadable-log.test
 delete mode 100755 tests/parallel-tests.test
 delete mode 100755 tests/parallel-tests10.test
 delete mode 100755 tests/parallel-tests2.test
 delete mode 100755 tests/parallel-tests3.test
 delete mode 100755 tests/parallel-tests4.test
 delete mode 100755 tests/parallel-tests5.test
 delete mode 100755 tests/parallel-tests6.test
 delete mode 100755 tests/parallel-tests7.test
 delete mode 100755 tests/parallel-tests8.test
 delete mode 100755 tests/parallel-tests9.test
 delete mode 100755 tests/parse.test
 delete mode 100755 tests/percent.test
 delete mode 100755 tests/percent2.test
 delete mode 100755 tests/phony.test
 delete mode 100755 tests/pluseq.test
 delete mode 100755 tests/pluseq10.test
 delete mode 100755 tests/pluseq11.test
 delete mode 100755 tests/pluseq2.test
 delete mode 100755 tests/pluseq3.test
 delete mode 100755 tests/pluseq4.test
 delete mode 100755 tests/pluseq5.test
 delete mode 100755 tests/pluseq6.test
 delete mode 100755 tests/pluseq7.test
 delete mode 100755 tests/pluseq8.test
 delete mode 100755 tests/pluseq9.test
 delete mode 100644 tests/pm/Condition-t.pl
 delete mode 100644 tests/pm/Condition.pl
 delete mode 100644 tests/pm/DisjConditions-t.pl
 delete mode 100644 tests/pm/DisjConditions.pl
 delete mode 100644 tests/pm/Version.pl
 delete mode 100644 tests/pm/Wrap.pl
 delete mode 100755 tests/postproc.test
 delete mode 100755 tests/ppf77.test
 delete mode 100755 tests/pr2.test
 delete mode 100755 tests/pr204.test
 delete mode 100755 tests/pr211.test
 delete mode 100755 tests/pr220.test
 delete mode 100755 tests/pr224.test
 delete mode 100755 tests/pr229.test
 delete mode 100755 tests/pr243.test
 delete mode 100755 tests/pr266.test
 delete mode 100755 tests/pr279-2.test
 delete mode 100755 tests/pr279.test
 delete mode 100755 tests/pr287.test
 delete mode 100755 tests/pr300-lib.test
 delete mode 100755 tests/pr300-ltlib.test
 delete mode 100755 tests/pr300-prog.test
 delete mode 100755 tests/pr307.test
 delete mode 100755 tests/pr401.test
 delete mode 100755 tests/pr401b.test
 delete mode 100755 tests/pr401c.test
 delete mode 100755 tests/pr72.test
 delete mode 100755 tests/pr8365-remake-timing.test
 delete mode 100755 tests/pr87.test
 delete mode 100755 tests/pr9.test
 delete mode 100755 tests/prefix.test
 delete mode 100755 tests/primary-prefix-couples-documented-valid.test
 delete mode 100755 tests/primary-prefix-couples-force-valid.test
 delete mode 100755 tests/primary-prefix-invalid-couples.test
 delete mode 100755 tests/primary-prefix-valid-couples.test
 delete mode 100755 tests/primary.test
 delete mode 100755 tests/primary2.test
 delete mode 100755 tests/primary3.test
 delete mode 100755 tests/proginst.test
 delete mode 100755 tests/py-compile-basedir.test
 delete mode 100755 tests/py-compile-basic.test
 delete mode 100755 tests/py-compile-basic2.test
 delete mode 100755 tests/py-compile-destdir.test
 delete mode 100755 tests/py-compile-env.test
 delete mode 100755 tests/py-compile-option-terminate.test
 delete mode 100755 tests/py-compile-usage.test
 delete mode 100755 tests/python-pr10995.test
 delete mode 100755 tests/python.test
 delete mode 100755 tests/python10.test
 delete mode 100755 tests/python11.test
 delete mode 100755 tests/python12.test
 delete mode 100755 tests/python2.test
 delete mode 100755 tests/python3.test
 delete mode 100755 tests/python4.test
 delete mode 100755 tests/python5.test
 delete mode 100755 tests/python6.test
 delete mode 100755 tests/python7.test
 delete mode 100755 tests/python8.test
 delete mode 100755 tests/python9.test
 delete mode 100755 tests/recurs.test
 delete mode 100755 tests/recurs2.test
 delete mode 100755 tests/regex-obsolete.test
 delete mode 100755 tests/regex.test
 delete mode 100755 tests/remake-am-pr10111.test
 delete mode 100755 tests/remake-deleted-am-2.test
 delete mode 100755 tests/remake-deleted-am-subdir.test
 delete mode 100755 tests/remake-deleted-am.test
 delete mode 100755 tests/remake-m4-pr10111.test
 delete mode 100755 tests/remake-renamed-am.test
 delete mode 100755 tests/remake-subdir-from-subdir.test
 delete mode 100755 tests/remake-subdir-gnu.test
 delete mode 100755 tests/remake-subdir-long-time.test
 delete mode 100755 tests/remake-subdir.test
 delete mode 100755 tests/remake-subdir2.test
 delete mode 100755 tests/remake.test
 delete mode 100755 tests/remake2.test
 delete mode 100755 tests/remake3.test
 delete mode 100755 tests/remake4.test
 delete mode 100755 tests/remake5.test
 delete mode 100755 tests/remake6.test
 delete mode 100755 tests/remake7.test
 delete mode 100755 tests/req.test
 delete mode 100755 tests/reqd.test
 delete mode 100755 tests/reqd2.test
 delete mode 100755 tests/rulepat.test
 delete mode 100755 tests/sanity.test
 delete mode 100755 tests/scripts.test
 delete mode 100755 tests/seenc.test
 delete mode 100755 tests/self-check-env-sanitize.test
 delete mode 100755 tests/self-check-report.test
 delete mode 100755 tests/silent-configsite.test
 delete mode 100755 tests/silent-lex-gcc.test
 delete mode 100755 tests/silent-lex-generic.test
 delete mode 100755 tests/silent-many-gcc.test
 delete mode 100755 tests/silent-many-generic.test
 delete mode 100755 tests/silent-nested-vars.test
 delete mode 100755 tests/silent-yacc-gcc.test
 delete mode 100755 tests/silent-yacc-generic.test
 delete mode 100755 tests/silent.test
 delete mode 100755 tests/silent2.test
 delete mode 100755 tests/silent3.test
 delete mode 100755 tests/silent4.test
 delete mode 100755 tests/silent6.test
 delete mode 100755 tests/silent7.test
 delete mode 100755 tests/silent9.test
 delete mode 100755 tests/silentcxx.test
 delete mode 100755 tests/silentf77.test
 delete mode 100755 tests/silentf90.test
 delete mode 100755 tests/space.test
 delete mode 100755 tests/specflg-dummy.test
 delete mode 100755 tests/specflg.test
 delete mode 100755 tests/specflg10.test
 delete mode 100755 tests/specflg2.test
 delete mode 100755 tests/specflg3.test
 delete mode 100755 tests/specflg6.test
 delete mode 100755 tests/specflg7.test
 delete mode 100755 tests/specflg8.test
 delete mode 100755 tests/specflg9.test
 delete mode 100755 tests/spell.test
 delete mode 100755 tests/spell2.test
 delete mode 100755 tests/spell3.test
 delete mode 100755 tests/spelling.test
 delete mode 100755 tests/spy.test
 delete mode 100755 tests/srcsub.test
 delete mode 100755 tests/srcsub2.test
 delete mode 100755 tests/stamph2.test
 delete mode 100755 tests/stdinc.test
 delete mode 100755 tests/stdlib.test
 delete mode 100755 tests/stdlib2.test
 delete mode 100755 tests/strip.test
 delete mode 100755 tests/strip2.test
 delete mode 100755 tests/strip3.test
 delete mode 100755 tests/subcond.test
 delete mode 100755 tests/subcond2.test
 delete mode 100755 tests/subcond3.test
 delete mode 100755 tests/subdir.test
 delete mode 100755 tests/subdir10.test
 delete mode 100755 tests/subdir2.test
 delete mode 100755 tests/subdir3.test
 delete mode 100755 tests/subdir4.test
 delete mode 100755 tests/subdir5.test
 delete mode 100755 tests/subdir6.test
 delete mode 100755 tests/subdir7.test
 delete mode 100755 tests/subdir8.test
 delete mode 100755 tests/subdir9.test
 delete mode 100755 tests/subdirbuiltsources.test
 delete mode 100755 tests/subobj.test
 delete mode 100755 tests/subobj10.test
 delete mode 100755 tests/subobj11a.test
 delete mode 100755 tests/subobj11b.test
 delete mode 100755 tests/subobj11c.test
 delete mode 100755 tests/subobj2.test
 delete mode 100755 tests/subobj3.test
 delete mode 100755 tests/subobj4.test
 delete mode 100755 tests/subobj5.test
 delete mode 100755 tests/subobj6.test
 delete mode 100755 tests/subobj7.test
 delete mode 100755 tests/subobj8.test
 delete mode 100755 tests/subobj9.test
 delete mode 100755 tests/subobjname.test
 delete mode 100755 tests/subpkg-yacc.test
 delete mode 100755 tests/subpkg.test
 delete mode 100755 tests/subpkg2.test
 delete mode 100755 tests/subpkg3.test
 delete mode 100755 tests/subpkg4.test
 delete mode 100755 tests/subst.test
 delete mode 100755 tests/subst2.test
 delete mode 100755 tests/subst3.test
 delete mode 100755 tests/subst4.test
 delete mode 100755 tests/substre2.test
 delete mode 100755 tests/substref.test
 delete mode 100755 tests/substtarg.test
 delete mode 100755 tests/suffix.test
 delete mode 100755 tests/suffix10.test
 delete mode 100755 tests/suffix11.test
 delete mode 100755 tests/suffix12.test
 delete mode 100755 tests/suffix13.test
 delete mode 100755 tests/suffix2.test
 delete mode 100755 tests/suffix3.test
 delete mode 100755 tests/suffix4.test
 delete mode 100755 tests/suffix5.test
 delete mode 100755 tests/suffix6.test
 delete mode 100755 tests/suffix7.test
 delete mode 100755 tests/suffix8.test
 delete mode 100755 tests/suffix9.test
 delete mode 100755 tests/symlink.test
 delete mode 100755 tests/symlink2.test
 delete mode 100755 tests/syntax.test
 delete mode 100755 tests/tags.test
 delete mode 100755 tests/tagsub.test
 delete mode 100755 tests/tar-override.test
 delete mode 100755 tests/tar.test
 delete mode 100755 tests/tar2.test
 delete mode 100755 tests/tar3.test
 delete mode 100755 tests/target-cflags.test
 delete mode 100755 tests/targetclash.test
 delete mode 100755 tests/test-extensions-cond.test
 delete mode 100755 tests/test-extensions.test
 delete mode 100755 tests/tests-environment-backcompat.test
 delete mode 100755 tests/transform.test
 delete mode 100755 tests/transform2.test
 delete mode 100755 tests/txinfo.test
 delete mode 100755 tests/txinfo10.test
 delete mode 100755 tests/txinfo13.test
 delete mode 100755 tests/txinfo16.test
 delete mode 100755 tests/txinfo17.test
 delete mode 100755 tests/txinfo18.test
 delete mode 100755 tests/txinfo19.test
 delete mode 100755 tests/txinfo2.test
 delete mode 100755 tests/txinfo20.test
 delete mode 100755 tests/txinfo21.test
 delete mode 100755 tests/txinfo22.test
 delete mode 100755 tests/txinfo23.test
 delete mode 100755 tests/txinfo24.test
 delete mode 100755 tests/txinfo25.test
 delete mode 100755 tests/txinfo26.test
 delete mode 100755 tests/txinfo27.test
 delete mode 100755 tests/txinfo28.test
 delete mode 100755 tests/txinfo29.test
 delete mode 100755 tests/txinfo3.test
 delete mode 100755 tests/txinfo30.test
 delete mode 100755 tests/txinfo31.test
 delete mode 100755 tests/txinfo32.test
 delete mode 100755 tests/txinfo33.test
 delete mode 100755 tests/txinfo4.test
 delete mode 100755 tests/txinfo5.test
 delete mode 100755 tests/txinfo5b.test
 delete mode 100755 tests/txinfo6.test
 delete mode 100755 tests/txinfo7.test
 delete mode 100755 tests/txinfo8.test
 delete mode 100755 tests/txinfo9.test
 delete mode 100755 tests/uninstall-fail.test
 delete mode 100755 tests/uninstall-pr9578.test
 delete mode 100755 tests/unused.test
 delete mode 100755 tests/upc.test
 delete mode 100755 tests/upc2.test
 delete mode 100755 tests/upc3.test
 delete mode 100755 tests/vala-mix.test
 delete mode 100755 tests/vala-mix2.test
 delete mode 100755 tests/vala-vapi.test
 delete mode 100755 tests/vala-vpath.test
 delete mode 100755 tests/vala.test
 delete mode 100755 tests/vala1.test
 delete mode 100755 tests/vala2.test
 delete mode 100755 tests/vala3.test
 delete mode 100755 tests/vala4.test
 delete mode 100755 tests/vala5.test
 delete mode 100755 tests/vars.test
 delete mode 100755 tests/vars3.test
 delete mode 100755 tests/vartar.test
 delete mode 100755 tests/version.test
 delete mode 100755 tests/version2.test
 delete mode 100755 tests/version3.test
 delete mode 100755 tests/version4.test
 delete mode 100755 tests/version6.test
 delete mode 100755 tests/version7.test
 delete mode 100755 tests/version8.test
 delete mode 100755 tests/vpath.test
 delete mode 100755 tests/vtexi.test
 delete mode 100755 tests/vtexi2.test
 delete mode 100755 tests/vtexi3.test
 delete mode 100755 tests/vtexi4.test
 delete mode 100755 tests/warnopts.test
 delete mode 100755 tests/werror.test
 delete mode 100755 tests/werror2.test
 delete mode 100755 tests/werror3.test
 delete mode 100755 tests/whoami.test
 delete mode 100755 tests/xsource.test
 delete mode 100755 tests/xz.test
 delete mode 100755 tests/yacc-dist-nobuild-subdir.test
 delete mode 100755 tests/yacc.test
 delete mode 100755 tests/yacc2.test
 delete mode 100755 tests/yacc3.test
 delete mode 100755 tests/yacc4.test
 delete mode 100755 tests/yacc5.test
 delete mode 100755 tests/yacc6.test
 delete mode 100755 tests/yacc7.test
 delete mode 100755 tests/yacc8.test
 delete mode 100755 tests/yaccdry.test
 delete mode 100755 tests/yaccpp.test
 delete mode 100755 tests/yaccvpath.test
 delete mode 100755 tests/yflags.test
 delete mode 100755 tests/yflags2.test

diff --git a/.autom4te.cfg b/.autom4te.cfg
new file mode 100644
index 0000000..787905a
--- /dev/null
+++ b/.autom4te.cfg
@@ -0,0 +1,5 @@
+## autom4te.cfg for the Automake package.
+##
+begin-language: "Autoconf-without-aclocal-m4"
+args: --cache=.autom4te.cache
+end-language: "Autoconf-without-aclocal-m4"
diff --git a/.git-log-fix b/.git-log-fix
new file mode 100644
index 0000000..d87a0ec
--- /dev/null
+++ b/.git-log-fix
@@ -0,0 +1,13 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.
+
+3b369e6bbe0fb6d7359398935706c87dd9375cb6
+# Date:   Thu Feb 16 22:29:32 2012 +0100
+# Fix a typo.
+s| bur | bug |
+
+22729165f6bb902daeb8a4d8e7cb06982390f327
+# Date:   Fri Feb 17 10:13:15 2012 +0100
+# Fix a typo.
+s|.fix-git-log|.git-log-fix|
diff --git a/.gitignore b/.gitignore
index f219153..78b7aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-Makefile.in
-Makefile
 /ChangeLog
 /aclocal.m4
 /configure
-/autom4te.cache
+/Makefile.in
+/Makefile
+/.autom4te.cache
 /config.cache
 /config.log
 /config.status
@@ -11,33 +11,18 @@ Makefile
 /configure.lineno
 /aclocal
 /automake
-/doc/amhello-*.tar.gz
-/doc/automake.info
-/doc/automake.info-[0-9]
+/doc/.dirstamp
+/doc/automake*.info
+/doc/automake*.info-[0-9]
+/doc/automake*.html
+/doc/automake*.dvi
+/doc/automake*.pdf
+/doc/automake*.ps
 /doc/automake*.1
 /doc/aclocal*.1
 /doc/stamp-vti
 /doc/version.texi
-/doc/automake.ac
-/doc/automake.aux
-/doc/automake.cm
-/doc/automake.cp
-/doc/automake.cps
-/doc/automake.dvi
-/doc/automake.fn
-/doc/automake.fns
-/doc/automake.html
-/doc/automake.ky
-/doc/automake.log
-/doc/automake.op
-/doc/automake.pdf
-/doc/automake.pg
-/doc/automake.ps
-/doc/automake.toc
-/doc/automake.tp
-/doc/automake.tr
-/doc/automake.vr
-/doc/automake.vrs
+/doc/amhello-*.tar.gz
 /doc/amhello/Makefile.in
 /doc/amhello/aclocal.m4
 /doc/amhello/config.h.in
@@ -47,15 +32,22 @@ Makefile
 /doc/amhello/install-sh
 /doc/amhello/missing
 /lib/Automake/Config.pm
-/tests/*.log
-/tests/*.log-t
-/tests/pm/*.log
-/tests/pm/*.log-t
-/tests/*.dir
-/tests/*-p.test
-/tests/aclocal-1.*
-/tests/automake-1.*
-/tests/defs
-/tests/parallel-tests.am
+/test-suite.log
+/t/wrap/aclocal-1.*
+/t/wrap/automake-1.*
+/defs-static
+/t/testsuite-part.am
+/t/*-w.tap
+/t/*-w.sh
+/t/depcomp-*.tap
+/t/*.dir
+/t/*.log
+/t/*.trs
+/t/pm/*.log
+/t/pm/*.trs
+cscope.files
+cscope.in.out
+cscope.out
+cscope.po.out
 tags
 TAGS
diff --git a/ChangeLog.00 b/ChangeLog.00
deleted file mode 100644
index 756107d..0000000
--- a/ChangeLog.00
+++ /dev/null
@@ -1,2211 +0,0 @@
-2000-12-29  Derek Price  <address@hidden>
-
-       * automake.in (handle_dependencies): Switched the DEP_FILES
-       definition to be conditional on @address@hidden
-
-2001-02-03  Ville Laurikari  <address@hidden>
-
-       * depcomp (aix): New side-effect dependency tracking mode, for
-       the C for AIX compiler.
-       * m4/depend.m4 (AM_DEPENDENCIES): Recreate `conftest.c' and
-       `conftest.h' for each test.
-
-2001-02-03  Tom Tromey  <address@hidden>
-
-       * automake.texi (Dist): Updated to mention caveat of putting
-       directory in EXTRA_DIST and also providing a nice example of
-       removing the CVS dir.
-       From Ganesan Rajagopal.
-
-       * m4/depend.m4 (depcpp): Run tests in a subdir.  Fixes report from
-       Bob Proulx.
-
-       * automake.in (scan_one_autoconf_file): Disable warning about
-       AM_PROG_LIBTOOL.
-
-       * automake.in (handle_configure): Don't modify variable which
-       aliases list element.  Don't push @inputs onto the dist list.
-       Fixes colon7.test.
-       (initialize_per_input) [dist_dirs]: New variable.
-       (handle_dist_worker): Use global dist_dirs.
-       (handle_configure): Set dist_dirs entries at toplevel.
-
-2001-02-02  Gordon Sadler  <address@hidden>
-
-       * automake.texi (Java Support): Added index, @section.
-
-2001-02-02  Pavel Roskin  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Restore trace messages.
-
-       * automake.in (handle_aclocal_m4): Fix stripping of the initial
-       "./" from the dependencies of aclocal.m4.
-       Reported by Ralf Corsepius.
-
-2001-02-01  Pavel Roskin  <address@hidden>
-
-       * aclocal.in: Rename "verbosity" to "verbose". Always prepend
-       "aclocal: " to the verbose output.
-
-       * automake.in: Remove all debugging messages.
-
-2001-01-31  Akim Demaille  <address@hidden>
-
-       * automake.in (add_depend2): Quote properly $obj and $source.
-
-2001-01-31  Akim Demaille  <address@hidden>
-
-       * depend2.am: Instead of replacing @PFX@ in $(@address@hidden), and
-       then replacing `$(@address@hidden)' for the files that need some
-       special flags, use only @address@hidden  Similarly for @address@hidden
-       Try to document this file.
-       * automake.in (add_depend2): Adjust to these changes.
-
-2001-01-31  Akim Demaille  <address@hidden>
-
-       * automake.in (%factored_dependencies): New.
-       (file_contents): Use it.
-       (handle_phony): Rename as...
-       (handle_factored_dependencies): this.
-       * subdirs.am: No need for convolved syntax to declare .PHONY.
-
-2001-01-31  Akim Demaille  <address@hidden>
-
-       * automake.in: maintainer-check fixes.
-
-2001-01-31  Akim Demaille  <address@hidden>
-
-       * automake.in (file_contents): Rewrite: instead of trying to parse
-       it line by line, first swallow it completely into $CONTENTS,
-       *then*, parse it *paragraph* by paragraph.
-
-2001-01-30  Akim Demaille  <address@hidden>
-
-       * automake.in (file_contents): Remove.
-       (file_contents_with_transform): Swap the order of the arguments,
-       and rename as...
-       (file_contents): this.
-       Adjust all uses.
-
-2001-01-30  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Don't mention
-       omit_dependencies.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_autoconf_config_files): Extract from
-       &scan_one_autoconf_file.
-       (&scan_one_autoconf_file): Use it.
-       (&scan_autoconf_traces): New.
-       ($scan_autoconf_files): Use it.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * texinfos.am, tags.am, subdirs.am, multilib.am, mans.am: Add a
-       .PHONY target.
-       * automake.in (handle_texinfo, handle_man_pages, handle_multilib)
-       (handle_etags, handle_subdirs): Don't push into @phony.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Correctly recognize
-       configure.ac.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_tests_dejagnu): New, extracted from...
-       (handle_tests): here.  Use `.PHONY:'.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_phony): Sort.
-       (file_contents_with_transform): Catch `.PHONY:'.
-       (handle_tests): Instead dumping the hard coded target check-TESTS
-       and registering its .PHONYsm, get them from...
-       * check.am: here, new file.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (add_depend2): Use &transform.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_tags): Use &transform.
-       (am_error, am_line_error, am_conf_error, read_am_file): Use
-       directly arrays in strings, no need for &join.
-       Require Perl 5.
-       * Makefile.am (maintainer-check): Use grep -w when looking for
-       words.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (prog_error): New.
-       Spread its use.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_single_transform_list): if (@list) { foreach
-       (@list) ...} can be written as a simple `foreach' loop.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (define_standard_variables): Use &transform instead
-       of build_rx.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): Use the new $texinfodir instead of
-       the removed $texinfo_tex.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_libraries, handle_ltlibraries): Use
-       &transform.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_programs) <xexe>: Remove, replaced by
-       `exeext'.
-       Use it, and &transform.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * automake.in (get_object_extension) <$default_includes>: New.
-       Use it and &transform.
-
-2001-01-28  Tom Tromey  <address@hidden>
-
-       * automake.in (variable_value_as_list_worker): Handle entries in
-       %am_var_defs.  Fixes listval.test.
-
-2001-01-26  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): Don't use $conf_pat, just
-       $conf_dir to transform MDDIR since now &transform handles the
-       escaping of RE special characters by itself.
-
-2001-01-24  Akim Demaille  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Don't leave `AC_PROG_CC' etc. in
-       clear.
-       * m4/init.m4: Likewise.
-       * m4/sanity.m4: s/conftestfile/conftest.file/.
-
-2001-01-24  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_libraries): Use $configure_ac; typo fix.
-
-       * automake.in (transform): Quote substitution.
-
-2001-01-21  Alexandre Duret-Lutz  <address@hidden>
-           Tom Tromey  <address@hidden>
-
-       * automake.in (obsolete_rx): Match whole macro names, not
-       substrings.
-       * aclocal.in (obsolete_rx): Likewise.
-
-2001-01-21  Tom Tromey  <address@hidden>
-
-       * automake.texi: Changed dir category.
-
-2001-01-18  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): Use &transform, and transform
-       CONFIGURE_AC.
-       Reported by Lars Hecking, and diagnosed by Raja R Harinath.
-
-2001-01-16  Akim Demaille  <address@hidden>
-
-       Let Automake support `configure.ac'.
-
-       * automake.in: In the comments, prefer `configure.ac' to
-       `configure.in'.
-       When using &am_conf_error, don't repeat `in configure.in', since
-       the function already reports it.
-       When referring to `configure.in' use `$configure_ac' instead.
-       (configure_ac): New global variable.
-       (scan_configure, scan_one_configure_file): Rename as...
-       (scan_autoconf_files, scan_one_autoconf_file): this.
-       (scan_autoconf_files): Compute $configure_ac.
-       (transform): New function.
-       (handle_configure): Use it to transform CONFIGURE_AC in
-       `remake.am' and in `remake-hdr.am'.
-       (common_files): Also consider `configure.ac'.
-       Use consistently single quotes.
-       * aclocal.in (configure_ac): New variable.
-       Use it.
-       * texi-vers.am: Depend on CONFIGURE_AC not configure.in.
-       * remake.am: Likewise.
-       * remake-hdr.am: Likewise.
-
-2001-01-16  Akim Demaille  <address@hidden>
-
-       * m4/multi.m4: Remove the hairy useless quotation of `$'.
-       Simplify `ifelse([$2],,,[$2])' into... `$2'!
-       * m4/minuso.m4: Don't use changequote!
-       * m4/cond.m4: Fix quotation.
-       * m4/sanity.m4: Follow the Autoconf coding style.
-       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Use a for loop.
-       * m4/depend.m4 (AM_DEPENDENCIES): Fix quotation issues.
-       Use AC_CACHE_CHECK.
-
-2001-01-15  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Don't print rule
-       here when source is in subdir and object is not.  Fixes
-       subobj4.test.
-
-       * automake.in (handle_single_transform_list): Correctly compute
-       $nonansi_obj.  Fixes cxxansi.test.
-
-       * automake.texi (Man pages): Updated to account for man1_MANS,
-       etc.
-
-2001-01-13  Steve Robbins  <address@hidden>
-           Tom Tromey  <address@hidden>
-
-       * aclocal.in (scan_configure): Don't recognize macro assignments
-       or AC_SUBSTs.
-       (add_file): Likewise.
-
-2001-01-13  Kevin Ryde  <address@hidden>
-
-       * automake.in (handle_ltlibraries): Omit -rpath from
-       check_LTLIBRARIES, as per noinst_LTLIBRARIES.
-
-2001-01-11  Tom Tromey  <address@hidden>
-
-       * depcomp (case gcc3): Use -MD, not -M.
-
-2001-01-10  Tom Tromey  <address@hidden>
-
-       * depcomp: Handle gcc 3.
-
-2000-12-23  Tom Tromey  <address@hidden>
-
-       * configure.in: Updated to 1.4c for cvs.
-
-       * configure.in: Updated to 1.4b and released.
-
-       * config.guess, config.sub, texinfo.tex: New versions.
-
-       * automake.in (handle_dist_worker): Always define DIST_SUBDIRS.
-       Re-fixes pr87.test.
-
-       * subdirs.am (maintainer-clean-recursive): Use DIST_SUBDIRS for
-       distclean and maintainer-clean.
-       * automake.texi (Top level): Document use of DIST_SUBDIRS.
-
-       From Rusty Ballinger:
-       * automake.in (handle_java): Don't skip `noinst' prefix.
-
-       * automake.texi (Invoking aclocal): Mention ## comments.
-
-2000-12-22  Tom Tromey  <address@hidden>
-
-       From Raja R Harinath:
-       * automake.in (libtoolize_sometimes): New global.
-       (initialize_global_constants): Added libtoolize_sometimes to
-       common_files.
-
-       * m4/depend.m4 (AM_SET_DEPDIR): Ignore errors when running rmdir.
-
-       * m4/depend.m4 (AM_SET_DEPDIR): Remove .deps directory when done.
-
-2000-12-21  Tom Tromey  <address@hidden>
-
-       * automake.texi (Tags): Document GTAGS target.
-       * tags.am (GTAGS): New target.
-
-       * automake.in (libtoolize_files): Removed ltconfig.
-       (initialize_global_constants): Added ltconfig to common_files.
-
-2000-12-21  Kevin Ryde  <address@hidden>
-
-       * automake.in (handle_footer): Generate .SUFFIXES target when user
-       defines suffixes but automake does not.
-
-2000-12-20  Marc Espie  <address@hidden>
-
-       * automake.in (handle_texinfo): Make path of $vtexi explicit in
-       dependency.
-       * texi-vers.am: Likewise.
-
-2000-12-20  Tom Tromey  <address@hidden>
-
-       From Kevin Ryde:
-       * automake.in (handle_footer): Always push user suffixes at the
-       start of .SUFFIXES:.
-       * automake.texi (Suffixes): Updated to reflect new suffix
-       handling.
-
-2000-12-18  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_built_sources): Removed.
-       (handle_merge_targets): Handle BUILT_SOURCES.
-       * automake.texi (Sources): Updated documentation of
-       BUILT_SOURCES.
-
-2000-12-17  Tom Tromey  <address@hidden>
-
-       * m4/protos.m4: Always do header checks.
-
-       * automake.in (handle_ltlibraries): Check for LDFLAGS variables
-       before using values.
-
-       * automake.in (handle_ltlibraries): Allow _LDFLAGS to be
-       conditionally defined.  Fixes PR automake/77 and ldflags.test.
-
-2000-11-25  Tom Tromey  <address@hidden>
-
-       * automake.in (file_contents_with_transform): Added file name and
-       line number to error report.
-       (MACRO_PATTERN, BOGUS_MACRO_PATTERN): Leading spaces are ok.
-
-2000-11-23  Pavel Roskin  <address@hidden>
-
-       * m4/regex.m4 (AM_WITH_REGEX): This macro was broken because
-       of M4 underquoting.
-       * m4/ccstdc.m4 (AC_PROG_CC_STDC): Added some M4 quotes.
-       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
-       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
-       * m4/multi.m4 (AM_WITH_DMALLOC): Likewise.
-       * m4/python.m4 (AM_PATH_PYTHON): Likewise.
-       * m4/strtod.m4 (AM_FUNC_STRTOD): Likewise.
-
-2000-11-23  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file_internal): Pass $file as second
-       argument to maybe_push_required_file.  Fixes PR automake/87.
-
-2000-11-18  Tom Tromey  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Redirect `$am_depcomp' stdout to
-       /dev/null.  From Paul Martinolich.
-
-2000-11-16  Morten Eriksen  <address@hidden>
-
-       * aclocal.in (write_aclocal): Set ``binmode'' after file has been
-       opened, otherwise it has no effect.
-
-2000-10-23  Morten Eriksen  <address@hidden>
-
-       * aclocal.in (write_aclocal): Don't write aclocal.m4 with
-       CRLFs. This circumvents a bug in Cygwin bash.
-
-       * automake.in (generate_makefile): Don't write Makefile.in
-       files with CRLFs, as it causes problems for the dependency-file
-       extraction in AM_OUTPUT_DEPENDENCY_COMMANDS.
-
-2000-10-19  Alex Hornby  <address@hidden>
-
-       * automake.in (handle_merge_targets): Allow parallel install
-       with forced relink.
-
-2000-10-19  Akim Demaille  <address@hidden>
-
-       * subdir4.test (depcomp): Don't create it, defs does.
-
-2000-10-17  Pavel Roskin  <address@hidden>
-
-       * automake.in (handle_aclocal_m4): exclude aclocal.m4 and
-       acinclude.m4 from the dependencies of aclocal.m4 to avoid
-       circular and duplicated dependencies. Strip "./" from the
-       dependencies.
-
-2000-10-17  Lars J. Aas  <address@hidden>
-
-       * aclocal.in (write_aclocal): Set up aclocal.m4 header with
-       normal comments (#) instead of m4 dnl-type comments.
-
-2000-10-17  Alex Hornby  <address@hidden>
-
-       * depcomp: Altered sed clause to strip of inclusion depth
-       numbers generated by cpp. Also output in gcc style.
-
-2000-10-16  Morten Eriksen  <address@hidden>
-
-       * depcomp (msvisualcpp): New dependency tracking mode, for
-       Microsoft Visual C++.
-
-2000-10-16  Morten Eriksen  <address@hidden>
-
-       * depcomp: Fix a bug in SGI dependency tracking mode with source
-       files which do not dependend on any other source files.
-
-2000-10-16  Rodney Brown  <address@hidden>
-
-       * aclocal.in, aclocal.m4: Standardize FSF Copyright statements.
-       * automake.in, automake.texi: Likewise.
-       * clean-kr.am, clean.am: Likewise.
-       * comp-vars.am: Likewise.
-       * compile, compile.am: Likewise.
-       * data-clean.am: Likewise.
-       * data.am: Likewise.
-       * dejagnu.am: Likewise.
-       * depcomp: Likewise.
-       * depend.am, depend2.am: Likewise.
-       * dist-vars.am, dist.am: Likewise.
-       * elisp-comp: Likewise.
-       * footer.am: Likewise.
-       * header-vars.am, header.am: Likewise.
-       * java-clean.am java.am: Likewise.
-       * kr-extra.am: Likewise.
-       * library.am: Likewise.
-       * libs-clean.am, libs.am: Likewise.
-       * libtool.am: Likewise.
-       * lisp-clean.am lisp.am: Likewise.
-       * ltlib-clean.am ltlib.am: Likewise.
-       * ltlibrary.am: Likewise.
-       * m4/Makefile.in: Likewise.
-       * m4/strtod.m4: Likewise.
-       * mans-vars.am, mans.am: Likewise.
-       * mdate-sh: Likewise.
-       * missing: Likewise.
-       * multilib.am: Likewise.
-       * program.am: Likewise.
-       * progs-clean.am, progs.am: Likewise.
-       * python-clean.am, python.am: Likewise.
-       * remake-hdr.am, remake.am: Likewise.
-       * scripts.am: Likewise.
-       * subdirs.am: Likewise.
-       * tags-clean.am, tags.am: Likewise.
-       * texi-vers.am: Likewise.
-       * texinfos.am: Likewise.
-       * ylwrap: Likewise.
-
-2000-10-09  Pavel Roskin  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't rely on variable
-       assignments changing $? - it's broken in ash-0.2.
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
-
-       * automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is
-       defined use it as the list of M4 files aclocal.m4 depends on.
-
-2000-10-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (add_file): Strip comments while scanning for
-       macro dependencies.
-
-2000-09-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (initialize_global_constants): End the
-       result of dist-bzip2 with tar.bz2, not bz2.
-
-2000-08-30  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/72:
-       * automake.in (initialize_per_input): Define `need_link'.
-       (finish_languages): Use need_link.
-       (handle_source_transform): Set need_link if required.
-
-2000-08-28  Tom Tromey  <address@hidden>
-
-       * automake.in (yacc, yaccxx, lex, lexxx): Set `derived-autodep'
-       key.
-       (register_language): Default the `derived-autodep' option.
-       (handle_single_transform_list): Add to %dep_files if language has
-       `derived-autodep' set.  Re-fixes lex4.test.
-
-2000-08-27  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Only add to
-       %dep_files if language is found and supports automatic dependency
-       tracking.  Fixes PR automake/75.
-
-       * automake.in (am_primary_prefixes): Don't set `valid' for
-       configure variables that don't satisfy the other constraints.
-       Fixes PR automake/68.
-
-2000-04-14  Victor V. Vengerov  <address@hidden>
-
-       Fix for PR automake/67.
-       * automake.in (handle_multilib): remove .am suffix in fragment
-       name passed to file_contents.
-       * m4/multi.m4: Add missing ')' in AC_ARG_ENABLE invocation.
-       Remove external quotes in first arg of AC_OUTPUT_COMMANDS.
-       Remove unnecessary "rel-to-top-srcdir" before config-ml.in.
-
-2000-08-26  Tom Tromey  <address@hidden>
-
-       * subdirs.am (maintainer-clean-recursive): Always run clean rules
-       in `.' after all subdirs.  Fixes PR automake/3 and PR automake/24.
-
-       * automake.in (handle_man_pages): Generate install targets for man
-       even if man_MANS not defined.  From `danpb'.  Fixes PR automake/73.
-
-       * m4/depend.m4 (depcpp): Use `-o conftest.o'.
-       Fix for PR automake/74.  From js pendry.
-
-2000-08-20  Eli Zaretskii  <address@hidden>
-
-       * depcomp (gcc): Support DOS-style absolute file names with drive
-       letters.
-
-2000-08-06  Jim Meyering  <address@hidden>
-
-       * automake.in (handle_dependencies): Set $require_file_found{'depcomp'}
-       if the depcomp file exists, before calling require_config_file on
-       `depcomp'.  This makes require_file_internal skip its buggy existence
-       test that would make automake fail (with `required file `lib/depcomp'
-       not found') when AC_CONFIG_AUX_DIR is not set.
-
-       This change change does not fix the existing bug where, if `depcomp'
-       is not present in the build directory (at the top level), automake
-       still gives the inaccurate diagnostic about *lib*/depcomp rather
-       than ./depcomp.
-
-2000-08-05  Jim Meyering  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): Fix typo in last change:
-       add missing closing bracket and closing parenthesis.
-       Don't quote the first argument to AC_OUTPUT_COMMANDS.
-       Backslash-escape the backquotes and `$' in `am_indx'-incrementing stmt.
-
-2000-08-04  Tom Tromey  <address@hidden>
-
-       Idea from Nicolas Thiery:
-       * automake.texi (Tests): Document DEJATOOL as a list.
-       * dejagnu.am (RUNTESTDEFAULTFLAGS): Use $$tool, not $(DEJATOOL).
-       (check-DEJAGNU): Run runtest in a loop.
-
-2000-08-02  Akim Demaille  <address@hidden>
-
-       * m4: Quote properly the name of the macros being defined.
-       Use `#' instead of `dnl' where appropriate.
-       * m4/header.m4 (AM_CONFIG_HEADER): Get rid of changequote, just
-       quote.
-       Don't quote passive characters.
-       Pull the AC_PREREQ outside the macro.
-       * m4/init.m4: Pull the AC_PREREQ outside the macro.
-
-2000-07-28  Tom Tromey  <address@hidden>
-
-       * lisp.am (address@hidden@LISP): Prefix file with $(DESTDIR).
-       From Bruno Haible.
-
-2000-07-13  Kevin Ryde  <address@hidden>
-
-       * automake.in (am_install_var): Apply the $(EXEEXT) hack to
-       EXTRA_PROGRAMS as well as other _PROGRAMS.
-
-2000-07-02  Jim Meyering  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Recognize AC_LIBOBJ.
-
-2000-06-19  Paolo Bonzini    <address@hidden>
-
-       * texi-vers.am: define UPDATED-MONTH variable (for an example, see
-       GNU make's manual)
-
-2000-06-02  Morten Eriksen  <address@hidden>
-
-       * depcomp: workaround for problem with SGI IRIX sed (it can only
-       handle lines of up to 8192 characters, the rest of the line will
-       be mangled).
-
-2000-05-31  Morten Eriksen  <address@hidden>
-
-       * depcomp: tell SGI MIPSpro compilers to generate dependencies
-       through the pre-processor (only CVS libtool has the -Wc option
-       yet).
-
-2000-05-15  Brendan O'Dea  <address@hidden>
-
-       * missing: Add support for `help2man'.
-
-2000-05-11  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Work correctly if TESTS is empty;
-       print nothing if it is.  From Kevin Ryde.
-
-2000-05-08  Tom Tromey  <address@hidden>
-
-       * automake.texi (Texinfo): Mention vers*.texi.
-
-2000-05-04  Akim Demaille  <address@hidden>
-
-       AM_INIT_AUTOMAKE is no longer optional, so don't look for
-       `VERSION=' and `PACKAGE='.
-       * automake.in (seen_package, seen_version): Remove initializations of
-       unnecessary variables.
-       (scan_one_configure_file): Don't set them.
-       (scan_configure): Don't use them.
-
-2000-05-01  Akim Demaille  <address@hidden>
-
-       * m4/init.m4 (AC_PROVIDE_IFELSE): If it is not defined, do it.
-       (AM_INIT_AUTOMAKE): Update the writing conventions.
-       Quote the arguments properly.
-       Add a few missing `dnl'.
-       Use AC_PROVIDE_IFELSE.
-
-2000-04-26  Jim Meyering  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Handle the AC_CONFIG_FILES
-       macro.  Based on a patch from Harlan Stenn.
-
-2000-04-13  Akim Demaille  <address@hidden>
-
-       * compile: Remove unnecessary double quotes in assignments.
-
-2000-04-13  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Also recognize
-       AC_CONFIG_HEADERS.
-       Remove trailing blanks.
-
-2000-04-05  Tom Tromey  <address@hidden>
-
-       * header-vars.am (DESTDIR): Commented out definition.
-
-       * automake.in (require_file_internal): Pass --copy to libtoolize
-       if automake was run with `--copy'.
-
-2000-03-22  Tom Tromey  <address@hidden>
-
-       * automake.texi (Uniform): Fix definition of pkglibdir.
-       From thi <address@hidden>.
-
-2000-03-19  Tom Tromey  <address@hidden>
-
-       * aclocal.in (parse_arguments): Copyright 2000.
-       (write_aclocal): Likewise.
-       * automake.in (parse_arguments): Copyright 2000.
-       (initialize_global_constants): Likewise.
-
-       * automake.in (generate_makefile): Call handle_dist after
-       handle_dependencies and handle_tests.  Fixes subobj3.test and
-       pr19.test regressions.
-
-2000-03-19  Gordon Matzigkeit  <address@hidden>
-
-       * depend2.am (@address@hidden): Look for the source file in srcdir as 
well
-       as the current directory.
-       (@address@hidden): Likewise.
-
-2000-03-19  OKUJI Yoshinori  <address@hidden>
-
-       * automake.in (handle_data): Pass -candist instead of
-       -defaultdist, for the compatibility.
-
-2000-03-19  Tom Tromey  <address@hidden>
-
-       Fix for test nodepcomp.test:
-       * automake.in (require_file_internal): Use readlink on symlinks.
-       Only unlink file if we are going to try to add it again.
-       (handle_dependencies): Require `depcomp' here.
-       (scan_configure): Don't require `depcomp'.
-
-2000-03-16  OKUJI Yoshinori  <address@hidden>
-
-       * automake.in (handle_configure): Remove $(BUILT_SOURCES) from
-       the rule to remake Makefile, whether $use_dependencies is true
-       or not. This was a historical one and doesn't make sense any
-       longer.
-
-2000-03-19  Tom Tromey  <address@hidden>
-
-       More for PR automake/38:
-       * automake.texi (Invoking Automake): Document --force-missing.
-       * automake.in (force_missing): New global.
-       (parse_arguments): Recognize --force-missing.
-       (initialize_global_constants): Document --force-missing.
-       (require_file_internal): Handle --force-missing.
-
-       Fix for PR automake/38:
-       * automake.in (require_file_internal): Check for and handle
-       dangling symlinks.  Fixes symlink2.test.
-
-       Fix for PR automake/45:
-       * automake.texi (configure): Mention requirement to run
-       AM_INIT_AUTOMAKE.
-       (Requirements): Removed most text.
-       * automake.in (seen_init_automake): New global.
-       (scan_configure): Error if AM_INIT_AUTOMAKE not seen.
-       (scan_one_configure_file): Don't support AM_INIT_GUILE_MODULE.
-       Set seen_init_automake if needed.
-
-       Fix for PR automake/41:
-       * automake.in (require_file_found): New global.
-       (require_file_internal): Set require_file_found entry.
-       (handle_texinfo): Require file any number of times.
-
-       * automake.in (handle_dist_worker): Exit if `cp' fails.  Fixes
-       install2.test.
-
-       * tags.am: Don't reference $$here.  Report from Sven Verdoolaege.
-
-2000-03-13  Alexandre Oliva  <address@hidden>
-
-       * m4/missing.m4: Print the backtick in a way that won't cause
-       autoconf CVS to emit any warnings.
-
-2000-03-01  Jim Meyering  <address@hidden>
-
-       * automake.in (handle_dist_worker) [generating rules for distdir]:
-       Don't use `ln' (which was just a space optimization anyway) to
-       populate $(distdir).  Otherwise, the dist rules that change
-       permissions would end up affecting the master sources.
-       * texinfos.am (dist-info): Likewise.
-
-2000-02-13  Jim Meyering  <address@hidden>
-
-       * automake.in (generate_makefile): Detect write/close failure.
-
-2000-02-02  Assar Westerlund  <address@hidden>
-
-       * automake.in (handle_single_transform_list): do not use $< which
-       is not handled by all non-GNU makes.  Instead do explicit sh code
-       testing for the file in this directory and srcdir.  Based on a
-       suggestion by Alexandre Oliva <address@hidden>
-
-2000-01-12  Tom Tromey  <address@hidden>
-
-       * m4/lispdir.m4: Added --with-lispdir argument processing.
-       From Kevin Dalley.
-
-2000-01-06  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Don't check for
-       AC_PROG_MAKE_SET.
-       (scan_configure): Check for AC_PROG_MAKE_SET.
-
-       * header-vars.am (@SET_MAKE@): Added.
-       * subdirs.am (@SET_MAKE@): Removed.  Report from Motoyuki
-       Kasahara.
-
-1999-12-19  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Expand DIST_COMMON under all
-       conditions.
-       (require_file_internal): Corrected arguments to second invocation
-       of maybe_push_required_file.
-
-       Fix for PR automake/9:
-       * automake.in (make_dirs, make_dirs_set): New globals.
-       (is_make_dir): New function.
-       (handle_configure): Use it.
-       (require_file_internal): Push file if there is no Makefile in its
-       directory.
-       (initialize_per_input): Initialize handle_dist_run.
-       (push_dist_common): Inspect handle_dist_run.
-       (handle_dist): Set handle_dist_run.  Push items from
-       configure_dist_common onto dist_common if appropriate.
-       (configure_dist_common): New global.
-       (scan_configure): Set it.
-       (maybe_push_required_file): New function.
-       (require_file_internal): Use it.
-
-       * automake.in (handle_dist_worker): Scan DIST_COMMON to see if
-       more subdirs are defined.  From Axel Belinfante.  Fixes
-       PR automake/2.
-
-1999-12-18  Tom Tromey  <address@hidden>
-
-       Partial fix for PR automake/40:
-       * lisp.am (address@hidden@LISP): Handle nobase_ case.
-       (address@hidden@LISP): Likewise.
-       * header.am (address@hidden@HEADERS): Handle nobase_ case.
-       (address@hidden@HEADERS): Likewise.
-       * data.am (address@hidden@DATA): Handle nobase_ case.
-       (address@hidden@DATA): Likewise.
-       * automake.in (am_primary_prefixes): Recognize `nobase_' prefix.
-       (am_install_var): Recognize and handle `nobase_' prefix.
-
-1999-12-17  Tom Tromey  <address@hidden>
-
-       * automake.in (get_object_extension): Added space before `-I.'.
-       Report from Ralf Corsepius.
-
-1999-12-15  Tom Tromey  <address@hidden>
-
-       * aclocal.in: Don't pass $acdir to scan_m4_files.
-       (parse_arguments): Push $acdir on end of dirlist.
-       (scan_file): Don't warn if duplicate macro seen.
-
-1999-12-13  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/30 and PR automake/23.  Fixes test
-       suffix3.test.
-       * automake.in (initialize_per_input): Initialize
-       source_suffix_pattern.
-       (derive_suffix): New function.
-       (handle_single_transform_list): Call it.
-
-       * automake.in (add_depend2): Handle the no-dependency-tracking
-       case.  Fixes test suffix2.test.
-
-       * depcomp (tmpdepfile): [case sgi] Added missing `fi'.
-
-       * automake.in (get_object_extension): Fixed quoting on
-       -I$(srcdir).
-
-       * depend2.am: Removed erroneous comment.
-
-       * automake.texi (Program variables): Document nostdinc.
-       (Options): Likewise.
-       * automake.in (get_object_extension): Respect nostdinc option.
-       (handle_options): Recognize nostdinc.
-       * comp-vars.am (DEFS): Use @DEFAULT_INCLUDES@ as sole
-       substitution.
-
-       * automake.in (read_am_file): Allow conditional includes.  Fixes
-       test condincl.test.
-
-       * depcomp: Handle case on SGI when libtool is `yes'.
-       * depend2.am (@address@hidden): Set libtool.
-       (@address@hidden): Likewise.
-       (@address@hidden): Likewise.
-
-       * depcomp: Unify dashmstdout and dashXmstdout cases.  Move hp case
-       after gcc case.
-
-1999-12-13  Pavel Roskin  <address@hidden>
-
-       * automake.in (add_depend2): substitute $rule in the rules
-       for individual files.  Fixes test specflags5.test.
-
-1999-12-12  Tom Tromey  <address@hidden>
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Run mkinstalldirs
-       to create directories.  Fixes test subobj3.test.
-
-1999-12-10  Tom Tromey  <address@hidden>
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Don't print
-       message when creating .deps files.
-
-       * automake.in (initialize_global_constants): If unreadable by
-       owner, make it readable by owner regardless of number of links.
-       Fixes more of install2.test.
-
-       * missing: Try to see if gnutar or gtar exist before invoking
-       them.
-
-       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Remove ${SHELL} from
-       install_sh value.  Look for install-sh and install.sh in a
-       somewhat more sensible way.  Fixes test install2.test.  Partially
-       from Jim Meyering.
-
-1999-12-09  Pavel Roskin  <address@hidden>
-
-       * m4/missing.m4: remove redundant backquote
-
-1999-11-23  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Use `bzip2 -9', not
-       `bzip --best'  Report from Jim Meyering.
-
-1999-11-22  Tom Tromey  <address@hidden>
-
-       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Don't take argument.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't pass argument to
-       AM_MISSING_INSTALL_SH.
-       * automake.in (scan_one_configure_file): Reverted previous
-       change.
-
-       * automake.in (scan_one_configure_file): Define `install_sh'
-       configure variable when AM_INIT_AUTOMAKE seen.  Report from Jim
-       Meyering.
-
-       * automake.in (handle_single_transform_list): Generate explicit
-       rule for subdir objects.  Fixes new addition to subobj.test.
-
-       * automake.in (handle_lib_objects_cond): Allow LIBOBJS to be
-       defined by AC_SUBST.  Fixes ltlibobjs.test.
-
-       Fix for sourcesub.test:
-       * automake.in (handle_single_transform_list): Added `var'
-       argument.  If config sub found, give error.
-       (handle_source_transform): Updated for new
-       handle_source_transform.
-
-       * py-compile: New file.
-       * m4/Makefile.am (m4data_DATA): Added python.m4.
-       * m4/python.m4: New file.
-       * automake.texi (Uniform): Mention PYTHON.
-       (Python): New node.
-       * Makefile.am (amfiles): Added python.am, python-clean.am.
-       (dist_script_DATA): Added py-compile.
-       * python.am: New file.
-       * python-clean.am: New file.
-       * automake.in (seen_pythondir): New global.
-       (generate_makefile): Call handle_python.
-       (handle_python): New function.
-       (scan_one_configure_file): Set seen_pythondir if AM_PATH_PYTHON
-       seen.
-       (am_install_var): Special-case PYTHON like JAVA.
-       (scan_configure): Check for py-compile.
-       (initialize_global_constants): Added py-compile to @common_files.
-
-       * ltlib.am (address@hidden@LTLIBRARIES): Added missing space.
-
-1999-11-21  Tom Tromey  <address@hidden>
-
-       * automake.in (finish_languages): Only generate suffix rule when
-       not doing dependency tracking.
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AM_MISSING_INSTALL_SH.
-       * m4/missing.m4 (AM_MISSING_INSTALL_SH): New macro.
-
-       * depend2.am: Use @SOURCE@, @OBJ@, @LTOBJ@, @OBJOBJ@, and 
@address@hidden
-       Always use `-o'.
-
-1999-11-19  Tom Tromey  <address@hidden>
-
-       * dist.am: Set `CDPATH=:' to avoid problems.  Merged from
-       Alexandre's change on branch.
-
-1999-10-02  Alexandre Oliva  <address@hidden>
-
-       * Makefile.am (maintainer-check): Look for occurrences of ``cd'
-       without `CDPATH'.
-       * dejagnu.am: Set CDPATH before cd.
-       * Makefile.in: Rebuilt.
-
-       * automake.in (handle_single_transform_list): Change `\1' for `$1'
-       in `s///' replacement.
-
-       * automake.in (handle_dist): Set CDPATH before cd.
-       * dejagnu.am (check-DEJAGNU): Likewise.
-       * texinfos.am (install-info-am, dist-info): Likewise.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
-       * aclocal.m4, configure, Makefile.in: Rebuilt.
-
-       * AUTHORS: Added myself.
-
-1999-09-14  Alexandre Oliva  <address@hidden>
-
-       * m4/missing.m4: Support relative srcdir and ac_aux_dir.
-       Reported by Tim Wilkinson <address@hidden>
-       * aclocal.m4, configure: Rebuilt.
-
-1999-08-17  Alexandre Oliva  <address@hidden>
-
-       * m4/lex.m4 (AM_PROG_LEX): Require AM_MISSING_HAS_RUN and, if no
-       LEX program is found, use `${am_missing_run}flex'.
-
-1999-08-16  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Replace `$(OBJEXT)'
-       with `o' in depfile.
-
-       * automake.in (handle_lib_objects_cond): Remove second dot from
-       dependency file names.
-
-       * depend2.am (address@hidden@.obj): Dependency file should be .Po,
-       regardless of OBJEXT.
-
-       * automake.in (handle_dependencies): Add blank line after depend2.
-       (handle_dependencies): Start DEP_FILES with address@hidden@'.  Output
-       blank line before `include's, not after them.
-       (scan_one_configure_file): Do not special-case `DEP_' any more.
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Run for loop only
-       if AMDEP is empty.
-       * aclocal.m4, configure: Rebuilt.
-
-       * m4/depend.m4 (AMDEPBACKSLASH): Define.
-       * depend2.am (@address@hidden, @address@hidden, @address@hidden): Use 
AMDEPBACKSLASH.
-
-       * automake.in (handle_dependencies): Generate `include's for
-       dependency files after address@hidden@'.
-
-       * m4/missing.m4: Use eval, instead of a sub-shell, to test for
-       --run support in the missing script, since SHELL is not exported.
-       Reported by job bogan <address@hidden>
-       * aclocal.m4, configure: Rebuilt.
-
-1999-08-15  Alexandre Oliva  <address@hidden>
-
-       * aclocal.m4, configure: Rebuilt with itself.
-       * Makefile.in, m4/Makefile.in, tests/Makefile.in: Likewise.
-
-       * m4/missing.m4 (AM_MISSING_PROG): Remove DIRECTORY argument.
-       Require AM_MISSING_HAS_RUN.  Use am_missing_run, defined by...
-       (AM_MISSING_HAS_RUN): New macro.
-       * m4/init.m4: Remove missing_dir from calls to AM_MISSING_PROG.
-       * automake.texi (Requirements): Likewise.
-       * version.texi, stamp-vti: Rebuilt.
-
-1999-07-28  Tom Tromey  <address@hidden>
-
-       * depcomp: Handle the `hp' mode.
-
-1999-07-06  Tom Tromey  <address@hidden>
-
-       * depcomp: Work around HP-UX 10.20 sed bug.
-
-1999-07-05  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Generate a separate include
-       for each dep file.  Report from Alexandre Oliva.
-       * depend.am: Don't include DEP_FILES.
-
-1999-06-01  Alexandre Oliva  <address@hidden>
-
-       * depend.am: Add @AMDEP@ before `include', so that dependency
-       tracking can be disabled.
-       * depend2.am: Ditto, before all lines related with dependency
-       tracking.
-       * m4/depend.m4 (AM_DEP_TRACK): New macro, that documents
-       --enable/disable-dependency-tracking and sets AMDEP accordingly.
-       It is implicitly disabled if depcomp is missing.
-       (AM_DEPENDENCIES): Disable dependency tracking unless it can be
-       generated by side-effect.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_DEP_TRACK.
-       * automake.in (handle_dependencies): Add @AMDEP@ before the value
-       of DEP_FILES.
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Handle DEP_FILES
-       starting with `#'.
-
-       * depcomp: Support -xM for dependency generation, for Sun CC.
-       Reported by Alex Hornby <address@hidden>
-       * m4/depend.m4: Extract the list of supported dependency-tracking
-       mechanisms from the depcomp script and use it to test each one.
-       * THANKS: Added Alex Hornby.
-
-       * depend2.am: Move $(depcomp) to the line of $(...DEPMODE), so as
-       to leave $(...COMPILE) in a line by itself.
-
-       * THANKS: Added Miles Bader.
-
-1999-06-01  Miles Bader  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Add check for `makedepend'.
-       Fix `dashmstdout' to ignore non-dependency-generating uses of the
-       -M flag.
-       * depcomp (makedepend): New dependency-generating method.
-
-1999-06-01  Alexandre Oliva  <address@hidden>
-
-       * missing: If given `--run' as first argument, try to run the
-       given program before falling back to the ``emulated'' behavior.
-       Add support for `tar'.
-       * automake.in: Use new `tar' support for `dist'.
-       * m4/missing.m4 (AM_MISSING_PROG): Instead of checking for the
-       program, prepend `missing --run' to the given program name.
-       * m4/init.m4: Remove AMTAR-related stuff.
-       * NEWS: Updated.
-
-       * m4/depout.m4: Instead of `find'ing Makefiles, just iterate on
-       CONFIG_FILES.  Do not use temporary variable for list of
-       dependency files, it breaks Cygwin.
-
-1999-04-27  Alexandre Oliva  <address@hidden>
-
-       * depcomp (gcc): Imported comments removed from depend2.am, so
-       that we don't lose them.
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Avoid sed s/$U//
-       when not using ansi2knr.
-
-1999-04-26  Alexandre Oliva  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Test for depcc -E support.
-       * depcomp (cpp): Extract dependencies from `# nnn "..."' lines.
-
-1999-04-25  Alexandre Oliva  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Add a definition to conftest.h,
-       so as not to compile an empty source; some compilers fail on this.
-       Redirect stderr of depcc to /dev/null.  Test for -M with -o,
-       because some compilers will output the rules to the output file.
-       * depcomp (dashmstdout): Add --silent before --mode=compile, so
-       that we don't get libtool output mixed up with make rules.
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_DEPDIR.
-       * depend2.am: Set tmpdepfile too, to speed up depcomp.  Always use
-       -o for libtool, otherwise it may try to deduce the object name
-       from the dependency-generation flag.
-       * depcomp: Assume depdir exists.  Preserve depfile on unsuccessful
-       compilations.
-
-       * libtool.am: Do not emit .c.lo here...
-       * depend2.am: ... emit .*.lo here, only when using libtool.
-       * automake.in (get_object_extension): No more @MINUSO@ here.
-       (handle_single_transform_list): Set $depfile from $object.
-       (handle_dependencies): Emit depend2.am for all used languages,
-       regardless of $use_dependencies; the setting of depcomp makes the
-       difference.
-       (lang_cxx_finish): Do not emit compilation rules.
-       (lang_objc_finish): Likewise.
-       (lang_java_finish): Likewise.
-
-1999-04-21  Tom Tromey  <address@hidden>
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Correctly
-       interpolate DEPDIR in DEP_FILES expansion.
-
-1999-04-20  Lee Iverson  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Fix up test for SGI-style
-       dependency updating.
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Fix sed script to
-       handle multi-line dependency lists.
-
-1999-11-12  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/14:
-       * aclocal.in: Added `ud_GNU_GETTEXT'.  Updated to mention
-       AC_CYGWIN.
-       * automake.in: Mention AC_CYGWIN, not AC_CYGWIN32.
-
-       * m4/multi.m4: Added missing `]'.  From Akim Demaille.
-
-       * Makefile.am (path-check): Make sure distdir is writeable before
-       removing it.
-       * automake.in (handle_texinfo): Added `cm' and `ov' extensions.
-       (handle_dist_worker): Make sure distdir is writeable before
-       removing it.
-       (initialize_global_constants [$dist_trailer]): Make sure distdir
-       is writeable before removing it.
-       * dist.am (distcheck): Make the new source tree read-only before
-       compiling.  Idea from Karl Berry.
-
-       * automake.texi (Gnits): Allow COPYING.LIB again.
-       * automake.in (check_gnits_standards): Allow COPYING.LIB again.
-
-1999-11-11  Jim Meyering  <address@hidden>
-
-       * dist.am (distcheck): Remove $(distdir).tar.gz before counting
-       files.
-
-1999-11-09  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Typo fix.  From Jim Meyering.
-
-1999-11-09  Jim Meyering  <address@hidden>
-
-       * automake.in (handle_dist): Remove the DISTHOOK and GETTEXT
-       markers, no matter what.
-
-1999-11-08  Tom Tromey  <address@hidden>
-
-       * dist.am (distcheck): Put `&&' at the start of the distcheck-hook
-       line.
-
-       * automake.in (handle_dist_worker): Use `cp -R', not `cp -r'.
-       From Jim Meyering.  Also, don't mention file name in `cp'
-       destination.  From Olly Betts.
-
-1999-10-27  Miodrag Vallat  <address@hidden>
-
-       * texinfos.am (uninstall-info): Use installed info file, not one
-       from srcdir or builddir.
-
-1999-11-07  Tom Tromey  <address@hidden>
-
-       * clean.am (maintainer-clean-generic): Remove Makefile.in.  From
-       Jeff Bailey
-
-       Fix for PR automake/18:
-       * automake.in (handle_dist): Add contents of dist.am to the output
-       rules.
-       * Makefile.am (amfiles): Added dist.am.
-       * dist.am: New file.
-       (distcheck): Added uninstall and distclean checks.
-
-       * automake.in (PATH_PATTERN): Added `-' as allowable character.
-       Fixes PR automake/20.  From Matthew D. Langston.
-
-       * automake.in (SUFFIX_RULE_PATTERN): Add `0-9' as characters
-       allowed in suffixes.  Fixes PR 22.  From Matthias Clasen.
-
-1999-10-03  Alexandre Oliva  <address@hidden>
-
-       * m4/lispdir.m4: -batch must come before -q.
-       * elisp-comp: Likewise.
-       Reported by Lars Hecking <address@hidden>
-       * THANKS: Added Lars.
-
-1999-08-15  Tom Tromey  <address@hidden>
-
-       * automake.in (get_object_extension): Fixed quoting bug.  Fixes
-       ansi4.test.
-
-1999-07-27  Tom Tromey  <address@hidden>
-
-       * config.guess, config.sub: New versions from autoconf.
-
-1999-07-13  Tom Tromey  <address@hidden>
-
-       Work around losing `awk'.  Report from Harlan Stenn.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AC_PROG_AWK.
-       * tags.am (ID, TAGS): Use $(AWK), not `awk'.
-
-       * automake.in (handle_source_transform): Mark prefix as seen if
-       corresponding _SOURCES variable exists.  Fixes empty2.test.
-
-1999-06-25  OKUJI Yoshinori  <address@hidden>
-
-       * configure.in (ACLOCAL): Do not prepend the variable SRCDIR to
-       m4.
-       (AUTOMAKE): Set --amdir to current directory.
-
-1999-06-20  Tom Tromey  <address@hidden>
-
-       * Makefile.am (TAGS_FILES): New macro.
-       (ETAGS_ARGS): Moved files into TAGS_FILES.
-       (TAGS_DEPENDENCIES): Likewise.
-       (ETAGS_ARGS): Removed.
-       (TAGS_DEPENDENCIES): Removed duplicate definition.
-
-       * tags.am (ID): Handle VPATH correctly.  Use TAGS_FILES.  Report
-       from Ganesan Rajagopal.
-       (TAGS): Likewise.
-
-1999-06-18  Thomas Tanner  <address@hidden>
-
-       * automake.in (handle_ltlibraries): Check for -module in LDFLAGS,
-       too.
-
-1999-06-20 Mark Elbrecht <address@hidden>
-
-       * ylwrap: Handle filenames output by the DOS version of Bison.
-
-1999-06-20  Tom Tromey  <address@hidden>
-
-       * ylwrap: Be less strict when recognizing DOS paths.  From Mark
-       Elbrecht.
-
-1999-06-19  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Remove redundant entries from
-       DIST_SUBDIRS.
-
-       * automake.in (handle_lib_objects_cond): Better error message when
-       unrecognized option passed in LDADD.
-
-1999-06-08  Alexandre Oliva  <address@hidden>
-
-       * configure.in (ACLOCAL, AUTOMAKE): Use our own scripts, with
-       appropriate --acdir and --amdir arguments.
-
-1999-06-07  Alexandre Oliva  <address@hidden>
-
-       * automake.in (dist_header): Avoid changing permissions of files
-       in the source tree, trying a complex `find/chmod' command before
-       falling back to plain chmod.
-       (handle_dist_worker): Do not create directories with mode 777, the
-       find above will take care of that.
-       * m4/init.m4: Set install_sh for find/chmod above.
-
-       * THANKS: Added Shuhei Amakawa.
-
-1999-06-07  Shuhei Amakawa <address@hidden>
-
-       * mans.am: Strip dirname from given filename.
-
-1999-06-07  Jim Meyering  <address@hidden>
-
-       * automake.in (handle_dist): Change emitted rules so that a failure
-       in `$(MAKE) distcheck-hook' propagates to the outer make.
-
-1999-05-27  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Replace AM_FLAG and
-       not FLAG in compilation rule.
-       (add_depend2): Likewise.
-
-       * ltlib.am (address@hidden@LTLIBRARIES): Pass INSTALL_STRIP_FLAG to
-       libtool.
-
-       * m4/dmalloc.m4: Updated dmalloc site information.
-
-1999-05-19  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Push object name
-       without extension onto lang_specific_files.  Fixes
-       specflags4.test.
-
-       * automake.in (handle_single_transform_list): Added missing
-       space.  Fixes specflags.test.
-
-1999-05-05  Tom Tromey  <address@hidden>
-
-       * automake.in: Disabled dependency tracking for Java.
-
-1999-05-04  Tom Tromey  <address@hidden>
-
-       * library.am (@LIBRARY@): Use $(@address@hidden).
-       * automake.in (handle_libraries): Recognize _AR variable.
-
-1999-04-30  Tom Tromey  <address@hidden>
-
-       * automake.in (finish_languages): Always use `-o $@' with
-       libtool.  Define ltcompile and ltlink at outermost scope in
-       function.
-       * libtool.am (.c.lo): Removed.
-
-       * automake.in (finish_languages): Put `.' before extension in
-       suffix list, `.obj' rule, and `.lo' rule.  Look at `-flags', not
-       `-flag'.  From Pavel Roskin.
-
-1999-04-28  Tom Tromey  <address@hidden>
-
-       * automake.in (finish_languages): Fixed scoping of ltcompile and
-       ltlink.  From Pavel Roskin.
-
-1999-04-27  Tom Tromey  <address@hidden>
-
-       * automake.in (read_main_am_file): Don't start macro definition
-       with backslash-newline.  Instead, append newline at the end if
-       required.
-
-       * automake.in (read_am_file): Insert a backslash before a trailing
-       newline.  Fixes pluseq8.test.
-
-       * automake.in (MACRO_PATTERN): Allow digits and `_' to start a
-       macro name.
-       (check_canonical_spelling): Don't insert `AM' before macro name
-       (reverts Alexandre's 1999-04-27 patch).
-       * automake.texi: Reverted documentation change for `AM' patch.
-
-       * automake.in (handle_lib_objects_cond): Prefer `$1' over `\1'.
-       Minor rewrite for clarity.
-       (check_canonical_spelling): Prefer `$1' over `\1'.
-
-       * depend2.am (@OBJ@): Renamed.  Use @SOURCE@, @address@hidden  Always
-       use `-o $@'.
-       (@LTOBJ@): Likewise.
-       * automake.in (handle_single_transform_list): Don't print rule if
-       doing dependency tracking and the file's language supports it.
-       (initialize_per_input): Initialize lang_specific_files.
-       (add_depend2): New function.
-       (handle_dependencies): Use it.
-
-       * automake.in (lang_ppf77_finish): Use lang_f77_finish.
-       ratfor compiler name is `RCOMPILE'.  ppf77 compiler name changed
-       to `PPF77COMPILE' to allow use of f77 and ppf77 in the same
-       directory.
-       (lang_ratfor_finish): Use lang_f77_finish.
-
-       * compile.am (NOTDEPEND.c.o): Removed.
-       (OBJEXT.c.obj): Likewise.
-       * automake.in: Added `flags' attribute to all relevant languages.
-       (handle_single_transform_list): Handle per-derived-object flags.
-       Changed interface and all callers.
-       (handle_built_sources): Don't call handle_single_transform_list.
-       Added `compile' and `compiler-name' attribute to all relevant
-       languages.
-       (finish_languages): Define compiler variables here.
-       (lang_cxx_finish): Don't call define_compiler_variable.  Don't
-       define flag variable or .o rules.  Don't add to @suffixes.
-       (lang_f77_finish): Likewise.
-       (lang_ppf77_finish): Likewise.
-       (lang_objc_finish): Likewise.
-       (lang_java_finish): Likewise.
-       (finish_languages): Define flag variable here.
-       Added `output-arg' attribute to all relevant languages.
-       (finish_languages): Define `.o' rules here.
-       (finish_languages): Put extension on @suffixes.
-       (get_object_extension): Don't transform NOTDEPEND or MINUSO.
-
-1999-04-27  Alexandre Oliva  <address@hidden>
-
-       * automake.in (initialize_global_constants): Invoke gzip for
-       dist-shar just like in plain dist, i.e., pass it GZIP_ENV and -c.
-
-       * automake.in (initialize_global_constants): Remove zip file
-       before re-creating it.
-       Reported by Bob Friesenhahn <address@hidden>
-
-       * texinfos.am (uninstall-info): Look for info file in srcdir, just
-       like in install-info-am.
-       Reported by Tudor Hulubei <address@hidden>
-
-       * automake.in (handle_lib_objects_cond): \Q doesn't work either.
-       Let's use the good ol' substitution, then.
-       Reported by Russ Allbery <address@hidden>
-
-       * automake.in (check_canonical_spelling): Insert AM before names
-       starting with non-letters.
-
-       * automake.texi: Document it.
-
-1999-04-26  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_lib_objects_cond): Do not use quotemeta, it
-       doesn't work on perl4.  Maybe \Q and \E do.
-
-1999-04-24  Tom Tromey  <address@hidden>
-
-       * automake.in: Treat `.zip' and `.jar' files as Java.
-
-       * automake.in (generate_makefile): Define `subdir' after reading
-       .am file.
-       (read_main_am_file): Give programming error if variable defined
-       before invocation.
-
-1999-04-22  Tom Tromey  <address@hidden>
-
-       * automake.in (generate_makefile): Define `subdir' variable.
-       (handle_dist): Don't define `subdir'.
-
-       * automake.in (handle_texinfo): Change numbering scheme for
-       stamp-vti files, to avoid problems with DOS.
-       From Michel de Ruiter.
-
-       * automake.texi: Don't mention AM_FUNC_MKTIME.
-       * aclocal.in (obsolete_macros): Mention AM_FUNC_MKTIME.
-       * automake.in (scan_one_configure_file): Recognize
-       AC_FUNC_MKTIME, not AM_FUNC_MKTIME.
-       (obsolete_macros): Mention AM_FUNC_MKTIME.
-       * m4/Makefile.am (m4data_DATA): Removed mktime.m4.
-       * m4/mktime.m4: Removed.
-
-1999-04-20  Tom Tromey  <address@hidden>
-
-       * automake.texi (Top level): Don't recommend substing SUBDIRS.
-
-1999-04-20  Brian Ford <address@hidden>
-
-       * scripts.am: Change else if's to elif.
-
-1999-04-20  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_lib_objects_cond): Only require the source
-       of a LIBOBJ if it's not in BUILT_SOURCES.
-       Reported by Erez Zadok.
-
-1999-04-19  Tom Tromey  <address@hidden>
-
-       * automake.in: Treat `.class' files as Java source.
-       (lang_java_finish): Handle `.class' files.
-
-1999-04-18  Alexandre Oliva  <address@hidden>
-
-       * m4/lispdir.m4: Match only `/(share|lib)/x?emacs/site-lisp/*$'.
-
-       * m4/lispdir.m4: Do not override lispdir if it's already defined.
-       Run some emacs-lisp to find out the site-lisp directory, but
-       relocate it into prefix.
-
-1999-04-17  Paul Eggert  <address@hidden>
-
-       * m4/mktime.m4 (bigtime_test, main): Move alarm from
-       bigtime_test to main, since Solaris 7 (64-bit) mktime loops
-       even outside of bigtime_test.  Use a time limit of 60 seconds
-       for the whole test, not 10 seconds per iteration.
-
-1999-04-17  Erez Zadok  <address@hidden>
-
-       * automake.in: Create stamps for headers in appropriate
-       directories, even if the input file lives in a different place.
-       * remake-hdr.am: Likewise.
-
-1999-04-16  Tom Tromey  <address@hidden>
-
-       From Brian Ford:
-       * progs.am (address@hidden@PROGRAMS, address@hidden@PROGRAMS):
-       Invoke `sed' only once per program.
-       * scripts.am (address@hidden@SCRIPTS, address@hidden@SCRIPTS):
-       Invoke `sed' only once per program.
-
-1999-04-13  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_subdirs): Make `install-recursive' phony.
-       From Michel de Ruiter.
-
-       * automake.in (handle_ltlibraries): Added missing `check'.
-
-1999-04-12  Tom Tromey  <address@hidden>
-
-       * ansi2knr.c: New version from Pavel Roskin (via ansi2knr.c
-       maintainer).
-
-1999-04-11  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Use AMTAR.
-       (initialize_global_constants): Likewise.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AMTAR, not TAR.
-
-       * automake.in (lang_sub_obj): New function.
-       (lang_cxx_rewrite): Use it.
-       (lang_asm_rewrite): Likewise.
-       (lang_objc_rewrite): Likewise.
-       (lang_cxx_finish): Add `-o $@' to all C++ rules.
-       (lang_asm_finish): Add `-o' to suffix rules when appropriate.
-       (lang_objc_finish): Add `-o $@' to all ObjC rules.
-       (lang_java_finish): Likewise.
-
-       * automake.in: Only register `asm' once.
-       (lang_asm_finish): Put assembly suffixes on @suffixes.
-
-       * libtool.am (.s.lo): Removed.
-       (.S.lo): Likewise.
-       * automake.in (lang_asm_finish): Handle libtool.
-
-       * libtool.am (.c.o): Always pass -c to libtool.
-
-       * automake.in (lang_yacc_rewrite): Handle sources in subdirs.
-       (lang_yaccxx_rewrite): Likewise.
-       (lang_lex_rewrite): Likewise.
-       (lang_lexxx_rewrite): Likewise.
-
-       Assembly code no longer included by default:
-       * compile.am (.s.o): Removed.
-       (.S.o): Likewise.
-       * automake.in: Register `asm' language.
-       (lang_asm_finish): Generate suffix rules for assembly.
-       (get_object_extension): Don't add `.s' or `.S' to suffix list.
-
-       * automake.in (get_object_extension): Substitute @MINUSO@ when
-       including compile.am.
-       * compile.am (.c.o): Added @address@hidden
-       (.c.obj): Likewise.
-
-       First cut at allowing objects in subdirectories:
-       * m4/Makefile.am (m4data_DATA): Added minuso.m4.
-       * Makefile.am (dist_script_DATA): Added compile.
-       * m4/minuso.m4: New file.
-       * automake.in (initialize_global_constants): Added compile to
-       common_files.
-       (seen_cc_c_o): New global.
-       (scan_one_configure_file): Set it when AM_PROG_CC_C_O seen.
-       (handle_options): Recognize `subdir-objects' option.
-       (lang_c_rewrite): Added directory argument.
-       (lang_yacc_rewrite): Likewise.
-       (lang_yaccxx_rewrite): Likewise.
-       (lang_lex_rewrite): Likewise.
-       (lang_lexxx_rewrite): Likewise.
-       (handle_single_transform_list): Pass directory to _rewrite
-       function.  Generate dependencies for dirstamp files for each .o;
-       it is just the rules we want to create once.
-       (lang_c_rewrite): Handle `subdir-objects' option.
-       (lang_c_rewrite): Require `compile' program.
-       * compile: New file.
-
-       * automake.in (initialize_per_input): Initialize %directory_map.
-       (handle_single_transform_list): Only create .dirstamp rules once
-       per directory.
-
-       * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_PROGS, not AC_CHECK_PROG.
-
-       Fix for confh.test:
-       * automake.in (configure_input_files): New global.
-       (scan_configure): Set it.
-       (handle_configure): Use configure_input_files when determining
-       which subdirs have a Makefile.am.  Fixes confh.test.
-       (handle_configure): Only recognize acconfig.h in top srcdir.
-
-1999-04-10  Tom Tromey  <address@hidden>
-
-       * depend2.am (%.o): Use `$(*D)/$(*F)', not just `$(*F)'.
-       (%.lo): Likewise.
-
-       * automake.in (am_install_var): Remove redundancies from the
-       result.  Fixes test cond8.test.
-
-       * automake.in (handle_single_transform_list): Handle dependency
-       tracking when files are created in subdirs.  Error if object in
-       subdir has `..' component.
-
-       * automake.in (initialize_global_constants): Use $(TAR), not tar.
-
-       * automake.in (handle_ltlibraries): Allow check_LTLIBRARIES.
-
-       * automake.in (lang_yacc_finish): Added missing `&'.
-
-1999-04-10  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_configure): Replace multiple occurrences of
-       @STAMP@ in the same line; completes the patch for remake-hdr.am
-       below.
-
-       * automake.in (handle_dependencies): Fix test for `autodep'
-       support.
-
-       * automake.in (handle_source_transform): Add a pfx to used_pfx
-       only if it's conditional or non-empty, to reduce the number of
-       empty variables.  Emit _OBJECS variable based on program name if
-       no SOURCES were explicitly specified.
-
-       * remake-hdr.am: Create the stamp file before the header file,
-       and just rename it after, so that the timestamps will be correct.
-       Reported by Marc Horowitz <address@hidden>
-
-       * automake.in (lang_yacc_finish): Generate and dist a `.h' for a
-       `.y' iff YFLAGS or AM_YFLAGS contain `-d'.
-       Reported by Jim Meyering <address@hidden>
-
-       * automake.in (lang_yacc_finish): $hname must not contain a `.'.
-
-1999-04-10  Tom Tromey  <address@hidden>
-
-       * Makefile.am (EXTRA_DIST): New macro.
-       * ChangeLog.1996, ChangeLog.1998: New files.
-
-1999-04-09  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Handle dist and nodist
-       prefixes.
-       (initialize_per_input): Initialize dist_sources.
-       (check_libobjs_sources): Handle dist and nodist prefixes.
-       (generate_makefile): Define DIST_SOURCES.
-       * dist-vars.am (DISTFILES): Reference DIST_SOURCES, not SOURCES.
-
-       * automake.texi (Macros): Mention AM_PROG_GCJ.
-       (Java Support): New node.
-       (Dist): Documented dist_ and nodist_ prefixes.
-
-       * m4/gcj.m4 (AM_PROG_GCJ): Renamed from AC_PROG_GCJ.
-
-       * automake.in (lang_java_finish): Generate .lo rule for `.java'
-       files, not `.gcj' files.
-
-       * m4/gcj.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Added gcj.m4.
-
-       * automake.in: Register the `java' language.
-       (resolve_linker): Handle GCJLINK.
-       (lang_java_rewrite): New function.
-       (LANG_IGNORE, LANG_PROCESS, LANG_SUBDIR): New constants.
-       (lang_c_rewrite): Use new constants.
-       (lang_cxx_rewrite): Likewise.
-       (lang_header_rewrite): Likewise.
-       (lang_yacc_rewrite): Likewise.
-       (lang_yaccxx_rewrite): Likewise.
-       (lang_lex_rewrite): Likewise.
-       (lang_lexxx_rewrite): Likewise.
-       (lang_asm_rewrite): Likewise.
-       (lang_f77_rewrite): Likewise.
-       (lang_ppf77_rewrite): Likewise.
-       (lang_ratfor_rewrite): Likewise.
-       (lang_objc_rewrite): Likewise.
-       (handle_single_transform_list): Likewise.  Handle LANG_SUBDIR
-       return from rewrite function.
-       (lang_java_finish): New function.
-       (register_language): Changed interface and all calls.  Added
-       `autodep' settings to various languages.
-       (handle_dependencies): Use `autodep' property of language when
-       including dependency-tracking code.
-
-1999-04-07  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Indentation fixes.
-
-1999-04-07  Alexandre Oliva  <address@hidden>
-
-       * automake.in (value_to_list): Skip *only* trailing backslashes.
-
-1999-04-07  Pavel Roskin  <address@hidden>
-
-       * automake.in (value_to_list): Skip trailing backslashes.
-
-1999-04-07  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_texinfo): Add texinfo.tex to config_aux_dir
-       when appropriate.
-       Reported by Per Cederqvist <address@hidden>
-       (handle_texinfo): Do not define texinfo_tex='.', use
-       '$(srcdir)/texinfo.tex' instead; the directory name will be
-       properly extracted.
-       (require_conf_file_with_line): Fixed typo.
-
-1999-04-03  Raja R Harinath  <address@hidden>
-
-       * automake.in (handle_tests): Test `dir=./' before `dir=', so that
-       we do not depend on PATH starting with `.'.
-
-1999-03-31  Tom Tromey  <address@hidden>
-
-       * automake.in (quote_cond_val): Quote \n.
-       (unquote_cond_val): Unquote \n.
-       (read_am_file): If line ends with `\', preserve it and add a
-       newline.
-       (read_main_am_file): In conditional case, put conditional text at
-       beginning of each generated line.
-
-1999-03-31  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_tests): support XFAIL_TEST
-       * automake.texi: document it
-
-1999-04-12  Alexandre Oliva  <address@hidden>
-
-       * End of merge from trunk.
-
-1999-04-12  Alexandre Oliva  <address@hidden>
-
-       * automake.in (cmdline_use_dependencies): Reintroduce it.
-       (--ignore-deps): Set cmdline_use_dependencies again.
-       (handle_dependencies): If use_dependencies is not set, define
-       depcomp as empty.
-       (handle_configure): Pass --ignore-deps to generated Makefile.ins.
-       (scan_configure): Do not require depcomp when ignoring
-       dependencies.
-       (initialize_global_constants): Reintroduce --ignore-deps.
-
-1999-04-10  Alexandre Oliva  <address@hidden>
-
-       * depcomp: New file.
-       * Makefile.am (dist_script_DATA): Added depcomp.
-       * automake.in (cmdline_use_dependencies, omit_dependencies,
-       dependency_macros): Removed.
-       (--ignore-deps): Just ignore.
-       (handle_single_transform_list, dep_files): Named dependency files
-       as \$(DEPDIR)/$base.P$obj
-       (handle_lib_objects_cond): Likewise.
-       (generate_dependency_code): Do not check for AM_*_DEPENDENCIES.
-       (scan_one_configure_file): Likewise.
-       (handle_dependencies): Always enable auto-dep.  Define `depcomp'.
-       Ignore OMIT_DEPENDENCIES.
-       (handle_configure): Do not pass --ignore-deps.
-       (scan_configure): Require `depcomp'.
-       (initialize_global_constants): Make `depcomp' common.  Remove
-       `--ignore-deps' from usage.
-       (get_object_extension): No more NOTDEPEND in compile nor libtool.
-       * compile.am: Remove rules for .c.o and .c.obj
-       * depend.am (distclean-depend): Wipe out $(DEPDIR)
-       * depend2.am (@address@hidden): Define from config.status.
-       Use it and depcomp in suffix rules.
-       * libtool.m4: Likewise.
-       * m4/ccdepend.m4, m4/cxxdepend.m4: Removed.
-       * m4/depvars.m4, m4/objcdepend.m4: Likewise.
-       * m4/Makefile.am (dist_m4data_DATA): Likewise.
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Extract DEPDIR
-       from the Makefile and subst it in deps.  Report creation of deps
-       files (for now).  Replace $U with `_' and the empty string.  Write
-       a comment to each created file.
-       * m4/depend.m4 (AM_SET_DEPDIR): Select a valid deps dir name.
-       (AM_DEPENDENCIES): Accept CC, CXX and OBJC.  Just determine the
-       dependency mode and AC_SUBST [$1]DEPMODE.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Automatically call
-       AM_DEPENDENCIES for CC and CXX, if the corresponding AC_PROG
-       appears in configure.in, before or after AM_INIT_AUTOMAKE.
-
-1999-04-02  Raja R Harinath  <address@hidden>
-
-       * depout.m4: Fix sed expression for extracting `dirpart'.
-
-1999-03-29  Tom Tromey  <address@hidden>
-
-       * depend2.am (address@hidden@COMPILE): Use `!=' and not `-ne'.
-
-       * compile.am (.c.obj): Also disabled when dependency tracking
-       enabled.
-       * depend2.am (@address@hidden): New target.
-       * automake.in (get_object_extension): Added explanatory comment.
-       (generate_dependency_code): Handle $seen_objext.
-
-       * depend.am: Removed obsolete comment.
-       * depend2.am: Minor formatting fix.
-
-1999-03-28  Tom Tromey  <address@hidden>
-
-       * m4/Makefile.am (dist_m4data_DATA): Renamed, and added new
-       files.
-       (EXTRA_DIST): Removed.
-       * automake.in (dependency_macros): New global.
-       (scan_one_configure_file): Recognize new dependency tracking
-       macros, and define new resulting configure variables.
-       (generate_dependency_code): New sub.
-       (handle_dependencies): Use it.
-       * depend2.am (address@hidden@COMPILE): New macro.
-       (@address@hidden): Use it.
-       (@address@hidden): Likewise.
-       * m4/depvars.m4: New file.
-       * m4/objcdepend.m4: New file.
-       * m4/cxxdepend.m4: New file.
-       * m4/init.m4: Moved dependency handling code into depout.m4.
-       * m4/depout.m4: New file.
-       * m4/ccdepend.m4: New file.
-       * m4/depend.m4: New file.
-
-       * depend2.am (@address@hidden): Renamed to be old-style suffix pattern.
-       (@address@hidden): Likewise.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't create `.deps/.P'; it is no
-       longer needed.
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Add code to config.status which
-       will create the required .P files for dependency tracking.
-       * automake.in (scan_dependency_file): Removed.
-       (handle_dependencies): Never call scan_dependency_file.
-       (generate_deps): Removed.
-       (parse_arguments): Don't recognize --generate-deps, --build-dir,
-       --srcdir-name, or --include-deps.  Do recognize --ignore-deps.
-       (srcdir_name): Removed.
-       (build_directory): Removed.
-       (initialize_global_constants): Changed $USAGE to reflect argument
-       parsing changes.
-       (handle_dist_worker): Never run automake in `dist' rule.
-       (handle_configure): Use --ignore-deps, not --include-deps.
-       * depend.am (DEPS_MAGIC): Removed.
-       (DEP_FILES): Unconditionally include.
-
-1999-03-27  Tom Tromey  <address@hidden>
-
-       * automake.in (saw_sources_p): Correctly count header extensions
-       seen.
-       (handle_headers): Fixed order of arguments to am_install_var.
-
-       * automake.in (am_install_var): Don't error if EXTRA_foo is
-       defined uselessly.
-
-       * scripts.am (address@hidden@SCRIPTS): Use NDIR when appropriate.
-       (address@hidden@SCRIPTS): Likewise.
-       * progs.am (address@hidden@PROGRAMS): Use NDIR when appropriate.
-       (address@hidden@PROGRAMS): Likewise.
-       * ltlib.am (address@hidden@LTLIBRARIES): Use NDIR when appropriate.
-       (address@hidden@LTLIBRARIES): Likewise.
-       * lisp.am (address@hidden@LISP): Use NDIR when appropriate.
-       (address@hidden@LISP): Likewise.
-       * libs.am (address@hidden@LIBRARIES): Use NDIR when appropriate.
-       (address@hidden@LIBRARIES): Likewise.
-       * java.am (address@hidden@JAVA): Use NDIR when appropriate.
-       (address@hidden@JAVA): Likewise.
-       * header.am (address@hidden@HEADERS): Use NDIR when appropriate.
-       (address@hidden@HEADERS): Likewise.
-       * data.am (address@hidden@DATA): Use NDIR when appropriate.
-       (address@hidden@DATA): Likewise.
-       * Makefile.in: Rebuilt.
-       * Makefile.am (dist_pkgdata_DATA): Renamed.
-       (EXTRA_DIST): Removed.
-       (install-data-hook): Added POST_INSTALL; print commands as they
-       are run; respect DESTDIR.
-       * dist-vars.am (DISTFILES): Removed $(HEADERS).
-       * automake.in (am_install_var): Accept `-candist' and
-       `-defaultdist' options.  Handle `dist_' and `nodist_' prefixes.
-       (am_primary_prefixes): Added can_dist argument.  Recognize `dist_'
-       and `nodist_' prefixes.
-       (handle_scripts): Pass -candist to am_install_var.
-       (handle_data): Pass -defaultdist to am_install_var.
-       (handle_headers): Likewise.
-       (handle_emacs_lisp): Pass -candist to am_install_var.
-       (handle_java): Pass -candist to am_install_var.
-
-1999-03-26  Tom Tromey  <address@hidden>
-
-       * m4/init.m4: Fixed typo when invoking SHELL.
-
-       * automake.in (lang_yacc_finish): Always use `.h' as suffix for
-       yacc header file.  From Ralf Corsepius.
-
-       * Makefile.in: Rebuilt.
-       * Makefile.am: Updated to reflect removal of TAR subst.
-       * automake.texi (Options): Document dist-bzip2.
-       * automake.in (TAR): Removed global.
-       (initialize_global_constants): Changed `dist' to use pipe with
-       gzip; work with non-GNU tar.
-       (handle_dist): Handle non-GNU tar.  Don't define TAR.
-       (initialize_global_constants): Added `dist-bzip2' entry.
-       (handle_options): Recognize dist-bzip2 option.
-       (handle_dist): Likewise.
-       * configure: Rebuilt.
-       * configure.in: Don't check for tar.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Check for `tar'.  Substitute
-       AMTARFLAGS.
-
-       * automake.in (am_install_var): Removed obsolete comment.
-
-       * texinfos.am (uninstall-info): Don't print loop but instead print
-       commands.  Simplified pre-uninstall loop.
-       * scripts.am (address@hidden@SCRIPTS): Don't print loop but
-       instead print commands.
-       * progs.am (address@hidden@PROGRAMS): Don't print loop but instead
-       print commands.
-       * ltlib.am (address@hidden@LTLIBRARIES): Don't print loop but
-       instead print commands.
-       * lisp.am (address@hidden@LISP): Strip subdir from file name.
-       (address@hidden@LISP): Likewise.  Also, don't print loop but
-       instead print commands.
-       * libs.am (address@hidden@LIBRARIES): Don't print loop but instead
-       print commands.
-       * java.am (address@hidden@JAVA): Don't print loop but instead
-       print commands.
-       * header.am (address@hidden@HEADERS): Strip subdir from file name.
-       (address@hidden@HEADERS): Likewise.  Also, don't print loop but
-       instead print commands.
-       * data.am (address@hidden@DATA): Strip subdir from file name.
-       (address@hidden@DATA): Likewise.  Also, don't print loop but
-       instead print commands.
-
-       * automake.in (handle_merge_targets): `install-strip' is a phony
-       target.  From Michel de Ruiter.
-
-1999-03-25  Tom Tromey  <address@hidden>
-
-       * automake.in (define_compiler_variable): Don't define variable
-       with trailing `_'.
-
-1999-03-25  Alexandre Oliva  <address@hidden>
-
-       * automake.in (LDADD): accept -dlopen and -dlpreopen here
-       * automake.texi: ditto
-
-1999-03-25  Alexandre Oliva  <address@hidden>
-
-       * automake.in (TESTS): make from Solaris 7/x86 loses if srcdir
-       is absolute and != objdir.  dir="" or "$(srcdir)/" fixes it
-
-1999-03-24  Tom Tromey  <address@hidden>
-
-       * automake.in (define_compiler_variable): New sub.
-       (finish_languages): Use it.
-       (lang_cxx_finish): Likewise.
-       (lang_f77_finish): Likewise.
-       (lang_ppf77_finish): Likewise.
-       (lang_ratfor_finish): Likewise.
-       (lang_objc_finish): Likewise.
-
-1999-03-23  Tom Tromey  <address@hidden>
-
-       * progs.am (address@hidden@PROGRAMS): Use `-e' instead of multiple
-       sed invocations.  From Elrond.
-       (address@hidden@PROGRAMS): Likewise.
-
-       * automake.in (lang_lex_finish): Rewrite `l', not `y', to `c'.
-       From Ralf Corsepius.
-
-1999-02-01  Thomas Tanner  <address@hidden>
-
-       * automake.in: accept both A(C|M)_PROG_LIBTOOL, print a
-       warning when AM_PROG_LIBTOOL was found
-       * automake.texi: renamed AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
-
-1999-03-22  Tom Tromey  <address@hidden>
-
-       Made `+=' more robust.  Fixes pluseq6.test and pluseq7.test.
-       * automake.in (define_standard_variables): New sub.
-       (read_main_am_file): Use two passes to scan standard variables.
-       (read_am_file): Don't special-case configure variables with `+='.
-       (initialize_per_input): Initialize %var_was_plus_eq.
-       (read_am_file): Set var_was_plus_eq element correctly.
-       (define_variable): Give error if variable assigned with `+=' is
-       internally defined.
-       (initialize_per_input): Initialize %am_var_defs.
-       (file_contents_with_transform): Set element in %am_var_defs.
-       (read_am_file): Use %am_var_defs.
-
-1999-03-21  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_per_input): Initialize %object_map.
-       (handle_single_transform_list): Allow source files in
-       subdirectories.
-
-1999-03-21  Jim Meyering  <address@hidden>
-
-       * automake.in (handle_dist): Add missing newline after the first
-       semicolon.
-
-1999-03-11  Tom Tromey  <address@hidden>
-
-       * m4/error.m4, m4/mktime.m4, m4/obstack.m4, m4/regex.m4,
-       m4/strtod.m4: Use $ac_objext, not `.o'.  From Jim Meyering.
-
-       From Jim Meyering:
-       * automake.in (handle_dist): Add `;\' to end of distcheck-hook
-       line.
-       (scan_one_configure_file): In LIBOBJS, recognize `$ac_objext' as
-       legitimate ending.  Fixes libobj9.test.
-
-       From Ralf Corsepius.  Fixes lex3.test.
-       * automake.in (lang_yacc_finish): Include `.' in name pushed onto
-       maintainer-clean list.
-       (lang_lex_finish): Likewise.
-
-1999-03-02  Tom Tromey  <address@hidden>
-
-       * subdirs.am (maintainer-clean-recursive): Changed "&&" into "if"
-       construct to work around FreeBSD make/sh problem.  From Rich Wales.
-
-1999-03-01  Tom Tromey  <address@hidden>
-
-       Fixes from Pavel Roskin:
-       * automake.in (variable_conditions_sub): Sort list passed to
-       variable_conditions_permutations.
-       (variable_conditions): Sort list before returning.
-
-1999-02-27  Tom Tromey  <address@hidden>
-
-       * automake.in (lang_extensions): New sub.
-       (handle_dependencies): Use it.
-       (cxx_extensions): Removed.
-       (lang_cxx_finish): Use lang_extensions.
-       (f77_extensions): Removed.
-       (lang_f77_finish): Use lang_extensions.
-       (objc_extensions): Removed.
-       (lang_ppf77_finish): Put `.' before extension.  Fixes ext.test.
-       Report from Dave Morrison.
-       (lang_ratfor_finish): Likewise.
-
-1999-02-26  Tom Tromey  <address@hidden>
-
-       * automake.in (finish_languages): Added AM_LDFLAGS.
-       (lang_cxx_finish): Likewise.
-       (lang_f77_finish): Likewise.
-       (lang_ppf77_finish): Likewise.
-       (lang_ratfor_finish): Likewise.
-       (lang_objc_finish): Likewise.
-
-1999-02-11  Tom Tromey  <address@hidden>
-
-       * aclocal.in (obsolete_macros): Copied from automake.in.
-       (obsolete_rx): Use only keys of obsolete_macros.
-       (scan_configure): Report replacement macro for an obsolete macro.
-       * automake.in (obsolete_macros): Added ud_GNU_GETTEXT.
-
-       * automake.in (obsolete_macros): Corrected typo in AM_EXEEXT
-       entry.  Fixes obsolete2.test.
-
-       * automake.in (obsolete_macros): Use empty string to indicate no
-       substitution.
-       (scan_one_configure_file): Likewise.
-
-1999-02-07  Paul Eggert  <address@hidden>
-
-       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Prefer -Ae to -Aa
-       -D_HPUX_SOURCE, since -Ae allows `long long' and this is
-       needed by some programs.
-
-1999-02-10  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Added `pgs' to list of
-       extensions.  From NISHIDA Keisuke.
-
-1999-02-04  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): remove texinfo.tex from
-       TEXINFODIR.
-
-1999-02-02  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG.
-       * progs.am (address@hidden@PROGRAMS): Added INSTALL_STRIP_FLAG.
-       * header-vars.am (INSTALL_PROGRAM): Removed
-       AM_INSTALL_PROGRAM_FLAGS.
-       (INSTALL_STRIP_FLAG): New macro.
-
-       * automake.in: Handle `ypp' as C++ yacc source and `lpp' as C++
-       lex source.
-       (lang_yacc_finish): Likewise.
-       (lang_lex_finish): Likewise.
-
-1999-02-01  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Correctly find find in $$d,
-       not $$.  From Bill Davidson.
-
-       * automake.in (finish_languages): Use "&", not "do".  From Pavel
-       Roskin.
-       (handle_single_transform_list): Likewise.
-
-1999-01-29  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Removed unused variable.  From
-       Pavel Roskin.
-
-       * ansi2knr.c: New version from L. Peter Deutsch.
-
-1999-01-22  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file_internal): Correctly examine return
-       value of `system'.  From Andris Pavenis.  Fixes copy.test.
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require autoconf 2.13.
-
-       * automake.in (lang_ppf77_rewrite): New function.  From Jochen
-       Kuepper.  Fixes ppf77.test.
-       (lang_ratfor_rewrite): New function
-
-       * automake.in (handle_configure): Use `&' before sub calls (Perl 4
-       fix).  From Erez Zadok.
-
-1999-01-15  Tom Tromey  <address@hidden>
-
-       * configure.in: Version 1.4a (oops).
-
-       * configure.in: Updated version to 1.5a.
-
-1999-01-14  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Compute $header_dir based on
-       $one_name, not $one_hdr.  Reported by Erez Zadok.  Fixes
-       confh2.test.
-       (handle_configure): Compute relative path to input header
-       correctly in all cases.
-
-       * automake.in (handle_tests): Avoid error messages from dejagnu
-       test rules.  From Karl Heuer.
-
-       * automake.in (handle_texinfo): Add `/' to end of $conf_dir.
-
-       * Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.
-
-       * texi-vers.am ($(srcdir)/address@hidden@): Find @TEXI@ in srcdir.
-       From Alexandre Oliva and Erez Zadok.
-
-       * automake.in (create): Renamed from touch.
-       (handle_configure): Use create, not touch.
-
-       * config.sub, config.guess: New versions from autoconf.
-
-       * mkinstalldirs: New version from autoconf.
-
-1999-01-12  Tom Tromey  <address@hidden>
-
-       * config.sub, config.guess, COPYING, texinfo.tex: New versions
-       from FSF.
-
-1999-01-11  Marcus G. Daniels  <address@hidden>
-
-       * automake.in (PATH_PATTERN): New variable:
-       (INCLUDE_PATTERN): Use it.  Ignore all include commands using
-       symbols besides $(top_srcdir) and $(srcdir).
-
-1999-01-11  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_dist_worker): avoid failure in `make dist'
-       if last file is a builddir-only file
-
-1999-01-11  Alexandre Oliva  <address@hidden>
-
-       * missing (autoheader): `s' was missing from sed script; grr
-
-1999-01-11  Tom Tromey  <address@hidden>
-
-       * remake-hdr.am (@STAMP@): Reverted timestamp change.
-       ($(srcdir)/@address@hidden): Likewise.
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * Makefile.am (scriptdir): New macro.
-       (script_DATA): Likewise.
-       (install-data-hook): Use them.
-       (EXTRA_DIST): Added script_DATA.
-       (installcheck-local): Use script_DATA.
-
-       * Makefile.am (pkgdata_DATA): Removed duplicate definition.
-
-1999-01-10  Alexandre Oliva  <address@hidden>
-
-       * missing (autoheader): accept multiple header files
-       (automake): simplify sed processing
-
-1999-01-10  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_configure, stamp_dir): create only one stamp
-       file per header, instead of one in the top-level directory and one
-       in the directory that contains the header.
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * automake.in (lang_objc_finish): Formatting fix.
-
-       * automake.in (objc_extensions): New sub.
-       (handle_dependencies): Only generate dependency-tracking code for
-       ObjC when ObjC source seen.
-
------
-
-Copyright 1999, 2000 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.01 b/ChangeLog.01
deleted file mode 100644
index d3150b2..0000000
--- a/ChangeLog.01
+++ /dev/null
@@ -1,4937 +0,0 @@
-2001-12-31  Tom Tromey  <address@hidden>
-
-       * automake.texi (Extending): Document installcheck-local.  Added
-       installdirs-local index entry.
-       (Tests): Document installcheck-local.
-
-       * automake.in (handle_single_transform_list): Indentation fix.
-
-2001-12-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (common_files): Add COPYING.DOC.
-       Suggested by Karl Berry.
-
-2001-12-30  Tom Tromey  <address@hidden>
-
-       * automake.in (define_configure_variable): Define a user macro,
-       not an automake macro.
-       * tests/Makefile.am (TESTS): Added ar.test.
-       * tests/ar.test: New file.
-
-       For PR automake/211:
-       * automake.in (object_compilation_map): New global.
-       (initialize_per_input): Initialize it.
-       (COMPILE_LIBTOOL): New constant.
-       (COMPILE_ORDINARY): Likewise.
-       * tests/Makefile.am (TESTS): Added pr211.test.
-       * tests/pr211.test: New file.
-
-       For PR automake/215:
-       * configure.in: Use AM_AUTOMAKE_OPTIONS.
-       * Makefile.am (AUTOMAKE_OPTIONS): Removed.
-       * automake.texi (Macros): Document AM_AUTOMAKE_OPTIONS.
-       (Options): Mention AM_AUTOMAKE_OPTIONS.
-       * automake.in (global_options): New global.
-       (global_options_line): Likewise.
-       (scan_autoconf_traces): Trace AM_AUTOMAKE_OPTIONS.
-       (scan_one_autoconf_file): Likewise.
-       (process_option_list): New function.
-       (handle_options): Use it.  Also, handle global options.
-       * m4/Makefile.am (m4data_DATA): Added options.m4.
-       * m4/options.m4: New file.
-
-       * lib/am/install.am (?SUBDIRS?installdirs-am): Handle
-       installdirs-local.
-       (?!SUBDIRS?installdirs): Likewise.
-       * automake.in (handle_installdirs): Handle installdirs-local.
-       * automake.texi (Extending): Mention installdirs.
-       * tests/Makefile.am (TESTS): Added installdir.test.
-       * tests/installdir.test: New file.
-
-2001-12-30  Akim Demaille  <address@hidden>
-
-       * lib/am/yacc.am: Also rename the possible y.output file.
-       Remove the trailing y.tab.h.
-
-2001-12-30  Paolo Bonzini  <address@hidden>
-
-       * automake.texi (Install): Remove mention of nonexistent
-       uninstall-hook.
-
-2001-12-30  Alan Modra  <address@hidden>
-
-       * automake.in (generate_makefile): Unlink output file before
-       opening so that any hard links are not changed.
-
-2001-12-30  Tom Tromey  <address@hidden>
-
-       * tests/pr220.test: Use `required' to pick up gcc.
-
-       For PR automake/243:
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Strip everything
-       after `:'.
-       * tests/Makefile.am (TESTS): Added pr243.test.
-       * tests/pr243.test: New file.
-
-       For PR automake/220:
-       * tests/Makefile.am (TESTS): Added pr220.test.
-       * tests/pr220.test: New file.
-       * m4/cond.m4 (AM_CONDITIONAL): Cause creation of config.status to
-       fail if conditional was never run.
-
-       For PR automake/260:
-       * lib/depcomp (tru64): Correctly handle libtool case.
-       From address@hidden
-
-2001-12-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distcleancheck_listfiles): Unquote.
-       Reported by Yann Droneaud.
-
-2001-12-29  Tom Tromey  <address@hidden>
-
-       For PR automake/266:
-       * tests/Makefile.am (TESTS): Added pr266.test.
-       * tests/pr266.test: New file.
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Handle
-       non-standard name for makefile.
-
-       For PR automake/279:
-       * automake.in (conditional_ambiguous_p): New sub.
-       (handle_lib_objects_cond): Use it.
-       (check_ambiguous_conditional): Use it.
-       * tests/Makefile.am (TESTS): Added pr279.test, pr279-2.test.
-       * tests/pr279.test: New file.
-       * tests/pr279-2.test: New file.
-
-2001-12-26  Tom Tromey  <address@hidden>
-
-       For PR automake/249:
-       * tests/Makefile.am (TESTS): Added nodist2.test.
-       * tests/nodist2.test: New file
-
-2001-12-26  Ralf Corsepius <address@hidden>
-
-       * m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS.
-
-2001-12-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Test for Autoconf >= 2.52.
-       * tests/defs (needs_autoconf, has_autoconf): Delete definition.
-       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
-       tests/cond4.test, tests/cond9.test, tests/cond16.test,
-       tests/cond18.test, tests/cond19.test, tests/cond20.test,
-       tests/confsub.test, tests/depcomp2.test, tests/depdist.test,
-       tests/depend2.test, tests/dirname.test, tests/distname.test,
-       tests/extra5.test, tests/install2.test, tests/lex3.test,
-       tests/make.test, tests/nobase.test, tests/pr9.test,
-       tests/pr87.test, tests/stamph2.test, tests/subdir5.test,
-       tests/subdirbuiltsources.test, tests/subobj3.test,
-       tests/subobj5.test, tests/subobj6.test, tests/substref.test,
-       tests/target-cflags.test, tests/yacc4.test, tests/yacc7.test,
-       tests/yaccvpath.test: Do not use $needs_autoconf.
-
-2001-12-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.5c.
-
-2001-12-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.5b.
-
-       * lib/config.sub, lib/config.guess: New versions from FSF.
-
-       * lib/am/lex.am, lib/am/yacc.am: Use `rm -f', not `rm'.
-
-2001-12-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (check_gnu_standards, check_gnits_standards): Pass
-       "$am_file.am" as WHERE argument to require_file.
-
-2001-12-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (AM_PATH_PYTHON): Check all known Python interpreters
-       in loop until we find one the satisfies the user supplied version.
-       Add python2 to the list of known interpreters.  Don't use
-       changequote.  Cache the calculation of PYTHON_VERSION and
-       PYTHON_PLATFORM.
-       (AM_PYTHON_CHECK_VERSION): New function, extracted from
-       AM_PATH_PYTHON and modernized.
-       * m4/runlog.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Add it.
-
-2001-12-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/confsub.test, tests/depdist.test, tests/extra5.test,
-       tests/nobase.test, tests/stamph2.test,
-       tests/subdirbuiltsources.test: Require Autoconf.
-
-2001-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Dist): Document $(DISTCHECK_CONFIGURE_FLAGS).
-       * lib/am/distdir.am (distcheck): Honnor $(DISTCHECK_CONFIGURE_FLAGS).
-       Suggested by Merijn de Jonge.
-
-2001-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/tags.am (ID): Search $(LISP) files in $(srcdir),
-       like other ID dependencies.
-       Suggested by Christian Cornelssen.
-
-2001-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_dist): Distribute common files which
-       do not exist but are target of a Makefile rule.
-       * automake.texi (Dist): Update.
-       * test/builtcommon3.test: New file.
-       * test/Makefile.am (TESTS): Add distcommon3.test.
-
-2001-12-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (macro_define): Fix misuse of chomp introduced on
-       2001-11-28.
-
-2001-11-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (append_comments): New.  Extracted from
-       read_am_file.  Match '\n' with a regexp, don't use substr (the
-       perlport man page says '\n' is not always one byte wide).
-       (read_am_file):  Use it.  Always chomp $_.
-       (file_contents_internal):  Use append_comments.
-       (macro_define): Don't treat the trailing '\n' with substr, use
-       a regexp or chomp.
-
-2001-11-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs: Turn on shell traces when VERBOSE=x.
-
-2001-11-26  Tom Tromey  <address@hidden>
-
-       * automake.texi (Assembly Support): Mention .s and .S as only
-       suffixes.
-
-2001-11-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/subdirbuiltsources.test: Set -e after sourcing defs, not
-       before.
-
-2001-11-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/lex3.test: Require GNU Make.
-
-2001-11-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
-       directory.
-
-2001-11-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/tags.am (TAGS): Search %CONFIG% and $(LISP) files
-       in $(srcdir), like other TAGS dependencies.
-       Suggested by Christian Cornelssen.
-
-2001-11-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): Use $where when reporting an error,
-       not the place where the macro was first defined since (i) if this
-       is the first definition, then obviously it was not defined before,
-       and (ii) anyway, the error is with the new definition, not the
-       first.
-
-2001-11-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Call distcleancheck.
-       (distcleancheck_listfiles, distcleancheck): New, extracted from
-       distcheck.
-       * automake.texi (Checking the distribution): Document
-       distcleancheck_listfiles and distcleancheck.
-
-2001-11-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Parenthesize qw// in
-       foreach invocation, otherwise Perl5.005_03 complains about a
-       syntax error.  Reported by Yann Droneaud.
-
-2001-11-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Suppress FIXME about strange
-       map behavior.
-
-2001-11-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (aclocaldir): Check for existence of libtool.m4 and
-       gettext.m4 if required.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (define_objects_from_sources,
-       handle_lib_objects_cond, value_to_list): Use quotemeta instead of
-       the equivalant substitution.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (SUFFIX_RULE_PATTERN): Add '_(){}$@' to the
-       set of accepted characters in extensions.
-       (rule_define): Convert '.o' and '.obj' into '$(OBJEXT)' for
-       internall use.
-       * tests/suffix6.test: Ensure that `.o' is handled like `.$(OBJEXT)'.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Suffixes): Don't require SUFFIXES, but document
-       its use for the "extreme" cases.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (rule_define): Use $KNOWN_EXTENSIONS_PATTERN
-       to match suffix rules for known extensions, or call
-       accept_extensions on suffixe rules for unknown extensions.
-       (var_SUFFIXES_trigger): New function.
-       (macro_define): Call var_VAR_trigger when $VAR is updated.
-       * tests/suffix6.test, tests/suffix7.test: New files.
-       * tests/Makefile.am (TESTS): Add suffix6.test and suffix7.test.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (KNOWN_EXTENSIONS_PATTERN, known_extensions_list):
-       New variables.
-       (handle_single_transform_list, lang_yacc_target_hook): Use
-       KNOWN_EXTENSIONS_PATTERN.
-       (accept_extension): New function.
-       (register_language): Call it.
-
-2001-11-16  Alexandre Duret-Lutz  <address@hidden>
-
-       At every place where an "$extension" is used, include the leading
-       dot in the extension, don't hardcode it when building the filename.
-       That will make any support for a dot-less extension easier to add.
-
-       * automake.in (SUFFIX_RULE_PATTERN): Include extension dots in
-       backref groups.
-       ("main"): Prepend a '.' to the supported extensions of all
-       languages (e.g. 'c' becomes '.c').
-       (handle_languages, handle_single_transform_list,
-       handle_lib_objects_cond, handle_headers, derive_suffix,
-       rule_define): Do not add a dot
-       before extensions, and include dots in matching groups.
-       * lib/am/depend2.am (.%EXT%.o, .%EXT%.obj, .%EXT%.lo): Rename as ...
-       (%EXT%.o, %EXT%.obj, %EXT%.lo): ... these.
-       * lib/am/lex.am (.%EXT%.%DERIVED-EXT%): Rename as ...
-       (%EXT%%DERIVED-EXT%): ... this.
-       * lib/am/yacc.am: Likewise.
-
-2001-11-12  Akim Demaille  <address@hidden>
-
-       * m4/make.m4 (AM_MAKE_INCLUDE): Serial 2.
-       Use `"#"' and `"\""', which
-       Autoconf mode prefers over `'#'' and `'"''.
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Serial 3.
-       Rely on AC_MSG 2.50's quotation.
-
-2001-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Typo from 2001-11-05.
-
-2001-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distdir): Also look for directory in build
-       directory first. (See 2001-05-14.)
-       * tests/Makefile.am (TESTS): Add extra5.test.
-       * tests/extra5.test: New file.
-       From Dean Povey.
-
-2001-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for distcommon2.test:
-       * automake.in (automake_needs_to_reprocess_all_files): New
-       variable.
-       ("main"): Process all Makefiles a second time if
-       $automake_needs_to_reprocess_all_files is set.
-       (maybe_push_required_file): Return 1 or 0 whether the file is
-       pushed or not.
-       (require_file_internal): Set $automake_needs_to_reprocess_all_files
-       if an added file can't be pushed.
-
-       * test/distcommon2.test: New file.
-       * test/Makefile.am (TESTS): Add distcommon2.test.
-       From Pavel Roskin.
-
-2001-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (exec_dir_p): Remove.  Replace by...
-       (EXEC_DIR_PATTERN):... this.
-       (am_install_var): Adjust to use EXEC_DIR_PATTERN.
-
-2001-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for nobase.test:
-       * lib/am/header-vars.am (install_sh_DATA): New.
-       * lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use
-       %DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead
-       of $(INSTALL_DATA) for nobase_ targets.
-       * lib/am/lisp.am (install-%DIR%LISP): Likewise.
-       * lib/am/python.am (install-%DIR%PYTHON): Likewise.
-       * tests/nobase.test (configure.in): Append AC_OUTPUT.
-       * tests/Makefile.am (XFAIL_TESTS): Remove nobase.test.
-
-2001-11-08  Akim Demaille  <address@hidden>
-
-       * automake.texi: Remove references to stamp-h.in, which no longer
-       exists.
-       * tests/stamph2.test: Formatting change.
-
-2001-11-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/suffix3.test: Check for foo.$(OBJEXT) in Makefile.in.
-       Don't use -Wno-error.
-
-2001-11-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/suffix4.test ($AUTOMAKE): Don't use -Wno-error.
-       * tests/suffix5.test ($AUTOMAKE): Likewise.
-
-2001-11-07  Akim Demaille  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't escape quotes in
-       AC_MSG_ERROR.
-       Reported by Jim Meyering.
-
-2001-11-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (am__remove_distdir): Define in topdir only.
-
-2001-11-05  Paul Eggert  <address@hidden>
-
-       * lib/am/distdir.am (am__remove_distdir):
-       New macro.  Do not change permission of non-directories.
-       Change only user permission, as there's no point to changing group
-       or other permission.
-       (distdir, dist, dist-bzip2, dist-tarZ, dist-shar, dist-zip, dist-all,
-        distcheck): Use it.
-
-2001-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/python.am: Cleanup the cleaning section.
-       * automake.texi (Python): Remove documentation for PYCFILES
-       and PYOFILES.  Update the first paragraphes.
-
-2001-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (FOREIGN, GNU, GNITS, AC_CANONICAL_HOST,
-       AC_CANONICAL_SYSTEM, MOSTLY_CLEAN, DIST_CLEAN): Define as constants.
-       Adjust usage everywhere.
-
-2001-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (libtool_files, libtool_sometimes, common_files,
-       common_sometimes, config_aux_path): Use qw to simplify definition.
-       (scan_texinfo_file) <clean_suffixes, predefined_index,
-       hidden_index>: Likewise.
-       (scan_autoconf_traces) <traced>: Likewise.
-       (scan_one_autoconf_file, check_gnu_standards, resolve_linker):
-       Likewise.
-
-2001-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Pass $nonansi_obj to
-       derive_suffix.  Don't use an hardcoded 'o' for object extensions.
-       (derive_suffix): Accept $OBJ as a second argument, don't
-       hardcode 'o'.
-       * tests/suffix5.test: New test.
-       * tests/Makefile.am (TESTS): Add suffix5.test.
-       Reported by Arkadiusz Miskiewicz <address@hidden>.
-
-2001-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Don't call
-       $lang->target_hook for undefinied langages.
-       * tests/suffix4.test: New test.
-       * tests/Makefile.am (TESTS): Add suffix4.test.
-       Reported by Dmitry Mikhin <address@hidden>.
-
-2001-11-05  Akim Demaille  <address@hidden>
-
-       * automake.in (@common_sometimes, &handle_configure): No longer
-       use stamp-hin.
-       * lib/am/remake-hdr.am: Adjust.
-       * tests/confh.test: There is no stamp.hin.
-
-2001-11-01  Akim Demaille  <address@hidden>
-
-       * lib/am/lex.am, lib/am/yacc.am: Use the output file name in
-       `#line' and multiple inclusion guards.
-       * lib/ylwrap: Remove debugging code.
-       (input_dir, input_rx): Move where used.
-       Use the output file name in `#line'.
-
-2001-10-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (transform): Update documentation.
-
-2001-10-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/gcj.m4 (AM_PROG_GCJ): Define GCJFLAGS if unset.
-       Reported by Olivier Louchart-Fletcher <address@hidden>.
-
-2001-10-30  Akim Demaille  <address@hidden>
-
-       * automake.in (&create): Reinstall.
-
-2001-10-30  Akim Demaille  <address@hidden>
-
-       * automake.in (&append_exeext): Use macro_delete.
-
-2001-10-30  Akim Demaille  <address@hidden>
-
-       * automake.in ($verbose): Remove, inherited from
-       Automake::General.
-       (&variable_delete): Rename as...
-       (&macro_delete): this, for consistency.
-       (&variable_assert): New.
-       (&variable_value_as_list, &variable_value_as_list_recursive_worker):
-       Use it.
-
-2001-10-29  Akim Demaille  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Use AC_RUN_LOG to avoid
-       cluttering configure's stdout.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in: Various formatting changes.
-       (create): Remove, unused.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (&append_exeext): New.
-       (&am_primary_prefixes): Use it.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (am_primary_prefixes): Now, in accordance with its
-       comment, return the list of prefixes actually used, not all the
-       possible prefixes for a primary.
-       (&handle_libraries, &handle_ltlibraries, &handle_java)
-       (&am_install_var): Adjust.
-       * Makefile.am (maintainer-check): Allow `local $_;'.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in: Various formatting changes.
-       (&variable_defined): Second argument is optional.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_primary_prefixes): Now returns a list, not a
-       hash.
-       (&handle_libraries, &handle_ltlibraries, &handle_java)
-       (&am_install_var): Adjust.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (@libtoolize_files, @libtoolize_sometimes): Rename
-       as...
-       (@libtool_files, @libtool_sometimes): these.
-       ($libtool_location): Remove, completely replaced by $seen_libtool.
-       (&require_file_internal): Do not run libtoolize, that's
-       autoreconf's job.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
-       * tests/acouttbs.test, tests/auxdir.test, tests/colon.test,
-       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
-       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
-       * tests/conf2.test, tests/config.test, tests/depcomp.test,
-       * tests/depcomp2.test, tests/discover.test, tests/fpinst2.test,
-       * tests/fpinstall.test, tests/ldadd.test, tests/libobj7.test,
-       * tests/libobj8.test, tests/output.test, tests/output2.test,
-       * tests/output3.test, tests/output4.test, tests/output5.test,
-       * tests/pr2.test, tests/remake.test, tests/remake2.test,
-       * tests/remake3.test, tests/scripts.test, tests/stamph.test,
-       * tests/subdir.test, tests/subdir2.test, tests/subdir4.test,
-       * tests/tagsub.test, tests/texinfo8.test: Remove PACKAGE and VERSION
-       assignments.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_autoconf_traces): Use eq for equality.
-       Anchor regexps.
-       Remove dead comment.
-       (&initialize_per_input): Don't initialize several times the same
-       vars.
-
-2001-10-28  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): When using %generalize, be
-       sure to replace only words.  AC_FUNC_OBSTACK was matching
-       M4_AC_FUNC_OBSTACK.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * tests/stamph2.test: Strengthen.
-       * tests/confh2.test, tests/confh3.test: Remove.
-       These are bad tests: they don't check the effects, but some
-       internal details in Makefile.
-       And they are covered by stamph2.test.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       Now that stamp-h's are created by config.status, we don't need to
-       handle them in Makefile's.
-
-       * lib/am/remake-hdr.am (%STAMP%): Just run config.status.
-       * m4/header.m4 (_AM_STAMP): New.
-       (_AM_CONFIG_HEADER): Use it.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&generate_makefile, &handle_texinfo_helper)
-       (&handle_man_pages, &handle_dist, &handle_configure, &handle_all)
-       (&define_pretty_variable, &read_am_file, &file_contents_internal)
-       (&am_install_var, &push_dist_common, &unquote_m4_arg): Simplify
-       `join (' ', @list)' into `"@list"'.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * automake.in (@config_fullnames, @config_names): Remove.
-       (@config_headers): Now contains the actual spec used in
-       AC_CONFIG_HEADERS.
-       (&split_config_file_spec): New.
-       (&handle_tags, &handle_configure, &handle_all, &scan_autoconf_traces)
-       (&scan_one_autoconf_file): Adjust.
-       (&scan_one_autoconf_file): Pff, don't think _AM_CONFIG_HEADER is
-       AM_CONFIG_HEADER.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * m4/header.m4 (_AM_CONFIG_HEADER): New.
-       (AM_CONFIG_HEADER): Use it.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_configure): Use the config.status 2.50
-       invocation syntax for config files and headers.
-       autoheader needs the name of the file to create, not from what it
-       must be created, hence CONFIG_HEADER_FULL is $one_name, not
-       $one_fullname.
-       * lib/am/configure.am, lib/am/remake-hdr.am: Likewise.
-       * tests/confsub.test (SUBDIRS): Adjust to the new config.status
-       invocation.
-       Strengthen: Use the non-default config.hin source.
-       Strengthen: Make sure config.h is properly updated when config.hin
-       is changed.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_configure): Seeing Automake files in
-       @other_input_files is a programming error, not merely something to
-       ignore.
-       Factor slightly the code.
-
-2001-10-26  Akim Demaille  <address@hidden>
-
-       * automake.in ($canonical_location): New.
-       Use it.
-       (&require_config_file, $line_error): Remove.
-
-2001-10-24  Akim Demaille  <address@hidden>
-
-       * automake.in: Use &verbose.
-       (&generate_makefile, &scan_texinfo_file, &scan_aclocal_m4): Use
-       Automake::XFile.
-
-2001-10-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
-       Have the basename step optional and use %NDIR% instead of %DIR% in
-       filenames in order to support 'nobase_'.
-
-2001-10-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages, handle_single_transform_list,
-       lang_c_rewrite): Use require_conf_file instead of
-       require_config_file to require depcomp or compile from
-       Makefile.am.  (This is a part of my patch of 2001-10-15 which got
-       mistakenly reverted.)
-
-2001-10-24  Akim Demaille  <address@hidden>
-
-       * tests/confh.test: Since 2001-10-20 Kevin Ryde, stamp-h is
-       stamp-h1.
-
-2001-10-24  Akim Demaille  <address@hidden>
-
-       Since the ansi2knr patch from 2001-10-20 Kevin Ryde, `$U' can
-       appear in Makefile.in in the clean rule.
-
-       * tests/cxxansi.test: Adjust.
-
-2001-10-24  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_print_error, &am_file_error, &am_macro_error)
-       (&am_target_error, &am_line_error, &am_conf_error, &am_file_warning):
-       Rename as...
-       (&print_error, &file_error, &macro_error, &target_error, &line_error)
-       (&conf_error, &file_warning): these.
-       (&file_warning): Fix the prototype and argument handling.
-       (&am_line_warning): Remove, unused.
-
-       Also, repair the misapplication of previous patches.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in ($ac_output_location): Replace with...
-       ($ac_config_files_location): this.
-       (&scan_autoconf_traces): We don't need $file and $line, $here is
-       enough.
-       (&scan_one_autoconf_file): Use `$in_ac_output' to store the macro
-       name (AC_OUTPUT or AC_CONFIG_FILES) for error messages.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&require_file_with_macro): Use &require_file.
-       (&read_am_file): Move the definition of $here at its proper place.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in ($libtool_line, $seen_pythondir): Replace with...
-       ($libtool_location, $pythondir_location): these.
-       (&require_conf_file_with_line, &require_conf_file_with_line):
-       Remove, unused.
-       (&require_file): Don't forget $where.
-       (&require_conf_file): Ahem...  Fix the name.
-       (&require_config_file): Invoke &require_conf_file, not yourself.
-       (&am_line_error): Fix the default am_file_error invocation.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in ($seen_lispdir): Replace with...
-       ($am_lispdir_location): this.
-       (&require_conf_file): New.
-       (&require_config_file, &require_conf_file_with_line,
-       (&require_conf_file_with_conf_line): Use it.
-       (&require_conf_file_with_macro): New.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in ($config_header_line, $ac_output_line)
-       ($ac_gettext_line, $package_version_line): Replace with...
-       ($config_header_location, $ac_output_location)
-       ($ac_gettext_location, $package_version_location): these.
-       (&require_file_with_conf_line, &require_file_with_line): Remove,
-       no longer used.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&require_file_internal): Instead of $file and $line,
-       take $where as first argument.
-       Adjust all callers.
-       (&require_file_with_macro): New.
-       Use it where internal black magic was used to recover the location
-       of a macro definition.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file): Define and use `$here'.
-       Avoid using am_line_error.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_target_error): New.
-       Use it where appropriate instead of...
-       (&am_line_error): this.
-       Using it for a target is a croak error.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_macro_error): New.
-       Use it where appropriate instead of...
-       (&am_line_error): this.
-       Using it for a macro is a croak error.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * tests/asm.test: s/AC_PROG_AS/AM_PROG_AS/.
-       AC_OUTPUT a Makefile.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (%var_line): Rename as...
-       (%var_location): this.
-       Use it consistently as the location where the macro is defined,
-       file and line when possible, otherwise just file.
-       (&read_am_file): Rules have their own location tracking, don't
-       pollute %var_location.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (am_line_error): Clarify.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_print_error): Set $exit_status since all your
-       users do.
-       (&am_error, &am_file_error, &am_line_error, &am_conf_error):
-       Don't.
-       (&am_conf_line_error, &am_conf_line_warning): Remove.
-       Adjust callers to use &am_file_error and...
-       (&am_file_warning): new.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * m4/regex.m4: Use AC_LIBOBJ.
-       Require 2.50, and use AC_LIBSOURCES freely.
-       * tests/asm.tests: Formatting changes.
-       Exercise AM_PROG_AS.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * tests/install.test: This test is an empty shell, do not run
-       automake.
-       * tests/Makefile.am (TESTS): Don't run it.
-       * tests/defs (ACLOCAL): When using gettext, pass in the installed
-       aclocaldir.
-       * tests/subdircond.test (SUBDIRS): AM_GNU_GETTEXT needs automake
-       --add--missing.
-       * tests/obsolete2.test: Remove, merged into...
-       * tests/obsolete.test: here.
-       Both aclocal and automake should complain.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Don't recognize AC_SUBSTs
-       for symbols which cannot be Make macro names.
-       (scan_one_autoconf_file): `$here' is new.
-       Use it consistently instead of `1' to remember a token was seen.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * tests/subdircond.test: Requires gettext.
-       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
-       * tests/libobj6.test, tests/libobj9.test, tests/libtool.test,
-       * tests/libtool2.test, tests/ltdeps.test, tests/ltlibobjs.test,
-       * tests/nolink.test, tests/obsolete.test, tests/pr72.test,
-       * tests/sinclude.test, tests/subdircond.test, tests/subobj4.test:
-       Produce valid configure.in, use aclocal appropriately, declare
-       when libtool is required.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * m4/lex.m4: Don't run AC_DECL_YYTEXT, Autoconf does.
-       * automake.texi (Macros, Yacc and Lex): Adjust.
-       * automake.in ($seen_decl_yytext): Rename as...
-       ($seen_prog_lex): this.
-       (&scan_autoconf_traces): Add AC_PROG_LEX support.
-       (&scan_one_autoconf_file, &lang_lex_finish): Adjust.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_autoconf_traces): Add support for
-       AM_PATH_LISPDIR and AM_PATH_PYTHON.
-
-2001-10-21  Akim Demaille  <address@hidden>
-
-       * tests/defs (ACLOCAL): Point to the installed aclocaldir if
-       libtool is required.
-       * tests/lex.test: Run AC_INIT once.
-       * tests/ldflags.test, tests/listval.test, tests/suffix2.test:
-       Libtool is required.
-       * tests/header.test: Build a correct configure.in.
-       * tests/defun2.test (configure.in): Be a bit respectful with
-       Autoconf, close the macro invocations.
-       * tests/confdeps.test: Even when not using aclocal, aclocal.m4
-       must be correct.
-
-       * automake.in (scan_autoconf_traces): Add support for
-       AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, A[CM]_PROG_LIBTOOL,
-       AM_CONFIG_HEADER, AM_MAINTAINER_MODE.
-       * tests/condincl.test (target): Better pattern, to avoid matching
-       the definition of `target_alias' which is now properly discovered
-       as an AC_SUBST by traces.
-       * cond4.test: Better grep pattern: After all, why shouldn't
-       TWO_FALSE be AC_SUBST properly.
-       * tests/installsh.test (AUTOMAKE, ACLOCAL): Adjust.
-
-2001-10-20  Kevin Ryde <address@hidden>
-
-       * lib/am/ansi2knr.am (mostlyclean-kr): Only rm *_.c when
-       actually using ansi2knr.
-
-       * automake.in (handle_configure): Always put a number on $stamp_name,
-       to match AM_CONFIG_HEADER.
-
-2001-10-20  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added condd.test.
-       (XFAIL_TESTS): Added condd.test.
-       * tests/condd.test: New file.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_autoconf_traces): Add support for
-       AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and
-       AC_CONFIG_AUX_DIR.
-       * tests/alpha.test (configure.in): Automake wants a Makefile.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Use an unlikely to be used
-       separator between trace arguments, in particular not `:' as it is
-       within AC_CONFIG_FILES's $1.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * tests/alpha.test (configure.in): Create, don't append.  A single
-       AC_INIT is enough.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
-       * tests/acoutqnl.test, tests/acouttbs.test, tests/all.test,
-       * tests/alpha.test, tests/ansi.test, tests/asm.test,
-       * tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test,
-       * tests/badline.test, tests/block.test, tests/canon2.test,
-       * tests/check.test, tests/checkall.test, tests/clean.test,
-       * tests/colneq.test, tests/colneq2.test, tests/colon.test,
-       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
-       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
-       * tests/comment.test, tests/comment3.test, tests/cond.test,
-       * tests/cond2.test, tests/cond6.test, tests/cond7.test,
-       * tests/condincl.test, tests/condincl2.test, tests/condman.test,
-       * tests/condman2.test, tests/confdist.test, tests/confh.test,
-       * tests/confh2.test, tests/confh3.test, tests/confvar.test,
-       * tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
-       * tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test,
-       * tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test,
-       * tests/else.test, tests/empty.test, tests/exdir.test,
-       * tests/exdir2.test, tests/extra3.test, tests/extra4.test,
-       * tests/flibs.test, tests/fnoc.test, tests/fo.test,
-       * tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
-       * tests/fpinstall.test, tests/gcj2.test, tests/gnits.test,
-       * tests/include.test, tests/info.test, tests/insh.test,
-       * tests/insh2.test, tests/install.test, tests/installsh.test,
-       * tests/instdata.test, tests/instdata2.test, tests/instexec.test,
-       * tests/insthook.test, tests/instman.test, tests/instman2.test,
-       * tests/java.test, tests/javaprim.test, tests/javasubst.test,
-       * tests/libobj3.test, tests/link_f_only.test, tests/lisp.test,
-       * tests/man.test, tests/mclean.test, tests/mdate.test,
-       * tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
-       * tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test,
-       * tests/noinst.test, tests/obsolete.test, tests/obsolete2.test,
-       * tests/outdir.test, tests/output.test, tests/output2.test,
-       * tests/output3.test, tests/output4.test, tests/output5.test,
-       * tests/package.test, tests/pluseq.test, tests/pluseq2.test,
-       * tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test,
-       * tests/pluseq8.test, tests/ppf77.test, tests/pr2.test,
-       * tests/primary.test, tests/proginst.test, tests/python.test,
-       * tests/remake.test, tests/remake2.test, tests/remake3.test,
-       * tests/rulepat.test, tests/scripts.test, tests/seenc.test,
-       * tests/sinclude.test, tests/spell.test, tests/spell3.test,
-       * tests/spelling.test, tests/stamph.test, tests/subdir.test,
-       * tests/subdir2.test, tests/subdircond.test, tests/subst.test,
-       * tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
-       * tests/syntax.test, tests/tags.test, tests/tagsub.test,
-       * tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test,
-       * tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test,
-       * tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test,
-       * tests/texinfo9.test, tests/vars.test, tests/vartar.test,
-       * tests/version.test, tests/version2.test, tests/version3.test,
-       * tests/version4.test, tests/vpath.test, tests/vtexi.test,
-       * tests/vtexi2.test, tests/werror.test: Run aclocal before automake.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
-       * tests/acouttbs.test, tests/asm.test, tests/colon.test,
-       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
-       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
-       * tests/conf2.test, tests/confh.test, tests/confh2.test,
-       * tests/confh3.test, tests/confh4.test, tests/config.test,
-       * tests/confsub.test, tests/depend3.test, tests/discover.test,
-       * tests/fpinst2.test, tests/fpinstall.test, tests/gnits.test,
-       * tests/header.test, tests/ldadd.test, tests/ldflags.test,
-       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
-       * tests/libobj6.test, tests/libobj7.test, tests/libobj8.test,
-       * tests/libobj9.test, tests/mdate4.test, tests/obsolete.test,
-       * tests/output.test, tests/output2.test, tests/output3.test,
-       * tests/output4.test, tests/output5.test, tests/package.test,
-       * tests/parse.test, tests/pr2.test, tests/remake.test,
-       * tests/remake2.test, tests/remake3.test, tests/scripts.test,
-       * tests/stamph.test, tests/subdir.test, tests/subdir2.test,
-       * tests/subdir4.test, tests/subdirbuiltsources.test,
-       * tests/subobj4.test, tests/tagsub.test, tests/texinfo8.test,
-       * tests/yacc5.test, tests/yacc6.test, tests/yacc7.test: Remove
-       AC_ARG_PROGRAM, AC_PROG_INSTALL and AC_PROG_MAKE_SET invocation
-       since AM_INIT_AUTOMAKE requires them.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * tests/defs (configure.in): Use credible AM_INIT_AUTOMAKE
-       arguments.
-       Don't run AC_ARG_PROGRAM another time, it is required by
-       AM_INIT_AUTOMAKE.
-       * tests/aclocal.test: Work on the default configure.in
-       * tests/config.test (configure.in): Don't AC_ARG_PROGRAM.
-       First AM_INIT_AUTOMAKE, then AM_CONFIG_HEADER.
-
-       Be realistic in testing: AC_INIT is required for Autoconf.
-       Broken so called optimized tests break trace handling.
-
-       * tests/aclibobj.test, tests/aclocal.test, tests/acoutnoq.test,
-       * tests/acoutput.test, tests/acoutput2.test, tests/acoutqnl.test,
-       * tests/acouttbs.test, tests/acsilent.test, tests/alpha.test,
-       * tests/colon.test, tests/colon2.test, tests/colon3.test,
-       * tests/colon4.test, tests/colon5.test, tests/colon6.test,
-       * tests/colon7.test, tests/cond.test, tests/cond2.test,
-       * tests/cond3.test, tests/cond5.test, tests/conf2.test,
-       * tests/confh.test, tests/confh2.test, tests/confh3.test,
-       * tests/confh4.test, tests/config.test, tests/confsub.test,
-       * tests/ctarget1.test, tests/depcomp.test, tests/depend3.test,
-       * tests/distcommon.test, tests/dup3.test, tests/fpinst2.test,
-       * tests/fpinstall.test, tests/header.test, tests/ldflags.test,
-       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
-       * tests/libobj6.test, tests/libobj7.test, tests/libobj8.test,
-       * tests/libobj9.test, tests/output.test, tests/output2.test,
-       * tests/output3.test, tests/output4.test, tests/parse.test,
-       * tests/pr2.test, tests/recurs.test, tests/recurs2.test,
-       * tests/remake.test, tests/remake2.test, tests/remake3.test,
-       * tests/req.test, tests/scripts.test, tests/subdir.test,
-       * tests/subdir2.test, tests/subdir4.test, tests/subobj4.test,
-       * tests/tagsub.test, tests/texinfo8.test, tests/version.test,
-       * tests/version2.test: Add AC_INIT in `configure.in'.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_autoconf_traces): Add support for
-       AM_INIT_AUTOMAKE, AM_CONDITIONAL.
-       Let @args have a more natural M4 correspondence: $1 is args[1], no
-       args[0] etc.
-       (&scan_autoconf_files): Using autoconf traces is no longer a
-       complement of the previous ad hoc scheme: use either.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_one_autoconf_file): `%generalize' is new, and
-       factors dedicated $libsources assignments.
-
-2001-10-20  Akim Demaille  <address@hidden>
-
-       * m4/error.m4, m4/obstack.m4, m4/ptrdiff.m4, m4/strtod.m4:
-       Remove, since Autoconf 2.52 has them.
-       * automake.in, aclocal.in, automake.texi: Adjust.
-
-2001-10-19  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_main_am_file): s/generated automatically/
-       generated/.
-       Insert @configure_input@, since 2.50 no longer output this
-       automatically for Makefiles.
-
-2001-10-19  Kevin Ryde <address@hidden>
-
-       * lib/am/check.am (check-TESTS): Add an "else true" to work with
-       Ultrix 4.5 /bin/sh when $(TESTS) is empty.
-
-2001-10-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add nobase.test.
-       * tests/nobase.test: New file.  Based on a bug report
-       from Martin Frydl <address@hidden>.
-
-2001-10-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (am_install_var): Don't strip nobase_ from $X, do
-       this with $nodir_name only.  Use $nodir_name where appropriate.
-
-2001-10-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages, handle_single_transform_list,
-       lang_c_rewrite): Use require_conf_file instead of
-       require_config_file to require depcomp or compile from Makefile.am.
-       (require_aux_file_with_line): New function, adapted from
-       require_conf_gile_with_line.
-       (require_conf_file_with_line, require_conf_file_with_conf_line):
-       Simplify using require_aux_file_with_line.
-       (require_config_file): Simplify using require_conf_file_with_conf_line.
-       (require_conf_file): New function.
-
-2001-10-15  Akim Demaille  <address@hidden>
-
-       * m4/depend.m4 (AM_DEP_TRACK): Use AC_SUBST([AMDEPBACKSLASH])
-       normally, what is wrong is that automake outputs a variable
-       definition for it, hence...
-       * automake.in (scan_one_autoconf_file): don't.
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): New, extracted
-       from...
-       (AM_OUTPUT_DEPENDENCY_COMMANDS): here.  Adjust.
-       Use AC_CONFIG_COMMANDS.
-       (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use AS_DIRNAME and AS_MKDIR_P.
-
-2001-10-15  Akim Demaille  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): Don't use m4_patsubst.
-
-2001-10-15  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_conditions): Be deterministic and Perl
-       version independent: sort the result.
-       (&variable_output, &variable_pretty_output): Sort all the @conds,
-       not only when defaulted.
-       * tests/cond3.test: Adjust.
-
-2001-10-15  Akim Demaille  <address@hidden>
-
-       * automake.in: Formatting changes.
-
-2001-10-15  Akim Demaille  <address@hidden>
-
-       * aclocal.in: Use Automake::General and Automake::XFile.
-       Use find_configure_ac.
-       Output the Emacs tags for Autoconf mode selection.
-
-2001-10-10  Akim Demaille  <address@hidden>
-
-       * lib/COPYING, COPYING, lib/config.guess, lib/config.sub: Update
-       from master copies.
-
-2001-10-09  Akim Demaille  <address@hidden>
-
-       Do not use Autoconf internals.
-
-       * tests/dirname.test: Don't use AC_PLAIN_SCRIPT.
-       * m4/header.m4 (_AM_DIRNAME): Use regexp and patsubst, not
-       m4_regexp and m4_patsubst, since the latter are reserved for ERE
-       macro in GNU M4 1.5.
-
-2001-10-08  Akim Demaille  <address@hidden>
-
-       * m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf
-       changed its name.
-
-2001-10-05  Akim Demaille  <address@hidden>
-
-       * automake.in (scan_autoconf_files): Use find_configure_ac from
-       General.
-
-2001-10-02  Akim Demaille  <address@hidden>
-
-       * lib/Automake/Struct.pm: Update from Autoconf.
-       * lib/Automake/General.pm, lib/Automake/XFile.pm: New, from CVS
-       Autoconf.
-       * automake.in: Use them.
-       (&uniq, $me): Remove, as they are provided by Automake::General.
-
-2001-10-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Don't check for 'cd' calls in m4.
-       * lib/am/tags.am (GTAGS): Use $(am__cd) instead of 'CDPATH=: && cd'.
-       * lib/am/dejagnu.am (check-DEJAGNU): Likewise.
-       * lib/am/distdir.am (distcheck): Likewise.
-       * lib/am/texinfos.am (install-info-am, dist-info): Rewrite without
-       using cd so we don't have to fiddle with CDPATH.
-       * lib/am/header-vars.am (am__cd): Define so as to support Zsh and
-       DOSish path separator.
-
-2001-10-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/python.am (install-%DIR%PYTHON,
-       uninstall-%DIR%PYTHON): Strip path of source file.
-       (clean-python): Comment out.
-
-2001-10-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_python): Use require_conf_file_with_conf_line
-       instead of require_file_with_conf_line, so that elisp-comp and
-       py-compile are installed in the aux-directory.
-       (handle_emacs_lisp): Likewise.  Define elisp_comp.
-       * lib/am/lisp.am (.el.elc): Use elisp_comp.
-
-2001-10-01  Akim Demaille  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Report the trailing files.
-       Run `dist-gzip', not `dist', as it may leave other distribution
-       flavors.
-
-2001-09-29  Paul Eggert  <address@hidden>
-
-       * lib/mkinstalldirs: Use "mkdir -p" if it works, as that fixes
-       bugs when making file names with unusual characters.  Quote chmod
-       arg "$dirmode", in case it contains white space.
-
-       Incorporate the following change from autoconf mkinstalldirs:
-
-       1999-04-10  Ben Elliston  <address@hidden>
-
-       Add `-m' flag to specify the mode of a newly created
-       directory.  Add command line usage and `-h', `--help' options.
-       Contributed by Jeff Garzik.
-
-2001-09-27  Akim Demaille  <address@hidden>
-
-       * m4/cond.m4, m4/init.m4, m4/header.m4: Remove Autoconf 2.13 code.
-
-2001-09-27  Akim Demaille  <address@hidden>
-
-       * lib/am/distdir.am (dist): Rename as...
-       (dist-gzip): this.
-       (dist): Additional name for dist-all.
-       * automake.texi (Options, Dist): Adjust.
-
-2001-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (obsolete_macros): Update AM_EXEEXT message.
-       * automake.in (obsolete_macros): Likewise.
-       (seen_objext): Remove (unused).
-       (scan_one_autoconf_file): Don't handle AC_OBJEXT.
-       * lib/am/header-vars.am (EXEEXT, OBJEXT,
-       PATH_SEPARATOR): New variables.
-       * tests/obsolete2.test: Use AM_FUNC_FNMATCH instead of AM_EXEEXT.
-
-2001-09-23  Tim Van Holder  <address@hidden>
-
-       * m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
-       neutralize CDPATH for us.
-       * m4/init.m4: Don't substitute EXEEXT or OBJEXT anymore.
-       * lib/am/texibuild.am: Use $(PATH_SEPARATOR), not ':' to build
-       TEXINPUTS.
-
-2001-09-22  Akim Demaille  <address@hidden>
-
-       * configure.in, NEWS: Bump to 1.5a.
-       Require 2.52.
-
-2001-09-22   Paul Eggert  <address@hidden>
-
-       * ChangeLog, ChangeLog.1996, ChangeLog.1998, ChangeLog.2000,
-       Makefile.am, NEWS, README, TODO, configure.in, lib/Makefile.am,
-       lib/acinstall, lib/am/Makefile.am, m4/Makefile.am, m4/as.m4,
-       m4/auxdir.m4, m4/ccstdc.m4, m4/cond.m4, m4/depend.m4,
-       m4/depout.m4, m4/dmalloc.m4, m4/error.m4, m4/gcj.m4, m4/header.m4,
-       m4/init.m4, m4/install-sh.m4, m4/lex.m4, m4/lispdir.m4,
-       m4/maintainer.m4, m4/make.m4, m4/minuso.m4, m4/missing.m4,
-       m4/multi.m4, m4/obstack.m4, m4/protos.m4, m4/ptrdiff.m4,
-       m4/python.m4, m4/regex.m4, m4/sanity.m4, m4/strip.m4,
-       m4/termios.m4, m4/winsz.m4: Add copyright notice.
-
-       * INSTALL, lib/INSTALL: Upgrade to latest autoconf version,
-       which has a copyright notice.
-
-       * m4/strtod.m4: Correct the dates on the copyright notice.
-
-2001-09-17  Akim Demaille  <address@hidden>
-
-       * lib/missing (autom4te): New.
-       (aclocal, autoconf, automake, autoheader, help2man): Propagate
-       actual failures.
-
-2001-08-27  Tom Tromey  <address@hidden>
-
-       * automake.texi (A Shared Library): Clarify installation
-       requirement.
-       (Install): Typo.  From Adrian Bunk.
-
-2001-08-27  Tom Tromey  <address@hidden>
-
-       * automake.texi (Macros): Typo fix.
-       From Christian Cornelssen
-
-2001-08-27  Tom Tromey  <address@hidden>
-
-       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
-       tests/cond4.test, tests/cond16.test, tests/cond18.test,
-       tests/cond19.test, tests/depcomp2.test, tests/depend2.test,
-       tests/lex3.test, tests/pr87.test, tests/subobj3.test,
-       tests/substref.test: Clear CFLAGS.
-
-       * automake.texi (Yacc and Lex): Mention lex, not yacc.
-       From Alexey Mahotkin.
-
-2001-08-27  Tom Tromey  <address@hidden>
-
-       * tests/yacc7.test: Use test -f, not test -e.
-
-2001-08-27  Adrian Bunk  <address@hidden>
-
-       * automake.texi (etags): Typo fix.
-
-2001-08-27  Guido Draheim <address@hidden>
-
-       * automake.in : restrict ansi2knr option to be a filepath
-
-2001-08-23  Richard Boulton <address@hidden>
-
-       * tests/yacc7.test: Actually add this file: was accidentally omitted.
-
-2001-08-22  Tom Tromey  <address@hidden>
-
-       * automake.texi (Conditionals): Mention that conditionals must
-       always be invoked.  For PR automake/220.
-
-2001-08-22  Richard Boulton <address@hidden>
-           Tom Tromey  <address@hidden>
-
-       * automake.in (lang_yacc_target_hook): Make header file depend on
-       .c file, not .y file.
-       * lib/am/yacc.am: Non-generic rule changed to depend on %OBJ% (the
-       .c file) rather than %SOURCE% (the .y file)  Removed `.y.h' rule.
-       * tests/yacc7.test: New file.
-       * tests/Makefile.am (TESTS): Added yacc7.test.
-
-2001-08-22  Tim Van Holder  <address@hidden>
-
-       * m4/missing.m4: Require AM_AUX_DIR_EXPAND and use $am_aux_dir.
-
-2001-08-18  Tom Tromey  <address@hidden>
-
-       * automake.texi (Dist): Mention dist-all.
-
-2001-08-18  Tom Tromey  <address@hidden>
-
-       * tests/cond3.test: Use portable sed expression.
-       From Richard Boulton.
-
-2001-08-13  Richard Boulton <address@hidden>
-
-       * automake.in (handle_source_transform): Call
-       define_objects_from_sources() instead of calling
-       variable_value_as_list(), handle_single_transform_list() and
-       define_pretty_variable() directly.
-       (handle_single_transform_list): Add $topparent parameter, used for
-       error messages.  Improved error message.
-       (define_objects_from_sources): New function.
-       (subobjname): New function.
-       (variable_conditions_recursive): New name for variable conditions.
-       (variable_value_as_list_recursive): New name for variable_value_as_list.
-       (variable_value_as_list_worker): Renamed to ...
-       (variable_value_as_list_recursive_worker): ... this.
-       (variable_conditions_sub): Renamed to ...
-       (variable_conditions_recursive_sub): ... this.
-       (variable_conditions): Rewritten: now doesn't recurse subvariables.
-       (variable_value_as_list): Rewritten: now doesn't recurse subvariables.
-       (substfroms): New global.
-       (substtos): New global.
-       (substnums): New global.
-       * tests/cond3.test: Update to work with new method of defining _OBJECTS.
-       * tests/cond4.test: Update to work with new method of defining _OBJECTS.
-       * tests/sourcesub2.test: New test.
-       * tests/Makefile.am (TEST): Added sourcesub2.test.
-
-2001-08-11  Tom Tromey  <address@hidden>
-
-       * configure.in: Upped to 1.4s.
-
-2001-08-09  Richard Boulton <address@hidden>
-
-       * automake.in (handle_single_transform_list): Use new global,
-       `%linkers_used', to store the linkers used, rather than an internal
-       variable.  Enables correct linker to be calculated across a group
-       of calls to &handle_single_transform_list.  Return only list of
-       objects, since linker to be used is now externally determined.
-       (handle_source_transform): adapted for new calling conventions of
-       handle_single_transform_list.  Calls resolve_linker() on a set of
-       all the linkers used for any prefix, rather than for each prefix in
-       turn.
-       (linkers_used): New global.
-       * tests/link_dist.test: New test.
-       * tests/Makefile.am (TESTS): Added link_dist.test.
-
-2001-08-08  Raja R Harinath  <address@hidden>
-
-       Dissociate testsuite 'make' invocations from outer 'make'.
-       * tests/defs: Unset the MFLAGS, MAKEFLAGS and MAKELEVEL
-       environment variables.
-       * tests/cond16.test: Use '$MAKE -s', and avoid GNU make
-       dependency.
-       * tests/substref.test: Likewise.
-
-2001-08-08  Richard Boulton <address@hidden>
-
-       * tests/cond18.test: New file.
-       * tests/cond19.test: New file.
-       * tests/cond20.test: New file.
-       * tests/cond4.test: Updated to check the generated _OBJECTS more
-       thoroughly.
-       * tests/Makefile.am (TESTS): Added cond18.test, cond19.test and
-       cond20.test
-
-2001-08-08  Richard Boulton <address@hidden>
-
-       * automake.in (file_contents_internal): if a rule is conditionally
-       defined, define the standard automake definition for it for those
-       conditions which are not conditionally defined.
-       (invert_conditions): New function: invert a list of conditionals.
-
-       * tests/cond14.test: New file.
-       * tests/cond15.test: New file.
-       * tests/Makefile.am (TESTS): Added cond14.test and cond15.test.
-
-2001-08-05  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added dejagnu2.test.
-       * tests/dejagnu2.test: New file.
-       * lib/am/dejagnu.am (site.exp): Don't conditionalize.
-       * automake.in (handle_scripts): Removed dead code.
-       (handle_tests_dejagnu): Don't handle site.exp generation
-       specially.
-
-2001-08-04  Richard Boulton <address@hidden>
-
-       * tests/cond17.test: New file: test for being able to define an
-       object to be generated in different ways according to a
-       conditional.
-       * tests/Makefile.am (XFAIL_TESTS): Add cond17.test.
-       (TESTS): Added cond17.test.
-
-2001-08-02  Richard Boulton <address@hidden>
-
-       * automake.in (variable_conditions_sub): Handle variable
-       substitution refs when computing conditions based on subvariable
-       conditions.  Fixes substitution refs of system variables when sub
-       variable is conditional.
-       (SUBST_REF_PATTERN): New global.
-       * tests/cond16.test: New file: regression test for variable
-       substitution refs.
-       * test/Makefile.am (TESTS): Added cond16.test.
-
-2001-08-03  Tom Tromey  <address@hidden>
-
-       * tests/substref.test: Require GNU make; backed out previous
-       change.
-
-       * tests/substref.test: Handle entering/leaving directory
-       messages.
-
-2001-08-03  Richard Boulton <address@hidden>
-
-       * automake.in (value_to_list): Check for whether $from is defined,
-       rather than whether it is true, so that empty $froms are allowed in
-       substitution reference patterns.
-
-       * tests/substref.test: New file: test behavior of substitution
-       references when the $from side of the substitution is empty.
-       * tests/Makefile.am (TESTS): Added substref.test.
-
-2001-08-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/install-sh.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Add install-sh.m4.
-       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Move ...
-       * m4/install-sh.m4 (AM_PROG_INSTALL_SH): ... here.  Don't check
-       for install.sh any longer, always use install-sh, don't even
-       fall back to missing.  Use $am_aux_dir, making $install_sh absolute.
-       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Simplify, since $install_sh
-       is absolute.
-       * m4/init.m4: Adjust call to AM_PROG_INSTALL_SH.
-
-2001-08-02  Tim Van Holder  <address@hidden>
-
-       * automake.texi (EXEEXT): Clarify.
-
-2001-08-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Typo.
-
-       * m4/auxdir.m4: More comments.
-
-2001-07-31  Richard Boulton <address@hidden>
-            Raja R Harinath <address@hidden>
-
-       * automake.in (variable_conditions_sub): Remove @parent_conds
-       argument.  This was old logic - duplicate or impossible
-       conditionals are removed later by &variable_conditions_reduce().
-       Fixes tests/cond13.test.
-       (conditionals_true_when): Removed.
-       * tests/Makefile.am (XFAIL_TESTS): Removed cond13.test.
-
-2001-07-31  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added cond13.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/cond13.test: New file.
-
-       * configure.in: Upped to version 1.4k.
-
-       * configure.in: Released 1.4j.
-
-       * lib/config.guess: Updated from master sources.
-       * lib/config.sub: Likewise.
-
-2001-07-30  Tom Tromey  <address@hidden>
-
-       * automake.texi (A Program): Typo.  Added subsections and more
-       text about conditional compilation.
-       (A Shared Library): Moved earlier.
-       (Program variables): Updated LINK text.  Added AM_CFLAGS.
-       (C++ Support): Added AM_CXXFLAGS.
-       (Fortran 77 Support): Added AM_FFLAGS and AM_RFLAGS.
-       (EXEEXT): New node.
-
-       * tests/Makefile.am (TESTS): Added aclibobj.test.
-       * tests/aclibobj.test: New file.
-       * automake.in (handle_lib_objects_cond): Avoid undefined variable
-       error.
-       (scan_one_autoconf_file): Handle AC_LIBSOURCE and AC_LIBSOURCES.
-
-       * automake.texi (Dist): Mention other distribution types.
-       (Install): Updates.
-
-2001-07-29  Tom Tromey  <address@hidden>
-
-       * automake.texi (Program and Library Variables): Texinfo fix.
-       From Alexey Mahotkin.
-
-2001-07-28  Tom Tromey  <address@hidden>
-
-       * automake.texi (Strictness): Mention Cygnus mode.
-       (Cygnus): Updated.
-       (Uniform): Likewise.
-       (Canonicalization): Likewise.
-       (Install): Add `nobase_' to example; typo fix.
-       (Clean): Typo.
-       (Dist): Expand on putting a directory into EXTRA_DIST.  Insert
-       section markers.
-       (Options): Texinfo fixes; some text updates.
-       (Tags): Update.
-
-2001-07-27  Tom Tromey  <address@hidden>
-
-       * automake.texi (Invoking Automake): Document --Werror and
-       --Wno-error.
-
-2001-07-26  Tom Tromey  <address@hidden>
-
-       * tests/nolink.test: Added no-exeext.
-
-       * automake.in (check_variable_defined_unconditionally): Don't call
-       macro_dump.
-
-       * automake.texi (Optional): Don't mention ALL_LINGUAS.
-       (gettext): Likewise.
-       * automake.in (seen_linguas, all_linguas, all_linguas_line):
-       Removed.
-       (handle_gettext): Don't do any checking of the languages.
-       (scan_one_autoconf_file): Don't look for ALL_LINGUAS.
-
-       * automake.in (am_print_error): New function.
-       (am_error): Use it.
-       (am_file_error): Likewise.
-       (am_line_error): Likewise.
-       (am_conf_error): Likewise.
-       (am_conf_line_error): Likewise.
-
-       * automake.texi (Options): Document no-exeext.
-       * automake.in (handle_options): Recognize no-exeext.
-       (rule_define): Handle no-exeext.
-       * tests/Makefile.am (TESTS): Added new file.
-       * tests/exeext2.test: New file.
-
-       * automake.in (make_input_list): Removed.
-       (scan_autoconf_config_files): Don't add to make_input_list.
-       (scan_one_autoconf_file): Don't use make_input_list.
-       (scan_autoconf_files): Use make_list, not make_input_list.
-       (scan_autoconf_files): Likewise.
-
-       * automake.in (seen_exeext): Removed.
-       (generate_makefile): Don't define EXEEXT or OBJEXT.
-       (scan_one_autoconf_file): Don't check for AC_EXEEXT.
-       (am_install_var): Don't check $seen_exeext.
-       (handle_programs): Likewise.
-       (rule_define): Allow x to override x$(EXEEXT), for now.
-       (file_contents_internal): Only define rule if rule_define allows
-       us to.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Define EXEEXT and OBJEXT.
-
-2001-07-25  Tom Tromey  <address@hidden>
-
-       From Nicolas Joly:
-       * tests/pr9.test: Require GNU make.
-       * tests/dirname.test: Don't use `-u'.
-
-2001-07-22  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added auxdir2.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/auxdir2.test: New file.
-
-       * tests/Makefile.am (XFAIL_TESTS): Removed substtarg.test.
-       * automake.in (TARGET_PATTERN): Add `@' as allowable character.
-
-       * tests/Makefile.am (XFAIL_TESTS): Removed exeext.test.
-       * automake.in (am_install_var): Add $(EXEEXT) even if program name
-       holds `.'.  Don't add $(EXEEXT) if program name already has it.
-       (handle_programs): Don't add $(EXEEXT) if user already did.
-       (make_paragraphs): Don't compute EXEEXT.
-
-       * tests/Makefile.am (TESTS): Added exeext.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/exeext.test: New file.
-
-2001-07-22  Tom Tromey  <address@hidden>
-
-       * lib/am/progs.am (install-%DIR%PROGRAMS): Test for `prog', not
-       `prog.exe' on Cygwin with libtool.  From Robert Collins.
-
-2001-07-21  Tim Van Holder  <address@hidden>
-
-       * tests/dirname.test: Explicitly use $SHELL to run the
-       script; this avoids failures on DJGPP.
-       * tests/install2.test: Skip if 'chmod 000' doesn't make
-       a file unreadable.
-
-2001-07-21  Tom Tromey  <address@hidden>
-
-       * tests/libtool2.test: Check for libtoolize.
-
-       * tests/Makefile.am (TESTS): Added substtarg.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/substtarg.test: New file.
-
-       * automake.in (handle_dist): Handle case where aux dir doesn't
-       have a Makefile.  Fixes depdist.test.
-       * tests/Makefile.am (XFAIL_TESTS): Removed depdist.test.
-       * tests/depdist.test: Look for config/depcomp.
-
-       * tests/Makefile.am (TESTS): Added depdist.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/depdist.test: New file.  From Eric Magnien.
-
-       * tests/ccnoco.test: Removed `configure.2' test; in autoconf 2.50
-       AC_PROG_CC_C_O does require AC_PROG_CC.
-
-       From Erik Lindahl:
-       * lib/depcomp (tru64): Some Tru64 compilers use `foo.d' and not
-       `foo.o.d'.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Check to make sure compilation
-       output is suitable for make.
-
-       * automake.texi (Macros): Document AM_PROG_AS.
-       (Assembly Support): New node.
-       * m4/Makefile.am (m4data_DATA): Added as.m4.
-       * m4/as.m4: New file.
-
-       * automake.texi (Tags): Added uref to global tags.
-
-2001-07-21  Tim Van Holder  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Use $(DEPDIR)
-       instead of hardcoding '.deps'.
-       * m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check.
-
-2001-07-20  Derek Price  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): Create stamp-h files in the correct
-       locations.
-       * tests/dirname.test: New test.
-       * tests/stamph2.test: New test.
-       * tests/Makefile.am: Add new tests.
-       * tests/Makefile.in: Regenerated.
-
-2001-07-19  Tom Tromey  <address@hidden>
-
-       * automake.texi (Tags): Document GTAGS_ARGS.
-       * lib/am/tags.am (GTAGS): Added GTAGS_ARGS.  From Shigio Yamaguchi.
-
-2001-07-19  Tom Tromey  <address@hidden>
-            Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for ccnoco.test, subobj8.test:
-       * m4/Makefile.am (m4data_DATA): Added auxdir.m4.
-       * tests/Makefile.am (XFAIL_TESTS): Removed ccnoco.test,
-       subobj8.test.
-       * m4/minuso.m4 (AM_PROG_CC_C_O): Use absolute path to compile.
-       Use AM_AUX_DIR_EXPAND.
-       * lib/compile: Handle case where `-o' argument is the name of an
-       executable, not an object file.
-       * m4/auxdir.m4: New file, from...
-       * m4/missing.m4: ... here.  Moved AM_AUX_DIR_EXPAND.
-       * automake.in (handle_single_transform_list, lang_c_rewrite):
-       Require compile using `require_config_file'.
-
-2001-07-19  Tom Tromey  <address@hidden>
-
-       * automake.texi (Program and Library Variables): Added X example
-       for _LDADD.
-
-2001-07-19  Tom Tromey  <address@hidden>
-
-       * automake.texi (Distributing): Updated to reflect new license.
-
-2001-07-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (require_build_directory): New function, extracted
-       from ...
-       (handle_single_transform_list): ... here.
-       (require_build_directory_maybe): New function.
-       (handle_prograns, handle_libraries, handle_ltlibraries): Call
-       require_build_directory_maybe() to ensure the subdirectory
-       in which a target may lie will exist when the target is created.
-       (handle_libraries, handle_ltlibraries): Use basename before
-       checking library name.
-       * lib/am/library.am (%LIBRARY%): Depend on %DIRSTAMP%.
-       * lib/am/ltlibrary.am (%LTLIBRARY%): Likewise.
-       * lib/am/program.am (%PROGRAM%): Likewise.
-
-2001-07-18  Tim Van Holder  <address@hidden>
-
-       * m4/missing.m4: Reword comment.
-
-2001-07-18  Pavel Roskin  <address@hidden>
-
-       * automake.texi: Rename AM_DEPENDENCIES to _AM_DEPENDENCIES.
-       * tests/gcj.test: Likewise.
-       * tests/gcj2.test: Likewise.
-       * tests/gcj3.test: Likewise.
-
-2001-07-18  Tom Tromey  <address@hidden>
-
-       * lib/compile: Change how lockdir is computed.  If linking or
-       compiling without `-o', just run the compiler.
-
-       * tests/Makefile.am (TESTS): Added ccnoco.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/ccnoco.test: New file.
-
-2001-07-17  Tom Tromey  <address@hidden>
-
-       * lib/ylwrap: Added special exception.
-       * lib/py-compile: Added license.
-       * lib/mdate-sh: Added special exception.
-       * lib/elisp-comp: Added special exception.
-       * lib/compile: Added special exception.
-       * lib/depcomp: Added special exception.
-
-       Report from Motoyuki Kasahara:
-       * tests/make.test: Use am__include.
-       * tests/exsource.test: Use am__include.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Use am__include and am__quote.
-       * automake.in (handle_languages): Use am__include and am__quote.
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Renamed to _AM_DEPENDENCIES.
-       * m4/init.m4: Updated callers.
-
-2001-06-10  Tim Mooney  <address@hidden>
-
-       * aclocal.in (parse_arguments, write_aclocal): Update Copyrights.
-       * aclocal.in (scan_configure, add_file): Handle the full macro
-       name even if it contains numbers, such as I18N.
-
-2001-07-16  Tom Tromey  <address@hidden>
-
-       * automake.texi (Dependencies): Link to dependency tracking page.
-       (Data): Mention dist_.
-       (Clean): Mention clean heuristics.
-       (Install): Mention nobase_.
-
-       * automake.texi (Program and Library Variables): Document _LINK.
-
-2001-07-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_libraries): Allow libraries to lie in
-       a subdirectory by constraining only the basename to start
-       with 'lib', not the whole path.
-
-2001-07-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/subobj8.test: New file.
-       * tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test.
-
-2001-07-16  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/212:
-       * lib/am/lisp.am (install-%DIR%LISP): Added missing `\'.
-       (uninstall-%DIR%LISP): Likewise.
-
-2001-07-15  Tom Tromey  <address@hidden>
-
-       * automake.in (usage): Rewrote code to handle columnization.
-       From Alexey Mahotkin and Maxim Sinev.
-
-       Report from Ralf Corsepius:
-       * automake.in (TARGET_PATTERN): Add `+' as valid character.
-       (SUFFIX_RULE_PATTERN): Likewise.
-       * tests/Makefile.am (TESTS): Added cxx.test.
-       * tests/cxx.test: New file.
-
-       * lib/am/tags.am (distclean-tags): Remove files for gtags.
-       From Shigio Yamaguchi.
-
-2001-07-14  Steve M. Robbins  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Emit diagnostic when files
-       remain after "make uninstall".
-
-2001-07-14  Tom Tromey  <address@hidden>
-
-       * lib/am/tags.am (.PHONY): Depend on GTAGS.  From Shigio Yamaguchi.
-
-       * lib/missing (makeinfo): Redirect stdout and stderr outside
-       subshell.  From Alexandre Oliva.
-
-2001-07-14  Akim Demaille  <address@hidden>
-
-       * automake.in ($obsolete_rx): No need for `\b(foo\b|\bbar)\b',
-       `\b(foo|bar)\b' is what we want.
-       * aclocal.in: Likewise.
-
-2001-07-14  Akim Demaille  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Don't define `depcpp' which is
-       not used.
-       Do not require the corresponding AC_PROG_CC as AC_PROG_CC is
-       actually modified to require AM_DEPENDENCIES.
-       Rename `confdir' as `conftest.dir' so that the configure trap
-       remove it.
-
-2001-07-04  Tom Tromey  <address@hidden>
-
-       Fix for nolink.test:
-       * tests/Makefile.am (XFAIL_TESTS): Removed nolink.test.
-       * lib/am/program.am (%PROGRAM%%EXEEXT%): Use %EXEEXT%.
-       * automake.in (am_install_var): Only rewrite PROGRAMS if
-       $seen_exeext.
-       (make_paragraphs): Always define %EXEEXT%.
-
-2001-07-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nolink.test: New file.
-       * tests/Makefile.am (TEST, XFAIL_TESTS): Add nolink.test.
-
-2001-07-04  OKUJI Yoshinori  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Add the second argument to
-       address@hidden' into @CLEAN_SUFFIXES, because the combined index
-       itself may not be used directly.
-
-2001-07-04  Tom Tromey  <address@hidden>
-
-       * missing: Updated.
-       * lib/missing (makeinfo): Use subshell, not explicit sh
-       invocation.
-
-       * automake.texi (Headers): Mention that we prefer uninstalled
-       headers in _SOURCES.
-       (ANSI): Mention cross-compilation limitation.
-
-2001-07-03  Tom Tromey  <address@hidden>
-
-       * configure.in: Upped to 1.4i.
-
-       * configure.in: Released 1.4h.
-
-       * lib/config.guess, lib/config.sub: Updated.
-
-2001-07-02  Tom Tromey  <address@hidden>
-
-       Fix for libtool2.test:
-       * tests/libtool2.test: Use `rm -f' to placate maintainer-check.
-       * lib/am/libtool.am (distclean-libtool): Conditional on TOPDIR.
-       * automake.in (generate_makefile): Call handle_libtool
-       unconditionally.
-       * tests/Makefile.am (XFAIL_TESTS): Removed libtool2.test.
-
-       * tests/libtool2.test: Look for `.lo' files to be removed.
-
-       * tests/Makefile.am (XFAIL_TESTS): Added libtool2.test.
-
-       * tests/Makefile.am (TESTS): Removed dup.test.
-       * tests/dup.test: Removed.
-       * aclocal.in (scan_file): Don't give error for duplicate macro.
-
-2001-07-01  Tom Tromey  <address@hidden>
-
-       * automake.texi (Program and Library Variables): Document
-       subdir-objects.  Document fact that per-object flags override AM_
-       flags.
-       (Options): Likewise.
-       (Yacc and Lex): Document YFLAGS, AM_YFLAGS, LFLAGS, AM_LFLAGS.
-       (Multilibs): New node.
-       (Macros): Documented missing macros.
-       (Auxiliary Programs): New node.
-
-       * lib/missing (makeinfo): If makeinfo exists, and we're in --run
-       mode, then simply fail.
-
-2001-07-01  Tim Van Holder  <address@hidden>
-
-       * lib/ylwrap: Improve support for DOS paths (and paths
-       containing backslashes in general).
-
-2001-07-01  Tom Tromey  <address@hidden>
-
-       * lib/missing: Added special exception to license.
-
-       * missing: Updated.
-       * lib/missing: Updated.  Added comment explaining configure.ac
-       oddity.
-
-       * lib/depcomp: Reorder arguments to gcc3.
-       From Per Oyvind Hvidsten.
-
-       * tests/Makefile.am (TESTS): Added libtool2.test.
-       * tests/libtool2.test: New file.
-
-       * automake.texi (Program and Library Variables): Added example for
-       _AR.
-
-2001-06-29  Tom Tromey  <address@hidden>
-
-       * tests/cond11.test: Use `=', not `=='.
-       * tests/cond12.test: Look for automake in build directory, not
-       source directory.
-
-2001-06-29  Richard Boulton  <address@hidden>
-
-       * automake.in (conditionals_true_when): Pass first parameters by
-       reference, avoiding bug which put all parameters in @CONDS instead
-       of @WHENS.  Report by Kalle Olavi Niemitalo.
-       Take a single WHEN instead of an array of WHENS.
-       Remove FIXME; can't now have an empty @WHENS.
-       (conditional_is_redundant): New sub.
-       (variable_conditions_reduce): Check whether each condition is
-       implied by any of the other conditions (other those already
-       discarded), rather than checking only against those already
-       considered (and kept).  Also, fix sense of check: was keeping
-       tautologous terms instead of discarding them.  Use
-       conditional_is_redundant instead of conditionals_true_when.
-       * tests/Makefile.am (TESTS): Added cond11.test and cond12.test.
-       * tests/cond11.test: New file.
-       * tests/cond12.test: New file.
-
-2001-06-29  Raja R Harinath  <address@hidden>
-
-       * automake.in (saw_sources_p): Work even if there are more
-       than one header files, and more than of one type of header.
-       * tests/Makefile.am (TESTS): Added new file.
-       * tests/depend4.test: New file.
-
-2001-06-28  Tom Tromey  <address@hidden>
-
-       * lib/am/libs.am (RANLIB): Don't define.
-
-2001-06-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (am_install_var): Assign 1 to $first on
-       first interation.
-
-2001-06-23  Tom Tromey  <address@hidden>
-
-       Fix for yacc5.test:
-       * lib/ylwrap: Changed usage.
-       * lib/am/yacc.am: Rewrote to use new substitutions.
-       * lib/am/lex.am: Likewise.
-       * automake.in (handle_languages): Skip files whose language
-       doesn't have a compiler.  Handle `define_flag' attribute.
-       Changed '$' to "\$" to aid Emacs fontification.
-       (struct): Added `rule_file'.  Removed `derived_autodep'.  Added
-       `_target_hook' and `define_flag'.
-       (yacc, yaccxx, lex, lexxx): Set `rule_file', `flags', `compile',
-       and `compiler' attributes.  Removed `linker', `derived_autodep',
-       and `ansi' attributes.  Added `define_flag'.
-       (yacc, yaccxx): Added `_target_hook'.
-       (saw_extension): Count number of times extension seen.
-       (count_files_for_language): New sub.
-       (saw_sources_p): Use it.
-       (handle_single_transform_list): Allow language rewrite function
-       to return a new source extension.  Call target_hook.
-       (yacc_sources, lex_sources): Removed.
-       (initialize_per_input): Don't initialize yacc_sources or
-       lex_sources.
-       (lang_yacc_rewrite): Rewrote.
-       (lang_yaccxx_rewrite): Likewise.
-       (lang_lex_rewrite): Likewise.
-       (lang_lexxx_rewrite): Likewise.
-       (output_yacc_build_rule): Removed.
-       (output_lex_build_rule): Removed.
-       (lang_yacc_finish): Removed build rule generation.
-       (lang_lex_finish): Likewise.
-       (DASH_D_PATTERN): New global.
-       (lang_yacc_target_hook): New function.
-       (_target_hook): New function.
-       (register_language): Default `define_flag'.
-       * tests/yacc5.test: Updated test.
-       * tests/yacc4.test: Exit with status 77 if bison doesn't work.
-       * tests/yacc3.test: Remove bogus `make' invocation.  Added test
-       for all YFLAGS variables.
-
-2001-06-20  Tom Tromey  <address@hidden>
-
-       * tests/yacc5.test: Check for per-executable YFLAGS.
-
-2001-06-19  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added yacc5.test.
-       * tests/yacc5.test: New file.
-
-2001-06-17  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file_internal): Check for already-required
-       file after searching for it, and only if it is not found.  Don't
-       use `readlink' when checking for dangling symlink.  Work if
-       --force-missing specified.
-       * tests/acoutput2.test: Also test --force-missing.
-
-       Fix for libtool.test:
-       * automake.in (generate_makefile): Call handle_libtool.
-       (handle_libtool): New sub.
-       (handle_compile): Don't read `libtool' file.
-
-       * tests/acoutput2.test: New file.
-       * tests/Makefile.am (TESTS): Added acoutput2.test.
-
-2001-06-15  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added libtool.test.
-       * tests/libtool.test: New file.
-
-2001-06-14  Tom Tromey  <address@hidden>
-
-       Fix some lisp bugs reported by Bruno Haible:
-       * lib/am/lisp.am (uninstall-%DIR%LISP): Added DESTDIR to the
-       echo.
-       (install-%DIR%LISP): Handle case where lispdir is not defined.
-       (uninstall-%DIR%LISP): Likewise.
-       (.el.elc): Added `else' clause.
-
-       Fix for bug reported by Steve M. Robbins:
-       * automake.in (handle_single_transform_list): When building a file
-       from a subdirectory, continue to use `AM_' prefix.
-       * tests/Makefile.am (TESTS): Added subobj7.test.
-       * tests/subobj7.test: New file.
-
-       * lib/am/configure.am ($(top_builddir)/config.status): Added
-       $(top_builddir) prefix to work around problems with some vendor
-       makes.  From Nicolas Joly.
-
-       * automake.in (yacc_lex_finish_helper): Find ylwrap in
-       top_srcdir.  From Tim Van Holder.
-       * tests/Makefile.am (TESTS): Added yacc6.test.
-       * tests/yacc6.test: New file.
-
-2001-06-14  Tim Van Holder  <address@hidden>
-
-       * tests/defs, tests/installsh.test: Properly support
-       DOS-style paths.
-
-2001-06-14  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added mdate4.test.
-       * tests/mdate4.test: New file.
-
-       * aclocal.in (scan_m4_files): Removed unused variable.
-
-2001-06-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (scan_m4_files): Tweak the building of &search so
-       that multiple macro names can be found on the same line.  Ensure
-       we match whole macro name, not only substrings.
-
-2001-06-12  Tom Tromey  <address@hidden>
-
-       * automake.texi (ANSI): Minor clarification.
-       (Other GNU Tools): Don't mention Guile.
-       (Guile): Removed.
-       (Java Support): Mention file extensions.
-       (Man pages): Mention dist_.  Don't mention info pages.
-
-2001-06-11  Tom Tromey  <address@hidden>
-
-       * automake.texi (Program variables): Document AM_CPPFLAGS.
-       Deprecate INCLUDES.
-       (Java Support): Document AM_GCJFLAGS.
-       (Support for Other Languages): Removed `fixme'; added link to
-       suffix rule handling.
-
-       * automake.texi (Program and Library Variables): Document _LIBADD,
-       _LDADD, _LDFLAGS, _AR, and _DEPENDENCIES.
-
-2001-06-11  Kevin Dalley  <address@hidden>
-
-       * missing: Support configure.ac.
-
-2001-06-08  Tom Tromey  <address@hidden>
-
-       * tests/version4.test: New file.
-       * automake.in (version_check): New sub.
-       (handle_options): Use it.
-       * tests/Makefile.am (AUTOMAKE_OPTIONS): Removed.
-       (TESTS): Added version4.test.
-       * m4/Makefile.am (AUTOMAKE_OPTIONS): Removed.
-       * Makefile.am (AUTOMAKE_OPTIONS): Remove `gnits'.
-
-2001-06-04  Kevin Dalley  <address@hidden>
-
-       * lib/am/dejagnu.am (site.exp): Fix typo.
-
-2001-06-02  Tom Tromey  <address@hidden>
-
-       * automake.in (variable_conditions_sub): Move parent-only code
-       from here...
-       (variable_conditions): ... to here.
-       (variable_conditions_sub): Include this variable's conditions in
-       the resulting condition list.
-       * tests/Makefile.am (XFAIL_TESTS): Removed ltdeps.test.
-
-2001-06-01  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (XFAIL_TESTS): Added ltdeps.test.
-       (TESTS): Likewise.
-       * tests/ltdeps.test: New file.  Report from Lars J. Aas.
-
-2001-05-31  Tom Tromey  <address@hidden>
-
-       * automake.texi (Alternative): New node.
-       (Macros): Use new name for gcc.
-       (Java Support): Likewise.
-       (Dependencies): Rewrote.
-       (Invoking Automake): (Re-)document -i, --ignore-deps, and
-       --include-deps.
-
-       * automake.texi (Top level): Removed erroneous spaces.  Documented
-       MAKE and MAKEFLAGS.
-
-2001-05-29  Tom Tromey  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Allow any AM_*FLAGS variable.
-
-       * automake.texi (Include): Rewrote.
-       (Suffixes): Remove Java example.
-       (Java): Added more explanation.  Document variables.
-       (Uniform): Mention JAVA as a primary.
-       (Python): Updated for new Python support.
-       (Sources): Added a weak example.
-
-       * lib/am/java.am (class%DIR%.stamp): Use AM_JAVACFLAGS.
-
-       * automake.texi (A Program): Mention `check' prefix.
-       (Program and Library Variables): New node.
-       (Texinfo): Document UPDATED-MONTH, MAKEINFOFLAGS, and
-       AM_MAKEINFOFLAGS.
-       (etags): Mention per-program flags.
-       (Tests): Document AM_RUNTESTFLAGS; added sectioning; more
-       updates.
-
-       * lib/am/texinfos.am (.PHONY): Always list uninstall-info-am and
-       install-info-am.
-
-2001-05-28  Tom Tromey  <address@hidden>
-
-       * m4/Makefile.am (MAINT_CHARSET): Removed.
-       * Makefile.am (MAINT_CHARSET): Removed.
-       * automake.in (maint_charset, dist_charset): Removed.
-       (local_maint_charset): Removed.
-       (initialize_per_input): Don't use maint_charset.
-       (handle_dist): Don't compute maint_charset or check DIST_CHARSET.
-
-       * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and
-       AM_MAKEINFOFLAGS.
-       (.%SUFFIX%.dvi): Likewise.
-       (.%SUFFIX%): Likewise.
-
-2001-05-27  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_multilib): Only add multilib support code at
-       top level.
-       * lib/am/multilib.am: Handle invocation of *-multi targets
-       differently for SUBDIRS and non-SUBDIRS Makefiles.
-       * m4/multi.m4 (AM_ENABLE_MULTILIB): Removed erroneous comment.
-       Only add multilib code when the Makefile in question is actually
-       rebuilt.
-
-       * lib/am/dejagnu.am (check-DEJAGNU): Added AM_RUNTESTFLAGS.
-
-2001-05-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Skip unknown
-       extensions.
-
-2001-05-25  Tom Tromey  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Ignore AM_RUNTESTFLAGS.
-
-2001-05-24  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo_helper): Find mdate-sh in current
-       directory in some situations.
-
-       * automake.in (generate_makefile): Better explanation for ansi2knr
-       fix.
-
-2001-05-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages): Skip unknown extensions.
-       (derive_suffix): Check whether $extension_map{$source_ext}
-       is undefined, not empty.
-
-2001-05-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (read_am_file): Ignore trailing backslash on
-       comment lines.
-
-2001-05-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (ASSIGNMENT_PATTERN): Forbid : and + in variable names.
-
-2001-05-21  Akim Demaille  <address@hidden>
-
-       * automake.texi (Macros): Explain the ``AC_PROG_LEX invoked
-       multiple times'' warning.
-
-2001-05-20  Tom Tromey  <address@hidden>
-
-       * configure.in: Updated to 1.4g.
-
-       * configure.in: Updated to 1.4f.
-
-       * Makefile.am (EXTRA_DIST): Added ChangeLog.2000.
-
-       * lib/ansi2knr.c: New version.
-
-       * Makefile.am (FETCHFILES): Added ansi2knr.c.
-       (fetch): Likewise.
-
-2001-05-19  Tom Tromey  <address@hidden>
-
-       * config.guess, config.sub: New versions from FSF.
-
-       * Makefile.am (fetch): Compare against files in srcdir.
-
-       For for ansi2knr report from Harlan Stenn:
-       * automake.in (generate_makefile): Run handle_compile before
-       handle_languages.
-
-2001-05-18  Tom Tromey  <address@hidden>
-
-       * automake.in: Reverted erroneous checkin.
-
-2001-05-18  Akim Demaille  <address@hidden>
-
-       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust
-       to missing `install-info'.
-
-2001-05-17  Tom Tromey  <address@hidden>
-
-       * automake.in (lang_c_finish): Use `rm -f'.
-
-       * automake.in (lang_c_finish): Remove _.c file if ansi2knr fails.
-       * tests/Makefile.am (TESTS): Added new file.
-       * tests/ansi5.test: New file.
-
-2001-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/install.am (install-strip): Set INSTALL_PROGRAM_ENV if
-       STRIP is not empty.
-       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Set INSTALL_STRIP_PROGRAM
-       to install-sh unconditionally.  Don't set INSTALL_STRIP_PROGRAM_ENV.
-       * automake.texi (Requirements): Document the use of the STRIP
-       variable in cross-compilation environments.
-
-2001-05-17  Tom Tromey  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): If depcomp doesn't exist, revert
-       to no dependency tracking.
-       * tests/Makefile.am (TESTS): Added depcomp2.test.
-       * tests/depcomp2.test: New file.  From Pavel Roskin.
-
-       * lib/depcomp (aix): Bug fix and simplification from Larry Jones.
-
-       * lib/depcomp (tru64): New dependency tracking mode.
-
-       Fix for PR automake/159:
-       * lib/depcomp (aix): Rewrote.
-       (sgi): Likewise.
-
-       Fix for PR automake/174:
-       * tests/Makefile.am (XFAIL_TESTS): Removed comment3.test.
-       * automake.in (read_am_file): Warn if `#' is at start of rule.
-
-2001-05-16  Tom Tromey  <address@hidden>
-
-       For PR automake/174:
-       * tests/Makefile.am (TESTS): Added comment3.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/comment3.test: New file.
-
-       Fix for PR automake/175:
-       * tests/Makefile.am (XFAIL_TESTS): Removed make.test.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Omit `Entering directory' and
-       `Leaving directory' messages.
-
-       For PR automake/175:
-       * tests/Makefile.am (XFAIL_TESTS): Added make.test.
-       * tests/make.test: Run test with `make -w'.
-
-       * tests/Makefile.am (TESTS): Removed maintclean.test.
-       * lib/am/clean.am (maintainer-clean-generic): Don't remove
-       Makefile.in.
-       * lib/am/configure.am (maintainer-clean-am): Removed.
-       (maintainer-clean-conf): Removed.
-       * tests/maintclean.test: Removed.
-
-2001-05-15  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/177:
-       * Makefile.am (maintainer-clean): Set perllibdir before invoking
-       automake or aclocal.
-
-       Fix for maintclean.test:
-       * tests/Makefile.am (XFAIL_TESTS): Removed maintclean.test.
-       * lib/am/clean.am (distclean-generic): Don't remove config.cache
-       or config.log.
-       (distclean, maintainer-clean): Moved to...
-       * lib/am/configure.am: ... here.
-       (distclean): Remove config.cache and config.log.
-       (maintainer-clean): Removed.
-       (maintainer-clean-conf): New target.
-       (maintainer-clean-am): New target.
-
-       * tests/Makefile.am (TESTS): Added maintclean.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/maintclean.test: New file.
-
-       Fixes PR automake/175:
-       * tests/target-cflags.test: Use $needs_gnu_make.
-       * tests/exsource.test: Use $needs_gnu_make.
-       * tests/make.test: Require GNU make.
-       * tests/defs (needs_gnu_make): Compute.
-
-2001-05-14  Tom Tromey  <address@hidden>
-
-       * lib/ylwrap: Fixed quoting on regular expression.  Fixes
-       yacc4.test.
-
-       Fix for texinfo10.test.
-       * tests/Makefile.am (XFAIL_TESTS): Remove texinfo10.test.
-       * lib/am/texinfos.am: Use LOCAL-TEXIS liberally.
-       * automake.in (handle_texinfo_helper): New sub.
-       (handle_texinfo): Rewrote.  Now defines LOCAL-TEXIS.
-       * tests/texinfo10.test: Added more cases.
-
-       Fix for yaccvpath.test:
-       * tests/Makefile.am (XFAIL_TESTS): Removed yaccvpath.test.
-       * lib/am/distdir.am (distdir): Always look for file in build
-       directory first.
-       * lib/ylwrap: Quote the `#line' regular expression.
-       * lib/am/yacc.am (%YACC_SUFFIX%%C_SUFFIX%): Reverted earlier
-       change; don't run sed on the generated file.
-       * tests/yaccvpath.test: Create new parser in srcdir.  Added test
-       to make sure parser will be rebuilt at dist time.
-
-2001-05-13  Pavel Roskin  <address@hidden>
-
-       * automake.in ($IGNORE_PATTERN): Allow spaces before comments
-       beginning with `##'.
-       * automake.texi (General Operation): Document it.
-
-2001-05-13  Tom Tromey  <address@hidden>
-
-       Reported by Rainer Orth:
-       * lib/am/distdir.am (?DISTDIR?distdir): Define conditional on
-       TOPDIR_P.
-       * tests/Makefile.am (TESTS): Added distname.test.
-       * tests/distname.test: New file.
-
-       * Makefile.am (dist_pkgdata_DATA): Removed.
-
-       * tests/defs: Find files to copy in lib/.
-       * automake.in (perllibdir): Set to Automake directory.
-       * ansi2knr.c, ansi2knr.1: Removed.
-       * Makefile.am (dist_am_DATA): Removed.
-       (amdir): Removed.
-       (maintainer-check): Look for lib/am/*.am.  Expect 28 lines of
-       diffs.
-       (scriptdir): Removed.
-       (dist_script_DATA): Likewise.
-       (install-data-hook): Likewise.
-       (installcheck-local): Likewise.
-       (TAGS_FILES): Removed amfiles.
-       (dist_pkgdata_DATA): Removed ansi2knr.c and ansi2knr.1.
-       * tests/installsh.test (AUTOMAKE): Use --libdir, not --amdir, and
-       point it to the right directory.
-       * ansi2knr.am, check.am, clean-hdr.am, clean.am, comp-vars.am,
-       compile.am, configure.am, data.am, dejagnu.am, depend.am,
-       depend2.am, distdir.am, footer.am, header-vars.am, header.am,
-       install.am, java.am, lang-compile.am, lex.am, library.am, libs.am,
-       libtool.am, lisp.am, ltlib.am, ltlibrary.am, mans-vars.am,
-       mans.am, multilib.am, program.am, progs.am, python.am,
-       remake-hdr.am, scripts.am, subdirs.am, tags.am, texi-vers.am,
-       texibuild.am, texinfos.am, yacc.am: Moved to lib/am/.
-       * configure.in (AC_OUTPUT): Added lib/am/Makefile.
-       (AUTOMAKE): Use --libdir, not --amdir.
-       Ues AC_CONFIG_AUX_DIR.
-       * lib/Makefile.am (SUBDIRS): Added `am'.
-       (scriptdir): New macro.
-       (dist_script_DATA): Likewise.
-       (dist_pkgdata_DATA): Likewise.
-       (install-data-hook): New target.
-       (installcheck-local): Likewise.
-       * lib/am/Makefile.in: New file.
-       * lib/am/Makefile.am: Removed everything except amdir and
-       dist_am_DATA.
-
-2001-05-13  Akim Demaille  <address@hidden>
-
-       * automake.in ($pkgdata_dir): Rename as...
-       ($libdir): this.
-       ($am_dir): Remove, replace its uses with $libdir.
-       (&parse_arguments): Replace --amdir with --libdir.
-       * automake.texi (Invoking Automake): Document --libdir, not
-       --amdir.
-       * tests/defs (AUTOMAKE): Use --libdir, not --amdir.
-
-2001-05-13  Tom Tromey  <address@hidden>
-
-       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Use AMDEP_TRUE,
-       not AMDEP.
-       * m4/depend.m4 (AM_DEPENDENCIES): Require AM_DEP_TRACK.
-       Correctly look at AMDEP_TRUE, not AMDEP.
-
-       Report from Robert Boehne:
-       * tests/Makefile.am (TESTS): Added depend2.test.
-       * tests/depend2.test: New file.
-
-2001-05-13  James Henstridge  <address@hidden>
-
-       * m4/python.m4 (AM_PATH_PYTHON): Added more names for python.
-       Point pythondir at site-packages directory.  Rename
-       PYTHON_SITE_PACKAGE to pkgpythondir.  Rename PYTHON_SITE_EXEC to
-       pyexecdir.  Removed package/module argument.  Removed
-       PYTHON_SITE_INSTALL.  Added version checking.
-
-2001-05-14  Jim Meyering  <address@hidden>
-
-       * automake.in (macro_define): Change one remaining use of
-       `variable_dump' to `macro_dump'.
-
-2001-05-13  Tom Tromey  <address@hidden>
-
-       * m4/depend.m4 (AM_DEPENDENCIES): Prefer gcc3 over gcc for objc
-       and gcj.
-
-2001-05-13  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_texinfo_file, &handle_dist, &handle_gettext)
-       (&handle_footer, &handle_factored_dependencies, &handle_emacs_lisp)
-       (&am_primary_prefixes): Use `map' rather than `grep'.
-
-2001-05-13  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Set config_vars for yacc, yaccxx, lex,
-       lexxx, asm.
-       (&lang_c_finish, &lang_yacc_finish, &lang_lex_finish): Simplify.
-       (&lang_asm_finish): Remove, set asm's finisher to C's one.
-
-2001-05-13  Akim Demaille  <address@hidden>
-
-       * lang-compile.am: New file, loaded once per language.
-       * depend2.am: Move definitions loaded once per language in the
-       aforementioned file.
-       * automake.in (&handle_languages): Load it.
-       (&lang_ppf77_finish, &lang_ratfor_finish): Remove as it's now
-       handled by lang-compile.am.
-
-2001-05-13  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added python.test.
-       * tests/python.test: New file.
-       * automake.in (handle_languages): Use
-       config_aux_dir_set_in_configure_in.
-       (handle_python): Correctly mention AM_PATH_PYTHON.  Use
-       py-compile, not py_comp.  Define py_compile macro.
-
-2001-05-13  Derek Price  <address@hidden>
-
-       * automake.in (require_file_with_conf_line,
-       require_file_with_line, require_file): Pass a @require_file_path
-       of $relative_dir instead of '.' to require_file_internal so that
-       all the special casing of '.' can be removed elsewhere.
-       (require_config_file, require_conf_file_with_line,
-       require_conf_file_with_conf_line): Remove special casing for '.'
-       and make sure $config_aux_dir is maintained properly.
-       (require_file_internal): Remove special casing of '.' and set
-       @require_file_path when missing files are added.
-       (maybe_push_required_file): Remove special casing of '.'
-       (handle_dependencies): Remove a workaround for a bug now fixed
-       and remove $config_aux_dir special casing.
-       (handle_configure): Remove special casing for $config_aux_dir
-       (handle_python): Ditto.
-       (yacc_lex_finish_helper): Change $config_aux_dir switch to
-       switch on the value of $config_aux_dir_set_in_configure_in.
-       (handle_texinfo): Ditto.
-       (scan_one_configure_file): Set $config_aux_dir and
-       $config_aux_dir_set_in_configure_in properly so special casing
-       on the value of $config_aux_dir can be removed elsewhere.
-       * tests/depcomp.test: New file.
-       * tests/confsub.test: Look for depcomp in $(top_srcdir) instead of the
-       first subdir containing a C file.
-       * tests/libobj2.test: Ditto.
-       * tests/Makefile.am (TESTS): Added 'depcomp.test'.
-
-2001-05-12  Tom Tromey  <address@hidden>
-
-       * tests/gcj.test: Updated for gcj dependency tracking.
-       * tests/gcj2.test: Likewise.
-
-       Fixes PR automake/169.
-       * m4/depend.m4 (AM_DEPENDENCIES): Handle GCJ.  Don't assume gcc
-       style for OBJC.
-       * automake.in (java): Added autodep entry.
-       * tests/Makefile.am (TESTS): Added gcj3.test.
-       * tests/gcj3.test: New file.
-
-2001-05-12  Raja R Harinath  <address@hidden>
-
-       * automake.in (ASSIGNMENT_PATTERN): Make variable-name pattern
-       stop at the first '='.
-       * tests/Makefile.am (TESTS): Added vars.test.
-       * tests/vars.test: New file.
-
-2001-05-12  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_single_transform_list): Simplify
-       computation of $object and $this_obj_ext.
-       * tests/lex3.test: Merge into...
-       * tests/lex.test: here.
-       * tests/pr19.test: Improve and rename as...
-       * tests/lex3.test: this.
-
-2001-05-09  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Correctly compute $saw_bk.
-       (scan_autoconf_files): Ensure configure_dist_common is always
-       set.
-       * tests/defs (AUTOMAKE): Added --Werror.
-
-2001-05-09  Pavel Roskin  <address@hidden>
-
-       * automake.in (define_compiler_variable): Escape $(LIBTOOL) in
-       double quotes.
-
-2001-05-09  Tom Tromey  <address@hidden>
-
-       * tests/werror.test: Use `rm -f'.
-
-2001-05-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_line_warning): Invoke `am_line_error', not itself.
-
-2001-05-09  Akim Demaille  <address@hidden>
-
-       * automake.in: Remove some code left from bad patches.
-       (&handle_dependency): Remove, for the same reason.
-
-2001-05-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_paragraphs): Transform BUILD, HOST and TARGET.
-       (&handle_tests_dejagnu, &define_standard_variables): Don't.
-       (&define_standard_variables): Don't transform %top_builddir% since...
-       * header-vars.am: Use %TOPDIR% instead.
-
-2001-05-09  Akim Demaille  <address@hidden>
-
-       * automake.in (@objects): Remove, unused.
-       Remove all the code related to it, and to former `$(OBJECTS)'.
-
-2001-05-08  Tom Tromey  <address@hidden>
-
-       For PR automake/29:
-       * ylwrap: Handle arguments to program.  Remove old code that tried
-       to avoid absolute paths and add new code to do it in all cases.
-       Removed ancient logic that tried to deal with relative path.
-       * tests/Makefile.am (TESTS): Added yacc4.test.
-       * tests/yacc4.test: New file.
-
-       Fix for PR automake/149 and werror.test:
-       * automake.in (require_file_internal): Use am_line_warning or
-       am_conf_line_warning when suppressing error.
-       (am_line_warning): New sub.
-       (am_conf_line_warning): Save and restore warning signal.
-       * tests/Makefile.am (XFAIL_TESTS): Removed werror.test.
-
-       Fix for PR automake/36:
-       * tests/Makefile.am (TESTS): Added asm.test.
-       * tests/asm.test: New file.
-       * automake.in (asm): Use ASFLAGS and AS.
-       (lang_asm_finish): New sub.
-
-       * automake.in (read_am_file): Removed debugging code.
-
-       For PR automake/149:
-       * tests/Makefile.am (TESTS): Added werror.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/werror.test: New file.
-
-       * automake.in (conditional_true_when): Don't return if we see
-       `TRUE'.
-
-       * tests/objc.test: Removed.
-       * tests/Makefile.am (XFAIL_TESTS): Removed objc.test.
-       (TESTS): Likewise.
-
-       * automake.in (subst): New sub.
-       (handle_languages): Use it.
-       (output_lex_build_rule): Likewise; also use _am_quote.
-       (check_libobjs_sources): Likewise.
-       (make_paragraphs): Use subst.
-
-       * automake.in (check_libobjs_sources): Re-fixed AMDEP_TRUE
-       problem.
-
-       * automake.in (file_contents_internal): Prototype now `$$%'.
-       (register_language): Prototype now `%'.
-
-       Fixes test subobj6.test and PR automake/160:
-       * tests/Makefile.am (XFAIL_TESTS): Removed subobj6.test.
-       * compile.am (mostlyclean-compile): Added MOSTLYRMS.
-       (distclean-compile): Added DISTRMS.
-       * tests/subobj6.test (wish_SOURCES): Updated to reflect
-       `mostlyclean' use; added test for non-subdir case.
-       * automake.in (compile_clean_files): New global.
-       (MOSTLY_CLEAN, DIST_CLEAN): New constants.
-       (initialize_per_input): Initialize compile_clean_files.
-       (handle_single_transform_list): Set compile_clean_files entries.
-       (handle_compile): Handle compilation cleanups.
-
-2001-05-08  Lars J. Aas  <address@hidden>
-
-       * automake.texi (Canonicalizing Automake macros): Document not
-       canonicalizing strudels (@) anymore.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * distdir.am (dist-all): Build all the flavors using a single
-       distdir.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents_internal): Apply the @cond_stack to
-       the rules and assignments.
-       Don't rely on `$.' as it's biased by &make_paragraphs.
-       Don't remove backslashes in variable values.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in ($IGNORE_PATTERN): Improve for multi-line matches.
-       ($RULE_PATTERN): Use that from `&make_paragraphs'.
-       ($MACRO_PATTERN): Just catch the name of a macro.
-       ($BOGUS_MACRO_PATTERN): Remove.
-       ($ASSIGNMENT_PATTERN): New.
-       (&file_contents_internal, &make_paragraphs): Adjust.
-       (&macro_define): Catch bad macro names.
-       (&cond_stack_endif): Better error message.
-       (&file_contents_internal): Don't remove backslashes in variable
-       values.
-       (&macro_define): Do it for `+=' user variables.
-       (&define_standard_variables): Use `undef' instead of a dummy
-       variable.
-       (&make_paragraph): Be sure not to chop the trail of hash only
-       lines: adjust the `##' regexp.
-       (&rule_define): Fix a bug: don't read $1 but $target.
-       * tests/condincl.test: Strengthen.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attributes `Name' and `config_vars'.
-       (&finish): Work properly if there is no _finish.
-       (Automake): Register language Names and AC_SUBST dependencies.
-       Register Fortran 77 variables upon which ratfor and ppf77 depend.
-       (&handle_languages): Once per language, invoke
-       `define_linker_variables', and check its config_vars.
-       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
-       (&lang_java_finish): Remove.
-       (&lang_ppf77_finish, &lang_ratfor_finish): Adjust.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents_internal): Accept $IS_AM.
-       (&handle_compile, &define_standard_variables, &file_contents): Adjust.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (am_install_var): Use `next' instead of `if' on the
-       body of $X loop.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attributes `lder' and `ld'.
-       (&register_language): Specify for cxx, objc, f77, gcj.
-       (&define_linker_variable): New.
-       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
-       (&lang_java_finish): Adjust.
-       (&libtool_compiler): Remove.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_lib_objects_cond): Don't take $LEX_SEEN as
-       argument, as you don't use it.
-       Hence...
-       (&handle_lib_objects): Don't take $LEX_SEEN as argument, as you
-       don't use it.
-       Hence...
-       (&handle_programs): Don't mess with %lex_sources, as you don't use
-       it.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attribute `link'.
-       (&register_language): Specify for cxx, objc, f77, gcj.
-       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
-       (&lang_java_finish): Adjust.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&define_compiler_variables): Use only $LANG as
-       argument.
-       (&handle_languages): Adjust.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&define_program_variable): Remove.
-       (&scan_one_autoconf_file): Skip MAKEINFO when found in an
-       AM_MISSING_PROG.
-       (&handle_texinfo): Don't define MAKEINFO and TEXI2DVI.
-       * texinfos.am: Do it.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_tests_dejagnu): Don't define EXPECT and
-       RUNTEST.
-       * dejagnu.am: Do it.
-       (site.exp): Use `if'.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in: Formatting changes.
-       (variable_dump, variables_dump): Rename as...
-       (macro_dump, macros_dump): these.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       Support `if !COND', `else COND', `end COND'.
-
-       * automake.texi (Conditionals): Document it.
-       * automake.in ($WHITE_PATTERN, $MACRO_PATTERN, $BOGUS_MACRO_PATTERN)
-       ($GNITS_VERSION_PATTERN, $INCLUDE_PATTERN): Use `\d' and `\s'.
-       ($IF_PATTERN, $ELSE_PATTERN, $ENDIF_PATTERN): Likewise, and accept
-       a leading `!' before the condition.
-       (&handle_options): Use `\d'.
-       (&cond_stack_if, &cond_stack_else, &&cond_stack_endif): New.
-       (&read_am_file, &file_contents_internal): Use them.
-       (&transform): No longer substitute `%!COND%', forcing the use of
-       `! %?COND%'.
-       * ansi2knr.am, lex.am, tags.am, texinfos.am, yacc.am: Adjust.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       Uniform handling of per-object compilation rules.
-       Note: Automake is repaired.
-
-       * automake.in (&handle_languages): Output per object rules for all
-       the objects, not only for those which language supports dependency
-       tracking.
-       Fix Automake: when outputting per-object rules, use `-o' if the
-       language has no `output_flag', as it's really needed.
-       (&handle_single_transform_list): Instead of special casing files
-       which need per object rules but which language don't support
-       dependency tracking, keep them in the queue for processing by
-       `&handle_languages'.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): `ext-compile.am' and
-       `depend2.am' are now equivalent for generic rules: output only the
-       latter.
-       * ext-compile.am: Remove.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       Note: This patch breaks Automake.  Repaired within two patches.
-
-       * automake.in (Language): Replace the attribute `output_arg' with
-       `compile_flag' and `output_flag'.
-       (Automake): Adjust language registrations.
-       (&handle_languages): Transform `-c' and `-o' for both suffix and
-       per object rules, instead of `OUTARG' and `LTOUTARG' only for
-       generic rules.
-       (&handle_single_transform_list): Adjust to `compile_flag' and
-       `output_flag'.
-       * depend2.am, ext-compile.am: Use `%-c%' and `%-o%'.
-
-2001-05-08  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Don't transform %COMPILER%.
-       Use `$lang->compiler' instead of `$pfx' to transform generic
-       %COMPILE% and %LTCOMPILE%.
-       * ext-compile.am: Use %COMPILE%, %LTCOMPILE% and %SOURCE% instead
-       of %COMPILER% and $<.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Use the same `%transform' for
-       both `depend2.am' and `ext-compile.am'.
-       Delay the definition of `$flag' so it is right before the first use,
-       and rename as `$flags'.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Compute `$ltoutarg' and
-       `$outarg' independently of dependency code.
-       There is no use looping on a language's possible extensions since
-       we loop over used extensions.
-       Therefore, there is no use for a local `%transform'.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Don't use $comp.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Merge the two loops over
-       %extension_seen/%languages into one and group code to be run once
-       per language together.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_languages): Move the `if
-       ($use_dependencies)' block so that loops over extensions and
-       languages are next to each other.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&depend2): Remove, merged into...
-       (&handle_languages): here.
-
-2001-05-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&finish_languages): Rename as...
-       (&handle_languages): this.
-       Include the body of...
-       (&handle_dependency): this.
-       Remove.
-
-2001-05-06  Tom Tromey  <address@hidden>
-
-       For PR automake/46:
-       * tests/Makefile.am (TESTS): Add subdir5.test.
-       (XFAIL_TESTS): Likewise.
-       * tests/subdir5.test: New file.
-
-       * tests/subobj6.test (wish_SOURCES): Use $MAKE.
-       * tests/subobj5.test (wish_SOURCES): Use $MAKE.
-
-       * automake.in (GNITS_VERSION_PATTERN): Document.  Add `fork
-       identifier'.
-       (handle_options): Handle fork identifier in version number.
-
-       * automake.texi (Dist): Document distcheck-hook.
-
-       * tests/confh4.test: Update to reflect DEFS change.
-       For PR automake/132.
-
-       Fix for PR automake/132:
-       * automake.in (c, c++, objc, asm, ppf77): Add DEFAULT_INCLUDES to
-       compilation.
-       (java): Remove INCLUDES and DEFS from compilation.
-       (lang_c_finish): Add DEFAULT_INCLUDES to compilation.
-       * compile.am (DEFS): Don't include %DEFAULT_INCLUDES%.
-       (DEFAULT_INCLUDES): New macro.
-
-       * automake.in (usage): Re-align explanatory text.
-       Fixes PR automake/148.
-
-       * automake.texi (Uniform): Don't use @address@hidden
-       Fixes PR automake/154.
-
-       For PR automake/160:
-       * tests/Makefile.am (TESTS): Add subobj5.test and subobj6.test.
-       (XFAIL_TESTS): Add subobj6.test.
-       * tests/subobj6.test: New file.
-
-       * automake.texi (Uniform): Mention dist_, nodist_, and nobase_.
-       (Top level): Don't mention `flat'.
-       (Extending): Likewise.
-       (User Variables): New node.
-
-       * distdir.am (distdir): Make subdirectory for each file.
-       Fixes test subobj5.test.
-
-       * tests/Makefile.am (TESTS): Add new file.
-       (XFAIL_TESTS): Likewise.
-       * tests/texinfo10.test: New file.
-
-2001-05-05  Pavel Roskin <address@hidden>
-
-       * automake.in (scan_texinfo_file): Treat @defindex and @synindex
-       in the same way as @defcodeindex and @syncodeindex respectively.
-
-2001-05-05  Tom Tromey  <address@hidden>
-
-       * mans.am (install-man%SECTION%): Minor cleanup.
-       (uninstall-man%SECTION%): Likewise.
-
-       * tests/Makefile.am (XFAIL_TESTS): Removed man.test.
-       * mans.am (install-man%SECTION%): Handle dist_ and nodist_
-       prefixes.
-       (uninstall-man%SECTION%): Likewise.
-       * automake.in (handle_man_pages): Handle dist_ and nodist_
-       prefixes.
-
-       * automake.texi (Future): Removed.
-       (Depth): Removed.
-       (Hello): Don't mention `deep'.
-       (Top level): Likewise.
-
-       * automake.in (conditional_true_when): Use a hash, not index().
-       Also, a TRUE component always results in a true return.
-       Fixes test cond10.test.  For PR automake/164.
-       * tests/Makefile.am (XFAIL_TESTS): Removed cond10.test.
-
-2001-05-05  Raja R Harinath  <address@hidden>
-
-       For PR automake/164:
-       * tests/Makefile.am (TESTS): Added new file.
-       (XFAIL_TESTS): Likewise.
-       * tests/cond10.test: New file.
-
-2001-05-05  Tom Tromey  <address@hidden>
-
-       * texinfos.am (uninstall-info-am): Debian install-info v1.8.3
-       prints to stderr.
-       (install-info-am): Likewise.
-
-2001-05-05  Pavel Roskin <address@hidden>
-
-       * automake.in (scan_texinfo_file): Don't push undefined values
-       to @clean_suffixes.
-
-2001-05-05  Richard Boulton  <address@hidden>
-
-       * automake.in (handle_dist): Check for existence of DIST_SUBDIRS
-       first.
-
-2001-05-05  Robert Collins  <address@hidden>
-
-       * automake.in (required_targets): Added uninstall-am.
-
-2001-05-05  Tom Tromey  <address@hidden>
-
-       Fix bug reported by Robert Boehne:
-       * automake.in (output_lex_build_rule): Don't let AMDEP_TRUE be
-       substituted.
-       (handle_dependencies): Likewise.
-       * Makefile.am (maintainer-check): Look for AMDEP_TRUE
-       substitution.  Correct diff now has 30 lines.  Look for space
-       after losing `undef'.
-
-2001-05-04  Peter Eisentraut  <address@hidden>
-
-       * m4/sanity.m4: Remove the temp file before possible error exits.
-
-2001-05-04  Akim Demaille  <address@hidden>
-
-       * configure.in: Set perllibdir.
-       From Dave Morrison.
-
-2001-05-04  Ralf Corsepius  <address@hidden>
-
-       * automake.in ($pkgdata_dir): New.
-       (&require_file_internal): Use it.
-
-2001-05-03  Akim Demaille  <address@hidden>
-
-       Case insensitive FS choke on Automake/ vs automake.
-       Reported by Tim Van Holder.
-
-       * Automake/: Move into...
-       * lib/: this new directory.
-
-2001-05-03  Raja R Harinath  <address@hidden>
-
-       * data.am (install-%DIR%%PRIMARY%): Execute the same command as
-       echoed.
-
-2001-04-30  Jim Meyering  <address@hidden>
-
-       * automake.in: Remove `/lib' from include directory.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       AM_INIT_AUTOMAKE is no longer optional.
-
-       * automake.in ($seen_make_set, $seen_prog_install)
-       ($seen_arg_prog): Remove.
-       (&handle_programs, &handle_scripts, &scan_one_autoconf_file):
-       Remove related code.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * tests/specflags4.test, tests/specflags5.test: Remove, merged
-       into...
-       * tests/specflags3.test: here.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in ($seen_path_xtra): Remove.
-       (&handle_compile): Don't handle `AC_PATH_XTRA' AC_SUBST variables.
-       (&scan_one_autoconf_file): Do it, instead of setting $seen_path_xtra.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents_internal): Declare it.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file, &file_contents_internal): Don't
-       define macros when `FALSE', to avoid errors on doubly defined
-       variables but under condition `FALSE'.  In order to allow...
-       (&am_install_var): When reading the associated file for the first
-       time, enable `%?FIRST%'.
-       (&handle_libraries): Let libs.am define $(AR) and $(RANLIB).
-       * libs.am: Do it when `%?FIRST%'.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_compile): Let ansi2knr.am define $(ANSI2KNR).
-       * ansi2knr.am: Do it.
-       Prefer `if %?FOO%' to `if %!FOO%'.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&register_language, &finish_languages): Use `pure'
-       as a Boolean.
-       (&register_language): Use %done properly with objects, not names.
-       (&finish_languages): Replace `$non_c' with `$needs_c'.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       Unify LISP, PYTHON and JAVA primaries.
-
-       * automake.in (&handle_emacs_lisp): Be like &handle_python, i.e.,
-       return if there are no files, hook elisp-comp on the Autoconf
-       macro, rely on lisp.am to define variables.
-       (&handle_python, &handle_java): Likewise.
-       (&scan_one_autoconf_file): Pseudo AC_SUBST of `pythondir' and
-       `PYTHON' must be handled here, not in `&handle_python'.
-       * java.am: Define needed variables and rules.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Transform `ONE_PRIMARY'.
-       * data.am: Use it.
-       * header.am: Include data.am.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Transform `PRIMARY'.
-       * data.am: Equip with %PRIMARY%.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (@conditional_stack): Rename as...
-       (@cond_stack): this.
-       (&file_contents_internal): Support inclusion of files.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&lang_extensions): Remove.
-       (&add_depend2, &saw_sources_p): Adjust.
-       * depend2.am: `%EXT%' no longer includes the dot.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&finish_languages, &handle_single_transform_list)
-       (&add_depend2, &handle_dependencies): No longer use the language
-       name in `$lang'.  Rename `$lang_obj' as `$lang'.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&register_language): Use `new Language' with a hash.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&register_language): Rename `output-arg' and
-       `derived-autodep' as `output_arg' and `derived_autodep' to match
-       the Language attribute.
-       Set the defaults in %option instead of $lang.
-
-2001-04-27  Akim Demaille  <address@hidden>
-
-       * Automake/: New directory.
-       * Automake/Struct.pm: New file, based on Perl 5.6's Class::Struct.
-       * automake.in (Language): Use Automake::Struct.
-       * tests/defs: Adjust to find Struct.
-
-2001-04-23  Pavel Roskin <address@hidden>
-
-       * automake.in: Add forward declaration for register_language().
-       * tests/Makefile.am (XFAIL_TESTS): Remove installsh.test - it
-       passes now.
-
-2001-04-20  Akim Demaille  <address@hidden>
-
-       * automake.in (%required_targets): Add `uninstall'.
-       From Robert Collins.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attribute `name'.
-       (&register_language): The name of the language is now given in the
-       hash.
-       No longer use `$lang' as the name of the language.
-       Rename `$lang_obj' as `$lang'.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attribute `_finish'.
-       (&finish): New.
-       (Automake): Adjust.
-       (&lang_header_finish, &lang_yaccxx_finish, &lang_lexxx_finish)
-       (&lang_asm_finish): Remove.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attribute `extensions'.
-       (Automake): Pass a hash to `&register_language' instead of a
-       list of pseudo assignments.
-       (&register_language): Adjust.
-       (&finish_languages): Initialize `$ltoutarg'.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attribute `output_arg'.
-       (%language_map): Remove.
-       (&register_language): Build only the object, and store in
-       %languages only.
-       (&finish_languages, &handle_single_transform_list): Adjust.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): Add attributes `flags', `compile' and
-       `compiler'.
-       (&finish_languages, &handle_single_transform_list, &handle_dist)
-       (&add_depend2, &register_language): Use them and the `linker' and
-       `pure' attributes.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_single_transform_list, &finish_languages)
-       (&handle_dist, &handle_dependencies): Use the language object for
-       autodep and derived-autodep too.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): Ignore Automake definition for
-       ($var, $cond) if there is already a user definition for ($var, $cond).
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_texinfo_file): Catch @cindex and the like,
-       but also @deffn and so on which push data in indexes.
-       Reported by Derek R. Price.
-
-2001-04-12  Akim Demaille  <address@hidden>
-
-       * automake.in (Language): New package, temporarily in this file.
-       Use Class::Struct.
-       (Automake): New package.
-       (%languages): New.
-       (&handle_single_transform_list): Use the language object's `ansi'
-       attribute instead of `$language_map{"$lang-ansi-p"}'.
-       (&register_language): Build and register the language too.
-
-2001-04-11  Tom Tromey  <address@hidden>
-
-       Fixes report from Larry Jones:
-       * automake.in (handle_dependencies): Add address@hidden@' where
-       appropriate.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Handle BSD-style make.
-
-2001-04-11  Akim Demaille  <address@hidden>
-
-       * depend2.am: Fix the `if' condition for Libtool.
-       Reported by Robert Boehne.
-
-2001-04-10  Robert Collins  <address@hidden>
-
-       * tests/subobj5.test: New file.
-
-2001-04-10  Ralf Corsepius  <address@hidden>
-
-       * m4/make.m4 (AM_MAKE_INCLUDE): Pass `-s' to make.
-       * tests/Makefile.am (TESTS): Added make.test.
-       * tests/make.test: New file.
-
-2001-04-10  Tom Tromey  <address@hidden>
-
-       * tests/defs: Changed how ACLOCAL and AUTOMAKE are set.
-
-2001-04-10  Derek R. Price  <address@hidden>
-
-       * tests/defs: Allow user to override AUTOMAKE and ACLOCAL.
-
-2001-04-10  Akim Demaille  <address@hidden>
-
-       * distdir.am: Add a missing backslash.
-
-2001-04-10  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_aclocal_m4): Handle $relative_dir and special
-       variables.
-       Specify to the caller whether $regen_aclocal_m4.
-       (&handle_configure): Adjust.
-       Transform `REGEN-ACLOCAL-M4'.
-       Reported by Tom.
-       * configure.am: Use it.
-       * tests/defs (me): New.
-       * tests/confdeps.test: New.
-
-2001-04-09  Tom Tromey  <address@hidden>
-
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Use `true', not `:'.
-       Fixes report from Jim Meyering.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_configure): Don't bother with optimizing
-       macro uses.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * tests/cond3.test (expected): Adjust.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_single_transform_list): Remove $xbase,
-       unused.
-       (&handle_source_transform): All the variables have conditions now,
-       simplify.
-       (&variable_delete): Admit an argument @conds.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in ($source_suffix_pattern): Remove, unused.
-       %extension_map seems to have replaced it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * ext-compile.am: New file.
-       * automake.in (&finish_languages): Output it.
-       Require a C linker if there are several registered source suffixes.
-       (&handle_compile): No longer push the `.c', `.o', `.obj', `.lo'
-       extensions, which are discovered in ext-compile.am.
-       With the help from Robert Boehne.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_compile): Extract from...
-       (&get_object_extension): here.
-       (&read_am_file): Call it.
-       ($included_generic_compile, $included_knr_compile)
-       ($included_libtool_compile): Remove.
-       ($get_object_extension_was_run): New.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       Use AM_CONDITIONAL and if/endif for AMDEP.
-
-       * m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
-       * automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
-       to a configure time if/endif), or to `FALSE' (static removal of
-       the code).
-       (&handle_dependencies): Adjust to use `AMDEP_TRUE'.
-       * depend2.am: Use if/endif.
-
-       Adjust the 101 tests that use dependencies so that they
-       properly invoke aclocal before automake.  They need to `see'
-       `AM_CONDITIONAL([AMDEP], ...)'.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * tags.am: Fix missing leading tabs.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in: Use simple quotes to define the _PATTERN variables
-       to unobfuscate the regexps.
-       ($AM_CONDITIONAL_PATTERN): Let the user quote the variable.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&rule_define): When you discover a suffix rules,
-       register the extensions for .SUFFIXES.
-       (&handle_texinfo): Don't register the suffixes.
-       (&get_object_extension): Don't register suffixes, let them be
-       discovered in depend2.am.
-       (&handle_emacs_lisp): Depend on your lisp.am.
-       * lisp.am: Include the rule &handle_emacs_lisp used to output.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * subdirs.am: Don't define info related recursive targets.
-       * texinfos.am: Do.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * subdirs.am (RECURSIVE_TARGETS): New variable.
-       Use it.
-       * automake.in (&handle_subdirs): Output it.
-       (&file_contents_internal): Support value spread on several lines.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_man_pages): Rely on mans.am to define
-       man%SECTION%dir and MANS.
-       * mans.am: Do it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_dump): Use %var_type properly.
-       (&macro_define): Enforce better overriding rules.
-       Handle the special case that used to handle...
-       (&define_pretty_variable): this.
-       Hence, don't.
-       The variables you define are owned by Automake.
-       (&generate_makefile): PRE_INSTALL and co must not be defined *by
-       the user*.
-       (&variable_defined): Now independent of the owner.
-       (&variable_output, &variable_pretty_output): Adjust to %var_type.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (%var_was_plus_eq): Rename as...
-       (%var_type): this.
-       (%def_type): Remove.
-       (&macro_define): %var_type may now hold `', `+', or `:'.
-       (%conditional, %am_vars, %content_lines): Rename as...
-       (%var_value, %var_comment, %var_line): these.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_output): Admit a list of @CONDS.
-       (&variable_pretty_output): New.
-       (&define_pretty_variable): Use it.
-       (&read_am_file, &file_contents_internal): Prepend a separator to
-       $am_vars only if there is none yet.
-       (&file_contents_internal): Rename $separator as $spacing to
-       harmonize with &read_am_file.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Transform DIST, and let the *.am
-       files handle DIST_COMMON.
-       * data.am, header.am, java.am, list.am, python.am, script.am: Set
-       DIST_COMMON.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (%dist_common): Remove.
-       (%configure_dist_common): Replace with...
-       ($configure_dist_common): this.
-       (&generate_makefile): Read the user file before using
-       push_dist_common, as it sets DIST_COMMON, and read_am_file checks
-       that no variable is defined before it is run.
-       (&handle_texinfo): Don't handle DIST_COMMON, let your file do it.
-       (&dist_cmp): Rename as...
-       (&for_dist_common): this.
-       (&handle_dist): Don't handle DIST_COMMON, let `configure.am' do
-       it.
-       Adjust to $configure_dist_common.
-       * configure.am, texi-vers.am: Set DIST_COMMON.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_aclocal_m4): Rename as...
-       (&scan_aclocal_m4): this.
-       Return the list of aclocal.m4 dependencies.
-       (&handle_configure): Invoke it, and use it when loading...
-       * configure.am: Template the rules to recreate aclocal.m4.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&get_object_extension): Use ansi2knr.am.
-       * clean-kr.am, kr-extra.am: Remove, merged into...
-       * ansi2knr.am: this new file.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&transform): Fix an incredible bug which was
-       breaking the if/endif system.
-       ($ELSE_PATTERN): Admit an optional argument.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * comp-vars.am: Remove, merged into...
-       * compile.am: here.
-       * automake.in (&get_object_extension): Adjust.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * remake.am: Merge into...
-       * configure.am: ... here.
-       * automake.in (&handle_configure): Adjust.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&output_lex_build_rule): Output this...
-       * lex.am: New file.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&condition_negate): New.
-       (&variable_conditions_permutations): Use it.
-       (&read_am_file, &file_contents): Use it on `else' clauses to
-       support `if FALSE'.
-       (&output_yacc_build_rule): Output this...
-       * yacc.am: New file.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_paragraphs): Transform TOPDIR_P and TOPDIR.
-       (&handle_dist): Don't.
-       (&handle_clean): Don't handle config.status here, let...
-       * clean.am: ... do it.
-       * distdir.am: Adjust.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in: Use strict vars and subs.
-       Declare `%require_file_found'.
-       (&handle_source_transform, &make_paragraphs): Declare my variables.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
-       * progs.am, python.am: Use if/endif instead of ?INSTALL?.
-       * java.am (_am_installdirs): Be sure to set it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_condition): Return '#' when FALSE.
-       (&conditional_string): Return FALSE, not '#' in the corresponding
-       cases.
-       (&file_contents_internal): Adjust.
-       (&check_variable_defined_unconditional): Dump the guilty variable.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * distdir.am: Use and abuse of if/endif.
-       * scripts.am: Using if/endif with variables is fine.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_paragraphs):  Extract from &file_contents.
-       Make it more robust than the previous RE based scheme.
-       (&file_contents): Use it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_paragraphs):  Extract from &file_contents.
-       Make it more robust than the previous RE based scheme.
-       (&file_contents): Use it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * tests/yacc2.test: Don't define several times a variable, as
-       automake complains.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_source_transform): Fix pr72: don't define
-       $linker if there are no @files.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       Avoid reading twice header-vars.am as now macro_define
-       complains.
-
-       * automake.in (&define_standard_variables): Don't output the
-       variables.
-       (&read_main_am_file): Output first user variables, then Automake
-       variables.
-       Don't call twice &define_standard_variables.
-       Save variable comments in $am_vars.
-       (&variable_output): New.
-       (&file_contents_internal): New.
-       Save variable comments in $am_vars.
-       (&file_contents): Use it.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): The user is allowed to override
-       a value if it was set by Automake, or if it was found in AC_SUBST.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_source_transform): Better locality of the
-       variables.
-       Use `next' to skip nonexistent variables.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_dump): If a variable is undefined, say
-       it.
-       (&check_ambiguous_conditional): Give finer error messages.
-       (&macro_define): Check that a `+=' variable is not set with `='.
-       Check for ambiguous definitions each time you _set_ (even with `+=')
-       a variable.
-       (&read_main_am_file): Perform a deep copy of %conditional.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_defined): Some callers, e.g.,
-       &am_primary_prefixes, really want to know if the variable is
-       defined for any condition, not `TRUE' by default.
-       (&am_primary_prefixes): Give a more precise error message.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       (&variable_conditions): Don't include `FALSE' in the result.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_conditions_reduce): FALSE is absorbent.
-       (&variable_conditions): Don't include `FALSE' in the result.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * tests/defs, tests/depend3.test: Remove useless code.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_source_transform):  Use
-       &variable_conditions, don't read $conditional{$var}.
-       (&variable_conditions_sub): When the call is the top level call,
-       generate all the permutations of the conditions.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * depend2.am (@address@hidden): Define it when GENERIC so
-       that it does not get noticed twice by automake, which now
-       complains for multiple definitions.
-       * tests/vartar.test: s/INSTALL/install/g, automake now complains
-       because we defined INSTALL.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&generate_makefile) Use macro_define to define
-       SOURCES and OBJECTS.
-       (&variable_defined): Don't check for $conditional{VAR}{COND} as
-       this would make perl create $condition{VAR}, which we don't want.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_defined, &define_pretty_variable):
-       Simplify code which used to handle the cases where not all
-       variables were in %conditional.
-       (&define_variable): Use &define_pretty_variable.
-       (&variable_conditions_sub, &variable_value_as_list_worker)
-       (&variable_value_as_list, &rule_define): Simplify syntax.
-       (&read_main_am_file): Dump the guilty predefined variables.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_conditions_sub)
-       (&variable_value_as_list_worker): Remove dead code which used to
-       handle the cases where not all variables were in %conditional.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_source_transform, &read_main_am_file):
-       Simplify loops which were split in two parts, conditional vs
-       unconditional variables.
-
-2001-04-09  Akim Demaille  <address@hidden>
-
-       Handle unconditional values of variables as conditioned by
-       `TRUE'.
-
-       * automake.in (%contents): Remove.
-       (&generate_makefile, &handle_ltlibraries, &macro_define)
-       (&read_am_file, &variable_defined, &variable_conditions_sub)
-       (&variable_value, &variable_value_as_list_worker)
-       (&variable_value_as_list, &define_pretty_variable)
-       (&read_main_am_file): Use
-       $conditional, not %contents.
-       (&variable_conditions_permutations): Don't return TRUE and FALSE.
-       (&variable_conditionally_defined): New.
-       (&handle_dist): Use it.
-       (&check_ambiguous_conditional): When multiply defined, specify
-       under which condition.
-       (&macro_define): Use it.
-       (&variable_delete): New.
-       (&read_am_file): Use it.
-       (&am_install_var): Simplify, as all the variables are in
-       %conditional now.
-
-2001-04-07  Tom Tromey  <address@hidden>
-
-       * tests/Makefile.am (XFAIL_TESTS): Added man.test.
-       (TESTS): Likewise.
-       * tests/man.test: New file.
-
-2001-04-07  Raja R Harinath  <address@hidden>
-
-       * depcomp (gcc3): Invert test condition.
-
-2001-04-07  Tom Tromey  <address@hidden>
-
-       * depcomp (gcc3, gcc): Don't assume $? will be set in `if'
-       statement.  Report from Larry Jones.
-
-2001-04-07  Raja R Harinath  <address@hidden>
-
-       * depcomp (sgi): Fix sed expression.  Report from Robert Boehne.
-
-2001-04-01  Tom Tromey  <address@hidden>
-
-       * java.am (.PHONY clean-am): Removed trailing ":".
-       From Per Bothner.  Fixes PR automake/139.
-
-2001-03-28  Akim Demaille  <address@hidden>
-
-       * program.am: Fix a stupid typo: now *all* (not none) the programs
-       use `$(EXEEXT)'.
-       Reported by Robert Boehne.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file, &file_contents): Avoid name clashes
-       on $cond.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_conditionally_defined): Rename as...
-       (&check_variable_unconditionally_defined): this.
-       (&variable_dump): Fix the output.
-       (&variable_defined, &macro_define): Since conditions are
-       canonicalized, don't use a loop to look for a condition: read the
-       hash.
-       (&macro_define, &rule_define, &read_am_file, &file_contents):
-       Rename $cond_string as $cond.
-       * distdir.am (PACKAGE, VERSION): Remove; since they are already
-       discovered via AC_SUBST, they now trigger a `defined twice' error.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_footer, &handle_installdirs)
-       (&read_main_am_file): Don't read %contents directly, use
-       &variable_value.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file): Define the variables in a single
-       shot.
-       Factor the $saw_bk code.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file): Keep $cond_string up to date.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&define_variable): Use &macro_define.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): Don't lose the location if we
-       redefine a variable.
-       Don't push all the variables in @var_list, let...
-       (&read_am_file, &file_contents): ... do it.
-       (&define_pretty_variable): Use macro_define.
-       (&am_install_var): Delete the value of variables being redefined
-       to pacify &macro_define which checks that variables are not
-       doubly defined.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&conditional_dump): Rename as...
-       (&variables_dump): this.  Use...
-       (&variable_dump): this new sub.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Maintain $cond_string sync with
-       @cond_stack.
-       Output rules only if not under `FALSE'.
-       Define variables under $cond_string.
-       * scripts.am: For the time being if/endif does not work properly
-       with macros.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (IF_PATTERN): Unobfuscate the parens.
-       (ENDIF_PATTERN): Allow a condition to be specified.
-       (&file_contents): Use a @cond_stack.
-       (&transform): At least for an easy transition, also transform
-       %?FOO% and %!FOO%, as suggested by Lars.
-       * scripts.am: First test bed for static if/endif use.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Use rule_define.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): Don't rely on $1.
-       Initialize the variable.
-       Set its Automakism only if not defined or if given to the user.
-       When concatenating values, insert a separator only if the value
-       was not empty.
-       (&read_am_file): When dumping the @var_list, skip Automake
-       variables.
-       (&file_contents): Use macro_define.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&rule_define): Extract from...
-       (&read_am_file): here.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define, &read_am_file): More work for the
-       former from the latter.  Reorganize the latter.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&macro_define): Extract from...
-       (&read_am_file): here.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (%am_var_defs): Replace with...
-       (%var_is_am): this.
-       (&handle_installdirs, &variable_value_as_list_worker, &read_am_file)
-       (&file_contents, am_primary_&prefixes): Adjust.
-       (&variable_defined, &define_variable): The actual semantics is
-       `user defined'.
-       (&read_main_am_file): Assert the var is user defined when
-       outputting @var_list.
-
-2001-03-23  Akim Demaille  <address@hidden>
-
-       * automake.in (read_am_file): TRUE and FALSE are predefined
-       conditionals.
-       (&by_condition): Adjust.
-       (&conditional_string): Recognize `TRUE' and `FALSE'.
-       (&make_condition): Use it.
-       * m4/cond.m4: Reject TRUE and FALSE as conditionals.
-       * automake.texi (Conditionals): Adjust.
-       * tests/cond9.test: s/FALSE/WRONG/.
-
-2001-03-12  Pavel Roskin  <address@hidden>
-
-       * tests/Makefile.am (XFAIL_TESTS): Remove cond3.test, it passes
-       now.
-
-2001-03-12  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_conditions_permutations): Separate the
-       conditions.
-       * tests/cond3.test: Improve the sed expression.
-
-2001-03-09  Pavel Roskin  <address@hidden>
-
-       * Makefile.am (maintainer-check): Scan all *.am files and tests
-       for invocations of `rm' without `-f'.
-       * tests/mclean.test: Adjusted to prevent triggering the above
-       test.
-
-2001-03-09  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Fixed comment to avoid
-       maintainer-check failure.
-
-2001-03-09  Akim Demaille  <address@hidden>
-
-       * tests/cond3.test: Strengthen.
-
-2001-03-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&conditional_string): Produce a unique string
-       characterizing a condition stack.
-       (&conditional_same): Remove, comparing two strings is now enough.
-       (&variable_defined): Adjust.
-       (&read_am_file): Use conditional_string.
-
-2001-03-08  Akim Demaille  <address@hidden>
-
-       * automake.in: Use -w.
-       Normalize all use of `$lang . '-foo'' into `"$lang-foo"'.
-       (&parse_arguments): Support --Werror and --Wno-error as a
-       temporary hack until --warning/-W is properly implemented.
-       (&handle_single_transform_list): Prototype.
-       Be sure to define $directory.
-       Use `exists' instead of testing the value of a maybe undefined
-       hash value.
-       (&add_depend2, &handle_configure, &handle_footer, &file_contents)
-       (&handle_factored_dependencies): Use defined values.
-       (&scan_one_autoconf_file): Save $_.
-       * tests/lex2.test, tests/sinclude.test, tests/suffix3.test:
-       Run automake with --Wno-error.
-
-2001-03-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_all): Use an array instead of a scalar for
-       local_headers.
-       Get rid of all-redirect: let `all' be that target.
-
-2001-03-07  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_merge_targets): Ventilate its non `all'
-       related content into...
-       (&generate_makefile): here.
-       (&handle_merge_targets): Rename as...
-       (&handle_all): this.
-       Remove a useless `if': address@hidden' is obviously not empty, since it
-       contains at least the `basename ($makefile)' which has just been
-       unshifted.
-
-2001-03-07  Akim Demaille  <address@hidden>
-
-       * automake.in, aclocal.in: Backquote is inert in double quotes.
-
-2001-03-06  Akim Demaille  <address@hidden>
-
-       * Makefile.am (maintainer-check): Simplify `grep -v ... | grep .'
-       into `grep -v ...'.
-
-2001-03-06  Pavel Roskin  <address@hidden>
-
-       * java.am: Use `rm -f' instead of `rm'.
-
-2001-03-06  Akim Demaille  <address@hidden>
-
-       * automake.in (&push_dist_common): Simplify.
-
-2001-03-06  Jens Krüger <address@hidden>
-
-       * ltlib.am: Replaced spaces with tab.
-
-2001-03-06  Pavel Roskin  <address@hidden>
-
-       * tests/Makefile.am (XFAIL_TESTS): noinstdir.test removed, it's
-       fixed now.
-
-2001-03-05  Pavel Roskin  <address@hidden>
-
-       * header.am, scripts.am: Use ?INSTALL? in the install and
-       uninstall rules.
-
-2001-03-05  Pavel Roskin  <address@hidden>
-
-       * tests/copy.test: Never use `rm' without `-f' - it may ask
-       questions, notably for read-only files during `make distcheck'.
-       * tests/insh.test: Likewise.
-       * tests/installsh.test: Likewise.
-       * tests/symlink.test: Likewise.
-       * tests/symlink2.test: Likewise.
-       * tests/symlink3.test: Likewise.
-
-2001-03-05  Pavel Roskin  <address@hidden>
-
-       * noinstdir.test: New test.
-       * tests/Makefile.am (TESTS): Add noinstdir.test.
-       (XFAIL_TESTS): Likewise.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_options): Change the RE so that the third
-       part of the versions always exist.
-       (&file_contents): Don't pass uninitialized values to &transform.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Require a hash as second argument.
-       Adjust callers.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       Always use hashes with &file_contents.
-
-       * automake.in (&handle_texinfo): texibuild.am does not need
-       TEXINFODIR.
-       texinfos.am wants only TEXICLEANS.
-       (&handle_dist, &add_depend2, &handle_clean): Replace $xform with
-       %transform.
-       * texinfos.am: Adjust.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_programs, &handle_libraries, &handle_tags)
-       (&handle_ltlibraries, &handle_emacs_lisp, &handle_python): Adjust.
-       (&am_install_var): Forget about `-clean'.
-       Transform ?INSTALL?.
-       Always output the *.am file.
-       * data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
-       * ltlib-clean.am, progs-clean.am, python-clean.am, tags-clean.am:
-       Remove, merged into the corresponding *.am file.
-       * data.am, libs.am, ltlib.am, progs.am, python.am: Equip with
-       ?INSTALL?.
-
-2001-03-05  Pavel Roskin  <address@hidden>
-
-       * Makefile.am (amfiles): Add configure.am. Sort alphabetically.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       If OBJEXT and EXEEXT are not set, provide a default value, and use
-       them unconditionally.
-
-       * automake.in (&generate_makefile): Provide default values for
-       EXEEXT and OBJEXT.
-       (&get_object_extension, &finish_languages)
-       (&handle_single_transform_list, &handle_programs, &add_depend2)
-       (&check_cygnus, &lang_c_finish, am_install_var): Don't bother with
-       them, they are defined.
-       * compile.am, depend2.am, program.am, progs.am: Likewise.
-       * remake-hdr.am: Fix a typo.
-       * tests/cxxo.test, tests/fo.test, tests/implicit.test,
-       * tests/interp.test, tests/subobj.test, tests/subobj2.test,
-       * tests/suffix2.test: Adjust.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Map MAINTAINER-MODE to
-       @MAINTAINER_MODE_TRUE@ or nothing.
-       * configure.am, remake-hdr.am, remake.am, texi-vers.am: Adjust.
-       Suggested by Tom.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&do_one_merge_target): Remove, was only called from...
-       (&handle_merge_targets): here for `all'.
-       Adjust.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       Make the installation/uninstallation of Info pages follow the
-       regular am/recursive scheme.
-
-       * automake.in (%required_targets, %dependencies): Add
-       install-info.
-       (%dependencies): Add install-info, install-info-am, and
-       unstall-info.
-       (&handle_subdirs): Don't transform INSTALLINFO, which mapping was
-       reversed BTW.  Does anybody use the option `no-installinfo'?
-       (&handle_merge_targets): Let the handling of info related targets
-       to...
-       (&handle_factored_dependencies): this.
-       * subdirs.am: Use ?INSTALL-INFO?.
-       * texinfos.am: Define the install-info, uninstall-info and
-       uninstall-info-am targets.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (%required_targets, %dependencies): Add dvi, info,
-       dvi-am, info-am.
-       (@info, @dvi): Remove.
-       (&handle_texinfo, &handle_merge_targets): Adjust.
-       (&handle_factored_dependencies): Required targets are phony.
-       * texinfos.am: Build info, dvi, and the corresponding -am or
-       -recursive targets.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Remove $cygxform, unused.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Transform LIBTOOL.
-       (&am_install_var): Remove $ltxform.
-       * ltlib.am, progs.am: Adjust.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in: Require AC_PROG_INSTALL in...
-       (&scan_autoconf_files): here.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * configure.am: New file.
-       * automake.in (&file_contents): Transform CONFIGURE-AC.
-       (&handle_texinfo, &handle_configure): Don't transform
-       CONFIGURE_AM.
-       (&handle_configure): Use `configure.am'.
-       * remake-hdr.am, remake.am, texi-vers.am: Adjust to
-       MAINTAINER-MODE and CONFIGURE-AC.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&pretty_print_internal): Don't output useless
-       spaces.
-       (define_pretty_variable): Don't issue the space after the `=' sign
-       to avoid trailing spaces in Makefile.ins.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&generate_makefile): Invoke &initialize_per_input
-       *before* setting $am_file_name and $in_file_name.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in ($in_file_name, $am_file_name, $relative_dirs):
-       Globals, initialized...
-       (&initialize_per_input): here.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in ($am_relative_dir): Global.
-       (&initialize_per_input): Init it.
-       (%make_list, @make_input_list): My them from
-       (&scan_autoconf_files): here.
-       (&require_file_internal): Mying changes.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (%am_vars, @var_list, %def_type): Globals.
-       (&initialize_per_input): Initialize them.
-       (&read_main_am_file): Don't local them.
-       (&get_object_extension): $objext is private.
-       (&handle_single_transform_list): $lang is.
-       (&handle_ltlibraries): $libname_rx is.
-       (&scan_autoconf_config_files): How about actually paying attention
-       to your arguments, instead of working on $_? (this is no Perl
-       variable, it's a Perl variable followed by a question mark).
-       (&file_contents): $contents and $separator are private.
-       (&am_install_var): Declare @condvals, not $condvals.
-       (%make_dirs): My.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&initialize_per_input): Move to the top.
-       Precede with the `my' list of its variables.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in ($am_file): Use vars.
-       ($am_file_name, $in_file_name): Private to &generate_makefile.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in: Preparation for `use strict': Move the
-       initialization of the constants to the top, from...
-       (&initialize_global_constants): here.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_single_transform_list, &add_depend2): Let
-       $lang_specific_files{$lang} be a list instead of a string.
-
-2001-03-05  Akim Demaille  <address@hidden>
-
-       Let's make it run ten times faster...
-
-       * automake.in (&transform): Be sure to remove the `\n' with ?FOO?
-       transformations.
-       (&file_contents): Let `$command' remove the Automake commands, and
-       normalize the series of `\n'.
-       Slurp the file and apply $command in a single step.
-       No longer apply the address@hidden@' transformation which
-       is already normalized to be handled by &transform.
-
-2001-03-05  Tom Tromey  <address@hidden>
-
-       * automake.in (register_language): Add entry for `-pure'.
-       Added `pure=yes' entries for cxx, objc, f77, ppf77, ratfor, java.
-       (finish_languages): Use `-pure' field of language map.
-
-2001-03-03  Tom Tromey  <address@hidden>
-
-       * tests/yaccvpath.test: No need to remove dummy files.
-       * tests/subobj3.test: No need to remove dummy files.
-       * tests/pr9.test: No need to remove dummy files.
-       * tests/pr87.test: No need to remove dummy files.
-       * tests/pr19.test: No need to remove dummy files.
-       * tests/install2.test: No need to remove dummy files.
-       * tests/defs: Actually copy in install-sh, mkinstalldirs, missing,
-       and depcomp.
-
-2001-02-27  Pavel Roskin  <address@hidden>
-
-       * tests/yaccvpath.test: Add a delay to make parse.c really out
-       of date. Detect the problem earlier, after `make distdir'. Drop
-       dependency on flex. Always use the `-y' flag for bison. Comment
-       changes.
-       * tests/Makefile.am: Add yaccvpath.test to XFAIL_TESTS.
-
-2001-03-02  Jens Krüger <address@hidden>
-
-       * depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo.
-
-2001-02-28  Akim Demaille  <address@hidden>
-
-       * automake.in (&add_depend2): Transform `GENERIC'.
-       Get rid of the ad hoc transformation of address@hidden@.o:' which in
-       addition was broken by the `@ -> %' patch.
-       * depend2.am: Adjust to use ?GENERIC?.
-
-2001-02-28  Akim Demaille  <address@hidden>
-
-       * Makefile.am (maintainer-check): `undef $/' is OK.
-
-2001-02-28  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_configure): Fortunately, $top_reldir,
-       the definition of which was highly suspicious, was unused.
-
-2001-02-27  Akim Demaille  <address@hidden>
-
-       * automake.in (%exec_dir_p): Move to the top so that it is visible
-       to all routines.
-
-2001-02-27  Pavel Roskin  <address@hidden>
-
-       * tests/yaccvpath.test: Prevent automake from looking into ..
-       and ../.. by using AC_CONFIG_AUX_DIR in configure.in.
-
-2001-02-27  Akim Demaille  <address@hidden>
-
-       * automake.in (%exec_dir_p): Pulled out from...
-       (&am_primary_prefixes): here.
-
-2001-02-27  Akim Demaille  <address@hidden>
-
-       * automake.in (&usage): Display $0, not $me.
-
-2001-02-27  Akim Demaille  <address@hidden>
-
-       * mans.am: s/INSTALL_MAN/INSTALL-MAN/.
-       * automake.in (&handle_clean): Don't escape what's given to
-       &transform.
-
-2001-02-27  Akim Demaille  <address@hidden>
-
-       Distinguish automake substitutions from config.status
-       substitutions.
-
-       * automake.in (&add_depend2): Transform AMDEP.
-       (&handle_clean): Transform MCFILES and MFILES.
-       (&file_contents): Transform MAINTAINER_MODE.
-       (&transform, &am_install_var): Use `%', not `@'.
-       Adjust all the *.am files.
-       * clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
-       * depend2.am: Display the double dependency on both ?AMDEP? and
-       @address@hidden
-
-2001-02-27  Tom Tromey  <address@hidden>
-
-       * distdir.am (distcheck): Fixed new code.
-
-       * tests/yaccvpath.test: Fail gracefully if bison/flex not found.
-       Only configure once.
-
-       * distdir.am (distcheck): Print error message if distclean failed
-       to fully clean.
-
-2001-02-27  Pavel Roskin  <address@hidden>
-
-       * tests/Makefile.am (TESTS): s/yaccpvath/yaccvpath/.
-
-2001-02-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/Makefile.am (TESTS): Added yaccvpath.test.
-       * tests/yaccvpath.test: New file.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Recognize whether predefined
-       directories are `data' or `exec'.
-       * libs.am, ltlib.am, progs.am, python.am, scripts.am: Install
-       ?EXEC?.
-       * tests/instdata2.test: Update.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * texinfos.am: No ?EXEC? hook as currently installing TEXINFOS is
-       necessarily in infodir.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in ($am_file): Be `local', as my'd variables used in
-       `foreach' loops are always private to the loop.
-
-2001-02-26  Pavel Roskin  <address@hidden>
-
-       * Makefile.am: Add install.am.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&target_cmp, &dist_cmp): Do not prototype comparing
-       routines, otherwise the elements to compare are passed in @_
-       instead of $a and $b.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (%required_targets): `installcheck-am' is needed.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&transform_cond): Merge into...
-       (&transform): this.
-       Adjust all uses.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_dist): Use &transform instead of dedicated
-       magic for DISTDIRS.
-       But be sure to always do it.
-       * distdir.am: Adjust.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in: Use File::Basename.
-       (&dirname, &basename): Remove.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in ($me): New.
-       Use it.
-       (&usage): Display your full name.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.texi (Invoking Automake): Remove dead options.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_texinfo_file): Also compute the list of files
-       to clean.
-       Handle local errors.
-       (&handle_texinfo): Use it.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in: Don't pass arguments to...
-       (&parse_arguments): Work on @ARGV.
-       Use Getopt.
-       Add support for `-f'.
-       (&version): New.
-       (&usage): Update.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
-       handle installcheck and installcheck-am.
-       * install.am: Do it.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
-       handle install and install-am.
-       * install.am: Do it.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
-       work on targets handled by %dependencies.
-       (&handle_factored_dependencies): Do it.
-       * install.am: Install install-exec, install-data and uninstall's
-       suites.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_merge_targets): Move `install-strip' from
-       here...
-       * install.am: to here.
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * automake.in (@installdirs): Remove.
-       (&file_contents): Be able to grow Automake macros with `+='.
-       (&handle_texinfo, &handle_man_pages, &am_install_var): Let your
-       files define _am_installdirs.
-       (&handle_installdirs): Remove the code, just output `install.am'.
-       * install.am: New.
-       * data.am, header.am, libs.am, lisp.am, ltlib.am, mans.am, progs.am,
-       * python.am, scripts.am, texinfos.am: Extend $(_am_installdirs).
-
-2001-02-26  Akim Demaille  <address@hidden>
-
-       * tests/instdata2.test (libexec_DATA): Exercise more
-       possibilities.
-
-2001-02-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * header-vars.am (INSTALL_STRIP_FLAG): Remove (obsolete).
-
-2001-02-25  Tom Tromey  <address@hidden>
-
-       * tests/instdata2.test: Added `sbin_DATA' check.
-
-       * tests/Makefile.am (TESTS): Added subdircond.test.
-       * tests/subdircond.test: New file.
-       * automake.in (handle_gettext): Don't fail if SUBDIRS
-       conditionally defined.
-
-       * automake.in: Use IO::File.
-       (generate_makefile): Use IO::File.
-       (scan_texinfo_file): Likewise.
-       (handle_aclocal_m4): Likewise.
-       (scan_autoconf_traces): Likewise.
-       (scan_one_autoconf_file): Likewise.
-       (read_am_file): Likewise.
-       (file_contents): Likewise.
-       (create): Likewise.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): Remove code handled by texinfos.am.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&transform): Also call &transform_cond on your
-       arguments.
-       (&handle_dist): Adjust.
-       (&handle_factored_dependencies): Uniq dependencies.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_gettext): Simplify redundant `if'.
-       Used &variable_value, don't read %contents directly.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in ($install_recursive): Remove, replaced with calls to
-       `&variable_defined ('SUBDIRS')'.
-       (&handle_dist, &handle_clean): Don't transform_cond SUBDIRS since...
-       (&file_contents): now does.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_man_pages): $found is dead.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       Internally just store the conditionals as space separated lists of
-       CONDITIONS (instead of @CONDITIONS@).
-
-       * automake.in (&conditional_true_when, &variable_conditions_sub):
-       Split conditions at spaces.
-       (&handle_dependencies, &variable_conditions_permutations): Don't
-       put @ around conditions.
-       (&variable_conditions_cmp): There are no @ to strip.
-       (&make_condition): New.
-       (&define_pretty_variable, &read_main_am_file, &read_am_file): Use
-       it.
-       (&read_main_am_file, &read_am_file): Stop playing with @ by hand.
-       Join @conditional_stack with spaces.
-       (&read_main_am_file): Adjust the output of variables.
-       Output `TRUE = true' under the condition `TEST' as address@hidden@TRUE =
-       true' and no longer address@hidden@TRUE = @address@hidden'.
-       (&variable_conditions_cmp): Rename as...
-       (&by_condition): this.
-       Sort in a human pleasant order.
-       Use it everywhere a human can see conditions.
-       (&variable_conditions_reduce): Don't sort conditions, that's
-       pointless.
-       * tests/cond.test, ctarget1.test, pluseq3.test: Strengthen.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in: `my' the globals.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&initialize_per_input): %targets_conditionals is
-       new.
-       (&read_am_file): When slurping a rule, set the target related
-       variable, and no variable related variable.
-       (&file_contents): Likewise.
-       * tests/vartar.test, tests/ctarget1.test: New.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&variable_defined, &variable_value_as_list_worker):
-       If $VAR is effectively a variable, don't die if it's also a
-       target.
-       Plus some formatting changes.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in: Mying changes.
-       * Makefile.am (maintainer-check): Check the stability of the
-       number of uses of `local'.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in: Mying changes.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in: Mying changes.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in: Mying changes.
-       (&handle_tags): Fix a bug uncovered by the previous mying changes:
-       transform CONFIG into $config, not $xform.
-
-2001-02-25  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_texinfo, &handle_man_pages, &am_install_var):
-       Don't deal with install-data-am, install-exec-am and unstall-am.
-       (&initialize_per_input): Add them to %dependencies.
-       Remove %exec_dir_p since the *.am files are now in charge of it.
-       Remove @uninstall, @install_data, @install_exec.
-       (&handle_merge_targets): Adjust to these removals.
-       (&file_contents): Also &transform_cond for --no-installman and
-       --no-installinfo.
-       (&do_one_merge_target): Add some magic to install hooks on
-       %dependencies' targets.
-       (%required_targets): New.
-       (&handle_factored_dependencies): Output required targets.
-       * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
-       * mans-vars.am, mans.am, progs.am, python.am, scripts.am,
-       * texinfos.am: Declare your dependencies on install-data-am,
-       install-exec-am and uninstall-am.
-       * tests/instdata2.test (incldata_HEADERS): New test.
-
-2001-02-24  Tom Tromey  <address@hidden>
-
-       * Makefile.am (amfiles): Added texibuild.am.
-       * texibuild.am: New file.
-       * tests/Makefile.am (TESTS): Added texinfo9.test.
-       * tests/texinfo9.test: New file.
-       * automake.in (handle_texinfo): Keep track of suffixes used.  Give
-       error if suffix unrecognized.  Removed extraneous newline.
-
-2001-02-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&am_install_var): Don't hook on the clean targets
-       and .PHONY.
-       * data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
-       * ltlib-clean.am, progs-clean.am, python-clean.am, tags-clean.am:
-       Do it.
-
-2001-02-23  Akim Demaille  <address@hidden>
-
-       * automake.in: Promote local `my' over `local'.
-
-2001-02-23  Akim Demaille  <address@hidden>
-
-       * automake.in: Formatting and mying changes.
-
-2001-02-23  Akim Demaille  <address@hidden>
-
-       * automake.in: Formatting and mying changes.
-
-2001-02-23  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_man_pages): Let install-man and
-       uninstall-man be handled by the dependency tracker.
-       (&initialize_per_input): Let %dependencies track them.
-       * mans.am: Add the needed hooks with the proper dependencies.
-
-2001-02-22  Pavel Roskin  <address@hidden>
-
-       * tests/target-cflags.test: Don't use subshell to configure in
-       subdirectory. Typo fix - run `./foo', not `/foo'.
-
-2001-02-22  Akim Demaille  <address@hidden>
-
-       * automake.in: Formatting and mying changes.
-
-2001-02-21  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Introduce new variable to avoid extra
-       keys in %dist_dirs.  Fixes distdir.test.
-
-       * automake.in (handle_texinfo): Only remove suffixes we can
-       handle.
-
-       * tests/distdir.test: Check to make sure directory isn't made in
-       build directory.
-
-       * automake.in (handle_dist): Do nothing in Cygnus mode.
-
-2001-02-21  Pavel Roskin  <address@hidden>
-
-       * header-vars.am: Remove tabs before variable definitions.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * tests/distdir.test (EXTRA_DIST): Use a finer pattern to avoid
-       false diagnostics.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&dist_cmp, &target_cmp): Be sure to return a
-       numeric value as required by Perl 5.6.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * dist-vars.am: Remove, merge into...
-       * distdir.am: this.
-       * automake.in (dirname, basename, backname): Move to the top of
-       the file so that prototypes are checked,
-       Use them without `&'.
-       (&handle_dist): Adjust.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&check_ambiguous_conditional, &read_main_am_file):
-       Use a uniform naming scheme.
-       (&quote_cond_val, &unquote_cond_val): Delete, dead code.
-       (&read_am_file): Fix conditional definition of backslash continued
-       items.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       Change the handling of conditionals: instead of using an ad-hoc
-       encoding to store a hash in a string, use hashes.
-
-       * automake.in (&conditional_dump): New.
-       (&check_ambiguous_conditional, &variable_defined)
-       (&variable_conditions_sub, &variable_value_as_list_worker)
-       (&define_variable, read_am_file, &read_main_am_file): Be sure to
-       handle `$conditional{$vars}' as a hash instead of a plain string.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&conditional_true_when): Modernize, simplify.
-       Warning: `$comp' is now private (my), while it used to be
-       `inherited' from a `local' elsewhere in the code.  AFAICT it was
-       wrong, but some dirty side effect might show up.
-       (&conditionals_true_when): New.
-       (&variable_conditions_sub, &variable_conditions_reduce): Use it.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in ($top_builddir): Remove, used in one place.
-       (&define_standard_variables): Adjust.
-       Move the definition of triplet variables into...
-       * header-vars.am: here.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&initialize_global_constants): Don't define $USAGE.
-       (&usage): Handle the former content of $USAGE.
-       Don't pretend autoconf cares about Makefile.in.
-       Classify the options.
-       (&handle_tests): Formatting and mying changes.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&handle_tests_dejagnu): Move the definition of a
-       default `site.exp' into...
-       * dejagnu.am (site.exp): here.
-       Use DOS compliant file names.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&dist_cmp): New.
-       (&handle_dist): Use it.
-       Promote `my' over `local'.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * dist.am: Remove, merge into...
-       * distdir.am: here.  Use the neat sed snippet for banners.
-       BTW, distcheck is phony.
-       * automake.in (&handle_dist_worker): Remove, merge into...
-       (&handle_dist): this.
-       (&file_contents): Strip leading new lines.
-       Be sure to end comments with new lines.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * distdir.am (GZIP_ENV): Define.
-       * automake.in (&handle_dist): Don't.
-       (&uniq): New.
-       (&handle_dist_worker, &am_install_var): Use it.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * distdir.am (distdir): Handle the DIST-TARGETS.
-       * automake.in (&handle_dist_worker): Don't.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Transform the global options (such
-       as CYGNUS).
-       (&handle_texinfo, &handle_dist_worker, &handle_tests_dejagnu): Don't.
-
-2001-02-21  Akim Demaille  <address@hidden>
-
-       * distdir.am (distdir): Be sure to have permissive rights on its
-       contents.
-       (dist-all, dist-bzip2, dist-zip, dist-tarZ): New conditional
-       targets.
-       And BTW, all these guys are phony.
-       * automake.in (&handle_dist_worker): As its name doesn't indicate,
-       output distributions.
-       (&handle_dist): As its name doesn't indicate, don't.
-       (&initialize_global_constants): Don't define variables which
-       content is now handled by distdir.am.
-       But register `dist-all' as a factored target.
-       (&handle_factored_dependencies): Don't output empty targets.
-
-2001-02-20  Tom Tromey  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Simplify m4_pattern_allow
-       invocation.
-
-2001-02-18  Tom Tromey  <address@hidden>
-
-       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Don't call AM_PROG_STRIP.
-       Set INSTALL_STRIP_PROGRAM_ENV to `$(STRIP)', not `$STRIP'.
-       (AM_PROG_STRIP): Commented out.
-
-2001-02-17  Raja R Harinath  <address@hidden>
-
-       * depcomp (gcc3): Protect against the compiler deleting
-       the dependency output file.
-
-2001-02-17  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): Use double quotes around
-       setting of INSTALL_STRIP_PROGRAM.
-       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Set INSTALL_STRIP_PROGRAM
-       to absolute path at runtime.
-       (AM_PROG_STRIP): Don't explicitly test $STRIP.
-
-2001-01-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/strip.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Add strip.m4.
-       * m4/init.m4: Call AM_PROG_INSTALL_STRIP.
-       * m4/missing.m4 (AM_AUX_DIR_EXPAND): New function.
-       * automake.in (handle_merge_targets): In the install-strip rule,
-       set INSTALL_PROGRAM to INSTALL_STRIP_PROGRAM, and INSTALL_PROGRAM_ENV
-       to INSTALL_STRIP_PROGRAM_ENV; don't use INSTALL_STRIP_FLAG.
-       * progs.am (address@hidden@PROGRAMS): Adapt to use INSTALL_PROGRAM_ENV,
-       don't use INSTALL_STRIP_FLAG any longer.
-
-2001-02-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Unquote AC_CONFIG_AUX_DIR's
-       argument.
-
-2001-02-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (unquote_m4_arg): New function.
-       (scan_one_configure_file): Call unquote_m4_arg on
-       AM_CONFIG_HEADER argument, so that AM_CONFIG_HEADER([foobar.h])
-       works.
-
-2001-02-15  Tom Tromey  <address@hidden>
-
-       * config.guess, config.sub: New versions from FSF.
-
-       * Makefile.am (WGET): New macro.
-       (FETCHFILES): New macro.
-       (fetch): New target.
-
-       * tests/subobj3.test: Exit with status 77 if gcc not found.
-       * tests/pr9.test: Exit with status 77 if gzip not found.
-       * tests/pr87.test: Exit with status 77 if gcc not found.
-       * tests/pr19.test: Exit with status 77 if gzip or gcc not found.
-       * tests/install2.test: Exit with status 77 if gzip not found.
-       * tests/exsource.test: Exit with status 77 if GNU make not found.
-       * tests/ansi3.test: Exit with status 77 if gcc not found.
-
-       * tests/target-cflags.test: Require GNU make.  Exit with status 77
-       if gcc or make not found.  Fixes PR automake/121.
-
-       * configure.in: Require Perl 5.005.
-       * automake.in: Require 5.005.
-
-       * automake.texi (Top): Conditionalize on `nottex', not `info'.
-       Fixes PR automake/122.
-
-2001-02-14  Tom Tromey  <address@hidden>
-
-       * automake.in (add_depend2): Only emit a given object rule once.
-       Fixes specflags6.test.
-
-2001-02-14  Richard Boulton  <address@hidden>
-
-       * tests/specflags6.test: New file.
-
-2001-02-14  Tom Tromey  <address@hidden>
-
-       * automake.texi (A Shared Library): Mention -module.
-
-2001-02-13  Tom Tromey  <address@hidden>
-
-       * automake.in (do_one_merge_target): Always register $name and
-       $name-am as phony.
-
-       * automake.in (do_one_merge_target): Register `all' as phony
-       target.
-
-       * configure.in: Updated to 1.4e for cvs.
-
-2001-02-12  Tom Tromey  <address@hidden>
-
-       * configure.in: Updated to 1.4d and released.
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly allow various AM_*
-       names through autoconf.
-
-       Fix for subdirbuiltsources.test:
-       * automake.in (initialize_per_input): [all_target] Initialize to
-       empty string.
-       (handle_merge_targets): Use all-redirect target to handle built
-       sources.
-       (do_one_merge_target): Don't generate all-redirect rule.
-
-2001-02-11  Peter Muir  <address@hidden>
-
-       * tests/subdirbuiltsources.test: New file.
-       * tests/Makefile.am (TESTS): Added new file.
-
-2001-02-10  Tom Tromey  <address@hidden>
-
-       * tests/condlib.test: New file.
-       * tests/Makefile.am (TESTS): Added new file.
-
-2001-02-10  Lars J. Aas  <address@hidden>
-
-       * automake.in ($MACRO_PATTERN): Include '@' in name regex.
-       (&canonicalize): New. Includes '@' in canonical range.
-       (&check_canonical_spelling, &handle_programs, &handle_libraries,
-       &handle_ltlibraries, &handle_texinfo): Use &canonicalize.
-
-2001-02-10  Raja R Harinath  <address@hidden>
-
-       * automake.in (handle_configure): Revert part of
-       '2001-02-04  Kevin Ryde <address@hidden>'.  Don't
-       set CONFIG_COMMANDS explicitly.
-
-2001-02-09  Raja R Harinath  <address@hidden>
-
-       * depcomp (gcc3): Propagate exit code.
-
-2001-02-09  Lars J. Aas  <address@hidden>
-
-       * header.am (address@hidden@HEADERS): s,?!NOBASE?,?!BASE?, (typo)
-
-2001-02-09  Tom Tromey  <address@hidden>
-
-       Clean up maintainer-check warnings:
-       * Makefile.am (maintainer-check): Ignore comment lines in CDPATH
-       check.
-       * automake.in (handle_dist_worker): Removed redundant `my $xform'.
-
-2001-02-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&file_contents): Remove a dead branch.
-
-2001-02-09  Akim Demaille  <address@hidden>
-
-       * automake.in (&transform): Use `my', not `local'.
-       (&transform_cond): New.
-       (&get_object_extension, &handle_texinfo, &handle_tags)
-       (&handle_dist_worker, &handle_dist, &add_depend2, &handle_clean)
-       (&handle_tests_dejagnu): Use it.
-       * texinfos.am, lisp.am, header.am, dist.am, distdir.am, depend2.am
-       * dejagnu.am, data.am, clean.am: Adjust to the new syntax.
-
-2001-02-09  Akim Demaille  <address@hidden>
-
-       * automake.in: Various formatting changes, and modernization of
-       Perl constructs.
-       (&backname): New.
-       (&handle_configure, define_standard_variables): Use it.
-
-2001-02-08  Tom Tromey  <address@hidden>
-
-       * automake.in (file_contents): Only add $actions if any are
-       found.  Fixes new failure in pr87.test.
-
-2001-02-08  Pavel Roskin  <address@hidden>
-
-       * tests/pr87.test: Check foo/Makfile.in after it is created.
-
-2001-02-08  Tom Tromey  <address@hidden>
-
-       * tests/pr87.test: Added check for blank line after `.c.o' rule.
-       Report from Lars J. Aas.
-
-2001-02-07  Lars J. Aas  <address@hidden>
-
-       * lisp.am (address@hidden@LISP): Removed extra space.
-       * header.am (address@hidden@HEADERS): Removed extra space.
-       * data.am (address@hidden@DATA): Removed extra space.
-
-2001-02-07  Tom Tromey  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use \", not ".
-
-       * automake.in (handle_dependencies): Use _am_include, not
-       AMINCLUDE.
-       * tests/exsource.test: Use _am_include, not AMINCLUDE.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Use _am_include, not AMINCLUDE.
-
-       * tests/Makefile.am (XFAIL_TESTS): Removed distcommon.test.
-
-       * tests/Makefile.am (EXTRA_DIST): Added ChangeLog-old.
-
-       * automake.in (handle_configure): Handle case where output file is
-       in subdir with no Makefile of its own.  Fixes remake3.test,
-       distcommon.test.
-
-2001-02-06  Pavel Roskin  <address@hidden>
-
-       * automake.in (handle_dependencies): Rename AM_INCLUDE to
-       AMINCLUDE.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
-       * tests/exsource.test: Likewise.
-
-2001-02-06  Derek Price  <address@hidden>
-
-       * automake.in (handle_configure): Fix syntax error.
-
-2001-02-06  Akim Demaille  <address@hidden>
-
-       * subdirs.am: This file is the exception: clean recursive targets
-       are called by the clean targets, not the clean-am targets.
-       Otherwise we have a circular dependency: clean -> clean-am ->
-       clean-recursive -> clean.
-       * automake.in (handle_clean): Bind `-local' targets to `-am'
-       targets, not top targets.
-       Don't declare -recursive dependencies of the clean targets:
-       `subdirs.am' did it.  Less hard coded knowledge, transfered
-       into...
-       * clean.am: here.
-
-2001-02-06  Akim Demaille  <address@hidden>
-
-       Monstro unsplitable patch.
-
-       The aim is to remove hard coded knowledge about clean targets from
-       automake.in, leaving them in the *.am files.
-       In addition to the mechanic needed to factor some dependencies, it
-       appears some rules (most notably distclean and maintainer-clean)
-       need factored actions.  So first, be ready to catch factored
-       rules.
-
-       * automake.in (&file_contents): For the time being, use an extended
-       $RULE_PATTERN which is able to match any kind of rules, with or
-       without dependency, with or without actions.
-       Handle all the rules uniformly, storing in %actions the factored
-       actions.
-       (&flatten, &target_cmp): New.
-       (&handle_factored_dependencies): Output the %actions.
-       No longer special case `clean'.
-       Output the rules in alphabetical order, but keeping `.PHONY' last.
-
-       Now we must not use &push_phony_cleaners, which is doing all sort
-       of magic to push a bit of everything in all the clean targets.
-       The biggest problem being that, making a Cartesian product, it
-       requires many useless targets.  The `*.am' file know better.
-       But first, register the new factored rules.
-
-       * automake.in (&initialize_per_input): Include clean, mostlyclean,
-       maintainer-clean, distclean and their `*-am' counterpart in
-       %dependencies.
-       Initialize %actions.
-       (get_object_extension, handle_texinfo, handle_tags, handle_multilib)
-       handle_dependencies, handle_subdirs, handle_configure, handle_clean)
-       (handle_emacs_lisp, handle_python): Don't play with
-       &push_phony_cleaners nor &depend and `clean'.
-       * texinfos.am, texi-vers.am, tags-clean.am:
-       * subdirs.am,python-clean.am, multilib.am, lisp-clean.am:
-       * libtool.am, kr-extra.am, depend.am, compile.am, clean.am:
-       * clean-kr.am, clean-hdr.am: Do it.
-       Whenever a target is empty, just remove it, it will no longer be
-       called.
-
-       There is still some magic about clean to hard code.  But really,
-       that's the end of &do_one_clean_target.
-
-       * automake.in (&do_one_clean_target): Kaboom out.
-       (&handle_clean): Rewrite the magic code.
-       (&am_install_var): No longer use &push_phony_cleaners, nor depend
-       on `clean'.
-       (&push_phony_cleaners): Kaboom too.
-
-2001-02-06  Akim Demaille  <address@hidden>
-
-       * automake.in (do_one_clean_target): Don't hard code knowledge
-       about libtool, and maintainer-clean.
-       * clean.am, libtool.am: Handle these.
-
-2001-02-05  Akim Demaille  <address@hidden>
-
-       * automake.in (handle_texinfo): No longer hard code the clean
-       targets.
-       (texinfos.am): Include them.
-
-2001-02-05  Akim Demaille  <address@hidden>
-
-       * Makefile.am (perl4-check): Remove, we now require Perl 5.
-       (maintainer-check): Don't be silent when you find a problem, and
-       actually, even specify the locations.
-       Also check that @_ is assigned to arrays.
-
-2001-02-05  Akim Demaille  <address@hidden>
-
-       * m4/regex.m4: Use AC_LIBSOURCES.
-       * automake.in (scan_autoconf_traces): Trace AC_LIBSOURCE, not
-       _AC_LIBOBJ_DECL.
-
-2001-02-04  Tom Tromey  <address@hidden>
-
-       * m4/Makefile.am (m4data_DATA): Added make.m4.
-       * automake.in (handle_dependencies): Use @AM_INCLUDE@ to include
-       dependency files.
-       * m4/depend.m4 (AM_DEPNDENCIES): Require AM_MAKE_INCLUDE.
-       Copy depcomp to subdir.
-       * m4/make.m4: New file.
-
-2001-02-04  Pavel Roskin  <address@hidden>
-
-       * automake.in (handle_dist_worker): Remove a line that is now
-       in distdir.am.
-
-2001-02-04  Kevin Ryde  <address@hidden>
-
-       * automake.in (handle_configure): Call config.status with empty
-       CONFIG_LINKS and CONFIG_COMMANDS when regenerating a file.
-
-2001-02-04  Tom Tromey  <address@hidden>
-
-       * depcomp (ddashmd): Removed case.
-       (sgi): Handle failure exit correctly
-       (aix): Likewise.  Also, add dummy `.h' targets.
-
-2001-02-04  Akim Demaille  <address@hidden>
-
-       * distdir.am (distdir): New file, extracted from...
-       * automake.in (handle_dist_worker): here.
-       Adjust.
-
-2001-02-04  Akim Demaille  <address@hidden>
-
-       * automake.in (@clean): Remove, replaced by...
-       ($dependencies{'clean'}): this.
-       Use `&depend' instead of push'ing into @clean.
-       (handle_factored_dependencies): For the time being, skip 'clean'.
-       (do_one_clean_target): Don't ask for argument 1 and 4 as they are
-       always `clean', and address@hidden'.
-
-2001-02-04  Akim Demaille  <address@hidden>
-
-       * automake.in (%dependencies): Don't be initialize globally for
-       all the files, but in...
-       (&initialize_per_input): here.
-       (&depend): New.
-       (@phony): Replace all occurrences with the corresponding &depend
-       invocation.
-
-2001-02-03  Tom Tromey  <address@hidden>
-
-       * header.am (address@hidden@HEADERS): Use INSTALL_HEADER.
-       * header-vars.am (INSTALL_HEADER): New macro.
-
-       * automake.texi (Rebuilding): New node.
-
------
-
-Copyright (C) 2001, 2003  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.02 b/ChangeLog.02
deleted file mode 100644
index 7e5caa7..0000000
--- a/ChangeLog.02
+++ /dev/null
@@ -1,3225 +0,0 @@
-2002-12-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/ChannelDefs.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add ChannelDefs.pm.
-       * automake.in: Move all "register_channel" calls to ChannelDefs.pm.
-       (prog_error, error, fatal, verb, switch_warning, parse_WARNINGS,
-       parse_warnings): Move to ChannelDefs.pm.
-       (usage): Move the warning list to Automake::ChannelDefs::usage
-       and call it.
-       (set_strictness): Move channel setings to
-       Automake::ChannelDefs::set_strictness and call it.
-
-       * automake.in (err): Rename as ...
-       (error): ... this.  Adjust all callers.
-       Suggested by H.Merijn Brand.
-
-2002-12-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/version7.test: Require GNU make.
-       Reported by Patrick Welche.
-
-2002-12-11  Brian Ford  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Properly quote AC_PACKAGE_TARNAME
-       and AC_PACKAGE_VERSION.
-
-2002-12-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (ANSI): Since Autoconf 2.54, LIBOBJ and LTLIBOBJ
-       no longer have to be rewritten in order to support deansification.
-       (Tests): Link to the DejaGnu manual.
-       (Optional): Comment out FIXME.
-       (Complete, A Library, LIBOBJS): Use $(LIBOBJ) and $(ALLOCA)
-       instead of @LIBOBJ@ and @address@hidden
-       (Sources): Typo.
-
-2002-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Strip
-       directories from info filenames.
-       * tests/texinfo13.test: Make sure main.info gets installed
-       as $(infodir)/main.info.
-
-       * automake.in (handle_dist): Do not define %GETTEXT% if the user
-       is using $seen_gettext_external, this distcheck won't run
-       `./configure' with a meaningless `--with-included-gettext'.
-       * tests/gettext.test: Make sure distcheck uses --with-included-gettext.
-       * tests/gettext2.test: Make sure distcheck does not use
-       --with-included-gettext.
-
-       * m4/ccstdc.m4: Define am_cv_prog_cc_stdc for backward
-       compatibility and diagnose the use of AM_PROG_CC_STDC.
-       * automake.texi (Public macros) <AM_PROG_CC_STDC>: Remove
-       documentation, this macro is no longer supported.
-       Reported by Kevin Ryde.
-
-2002-12-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages): Test $objdir, not $srcdir, to
-       decide whether a _.c file is in a subdirectory and has to be
-       cleaned separately.
-       Reported by Kevin Ryde.
-
-       * tests/ansi10.test (liblib_a_LIBADD): Set ac_cv_prog_cc_stdc
-       not am_cv_prog_cc_stdc.
-
-       * automake.texi (Options): Some English nits from Eric Siegerman.
-       (Sources): Rewrite the introduction and move the example to ...
-       (Built sources example): ... this separate node.
-
-       * automake.in (variable_pretty_output): Strip trailing
-       backslashes in $val after $val is defined...
-       Reported by Kevin Ryde.
-
-       * tests/depcomp2.test: Pass CC='gcc' as an argument to ./configure
-       not in the environment.  Otherwise the test will fail when
-       run with ksh and VERBOSE=x.
-       Reported by Paul Jarc.
-
-       * tests/man2.test: Exercize `make uninstall', to test
-       the previous change.
-
-2002-12-03  Nicolas Joly  <address@hidden>
-
-       * lib/am/mans.am (uninstall-man%SECTION%): Change the extension of
-       the man pages being uninstalled, if needed.
-
-2002-12-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (macro_define): Do not strip escaped new lines
-       in Automake's +='ed variables.  We don't know whether it will
-       be pretty printed or not at this point.
-       (variable_pretty_output): Do this here.
-       * tests/pluseq10.test: New file.
-       * tests/Makefile.am (TESTS): Add pluseq10.test.
-       Reported by Ralf Corsepius.
-
-2002-12-02  Charles Wilson  <address@hidden>
-
-       * tests/gnits3.test (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT):
-       Append $(EXEEXT) again.
-
-2002-12-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Sources): Illustrate $(BUILT_SOURCES) with an
-       example.
-
-       * automake.texi (Options): Programs listed in
-       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT should have $(EXEEXT) appended.
-       * tests/gnits3.test (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT):
-       Append $(EXEEXT).
-       Reported by Charles Wilson.
-
-2002-12-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (lang_c_finish): Do not fill de_ansi_files with
-       subdirectory informations for %libsources files.  A LIBOBJS source
-       is always in the current directory.  This reverts part of a change
-       from 2002-01-13.
-       * tests/ansi10.test: New file.
-       * tests/Makefile.am (TESTS): Add ansi10.test.
-
-       * automake.in (do_check_merge_target): Add missing space.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-       * configure.in: Do not use missing while checking for Autoconf's
-       version, otherwise we won't notice that Autoconf isn't installed.
-       Augment the error message with a few questions to help users.
-
-2002-11-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/gnits2.test, tests/gnits3.test: Move the greps inside the
-       Makefile, so we can honor $(EXEEXT).  Otherwise these tests
-       fail under Cygwin.
-       Reported by Charles Wilson.
-
-       For PR automake/375 (Debian Bug #168671):
-       * automake.in (scan_texinfo_file): Erase all known index files, no
-       matter whether they are used at the top-level or not, because we
-       can never know if they are used in included files.  The remaining
-       macros we recognize at the top-level of a Texi document are
-       @defindex, @defcodeindex, @synindex, and @syncodeindex.
-       * tests/texinfo18.test: New file.
-       * tests/Makefile.am (TESTS): Add texinfo18.test.
-       Reported by Simon Richter.
-
-       * automake.in (scan_texinfo_file): Honor only the first @setfilename.
-       * tests/texinfo17.test: New file.
-       * tests/Makefile.am (TESTS): Add texinfo17.test.
-       Reported by Karl Berry.
-
-       For PR automake/357:
-       * automake.in (require_file_internal): Don't complain a file is "not
-       found" when it is a target.  Make sure "not found" files are otherwise
-       reported as error (they were reported as 'note').
-       * tests/distcommon3.test: Augment to test the above.
-       * tests/libobj12b.test: Touch ltmain.sh.
-       * tests/required2.test: Make sure Automake fails because ltmain.sh
-       has been removed.
-       Reported by Ronald Landheer.
-
-       * tests/texinfo3.test: Make sure we don't output single suffix
-       inference rules when building `.info'-less Info files (this
-       confuses Solaris make).  Run distcheck to make sure the rules
-       work.
-       * automake.in (output_texinfo_build_rules): Define GENERIC_INFO
-       and SOURCE_INFO.
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%,
-       %DEST_PREFIX%%DEST_SUFFIX%): Honor GENERIC_INFO and SOURCE_INFO.
-
-2002-11-29  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/359:
-       * automake.in (do_check_merge_target): Make `check' dependent on
-       $(BUILT_SOURCES) if the variable is defined.  Run `check-am' or
-       `check-recursive' in a submake in this case.
-       * tests/check2.test, tests/check3.test: New files.
-       * tests/check.test: Make sure `check' depends on `check-am'.
-       * tests/Makefile.am (TESTS): Add check2.test and check3.test.
-
-       For PR automake/371 and PR automake/372:
-       * automake.in (rule_define): Honor inference rules with multiple
-       targets, and warn when they are used.
-       * tests/suffix11.test: New file.
-       * tests/Makefile.am (TESTS): Add suffix11.test.
-       Reported by Duncan Gibson.
-
-2002-11-28  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/370:
-       * automake.in (handle_languages): Don't prepend $U to $myext
-       since handle_single_transform_list now appends it to $obj.
-       Process the rule twice to handle deansified files in subdirectories.
-       Mark _.c files in subdirectories for cleaning.
-       (handle_single_transform_list): Append $U to $obj_sans_ext if
-       needed: before this dependencies were output foo.Po instead
-       of foo$U.Po.  Don't output explicit dependencies for renamed
-       objects or sources in sub-directories: we already output
-       a full compile rule for them.
-       (lang_c_finish): Don't always use the full filename in the
-       .c -> _.c rule.  This reverts part of my change of 2002-11-21.
-       * tests/ansi6.test, tests/ansi7.test: Make sure deansified
-       files are created in the right directory, and cleaned.
-       Reported by Kevin Ryde.
-
-2002-11-25  Jim Meyering  <address@hidden>
-
-       * lib/install-sh: Put `$0:' at the beginning of each diagnostic,
-       not `install:'.
-
-2002-11-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (make_condition_string): New function.
-       (cond_stack_if, cond_stack_else, cond_stack_endif): Use it.
-       Suggested by Raja R Harinath.
-
-       * tests/texinfo13.test: Require texi2dvi-o.
-       * tests/defs.in: Handle required=texi2dvi-o.
-
-       * automake.in (lang_c_finish): Use $@ in the .c -> _.c rule.
-
-       * automake.in (handle_single_transform_list): Don't strip the
-       directory from $full_ansi.  This reverts my patch of 2002-10-16.
-       (lang_c_finish): Use the full filename, including the directory,
-       in the .c -> _.c rule.  These two files must reside in the same
-       directory.
-       * tests/ansi6.test: Also try to compile without ansi2knr.
-       Reported by Andreas Schwab
-
-2002-11-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Conditional.pm (strip): New function.
-       * lib/Automake/ConditionalSet.pm (sub_conditions): Use it.
-       Suggested by Raja R Harinath.
-
-       * automake.in (conditional_ambiguous_p, macro_define, rule_define,
-       require_variables): Use ->human instead of ->string.
-       * lib/Automake/Conditional.pm (string): Don't sort conditions, they
-       are already sorted.
-       (_to_human, human): New functions.
-       * lib/Automake/ConditionalSet.pm (human): New function.
-       * tests/cond27.test, tests/library3.test, tests/pluseq5.test,
-       tests/pluseq9.test: Adjust.
-
-       * lib/Automake/Conditional.pm [SYNOPSIS]: Fix not's description.
-       * lib/Automake/ConditionalSet.pm (sub_conditions): New function.
-       (multiply): Also accept an Automake::Conditional as argument.
-       * automake.in (variable_not_always_defined_in_cond): Simplify,
-       using only Automake::ConditionalSet methods.
-       Suggested by Raja R Harinath.
-
-       * lib/Automake/ConditionalSet.pm (conds): Use value() to simplify.
-       (invert): Rewrite as a product-of-sums to sum-of-products converter.
-       (_multiply, multiply): New functions.
-       * lib/Automake/Conditional.pm (not): New function.
-       * lib/Automake/tests/ConditionalSet.pl (test_invert): Update.
-       * automake.in (condition_negate): Move ...
-       * lib/Automake/Conditional.pm (negate_condition): ... here.
-       Suggested by Raja R Harinath.
-
-2002-11-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/ConditionalSet.pm (_simplify, simplify): New methods.
-       (true): Cache return value, so _simplify can use it.
-       * lib/Automake/tests/ConditionalSet.pl (test_simplify): New function.
-       * automake.in (variable_not_always_defined_in_cond): Return
-       a simplified ConditionalSet.
-       (macro_define, require_variables): Adjust.
-       * tests/Makefile.am (TEST): Add library3.test.
-       * tests/library3.test: New file.
-       * tests/pluseq9.test: Adjust.
-       Thanks to Raja R Harinath.
-
-2002-11-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/tests/Makefile.am, lib/Automake/tests/Conditional.pl,
-       lib/Automake/tests/ConditionalSet.pl: New files.
-       * lib/Automake/Makefile.am (SUBDIRS): New variable.
-       * configure.in: Output lib/Automake/tests/Makefile.
-       * lib/Automake/ConditionalSet.pm (by_conditions): Delete.
-       (conds): Don't use by_conditions, sort alphabetically, and
-       return sorted conds.
-       (string): Call ->string on each Conditional.
-       * tests/Makefile.am (TESTS): Remove cond12.test.
-       * tests/cond12.test: Remove, moved to
-       lib/Automake/tests/ConditionalSet.pl.
-       * tests/cond3.test: Adjust conditional ordering.
-
-2002-11-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/ConditionalSet.pm (_permutations_worker): Ignore TRUE
-       conditions.
-       (permutations): Treat empty permutations as TRUE.
-       (invert): Simplify.
-       Suggested by Raja R Harinath.
-
-2002-11-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (variable_defined): Thinko.
-       * lib/Automake/ConditionalSet.pm (true): Simplify.
-       (permutations): Fix documentation.
-       (new): Don't simplify conditional sets that contain TRUE.
-       Reported by Raja R Harinath.
-
-2002-11-14  Eric Blake  <address@hidden>
-
-       * lib/am/depend2.am: Add missing fi in c.obj rules.
-
-2002-11-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_installdirs): Reindent to workaround a
-       parsing bug in Perl 5.6.0.
-       Reported by Patrick Welche.
-
-       * lib/Automake/Conditional.pm: Add reference to ConditionalSet.pm.
-       * lib/Automake/ConditionalSet.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add ConditionalSet.pm.
-       * automake.in: Use ConditionalSet.
-       (by_condition, invert_conditions, variable_conditions_permutations):
-       Remove, now defined as Automake::ConditionalSet::by_condition,
-       Automake::ConditionalSet::invert, and
-       Automake::ConditionalSet::permutations.
-       (variable_sorted_conditions): Remove.
-       (msg_var, msg_target handle_source_transform, handle_lib_objects,
-       conditional_ambiguous_p, variable_not_always_defined_in_cond,
-       macro_define, macro_dump, variable_defined,
-       variable_conditions_recursive, variable_conditions,
-       target_conditions, variable_conditionally_defined,
-       variable_conditions_recursive_sub,
-       check_variable_defined_unconditionally, variable_value_as_list,
-       variable_value_as_list_recursive_worker, variable_output,
-       variable_pretty_output, rule_define, append_exeext,
-       am_install_var, require_variables_for_macro): Adjust to
-       use ConditionalSet.
-
-2002-11-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (variable_conditions): Split into ...
-       (variable_conditions, variable_sorted_conditions): ... these
-       functions, where variable_sorted_conditions has the semantic of
-       the old variable_condition.
-       (target_conditions): New function.
-       (msg_var, handle_lib_objects_cond, check_ambiguous_conditional,
-       variable_not_always_defined_in_cond, macro_define,
-       variable_defined, check_variable_defined_unconditionally,
-       variable_conditions_recursive_sub,
-       variable_conditions_permutations, variable_value_as_list,
-       variable_value_as_list_recursive_worker, append_exeext,
-       am_install_var, require_variables_for_macro): Use variable_conditions.
-       (msg_target, rule_define): Use target_conditions.
-       (define_objects_from_sources, macro_define, macro_dump,
-       variable_pretty_output): Use variable_sorted_conditions.
-
-       * automake.texi (Conditional Sources): Fix the `+=' example.
-       Reported by Mike Castle.
-
-       * automake.in: Don't declare TRUE and FALSE, import them from
-       Automake::Conditional.
-       * lib/Automake/Conditional.pm (TRUE, FALSE): New constants.
-       (new): Simplify using FALSE.
-       (reduce): New function, moved from ...
-       * automake.in (variable_conditions_reduce): ... here.
-       (variable_conditions_recursive_sub, invert_conditions):
-       Adjust calls to Automake::Conditional::reduce.
-       * tests/cond12.test: Adjust to use Automake::Conditional.
-
-2002-11-09  Jim Meyering  <address@hidden>
-
-       Make install-sh work even when names contain spaces or
-       certain (but not all) shell metachars.
-
-       * lib/install-sh: Remove lots of unnecessary quoting.
-       Add double quotes where necessary.
-       Write diagnostics to stderr, not stdout.
-       Normalize spacing in diagnostics: use one space (not two,
-       and not a TAB) after the leading `install:'.
-       Remove trailing white space.
-       Remove unnecessary curly braces.
-       If removing the destination fails, also try to move it aside.
-       Use `trap' more portably.
-       * tests/installsh2.test: New file, to test for the above fix.
-       * tests/Makefile.am (TESTS): Add installsh2.test.
-
-       * automake.texi: Fix some typos and a grammar nit.
-
-2002-11-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (switch_warning): Subject Perl warnings to -Werror.
-
-       * automake.texi (Extending): Complete unterminated sentence.
-       Reported by Mike Castle.
-
-2002-11-06  Akim Demaille  <address@hidden>
-
-       * automake.in (&conditional_ambiguous_p): Don't forget to ->string
-       the Conditionals.
-
-2002-10-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Dist): Fix the distcleancheck_listfiles example.
-       Reported by Karl Berry.
-
-2002-10-31  Akim Demaille  <address@hidden>
-
-       * tests/location.test (Makefile.am): Strengthen.
-       * lib/Automake/Channels.pm (_print_message): Be sure to flush
-       $partial when the message is output.
-       Thanks to Alexandre Duret-Lutz.
-
-2002-10-31  Akim Demaille  <address@hidden>
-
-       * automake.in (&read_am_file): Use $last_where to register the
-       _first_ line of a variable definition as location instead of the
-       last one.
-       (&conditional_ambiguous_p): Don't forget to ->string the
-       Conditionals.
-       (&rule_define): Likewise.
-       * tests/location.test: Adjust to exercise this.
-
-2002-10-25  Charles Wilson  <address@hidden>
-
-       * tests/defs.in: Add explicit stanza for python -V.
-
-2002-10-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
-       of am_cv_prog_cc_stdc.  This follows Akim's patch of 2002-10-09,
-       and reveals a bug in my patch of 2002-10-15.
-       * automake.in (handle_single_transform_list): Strip directory name
-       from $full_ansi if subdir-objects is not set.
-
-       * lib/texinfo.tex: New version from Texinfo 4.2b.
-
-2002-10-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list) <full_ansi>: New variable.
-       Use this to record correct dependencies about deansifiable files which
-       are using per-program flags or are in a subdirectory.
-       * tests/ansi9.test: New file.
-       * tests/Makefile.am (TESTS): Add ansi9.test.
-       Reported by Paul D. Smith
-
-2002-10-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (ac_defun_rx, ac_require_rx): If the macro name is
-       quoted, accept any character but `]'.  This makes it possible
-       to define macros such as `AC_LANG_PREPROC(Fortran 90)'.
-       (scan_m4_files): Quote $key in the regex.  Don't define $expr, it's
-       not used.
-       (add_file, scan_file): Adjust to the new definitions of $ac_defun_rx
-       and $ac_require_rx.
-       * tests/aclocal2.test: New file.
-       * tests/Makefile.am (TESTS): Add aclocal2.test.
-       Reported by Tamara L. Dahlgren and Tom Epperly.
-
-2002-10-11  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug#153697:
-       * lib/am/dejagnu.am (distclean-DEJAGNU): Remove $tool.sum and
-       $tool.log.
-       Suggested by Andrew Suffield.
-
-2002-10-10  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/369:
-       * lib/am/python.am: Lookup python files in build directory or
-       source directory.
-       From Mathias Doreille.
-       * tests/python3.test: New file.
-       * tests/Makefile.am (TESTS): Add python3.test.
-       * tests/defs: Handle `required=python'.
-
-       For PR automake/358:
-       * lib/am/texi-vers.am (%STAMPVTI%): Depend on configure instead of
-       configure.ac.
-       Suggested by Thien-Thi Nguyen.
-       * lib/am/configure.am ($(srcdir)/configure): Depends on
-       %CONFIGURE_DEPS%
-       * automake.in (@configure_deps): New array.
-       (scan_autoconf_traces): Scan for m4_include and m4_sinclude,
-       and fill @configure_deps.
-       (handle_configure): Substitute %CONFIGURE_DEPS%.
-       Distribute @configure_deps.
-       * tests/version7.texi: New file.
-       * tests/vtexi.test: Adjust.
-       * tests/Makefile.am (TESTS): Add version7.test.
-       * automake.texi (Dist): Mention that m4_include'd files
-       are distributed.
-
-2002-10-09  Akim Demaille  <address@hidden>
-
-       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Its definition is now empty:
-       the content of this macro was merged in AC_PROG_CC.
-       * m4/protos.m4 (AM_C_PROTOTYPES): Adjust to AC_C_PROTOTYPES.
-       * tests/depacl.test: Remove, it exercizes aclocal in a way that was
-       exercized by all the other tests since the test suite really uses
-       aclocal.
-       * tests/Makefile.am (TESTS): Remove depacl.test.
-
-2002-10-08  Paul Eggert  <address@hidden>
-
-       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
-       %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Use "makeinfo -o output
-       input", not "makeinfo input -o output", as the latter fails if
-       POSIXLY_CORRECT=1.
-       * lib/am/texinfos.am (.dvi.ps): Likewise for dvips.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Likewise for $depcc.
-
-2002-10-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (file_contents_internal): Fix the relationship
-       regex flags, don't use `m'.
-
-       For Debian Bug#162583:
-       * automake.in (file_contents_internal): Simplify regex to
-       separate relationship from actions in rules.
-       Reported by Sam Hocevar.
-
-       * lib/Automake/Conditional.pm (has): Simplify.
-
-2002-10-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Conditional.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Conditional.pm.
-       * automake.in: Use Automake::Conditional.
-       (TRUE, FALSE): New constants.
-       (%var_value, %var_location, %var_comment, %var_type, %var_owner,
-       %targets, %target_source, %target_name, %target_owner): Tie to
-       Tie::RefHash::Nestable.
-       (generate_makefile, process_option_list, handle_options,
-       handle_languages, handle_source_transform, handle_compile,
-       handle_libtool, handle_texinfo_helper, handle_dist, handle_subdirs,
-       scan_aclocal_m4, handle_emacs_lisp, handle_python,
-       scan_autoconf_files, variable_assert, define_variable,
-       define_pretty_variable, define_configure_variable, am_install_var,
-       push_dist_common): Use TRUE.
-       (define_objects_from_sources): Fix return value on
-       "recursively-defined" errors.
-       (conditional_string, conditional_true_when, conditional_is_redundant,
-       conditional_implies_any, make_conditions): Remove these functions,
-       obsoleted by Conditional.pm.
-       (cond_stack_if, cond_stack_else, cond_stack_endif): Return
-       an Automake::Conditional instance.
-       (by_condition, conditional_ambiguous_p,
-       variable_not_always_defined_in_cond, macro_define,
-       variable_conditions_recursive, variable_conditions_recursive_sub,
-       variable_conditions_reduce, invert_conditions,
-       variable_conditions_permutations,
-       check_variable_defined_unconditionally, variable_value_as_list,
-       variable_output, variable_pretty_output, rule_define,
-       read_am_file, file_contents_internal, require_variables): Adjust
-       to use Automake::Conditional objects.
-       (handle_footer): Get $(SUFFIXES) in 'all' conditions.
-       * tests/cond12.test: Adjust to use Automake::Conditional objects.
-
-2002-10-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_source_transform): If foo_SOURCES is defined
-       conditionally, create and use am__foo_SOURCES_DIST for distribution.
-       * tests/condd.test: Extend to check distributed files.
-       * tests/substref.test: Make sure we don't use such a variable when
-       it's not needed.
-       Reported by Marcus Brinkmann.
-
-2002-09-30  Ezra Peisach  <address@hidden>
-
-       * tests/defs.in: Run $MAKE --version -v.
-       * tests/dollar.test: Abort on ./defs failure.
-       * tests/lex5.test: Require GNUmake, not make.
-
-2002-09-30  Kevin Ryde  <address@hidden>
-
-       * m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual
-       values of $CC and $CFLAGS (as opposed to $(CC) and $(CFLAGS)), so
-       configure tests can use them.  Use AC_ARG_VAR instead of AC_SUBST.
-
-2002-09-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (require_variables): The fix introduced in 2002-09-19
-       is imcomplete.  Rewrite the conditional variable definition check
-       using &variable_not_always_defined_in_cond.
-       * tests/cond26.test, tests/cond27.test, tests/cond28.test: New file.
-       * tests/Makefile.am (TESTS): Add cond26.test, cond27.test, and
-       cond28.test.
-       Reported by Juergen Keil.
-
-       * automake.in (INTERNAL): Redefine as an empty location,
-       so that internal locations get displayed as `automake:'.
-
-       * lib/am/distdir.am (distdir): Create $dc_destdir right before
-       its use.
-       Reported by Akim Demaille.
-
-       Fix for PR automake/366:
-       * automake.in (handle_dist): Strip $(srcdir) and replace
-       $(top_srcdir) when computing DIST_COMMON directories.
-       * tests/include2.test: Use an obsolute $(srcdir), and check
-       for spurious directories in $(distdir)/sub.
-       * lib/am/distdir.am: Rewrite $(top_srcdir) as $(top_builddir).
-       Reported by Kevin Ryde.
-
-2002-09-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Channels.pm (%_default_options): Add 'partial'.
-       (_format_message): Rename as ...
-       (_format_sub_message): ... this.
-       (_format_message): New function, extracted from ...
-       (_print_message): ... here.  Honor the 'partial' option.
-       ($partial): New variable.
-       * automake.in (handle_ltlibraries, check_ambiguous_conditional,
-       rule_define): Mark partial messages.
-
-       * automake.in (handle_ltlibraries): Record library locations in
-       %liblocations, and print the previous declaration on error.
-       * tests/libtool6.test: Check that the locations of the two
-       definitions are shown.
-
-       For PR automake/360:  Propagate more locations.
-       * automake.in (handle_programs): Adjust usage of am_install_var's
-       return value.  Pass on locations as context to file_contents.
-       (handle_libraries, handle_ltlibraries): Likewise.  Use locations
-       in the 'not a standard library name' diagnostic.
-       (handle_emacs_lisp, handle_python): Adjust usage of am_install_var's
-       return value.  Pass on locations to require_variables and
-       require_conf_file.
-       (check_ambiguous_conditional): Strip trailing dot in message.
-       (value_to_list): Add the $WHERE and $LOC_WANTED arguments.
-       (variable_value_as_list_recursive_worker): Add the $LOC_WANTED
-       argument.  Adjust calls to value_to_list.
-       (variable_value_as_list_recursive): Call
-       variable_value_as_list_recursive_worker with $LOC_WANTED = 0.
-       (variable_loc_and_value_as_list_recursive): New function,
-       variable_value_as_list_recursive_worker with $LOC_WANTED = 1.
-       (am_install_var): Use variable_loc_and_value_as_list_recursive,
-       and return a list of [$location, $value] pairs.
-       (rule_define): Use better locations in EXEEXT diagnostic.
-       (handle_source_transform, define_objects_from_sources): Add and use
-       a $WHERE argument.  Adjust callers.
-       * tests/stdlib.test: Grep the location in error message.
-       * tests/location.test: New file.
-       * tests/Makefile.am (TESTS): Add location.test.
-
-       * tests/exeext3.test: New file.
-       * tests/Makefile.am (TESTS): Add exeext3.test.
-       * automake.in (%target_name): New hash.
-       (initialize_per_input): Reset %target_name.
-       (rule_define): Fill %target_name, and use it to detect targets
-       which have been registered with key X but really are X$(EXEEXT).
-
-2002-09-28  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/360:
-       * lib/Automake/Location.pm: New file.
-       * lib/Automake/Channels.pm (_print_message): Display contexts
-       when given an Automake::Location.
-       (msg): Clone the location.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Location.pm.
-       * tests/comment5.test: Make sure we display `included from' stacks.
-       * automake.in: Use Automake::Location.
-       (INTERNAL): New constant.
-       (file_contents, file_contents_internal, define_variable,
-       define_pretty_variable, read_am_file): Take $WHERE as argument.
-       Adjust all callers.
-       (scan_autoconf_traces) <$where>: Define as a Location, and use
-       it instead of $here.
-       (macro_define, rule_define): Make sure $WHERE is a location.
-       Clone it before updating $var_location or $targets.
-
-2002-09-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/mkinstalldirs: Reindent using `sh-indentation: 2'.
-       Suggested by Bruno Haible.
-
-       * Makefile.am (fetch, FETCHFILES): Don't fetch install-sh from
-       Autoconf.  Automake now has the master copy of install-sh and
-       mkinstalldirs.
-
-2002-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.7a.
-
-       * NEWS, configure.ac: Version 1.7.
-
-2002-09-25  Art Haas  <address@hidden>
-
-       * automake.texi (Optional, Options, Distributing, ANSI,
-       API versioning): Spelling fixes and Texi tweaks.
-
-2002-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Check for 'tex'.
-       * tests/defs.in: Handle required=tex using configure's result.
-       Reported by Patrick Welche.
-
-       * Makefile.am (mdate-sh): Remove.
-       * mdate-sh: Delete.
-       Suggested by Akim Demaille.
-
-2002-09-25  Tom Tromey  <address@hidden>
-
-       * NEWS: Mention distuninstallcheck.
-       * automake.texi (Dist): Document new macro and target.
-       * lib/am/distdir.am (distuninstallcheck_listfiles): New macro.
-       (distuninstallcheck): New target.
-       (distcheck): Use distuninstallcheck.
-
-2002-09-25  Rainer Orth  <address@hidden>
-
-       * tests/specflags7.test (true_CFLAGS, false_CFLAGS, false.c): Use
-       AM_TRUE, AM_FALSE to avoid bad interaction with Tru64 UNIX
-       <sys/types.h>.
-       * tests/specflags8.test (true_CPPFLAGS, false_CPPFLAGS, false.c):
-       Likewise.
-
-2002-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (output_texinfo_build_rules): Define %SOURCE_REAL%.
-       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
-       %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Add %SOURCE_REAL% as dependency.
-
-2002-09-24  Rainer Orth  <address@hidden>
-
-       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Use $$dir in make
-       command.
-
-2002-09-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Revert the change
-       from 2002-09-22.  We need to erase .libs/ in the object directory
-       in addition to the library directory.
-
-       * tests/target-cflags.test: Build in `build/', not `obj/' because
-       `obj/' is special to BSD make.
-
-       * automake.in (read_am_file): Prefix included files with
-       $(top_srcdir) or $(srcdir) in DIST_COMMON.  Fixes
-       subdircond2.test, and subdircond3.test on OSF1.
-
-       * tests/defs.in (SHELL): Set it.
-
-       * lib/am/distdir.am (distcleancheck): Mention `in build directory'
-       in error message.
-
-2002-09-23  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/350:
-       * automake.in (handle_ltlibraries): Allow a library to be installed
-       many times in the same directory.
-       * tests/libtool5.test, tests/libtool6.test: New files.
-       * tests/Makefile.am (TESTS): Add libtool5.test and libtool6.test.
-
-2002-09-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_ltlibraries): Fill $libtool_clean_directories
-       here, with directories where .la files are built...
-       (handle_single_transform_list): ... not here with directories
-       where .lo files are built.
-       * tests/libtool3.test: Build a library in a subdirectory to
-       check for this.
-       Reported by Peter Gavin.
-
-       * tests/cond5.test: Give more time to automake.
-       Reported by Art Haas.
-
-       * configure.in: Really check for Autoconf 2.54.
-
-       * automake.texi (Yacc and Lex): ylwrap is used only when there is
-       more than one yacc or lex source file in a directory.
-
-       * automake.in (macro_define): Update a variable's location each
-       time its owner is updated.
-       * tests/gnuwarn.test: Append to CFLAGS to check for this.
-       Reported by Harlan Stenn.
-
-2002-09-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.6g.
-
-       * configure.in, NEWS: Bump version to 1.6f.
-
-       * Makefile.am (INSTALL): New rules.
-
-2002-09-20  Mirko Streckenbach  <address@hidden>
-
-       For PR automake/363:
-       * m4/cond.m4: Fix AC_MSG_ERROR quoting.
-
-2002-09-19  Pavel Roskin  <address@hidden>
-
-       * tests/warnopts.test: Fix random failures by removing Autoconf
-       cache directory when configure.in changes.  Use the code and the
-       comment from tests/asm.test.
-
-2002-09-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Program and Library Variables) <maude_LIBADD>:
-       Don't mention _LDADD for Libtool libraries.
-       Reported by Schleicher Ralph.
-
-       For PR automake/361:
-       * tests/suffix8.test: More explicit dependencies.
-       Reported by Paul Eggert.
-
-       * automake.in (rule_define): Don't diagnose duplicate user rules.
-       * tests/phony.test, tests/percent2.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-       Reported by Ralf Corsepius.
-
-       * automake.in (require_variables): Search variable definitions
-       in any condition implied by $cond.
-       * tests/cond25.test: New file.
-       * tests/Makefile.am (TESTS): Add cond25.test.
-       Reported by Pavel Roskin.
-
-       * tests/subobj9.test: Skip this test on configure errors.
-       Reported by Paul Eggert.
-
-2002-09-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.6e.
-
-       * configure.in, NEWS: Bump version to 1.6d.
-       * tests/libobj12.test, tests/libobj12b.test: Include ./defs,
-       not $srcdir/defs.
-       * tests/suffix8.test: Typo.
-
-       * automake.in (check_ambiguous_conditional, rule_define): Issue
-       syntactic warnings, not errors.
-       (macro_define): Don't adjust the owner of a variable which is being
-       appended in a condition different from its definition.
-       (variable_output, variable_pretty_output): Make sure the
-       requested condition exists.
-
-       For PR automake/353: fill %var_location, %var_comment,
-       %var_type, %var_owner for each condition.
-       * automake.in (msg_cond_var): New function.
-       (msg_var): Use it.
-       (generate_makefile, process_option_list, handle_languages,
-       handle_lib_objects_cond, handle_compile, handle_libtool,
-       handle_ltlibraries, handle_texinfo_helper, handle_tests,
-       handle_emacs_lisp, handle_python, macro_define, macro_delete,
-       macro_dump, variable_assert, variable_output,
-       variable_pretty_output, read_am_file, read_main_am_file,
-       file_contents_internal, am_primary_prefixes,
-       require_variables_for_macro): Adjust accesses to %var_location,
-       %var_comment, %var_type, %var_owner.
-       (append_comments, require_file_with_macro,
-       require_conf_file_with_macro, require_variables): Add the
-       $cond argument.
-       * tests/comment7.test: New file.
-       * tests/Makefile.am (TESTS): Add comment7.test.
-
-2002-09-17  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/353:
-       * automake.in (check_ambiguous_conditional): Display locations for
-       the two definitions of the ambiguous variable.  Show the macro_dump
-       output in --verbose only.  Accept $where as a third argument,
-       (macro_define): Pass $where.
-
-       * automake.in (handle_programs): Ooops.  Really add LDADD
-       objects into _DEPENDENCIES.
-       * tests/libobj12.test: Check for it.
-
-2002-09-17  Assar Westerlund  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_programs, handle_libraries,
-       handle_ltlibraries): Maintain $seen_libobjs on a
-       per-program/per-library basis, instead of globally to each
-       of these functions.
-       * tests/libobj12.test, tests/libobj12b.test: New files.
-       * tests/Makefile.am (TESTS): Add libobj12.test and libobj12b.test.
-
-2002-09-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in (configure.in): Don't call AC_PROG_INSTALL and
-       AC_PROG_MAKE_SET.
-
-       * lib/config.guess, lib/config.sub, lib/INSTALL,
-       lib/Automate/Struct.pm: New upstream version.
-       * Makefile.am (mdate-sh): New rule.
-       (FETCHFILES): Add Automate/Struct.pm.
-       (fetch): Get Automate/Struct.pm.
-       (AUTOMAKESOURCES, CLEANFILES): New macros.
-       (EXTRA_DIST, TAGS_FILES): Use them.
-       * install-sh, mkinstalldirs, missing: Delete.
-
-       * automake.in: Rename the 'unused' channel to 'syntax'.
-       (variable_defined): Issue a warning instead of an error
-       for variable-is-a-target conditions.
-       * automake.texi (Invoking Automake): Rename the 'unused'
-       channel to 'syntax'.
-       * tests/warnopts.test: Likewise.
-
-       * tests/suffix8.test: Add explicit dependencies.
-       * tests/texinfo13.test, tests/texinfo16.test: Require tex.
-
-2002-09-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in, m4/init.m4, NEWS: Require Autoconf 2.54.
-
-       * automake.in (variable_defined): Thinko in $cond handling.
-
-2002-09-15  Paul Eggert  <address@hidden>
-
-       * lib/Automake/Channels.pm: Don't use 'our', as it isn't portable
-       to Perl 5.00503.
-
-       * Makefile.am (maintainer-check): Don't use egrep.
-
-2002-09-15  Tom Tromey  <address@hidden>
-
-       * tests/subdircond3.test: Pass flags to make in environment.
-       * tests/subdircond2.test: Pass flags to make in environment.
-       * Makefile.am (maintainer-check): Add a new check for @...@
-       substitutions.  Updated correct number of diffs between source and
-       build trees.
-
-       * configure.in (aclocal, automake): Don't create.
-       * automake.in ($prefix): Don't define.
-       * aclocal.in ($prefix): Don't define.
-       * Makefile.am (do_subst): New macro.
-       (automake): New target.
-       (aclocal): Likewise.
-
-2002-09-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in, automake.in: Requote each "@var@" as '@var@'.
-
-2002-09-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/Makefile.am (XFAIL_TESTS): Remove specflags7.test and
-       specflags8.test.
-
-2002-09-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Building ctags and etags): Rename and adjust as ...
-       (Building true and false): ... this.
-       * tests/targetclash.test: New file.
-       * tests/specflags7.test, tests/specflags8.test: Adjust to build
-       true and false.
-       * tests/Makefile.am (TESTS): Add targetclash.test.
-
-       Diagnose target clashes, for PR automake/344:
-       * automake.in (%targets): Record conditionals for definitions.
-       (%target_conditional): Remove (obsoleted by %targets).
-       (%target_source, %target_owner): New hashes.
-       (TARGET_AUTOMAKE, TARGET_USER): New constants.
-       (initialize_per_input): Adjust to reset new variables.
-       (err_cond_target, msg_cond_target): New functions.
-       (msg_target): Adjust usage of %targets.
-       (conditional_ambiguous_p): Take a list of conditional to check
-       as a third parameter, so this can be used for other things that
-       variables.
-       (handle_lib_objects_cond): Adjust conditional_ambiguous_p usage.
-       (variable_defined): Restrict the target-with-same-name check
-       to user targets.
-       (rule_define): Add the $SOURCE argument, and take $OWNER instead
-       of $IS_AM.  Diagnose target clashes (including ambugious
-       conditionals).  Return a list of conditions where the rule should
-       be defined instead of a boolean.  Fill %target_source and
-       %target_owner.
-       (target_define): Use `exists', not `defined'.
-       (read_am_file): Adjust the call to rule_define.
-       (file_contents_internal): Add more FIXMEs.  Simplify my moving
-       and documenting the "define rules in undefined conditions" to
-       rule_define.
-       * tests/Makefile.am (XFAIL_TESTS): Add specflags7.test and
-       specflags8.test.
-
-2002-09-12  Akim Demaille  <address@hidden>
-
-       * aclocal.in: Prototype all the functions.
-       Add `(C)' to Copyrights.
-       (&add_file): Strip the comments before checking for `AC_REQUIRE'.
-       Remove Perl 4 hacks, since anyway we require 5.005 via General.pm.
-
-2002-09-11  Akim Demaille  <address@hidden>
-
-       * lib/am/texinfos.am (TEXI2PDF): Pass --batch to texi2dvi, since
-       it was already supported when --pdf support was added.
-
-2002-09-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Channels.pm (_default_options): Add `backtrace'.
-       (msg): Die with backtrace if requested.
-       * automake.in: Enable `backtrace' on the `automake' channel.
-
-       * automake.in (process_option_list): Mention `Automake' in
-       version-mismatch error.
-       Suggested by Akim Demaille.
-
-       * tests/Makefile.am ($(TESTS)): Replace by ...
-       (check_SCRIPTS): ... this.
-       Suggested by Raja R Harinath.
-
-2002-09-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/Makefile.am ($(TESTS)): New, depends on defs.
-       (BUILT_SOURCES): Remove (useless because of PR/359).
-
-       * m4/init.m4: Execute cygpath in a sub-shell.
-
-2002-09-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (macro_define): Warn about `:=' assignments.
-       * tests/colneq.test: Check for this warning.
-
-       * automake.texi (Include): Fragments are always distributed.
-       * NEWS: Likewise.
-
-2002-09-08  Andreas Buening  <address@hidden>
-
-       Fix for automake/334:
-       * lib/am/depend2.am: Replaced "cygpath -w" by $(CYGPATH_W).
-       * m4/init.m4: New make variable CYGPATH_W.
-
-2002-09-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Check for EGREP and FGREP.  Create tests/defs.
-       * tests/defs: Rename as ...
-       * tests/defs.in: ... this.  Add copyright notice.  Use configure's
-       values for PERL, EGREP, and FGREP.  Be verbose if $srcdir is unset.
-       * tests/Makefile.am (EXTRA_DIST): Remove defs.
-       (BUILT_SOURCES): New.
-       * tests/acinclude.test, tests/aclibobj.test, tests/aclocal.test,
-       tests/aclocali.test, tests/aclocali1.test, tests/aclocalii.test,
-       tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
-       tests/acoutqnl.test, tests/acouttbs.test, tests/acouttbs2.test,
-       tests/acsilent.test, tests/acsubst.test, tests/acsubst2.test,
-       tests/all.test, tests/alpha.test, tests/amassign.test,
-       tests/ammissing.test, tests/ansi.test, tests/ansi2.test,
-       tests/ansi3.test, tests/ansi4.test, tests/ansi5.test,
-       tests/ansi6.test, tests/ansi7.test, tests/ansi8.test,
-       tests/ar.test, tests/asm.test, tests/autoheader.test,
-       tests/autoheader2.test, tests/auxdir.test, tests/auxdir2.test,
-       tests/backsl.test, tests/backsl2.test, tests/badline.test,
-       tests/badopt.test, tests/badprog.test, tests/block.test,
-       tests/canon.test, tests/canon2.test, tests/canon3.test,
-       tests/canon4.test, tests/canon5.test, tests/ccnoco.test,
-       tests/check.test, tests/checkall.test, tests/clean.test,
-       tests/colneq.test, tests/colneq2.test, tests/colon.test,
-       tests/colon2.test, tests/colon3.test, tests/colon4.test,
-       tests/colon5.test, tests/colon6.test, tests/colon7.test,
-       tests/comment.test, tests/comment2.test, tests/comment3.test,
-       tests/comment4.test, tests/comment5.test, tests/comment6.test,
-       tests/compile_f_c_cxx.test, tests/cond.test, tests/cond10.test,
-       tests/cond11.test, tests/cond12.test, tests/cond13.test,
-       tests/cond14.test, tests/cond15.test, tests/cond16.test,
-       tests/cond17.test, tests/cond18.test, tests/cond19.test,
-       tests/cond2.test, tests/cond20.test, tests/cond21.test,
-       tests/cond22.test, tests/cond23.test, tests/cond24.test,
-       tests/cond3.test, tests/cond4.test, tests/cond5.test,
-       tests/cond6.test, tests/cond7.test, tests/cond8.test,
-       tests/cond9.test, tests/condd.test, tests/condincl.test,
-       tests/condincl2.test, tests/condlib.test, tests/condman.test,
-       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
-       tests/confdist.test, tests/confh.test, tests/confh4.test,
-       tests/config.test, tests/confincl.test, tests/confsub.test,
-       tests/confvar.test, tests/confvar2.test, tests/copy.test,
-       tests/ctarget1.test, tests/cxx.test, tests/cxx2.test,
-       tests/cxxansi.test, tests/cxxcpp.test, tests/cxxlibobj.test,
-       tests/cxxlink.test, tests/cxxnoc.test, tests/cxxo.test,
-       tests/cygwin32.test, tests/dash.test, tests/defun.test,
-       tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
-       tests/depacl.test, tests/depacl2.test, tests/depcomp.test,
-       tests/depcomp2.test, tests/depdist.test, tests/depend.test,
-       tests/depend2.test, tests/depend3.test, tests/depend4.test,
-       tests/destdir.test, tests/dirforbid.test, tests/dirlist.test,
-       tests/discover.test, tests/distcommon.test,
-       tests/distcommon2.test, tests/distcommon3.test,
-       tests/distdir.test, tests/distname.test, tests/dollar.test,
-       tests/double.test, tests/dup2.test, tests/dup3.test,
-       tests/else.test, tests/empty.test, tests/empty2.test,
-       tests/empty3.test, tests/empty4.test, tests/error.test,
-       tests/exdir.test, tests/exdir2.test, tests/exeext.test,
-       tests/exeext2.test, tests/exsource.test, tests/ext.test,
-       tests/ext2.test, tests/extra.test, tests/extra2.test,
-       tests/extra3.test, tests/extra4.test, tests/extra5.test,
-       tests/extra6.test, tests/extra7.test, tests/flibs.test,
-       tests/fnoc.test, tests/fo.test, tests/fonly.test,
-       tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
-       tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
-       tests/gcj5.test, tests/getopt.test, tests/gettext.test,
-       tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
-       tests/gnits3.test, tests/gnuwarn.test, tests/header.test,
-       tests/implicit.test, tests/include.test, tests/include2.test,
-       tests/info.test, tests/insh.test, tests/insh2.test,
-       tests/install.test, tests/install2.test, tests/installdir.test,
-       tests/installsh.test, tests/instdata.test, tests/instdata2.test,
-       tests/instexec.test, tests/insthook.test, tests/instman.test,
-       tests/instman2.test, tests/interp.test, tests/interp2.test,
-       tests/java.test, tests/java2.test, tests/javaprim.test,
-       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
-       tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
-       tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
-       tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
-       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
-       tests/library.test, tests/library2.test, tests/libtool.test,
-       tests/libtool2.test, tests/libtool3.test, tests/libtool4.test,
-       tests/link_c_cxx.test, tests/link_dist.test, tests/link_f_c.test,
-       tests/link_f_c_cxx.test, tests/link_f_cxx.test,
-       tests/link_f_only.test, tests/lisp.test, tests/lisp2.test,
-       tests/listval.test, tests/ltdeps.test, tests/ltlibobjs.test,
-       tests/maintclean.test, tests/make.test, tests/makevars.test,
-       tests/man.test, tests/man2.test, tests/mclean.test,
-       tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
-       tests/mdate4.test, tests/mkinst2.test, tests/mkinstall.test,
-       tests/nobase.test, tests/nodefine.test, tests/nodefine2.test,
-       tests/nodep.test, tests/nodepcomp.test, tests/nodist.test,
-       tests/nodist2.test, tests/noinst.test, tests/noinstdir.test,
-       tests/nolink.test, tests/nostdinc.test, tests/number.test,
-       tests/obsolete.test, tests/order.test, tests/outdir.test,
-       tests/output.test, tests/output2.test, tests/output3.test,
-       tests/output4.test, tests/output5.test, tests/package.test,
-       tests/parse.test, tests/percent.test, tests/pluseq.test,
-       tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
-       tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
-       tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
-       tests/ppf77.test, tests/pr2.test, tests/pr204.test,
-       tests/pr211.test, tests/pr220.test, tests/pr224.test,
-       tests/pr229.test, tests/pr243.test, tests/pr266.test,
-       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
-       tests/pr300-lib.test, tests/pr300-ltlib.test,
-       tests/pr300-prog.test, tests/pr307.test, tests/pr72.test,
-       tests/pr87.test, tests/pr9.test, tests/prefix.test,
-       tests/primary.test, tests/primary2.test, tests/proginst.test,
-       tests/python.test, tests/python2.test, tests/ranlib.test,
-       tests/recurs.test, tests/recurs2.test, tests/remake.test,
-       tests/remake2.test, tests/remake3.test, tests/req.test,
-       tests/required.test, tests/required2.test, tests/rulepat.test,
-       tests/scripts.test, tests/seenc.test, tests/sinclude.test,
-       tests/sourcesub.test, tests/sourcesub2.test, tests/space.test,
-       tests/specflags.test, tests/specflags2.test,
-       tests/specflags3.test, tests/specflags6.test,
-       tests/specflags7.test, tests/specflags8.test,
-       tests/specflags9.test, tests/spell.test, tests/spell2.test,
-       tests/spell3.test, tests/spelling.test, tests/stamph.test,
-       tests/stamph2.test, tests/stdlib.test, tests/strip.test,
-       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
-       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
-       tests/subdir7.test, tests/subdirbuiltsources.test,
-       tests/subdircond.test, tests/subdircond2.test,
-       tests/subdircond3.test, tests/subobj.test, tests/subobj2.test,
-       tests/subobj3.test, tests/subobj4.test, tests/subobj5.test,
-       tests/subobj6.test, tests/subobj7.test, tests/subobj8.test,
-       tests/subobj9.test, tests/subobjname.test, tests/subpkg.test,
-       tests/subst.test, tests/substref.test, tests/substtarg.test,
-       tests/suffix.test, tests/suffix10.test, tests/suffix2.test,
-       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
-       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
-       tests/suffix9.test, tests/symlink.test, tests/symlink2.test,
-       tests/symlink3.test, tests/syntax.test, tests/tags.test,
-       tests/tagsub.test, tests/target-cflags.test, tests/target.test,
-       tests/texinfo.test, tests/texinfo10.test, tests/texinfo13.test,
-       tests/texinfo16.test, tests/texinfo2.test, tests/texinfo3.test,
-       tests/texinfo4.test, tests/texinfo5.test, tests/texinfo6.test,
-       tests/texinfo7.test, tests/texinfo8.test, tests/texinfo9.test,
-       tests/transform.test, tests/unused.test, tests/vars.test,
-       tests/vars2.test, tests/vars3.test, tests/vartar.test,
-       tests/version.test, tests/version2.test, tests/version3.test,
-       tests/version4.test, tests/version5.test, tests/version6.test,
-       tests/vpath.test, tests/vtexi.test, tests/vtexi2.test,
-       tests/warnopts.test, tests/werror.test, tests/whoami.test,
-       tests/xsource.test, tests/yacc.test, tests/yacc2.test,
-       tests/yacc3.test, tests/yacc4.test, tests/yacc5.test,
-       tests/yacc6.test, tests/yacc7.test, tests/yacc8.test,
-       tests/yaccpp.test, tests/yaccvpath.test: Add copyright notice.
-       Source ./defs instead of $srcdir/defs.
-
-2002-09-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Strip $(srcdir) prefix on
-       distributed files, to workaround Sun make VPATH munging.
-       This fixes subdircond2.test, subdircond3.test, and subpkg.test
-       on Solaris.
-       * tests/extra6.test, tests/lex3.test, tests/pr87.test,
-       tests/pr9.test, tests/target-cflags.test, tests/texinfo13.test,
-       tests/texinfo16.test, tests/yacc7.test, tests/yaccvpath.test:
-       Don't require GNU make.
-
-       * lib/am/distdir.am (distcheck): Add missing `;'.
-
-       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Account for
-       Sun make rewriting rules in VPATH builds.  (Fixes gnits3.test.)
-       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Likewise.
-
-2002-09-04  Alexandre Duret-Lutz  <address@hidden>
-
-       For automake/354:
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%.dvi, %SOURCE_SUFFIX%.pdf):
-       Don't use `-o' unless necessary.
-
-2002-08-25  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/343:
-       * automake.in (scan_texinfo_file) <clean_suffixes>: Remove dvi, ps,
-       and pdf.
-       (output_texinfo_build_rules): Define %DIRSTAMP% when processing
-       texibuild.am.  Return $dirstamp and a list of files to clean.
-       (handle_texinfo_helper): Process texi-vers.am after the call to
-       output_texinfo_build_rules and use $dirstamp to define %DIRSTAMP%.
-       * lib/am/texi-vers.am (%STAMPVTI%): Build %DIRSTAMP% if needed.
-       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%): Likewise.
-       (%DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Depend on %DIRSTAMP%.
-       * tests/texinfo13.test: New file.
-       * tests/Makefile.am (TESTS): Add texinfo13.test.
-       * lib/am/texinfos.am (install-info-am, dist-info): Looks for
-       info files in build or source directory.
-       This completes the change from 2002-07-30 (for PR automake/168).
-
-2002-08-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (CLEAN, MAINTAINER_CLEAN): New constants.
-       (maintainer_clean_files): Replace by ...
-       (clean_files): ... this new variable.
-       (initialize_per_input, lang_yacc_target_hook,
-       lang_lex_target_hook): Use %clean_files instead of
-       @maintainer_clean_files.
-       (handle_clean): Rewrite, using %clean_files.
-       (require_build_directory_maybe): Use %clean_files instead
-       of %compile_clean_files.  This allows using
-       &require_build_directory_maybe for non-compiling targets.
-       * lib/am/clean.am (mostlyclean-generic, clean-generic,
-       distclean-generic, maintainer-clean-generic): Rewrite using
-       %MOSTLYCLEAN_RMS%, %CLEAN_RMS%, %DISTCLEAN_RMS%, and
-       %MAINTAINER_CLEAN_RMS%.
-
-       For Debian Bug#157778:
-       * m4/python.m4: Fix output of `python' in checking messages
-       when no version of Python is required.
-
-2002-08-23  Raja R Harinath  <address@hidden>
-
-       * lib/am/depend2.am (%EXT%.lo): Fix typo.  Rename the file that
-       was generated by gcc -MF.
-
-2002-08-23  Pavel Roskin  <address@hidden>
-
-       * lib/am/progs.am: Exit in case of install failure, otherwise
-       it is ignored on Cygwin because of the surrounding "for" loop.
-
-2002-08-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Top level): More words about conditional
-       subdirectories.  Don't mention AC_PROG_MAKE_SET.
-       * tests/subdircond2.test, tests/subdircond3.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-       For PR automake/347:
-       * automake.in (MACRO_PATTERN): Allow `.' in variable names.
-       (scan_variable_expansions, check_variable_expansions): New functions.
-       (macro_define): Call check_variable_expansions.
-       (read_am_file): Likewise, when outputing rules.
-       (variable_conditions_recursive_sub): Simplify using
-       scan_variable_expansions.
-       * tests/vars3.test: New file.
-       * tests/Makefile.am (TESTS): Add vars3.test.
-       * tests/colneq.test: Use -Wno-portability.
-
-       * lib/Automake/Channels.pm (buffering, backlog): New variables.
-       (buffer_messages, flush_messages): New functions.
-       (@EXPORT): Add buffer_messages and flush_messages.
-       * automake.in (generate_makefile): Call buffer_messages and
-       flush_messages to buffer warnings until AUTOMAKE_OPTIONS has
-       been read.
-
-       * automake.in (read_am_file): Fix computation of path to
-       included file when $(top_srcdir) is not used.
-       * tests/include2.test: Augment.
-
-2002-08-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (set_strictness): Never enable 'portability'
-       warnings for now.
-       (usage): Adjust `-Wportability' doc.
-       * automake.texi (Invoking Automake): Likewise.
-       Suggested by Ralf Corsepius.
-
-2002-08-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Fix cleanup of
-       so_location files in current directory.
-
-       Fix for PR automake/346:
-       * automake.texi (Optional): Supress the documentation for
-       AC_PATH_XTRA, AC_FUNC_ALLOCA, AC_FUNC_ERROR_AT_LINE, AC_FUNC_FNMATCH,
-       AC_FUNC_GETLOADAVG, AC_FUNC_MEMCMP, AC_FUNC_MKTIME, AC_FUNC_OBSTACK,
-       AC_FUNC_STRTOD, AC_REPLACE_FUNCS, AC_REPLACE_GNU_GETOPT,
-       AC_STRUCT_ST_BLOCKS, AM_WITH_REGEX, AC_CHECK_TOOL, AC_CHECK_PROG,
-       AC_CHECK_PROGS, AC_PATH_PROG, and AC_PATH_PROGS.  Augment the
-       documentation of AC_LIBSOURCE and AC_SUBST to explain this
-       applies to any macro that calls them.
-
-2002-08-19  Tom Tromey  <address@hidden>
-
-       For PR automake/348:
-       * tests/Makefile.am (TESTS): Added include2.test.
-       * tests/include2.test: New file.
-       * tests/include.test: Check to make sure include file is
-       distributed.
-       * automake.in (read_am_file): Distribute included files.
-
-2002-08-19  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/345:
-       * tests/defs: Add support for required=non-root, stolen
-       from fileutils' test suite.
-       * tests/destdir.test: Use required=non-root.
-
-       * tests/vtexi.test: Fix spurious failure introduced on 2002-07-30.
-
-2002-08-17  Tom Tromey  <address@hidden>
-
-       For PR automake/347:
-       * automake.in (rule_define): Given portability warning if "%" seen
-       in target name.
-       (TARGET_PATTERN): Added `%'.
-       * tests/Makefile.am (TESTS): Added percent.test.
-       * tests/percent.test: New file.
-
-2002-08-15  Art Haas  <address@hidden>
-
-       * lib/am/depend2.am: Use correct name for dependency file in
-       libtool fastdep case.
-
-2002-08-14  Art Haas  <address@hidden>
-
-       * lib/am/depend2.am: Added missing `;'.
-
-2002-08-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Python): Fix wording.
-
-       * tests/ext2.test: New file.  This bug is present in Automake 1.6.3
-       and was fixed by the change on variable_conditions_permutations
-       and invert_conditions on 2002-05-16.
-       * tests/Makefile.am (TESTS): Add ext2.test.
-       Reported by Ladislav Strojil.
-
-2002-08-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (parse_arguments): Add `dirlist' paths add the
-       very end of the search path, after aclocal-APIVERSION/ and
-       aclocal/.
-       * automake.texi (Macro search path): Adjust to reflect the
-       new ordering.
-       * tests/dirlist.test: Check for this.
-
-2002-07-31  Charles Wilson  <address@hidden>
-
-       * aclocal.in (parse_arguments): Add support for extending
-       default macro search path, using a `dirlist' file within
-       the aclocal directory.
-       * automake.texi (Invoking aclocal): Move option descriptions into ...
-       (aclocal options): ... this new node.
-       (Macro search path): New node.
-       * tests/dirlist.test: New file.
-       * tests/Makefile.am (TESTS): Add dirlist.test.
-       * m4/dirlist: New file.
-       * m4/Makefile.am (EXTRA_DIST): Add dirlist.
-       * tests/defs: Honor any installed dirlist when searching for
-       libtool.m4 and gettext.m4.
-
-2002-07-30  Alexandre Duret-Lutz  <address@hidden>
-
-       Build info files in builddir instead of srcdir (for PR automake/168),
-       and prepare support for info files in subdirecties.
-       * automake.in (output_texinfo_build_rules): New function.
-       (handle_texinfo_helper): Use output_texinfo_build_rules, and
-       prepare to support subdir texinfos.  Define am__TEXINFO_TEX_DIR.
-       * lib/am/texi-vers.am: Build version.texi and stamp-vti in the
-       current directory, not $(srcdir).  Use %STAMPVTI% to name the stamp
-       file.
-       * lib/am/texibuild.am: Rewrite to output files in the current
-       directory, not $(srcdir).  Also, support both generic and
-       non-generic output.  Pass `-o $@' to makeinfo, texinfo, and
-       texi2dvi (for PR automake/339).
-       * tests/texinfo3.test: Make sure the `.texi:' rule is output.
-       * tests/texinfo10.test: Use set -e, so the checks are not ignored.
-       * tests/texinfo16.test: New file.
-       * tests/Makefile.am (TESTS): Add texinfo16.test.
-
-2002-07-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (write_aclocal): Don't write the filename ($output_file)
-       in the aclocal.m4 header.
-
-       * configure.in: Require Autoconf 2.53b.
-
-2002-07-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Bump version to 1.6c.
-
-       * configure.in: Bump version to 1.6b.
-       * lib/config.guess, lib/config.sub, lib/Automake/XFile.pm: New
-       upstream versions.
-       * automake.in: Don't write @ALLOCA@ and @LIBOBJS@ in clear text,
-       since this file is processed by config.status.
-
-2002-07-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (read_am_file): Escaped newlines in comments are not
-       portable.  If a comment line doesn't start with a `#', add it.
-       * tests/comment6.test: Ensure this is done.
-
-2002-07-24  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix failures reported by Patrick Welche on NetBSD.
-       * tests/gnits2.test, tests/gnits3.test: Don't trust the exit
-       status of `make -k'.
-       * tests/obsolete.test: Source obs.1 and obs.2 from current
-       directory.
-
-2002-07-23  Patrick Welche  <address@hidden>
-
-       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): Add
-       configure.lineno.
-
-2002-07-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/required2.test: New file.
-       * tests/Makefile.am (TESTS): Add required2.test.
-       * automake.in (initialize_per_input): Remove %require_file_found
-       setting.  This reverts my change of 2002-04-19.
-       (require_file_internal): Use the full name of a file as a
-       key in %require_file_found, not only the basename.
-       Reported by Andrew Suffield.
-
-2002-07-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_subdirs): Warn if `obj' appears in SUBDIRS.
-       * tests/subdir7.test: New file.
-       * tests/Makefile.am (TESTS): Add subdir7.test.
-
-       * lib/mkinstalldirs: Remove Id keyword.
-
-       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Honor
-       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT.
-       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise.
-       * automake.texi (Options) <std-options>: Document
-       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT.
-       (Gnits): Reference std-options.
-       * tests/gnits3.test: New file.
-       * tests/Makefile.am (TESTS): Add gnits3.test.
-       Suggested by Jim Meyering.
-
-2002-07-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/gnits2.test: Use --program-prefix.  Test for scripts too.
-       Replace the sed script by calls to grep, easier to debug.
-       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Honor nobase
-       and $(transform).
-       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise.
-
-       * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS):
-       Always strip the directory part before applying $(transform),
-       even for nobase_ targets.
-       * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS):
-       Likewise.
-       * tests/nobase.test: Use --program-prefix while testing nobase
-       support.
-
-2002-07-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dirname.test: Delete.  We don't define _AM_DIRNAME anymore.
-       * tests/Makefile.am (TESTS): Remove dirname.test.
-
-       * m4/init.m4: Require Autoconf 2.53b.
-       * m4/header.m4 (AM_CONFIG_HEADER): Redefine using AU_DEFUN.
-       * m4/ccstdc.m4 (fp_PROG_CC_STDC): New AU_DEFUN.
-       * m4/dmalloc.m4 (fp_WITH_DMALLOC): Likewise.
-       * m4/lispdir.m4 (ud_PATH_LISPDIR): Likewise.
-       * m4/maintainer.m4 (jm_MAINTAINER_MODE): Likewise.
-       * m4/protos.m4 (fp_C_PROTOTYPES): Likewise.
-       * m4/regex.m4 (fp_WITH_REGEX): Likewise.
-       * m4/termios.m4: Delete.  AM_SYS_POSIX_TERMIOS is now AU_DEFUNed
-       in m4/obsolete.m4.
-       * m4/winsz.m4: Delete. AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL is now
-       AU_DEFUNed in m4/obsolete.m4.
-       * m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4 : New files.
-       * m4/Makefile.am (dist_m4data_DATA): Add obsol-gt.m4, obsol-lt.m4,
-       and obsolete.m4. Remove termios.m4 and winsz.m4.
-       * aclocal.in (obsolete, obsolete_rx): Remove.
-       (scan_configure): Don't grep for obsolete macros.
-       * tests/defs (AUTOUPDATE): Define.
-       * Makefile.am (maintainer-check): Check for misuses of autoupdate.
-       * tests/obsolete.test: Rewrite.  Exercize the AU_DEFUN macros from
-       m4/obsolete.m4.
-
-       Fix for PR automake/338:
-       * automake.in (seen_gettext_external): New variable.
-       (handle_gettext): Conditionalize the intl/ check on
-       $seen_gettext_external.  Fix grep usage.
-       (scan_autoconf_traces): Set $seen_gettext_external if
-       `external' is passed to AM_GNU_GETTEXT.
-       * tests/gettext.test, tests/gettext2.test: New files.
-       * tests/Makefile.am (TESTS): Add gettext.test and gettext2.test.
-
-2002-07-18  Alexandre Duret-Lutz  <address@hidden>
-           Akim Demaille  <address@hidden>
-
-       * m4/header.m4 (_AM_DIRNAME, _AM_STAMP, _AM_CONFIG_HEADER,
-       _AM_CONFIG_HEADER_INSINUATE): Remove them all.  Leave just ...
-       (AM_CONFIG_HEADER): ... this new definition for compatibility.
-       * m4/init.m4: Don't call _AM_CONFIG_HEADER_INSINUATE.
-       (_AC_AM_CONFIG_HEADER_HOOK): New macro.
-       * tests/confh5.tests: Delete.
-       * tests/Makefile.am (TESTS): Remove confh5.tests.
-
-2002-07-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Typo.
-
-       * lib/Automake/Channels.pm (dup_channel_setup,
-       drop_channel_setup): New functions.
-       (@EXPORT): Add them.
-       * automake.in (generate_makefile): Call dup_channel_setup and
-       drop_channel_setup.
-       (process_option_list): Recognize --warnings and -W options.
-       * automake.texi (Options): Document them.
-       * tests/pluseq5.test: Check that -Wno-obsolete will disable the
-       warning.
-       * tests/warnopts.test: New file.
-       * tests/Makefile.am (TESTS): Add warnopts.test.
-
-2002-07-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in: Register warning channel `gnu'.
-       (set_strictness): Turn on `gnu' in --gnu and --gnits.
-       (usage): Mention the `gnu' category.
-       (%var_is_am): Replace by ...
-       (%var_owner): ... this, which uses ...
-       (VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE): ... these new constants.
-       Adjust all uses of %var_is_am.
-       (handle_languages): Warn about user variables being overriden.
-       (require_variables): Also check %configure_vars for the existence
-       of a required variable.
-       * automake.texi (Invoking Automake): Document -Wgnu.
-       * tests/yacc2.test, tests/yacc3.test: Use -Wno-gnu when
-       we test YFLAGS.
-       * tests/gnuwarn.test: New file.
-       * tests/Makefile.am (TESTS): Add gnuwarn.test.
-
-2002-07-11  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/337:
-       * automake.in: Redefine the `flags' attribute of each language
-       as a list.  List CPPFLAGS in `flags' when it is used.
-       (register_language): Set the default value of 'flags'.
-       (handle_single_transform_list): Adjust to treat `flags' as a list.
-       (handle_languages): Likewise.  Don't bother defining the
-       configure variable for `c', this is always done since we trace
-       configure.ac.
-       * automake.texi (etags): Use per-executable _CPPFLAGS.
-       (Program and Library Variables): Mention maude_CPPFLAGS.
-       (Program variables): Likewise.
-       * tests/specflags8.test: Use _CPPFLAGS instead of _CFLAGS.
-       * tests/specflags9.test: New file.
-       * tests/Makefile.am (TESTS): Add specflag9.test.
-
-2002-07-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi: Use `variable' instead of `macro' everywhere it
-       designates a Makefile variable.
-       (Texinfo): `VERSION', `UPDATED', `EDITION', and `UPDATED-MONTH' are
-       `flags', not `macros'.  `Macro' means something else in Texinfo.
-       Also show how to use these flags.
-       * automake.in (file_contents_internal): s/macro/variable/ in
-       error message.
-
-       * automake.in (parse_arguments): Call Getopt twice: once to catch
-       --help or --verbose, and once to process the other arguments.
-       (usage, verbose): Always exit 0, ignoring $exit_code (which anyway
-       should always be 0 because of the change to parse_arguments).
-       * tests/Makefile.am (TESTS): Add getopt.test.
-       * tests/getopt.test: New file.
-
-2002-07-09  Tom Tromey  <address@hidden>
-
-       For PR automake/286:
-       * automake.texi (Tags): Document ctags.
-       * automake.in (handle_tags): Handle ctags.
-       * lib/am/tags.am (CTAGS): New macro.
-       (CTAGSFLAGS): Likewise.
-       (ctags): New target.
-       (distclean-tags): Remove `tags'.
-
-       * lib/am/depend2.am: Reworked syntax to avoid parsing problem.
-
-       * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE%
-       before passing to cygpath.  Partial fix for PR automake/334.
-
-2002-07-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (generate_makefile): Suggest using AM_CPPFLAGS
-       instead of INCLUDES.
-       * tests/pluseq5.test: Check that AM_CPPFLAGS is suggested.
-
-2002-07-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (usage, version): Honor $exit_code.
-       (parse_arguments): Use fatal.
-
-2002-07-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Invoking Automake): Document WARNINGS.
-       * automake.in (switch_warning, parse_WARNINGS): New function.
-       (setup_warnings): Rename to ...
-       (parse_warnings): ... this.  Move most of the code to switch_warning.
-       Accept a comma separated list of categories.
-       * tests/vars2.test: Use a comma separated list of warning categories.
-
-2002-07-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS (New in 1.6): Mention that libtoolize is no longer run
-       by automake.
-
-2002-07-08  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/291:
-       * automake.in (macro_define): Catch variable names starting
-       with `_'.
-       (handle_installdirs): Rename _am_installdirs to am__installdirs.
-       * lib/am/data.am, lib/am/install.am, lib/am/libs.am,
-       lib/am/lisp.am, lib/am/ltlibs.am, lib/am/mans.am,
-       lib/am/progs.am, lib/am/python.am, lib/am/scripts.am,
-       lib/am/texinfos.am: Likewise.
-       * tests/canon5.test: Use -Wno-portability.
-       * tests/vars2.test: New file.
-       * tests/Makefile.am (TESTS): Add vars2.test.
-
-2002-07-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (AUTOMAKE): Add -Wall.
-       * tests/outdir.test: Use -Wno-obsolete.
-
-2002-07-07  Tom Tromey  <address@hidden>
-
-       * m4/depend.m4 (_AM_DEPENDENCIES): Compute am__fastdep<compiler>
-       conditional.
-       * automake.in (handle_languages): Compute FASTDEP.
-       * lib/am/depend2.am: Added %FASTDEP% mode.
-
-2002-07-07  Tom Tromey  <address@hidden>
-
-       * automake.texi (Optional): AM_MAINTAINER_MODE is ok in Gnits mode
-       now.  Fixes PR automake/332.
-
-2002-07-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nobase.test (test-install-exec): Move all the `test -f'
-       tests in the Makefile so we can use $(EXEEXT) on programs.
-       Reported by Charles Wilson.
-
-2002-07-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): New macro.
-       * tests/confh5.test: Make sure that Autoconf complains if
-       AM_CONFIG_HEADER or AC_CONFIG_HEADERS is called before
-       AM_INIT_AUTOMAKE.
-
-2002-07-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Channels.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Channels.pm.
-       * automake.in: Use Automake::Channels and register some channels
-       for errors and warnings.
-       ($exit_status): Remove, replaced by Channels::$exit_code.
-       (%required_variables): Remove, Channels will filter-out duplicates
-       itself.
-       (initialize_per_input): Call reset_local_duplicates.
-       (prog_error): Adjust to all `msg'.
-       (setup_warnings): New functions.
-       (parse_arguments): Accept -W CATEGORY and --warnings=CATEGORY,
-       call setup_warnings.
-       (usage): Update usage text accordingly.
-       (macro_dump, macros_dump): Return the dump as a string instead
-       of printing it.
-       (am_install_var) <$warned_about_extra>: Remove, Channels will
-       filter-out duplicates itself.
-       (set_strictness): Turn on/off channels for each stricness.
-       (err, fatal, err_var, err_target, err_am, err_ac, msg_var,
-       msg_target, msg_am, msg_ac, reject_var, reject_target, verb):
-       New functions, to replace ...
-       (print_error, am_error, file_error, macro_error, target_error,
-       conf_error, file_warning): ... these functions.  Remove them.
-       Update all the code to use the new functions.  The rough
-       correspondance is
-          am_error                -> err_am
-          file_error              -> err
-          macro_error             -> err_var
-          target_error            -> err_target
-          conf_error              -> err_ac
-          die                     -> fatal
-          macro_error if defined  -> reject_var
-          target_error if defined -> reject_target
-          verbose                 -> verb
-       * automake.texi (Invoking Automake): Document -W and --warnings.
-       Remove the documentation for --Werror and --Wno-error.
-       * tests/defs: Use -Werror, not --Werror.
-       * tests/exeext2.test: Test that the error message
-       is enabled with -Wobsolete.
-       * tests/output5.test: Rewrite to test that Automake complains
-       when there is no Makefile specified. (The original test was
-       succeeding for the wrong reason.)
-       * tests/seenc.test: Don't use --Wno-error, there is no reason now
-       that -Werror doesn't stop after the first error.
-       * tests/subobj.test: Use --add-missing, and check that
-       `compile' is installed and that Automake says so.
-       * tests/subobj2.test: Don't create `compile'.
-
-2002-07-05  Tom Tromey  <address@hidden>
-
-       * automake.texi (Java Support): Mention --main and _LDFLAGS.
-       For PR automake/324.
-
-2002-07-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/asm.test: Erase Autom4te's cache between each test.
-
-2002-07-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (am_macro_for_var): Add LIBTOOL.
-       (ac_macro_for_var): Add RANLIB.
-       (seen_libtool): Remove.
-       (handle_libtool, lang_c_finish, define_compiler_variable,
-       make_paragraphs): Use
-       variable_defined ('LIBTOOL') instead of $seen_libtool.
-       (handle_languages) <%transform>: Don't set 'LIBTOOL', it is
-       already done in make_paragraphs.
-       (handle_libraries): Simplify by requiring RANLIB with
-       &require_variables_for_macro.
-       (handle_ltlibraries): Simplify by requiring LIBTOOL with
-       &require_variables_for_macro.
-       (scan_autoconf_traces): Don't trace for AC_PROG_LIBTOOL and
-       AM_PROG_LIBTOOL.
-       * tests/libtool4.test, tests/library2.test: New files.
-       * tests/Makefile.in (TESTS): Add libtool4.test and library2.test.
-
-2002-07-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (create, keyed_aclocal_warning): Delete, unused.
-
-2002-07-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (ac_macro_for_var): Add YACC.
-
-2002-07-01  Alexandre Duret-Lutz  <address@hidden>
-
-       Handle multiple suffix rules with the same input extension.
-       For PR automake/37.
-
-       * automake.in (suffix_rules_default): New variable.
-       (suffix_rules): Redefine as a hash of hashes of pairs.
-       (initialize_per_input): Setup suffix_rules_default from
-       suffix_rules on first call, an override suffix_rules
-       with suffix_rules_default on following calls.
-       (struct) <output_extensions>: New attribute.
-       (register_language): Set the default for output_extensions.
-       Call register_suffix_rule for each suffix.
-       (derive_suffix, handle_languages): Adjust to the new definition
-       of $suffix.
-       (register_suffix_rule): New function.
-       (rule_define): Call register_suffix_rule.
-       * tests/suffix8.test, tests/suffix9.test, tests/suffix10.test:
-       New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2002-06-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (am_macro_for_var, ac_macro_for_var,
-       required_variables): New variables.
-       (am_c_prototypes, seen_prog_lex, am_lispdir_location,
-       pythondir_location): Remove.
-       (initialize_per_input): Clear %required_variables.
-       (require_variables, require_variables_for_macro): New functions.
-       (handle_languages): Call &require_variables for $lang->config_vars.
-       (handle_compile): Call &require_variables_for_macro for the
-       ANSI2KNR and U variables.
-       (handle_emacs_lisp): Call &require_variables for EMACS and libdir.
-       (handle_python): Call &require_variables for PYTHON.  Don't
-       explicitly allow `python' as a prefix for PYTHON.
-       (scan_autoconf_traces): Don't scan AC_PROG_LEX, AM_C_PROTOTYPES,
-       AM_PATH_LISPDIR, and AM_PATH_PYTHON.
-       (scan_autoconf_traces) <AC_SUBST>: Don't filter out ANSI2KNR and
-       AMDEPBACKSLASH here...
-       (define_configure_variable): ... do this here.
-       (am_primary_prefixes): Probe the existence of ${X}dir using
-       &require_variables_for_macro.  If a standard prefix is not
-       legitimate, say so.  Ignore all configure variables.
-       * tests/ansi8.test, tests/cxx2.test, tests/gcj5.test,
-       tests/lisp2.test, tests/python2.test: New files
-       * tests/Makefile.am (TESTS): Add them.
-       * tests/asm.test: Grep stderr.
-       * tests/lex2.test: Rewrite to test that Automake suggests AM_PROG_LEX.
-       * tests/python.test: Make sure py-compile is installed.
-
-2002-06-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (LANG_IGNORE, LANG_PROCESS, LANG_SUBDIR,
-       COMPILE_LIBTOOL, COMPILE_ORDINARY): Redefine as constants.
-       Adjust all occurrences.
-
-2002-06-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in: Add local variables so that Emacs setups GNU style
-       for perl-mode and cperl-mode.
-       * automake.in: Likewise.
-       (WHITE_PATTERN, RULE_PATTERN, SUFFIX_RULE_PATTERN, MACRO_PATTERN,
-       ASSIGNMENT_PATTERN, IF_PATTERN, ELSE_PATTERN, ENDIF_PATTERN,
-       INCLUDE_PATTERN, EXEC_DIR_PATTERN): Write $ as "\$" to please
-       perl-mode.
-
-2002-06-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (fetch): Fetch install-sh from Autoconf CVS.
-       * lib/config.sub, lib/install-sh: New upstream versions.
-
-2002-06-26  Paul Eggert  <address@hidden>
-
-       * Makefile.am (maintainer-check): Don't assume that egrep exists;
-       this fixes a portability bug introduced in the 2002-06-08 fix for
-       PR automake/317.
-
-2002-06-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (required_targets): Add ps and ps-am.
-       (initialize_per_input): Reset them.
-       (handle_texinfo_helper): Fill @pss_list, and define the
-       PSS make variable.
-       * lib/am/texinfos.am (RECURSIVE_TARGETS): Add ps-recursive.
-       (ps, ps-am): New targets.
-       * automake.texi (Auxiliary Programs) <texinfo.tex>: Mention
-       `make ps' and `make pdf'.
-       (Texinfo): Document `make ps', `make pdf', and `make dvi'.
-       (Extending): The `ps' and `pdf' targets support a `-local' version.
-
-2002-06-26  Art Haas  <address@hidden>
-
-       * automake.texi: s/.../@dots{}/.
-
-2002-06-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Check that ln works, fall back to `cp -p'.
-       * Makefile.am (install-exec-hook): Use $(LN) instead of ln.
-       Reported by Andreas Buening.
-
-2002-06-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in: Register &lang_lex_target_hook for lex and lexxx.
-       (lang_lex_target_hook): New function.
-       * tests/lex3.c: Complete to check that maintainer-clean erases
-       Lex's output.
-       Reported by Flavien Astraud.  This was lost on 2001-06-23 too.
-
-2002-06-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (lang_yacc_target_hook): Add $output to
-       @maintainer_clean_files.  This was lost on 2001-06-23.
-       * tests/yacc7.test, tests/yacc4.test: Complete to check
-       that maintainer-clean erases YACC's output files,
-       respectively with and without `-d'.
-       Reported by Flavien Astraud.
-
-2002-06-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/lang-compile.am (%FPFX%DEPMODE): Delete.  This is now
-       traced from configure.ac.
-
-       * automake.in (macro_define): Don't accept to override an AC_SUBST
-       or Automake variable in a new condition.
-       * tests/cond23.test, tests/cond24.test: New file.
-       * tests/Makefile.am (TESTS): Add cond23.test and cond24.test.
-       Reported by Patrik Weiskirchre.
-
-2002-06-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nobase.test, tests/pr204.test, tests/pr300-lib.test,
-       tests/pr300-ltlib.test, tests/pr300-prog.test,
-       tests/specflags7.test, tests/specflags8.test, tests/subdir5.test,
-       tests/subobj6.test, tests/subpkg.test, tests/transform.test:
-       Require gcc.
-
-2002-06-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/libtool2.test: Use required=libtoolize.
-       * tests/install2.test: Use required=gzip.
-
-2002-06-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (required): Handle bison; set YACC automatically.
-       * tests/pr204.test, tests/yacc4.test, tests/yacc8.test,
-       tests/yaccvpath.test: Require bison.  Don't set YACC.
-
-2002-06-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (required): Handle `gcc' and `g++'; automatically
-       export CC and CXX when they are required.
-       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
-       tests/cond4.test, tests/cond16.test, tests/cond18.test,
-       tests/cond19.test, tests/depcomp2.test, tests/depend2.test,
-       tests/lex3.test, tests/pr87.test, tests/pr220.test,
-       tests/substref.test, tests/target-cflags.test, tests/yacc4.test,
-       tests/yaccvpath.test: Require gcc.  Don't pass CC=gcc to
-       configure.
-       * tests/subobj9.test: Require g++.
-
-2002-06-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (required): Handle `GNUmake'.
-       (needs_gnu_make): Don't define anymore.
-       * tests/cond4.test, tests/cond18.test, tests/cond19.test,
-       tests/dollar.test, tests/exsource.test, tests/extra6.test,
-       tests/lex3.test, tests/make.test, tests/pr9.test, tests/pr87.test,
-       tests/subdir5.test, tests/target-cflags.test, tests/yacc7.test,
-       tests/yaccvpath.test: Use `required=GNUmake' instead of
-       `$needs_gnu_make'.
-
-2002-06-17  Paolo Bonzini  <address@hidden>
-
-       * automake.in (process_option_list): Recognize std-options.
-       (handle_options): Enable std-options in gnits strictness.
-       (am_install_var): If std-options, enable CK-OPTS section.
-       * lib/am/scripts.am (installcheck-am): New target.
-       * lib/am/progs.am (installcheck-am): New target.
-       * tests/gnits2.test: New file.
-       * tests/Makefile.am (TESTS): Add gnits2.test.
-       * automake.texi (Gnits, Options): Document std-options.
-
-2002-06-17  Kevin Ryde  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Add tmp to @clean_suffixes,
-       as generated by recent texinfo.tex.
-
-2002-06-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): Rename to ...
-       (_AM_CONFIG_HEADERS): ... this.
-       (_AM_CONFIG_HEADER_INSINUATE): Define AC_CONFIG_HEADERS to
-       call _AM_CONFIG_HEADERS; and AM_CONFIG_HEADER to call
-       AC_CONFIG_HEADERS.
-       * automake.in (scan_autoconf_traces): Trace AC_CONFIG_HEADERS
-       instead of AM_CONFIG_HEADER.
-       * tests/autoheader2.test: New file.
-       * tests/Makefile.am (TESTS): Add autoheader2.test.
-       Suggested by Raja R Harinath.
-
-2002-06-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): Use m4_copy instead
-       of m4_rename so that AC_CONFIG_HEADER is never undefined and
-       therefore still traced after the redefinition.
-       * tests/defs (AUTOHEADER): Define.
-       * tests/autoheader.test: New file.
-       * tests/Makefile.am (TESTS): Add autoheader.test.
-       Reported by Braden McDaniel.
-
-2002-06-13  Paolo Bonzini  <address@hidden>
-
-       * automake.in (check_gnu_standards): In --gnu mode, accept
-       one of COPTING, COPYING.LESSER, or COPYING.LIB.
-       (common_files): Add COPYING.LESSER.
-       * automake.texi (Gnits): Document this.
-
-2002-06-13  Paolo Bonzini  <address@hidden>
-
-       * automake.in (required_targets): Add the pdf and pdf-am targets.
-       (initialize_per_input): Likewise.
-       (scan_texinfo_file): Add pdf to @clean_suffixes.
-       (handle_texinfo_helper): Output the .pdf dependencies, and define
-       the PDFS variable.
-       * lib/am/texinfos.am (TEXI2PDF): New variable.
-       (pdf, pdf-am): New targets.
-       (.PHONY): Add pdf, pdf-am, and pdf-recursive.
-       * lib/am/texibuild.am (.%SUFFIX%.pdf): New rule.
-
-2002-06-13  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix pr307.test failure with gcc 3.x.
-       * lib/depcomp (dashmstdout): Strip the call to libtool, and
-       replace `-o $object' by `-o /dev/null' before running "$@"
-       to generate dependencies.
-       (cpp): Strip the call to libtool as well as `-o $object'.
-
-2002-06-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/depcomp (tru64): Expect dependency files in .libs/, maybe as
-       $base.lo.d, when libtool is used.
-       Reported by Nicolas Joly.
-
-2002-06-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there
-       is no file to compile.
-       * tests/java2.test: New file.
-       * tests/Makefile.am (TESTS): Add java2.test.
-       Reported by Braden N. McDaniel.
-
-2002-06-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/maintclean.test: Don't check for autom4te.cache if
-       it's not created by Autoconf.
-       Reported by Bernd Jendrissek.
-
-2002-06-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Tests): Document site.exp.  Update DejaGnu's url.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/header-vars.am (transform): Define.
-       Was removed by mistake on 2002-04-13.
-       * tests/transform.test: New file.
-       * tests/Makefile.am (TESTS): Add transform.test.
-       Reported by Nicolas Joly.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dollar.test: Require GNU make.
-       * tests/maintclean.test: Don't use `export YACC=false'.  Pass
-       YACC=false to configure instead.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex, lib/INSTALL,
-       INSTALL: New upstream versions.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/sinclude.test: Check for m4_include too.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/sinclude.test: Rename the package as amsinclude;
-       am__sinclude still trigers the sinclude macro once it has been
-       converted to am--sinclude.
-       Reported by Nicolas Joly.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (API versioning): Typo.
-
-2002-06-10  Nicolas Joly  <address@hidden>
-
-       * THANKS (Nicolas Joly): Remove duplicate.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Fix $MAKE -e detection.
-       * tests/yacc7.test: Use rm -f.
-
-2002-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (ACLOCAL, AUTOMAKE): Use absolute paths.
-       * tests/subpkg.test: New file.
-       * tests/Makefile.am (TESTS): Add subpkg.test.
-
-2002-06-09  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/318:
-       * tests/nobase.test: Rewrite to test _HEADERS, _DATA, _SCRIPTS,
-       _PROGRAMS, _LIBRARIES, and _LTLIBRARIES.
-       * lib/am/scripts.am (install-%DIR%SCRIPTS,
-       uninstall-%DIR%SCRIPTS): Honor nobase_; strip the directory by
-       default.
-       (?%DIR%SCRIPT_INSTALL): New variable.
-       * lib/am/header-vars.am (install_sh_SCRIPT): New variable.
-       Reported by Eric Siegerman.
-
-2002-06-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (lang_yacc_target_hook): Add rule to recover from
-       the removal of $header.
-       * lib/am/yacc.am (%BASE%.h): Remove (duplicate with the one
-       output by lang_yacc_target_hook).
-       * tests/yacc7.test: Try to recreate foo.h after its removal.
-       * tests/yacc8.test: Add `AM_YFLAGS = -d' and try to recreate
-       parse.h too.
-       Reported by Bernd Jendrissek.
-
-2002-06-08  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/317:
-       * Makefile.am (maintainer-check): Disallow `for f in $(FILES)',
-       suggest `list='$(FILES)'; for f in $$list' instead.
-       * lib/am/distdir.am (distdir): Adjust `for' usage.
-       * lib/am/texinfos.am (maintainer-clean-aminfo): Likewise.
-       * tests/dollar.test: New file.
-       * tests/Makefile.am (TESTS): Add dollar.test.
-       Reported by Eric Siegerman and Philip Fong.
-
-2002-06-06  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/47 (fixed a long time ago):
-       * tests/yacc7.test: Also check that parser sources are distributed.
-
-2002-06-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): New variable.
-       (distclean): Use it.
-       (maintainer-clean): Delete autom4te.cache and
-       $(am__CONFIG_DISTCLEAN_FILES).
-       * tests/maintclean.test: New file.
-       * tests/Makefile.am (TESTS): Add maintclean.test.
-
-2002-06-05  Miloslav Trmac  <address@hidden>
-
-       * lib/am/dejagnu.am (site.exp): Quote build_alias, host_alias, and
-       target_alias.
-
-2002-05-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Check for egrep and fgrep.
-
-       * test/cond22.test: Set SHELL when calling $MAKE -e.
-
-2002-05-31  Richard Boulton <address@hidden>
-
-       Fix PR automake/326:
-       * automake.in (define_objects_from_sources): Calculate the result in
-       all conditions before passing this to subobjname to pick a name to
-       store the result in.
-       (subobjname): Expect a list of condition/value pairs as input.
-       Combine this list and use it as the key to determine the variable name.
-       * test/cond22.test: New file.
-       * tests/Makefile.am (TESTS): Add cond22.test
-
-2002-05-30  Paul Eggert  <address@hidden>
-
-       * lib/am/distdir.am (distdir): Don't assume that 'grep -F' works;
-       instead, use shell pattern matching.
-
-2002-05-29  Paul Eggert  <address@hidden>
-
-       Don't assume that egrep and fgrep exist, as POSIX 1003.1-2001 no
-       longer requires them.
-
-       * Makefile.am (maintainer-check): Use grep -E and grep -F instead
-       of egrep and fgrep.  Omit unnecessary -E and -F.
-       Fix quoting typo -- "fgrep '\$${'" should have been "fgrep '$${'".
-       * lib/am/distdir.am (distdir): fgrep -> grep -F.
-       Use $(), not ${}, for Make variables.
-       * lib/am/texinfos.am (install-info-am, uninstall-info-am):
-       fgrep -> grep
-       * m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
-       * tests/defs: Set FGREP and EGREP.
-
-       * tests/aclocali.test, tests/acoutput2.test, tests/all.test,
-       tests/ansi.test, tests/ansi4.test, tests/colon3.test,
-       tests/cond21.test, tests/condlib.test, tests/confh4.test,
-       tests/confsub.test, tests/cxxansi.test, tests/cxxo.test,
-       tests/depend4.test, tests/discover.test, tests/distname.test,
-       tests/dup3.test, tests/empty4.test, tests/fo.test,
-       tests/implicit.test, tests/insh2.test, tests/interp.test,
-       tests/lex.test, tests/lex3.test, tests/lex4.test,
-       tests/libobj5.test, tests/libobj7.test, tests/make.test,
-       tests/makevars.test, tests/nostdinc.test, tests/parse.test,
-       tests/pluseq.test, tests/pluseq4.test, tests/pluseq6.test,
-       tests/pr2.test, tests/pr9.test, tests/seenc.test,
-       tests/specflags.test, tests/specflags3.test,
-       tests/specflags6.test, tests/subobj.test, tests/subobj2.test,
-       tests/suffix3.test, tests/texinfo.test, tests/texinfo6.test,
-       tests/texinfo8.test, tests/vtexi.test, tests/yacc3.test,
-       tests/yacc6.test: fgrep -> $FGREP, egrep -> $EGREP
-
-2002-05-24  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/323:
-       * m4/depend.m4: Missing comma.
-       * tests/gcj4.test: New file.
-       * tests/Makefile.am (TESTS): Add gcj4.test.
-       Reported by David Pashley.
-
-2002-05-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (configure.in): Don't double-quote $me.
-       * tests/sinclude.test: Overwrite configure.in and use
-       `am__sinclude' instead of `sinclude' as package name.
-       Excercise `m4_sinclude' instead of `sinclude'.
-
-2002-05-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (conditional_implies_one_of): Rename as ...
-       (conditional_implies_any): ... this.
-       * tests/pluseq9.test: Exercise another case with the new
-       `C' variable.
-       Suggested by Raja R Harinath.
-
-2002-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs (configure.in): Quote macro arguments.
-       Reported by Nicolas Joly.
-
-2002-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/header-vars.am (build_triplet, host_triplet,
-       target_triplet): Define.  Were removed by mistake on 2002-04-13.
-
-2002-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/186:
-       * lib/am/distdir.am (distcheck): Attempt a DESTDIR install.
-       * tests/destdir.test: New file.
-       * tests/Makefile.am (TESTS): Add destdir.test.
-
-2002-05-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (conditional_true_when): Return false if $WHEN == FALSE.
-       (conditional_is_redundant): Simplify.
-       (conditional_implies_one_of,
-       variable_not_always_defined_in_cond): New functions
-       (macro_define): Reject appends if the variable is not defined in
-       all conditions where `+=' applies.
-       (invert_conditions): Rewrite.  Before this patch,
-       invert_conditions("A_TRUE B_TRUE", "A_TRUE B_FALSE", "A_FALSE")
-       would return ("A_FALSE B_TRUE", "A_FALSE B_TRUE"), which seems
-       wrong (these conditions implies "A_FALSE").  Now it outputs (),
-       which just means the input conditions cover all cases.
-       (variable_conditions_permutations): Never output FALSE conditions.
-       * tests/pluseq2.test, tests/pluseq3.test: Define data_DATA
-       in the CHECK_FALSE condition to fix the test.
-       * tests/pluseq5.test: Actually check the diagnostic.
-       * tests/pluseq9.test: New file.
-       * tests/Makefile.am (TESTS): Add pluseq9.test.
-
-2002-05-14  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/322:
-       * automake.in (read_am_file): Rename $was_rule as $prev_state, and
-       set it with IN_RULE_DEF, IN_VAR_DEF, or IN_COMMENT as appropriate.
-       Handle comments continued by backslashes.
-       * tests/comment6.test: New file.
-       * tests/Makefile.am (TESTS): Add comment6.test.
-       Reported by Braden N. McDaniel.
-
-2002-05-08  Charles Wilson  <address@hidden>
-            Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/progs.am (clean-%DIR%PROGRAMS): If Libtool is used, clean
-       both `program$(EXEEXT)' and `program'; needed under Cygwin.
-       * tests/libtool3.test: New file.
-       * tests/Makefile.am (TESTS): Add libtool3.test.
-
-2002-05-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * TODO: Undust.
-
-2002-05-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (FETCHFILES, fetch): Get INSTALL from Autoconf CVS.
-
-2002-05-06  Alexandre Duret-Lutz  <address@hidden>
-
-       Erase stamps from the Makefile that generates them.
-
-       * automake.in (handle_configure): Append each used stamp to
-       @distclean_config.  Don't warn about stamp-h in AC_OUTPUT, this
-       file is not used anymore.
-       * lib/am/clean.am (distclean-generic): Don't erase stamp-h and
-       stamp-h[0-9]*.
-       * tests/subdir6.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2002-05-06  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for condd.test (conditional `+='):
-       * automake.in (%appendvar): New.
-       (initialize_per_input): Clear it.
-       (macro_define): Handle += for variable defined in another condition.
-       * automake.texi (Conditional Sources): Use conditional += in
-       the example.
-       (General Operation, Conditionals): Remove note about broken +=.
-       * tests/cond21.test: New file.
-       * tests/condd.test: Also test conditional append to a _SOURCE
-       variable.  Create missing directories.
-       * tests/Makefile.am (TESTS): Add cond21.test.
-       (XFAILS): Remove condd.test.
-
-2002-05-05  Tom Tromey  <address@hidden>
-
-       * automake.texi (Program and Library Variables): Mention _LFLAGS.
-
-2002-04-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Erase so_locations
-       files.  Fix subobj9.test on OSF and IRIX.
-       Reported by Nelson H. F. Beebe.
-
-2002-04-26  Tom Tromey  <address@hidden>
-
-       * lib/am/dejagnu.am (distclean-DEJAGNU): New target.
-       For Debian bug 144221.
-
-2002-04-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/man2.test: Use `pwd`, not $PWD.  Use $MAKE -e.
-
-2002-04-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (subobjname): Use the length of %subobjvar
-       instead of $subobjnamenum.
-       (subobjnamenum): Remove.
-
-2002-04-25  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/307:
-       * lib/depcomp: Never compute dependencies in the background, this
-       can cause races with libtool.  Compute the dependencies after
-       the actual compilation.  Don't make libtool silent now that
-       it's run in the foreground.
-       * tests/pr307.test: New file.
-       * tests/Makefile.am (TESTS): Add pr307.test.
-       Reported by Laurent Morichetti.
-
-2002-04-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/check.am: Show skipped tests.  Display the
-       $(PACKAGE_BUGREPORT) address on failure.
-
-2002-04-24  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix PR automake/315:
-       * automake.in (subobjname): Rewrite to generate variable name
-       unique for each content.
-       (%substnums): Remove.
-       (%subobjvar): New hash.
-       (initialize_per_input): Clear %subobjvar.
-       (define_objects_from_sources): Return the name of the variable
-       defined, in addition to the linker.  Call subobjname only once
-       the content of the variable to define is known.
-       (handle_source_transform): Adjust call to define_objects_from_sources.
-       * tests/specflags8.test: Mention PR 315.
-       * tests/subobjname.test: New file.
-       * tests/Makefile.am (XFAIL_TESTS): Remove specflags8.test.
-       (TESTS): Add subobjname.test.
-
-2002-04-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Grep
-       the whole file for 'generated by automake', not only the
-       first line.  This accounts for post-processed Makefile.in's.
-       * tests/postproc.test: New file.
-       * tests/Makefile.am (TESTS): Add postproc.test.
-
-2002-04-22  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/151 and PR automake/314:
-       * automake.texi (A Program): Split into
-       (Program Sources, Linking, Conditional Sources, Conditional
-       Programs): ... these subsections; moving the Linking node
-       before the Conditional discussions.
-       (Conditional Sources): More details.  Notably, mention
-       hello_DEPENDENCIES.
-       (Conditionals): Adjust reference to Conditional Programs.
-
-2002-04-19  Paul Eggert  <address@hidden>
-
-       Fix some bugs when using "$@" when there might be zero positional
-       arguments in cases where this matters.  Zsh doesn't support
-       the workaround ${1+"$@"} that has been used by Automake since
-       the Mon Dec  4 11:55:36 1995 change.
-
-       * aclocal.in: Use 'case' statement to work around problem.
-       * automake.in: Likewise.
-       * lib/ylwrap: Likewise.
-       * lib/missing: No need for workaround, as the command is never
-       invoked with zero arguments.
-       * tests/ccnoco.test: Likewise.
-       * missing: Update from lib/missing.
-
-2002-04-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (initialize_per_input): Clear %require_file_found.
-       (%require_file_found): Group the declaration with the other
-       variables initialized by initialize_per_input.
-       * tests/required.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       Reported by Marius Vollmer.
-
-2002-04-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): New function,
-       override AC_CONFIG_HEADERS with AM_CONFIG_HEADER.
-       (_AM_CONFIG_HEADER): Use _AM_AC_CONFIG_HEADERS.
-       * m4/init.m4: Call _AM_CONFIG_HEADER_INSINUATE.
-       * tests/stamph2.test: Use AC_CONFIG_HEADERS for some of the config
-       files.
-       * tests/confh5.test: New file.
-       * tests/Makefile.am (TESTS): Add confh5.test.
-       * automake.texi (Optional, Public macros): Update descriptions
-       of AC_CONFIG_HEADERS and AM_CONFIG_HEADER.
-
-2002-04-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/man2.test: New file.
-       * tests/Makefile.am (TESTS): Add man2.test.
-       * lib/am/mans.am (install-man%SECTION%): Change the extension
-       of the man pages being installed, as documented.
-
-2002-04-13  Alexandre Duret-Lutz  <address@hidden>
-
-       Enable traces; wipe out the old configure.in parser.
-
-       * automake.in (scan_autoconf_traces): Use '$ENF{AUTOCONF}' of
-       'autoconf'.  Honnor the $filename argument.
-       (scan_autoconf_files): Don't call scan_one_autoconf_file.
-       Always call scan_autoconf_traces.
-       (scan_one_autoconf_file): Remove, with it associated regexes.
-       (obsolete, obsolete_rx): Remove.
-       (register_language, handle_languages): Remove the 'define_flag'
-       support.  Remove it from the struct and language definitions too.
-       (unquote_m4_arg): Remove.
-       * lib/am/header-vars.am, lib/am/compile.am, lib/am/lisp.am: Remove
-       the `FOO = @FOO@' definitions for all AC_SUBST'ed variables.  They
-       are now generated automatically.
-       * aclocal.in (obsolete_macros): Don't mention obsolete_macros in
-       automake.in.
-       * automake.texi (Invoking Automake): Mention the AUTOCONF envvar.
-
-2002-04-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/version6.test: New file.
-       * tests/Makefile.am (TESTS): Add tests/version6.test.
-       * automake.in (version_check): Return 0 on equality.
-
-2002-04-13  Andreas Schwab  <address@hidden>
-
-       * THANKS: Update my mail address.
-
-2002-04-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/discover.test: Use a full configure.in that calls AC_INIT.
-       Use AC_LIBOBJ.  Grep the error message.
-       * test/ldadd.test: Don't use LIBOBJS.  Use a full configure.in.
-       Grep the error message.  Require libtool.
-       * tests/ldflags.test:  Don't use LIBOBJS.
-       * tests/seenc.test: Use AC_LIBOBJ, --Wno-error, and grep the
-       error messages for CC and CXX.
-
-2002-04-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_traces) <AC_SUBST>: Ignore ANSI2KNR
-       and AMDEPBACKSLASH.
-       * tests/distcommon2.test: Use a full configure.in that calls AC_INIT.
-       * tests/ext.test: Enable dependencies for OBJC.
-       * tests/libobj.test, tests/libobj6.test, tests/libobj9.test:
-       Delete.  They tests for different flavors of $LIBOBJS assignments
-       that wont be supported anymore.
-       * tests/libobj2.test, tests/libobj10.test: Use AC_LIBOBJ.
-       * tests/obsolete.test: Don't test Automake.
-       * tests/suffix5.test: Require libtool.
-       * tests/Makefile.am (TESTS): Remove libobj.test, libobj6.test and
-       libobj9.test.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in (APIVERSION): Fix definition.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS: Catch up with changes since 1.6.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/yacc8.test: Don't assume GNU make, run config.status
-       to regenerate the Makefile.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Make sure `$MAKE -e' is
-       always followed by a SHELL setting.
-       * tests/ansi3.test, tests/ansi5.test, tests/subobj3.test: Set
-       SHELL when calling `$MAKE -e'.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/subobj9.test: Use configure.in, not configure.ac,
-       otherwise this fails with old libtool versions.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-2002-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * ChangeLog.2001: New file, extracted from ChangeLog.
-       * Makefile.am (EXTRA_DIST): Add it.
-
-2002-04-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Canonicalization): The sources for libmumble++.a
-       go into libmumble___a_SOURCES.
-
-2002-04-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Check for `sleep 1' uses in the
-       test suite.  Suggest `sleep 2' instead.
-       * tests/confsub.test: Use `sleep 2'.
-
-2002-04-04  Paul Eggert  <address@hidden>
-
-       * lib/am/subdirs.am:
-       ($(RECURSIVE_TARGETS), maintainer-clean-recursive):
-       $(MAKEFLAGS) -> $$MAKEFLAGS, so that we don't run into problems if
-       MAKEFLAGS contains '$(...)'.
-
-2002-04-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/specflags8.test: Typo.
-
-2002-04-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/specflags6.test: Run aclocal.
-       * tests/Makefile.am (TESTS): Add specflags6.test.
-
-2002-04-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/specflags7.test, tests/specflags8.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-       (XFAIL_TESTS): Add specflags8.test.
-
-2002-03-29  Tom Tromey  <address@hidden>
-
-       * automake.in (check_typos): Examine AM_LDFLAGS.
-       Fixes PR automake/311.
-
-       For PR automake/312:
-       * lib/am/libtool.am (clean-libtool): Use LTRMS.
-       * automake.in (handle_single_transform_list): When processing a
-       libtool object, clean the ordinary object and register the
-       directory.
-       (libtool_clean_directories): New global.
-       (initialize_per_input): Initialize it.
-       (generate_makefile): Call handle_libtool later.
-       (handle_libtool): Handle libtool_clean_directories.
-       * tests/subobj9.test: New file.
-       * tests/Makefile.am (TESTS): Added subobj9.test.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/extra6.test, tests/subdir5.test: Require GNU make.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dup3.test (ACLOCAL): s/srcdir/testsrcdir/.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/extra7.test: New file.
-       * tests/Makefile.am: Add it.
-       * lib/am/distdir.an (distdir): When a distribuable directory
-       exists both in `.' and $(srcdir), merge both directories.  This
-       works around a failure of extra6.test on Tru64 reported by
-       Nicolas Joly.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/pr87.test, tests/yaccvpath.test: Require GNU make.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Catch occurrences of
-       `$MAKE foo=bar' in the testsuite.  Suggest using
-       `foo=bar $MAKE -e' instead.
-       * tests/ansi3.test, tests/ansi5.test, tests/subobj3.test:
-       Use $MAKE -e.  This fixes a ansi5.test failure with Solaris make.
-       * tests/defs: Unset $srcdir, and set $testsrcdir to its old value.
-       * tests/installsh.test (AUTOMAKE, ACLOCAL): Use $testsrcdir.
-
-2002-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/310:
-       * lib/am/depend2.am, lib/am/lex.am, lib/am/yacc.am: Quote %SOURCE%
-       so it never appears as a plain word.
-
-2002-03-25  Angus Leeming  <address@hidden>
-
-       * lib/depcomp (tru64): Correctly compute `base'.
-
-2002-03-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/pr211.test: s/requires/required/, otherwise the test fails
-       if libtool is not installed.
-
-2002-03-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dirname.test: Don't use $SHELL when calling ./configure.
-
-2002-03-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dirname.test: Use --quiet to fix failure on installations
-       using a site script.
-       Reported by Nicolas Joly.
-
-2002-03-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Check for misuses of make,
-       autoconf, automake, aclocal, and perl in the testsuite.  Suggest
-       using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead.
-       * tests/confsub.test: Use $AUTOCONF and $MAKE.
-       * tests/extra5.test, tests/extra6.test, tests/lex5.test,
-       tests/nobase.test, tests/nodist2.test, tests/pr204.test,
-       tests/pr224.test, tests/pr287.test, tests/strip.test,
-       tests/yacc8.test: Use $MAKE.
-
-2002-03-20  Alexandre Duret-Lutz  <address@hidden>
-
-       Add support for two-dot versions.
-
-       * tests/version5.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * automake.in (version_split, version_compare): New functions.
-       (version_check): Rewrite using version_split and version_compare.
-       (process_option_list): Adjust regex.
-
-2002-03-18  Richard Boulton <address@hidden>
-
-       Fix for PR automake/306:
-       * automake.texi (Generalities): Document +=.
-       (Conditionals): Document limitations of += with conditionals.
-
-2002-03-17  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/295:
-       * automake.texi (Invoking Automake): Deprecate --output-dir.
-       * automake.in (usage): Don't document --output-dir.
-       (output_directory): Don't initialize.
-       (parse_arguments): Deprecate --output-dir.
-
-       * m4/init.m4 (AUTOMAKE, ACLOCAL): Removed extra quotes.
-       Fixes PR automake/304.
-
-2002-03-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dirforbid.test: Workaround for NetBSD sh bug.
-       Fixes PR automake/305.
-
-2002-03-11  Richard Boulton <address@hidden>
-
-       * automake.in (check_typos): Allow variables with reserved
-       suffices (such as _LDFLAGS) and prefixes which aren't
-       recognised if the variable is defined in configure.ac.
-       Fixes acsubst.test.
-
-2002-03-11  Richard Boulton <address@hidden>
-
-       * tests/acsubst.test: New test, by Alexandre Duret-Lutz
-       * tests/acsubst2.test: New test, by Alexandre Duret-Lutz
-       * tests/Makefile.am (TEST): Added acsubst.test and acsubst2.test
-
-2002-03-11  Peter Breitenlohner  <address@hidden>
-
-       * tests/defs: Unset DESTDIR, otherwise `make DESTDIR=/foo check'
-       causes failures.
-
-2002-03-07  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/303:
-       * automake.in (version_check): Move the error message ...
-       (process_option_list): ... here, so we can distinguish between
-       global and local options.
-
-2002-03-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/pr300-lib.test, tests/pr300-ltlib.test,
-       tests/pr300-prog.test: Use AC_OUTPUT, not AC_OUTPUT(Makefile), so
-       Autoconf doesn't complain about Makefile being output twice.
-
-2002-03-06  Tom Tromey  <address@hidden>
-
-       * configure.in: Upped version to 1.6a.
-
-2002-03-05  Tom Tromey  <address@hidden>
-
-       * configure.in: Released 1.6.
-
-2002-03-05  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/300:
-       * tests/pr300-lib.test, tests/pr300-ltlib.test,
-       tests/pr300-prog.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-       * automake.in (handle_ltlibraries): Strip nobase_ prefix to
-       compute the directory.
-       * lib/am/header-vars.am (install_sh_PROGRAM): New variable.
-       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): New variable.
-       (install-%DIR%LIBRARIES): Use it.  Honor nobase_.
-       (uninstall-%DIR%LIBRARIES): Honor nobase_.
-       * lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): New variable.
-       (install-%DIR%LTLIBRARIES): Use it.  Honor nobase_.
-       (uninstall-%DIR%LTLIBRARIES): Honor nobase_.
-       * lib/am/progs.am (%DIR%PROGRAMS_INSTALL): New variable.
-       (install-%DIR%PROGRAMS): Use it.  Honor nobase_.
-       (uninstall-%DIR%PROGRAMS): Honor nobase_.
-       See also the fix for nobase.test on 2001-11-09.
-
-2002-03-05  Tom Tromey  <address@hidden>
-
-       * lib/config.sub, lib/config.guess, lib/texinfo.tex: Updated.
-
-2002-03-05  Pavel Roskin  <address@hidden>
-
-       * tests/yacc8.test: Add a command between "test" and "cd" to
-       work around a bug in bash-2.05.
-
-2002-03-05  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/294:
-       * tests/dirforbid.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * automake.in (standard_prefix): New hash.
-       (am_primary_prefixes): Forbid standard_prefixes which are not
-       explicitely allowed.
-       * automake.texi (Uniform): Remove FIXME.
-
-2002-03-05  Jim Meyering  <address@hidden>
-
-       * automake.in (@common_files): Add config.rpath.
-
-2002-03-05  Kevin Ryde  <address@hidden>
-
-       For PR automake/297:
-       * lex.m4 (AM_PROG_LEX): Don't set LEX=${am_missing_run}flex until
-       after AC_PROG_LEX, since it will try to run it and fail (in autoconf
-       2.52 at least).
-
-2002-02-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Declare
-       LEX_OUTPUT_ROOT and LEXLIB as configure variables when
-       AM_PROG_LEX or AC_PROG_LEX are seen.  This allows to ...
-       * lib/am/lex.am: ... remove the LEX_OUTPUT_ROOT and LEXLIB
-       definitions.  Search %SOURCE% in $(srcdir).  Use s||| instead
-       of s/// in the sed invocation, to support filenames containing
-       slashes.
-       * lib/am/yacc.am: Search %SOURCE% in $(srcdir).  Use s||| too.
-       * tests/lex5.test, tests/yacc8.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2002-02-23  Per Bothner  <address@hidden>
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Set `dirpart' to
-       `.' in else branch.
-
-2002-02-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/make.test: Revert the grep logic to work around a bug
-       in NetBSD sh (see NetBSD Problem Report #11542).
-       Reported by Patrick Welche.
-
-2002-02-20  Tim Van Holder  <address@hidden>
-
-       * m4/lispdir.m4: Redirect /dev/null to stdin when running $EMACS
-       to try and prevent a non-lisp emacs from starting in interactive
-       mode.
-       * automake.texi: Document this change.
-
-2002-02-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Macros): Split into ...
-       (Public Macros, Private Macros): ... these.
-
-2002-02-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/insthook.test: Use sed instead of "tail +X".
-
-2002-02-18  Paul Eggert  <address@hidden>
-
-       * lib/depcomp: Don't use "tail +3"; it's not portable to
-       POSIX 1003.1-2001 hosts.
-
-2002-02-18  Jim Meyering  <address@hidden>
-
-       * tests/cond12.test: Use sed 1q, not `head -n 1'.
-       The latter is not portable to some old systems.
-       * m4/depout.m4: Don't use `head -1'; it's no longer portable.
-       Use `sed 1q' instead.
-       * tests/insthook.test: Likewise.
-
-2002-02-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_lib_objects_cond): Tell the user to put
-       global linker flags in AM_LDFLAGS, not LDFLAGS.
-
-       * automake.texi (General Operation): AC_SUBST'ed variables
-       override Automake's variables.
-       (Uniform): More words and @refs.
-       (Auxiliary Programs) <config.sub, config.guess>: Add URL.
-       (etags): More explanations about the first example.
-       (Invoking Automake): Mention autoreconf.  More @refs.
-       (Requirements): Mention AC_CONFIG_FILES.
-       (Optional): AC_CHECK_TOOL will no longer install config.sub and
-       config.guess.  Mention AC_LIBOBJ, AC_LIBSOURCE, and AC_LIBSOURCES.
-       (Invoking aclocal): aclocal no longer warn about duplicates.
-       (Macros) <AM_INIT_AUTOMAKE>: More explanations.
-       (Extending aclocal): Suggest using the output of
-       `aclocal --print-ac-dir` to install third-party macros.
-       (Alternative): Specify ordering of dist_, nodist_, and nobase_
-       prefixes.
-       (A Program): Mention scripts.  The global LDADD variable is not
-       meant to hold link flags, suggest using AM_LDFLAGS instead.
-       (Program and Library Variables) <maude_LIBADD, maude_LDADD>:
-       _LIBADD and _LDADD are subject to the same restriction wrt to
-       link flags.
-       (Program and Library Variables) <maude_DEPENDECIES>: Is also
-       derived from maude_LIBADD.
-       (Program variables): Define AM_LDFLAGS.
-       (Dependencies): Passing the no-dependencies option to
-       AM_INIT_AUTOMAKE is prefered.
-       (Scripts): Explain why automake is magically cleaned.
-       Mention noinst_SCRIPTS and check_SCRIPTS.
-       (Data): Use dist_ in Automake's example.
-       (Dist): Reference AM_INIT_AUTOMAKE for PACKAGE and VERSION.
-       Mention AC_CONFIG_FILES instead of AC_OUTPUT.
-
-2002-02-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (FETCHFILES): Add Automake/XFile.pm.
-       (fetch): Fetch XFile.pm.  Update the files in $(srcdir) instead
-       of asking the maintainer to do it manually.
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex,
-       Automake/XFile.pm: New upstream versions.
-
-2002-02-02  Tom Tromey  <address@hidden>
-
-       * automake.texi (Macros): Warn about upgrading.
-
-2002-02-01  Tom Tromey  <address@hidden>
-
-       Change per GNU coding standards:
-       * aclocal.in (parse_arguments): Only mention most recent year in
-       copyright output.
-       * automake.in (version): Only mention most recent year.
-
-2002-01-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (API versioning): New Node.
-       (Extending): Use $(DESTDIR) in examples.
-
-2002-01-28  Akim Demaille  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Serial 5.
-       Respect the --help layout.
-
-2002-01-27  Tom Tromey  <address@hidden>
-
-       * configure.in: Bumped to 1.5e.
-
-       * lib/am/yacc.am: Use `rm -f'.
-
-       * configure.in: Released 1.5d.
-
-       * lib/config.guess: New version from FSF.
-
-       * Makefile.am (uninstall-hook): New target.
-
-2002-01-24  Akim Demaille  <address@hidden>
-
-       * lib/install-sh: Update, from Autoconf.
-
-2002-01-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Don't treat AC_CHECK_TOOL
-       as AC_CANONICAL_HOST (the former does not require the latter since
-       Autoconf 2.50).
-       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Check for strip.
-       * automake.texi (Requirements): Do not require STRIP to be
-       defined by the user.
-
-2002-01-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).
-       * automake.in (handle_languages): Compute and substitute %DEPDIRS%.
-       * tests/pr224.test: Make sure .deps subdirectories are
-       erased by distclean.
-
-2002-01-22  Tom Tromey  <address@hidden>
-
-       * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if
-       no-dependencies option is set.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't invoke dependency code if
-       no-dependencies option is set.  Don't call AM_DEP_TRACK or
-       AM_SET_DEPDIR.
-
-2002-01-22  Pavel Roskin  <address@hidden>
-
-       * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and
-       ASFLAGS.
-
-2002-01-22  Akim Demaille  <address@hidden>
-
-       * Makefile.am (FETCHFILES): Remove ansi2knr.c, add texinfo.tex.
-       (fetch): Adjust.
-
-2002-01-21  Tom Tromey  <address@hidden>
-
-       * Makefile.am (fetch): Don't fetch ansi2knr.
-
-       * automake.texi (Macros): Updated for new variable names.
-       (Program and Library Variables): Likewise.
-       (Assembly Support): Likewise.
-       * m4/as.m4: Use CCAS and CCASFLAGS.
-       * automake.in (asm): Use CCAS and CCASFLAGS.
-
-2002-01-21  Akim Demaille  <address@hidden>
-
-       * automake.in (&parse_arguments): Use a more GNUish error message
-       on wrong options.
-
-2002-01-20  Tom Tromey  <address@hidden>
-
-       Fix for PR automake/231:
-       * m4/gcj.m4 (AM_PROG_GCJ): Use _AM_DEPENDENCIES(GCJ).
-       * m4/depend.m4: Document `GCJ'.
-
-       For PR automake/224:
-       * tests/Makefile.am (TESTS): Added pr224.test.
-       * tests/pr224.test: New file.
-       * lib/depcomp: Fixed computation of depfile.
-       * lib/am/depend2.am: Use %DEPBASE%, not $(DEPDIR).
-       * automake.in (handle_single_transform_list): Only reject `..'
-       component for Java.  Put dependencies in directory near object.
-       (handle_languages): Set DEPBASE.  Handle de-ansi-fication.
-
-2002-01-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs: Export AUTOMAKE and ACLOCAL.
-
-2002-01-19  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/204:
-       * tests/pr204.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * automake.in (handle_single_transform_list): Don't distribute
-       sources derived from non-distributed sources.
-
-2002-01-18  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/229:
-       * tests/pr229.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * automake.in (scan_one_autoconf_file): Recognize AC_CYGWIN,
-       AC_EMXOS2, and AC_MINGW32.
-
-2002-01-18  Tom Tromey  <address@hidden>
-
-       * tests/cond7.test: Fix test bug exposed by copyright update.
-
-       For PR automake/288:
-       * automake.in (lang_c_rewrite): Don't prepend directory to base if
-       directory is `.'.  Also, properly compute de_ansi_files entry in
-       subdir-objects case
-       * tests/Makefile.am (TESTS): Added ansi7.test.
-       * tests/ansi7.test: New file.
-
-       * aclocal.in (parse_arguments): Added 2002.
-       (write_aclocal): Likewise.
-       (parse_arguments): Updated my email address.
-       * automake.in (gen_copyright): Added 2002.
-       (version): Likewise.  Also, changed my email address.
-
-       * configure.in (APIVERSION): Refined definition.
-
-2002-01-18  Tom Tromey  <address@hidden>
-
-       * missing: Updated.
-       * lib/missing: Accept versioned aclocal.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal.
-
-2002-01-17  Pavel Roskin  <address@hidden>
-
-       * m4/Makefile.am (m4datadir): Use APIVERSION.
-
-2002-01-16  Tom Tromey  <address@hidden>
-
-       * Makefile.am (install-exec-hook): Use APIVERSION.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
-       * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
-       APIVERSION.
-       * automake.in (perllibdir): Use APIVERSION.
-       (libdir): Likewise.
-       * aclocal.in (perllibdir): Use APIVERSION.
-       (APIVERSION): New global.
-       (parse_arguments): Use APIVERSION.
-       * configure.in (APIVERSION): New subst.
-       (pkgvdatadir): Use APIVERSION.
-
-2002-01-15  Tom Tromey  <address@hidden>
-
-       * missing: Updated.
-       * lib/missing: Match against `automake*' to pick up versioned
-       automake.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use versioned automake name.
-       * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__version
-       variable.
-       * lib/am/Makefile.am (amdir): Use pkgvdatadir.
-       * lib/Makefile.am (dist_pkgvdata_DATA): Renamed to use
-       pkgvdatadir.
-       (scriptdir): Use pkgvdatadir.
-       (installcheck-local): Likewise.
-       * lib/Automake/Makefile.am (perllibdir): Use pkgvdatadir.
-       * automake.in (perllibdir): Added VERSION.
-       (libdir): Likewise.
-       * aclocal.in (parse_arguments): Search versioned directory.  Don't
-       push unversioned directory unless it exists.
-       (perllibdir): Added VERSION.
-       (default_acdir): New global.
-       * m4/Makefile.am (m4datadir): Added $(VERSION).
-       * Makefile.am (install-exec-hook): New target.
-       * configure.in (ACLOCAL): Search build directory.
-       (pkgvdatadir): New subst.
-
-2002-01-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.sub, lib/config.guess: New versions from FSF.
-
-2002-01-13  Tom Tromey  <address@hidden>
-
-       For PR automake/288:
-       * automake.in (lang_c_rewrite): Set value for de_ansi_files entry
-       to directory.
-       (lang_c_finish): Likewise.  Also, use directory information from
-       de_ansi_files.
-
-2002-01-13  Kevin Ryde  <address@hidden>
-
-       For PR automake/288:
-       * tests/Makefile.am (TESTS): Added ansi6.test.
-       * tests/ansi6.test: New file.
-
-2002-01-13  Tom Tromey  <address@hidden>
-
-       For PR automake/287:
-       * lib/am/distdir.am (distdir): Use `$$list' trick when looping
-       over subdirs.
-       * tests/Makefile.am (TESTS): Added pr287.test.
-       * tests/pr287.test: New file.
-
-2002-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distdir): Handle subdirectories.
-       * tests/extra6.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2002-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/extra2.test: Run $ACLOCAL.
-
-2002-01-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from
-       AM_INIT_AUTOMAKE arguments when using the old-style call.
-       Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
-       Suggested by Pavel Roskin.
-
-2002-01-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * test/nodefine.test, test/nodefine2.test: Check that no-define
-       works, not the contrary...
-       * m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): A third argument implies no-define,
-       not the contrary.
-
-2002-01-12  Jim Meyering  <address@hidden>
-
-       * automake.in (scan_one_autoconf_file): Unquote AC_LIBOBJ argument.
-       * tests/libobj11.test: New file.
-       * tests/Makefile.am (TESTS): Add libobj11.test.
-
-2002-01-09  Ryan T. Sammartino  <address@hidden>
-
-       * lib/depcomp (msvisualcpp): Strip -Gm, -Gi, and -ZI options.
-
-2002-01-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (file_contents_internal): Introduce two variables,
-       $is_rule and $discard_rules to track rules spanning across multiple
-       paragraphs.  This fixes a very nasty bug reported by Dmitry Mikhin
-       where only the first paragraph of such a multi-paragraph rule was
-       discarded; but it leaves many similar latent bugs (see the FIXMEs).
-
-2002-01-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/dup3.test: Remove all -I from $ACLOCAL before using it.
-       * tests/error.test: Use some macro names which are not defined by
-       Automake itself.
-
-2002-01-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Complete, Macros, Options): Document the new style
-       AM_INIT_AUTOMAKE.  Remove AM_AUTOMAKE_OPTIONS documentaion.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Get PACKAGE and VERSION from
-       AC_INIT if they are available there.  Support a new call form
-       where the only argument is an optional space-separated list of
-       Automake options.
-       * m4/options.m4 (AM_AUTOMAKE_OPTIONS): Remove.
-       (_AM_MANGLE_OPTION, _AM_SET_OPTION, _AM_SET_OPTIONS,
-       _AM_IF_OPTION): New functions.
-       * automake.in (AC_INIT_PATTERN): New variable.
-       (global_options_line): Remove, use $seen_init_automake instead.
-       (scan_one_autoconf_file, scan_autoconf_traces): Set $package_version
-       from AC_INIT if available.  Support the new style AM_INIT_AUTOMAKE.
-       Remove the AM_AUTOMAKE_OPTIONS handling.
-       * configure.in: Modernize.
-       * tests/defs (configure.in): Modernize.  One third of the tests
-       still overwrite the default configure.in and use an old
-       AM_INIT_AUTOMAKE call,  so that makes testing for both.
-       * tests/nodefine.test, tests/nodefine2.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2002-01-08  Raja R Harinath  <address@hidden>
-
-       * automake.in (define_configure_variable): Propagate line numbers.
-
-2002-01-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.2.
-
-2002-01-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in: Run the Autoconf test in a subdirectory, then
-       erase this directory.
-
-2002-01-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in (AUTOMAKE): Create m4/amversion.m4.
-       * m4/amversion.in: New file.
-       * m4/Makefile.am (m4data_DATA, EXTRA_DIST): Replace by ...
-       (dist_m4data_DATA): ... this.
-       (nodist_m4data_DATA, DISTCLEANFILES): Add amversion.m4.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require
-       AM_SET_CURRENT_AUTOMAKE_VERSION.
-       * automake.in (seen_automake_version): New variable.
-       (scan_autoconf_traces, scan_one_autoconf_file,
-       scan_autoconf_files): Scan for AM_AUTOMAKE_VERSION and complain
-       when the version used in aclocal.m4 differs from Automake's.
-       * tests/defs (ACLOCAL): Look in ../m4 too.
-       * tests/installsh.test (ACLOCAL): Likewise.
-       * tests/installdir.test (installdirs-local): Run $ACLOCAL.
-
-2002-01-06  Raja R Harinath  <address@hidden>
-
-       * automake.in (handle_languages): Emit an automake
-        internal variable 'am__depfiles_maybe'.
-       * lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe.
-
-       * lib/am/configure.am (%MAKEFILE%): Pass `depfiles' to
-       config.status.
-
-2002-01-06  Tom Tromey  <address@hidden>
-
-       * automake.texi (Tags): Document new variables.
-       * lib/am/tags.am (ETAGS): New macro.
-       (ETAGSFLAGS): Likewise.
-       (TAGS): Use them.
-
-2002-01-04  Tom Tromey  <address@hidden>
-
-       * configure.in (ACLOCAL): Set perllibdir.  From Nicolas Joly.
-
-2002-01-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (read_am_file): Thinko in "comment following
-       trailing backslash" detection.
-       * tests/comment5.test: Test for this too.
-
-2002-01-02  Tom Tromey  <address@hidden>
-
-       * automake.texi (Extending): Added index for uninstall-hook.
-
-2002-01-02  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/278:
-       * m4/python.m4 (AM_PYTHON_CHECK_VERSION): Use `sys.hexversion' to cope
-       with versions such as '2.2c1'.  Also, use `int' instead of the
-       obsoleted `string.atoi'.
-       Reported by Enrico Scholz.
-
-2002-01-02  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/280:
-       * automake.in (read_am_file): Warn about trailing backslashes
-       in comments.
-       * tests/comment5.test: New file.
-       * tests/Makefile.am (TESTS): Add comment5.test.
-       Reported by Enrico Scholz.
-
-2002-01-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/comment4.test: New file.
-       * tests/Makefile.am (TESTS): Add comment4.test.
-
-       Fix for comment4.test:
-       * automake.in (read_am_file): Output leading comments only when
-       encountering white lines.
-
-2002-01-01  Tom Tromey  <address@hidden>
-
-       For PR automake/234:
-       * tests/Makefile.am (TESTS): Added strip.test.
-       * tests/strip.test: New file.
-
-       * automake.texi (Extending): Mention uninstall-hook.
-       (Install): Likewise.
-       * automake.in (handle_factored_dependencies): Allow
-       uninstall-hook.
-
-2002-01-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/install.am (install-strip): Set INSTALL_STRIP_FLAG=-s,
-       it is needed by install-%DIR%LTLIBRARIES in ltlib.am.
-       This fixes a bug introduced on 2001-01-28.
-       Reported by Jared Davis.
-
------
-
-Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.03 b/ChangeLog.03
deleted file mode 100644
index 0152d56..0000000
--- a/ChangeLog.03
+++ /dev/null
@@ -1,2971 +0,0 @@
-2003-12-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (generate_makefile): Update misleading comment.
-
-       * automake.in (handle_languages): Define %DEPBASE% conditionally
-       on subdir-objects.  Define SUBDIROBJ.  Do not clean *_.c files
-       here ...
-       (lang_c_finish): ... do it here.
-       (handle_single_transform_list): Do not output specific rules for
-       subdir-objects files which are not renamed.  This should reduce
-       the size of Makefiles with lots of subdirectory sources.
-       * lib/depcomp: Simplify computation of dependency output, and use
-       DEPDIR.
-       * lib/am/depend2.am (%EXT%.o, %EXT%.obj, %EXT%.lo): Adjust call
-       to depcomp.  Compute depbase on-the-fly in generic fastdep rules
-       for subdir-objects.
-       * tests/ansi9.test: Do not grep for an explicit rule that
-       we no longer expect.  Really run $MAKE to make sure the chain
-       of rules works.
-       * tests/yacc5.test: Do not grep for an explicit rule that
-       we no longer expect.  Adjust to use set -e.
-
-2003-12-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (@common_files): Move configure, configure.ac, and
-       configure.in ...
-       (@common_sometimes): ... here so that these files do not appear
-       twice in DIST_COMMON.
-
-       * automake.in (maybe_push_required_file): Add $(srcdir) in front
-       a required files outside the current directory or its subdirectories.
-       * lib/am/distdir.am (distdir): Update comment.
-       Report from Nicolas Joly.
-
-2003-12-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (@copying): Do not repeat the version.
-       (Top): Use @insertcopying.  Add a @detailmenu, this works around
-       Emacs 21's inability to lookup indices in sub-nodes (reported
-       by Kevin Ryde).
-       (C++ Support, Assembly Support, Fortran 77 Support, Java Support,
-       Support for Other Languages, Preprocessing Fortran 77, Compiling
-       Fortran 77 Files, Mixing Fortran 77 With C and C++, How the Linker
-       is Chosen): Add missing descriptions in menus.
-       (Fortran 77 and Autoconf): Remove, this node was just saying "use
-       Autoconf 2.53 or greater".
-
-2003-12-26  Santiago Vila  <address@hidden>  (tiny change)
-
-       * NEWS: s/Gettext 1.12.1/Gettext 0.12.1/
-
-2003-12-25  Nicolas Joly  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Conditional Sources): Typo.
-
-2003-12-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Config.in: Require Exporter.
-       Report from Kevin Ryde (failure with Perl 5.005_03).
-
-2003-12-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/aclocal6.test: Check for autom4te.cache only if it has
-       been created.
-       * tests/maintclean.test: Update comment.
-       Report from Bruno Haible.
-
-       * tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
-       Require texi2dvi-o.
-       Report from Václav Haisman.
-
-2003-12-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.8a.
-
-       * configure.ac, NEWS: Bump version to 1.8.
-
-       * lib/texinfo.tex: New upstream version.
-
-       * Makefile.am (INSTALL): Copy the source from $(srcdir).
-
-2003-12-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Rule.pm (define): Remove debugging traces.
-       Report from Akim Demaille.
-
-2003-12-09  Ralf Wildenhues  <address@hidden>  (tiny change)
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (do_subst): Fix the substitution of @address@hidden
-       (automake, aclocal): Create the output atomically and make it
-       read-only, as done in the Autoconf package.
-       * lib/Automake/Makefile.am (do_subst): Fix the substitution of
-       @address@hidden
-       (Config.pm): Create the output atomically and make it read-only.
-       * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Substitute
-       @configure_input@ and make the output read-only.
-       * lib/Automake/Config.in, m4/amversion.in, tests/aclocal.in,
-       tests/automake.in, tests/defs.in: Add a @configure_input@ line.
-
-2003-12-09  Ralf Wildenhues  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Local Macros, CVS): Typos.
-
-2003-12-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (hook): Use $$ as prototype, not $\&.
-       Perl 5.6.0 will not accept a reference sub reference for the
-       latter.
-       * automake.in (var_SUFFIXES_trigger): Adjust registration via
-       Automake::Variable::hook.
-       (handle_texinfo_helper): Make sure `inner_expand => 1' appears
-       on one line, so that Perl 5.6.0 does not complain about
-       inner_expand being a bare identifier.
-
-2003-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (check_acinclude, scan_file): Output `warning:' in
-       front of warnings.
-       Report from Pavel Roskin.
-
-2003-12-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * TODO: Remove some old entries.
-
-       * doc/automake.texi (Rebuilding): Document CONFIGURE_DEPENDENCIES
-       and CONFIG_STATUS_DEPENDENCIES.  Move this sections later
-       in the manual since it's pretty advanced material.
-
-       * automake.in ($config_header_location): Remove.  Use
-       %ac_config_files_location instead.
-       (rewrite_inputs_into_dependencies): Do not prepend $(top_builddir)/
-       at the top-level.
-       (handle_configure): Use rewrite_inputs_into_dependencies to
-       distribute and compute AC_CONFIG_HEADERS dependencies.
-       (scan_autoconf_traces) <AC_CONFIG_HEADERS>: Fill
-       %ac_config_files_location.
-       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Rename as ...
-       (%CONFIG_HIN%): ... this.  $(srcdir) is already added in
-       scan_autoconf_traces.
-       * tests/Makefile.am (TESTS): Add confh5.test.
-       * tests/confh5.test: New file.
-
-       * tests/ltlibsrc.test: Fix the zoo_d_old2_la.c rule in Makefile.am,
-       $< is not portable and the source is in $(srcdir).
-
-2003-12-03  Paolo Bonzini  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_configure): Do not require link sources if
-       they contain a dollar, or if they were built.  Likewise, do not
-       clean link destination if they contain a dollar.
-       (scan_autoconf_traces) <AC_CONFIG_LINKS>: Populate
-       %ac_config_files_location with link destinations.  Do not
-       store locations in @config_links, now that %ac_config_files_location
-       have them.
-       * tests/conflnk3.test: New file.
-       * tests/Makefile.am (TESTS): Add conflnk3.test.
-
-2003-12-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.7i.
-
-       * configure.ac, NEWS: Bump version to 1.7h.
-
-       * doc/automake.texi (Default _SOURCES): Fix reference to true.
-
-       * lib/texinfo.tex: New upstream version.
-
-2003-11-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_source_transform): If it's present, use
-       libfoo_la.c instead of libfoo.c as the default source of
-       libfoo.la, and issue an -Wobsolete diagnostic.  Do not be
-       greedy in the suffix replacement regex.
-       * doc/automake.texi (Default _SOURCES): New node.
-       (Program Sources, Libtool Modules): Refer to it.
-       * tests/ltlibsrc.test: Update to check for old default source files.
-
-2003-11-30  Gary V. Vaughan  <address@hidden>
-
-       * automake.in (&handle_source_transform): Calculate a default file
-       for use in the absence of an appropriate _SOURCES declaration by
-       first stripping any suffix from the unxformed target name, and
-       appending `.c'.
-       * doc/automake.texi (Program Sources, Libtool Modules): Document this.
-       * tests/ltlibsrc.test: New file.
-       * tests/Makefile.am (TESTS): Add ltlibsrc.test.
-
-2003-11-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (loc_and_value_as_list_recursive,
-       _value_as_list_recursive_worker): Merge into ...
-       (value_as_list_recursive): ... this function.  Pass options
-       as a hash argument, and use the `location' option to trigger
-       the behavior of loc_and_value_as_list_recursive.
-       (traverse_recursively, transform_variable_recursively): Take
-       options as a %options argument.
-       (_do_recursive_traversal): Perform expansion of inner variables
-       (as in `$(FILE).ext') on request.
-       * automake.in (handle_options, check_libobjs_sources)
-       (handle_source_transform, handle_LIBOBJS, handle_ltlibraries)
-       (handle_ltlibraries, handle_man_pages, handle_dist)
-       (handle_gettext, am_install_var): Adjust usage of
-       value_as_list_recursive.
-       (handle_texinfo_helper): Pass inner_expand to
-       value_as_list_recursive.
-       * tests/txinfo28.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo28.test.
-       Report from Ralf Corsepius.
-
-       * lib/Automake/Variable.pm (_do_recursive_traversal): Do not
-       update @_substfroms and @_substfroms for undefined variables.
-       * tests/substre2.test: New file.
-       * tests/Makefile.am (TESTS): Add substre2.test.
-
-       * lib/Automake/VarDef.pm (value): Rename as ...
-       (raw_value): ... this.
-       (value): New method, strip # and \\\n.
-       (dump): Use raw_value.
-       * lib/Automake/Variable.pm (output): Use raw_value.
-       (value_as_list): Simplify, now that backslash and comments
-       are already removed.
-       * tests/txinfo22.test: Make sure Automake isn't confused
-       by comments in variables.
-
-2003-11-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi: More target vs. rule editing.  Back out some
-       of the previous changes.  It's OK to talk about targets as "entry
-       points", or as thing to build, but targets cannot be run: rules
-       are run.
-
-       * doc/automake.texi: s/target/rule/ where appropriate.  A target
-       is the destination of a target rule, not the rule itself.
-       Suggested by Bruno Haible.
-
-2003-11-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.7g.
-
-       * configure.ac, NEWS: Bump version to 1.7f.
-
-       * automake.in (prepend_srcdir): Parenthesize @inputs to remove
-       a maintainer-check warning.
-       * tests/subst2.test: Rewrite the $MAKE invocation to please
-       maintainer-check.
-
-       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream
-       versions.
-
-       * doc/automake.texi (Program variables): Mention per-target
-       _CPPFLAGS in the documentation of INCLUDES.
-       * automake.in (generate_makefile): Likewise in the INCLUDES diagnostic.
-       Report from Bob Friesenhahn.
-
-       * doc/automake.texi (Extending): Elaborate on overriding.
-       * NEWS: Likewise.
-       Suggested by Bruno Haible.
-
-2003-11-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (output): Add $(am__empty) to variable
-       definitions that end with a line full of @substitutions@ that
-       would confuse HP-UX Make if it were blank.
-       (transform_variable_recursively): Make sure not to erase empty
-       variables.
-       * tests/Makefile.am (TESTS): Add subst2.test.
-       * tests/subst2.test: New file.
-       Report from Harlan Stenn.
-
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Work around a
-       Texinfo 4.1 bug.
-       Report from Dalibor Topic.
-
-2003-11-22  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/411:
-       * automake.in (rewrite_inputs_into_dependencies): Simplify, and rename
-       into ...
-       (prepend_srcdir): ... this.
-       (rewrite_inputs_into_dependencies): New function, extracted from ...
-       (handle_configure): ... here.  Adjust to use prepend_srcdir
-       or rewrite_inputs_into_dependencies where needed.  Especially,
-       using (the new) rewrite_inputs_into_dependencies to compute
-       Makefile dependencies will fix PR/411.
-       * lib/am/configure.am (DIST_COMMON): Remove %MAKEFILE-IN%, it's
-       already distributed by rewrite_inputs_into_dependencies.
-       * tests/Makefile.am (TESTS): Add output10.test, remove distcom.test.
-       * tests/colon3.test: Use set -e.  Don't allow any AUTOMAKE
-       invocation refer to zardoz.  Make sure two.in and three.in
-       appear as $(srcdir)/two.in and $(srcdir)/three.in dependencies.
-       * tests/distcom.test: Delete.  This is covered by tests/output9.test.
-       * tests/output10.test: New file, for PR/411.
-
-2003-11-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (append_exeext): Do not append $(EXEEXT) to
-       @address@hidden
-       * tests/exeext4.test: New file.
-       * tests/Makefile.am (TESTS): Add exeext4.test.
-
-2003-11-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/configure.am (%MAKEFILE%): Remove %MAINTAINER-MODE%,
-       mistakenly added on 2001-03-05.
-       * tests/remake5.test: New file.
-       * tests/Makefile.am (TESTS): Add remake5.test.
-       Report from Ralf Corsepius.
-
-2003-11-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.7e.
-
-       * configure.ac, NEWS: Bump version to 1.7d.
-
-       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New
-       upstream versions.
-
-2003-11-18  Maciej W. Rozycki  <address@hidden>  (tiny change)
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texinfos.am (install-info): Depend on
-       install-info-recursive or install-info-am even if no-installinfo.
-       * tests/txinfo27.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo26.test.
-
-2003-11-18  Paolo Bonzini  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/ylwrap: Do not overwrite headers if they haven't changed.
-       Fix the include guard substitution.
-       * tests/yacc6.test: Augment to run ylwrap, and make sure it
-       does not needlessly update headers.
-       * tests/yacc8.test: Make sure headers are not needlessly updated
-       with ylwrap is not used.  Move `test -f foo.o' into the
-       Makefile as `test -f foo.$(OBJEXT)' for portability.
-
-2003-11-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (generate_makefile): Define SUBDIRS if it is
-       not defined and DIST_SUBDIRS is.
-       * tests/subpkg2.test: New file.
-       * tests/Makefile.am (TESTS): Add subpkg2.test.
-       Report from Gary V. Vaughan.
-
-       * tests/suffix11.test: Check for suffixes containing `-'.
-       * lib/Automake/Rule.pm ($_SUFFIX_RULE_PATTERN): Accept `-' in
-       suffixes.
-
-       * lib/Automake/Rule.pm (define): Suggest using target-local instead
-       of target-am, not target-am-local.
-       * tests/overrid.test: Check the diagnostic for clean-am.
-       Report from Bruno Haible.
-
-2003-11-17  Jim Meyering  <address@hidden>
-
-       * bootstrap: Require not only that `perl' have the executable
-       bit set, but also that it is not a directory.
-
-       * lib/am/configure.am: Mark %MAKEFILE% as `.PRECIOUS'.
-
-2003-11-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (ac_config_files_location): Declare as a hash.
-       (handle_configure): Rewrite the computation of AC_CONFIG_FILES
-       dependencies; make sure we don't use $(srcdir) or $(top_srcdir)
-       for inputs which are also outputs, and do not check inputs
-       relatively to the current directory.
-       (scan_autoconf_config_files): Take $where as argument, and
-       fill $ac_config_files_location.
-       * tests/output8.test, tests/output9.test: New files.
-       * tests/Makefile.am (TESTS): Add output8.test and output9.test.
-       Report from Bruno Haible.
-
-2003-11-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/aclibobj.test, tests/aclocal.test, tests/aclocal3.test,
-       tests/acoutbs.test, tests/acoutbs2.test, tests/acoutnoq.test,
-       tests/acoutpt.test, tests/acoutpt2.test, tests/acoutqnl.test,
-       tests/acsilent.test, tests/acsubst.test, tests/acsubst2.test,
-       tests/all.test, tests/alpha.test, tests/amassign.test,
-       tests/ammissing.test, tests/ansi.test, tests/ansi10.test,
-       tests/ansi2.test, tests/ansi3.test, tests/ansi3b.test,
-       tests/ansi4.test, tests/ansi5.test, tests/ansi6.test,
-       tests/ansi7.test, tests/ansi9.test, tests/ar.test,
-       tests/autohdr.test, tests/autohdr2.test, tests/auxdir.test,
-       tests/auxdir2.test, tests/backsl.test, tests/backsl2.test,
-       tests/badprog.test, tests/block.test, tests/canon2.test,
-       tests/canon3.test, tests/canon4.test, tests/canon5.test,
-       tests/ccnoco.test, tests/check.test, tests/check2.test,
-       tests/check3.test, tests/checkall.test, tests/clean.test,
-       tests/colneq2.test, tests/colon.test, tests/colon2.test,
-       tests/colon3.test, tests/colon4.test, tests/colon5.test,
-       tests/colon6.test, tests/colon7.test, tests/comment.test,
-       tests/comment2.test, tests/comment4.test, tests/comment6.test,
-       tests/comment7.test, tests/compile_f_c_cxx.test, tests/cond.test,
-       tests/cond10.test, tests/cond11.test, tests/cond13.test,
-       tests/cond14.test, tests/cond15.test, tests/cond16.test,
-       tests/cond17.test, tests/cond18.test, tests/cond19.test,
-       tests/cond21.test, tests/cond22.test, tests/cond25.test,
-       tests/cond26.test, tests/cond28.test, tests/cond3.test,
-       tests/cond4.test, tests/cond5.test, tests/cond6.test,
-       tests/cond7.test, tests/cond8.test, tests/cond9.test,
-       tests/condd.test, tests/condinc.test, tests/condlib.test,
-       tests/condman.test, tests/condman2.test, tests/conf2.test,
-       tests/confdeps.test, tests/confh.test, tests/confh4.test,
-       tests/config.test, tests/confincl.test, tests/conflnk.test,
-       tests/conflnk2.test, tests/confsub.test, tests/confvar.test,
-       tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
-       tests/cxx.test, tests/cxxansi.test, tests/cxxcpp.test,
-       tests/cxxlibobj.test, tests/cxxlink.test, tests/cxxnoc.test,
-       tests/cxxo.test, tests/cygwin32.test, tests/dash.test,
-       tests/defun.test, tests/defun2.test, tests/dejagnu.test,
-       tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
-       tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
-       tests/depcomp.test, tests/depcomp2.test, tests/depcomp4.test,
-       tests/depdist.test, tests/depend.test, tests/depend2.test,
-       tests/depend3.test, tests/depend4.test, tests/destdir.test,
-       tests/dirlist.test, tests/discover.test, tests/distcom.test,
-       tests/distcom2.test, tests/distdir.test, tests/distname.test,
-       tests/dollar.test, tests/double.test, tests/dup2.test,
-       tests/empty.test, tests/empty2.test, tests/empty3.test,
-       tests/empty4.test, tests/error.test, tests/exdir.test,
-       tests/exeext.test, tests/exeext3.test, tests/exsource.test,
-       tests/ext.test, tests/ext2.test, tests/extra.test,
-       tests/extra2.test, tests/extra3.test, tests/extra4.test,
-       tests/extra5.test, tests/extra6.test, tests/extra7.test,
-       tests/flibs.test, tests/fnoc.test, tests/fo.test,
-       tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
-       tests/fpinstall.test, tests/gcj.test, tests/gcj3.test,
-       tests/gcj4.test, tests/gnits2.test, tests/gnits3.test,
-       tests/header.test, tests/implicit.test, tests/include.test,
-       tests/include2.test, tests/info.test, tests/insh2.test,
-       tests/install2.test, tests/installdir.test, tests/instdat.test,
-       tests/instdat2.test, tests/instexec.test, tests/insthook.test,
-       tests/instman.test, tests/instman2.test, tests/instsh.test,
-       tests/instsh2.test, tests/interp.test, tests/interp2.test,
-       tests/java.test, tests/java2.test, tests/javaprim.test,
-       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
-       tests/lex.test, tests/lex3.test, tests/lex4.test, tests/lex5.test,
-       tests/libobj11.test, tests/libobj2.test, tests/libobj4.test,
-       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
-       tests/library.test, tests/libtool.test, tests/libtool2.test,
-       tests/libtool3.test, tests/libtool5.test, tests/link_c_cxx.test,
-       tests/link_dist.test, tests/link_f_only.test, tests/link_fc.test,
-       tests/link_fccxx.test, tests/link_fcxx.test, tests/lisp.test,
-       tests/listval.test, tests/ltdeps.test, tests/ltlibobjs.test,
-       tests/maintclean.test, tests/make.test, tests/makej.test,
-       tests/makevars.test, tests/man.test, tests/man2.test,
-       tests/mclean.test, tests/mdate.test, tests/mdate2.test,
-       tests/mdate3.test, tests/mdate4.test, tests/mkinst2.test,
-       tests/mkinstall.test, tests/nobase.test, tests/nodef.test,
-       tests/nodef2.test, tests/nodep.test, tests/nodepcomp.test,
-       tests/nodist.test, tests/nodist2.test, tests/nodist3.test,
-       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
-       tests/nostdinc.test, tests/number.test, tests/obsolete.test,
-       tests/order.test, tests/outdir.test, tests/output.test,
-       tests/output2.test, tests/output3.test, tests/output4.test,
-       tests/parse.test, tests/phony.test, tests/pluseq.test,
-       tests/pluseq10.test, tests/pluseq2.test, tests/pluseq3.test,
-       tests/pluseq4.test, tests/pluseq6.test, tests/pluseq8.test,
-       tests/postproc.test, tests/ppf77.test, tests/pr2.test,
-       tests/pr204.test, tests/pr220.test, tests/pr224.test,
-       tests/pr229.test, tests/pr243.test, tests/pr266.test,
-       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
-       tests/pr300-lib.test, tests/pr300-ltlib.test,
-       tests/pr300-prog.test, tests/pr307.test, tests/pr72.test,
-       tests/pr87.test, tests/pr9.test, tests/prefix.test,
-       tests/proginst.test, tests/python.test, tests/python3.test,
-       tests/python4.test, tests/python5.test, tests/python6.test,
-       tests/python7.test, tests/python8.test, tests/python9.test,
-       tests/recurs2.test, tests/remake.test, tests/remake2.test,
-       tests/remake3.test, tests/req.test, tests/reqd.test,
-       tests/rulepat.test, tests/scripts.test, tests/sinclude.test,
-       tests/space.test, tests/specflg3.test, tests/specflg6.test,
-       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
-       tests/spell3.test, tests/spelling.test, tests/spy.test,
-       tests/stamph2.test, tests/stdlib2.test, tests/strip.test,
-       tests/subcond.test, tests/subcond2.test, tests/subcond3.test,
-       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
-       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
-       tests/subdirbuiltsources.test, tests/subobj.test,
-       tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
-       tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
-       tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
-       tests/subpkg.test, tests/subst.test, tests/substref.test,
-       tests/suffix.test, tests/suffix10.test, tests/suffix2.test,
-       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
-       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
-       tests/suffix9.test, tests/symlink2.test, tests/symlink3.test,
-       tests/tags.test, tests/tagsub.test, tests/target-cflags.test,
-       tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
-       tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
-       tests/txinfo18.test, tests/txinfo2.test, tests/txinfo23.test,
-       tests/txinfo24.test, tests/txinfo25.test, tests/txinfo26.test,
-       tests/txinfo3.test, tests/txinfo5.test, tests/txinfo6.test,
-       tests/txinfo7.test, tests/txinfo8.test, tests/txinfo9.test,
-       tests/unused.test, tests/vars.test, tests/vars3.test,
-       tests/vartar.test, tests/version.test, tests/version2.test,
-       tests/version4.test, tests/version6.test, tests/version7.test,
-       tests/vpath.test, tests/vtexi.test, tests/vtexi2.test,
-       tests/werror.test, tests/whoami.test, tests/yacc.test,
-       tests/yacc3.test, tests/yacc4.test, tests/yacc5.test,
-       tests/yacc6.test, tests/yacc7.test, tests/yacc8.test,
-       tests/yaccpp.test, tests/yaccvpath.test: Fix license to refer
-       to Automake, not autoconf.
-
-       Fix for PR automake/408:
-       * lib/am/texinfos.am (install-info-am): Strip any $(srcdir)/ prefix
-       from $file, as already done for dist-info.
-       * tests/Makefile.am (TESTS): Add txinfo26.test.
-       * tests/txinfo26.test: New file.
-       Report from Nicholas Wourms.
-
-2003-11-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
-       running AC_CHECK_PROGS(EMACS).
-       * lib/am/lisp.am (elc-stamp): Quote $(EMACS).
-       Report from Jens Petersen.
-
-       * tests/mkinst2.test: Rewrite.
-
-       * m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.
-
-2003-11-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Honor sinclude.
-       * tests/sinclude.test: Check for sinclude.
-       Report from Roberto Bagnara.
-
-2003-11-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'
-       already build the tarballs.  Commit files right before tagging.
-       Check NEWS before running distcheck.
-
-       * m4/amversion.in (AM_AUTOMAKE_VERSION): Missing cosmetic space.
-
-       * configure.ac, NEWS: Bump version to 1.7c.
-
-       * configure.ac, NEWS: Bump version to 1.7b.
-       * Makefile.am (maintainer-check): Ignore comments while
-       scanning for rm without -f.
-
-       * Makefile.am (fetch): Get all files from savannah.  Do not
-       postprocess Struct.pm and XFiles.pm, since we now are the master
-       of these.
-       * lib/config.sub, lib/config.guess, lib/config-ml.in,
-       lib/texinfo.tex: New upstream versions.
-
-       * configure.ac: Check that autoconf is installed, that it works,
-       and that it is recent enough in three steps, not one.
-
-       * NEWS: Minor edits.
-
-       * lib/Makefile.am (dist_script_DATA): Move config-ml.in ...
-       (dist_pkgvdata_DATA): ... here.
-
-       * tests/spy.test: Document overlapping ::-rules incompatibilities,
-       and check only non-overlapping ::-rules.
-
-       * doc/automake.texi (Texinfo): Define MAKEINFO, MAKEINFOHTML,
-       MAKEINFOFLAGS, AM_MAKEINFOFLAGS, AM_MAKEINFOHTMLFLAGS, TEXI2DVI,
-       TEXI2PDF, DVIPS, and TEXINFO_TEX in a table.
-       (Uniform): Do not speak of missing HTML support, this is
-       confusing.
-       * lib/Automake/Variable.pm (_silent_variable_override): Add
-       AM_MAKEINFOHTMLFLAGS.
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Use MAKEINFOHTML and
-       AM_MAKEINFOHTMLFLAGS instead of MAKEINFO and AM_MAKEINFOFLAGS.
-       * lib/am/texinfos.am (MAKEINFOHTML, AM_MAKEINFOHTMLFLAGS): Define.
-       * tests/txinfo21.test: Add a test with AM_MAKEINFOHTMLFLAGS.
-
-2003-11-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/spy.test: New file.
-       * tests/Makefile.am (TESTS): Add spy.test.
-
-       * automake.in (handle_configure): Distribute and define mkinstalldirs
-       only if it is already present in the package.
-       (scan_autoconf_files): Do not require mkinstalldirs.
-       (require_build_directory): Use $(mkdir_p), not $(mkinstalldirs).
-       * lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
-       lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/mans.am,
-       lib/am/progs.am, lib/am/python.am, lib/am/scripts.am,
-       lib/am/texinfos.am: Use $(mkdir_p) instead of $(mkinstalldirs).
-       * m4/mkdirp.m4: New file.
-       * m4/Makefile.am (dist_m4data_DATA): Add mkdirp.m4.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Call AM_PROG_MKDIR_P.
-       * tests/Makefile.am (TESTS): Remove insh.test.
-       * tests/insh.test: Delete.
-       * tests/defs.in, tests/instsh.test: Do not install mkinstalldirs.
-       * tests/auxdir.test: Install mkinstalldirs.
-       * tests/distdir.test, tests/instman.test, tests/pr2.test: Use
-       $(mkdir_p), not $(mkinstalldirs).
-       * tests/empty.test: Run configure, do not substitute things by hand.
-       * doc/automake.texi (Optional) <AC_CONFIG_FILES>: Take install-sh
-       as an example, not mkinstalldirs.
-       (Auxiliary Programs) <mkinstalldirs>: Update.
-
-       * tests/defs.in: Handle required=bzip2.
-
-       * tests/defs.in: Export SHELL.
-       * tests/cond11.test: Missing quotes.
-       * tests/nogzip2.test: Require bzip2.
-
-2003-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS: Add news entries from 1.6.x and 1.7.x.
-
-       * automake.texi (Optional) <AC_SUBST>: Grammar fixes.
-
-       * automake.in (check_gnu_standards): Install COPYING only if
-       none of COPYING, COPYING.LIB, or COPYING.LESSER exist.  Do not
-       overwrite the license otherwise.
-       * tests/Makefile.am (TESTS): Add license.test.
-       * tests/license.test: New file.
-
-       * lib/mkinstalldirs: Mention address@hidden and
-       address@hidden
-       * lib/compile, lib/depcomp, lib/elisp-comp, lib/mdate-sh:
-       Likewise.  Also add support for --help and --version.
-       * lib/py-compile, lib/ylwrap: Likewise, and reindent.
-
-2003-11-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.
-       * lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
-       * lib/am/java.am (JAVACFLAGS): Remove.
-       * tests/dejagnu3.test: Check that the environment value
-       of RUNTESTFLAGS get passed down to runtest.
-       Suggested by Mark Mitchell.
-
-       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
-       (?GENERIC?%EXT%.lo): Do not echo compile command manually, this
-       breaks `make -s'.  Instead, fold the compile command on two lines,
-       so that it take less space on the display.
-       Suggested by Karl Berry and William Fulton.
-
-       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%): Rename as ...
-       (%DEST_INFO_PREFIX%%DEST_SUFFIX%): ... this, and honor ?INSRC?
-       to select $(srcdir) or `.' builds.
-       (INFO_DEPS): Define here.
-       * lib/am/texinfos.am (dist-info): Strip filename starting with
-       "$(srcdir)/".
-       * automake.in (output_texinfo_build_rules): Take a new argument
-       $insrc, and adjust substitutions in 'texibuild'.
-       (handle_texinfo_helper): Compute a regex of all user-cleaned
-       files, and use this to select whether to build .info files in `.'
-       or $(srcdir).  Give an account of the $(srcdir) vs `.' debacle.
-       Alway build the version.texi and stamp files in $(srcdir).  Do not
-       define INFO_DEPS.
-       * tests/Makefile.am (TESTS): Add txinfo23.test, txinfo24.test,
-       and txinfo25.test.
-       * tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test:
-       New files.
-       * tests/txinfo13.test, tests/txinfo16.test, tests/txinfo3.test,
-       tests/vtexi.test: Adjust to new rules.
-
-2003-11-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.58.
-       * configure.ac: Require Autoconf 2.58a, and check for 2.58.
-
-2003-10-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Erase %STAMP%.
-       * tests/Makefile.am (TESTS): Add autohdr3.test
-       * tests/autohdr3.test: New file.
-
-       * automake.in (handle_configure): Rename am__configure_deps
-       as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
-       $configure_ac.  Define am__configure_deps as am__aclocal_m4_deps
-       + $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4).  Do not define
-       ACLOCAL_M4_DEPS while processing configure.am.
-       (make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
-       (scan_aclocal_m4): Do not distribute aclocal.m4, this
-       is done from lib/am/configure.am.
-       * lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
-       $(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
-       $(am__configure_deps) or $(am__aclocal_m4_deps).
-       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.
-
-2003-10-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Depend on
-       $(am__configure_deps).
-
-       * automake.in (handle_configure): Distribute all AC_CONFIG_HEADERS
-       sources, and without using require_file.  Define %CONFIG_H_DEPS%
-       and %FIRST_CONFIG_HIN% while processing remake-hdr.am.
-       * lib/am/remake-hdr.am (%STAMP%): Use %CONFIG_H_DEPS% instead
-       of (srcdir)/%CONFIG_HIN%.  Output the $(srcdir)/%CONFIG_HIN%
-       rule only for the first header (i.e., if %FIRST_CONFIG_HIN%).
-       * tests/autohdr4.test: New file.
-       * tests/Makefile.am (TESTS): Add autohdr4.test.
-       * tests/config.test: Do not grep, run things to see if they work.
-
-2003-10-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/output7.test: Populate sub/ with a dummy file, so that it
-       is not empty.  This fixes a failure reported by Patrick Welche.
-       * lib/am/distdir.am: Add note about tar's `-o' option and empty
-       directories.
-
-2003-10-24  Didier Cassirame  <address@hidden>  (tiny change)
-
-       * lib/ylwrap: Typo in regex.
-
-2003-10-23  Paul Eggert  <address@hidden>
-
-       * lib/Automake/XFile.pm: Don't assume -j is solo.
-       Issue a more-informative diagnostic.
-       Problems reported by Eric Sunshine.
-
-2003-10-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Always check for Emacs.
-       Always define lispdir.
-       * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Check
-       $(EMACS) to decide whether _LISP files must be installed,
-       not $(lispdir).
-       * doc/automake.texi (Emacs Lisp): Mention the two ways to install
-       non byte-compiled Emacs lisp files.
-       * tests/lisp4.test, tests/lisp5.test: Check "make install"
-       when EMACS=no.
-       Suggested by Simon Josefsson.
-
-       * NEWS: Clarify the entry about multiple conditional definitions
-       of _PROGRAMS, _LDADD, and _LIBADD.
-       Report from Simon Josefsson.
-
-       * lib/am/install.am (install-strip): Override install_sh_PROGRAM
-       too.
-       Report from Elmar Hoffmann.
-
-2003-10-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in ("MAIN", usage, parse_arguments): Move near
-       the end, so "MAIN" can use prototypes.
-       (scan_configure): Move later too, for the sake of prototypes.
-       (scan_configure_dep): Fix setting of $scanned_configure_dep.
-       (trace_used_macros): Do not take any argument.
-
-2003-10-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/stdlib2.test: Check AM_LDFLAGS alone.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-       * automake.in (handle_ltlibraries): Also grep AM_LDFLAGS for `-module'.
-       * tests/stdlib2.test: New file.
-       * tests/Makefile.am (TESTS): Add stdlib2.test.
-       Report from Kevin P. Fleming.
-
-2003-10-03  Richard Dawe  <address@hidden>  (tiny change)
-
-       * tests/defs.in: For required=runtest, check that we are using
-       a DejaGnu that supports specifying the program on the command-line.
-
-2003-10-03  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug #213524:
-       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Merge
-       stderr and stdout, and grep only the first line while testing
-       install-info --version's output.  This revert part of the change
-       from 2001-05-18.
-
-2003-10-01  Akim Demaille  <address@hidden>
-
-       * m4/amversion.in: Add (C) to the Copyright notice.
-
-2003-10-01  Paul Eggert  <address@hidden>
-
-       * lib/Automake/XFile.pm: Use Errno.
-       (lock): Ignore ENOLCK errors.  Problem reported Andreas Schwab in
-       <http://mail.gnu.org/archive/html/bug-autoconf/2003-09/msg00141.html>.
-
-2003-09-30  Tom Tromey  <address@hidden>
-
-       * lib/Automake/Options.pm (_process_option_list): Recognize
-       no-dist.
-       * NEWS: Update.
-       * doc/automake.texi (Options): Document no-dist.
-       * automake.in (check_cygnus): Set no-dist option.
-       (handle_dist): Recognize no-dist.
-       * tests/nodist3.test: New file.
-       * tests/Makefile.am (TESTS): Added nodist3.test.
-
-2003-09-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_clean): Take $makefile as argument, and
-       define %MAKEFILE% while processing clean.am.
-       (generate_makefile): Pass $makefile to handle_clean.
-       * lib/am/clean.am (distclean, maintainer-clean): Erase %MAKEFILE%,
-       not Makefile.
-       * tests/gnumake.test: New file.
-       * tests/Makefile.am (TESTS): Add gnumake.test.
-       Report from Braden N. McDaniel.
-
-2003-09-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Scripts): Update the example about automake.
-       Mention `dist_' for distributed scripts.
-
-       * lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
-       Suggested by Eric Sunshine.
-
-2003-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * README: More mailing lists.
-
-       * NEWS: Mention the switch to GNU FDL for the manual.
-
-2003-09-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/install-sh (src, dst): Protect names starting with `-',
-       as in mkinstalldirs.
-
-       * configure.in: Rename as ...
-       * configure.ac: ... this.
-       * README: s/configure.in/configure.ac/.
-
-       * doc/fdl.texi: New file.
-       * doc/Makefile.am (automake_TEXINFOS): New variable.
-       * doc/automake.texi (Copying This Manual): New appendix, include
-       fdl.texi.
-       (Macro and Variable Index, General Index): Move as subsections of ...
-       (Indices): This new appendix.
-
-       * doc/automake.texi: Refer to configure.ac instead of configure.in.
-
-       * automake.texi: Move ...
-       * doc/automake.texi: ... here.
-       * doc/Makefile.am: New file.
-       * configure.in: Output doc/Makefile.
-       * Makefile.am (SUBDIRS): Add doc.
-       (ETAGS_ARGS, TAGS_DEPENDENCIES): Move to doc/Makefile.am.
-
-2003-09-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (write_aclocal): Consider files with relative
-       paths as local to the project, i.e., subject to m4_include.
-       * tests/subpkg.test (ACLOCAL_AMFLAGS): Make sure m4_include
-       is also used for .m4 files in the outer project.
-
-       Support for multiple inputs in AC_CONFIG_FILES.
-       Requested long ago by Harlan Stenn.
-       * automake.in (handle_dist): Remove unused argument $makefile.
-       (handle_subdirs): Expect SUBDIRS elements in $relative_dir,
-       not $am_relative_dir.
-       (rewrite_inputs_into_dependencies): Allow $add_srcdir to
-       be a filename that must always be prefixed by $(srcdir) or
-       $(top_srcdir).
-       (handle_configure, generate_makefile): Revamp to make the
-       Makefile.am, Makefile.in, Makefile more independent.
-       (locate_am): New function.
-       (scan_configure_dep, parse_arguments): Use locate_am.
-       (MAIN): Adjust call to generate_makefile.
-       * lib/am/configure.am: Remove %MAKEFILE-IN% from the dependencies
-       of %MAKEFILE%.  %MAKEFILE-IN% is already in %MAKEFILE-DEPS%.
-       * tests/output6.test, tests/output7.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-       * automake.texi (Requirements) <AC_CONFIG_FILES>: Document how
-       multiple inputs are scanned.
-
-2003-09-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm
-       and lib/Automake/Struct.pm from Autoconf.
-       * lib/Automake/XFile.pm: Update comment, Automake is now
-       the master for this file.  Cosmetic changes.
-
-2003-09-09  Akim Demaille  <address@hidden>
-
-       * lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
-       Reported by Gary Vaughan.
-       (&find_file): Walk the @include in forward order.
-
-2003-09-09  Akim Demaille  <address@hidden>
-
-       * lib/Automake/FileUtils.pm (&update_file): Be sure not to leave
-       trailing files.
-
-2003-09-07  Alexandre Duret-Lutz  <address@hidden>
-
-       Changes to m4_included files should also cause aclocal.m4 to change.
-       * aclocal.in (m4_include_rx): New variable.
-       (scan_configure_dep): New function.
-       (scan_configure, add_file): Simplify using scan_configure_dep.
-       * tests/Makefile.am (TESTS): Add acloca13.test.
-       * tests/aclocal13.test: New file.
-
-       * tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
-       that we have fake version in the $PATH.
-
-       * aclocal.in (add_file): Remove useless filling of $output, probably
-       left a after CVS conflict.  This code is now in write_aclocal.
-
-       * aclocal.in (configure_ac): Do not call require_configure_ac
-       before parsing the options.
-       * automake.in (configure_ac): Likewise.
-       * lib/Automake/Variable.pm (configure_ac): Do not require configure.ac,
-       find it.
-       * lib/Automake/Configure_ac.pm (require_configure_ac):
-       find_configure_ac never return an undefined value, so test
-       the file's existence instead.
-       * tests/Makefile.am (TESTS): Add help.test.
-       * tests/help.test: New file.
-
-2003-09-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/XFile.pm: Update to use ChannelDefs.
-       (close): Call Automake::FileUtils::handle_exec_errors on errors.
-       * automake.in (scan_autoconf_files): Exit with $?=63 on version
-       mismatch.
-       (scan_autoconf_traces): Likewise.  Close the autoconf pipe to
-       capture abnormal exits.
-       * aclocal.in ($exit_status): Remove, and use Channels.pm's $exit_code
-       instead.
-       (trace_used_macros): Close the autom4te pipe to capture abnormal exits.
-       * lib/missing: When a tool has run and exited with $?=63, emulate
-       it.  Adjust the diagnostic and pretend the tool is tool old in this
-       case.  Use an emacs-updated "scriptversion" variable.
-       * configure.in: Output tests/aclocal-${APIVERSION} and
-       tests/automake-${APIVERSION}.
-       * tests/aclocal.in, tests/automake.in,
-       tests/missing.test, tests/missing2.test: New files.
-       * tests/defs.in (AUTOMAKE, ACLOCAL, PATH): Define
-       to use tests/aclocal-$APIVERSION and tests/automake-$APIVERSION.
-       * tests/dup3.test: Remove. alocal9.test, acloca10.test, and others are
-       already testing for this.
-       * tests/depacl2.test, tests/dup2.test, tests/order.test: Fix
-       configure.in so that aclocal works.
-       * tests/defun.test: Quote the AC_DEFUN body.
-       * tests/Makefile.am (TESTS): Add missing.test and missing2.test,
-       and remove dup3.test.
-       (check_SCRIPTS): Add aclocal and automake.
-
-       * tests/unused.test: Quote AC_DEFUN arguments.
-
-2003-09-05  Paul Eggert  <address@hidden>
-
-       * NEWS, aclocal.in, automake.in, automake.texi, lib/ansi2knr.c,
-       lib/depcomp, lib/missing, lib/py-compile,
-       lib/Automake/Channels.pm, lib/Automake/Rule.pm,
-       lib/Automake/Variable.pm, lib/Automake/tests/Condition.pl,
-       lib/am/dejagnu.am, lib/am/depend.am, lib/am/lisp.am,
-       lib/am/remake-hdr.am, lib/am/texi-vers.am, m4/obsolete.m4,
-       m4/python.m4, tests/backsl4.test, tests/defs.in,
-       tests/dejagnu7.test, tests/depacl2.test, tests/dirlist.test,
-       tests/error.test, tests/getopt.test, tests/gnuwarn.test,
-       tests/include2.test, tests/libobj10.test, tests/libtool5.test,
-       tests/libtool6.test, tests/lisp3.test, tests/phony.test,
-       tests/pr220.test, tests/subcond2.test, tests/subcond3.test,
-       tests/vtexi.test:
-       Spelling and minor grammar fixes.
-
-2003-09-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.sub, lib/config.guess, lib/texinfo.tex,
-       lib/config-ml.in, lib/symlink-tree: New upstream versions.
-
-2003-08-31  Thien-Thi Nguyen  <address@hidden>  (tiny change)
-
-       * tests/yacc7.test: Require bison.
-
-2003-08-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (scan_file): Warn about underquoted AC_DEFUN.
-       ($underquoted_manual_once): New variable.
-       * automake.texi (Extending aclocal): Document this.
-
-2003-08-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (@file_order): New variable, to make sure
-       files are output in the opposite order of the -I arguments.
-       (scan_file): Fill it.
-       (trace_used_macros, write_aclocal): Use it.
-       (scan_m4_files): Reverse the directory contents, so that
-       macros from the lexicographically greatest files are preferred.
-       * tests/aclocal9.test, tests/acloca10.test, tests/acloca11.test:
-       New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2003-08-24  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug #206299:
-       * automake.in ($configure_deps_greatest_timestamp,
-       $output_deps_greatest_timestamp): New variables.
-       (initialize_per_input): Reset $output_deps_greatest_timestamp.
-       (scan_autoconf_traces, scan_autoconf_files, read_am_file):
-       Update $configure_deps_greatest_timestamp and
-       $output_deps_greatest_timestamp
-       (generate_makefile): Rewrite the logic to decide whether
-       to rewrite the output.  Move the leading dup_channel_setup
-       and trailing drop_channel_setup to MAIN, so that
-       drop_channel_setup is executed for all exit paths.
-       * tests/aclocal7.test: Update to check for $AUTOMAKE --no-force
-       * tests/distcom6.test: New file.  Report from Scott James Remnant.
-       * tests/Makefile.am (TESTS): Add distcom6.test.
-
-       * configure.in: Require Autoconf 2.57b to be sure
-       aclocal can use autom4te --language Autoconf-without-aclocal-m4.
-       * m4/init.m4: Likewise.  Move the AC_PREREQ and m4_pattern_allow
-       calls inside the AM_INIT_AUTOMAKE macro.
-       * m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
-       AC_PREREQ calls inside the macros.
-       * m4/header.m4: Remove AC_PREREQ.
-
-       * automake.in (file_contents_internal): Do not add newlines before
-       empty actions.
-
-       * aclocal.in (write_aclocal): Take an output file and list of
-       used macros in arguments and make up the file contents here.
-       (trace_used_macros): New function.
-       (add_file): Do not update $output.
-       ($output): Delete.
-       (MAIN): Call trace_used_macros.  Then rewrite aclocal.m4 only
-       for these traced macros.  This should shorten aclocal.m4 by
-       stripping out unused macros.
-       * automake.texi (Invoking aclocal): Document ${AUTOM4TE}.
-       * tests/aclibobj.test: Make sure configure.in exists by the time
-       aclocal runs.
-       * tests/aclocal8.test: New file.
-       * tests/Makefile.am (TESTS): Add aclocal8.test.
-       Suggested by Bruno Haible and Akim Demaille.
-
-2003-08-21  Akim Demaille  <address@hidden>
-
-       * lib/Automake/Configure_ac.pm (&find_configure_ac)
-       (&require_configure_ac): Accept an optional directory argument.
-       ($configure_ac): Remove.
-       * aclocal.in, automake.in ($configure_ac): New.
-       * lib/Automake/Variable.pm: Don't use $configure_ac, just
-       configure.ac.
-
-2003-08-20  Akim Demaille  <address@hidden>
-
-       * lib/Automake/FileUtils.pm: More perldoc.
-       (&up_to_date_p): New.
-
-2003-08-17  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/398:
-       * m4/python.m4: Do not call AC_PATH_PROGS if $PYTHON is already
-       set.  Display `none' instead of `:' and $PYTHON is set to `:'
-       when no suitable interpreter is found.  Honor ACTION-IF-FOUND and
-       ACTION-IF-NOT-FOUND.
-       * automake.texi (Python): Document ACTION-IF-FOUND and
-       ACTION-IF-NOT-FOUND.
-       * tests/python4.test, tests/python5.test, tests/python6.test,
-       tests/python7.test, tests/python8.test, tests/python9.test: New
-       files.
-       * tests/Makefile.am (TESTS): Add them.
-       Report from Per Cederqvist.
-
-2003-08-13  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/399:
-       * m4/python.m4: Use AC_PATH_PROGS, not AC_PATH_PROG.
-       Report from Per Cederqvist.
-
-2003-08-12  Raja R Harinath  <address@hidden>
-
-       * lib/Automake/Condition.pm (strip): Replace loop with 'grep'.
-       (not): Replace loop with 'map'.
-       * lib/Automake/DisjConditions.pm (sub_conditions): Likewise.
-       * lib/Automake/Item.pm (not_alwasy_defined_in_cond):
-       Don't 'simplify' result of 'invert', since it's already in
-       canonical form.
-       * lib/Automake/Rule.pm (define): Replace loop with
-       'not_always_defined_in_cond'.
-
-       * lib/Automake/DisjConditions.pm (ambiguous_p): Typo in comment.
-       * lib/Automake/Rule.pm (accept_extensions, msg_cond_rule): Likewise.
-       (define): Reword comment slightly.
-       * Variable.pm (_var_order, msg_cond_var): Typo in comment.
-       * tests/cond20.test (var2): Use foo.c instead of foo.cc to avoid
-       spurious automake error exit.
-
-2003-08-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.
-       * lib/Automake/Rule.pm, lib/Automake/RuleDef.pm: New files.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add them.
-       * lib/Automake/VarDef.pm: Make this a subclass of Automake::ItemDef.
-       (new): Adjust to call Automake::ItemDef::new.
-       (comment, location, owner): Delete.  Now inherited from ItemDef.
-       * lib/Automake/Variable.pm: Make this a subclass of Automake::Item.
-       (_new): Adjust to call Automake::Item::new.
-       (name, def, rdef, _set, conditions, not_always_defined_in_cond):
-       Delete.  How inherited from Item, where `_set' is called `set'.
-       * automake.in (SUFFIX_RULE_PATTERN): Delete. Now in Automake::Rule.
-       (suffix_rules_default): Delete.  Now
-       Automake::Rule::_suffix_rules_default
-       (suffixes): Delete.  Now Automake::Rule::suffixes.
-       (TARGET_AUTOMAKE, TARGET_USER): Delete.  Now
-       Automake::RuleDef::RULE_AUTOMAKE and Automake::RuleDef::RULE_USER.
-       (%targets, %target_source, %target_name, %target_owner): Delete,
-       replaced by the Rule and RuleDef classes.
-       (dependencies, depend, actions): Delete.  Now in Automake::Rule.
-       (suffix_rules, register_suffix_rule): Likewise.
-       (KNOWN_EXTENSIONS_PATTERN, accept_extensions): Likewise.
-       (known_extensions_list): Delete.  Now
-       Automake::Rule::_known_extensions_list.
-       (target_conditions): Delete.  Now inherited by Automake::Rule
-       from Automake::Item::conditions.
-       (rule_define): Delete.  Now Automake::Rule::define.  Adjust all
-       callers.
-       (target_defined): Delete.  Now Automake::Rule::rule.  Adjust all
-       callers.
-       (initialize_per_input): Adjust to call Automake::Rule::reset.
-       (err_target, err_cond_target, msg_cond_target, msg_target,
-       reject_target): Delete.  Now defined in Automake::Rule as
-       err_rule, err_cond_rule, msg_cond_rule, msg_rule and reject_target.
-       Adjust all callers.
-       (handle_languages): Call suffix_rules_count.
-       * tests/location.test: Adjust expected diagnostics.  We now display
-       $(EXEEXT) accurately.
-
-2003-08-10  Alexandre Duret-Lutz  <address@hidden>
-
-       Revert the fix for PR automake/291:
-       * lib/Automake/Variable.pm (define): Do not warn about variables
-       starting with `_' which are an issue on NEWS-OS 4.2R.  According
-       to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
-       was released on 1996 and is not in wide use.  On the other hand,
-       variables starting with `_' are mandatory in several situations,
-       so diagnosing them is more annoying than useful.
-       * tests/canon5.test: Do not use -Wno-portability.
-       * tests/vars2.test: Delete.
-       * tests/Makefile.am (TESTS): Remove vars2.test.
-       Suggested by Jim Meyering.
-
-2003-08-09  Raja R Harinath  <address@hidden>
-
-       * lib/Automake/DisjConditions.pm (ambiguous_p): Simplify slightly.
-       * lib/Automake/tests/DisjConditions.pl (test_ambig): Test
-       Automake::Disjunctions::ambiguous_p.
-
-2003-08-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (condition_ambiguous_p): Move ...
-       * lib/Automake/DisjConditions.pm (ambiguous_p): ... here.
-       * automake.in (rule_define): Adjust usage.
-       * lib/Automake/Variable.pm (_check_ambiguous_condition): Likewise.
-
-       * lib/Automake/Options.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Options.pm.
-       * automake.in (FOREIGN, GNU, GNITS, $default_strictness)
-       ($default_strictness_name, $strictness, $strictness_name)
-       (%options, %global_options, process_option_list)
-       (set_strictness): Remove, now in Options.pm.
-       (initialize_per_input): Call Automake::Options::reset.
-       (handle_options, get_object_extension, get_object_extension)
-       (handle_languages, handle_single_transform_list, handle_compile)
-       (handle_texinfo_helper, handle_man_pages, handle_dist)
-       (handle_configure, do_check_merge_target)
-       (handle_factored_dependencies, handle_tests)
-       (handle_minor_options, scan_autoconf_traces, check_cygnus)
-       (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define)
-       (make_paragraphs, am_install_var, parse_arguments): Adjust
-       to set and read options via the new interface.
-
-2003-08-07  Raja R Harinath  <address@hidden>
-
-       * Makefile.am (maintainer-check): Update perllibdir.
-       * lib/Automake/Makefile.am (Config.pm): Depend on Makefile too.
-       (EXTRA_DIST): Add Config.in.
-       * Makefile.in, lib/Automake/Makefile.in: Regenerate.
-       * tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in
-       $perllibdir.
-
-2003-08-06  Raja R Harinath  <address@hidden>
-
-       * configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory
-       from the builddir too, to pick up Automake::Config.
-       * tests/defs.in (AUTOMAKE, ACLOCAL): Likewise.
-       * configure: Regenerate.
-       * automake.in (BEGIN): Handle multiple directories in $perllibdir.
-       * aclocal.in (BEGIN): Likewise.
-
-2003-08-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/ltcond.test: Thinko.
-
-2003-08-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Config.in: New file.
-       * lib/Automake/Makefile.am (nodist_perllib_DATA, do_subst,
-       CLEANFILES): New variables.
-       (Config.pm): New rule.
-       * Makefile.am (maintainer-check): Adjust expected differences
-       between automake.in and automake.
-       * aclocal.in, automake.in: Use Automake::Config.
-
-2003-08-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/ltconv.test: s/rm/rm -f/ to placate maintainer-check.
-
-       * automake.in (handle_texinfo_helper): Use the user definition
-       of TEXINFO_TEX before checking for cygnus or AC_CONFIG_AUX_DIR.
-       * tests/txinfo22.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo22.test.
-       Report from Tom Tromey.
-
-2003-08-03  Raja R Harinath  <address@hidden>
-
-       * lib/Automake/Variable.pm (@EXPORT): Remove
-       traverse_variable_recursively and
-       require_variables_for_variable.
-       (require_variables_for_variable, traverse_variable_recursively)
-       (_traverse_variable_recursively_worker): Convert to
-       Automake::Variable methods, remove support for being
-       invoked with variable names, and rename to ...
-       (requires_variables, traverse_recursively)
-       (_do_recursive_traversal): ... these.
-       (_value_as_list_recursive_worker, transform_variable_recursively):
-       Update to reflect changes.
-       * automake.in (handle_LIBOBJS, handle_ALLOCA)
-       (handle_libraries, handle_ltlibraries, am_primary_prefixes):
-       Likewise.
-       (define_objects_from_sources): Fix typo in comment.
-
-2003-08-02  Raja R Harinath  <address@hidden>
-
-       * automake.in (handle_source_transform): Replace 'grep' with 'map'.
-       (register_language): Replace 'grep' with 'foreach' modifier.
-
-2003-08-01  Raja R Harinath  <address@hidden>
-
-       * lib/Automake/Variables.pm (variables): Return a list of
-       Automake::Variable instances, not a list of strings.
-       (dump): Remove support for being invoked with a string.
-       (variables_dump): Adapt to these changes.
-       * automake.in (check_typos): Likewise.
-       (am_primary_prefixes): Likewise.
-
-2003-07-31  Ralf Wildenhues  <address@hidden>  (tiny change)
-
-       * lib/depcomp (aix): Support AIX Compiler version 6.
-
-2003-07-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (A Shared Library): Rewrite and split into
-       subsections.  Valuable comments from Norman Gray, Harlan Stenn,
-       Tim Van Holder, and Guido Draheim.
-       * tests/ltcond.test, tests/ltcond2.test, tests/ltconv.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2003-07-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Complain about
-       foo.$(OBJEXT) being created both with libtool and without, not
-       about foo.lo.
-       Report from Tim Van Holder.
-
-2003-07-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (FETCHFILES, fetch): Add config-ml.in and
-       symlink-tree.
-       * lib/config.sub, lib/config-ml.in, lib/texinfo.tex: New
-       upstream versions.
-
-2003-07-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_configure): Cosmetic change to avoid
-       a maintainer-check complaint.
-
-2003-07-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (@EXPORT): Remove variable_dump.
-       (variable_dump): Replace by ...
-       (dump): ... this method.
-       (rdef, _check_ambiguous_condition): Adjust to use ->dump.
-       (define, variables_dump): Adjust to use Automake::Variable::dump
-
-       * lib/am/compile.am (mostlyclean-compile): Do not erase core dumps.
-       * automake.texi (Built sources example): Adjust example.
-
-2003-07-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (get_object_extension, handle_languages)
-       (handle_single_transform_list, handle_compile, handle_compile)
-       (handle_texinfo_helper, handle_texinfo_helper, handle_man_pages)
-       (handle_tests, handle_minor_options, check_gnu_standards)
-       (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define):
-       Simplify "if (defined $options{'X'})" into "if ($options{'X'})".
-
-       Complete changes from 2003-07-08.
-       * automake.in ($cmdline_use_dependencies, $use_dependencies): Remove,
-       replaced by $options{'no-dependencies'}.
-       ($global_options): Remove.
-       (%global_options): New variable.
-       (initialize_per_input): Empty %options.
-       (process_option_list): Take a location and %options ref argument,
-       process no-dependencies as other options.
-       (handle_options): Do not reparse the global options, just initialize
-       %options from %global_options and fill it with local options.
-       (handle_languages, handle_single_transform_list)
-       (handle_configure, check_cygnus): Adjust usage of
-       $options{'no-dependencies'}.
-       (make_paragraphs): Adjust usage of $options{'cygnus'}.
-       (parse_arguments): Set cygnus and no-dependencies in %global_options.
-       (scan_autoconf_traces) <AM_INIT_AUTOMAKE>: Call process_option_list
-       to fill %global_options.
-
-2003-07-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/remake4.test: Use `$MAKE distdir' instead of `$MAKE dist' to
-       avoid the use of tar.
-
-2003-07-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/gnuwarn2.test: Typo.
-
-       * tests/insthook.test: Use $MAKE, not make.
-
-       Fix missing rebuilds during `make dist' with BSD make.
-       * automake.in (generate_makefile): Do not push Makefile.in, and
-       Makefile.am into DIST_COMMON here.
-       * lib/am/configure.am (DIST_COMMON): Do it here, and use
-       %MAKEFILE-AM% and %MAKEFILE-IN% so that items in DIST_COMMON
-       actually match the targets.  Prefix `configure' with `$(srcdir)/'
-       to match the target.
-       * tests/remake4.test: New file.
-       * tests/Makefile.am (TESTS): Add remake4.test.
-       Report from Akim Demaille.
-
-2003-07-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_multilib): Register all-multi.
-       (file_contents_internal): Insert \n when concatenating actions
-       from "factored" rules.
-       * lib/config-ml.in: New file, from GCC, including a patch
-       from Ralf Corsepius (see GCC's PR 11526).
-       * lib/symlink-tree.in: New file, from GCC.
-       * lib/Makefile.am (dist_script_DATA): Add config-ml.in and
-       symlink-tree.
-       * lib/am/clean.am (distclean-generic): Do not delete Makefile here...
-       (distclean, maintainer-clean): ... do it here.
-       * lib/am/depend.am (distclean-depend): Likewise, replace by
-       (distclean, maintainer-clean): ... these.
-       * lib/am/multilib.am (all-recursive, install-recursive,
-       mostlyclean-recursive, clean-recursive, distclean-recursive,
-       maintainer-clean-recursive): Remove these rules.
-       (mostlyclean-am, clean-am, distclean-am, maintainer-clean-am): Replace
-       by ...
-       (mostlyclean, clean, distclean, maintainer-clean): ... these.
-       (all-am): Remove, done in handle_multilib.
-       (install-am): Replace by ...
-       (install-exec-am): ... this.
-       * tests/Makefile.am (TESTS): Add multlib.test.
-       * tests/multlib.test: New file, based on a test case by
-       Ralf Corsepius
-
-2003-07-23  Tom Tromey  <address@hidden>
-
-       * lib/missing (autom4te): Typo.
-
-2003-07-16  Derek Price  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Handle AC_CONFIG_LINKS.
-       (handle_configure): Handle adding AC_CONFIG_LINKS arguments to
-       distclean targets (CONFIG_CLEAN_FILES makefile var).
-       * NEWS: Note new handling of AC_CONFIG_LINKS.
-       * automake.texi (Other things Automake recognizes): Ditto.
-       * tests/Makefile.am (TESTS): Add new tests.
-       * tests/conflnk.test: New test that links are cleaned on distclean.
-       * tests/conflnk2.test: New test that source files for links are
-       distributed.
-
-2003-07-15  Ralf Corsepius <address@hidden>  (tiny change)
-
-       * automake.in (scan_autoconf_traces): Trace AM_ENABLE_MULTILIB to
-       render $seen_multilib functional again.
-
-2003-07-10  Raja R Harinath  <address@hidden>
-
-       Avoid using refs as hash keys.
-       * lib/Automake/Variable.pm ($_traversal): New.
-       (reset): Reset $_traversal.
-       (_new): New attribute 'scanned'.
-       (%_vars_scanned): Remove.
-       (traverse_variable_recursively)
-       (traverse_variable_recursively_worker):
-       Use $_traversal instead of %_vars_scanned to detect recursively
-       defined variables.
-
-       * lib/am/configure.am (am--refresh): Silence.
-
-2003-07-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (define): Make clear the diagnostic
-       about variable names starting with `_' is about *Make* variables.
-
-       For Debian Bug #193907:
-       * automake.texi (Clean): make maintainer-clean should still
-       allow ./configure && make to run.
-
-       * automake.texi (CVS): Typo.
-
-2003-07-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in: Use Automake::FileUtils.
-       (parse_arguments, scan_configure, scan_m4_files): Never call
-       "die" to print an error message.  Use print and exit.
-       * automake.in: Use Automake::FileUtils.
-       * lib/Automake/General.pm ($debug, $help, $tmp, $verbose,
-       $version, &debug, &getopt, &mktmpdir, &verbose): Remove.
-       (END): Do not massage Perl's exit code.  Do not clean any temporary
-       directory.
-       (find_file, mtime, update_file, xsystem, contents): Move to ...
-       * lib/Automake/FileUtils.pm: ... this new file.  Adjust to
-       report errors using Channels.
-       (handle_exec_errors, xqx): New functions, from Autoconf.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add FileUtils.pm.
-
-       * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
-       Return the empty list on recursively defined variable.  This
-       supersedes my change of 2003-07-02.
-
-2003-07-08  Akim Demaille  <address@hidden>
-
-       * automake.in ($cygnus_mode): Replace with $options{'cygnus'}.
-       Adjust all dependencies.
-       (&depend): Move next to %dependencies and prototype.
-       (&initialize_per_input): Initialize the 'cygnus' field of
-       '%options' to spare the code from 'exists' or 'defined' when
-       testing it.
-       (&handle_configure, &do_check_merge_target, &check_cygnus): Prototype.
-       (&parse_arguments): Rename '%options' and '%options_1st_pass' as
-       '%cli_options' and '%cli_options_1st_pass' to avoid clashes and
-       inconsistencies.
-
-2003-07-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (generate_makefile): Move near the end of the
-       file, after the definition of all called functions, so that
-       prototypes can be enforced.
-
-2003-07-06  Akim Demaille  <address@hidden>
-
-       * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive,
-       install-exec-recursive, install-data-recursive and
-       uninstall-recursive addition to...
-       * lib/am/install.am: here.
-       * lib/am/texinfos.am, lib/am/subdirs.am: Remove the .PHONY
-       declaration of RECURSIVE_TARGETS.
-
-2003-07-06  Akim Demaille  <address@hidden>
-
-       * lib/Automake/Variable.pm, lib/Automake/VarDef.pm (VAR_SORTED):
-       New variable type.
-       Handle it.
-       * automake.in (&handle_subdirs): Prototype.
-       Adjust callers.
-       Make RECURSIVE_TARGETS a VAR_SORTED.
-
-2003-07-06  Akim Demaille  <address@hidden>
-
-       * automake.in (&define_files_variable): New.
-       (&handle_texinfo_helper): Move the handling of user variables from
-       here, to...
-       (&handle_texinfo): here.
-       This is to balance the size of these functions, and to match the
-       convention of other _helper functions.
-       (&handle_texinfo_helper): Use &define_files_variable.
-       Move some code to use less variables.
-       Rename $info_cursor as $texi.
-       (&handle_texinfo): Do not call handle_texinfo_helper if there are
-       no TEXINFOS.
-       * lib/am/texinfos.am: Sort the occurrences of dvi, info, pdf, ps
-       and html.
-       Remove *-recursive targets from .PHONY, they are part of
-       $(RECURSIVE_TARGETS) anyway.
-       (install-info, mostlyclean-aminfo): Are .PHONY.
-
-2003-07-05  Akim Demaille  <address@hidden>
-
-       * lib/am/distdir.am: Use ';' as a terminator, not a separator, for
-       sed complex commands, as required by NetBSD sed.
-       Reported by Patrick Welche.
-
-2003-07-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess, lib/config.sub: New upstream version.
-
-2003-07-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Optional, Dist): AC_CONFIG_AUX_DIR files
-       are automatically distributed.
-
-       * lib/depcomp (icc): Update to grok ICC 7.1's output.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Check dependency generation
-       in a subdirectory, and with many dependencies.  This
-       catches more failures of depcomp.
-       Reports from Ralf Wildenhues and Akim Demaille.
-
-2003-07-04  Akim Demaille  <address@hidden>
-
-       * automake.in (&scan_texinfo_file, &output_texinfo_build_rules,
-       (&handle_texinfo_helper, &handle_texinfo): Formatting changes.
-       Prototype properly.
-       Don't use & when calling functions.
-
-2003-07-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS: Categorize entries.
-       Suggested by Jim Meyering.
-
-       * Makefile.am (maintainer-clean): Disallow '$AUTOMAKE && exit 1'.
-       Ignore @...@ substitutions in comments.
-       * tests/defs.in: Try to make the shell more POSIX compliant.
-       (AUTOMAKE_run, AUTOMAKE_fails): New functions.
-       * tests/README: Mention AUTOMAKE_fails.
-       * tests/alloca.test, tests/alloca2.test, tests/ansi8.test,
-       * tests/asm.test, tests/backsl3.test, tests/backsl4.test,
-       * tests/badline.test, tests/badopt.test, tests/canon.test,
-       * tests/canon5.test, tests/colneq.test, tests/comment3.test,
-       * tests/comment5.test, tests/cond2.test, tests/cond20.test,
-       * tests/cond23.test, tests/cond24.test, tests/cond27.test,
-       * tests/condinc2.test, tests/conff2.test, tests/cxx2.test,
-       * tests/dejagnu2.test, tests/dirforbid.test,
-       * tests/distcom3.test, tests/else.test, tests/exdir2.test,
-       * tests/exeext2.test, tests/gcj2.test, tests/gcj5.test,
-       * tests/getopt.test, tests/gettext.test, tests/gettext2.test,
-       * tests/gnits.test, tests/gnuwarn.test, tests/gnuwarn2.test,
-       * tests/insh.test, tests/lex2.test, tests/libobj10.test,
-       * tests/libobj12.test, tests/libobj13.test,
-       * tests/libobj3.test, tests/library2.test,
-       * tests/library3.test, tests/libtool4.test,
-       * tests/libtool6.test, tests/lisp2.test, tests/location.test,
-       * tests/nogzip2.test, tests/output5.test, tests/overrid.test,
-       * tests/percent.test, tests/percent2.test,
-       * tests/pluseq5.test, tests/pluseq7.test, tests/pluseq9.test,
-       * tests/pr211.test, tests/primary.test, tests/primary2.test,
-       * tests/python2.test, tests/recurs.test, tests/reqd2.test,
-       * tests/seenc.test, tests/specflg.test, tests/specflg2.test,
-       * tests/spell.test, tests/spell2.test, tests/srcsub.test,
-       * tests/srcsub2.test, tests/stdlib.test, tests/subdir7.test,
-       * tests/substtarg.test, tests/suffix11.test,
-       * tests/symlink.test, tests/syntax.test,
-       * tests/targetclash.test, tests/txinfo4.test,
-       * tests/version3.test, tests/warnopts.test,
-       * tests/xsource.test, tests/yacc2.test: Use set -e,
-       AUTOMAKE_fails, and always grep error message.
-
-       * automake.in (handle_ltlibraries): Fix call to msg.
-
-       * tests/stamph.test: Delete.
-       * tests/Makefile.am (TESTS): Remove stamph.test.
-
-       * automake.in (handle_single_transform_list): Use $var->name
-       to print variable in the configure-substitution diagnostic.
-       Do not mention the parent when it is the variable itself.
-
-       * tests/package.test: Delete.
-       * tests/Makefile.am (TESTS): Remove package.test.
-
-       * automake.in (cond_stack_else): Return FALSE if `if' was not
-       used.
-       (cond_stack_endif): Return TRUE if `if' was not used.  Do not
-       display $negate and $cond, they are irrelevant and maybe undefined.
-
-2003-07-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
-       Do not return undef when a variable is recursively defined, this
-       causes warnings all over the place.  Return the empty string instead.
-
-       * lib/am/distdir.am (distcheck): Protect loop of DIST_ARCHIVES
-       from empty DIST_ARCHIVES.
-
-2003-07-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Check the expected
-       number of arguments of each traced macro.
-       * tests/overrid.test: Fix call to AM_CONDITIONAL.
-       * tests/conff2.test: New files.
-       * tests/Makefile.am (TESTS): Add conff2.test.
-       Report from Paolo Bonzini.
-
-2003-06-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in ($SUBST_REF_PATTERN): Do not define.
-       (%gen_varname): Move to Variable.pm, as %_gen_varname.
-       (initialize_per_input): Do not clean %gen_varname.
-       (handle_options, check_libobjs_sources, handle_source_transform,
-       handle_LIBOBJS, handle_ltlibraries, handle_texinfo_helper,
-       handle_man_pages, handle_dist, handle_subdirs, handle_gettext,
-       am_install_var): Adjust to use value_as_list_recursive,
-       loc_and_value_as_list_recursive, and has_conditional_contents.
-       (require_file_with_macro): Accept an Automake::Variable as argument.
-       (traverse_variable_recursively,
-       traverse_variable_recursively_worker, gen_varname,
-       transform_variable_recursively): Move ...
-       * lib/Automake/Variable.pm (traverse_variable_recursively,
-       _traverse_variable_recursively_worker,
-       _gen_varname, transform_variable_recursively): ... here.
-       * automake.in (variable_conditionally_defined,
-       variable_value_as_list_recursive_worker,
-       variable_value_as_list_recursive
-       variable_loc_and_value_as_list_recursive): Move ...
-       * lib/Automake/Variable.pm (has_conditional_contents,
-       _value_as_list_recursive_worker,
-       value_as_list_recursive, loc_and_value_as_list_recursive): ... here.
-       (reset): Reset %_gen_varname.
-       (require_variables_for_variable): Accept an Automake::Variable
-       as argument.
-
-2003-06-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/aclocal6.test: Test maintainer-clean in VPATH
-       builds. (For Ralf's fix.)
-
-2003-06-27  Ralf Corsepius  <address@hidden>  (tiny change)
-
-       * lib/am/configure.am (maintainer-clean): Remove
-       $(top_srcdir)/autom4te.cache, not autom4te.cache.
-
-2003-06-27  Akim Demaille  <address@hidden>
-
-       * automake.texi: Use @node with a single argument.
-
-2003-06-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/Makefile.am (dist_m4data_DATA): Add $(top_srcdir)/m4/amversion.m4.
-
-       * lib/am/distdir.am (distcheck): Run $(am__remove_distdir)
-       at the end of distcheck.  This was mistakenly removed on
-       2003-06-15.
-       * tests/subpkg.test: Make sure distcheck cleans up after itself.
-
-       * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ...
-       ($(top_srcdir)/m4/amversion.m4): ... this.
-       (DISTCLEANFILES): Remove.
-       (nodist_m4data_DATA): Remove. amversion.m4 is automatically
-       distributed.
-       (EXTRA_DIST): Add amversion.in.
-
-2003-06-25  Akim Demaille  <address@hidden>
-
-       * automake.texi (Top): Use @copying and @insertcopying.
-       Make Alexandre an author.
-       * automake.in ($gen_copyright): Add the "(C)" to Copyright.
-       * lib/depcomp: Likewise.
-
-2003-06-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (vardef, rvardef, set_seen): New functions.
-       (variable_defined, examine_variable): Remove.
-       (%_ac_macro_for_var): Add an entry for ALLOCA.
-       (require_variables): Use vardef instead of variable_defined.
-       Do not use _cvar.
-       * automake.in (generate_makefile): Do not push $(SOURCE) into
-       @sources.  Use define_pretty_variable to define SOURCES.
-       (handle_LIBOBJS, handle_ALLOCA): Use require_variables_for_variable
-       to require LIBOBJS, LTLIBOBJS and ALLOCA.
-       (handle_programs, handle_ltlibraries): Do not define an empty
-       _DEPENDENCIES or _LDFLAGS variable when none is defined.
-       (define_configure_variable): Do not check whether the variable
-       already exists (it's Automake::Variable::define's job).
-       (require_build_directory): Likewise, do not check
-       the existence of am__dirstamp.
-       (generate_makefile, handle_options, handle_languages)
-       (check_libobjs_sources, handle_single_transform_list)
-       (traverse_variable_recursively_worker, handle_source_transform)
-       (handle_lib_objects, handle_LIBOBJS, handle_compile)
-       (handle_libtool, handle_programs, handle_libraries)
-       (handle_ltlibraries, check_typos, handle_texinfo_helper)
-       (handle_man_pages, handle_tags, handle_dist, handle_subdirs)
-       (scan_aclocal_m4, handle_gettext, handle_footer, handle_install)
-       (handle_all, do_check_merge_target, handle_clean, lang_c_finish)
-       (handle_tests, lang_yacc_target_hook, define_pretty_variable)
-       (define_compiler_variable, define_linker_variable)
-       (make_paragraphs, am_primary_prefixes, am_install_var): Adjust to
-       call var, vardef, or set_seen, instead of variable_defined.  Use
-       set_seen only for variables which are actually checked by
-       check_typos.
-       * tests/target.test: Delete.
-       * tests/alloca.test, tests/alloca2.test: New files.
-       * tests/libobj3.test: Check error message.
-       * tests/distcom4.test: Make sure configure is in DIST_COMMON.
-       This replace confdist.test.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Remove target.test.
-       (TESTS): Add alloca.test and alloca2.test.  Remove confdist.test.
-
-2003-06-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_dist): Delete DIST_COMMON before redefining
-       it.  Bug report from Akim Demaille.
-       (rewrite_inputs_into_dependencies): Make sure we always return
-       something, even when $add_srcdir is 0.
-       * tests/distcom4.test, tests/distcom5.test: New files.
-       * tests/Makefile.am (TESTS): Add distcom4.test and distcom5.test.
-
-       * tests/cond29.test: Also check for _SOURCES.
-       Report from Paolo Bonzini.
-
-2003-06-20  Akim Demaille  <address@hidden>
-
-       * lib/am/configure.am: Replace leading spaces with a real tab.
-
-2003-06-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nogzip.test, tests/nogzip2.test: New files.
-       * tests/Makefile.am (TESTS): Add nogzip.test and nogzip2.test
-
-2003-06-15  Akim Demaille  <address@hidden>
-
-       * automake.in (&make_paragraphs): Define %GZIP%.
-       (&process_option_list): Accept no-dist-gzip2.
-       (&handle_dist): Complain when no archive format is enabled.
-       * lib/am/distdir.am (DIST_ARCHIVES): New variable.
-       (dist-gzip, dist-bzip2, dist-tarZ, dist-zip): No longer
-       conditioned.
-       (dist): Build $(distdir).tar.gz conditionally.
-       (distcheck): Use DIST_ARCHIVES to find an archive to unpack, and
-       to list built archives.  Run $(MAKE) dist instead of dist-gzip.
-       * automake.texi (Options, The types of distributions): Adjust.
-
-2003-06-15  Jens Elkner  <address@hidden>  (tiny change)
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Fix sed commands to work with
-       POSIXLY_CORRECT=1.
-
-2003-06-14  Karl Berry  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * mkinstalldirs (scriptversion): New variable.  Setup emacs hooks
-       to update it each time the file is written, as in install-sh.
-       (usage): Improve message.
-       (--version): New option.
-       (--help): Output to stdout, not stderr.
-
-2003-06-13  Paul Eggert  <address@hidden>
-
-       * lib/install-sh (dsttmp, rmtmp): Do not use '#' in file names;
-       it's not guaranteed by POSIX and it doesn't work on OpenVMS.
-       Bug reported by Bernard Giroud in:
-       http://mail.gnu.org/archive/html/autoconf-patches/2003-06/msg00013.html
-
-2003-06-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (check_gnu_standards): Use no-installman and
-       no-installinfo's locations.
-       (process_option_list): Fill %options with locations.
-       (check_cygnus) Fill $options{'no-installinfo'} and
-       $options{'no-dependencies'} with $cygnus_mode, so that it
-       remains a Location.
-       * tests/gnuwarn2.test: New file.
-       * tests/Makefile.am (TESTS): Add gnuwarn2.test.
-
-2003-06-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (process_option_list): Record the location
-       of ansi2knr's definition.
-       (handle_compile): Use it.
-       * tests/ansi3.test: Make sure the location appears correctly.
-       Update to use set -e.
-       * tests/ansi3b.test: New file.
-       * tests/Makefile.am (TESTS): Add ansi3b.test.
-
-       * tests/alpha.test: Really run $MAKE.  Augment to test
-       subdirectories, and check-news report.
-       * tests/alpha2.test: New file.  Bug report from Akim Demaille.
-       * tests/gnits2.test: Make sure README-alpha is not distributed.
-       * tests/Makefile.am (TESTS): Add alpha2.test.
-       * automake.in (handle_minor_options): Distribute README-alpha
-       using push_dist_common, not require_file_with_macro.
-
-2003-06-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Configure_ac.pm
-       (search_configure_ac, find_configure_ac): Rename as ...
-       (find_configure_ac, require_configure_ac): ... these.
-       * aclocal.in (scan_configure): Adjust call to require_configure_ac.
-       * automake.in (scan_autoconf_files): Likewise.
-       Suggested by Tim Van Holder.
-
-       * alocal.in: Use Automake::Configure_ac.
-       ($configure_ac): Delete.
-       (scan_configure): Adjust use of find_configure_ac;
-       * automake.in: Use Automake::Configure_ac.
-       ($configure_ac): Delete.
-       (scan_autoconf_files): Adjust use of find_configure_ac;
-       * lib/Automake/Configure_ac.pm: New file.
-       * lib/Automake/General.pm (find_configure_ac): Delete.  Now
-       replaced by Automake::Configure_ac::search_configure_ac.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm.
-       * lib/Automake/Variable.pm: Use Automake::Configure_ac.
-       (require_variables): Adjust use of $configure_ac.
-
-2003-06-02  Akim Demaille  <address@hidden>
-
-       * lib/am/texi-vers.am, lib/am/subdirs.am, lib/am/scripts.am,
-       * lib/am/remake-hdr.am, lib/am/python.am, lib/am/progs.am,
-       * lib/am/program.am, lib/am/multilib.am, lib/am/mans.am,
-       * lib/am/mans-vars.am, lib/am/ltlibrary.am, lib/am/ltlib.am,
-       * lib/am/lisp.am, lib/am/libtool.am, lib/am/library.am,
-       * lib/am/lang-compile.am, lib/am/java.am, lib/am/header.am,
-       * lib/am/header-vars.am, lib/am/footer.am, lib/am/depend.am,
-       * lib/am/dejagnu.am, lib/am/data.am, lib/am/compile.am,
-       * lib/am/clean.am, lib/am/clean-hdr.am, lib/am/check.am,
-       * lib/am/ansi2knr.am, lib/am/Makefile.am, lib/Makefile.am,
-       * m4/strip.m4, m4/sanity.m4, m4/runlog.m4, m4/regex.m4,
-       * m4/python.m4, m4/protos.m4, m4/options.m4, m4/obsolete.m4,
-       * m4/obsol-lt.m4, m4/obsol-gt.m4, m4/multi.m4, m4/missing.m4,
-       * m4/minuso.m4, m4/maintainer.m4, m4/lispdir.m4, m4/lex.m4,
-       * m4/install-sh.m4, m4/header.m4, m4/gcj.m4, m4/dmalloc.m4,
-       * m4/depout.m4, m4/cond.m4, m4/ccstdc.m4, m4/auxdir.m4, m4/as.m4,
-       * m4/Makefile.am: White space changes and Copyright updates.
-
-2003-05-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (check_defined_unconditionally): Add
-       the $parent_cond argument.
-       (output): Use $self->name in diagnostic not $self.
-       (variable_value_as_list): Rename as ...
-       (value_as_list): ... this.  Declare as a method.  Take a $parent_cond
-       argument and pass it to check_defined_unconditionally.  Do not call
-       variable_assert, now that this is a method.
-       (variable_assert): Delete (unused).
-       * automake.in (traverse_variable_recursively_worker): Adjust to
-       use check_defined_unconditionally and value_as_list as a methods.
-
-       * lib/Automake/Variable.pm (output): Declare as a method, since it
-       is only used this way.
-       (define): Fix documentation of $cond.
-       Suggested by Raja R. Harinath.
-
-2003-05-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm, lib/Automake/VarDef.pm: New files.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Variable.pm
-       and VarDef.pm.
-       * automake.in: Use Automake::Variable and Automake::VarDef.
-       (MACRO_PATTERN): Delete. Now Automake::Variable::_MACRO_PATTERN.
-       (am_macro_for_var): Delete. Now Automake::Variable::_am_macro_for_var.
-       (ac_macro_for_var): Delete. Now Automake::Variable::_ac_macro_for_var.
-       (silent_variable_override): Delete.  Now
-       Automake::Variable::_silent_variable_override.
-       (var_value, var_location, var_comment, var_type, var_owner,
-       var_pretty, content_seen): Delete.  This functionality is now
-       offered by Automake::Variable and Automake::VarDef.
-       (VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE, VAR_ASIS, VAR_PRETTY):
-       Delete.  Now defined in Automake::VarDef.
-       (var_order): Delete.  Now Automake::Variable::_var_order.
-       (appendvar): Delete.  Now Automake::Variable::_appendvar.
-       (var_SUFFIX_trigger): Register using Automake::Variable::hook.
-       (initialize_per_input): Call Automake::Variable::reset.
-       (err_var, msg_cond_var, msg_var, reject_var): Delete.  Now
-       defined in Automake::Variable.
-       (generate_makefile, process_option_list, handle_languages)
-       (traverse_variable_recursively_worker)
-       (transform_variable_recursively, handle_compile)
-       (handle_libraries, handle_ltlibraries)
-       (check_typos, handle_dist, handle_subdirs, scan_autoconf_files):
-       Adjust to use Automake::Variable functions.
-       (check_ambiguous_condition): Delete.  Now
-       Automake::Variable::_check_ambiguous_condition.
-       (condition_ambiguous_p): Delete.  Now
-       Automake::Variable::condition_ambiguous_p.
-       (variable_not_always_defined_in_cond): Delete.  Now
-       Automake::Variable::not_always_defined_in_cond.
-       (macro_define): Delete.  Now Automake::Variable::define.
-       (macro_delete): Delete.  Now Automake::Variable::variable_delete.
-       (macro_dump): Delete.  Now Automake::Variable::variable_dump.
-       (macros_dump): Delete.  Now Automake::Variable::variables_dump.
-       (variable_defined): Delete.  Now
-       Automake::Variable::variable_defined, with the target check
-       temporarily disabled.
-       (variable_assert): Delete.  Now Automake::Variable::variable_assert.
-       (examine_variable): Delete.  Now
-       Automake::Variable::examine_variable.
-       (variable_conditions): Delete.  Now Automake::Variable::conditions.
-       (scan_variable_expansions): Delete.  Now
-       Automake::Variable::scan_variable_expansions.
-       (check_variable_expansions): Delete.  Now
-       Automake::Variable::check_variable_expansions.
-       (check_variable_defined_unconditionally): Delete.  Now
-       Automake::Variable::check_defined_unconditionally.
-       (variable_value): Delete.  Now Automake::Variable::variable_value.
-       (variable_value_as_list): Delete.  Now
-       Automake::Variable::variable_value_as_list.
-       (variable_value_as_list_recursive_worker): Adjust to use
-       Automake::Variable functions.
-       (variable_output): Delete.  Now Automake::Variable::output.
-       (define_pretty_variable, define_configure_variable, read_am_file)
-       (define_standard_variables, read_main_am_file): Adjust to use
-       Automake::Variable functions.
-       (handle_variables): Delete.  Now Automake::Variable::output_variables.
-       (file_contents_internal, am_primary_prefixes, am_install_var)
-       (require_file_with_macro, require_conf_file_with_macro)
-       (push_dist_common): : Adjust to use
-       Automake::Variable functions.
-       (require_variables): Delete.  Now
-       Automake::Variable::require_variables.
-       (require_variables_for_macro): Delete.  Now
-       Automake::Variable::require_variables_for_variable.
-       * tests/Makefile.am (XFAIL_TESTS): Add target.test.
-
-2003-05-25  Christian Cornelssen  <address@hidden>  (tiny change)
-
-       * tests/dejagnu7.test: Check if runtest supports --status.
-
-2003-05-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Location.pm (dump): Output 'INTERNAL' when position
-       is undefined.
-
-       * lib/Automake/DisjConditions.pm (human): Fix infinite loop when
-       $self contains only one Condition.
-
-       * automake.in: Use plain strict, including refs.
-       (macro_define, handle_single_transform_list): Use \&{'name'} to
-       build references to named subroutines.
-
-2003-05-22  Karl Berry  <address@hidden>
-
-       * automake.texi: Update @dircategory to match the Free Software
-       Directory.  End directory entries with dots.
-
-2003-05-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
-
-       * lib/elisp-comp: s/François/Franc,ois/.
-       Suggested by Paul Eggert.
-
-       * automake.in: Move the "main" code at the end.
-       (parse_arguments): Move near the end.
-       ($KNOWN_EXTENSIONS_PATTERN, @known_extensions_list,
-       accept_extensions, var_SUFFIXES_trigger): Move these definitions
-       before any call to register_language.
-       (am_file): Move the definition with all other global variables,
-       do not use local to define it.
-       * Makefile.am (maintainer-check): Expect no `local' in Automake.
-
-2003-05-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Wrap.pm, lib/Automake/tests/Wrap.pl: New files.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Wrap.pm.
-       * lib/Automake/tests/Makefile.am (TESTS): Add Wrap.pl.
-       * automake.in (handle_texinfo_helper, pretty_print_rule)
-       (variable_output): Adjust to use makefile_wrap instead of
-       pretty_print_internal.
-       (pretty_print_internal): Remove.  Renamed as Automake::Wrap::wrap
-       and augmented to accept the $eol and $max_len arguments.
-
-2003-05-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Autom4te/XFile.pm, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: New upstream versions.
-
-2003-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/install.am (install, install-exec, install-data, uninstall):
-       Declare conditionally using a if/else/endif block instead of
-       using ?SUBDIRS?-style conditions.  The latter fail when
-       %maybe_BUILT_SOURCES% is replaced by several lines.
-       This fixes a bug introduced on 2003-04-06.
-       * tests/bsource.test: New file.
-       * tests/Makefile.am (TESTS): Add bsource.test.
-       Reported by Bruno Haible.
-
-2003-05-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (renamed objects): New node.
-       (Program and Library Variables): Move maude_DEPENDENCIES closer
-       to maude_LDADD.  Define and use `per-target compilation flags' in the
-       explanation for maude_CFLAGS et al.  Link to the `renamed objects'
-       node.  Illustrate maude_SHORTNAME.
-
-2003-05-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/install-sh: Update copyright notice and license to that of
-       X11R6.  This removes an advertising clause reported as Debian bug
-       #191717.
-
-2003-05-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.in (ACLOCAL): Do not use -I, --acdir is enough.
-
-       * m4/make.m4: Rename the doit target as am__doit,
-       and make it phony.
-       Reported by Philip S Tellis.
-
-2003-05-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/configure.am (%MAKEFILE-IN%): Propagate automake's exit
-       status.
-       * tests/makej.test: New file (test Autom4te's cache locking,
-       new in CVS Autoconf).
-       * tests/Makefile.am (TESTS): Add makej.test.
-
-2003-05-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/General.pm (contents): New function.
-       * aclocal.in (greatest_mtime, force_output): New globals.
-       (scan_configure, add_file): Update $greatest_mtime.
-       (parse_arguments): Parse --force.
-       (write_aclocal): Do not overwrite $output_file unless needed.
-       * automake.texi (aclocal options): Document --force.
-       * tests/aclocal7.test: New file.
-       * tests/Makefile.am (TESTS): Add aclocal7.test.
-
-2003-05-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Optional): Document m4_include.
-       (Invoking aclocal): Shake a bit to introduce the various uses
-       of aclocal and explain that aclocal will use m4_include for
-       local files.
-       (Extending aclocal): Show how to install installable macros
-       in $(datadir)/aclocal, and make it clearer that writing installable
-       macros is not the only way to extend aclocal.
-       (Local Macros, Future of aclocal): New sections.
-
-2003-04-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (@common_files): Remove acinclude.m4 since
-       it will be m4_included by aclocal.m4 and files are always
-       distributed.
-       (scan_aclocal_m4): Do not bother about acinclude.m4 anymore.
-       We will get this dependency when tracing m4_includes.
-       * tests/aclocal6.test: Make sure acinclude.m4 is distributed
-       when used.
-       * tests/acinclude.test: Delete.
-       * tests/Makefile.am (TESTS): Remove acinclude.test.
-
-2003-04-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_configure): Don't add @configure_deps to
-       DIST_COMMON, we do this from lib/am/configure.am now.
-       Define the am__configure_deps variable instead of substituing
-       %CONFIGURE_DEPS%.
-       * lib/am/configure.am (%MAKEFILE-IN%, $(top_srcdir)/configure,
-       $(ACLOCAL_M4)): Use $(am__configure_deps) instead of %CONFIGURE_DEPS%.
-       (DIST_COMMON): Add $(am__configure_deps).
-
-       * tests/aclocal6.test: New file.
-       * lib/am/configure.am (am--refresh): New rule.
-       (%MAKEFILE-IN%, %MAKEFILE%, $(top_builddir)/config.status,
-       $(top_srcdir)/configure): Call the top-level am--refresh from
-       subdirectories.
-       ($(ACLOCAL_M4)): Depend upon %CONFIGURE_DEPS%.  Call the
-       top-level am--refresh when not in the top-level directory.
-       Fix jump directories for VPATH builds.
-       Suggested by Raja R. Harinath.
-
-2003-04-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
-       and glob for m4_files (We've got all local m4 files while
-       tracing m4_include's).  Diagnose ACLOCAL_M4_SOURCES as obsolete.
-       Distribute aclocal.m4 only at the top-level.
-       (my_glob): Remove.  This fixes PR automake/11.
-       (handle_dist): Strip leading `./' from directories.
-       * aclocal.in (add_file): Output 'm4_include([file.m4])' instead
-       of copying local files.
-       (write_aclocal, parse_arguments): Bump copyright date.
-       * configure.in: De not build m4/amversion.m4 from here ...
-       * m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here.
-       (nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead
-       of amversion.m4.
-       * tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test.
-       (TESTS): Remove aclocal2.test.  Do not test aclocal.test twice.
-       * tests/aclocal2.test: Delete (pointless).
-       * tests/aclocal5.test: Make sure configure's dependencies are
-       distributed.
-       * tests/acinclude.test: Adjust to search for m4_include.
-       * tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep
-       configure instead of aclocal.m4.
-
-       For PR automake/46:
-       * automake.in (scan_aclocal_m4): Work in all directories, not only
-       the top-level.  Prepend $(top_srcdir) in front of each aclocal.m4
-       dependency.
-       * lib/am/configure.am (config.status, configure, $(ACLOCAL_M4)):
-       Define rebuild rules in each directory.
-       * tests/subdir8.test: Augment to exercise aclocal.m4's dependencies
-       from the top-level directory.
-       * tests/aclocal5.test: New file.  Exercise aclocal.m4's dependencies
-       from a subdirectory.
-       * tests/Makefile.am (TESTS): Add aclocal5.test.
-       (XFAIL_TESTS): Replace subdir8.test by aclocal5.test.
-
-2003-04-24  Akim Demaille  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/46:
-       * lib/am/configure.am (%MAKEFILE-IN%): If Makefile.in is rebuilt
-       because of one of configure's dependencies, run automake without
-       argument to update the whole tree at once.  Depend upon
-       %CONFIGURE_DEPS%.
-       (%MAKEFILE%): If Makefile is rebuilt because config.status has
-       been updated, run config.status without arguments.
-       * automake.in (scan_autoconf_traces): Prepend $(top_srcdir)
-       before all files in @configure_deps.
-       * tests/subdir5.test: Modernize configure.in, make sure
-       maude/Makefile was actually created, and exercise %CONFIGURE_DEPS%.
-       * tests/subdir8.test: New file.
-       * tests/Makefile.am (TESTS): Add subdir8.test.
-       (XFAIL_TESTS): Replace subdir5.test by subdir8.test.
-
-2003-04-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Requirements): Typo in index
-       s/AC_CONFIG_FILE/AC_CONFIG_FILES/.
-
-       * lib/texinfo.tex: New upstream version.
-
-2003-04-21  Jim Meyering  <address@hidden>
-
-       * lib/mkinstalldirs: Remove each sequence of spaces before a
-       TAB character.
-       * lib/depcomp: Search for TAB-SPC, not SPC-TAB.
-
-2003-04-19  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/389:
-       * automake.in (handle_configure): Don't put $colon_infile in
-       CONFIG-MAKEFILE.
-       * tests/conff.test: New file.
-       * tests/Makefile.am (TESTS): Add conff.test.
-       Reported by Alexander Turbov.
-
-2003-04-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in: Handle required=etags to work around
-       Exuberant Ctags.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-       * tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test:
-       Distribute dejagnu test cases, so that distcheck actually runs them.
-
-2003-04-18  Richard Dawe  <address@hidden>
-
-       * lib/am/dejagnu.am (site.exp): Don't define tool in site.exp,
-       because we set that by invoking runtest with --tool.
-       * tests/Makefile.am (TESTS): Add dejagnu4.test, dejagnu5.test,
-       dejagnu6.test, dejagnu7.test.
-       * tests/dejagnu4.test: New test.
-       * tests/dejagnu5.test: New test.
-       * tests/dejagnu6.test: New test.
-       * tests/dejagnu7.test: New test.
-
-       * tests/dejagnu3.test: Make sure the DejaGnu test is actually run.
-
-2003-04-18  Jim Meyering  <address@hidden>
-
-       * automake.in (variable_output): Fix typo in comment s/is/if/.
-
-       * lib/am/yacc.am (?!GENERIC?%OBJ% aka .y.c): Don't redirect
-       directly to address@hidden  Instead, redirect to address@hidden and 
rename upon success.
-       Also, move the commands that update $@ so they are last.  Otherwise,
-       this rule could leave the user with an up to date target (.c file)
-       but with a missing or corrupted corresponding .h file.
-
-2003-04-17  Richard Dawe  <address@hidden>
-
-       * tests/defs.in: Handle required=runtest, to detect runtest
-       from DejaGnu.
-       * tests/Makefile.am (TESTS): Add dejagnu3.test.
-       * tests/dejagnu3.test: New test.
-
-2003-04-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (rule_define): If the user tries to override
-       an Automake which has a -local variant, suggest using the
-       -local variant in the -Woverride diagnostic.
-       (handle_factored_dependencies): Register factored
-       rules with rule_define, and define them only in undefined
-       conditions.
-       * tests/Makefile.am (TESTS): Add override.test.
-       * tests/overrid.test: New file.
-       * tests/phony.test: Count the number of .PHONY targets.
-
-2003-04-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distuninstallcheck, distcleancheck): Silence
-       these rules, so that we don't confuse users by echoing
-       "echo ERROR:" commands which are not run.
-
-2003-03-14  Richard Dawe  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (output_texinfo_build_rules, handle_texinfo_helper,
-       initialize_per_input):  Add infrastructure for generating HTML
-       documentation from texinfo source.
-       * lib/am/texinfos.am: Add rules for building HTML documentation
-       from texinfo source.
-       * lib/am/texibuild.am: Likewise.
-       * automake.texi (Texinfo): Document rules for building
-       HTML documentation from texinfo source.
-       * tests/txinfo21.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo21.test.
-       * tests/defs.in: Handle required=makeinfo-html.
-
-2003-04-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (%silent_variable_override): New variable.
-       (macro_define): Warn about variable definitions overriding
-       Automake variables.
-       (rule_define): Warn about target definitions overriding
-       Automake variables.  Fix $condmsg definition.
-       * automake.texi (Invoking Automake): Document the `override'
-       category.
-       * lib/Automake/ChannelDefs.pm (usage): Likewise.
-       * lib/am/texinfos.am [!%?CYGNUS] (MAKEINFO): Do not define,
-       this is already done in m4/init.m4.
-       * tests/dejagnu2.test: Run $MAKE, don't only grep.  Use
-       -Wno-override, and make sure we get a warning without.
-       * tests/exeext2.test, tests/substtarg.test: Use -Wno-override,
-       and make sure we get a warning without.
-       * tests/exeext3.test, tests/java2.test, tests/nolink.test,
-       tests/subpkg.test, tests/vartest.test: Use -Wno-override.
-       * tests/txinfo13.test: Use installcheck-local instead of overriding
-       installcheck.
-       * tests/txinfo2.test: Run $MAKE on the real Makefile (this test
-       used to succeed thanks to a failure...)
-       * tests/location.test: Adjust expected messages.
-       * tests/Makefile.am (XFAIL_TESTS): Add txinfo5.test.
-
-2003-04-12  Raja R Harinath  <address@hidden>
-
-       * lib/Automake/DisjConditions.pm (true): Don't cache answer.
-       (invert): Update comment.
-       (_simplify): Remove.
-       (simplify): Implement using invert().
-       * lib/Automake/tests/DisjConditions.pl (test_simplify):
-       Update to reflect changes.
-
-2003-04-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_files): Augment the error message
-       about AM_INIT_AUTOMAKE not found.
-       Suggested by Bruno Haible.
-
-       * lib/Automake/Version.pm: New file.
-       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Version.pm.
-       * lib/Automake/tests/Version.pl: New file.
-       * lib/Automake/tests/Makefile.am (TESTS): Add Version.pl.
-       * tests/Makefile.am (TESTS): Remove version5.test.
-       * tests/version5.test: Delete.  Move the tests to Version.pl.
-       * automake.in (version_split, version_compare, version_check): Move ...
-       * lib/Automake/Version.pm (split, compare, check): ... here.
-
-2003-04-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/tests/Condition.pl (test_reduce_and)
-       (test_reduce_or): Cosmetics.
-       * lib/Automake/tests/DisjConditions.pl (test_sub_conditions):
-       Fix a comment.
-       * lib/Automake/DisjConditions.pm (sub_conditions): Add missing C<...>
-       in comment.
-       * tests/yacc8.test, configure.in: Update copyright year.
-
-2003-04-10  Richard Dawe  <address@hidden>
-
-       * configure.in: Get the build platform name.  Define
-       MODIFICATION_DELAY as the time to wait after modifying a file,
-       to cope with timestamp granularity issues, depending
-       on the platform.
-       * tests/defs.in: Define `sleep' using MODIFICATION_DELAY.
-
-2003-04-10  Eric Siegerman  <address@hidden>  (tiny change)
-
-       * automake.texi (Public macros): Clarify that the new
-       AM_INIT_AUTOMAKE variant is preferred, and the old one
-       deprecated.  Copy-edit the rest of the AM_INIT_AUTOMAKE item.
-       (Hello): Caution that the example uses the deprecated
-       AC_INIT/AM_INIT_AUTOMAKE syntax, and xref to the discussion.
-
-2003-04-10  Alexandre Duret-Lutz  <address@hidden>
-
-       Retain all variable definitions until the whole Makefile.am has
-       been processed, then output all variables in one step, at the top
-       of Makefile.in.  (Older revisions used to output user variables
-       before generating Automake targets, and to mix Automake variables
-       with Automake targets, preventing redefinitions of previously
-       output variables.)
-
-       * automake.in (%var_pretty): New variable.
-       (VAR_ASIS, VAR_PRETTY): New constants.
-       (@var_list): Rename as ...
-       (@var_order): ... this.
-       (initialize_per_input): Clear %var_pretty.
-       (handle_variables): New function, extracted from ...
-       (read_main_am_file): ... here.
-       (generate_makefile): Call handle_variable after everything else.
-       (handle_dist): Use define_pretty_variable, not pretty_print.
-       (pretty_print): Delete.
-       (macro_define): Augment with $COMMENT and $PRETTY parameters.
-       Update %var_comment, %var_pretty, and @var_order.  Adjust callers.
-       (variable_pretty_output): Merge with ...
-       (variable_output): ... this, and choose the prettiness on a
-       per-condition basis.
-       (append_comments): Delete.  This work is now done by macro_define.
-       (read_am_file, file_contents_internal): Don't call append_comments
-       nor update @var_list, adjust calls to macro_define.
-       (handle_subdirs): Don't explicitly output RECURSIVE_TARGETS,
-       just mark it as VAR_PRETTY.
-       * tests/exeext.test: Make sure bin_PROGRAMS is output only once.
-       Report from Jim Meyering.
-
-2003-04-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_installdirs): Rename as ...
-       (handle_install): ... this.  Define maybe_BUILT_SOURCES.
-       (generate_makefile): Adjust call to handle_install.
-       * lib/am/install.am (install): Use %maybe_BUILT_SOURCES%.
-       * automake.texi (Sources, Built sources example): BUILT_SOURCES
-       is honored by `make install' too.
-       * tests/check3.test: Make sure that `make install' also depends
-       upon BUILT_SOURCES.
-       Report from Alexander Turbov.
-
-       * lib/am/libs.am (ARFLAGS): Define.
-       * automake.in (handle_libraries): Use `$(ARFLAGS)' instead of
-       hard-coding `cru'.
-       * automake.texi (A Library): Explain how AR, ARFLAGS and RANLIB
-       are used, and how they can be overridden.
-       (Program and Library Variables): Adjust to show `$(ARFLAGS)'
-       instead of `cru'
-       * tests/ar.test: Rewrite to test for AR, ARFLAGS, and RANLIB.
-       * tests/ranlib.test: Delete, obsoleted by ar.test.
-       * tests/Makefile.am (TESTS): Remove ranlib.test.
-       Report from Paul Thomas.
-
-2003-04-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (check_trailing_slash): New function (variation on
-       a patch by Peter Muir).  Diagnose whitespaces following trailing
-       backslash.
-       (read_am_file): Use it.
-       * tests/backsl4.test: New file.
-       * tests/Makefile.am (TESTS): Add backsl4.test.
-       Reported by Peter Muir.
-
-2003-03-29  Raja R Harinath  <address@hidden>
-
-       Speedup Automake::DisjConditions::invert().
-       * lib/Automake/Condition.pm (multiply): New.
-       * lib/Automake/DisjConditions.pm (_multiply): Use it.
-       (sub_conditions): Likewise.
-
-       * lib/Automake/Condition.pm (reduce): Rename to ...
-       (reduce_and): ... this.
-       (reduce_or): New.
-       * lib/Automake/DisjConditions.pm (_multiply): Use reduce_or().
-       * lib/Automake/tests/Condition.pl (test_reduce): Rename to ...
-       (test_reduce_and): ... this.
-       (test_reduce_or): New.
-       * lib/Automake/tests/DisjConditions.pl
-       (test_invert): Update to reflect effect of reduce_or().
-       (test_simplify): Don't skip invert() on larger inputs.
-
-2003-03-29  Raja R Harinath  <address@hidden>
-
-       * tests/yacc8.test: Add a $sleep before modifying Makefile.am so
-       that timestamp will change.
-
-2003-03-23  Akim Demaille  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/tags.am (TAGS): Use --etags-include instead of --include,
-       when supported by etags (Exuberant Ctags).
-       * tests/tagsub.test: Rewrite to _run_ the `tags' rule.
-
-2003-03-20  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug #185388:
-       * automake.texi (Extending): Augment the install-exec-hook
-       discussion with an example how to symlink a versioned binary.
-       * tests/insthook.test: Rewrite to test the above example.
-       Report from James R. Van Zandt.
-
-2003-03-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Allow `automake:' tokens,
-       occuring in location.test.  Automake now has 5 legitimate
-       unsubstituted @address@hidden
-
-       * tests/aclocal4.test: Require GNU make.
-
-2003-03-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/aclocal4.test: New file.  Test for the ACLOCAL_M4 bug below.
-       * tests/Makefile.am (TESTS): Add aclocal4.test.
-
-2003-03-14  Jim Meyering  <address@hidden>
-
-       * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
-       subdirectories.  Makefile.in depends on that variable.
-
-2003-03-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/init.m4: Remove a leftover comment from the pre-1.7 era.
-
-       Fix for PR automake/386:
-       * m4/init.m4: Require Autoconf 2.55.
-       Reported by Owen Taylor.
-
-       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
-       (?GENERIC?%EXT%.lo): Use `mv -f' instead of `mv' in FASTDEP mode.
-       Suggested by Matthias Andree.
-
-       * tests/README: Typo.
-
-2003-03-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
-       (?GENERIC?%EXT%.lo): Hide the if/then/else machinery for FASTDEP.
-       Just echo the gcc command.
-       Suggested by Karl Berry.
-
-2003-03-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use
-       `test -f foo || echo $(srcdir)/` to emulate a VPATH search when
-       outputing suffix rules.  This follows 2003-02-25's change.
-       * lib/am/lex.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
-       * lib/am/yacc.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
-
-2003-03-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Requirements) <AC_CONFIG_FILES>: Files listed
-       with AC_CONFIG_FILES are cleaned by `make distclean'.  Don't
-       pretend otherwise.
-       Reported by Rafael Laboissiere.
-
-2003-03-04  Andreas Buening  <address@hidden>
-
-       * lib/mdate-sh: Find out which column of the ls -l output contains
-       the month. Do not assume it is at least the fifth column.
-
-2003-02-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Emacs Lisp): Mention that `dist_' can be used.
-
-       * automake.texi (Emacs Lisp): Instruct people to use lisp_DATA
-       instead of lisp_LISP when they don't want byte-compilation.
-       Don't mention ELCFILES anymore.
-       * automake.in (handle_data): Allow lisp_DATA.
-       * tests/lisp5.test: New file.
-       * tests/Makefile.am (TESTS): Add lisp5.test.
-
-       * automake.in (handle_emacs_lisp): Don't build *.elc files
-       if ELCFILES was set empty.
-       * tests/lisp4.test: New file.
-       * tests/Makefile.am (TESTS): Add lisp4.test.
-       Reported by Simon Josefsson.
-
-       * tests/lex3.test, tests/lex5.test: Require flex.
-       Reported by Leo Davis.
-
-2003-02-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
-       use the `test -f foo || echo $(srcdir)/` to emulate a VPATH search
-       when outputing suffix rules.
-       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.dvi)
-       (?GENERIC?%SOURCE_SUFFIX%.pdf): Likewise.
-       Suggested by Bruno Haible.
-
-       * automake.in (read_am_file): Catch trailing backslashes on last line.
-       * tests/backsl3.test: New file.
-       * tests/Makefile.am (TESTS): Add backsl3.test.
-       Reported by Akim Demaille.
-
-2003-02-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * ChangeLog: Move 2002's entries to ...
-       * ChangeLog.02: ... this new file.
-       * Makefile.am (EXTRA_DIST): Add ChangeLog.02.
-
-2003-02-24  Richard Dawe  <address@hidden>
-
-       * tests/version7.test: Use $sleep to sleep before updating
-       the version, to work around timestamp inconsistencies in Windows.
-
-2003-02-24  Bruno Haible  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texibuild.am: Don't remove the target info files. Instead,
-       back up and restore them if makeinfo fails.
-       * tests/txinfo20.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo20.test.
-
-2003-02-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
-       (distcleancheck): Fix typos and other errors reported by Karl
-       Berry.
-
-2003-02-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Use $(...)
-       instead of ${...}.
-
-       * tests/defs.in: Handle required=ro-dir.
-       * tests/destdir.test: Use this.
-
-2003-02-19  Richard Dawe  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Strip any leading DOS drive
-       from dc_install_base.
-
-2003-02-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Install
-       DJGPP-style *.iNN info files.
-       (maintainer-clean-aminfo): Rewrite using the same pattern
-       as in uninstall-info-am.
-       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Erase
-       DJGPP-style *.iNN info files before running $(MAKEINFO).
-       * tests/txinfo19.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo19.test.
-
-2003-02-18  Richard Dawe  <address@hidden>
-
-       * lib/depcomp (dashmstdout): Cope with DOS filenames in
-       dependencies.
-
-2003-02-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/depcomp (makedepend): Don't pass $object to makedepend.
-       Reported by Stepan Kasal.
-
-2003-02-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in: Handle required=makedepend.
-
-       * Makefile.am (maintainer-check): Update the diff check
-       to account for the recent @SHELL@ substitution.
-
-2003-02-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/depcomp: Do not put comments on the `icc)' line.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-       Fix for PR automake/381:
-       * automake.in (handle_gettext): Do not print diagnostics
-       about po/ and intl/ missing from SUBDIRS if po/ does not
-       exist.  Warn if `SUBDIRS = intl' is used although libintl
-       is 'external'.
-       * tests/gettext.test: Make sure diagnostics are not output
-       when po/ does not exist.
-       * tests/gettext2.test: Test for unwanted intl/.
-       PR from Alexander Turbov, fix suggested by Bruno Haible.
-
-       * m4/depend.m4: Grep depcomp's stderr for icc warnings about
-       ignored options.
-       * lib/depcomp (icc): New mode.
-       * tests/depcomp5.test: New file.
-       * tests/defs.in: Handle required=icc.
-       * tests/Makefile.am (TESTS): Add it.
-
-       Temporary hack for PR automake/381:
-       * automake.in (handle_gettext): Turn missing po/ and intl/ errors
-       into -Wsyntax warnings.
-
-2003-02-10  Richard Dawe  <address@hidden>
-
-       * Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
-       This makes the setting of SHELL work for DJGPP.
-
-2003-02-10  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/385:
-       * lib/depcomp (makedepend): Strip any libtool call, before
-       running makedepends.
-       * tests/depcomp4.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       Reported by Jeff Squyres.
-
-       Related to PR automake/385:
-       * lib/depcomp (dashmstdout): Do not use `-o /dev/null', or gcc will
-       write dependencies to /dev/null.  `-o /dev/null' was added
-       on 2002-06-13 just because I tried to replace `-o foo.o' by something
-       else and didn't thought about removing it entirely.
-       * tests/depcomp3.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-       * automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
-       SHELL for DJGPP.
-       Suggested by Richard Dawe.
-
-2003-02-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
-       (distcleancheck): New nodes.
-
-2003-02-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_files): Don't complain that
-       AM_INIT_AUTOMAKE comes from an old version if it was not found.
-
-2003-02-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (am_install_var): Simplify filtering of
-       variable_loc_and_value_as_list_recursive's output.
-
-2003-02-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Recompute
-       indexes of header files so we create stamp files with
-       the right numbers when config.status is run on some headers.
-       * tests/stamph2.test: Check for this.
-       Reported by Sander Niemeijer.
-
-2003-02-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (vars_scanned): Move near traverse_variable_recursively.
-       (traverse_variable_recursively,
-       traverse_variable_recursively_worker): Accept a $COND_FILTER argument
-       to filter out conditions during recursion.  Don't recurse into
-       undefined variables.  Don't pass empty results to &FUN_COLLECT.
-       (value_to_list): Remove, was used by
-       variable_value_as_list_recursive_worker only.
-       (variable_value_as_list_recursive_worker): Rewrite using
-       traverse_variable_recursively.  Remove the $parent argument.
-       (variable_value_as_list_recursive,
-       variable_loc_and_value_as_list_recursive): Adjust calls
-       to variable_value_as_list_recursive_worker.  Don't reset
-       %vars_scanned.
-       * tests/cond3.test: Don't expect empty helper variables,
-       we don't output them anymore.
-       * tests/cond30.test: Use an undefined variable.
-
-       * automake.in (handle_programs): Strip $(EXEEXT) before
-       calling &check_canonical_spelling.
-       * tests/exeext.test: Make sure we don't use a
-       maude3__EXEEXT__OBJECTS variable.
-
-2003-02-02  Jeremy Nimmer  <address@hidden>  (tiny change)
-
-       For Debian Bug #39542:
-       * automake.texi (Invoking Automake, Optional): Document how
-       AC_CONFIG_AUX_DIR interacts with missing files.
-
-2003-02-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/DisjConditions.pm (_permutations_worker)
-       (permutations): Remove, so that people aren't tempted to use it.
-       * lib/Automake/tests/DisjConditions.pl (tests_permutations): Remove.
-
-       * automake.in (variable_conditions_recursive): Remove.
-       (variable_conditionally_defined): Rewrite using
-       traverse_variable_recursively.
-
-       * automake.in (traverse_variable_recursively,
-       traverse_variable_recursively_worker): Pass one merged Condition
-       instead of a stack of conditions to &FUN_STORE and &FUN_COLLECT.
-       (transform_variable_recursively, define_objects_from_sources)
-       (handle_lib_objects, variable_conditions_recursive): Adjust usage.
-
-2003-02-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_lib_objects): Compute _DEPENDENCIES variables
-       using transform_variable_recursively instead of
-       variable_conditions_recursive and variable_value_as_list_recursive
-       to avoid combinatorial explosion.
-       (handle_lib_objects_cond): Merge into handle_lib_objects.
-       * tests/cond11.test: Don't grep internal details in Makefile.in,
-       run $MAKE to make sure the resulting Makefile runs as expected.
-       * tests/cond29.test: Also exercise conditional _LDADD.
-       * tests/cond31.test, tests/cond32.test: New files.
-       * tests/Makefile.am (TESTS): Add tests/cond31.test and
-       tests/cond32.test.
-
-2003-01-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_lib_objects_cond): Ignore -dlopen and
-       -dlpreopen in _LIBADD variables too.
-       (handle_LIBOBJS, handle_ALLOCA): New functions, extracted from
-       handle_lib_objects_cond.
-       * tests/libtool7.test: New file.
-       * tests/Makefile.am (TESTS): Add libtool7.test.
-
-       * automake.texi (Program and Library Variables): Clarify that
-       _LIBADD is for libraries and _LDADD for programs.
-
-       * automake.in (handle_source_transform): Correct typo from 2003-01-23.
-
-2003-01-28  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/352:
-       * automake.in (transform_variable_recursively): If the destination
-       and the source variables are the same, delete the source variable
-       before defining the destination variable.
-       (handle_programs): Strip any $(EXEEXT) suffix from $one_file,
-       or this will confuse handle_source_transform.
-       (append_exeext): Rewrite using transform_variable_recursively.
-       * tests/cond29.test, tests/cond30.test: New files.
-       * tests/exeext.test: Run ./configure and make, this uncovered
-       the above handle_programs issue.
-       * tests/Makefile.am (TESTS): Add cond29.test and cond20.test.
-
-       * automake.in (%subobjvar): Replace by ...
-       (%gen_varname): ... this.
-       (subobjname): Replace by ...
-       (gen_varname): ... this.
-       (initialize_per_input): Clean gen_varname instead of subobjname.
-       (transform_variable_recursively): New function, extracted
-       from define_objects_from_sources.
-       (define_objects_from_sources): Use transform_variable_recursively.
-       Remove the unused $parent argument.
-       (handle_source_transform): Adjust call to define_objects_from_sources.
-
-2003-01-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (@substfroms, @substtos): Move near
-       traverse_variable_recursively.
-       (traverse_variable_recursively, traverse_variable_recursively_worker):
-       New functions, extracted from define_objects_from_sources.
-       (define_objects_from_sources): Rewrite using
-       traverse_variable_recursively.
-       (handle_source_transform): Use variables_conditionally_defined
-       instead of calling variable_conditions_recursive directly.
-       Adjust the call to define_objects_from_sources; there is no need
-       to reset @substtos, @substfroms, and %vars_scanned now.
-       (variable_conditions_recursive): Rewrite using
-       traverse_variable_recursively.
-       (variable_conditions_recursive_sub): Remove.
-       (variable_conditionally_defined): Fix condition comparison (the
-       consequence was that DIST_SUBDIRS was always output).
-       * lib/Automake/Condition.pm (merge): Allow merging several
-       conditions at once.
-
-2003-01-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.texi (Python): Explain that directory variables start
-       with either ${prefix} or ${exec_prefix}, and point to the
-       `Installation Directory Variables' section of the Autoconf manual.
-
-2003-01-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (top_distdir, distdir): Define these
-       variables only in top level Makefile.  Redefine $(top_distdir)
-       as $(distdir).
-       (distdir): Fix passing of $(top_distdir) to sub-makes.
-       * automake.in (handle_dist): Do not define the DISTDIR and
-       TOP_DISTDIR transformations.  We don't need them anymore.
-       * automake.texi (Dist): Reorder the dist-hook section, and move
-       the DIST_SUBDIRS paragraph earlier.  Document distdir and
-       top_distdir.
-       * tests/subpkg.test: Update to check for $(distdir) and
-       $(top_distdir).
-
-2003-01-19  Alexandre Duret-Lutz  <address@hidden>
-
-       Rename more files to accomodate 8+3 file systems, and adjust the
-       vocabulary at the same time: AM_CONDITIONAL defines "conditionals",
-       and we call "condition" a conjunction of "conditionals".
-       * lib/am/Conditional.pm: Rename to lib/am/Condition.pm.
-       * lib/am/tests/Conditional.pl: Rename to lib/am/tests/Condition.pl.
-       * lib/am/ConditionalSet.pm: Rename to lib/am/DisjConditions.pm.
-       * lib/am/tests/ConditionalSet.pl: Rename to
-       lib/am/tests/DisjConditions.pl
-       * lib/am/Conditional.pm (condition_negate): Rename to ...
-       * lib/am/Condition.pm (conditional_negate): ... this.
-       * automake.in: Adjust references to Condition and DisjConditions.
-       (check_ambiguous_conditional, conditional_ambiguous_p): Rename to ...
-       (check_ambiguous_condition, condition_ambiguous_p): ... these.
-
-       * tests/README: New file.
-
-       * automake.texi (Conditional Programs): Show a sample Makefile.am.
-       Remind $(EXEEXT) must be appended to configure substitutions.
-       Show how Automake conditionals can be used instead.
-       * tests/exeext.test (check_PROGRAMS): Make sure EXEEXT is also
-       appended to conditionally defined programs.
-
-2003-01-16  Jim Meyering  <address@hidden>
-
-       Accept --help and --version, and lots of syntactic clean-up.
-       * lib/install-sh: Use consistent indentation, two spaces per level.
-       (scriptversion): New variable.
-       Change initializations like `variable=""' to `variable='.
-       (usage): New variable.
-       Use `test', not `['.
-       Use `test -z "$var"', not `[ x"$var" = x ]'.
-       Use `test -n "$var"', not `[ x"$var" != x ]'.
-       Alphabetize case entries.
-       Accept --help and --version options.
-       Remove unnecessary `else :' clauses.
-       Add a `Local variables' eval block to help emacs users update
-       the time-stamp variable added above.
-       Mostly from Karl Berry.
-
-2003-01-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (AM_PATH_PYTHON) <_AM_PYTHON_INTERPRETER_LIST>: Add
-       python2.3.
-
-       * m4/python.m4 (AM_PATH_PYTHON): Query distutils for `pythondir'
-       or `pyexecdir', for the sake of 64-bit distributions that usually
-       use lib64/ instead of lib/.  Fall back to the default directory
-       if it doesn't work.
-       Suggested by Gwenole Beauchesne.
-
-2003-01-14  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/382:
-       * automake.texi (Yacc and Lex): Document `AM_YFLAGS = -d'.
-       Explain BUILT_SOURCES is usually needed in this case.
-       Reported by William S Fulton.
-
-2003-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       Rename some files for the sake of 8+3 file systems.
-       * tests/aclocali.test:     Rename to tests/aclocal.test.
-       * tests/aclocali1.test:    Rename to tests/aclocal2.test.
-       * tests/aclocalii.test:    Rename to tests/aclocal3.test.
-       * tests/acoutput.test:     Rename to tests/acoutpt.test.
-       * tests/acoutput2.test:    Rename to tests/acoutpt2.test.
-       * tests/acouttbs.test:     Rename to tests/acoutbs.test.
-       * tests/acouttbs2.test:    Rename to tests/acoutbs2.test.
-       * tests/autoheader.test:   Rename to tests/autohdr.test.
-       * tests/autoheader2.test:  Rename to tests/autohdr2.test.
-       * tests/condincl.test:     Rename to tests/condinc.test.
-       * tests/condincl2.test:    Rename to tests/condinc2.test.
-       * tests/distcommon.test:   Rename to tests/distcom.test.
-       * tests/distcommon2.test:  Rename to tests/distcom2.test.
-       * tests/distcommon3.test:  Rename to tests/distcom3.test.
-       * tests/installsh.test:    Rename to tests/instsh.test.
-       * tests/installsh2.test:   Rename to tests/instsh2.test.
-       * tests/instdata.test:     Rename to tests/instdat.test.
-       * tests/instdata2.test:    Rename to tests/instdat2.test.
-       * tests/libobj12b.test:    Rename to tests/libobj13.test.
-       * tests/link_f_c.test:     Rename to tests/link_fc.test.
-       * tests/link_f_c_cxx.test: Rename to tests/link_fccxx.test.
-       * tests/link_f_cxx.test:   Rename to tests/link_fcxx.test.
-       * tests/nodefine.test:     Rename to tests/nodef.test.
-       * tests/nodefine2.test:    Rename to tests/nodef2.test.
-       * tests/required.test:     Rename to tests/reqd.test.
-       * tests/required2.test:    Rename to tests/reqd2.test.
-       * tests/sourcesub.test:    Rename to tests/srcsub.test.
-       * tests/sourcesub2.test:   Rename to tests/srcsub2.test.
-       * tests/specflags.test:    Rename to tests/specflg.test.
-       * tests/specflags2.test:   Rename to tests/specflg2.test.
-       * tests/specflags3.test:   Rename to tests/specflg3.test.
-       * tests/specflags6.test:   Rename to tests/specflg6.test.
-       * tests/specflags7.test:   Rename to tests/specflg7.test.
-       * tests/specflags8.test:   Rename to tests/specflg8.test.
-       * tests/specflags9.test:   Rename to tests/specflg9.test.
-       * tests/subdircond.test:   Rename to tests/subcond.test.
-       * tests/subdircond2.test:  Rename to tests/subcond2.test.
-       * tests/subdircond3.test:  Rename to tests/subcond3.test.
-       * tests/texinfo.test:      Rename to tests/txinfo.test.
-       * tests/texinfo2.test:     Rename to tests/txinfo2.test.
-       * tests/texinfo3.test:     Rename to tests/txinfo3.test.
-       * tests/texinfo4.test:     Rename to tests/txinfo4.test.
-       * tests/texinfo5.test:     Rename to tests/txinfo5.test.
-       * tests/texinfo6.test:     Rename to tests/txinfo6.test.
-       * tests/texinfo7.test:     Rename to tests/txinfo7.test.
-       * tests/texinfo8.test:     Rename to tests/txinfo8.test.
-       * tests/texinfo9.test:     Rename to tests/txinfo9.test.
-       * tests/texinfo10.test:    Rename to tests/txinfo10.test.
-       * tests/texinfo13.test:    Rename to tests/txinfo13.test.
-       * tests/texinfo16.test:    Rename to tests/txinfo16.test.
-       * tests/texinfo17.test:    Rename to tests/txinfo17.test.
-       * tests/texinfo18.test:    Rename to tests/txinfo18.test.
-       * tests/Makefile.am (TESTS): Adjust.
-       * ChangeLog.1996: Rename to ChangeLog.96.
-       * ChangeLog.1998: Rename to ChangeLog.98.
-       * ChangeLog.2000: Rename to ChangeLog.00.
-       * ChangeLog.2001: Rename to ChangeLog.01.
-       * Makefile.am (EXTRA_DIST): Adjust.
-       Reported by Richard Dawe.
-
-2003-01-13  Richard Dawe  <address@hidden>  (tiny change)
-
-       * lib/am/distdir.am (distcheck): '=' is not valid in DOS filenames.
-       Use '_build' and '_inst' instead of '=build' and '=inst'.
-       * tests/man2.test: Reflect change automake: check for files in
-       '_build' and '_inst' directories instead of '=build' and '=inst'.
-
-2003-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       Use `_dirstamp' when the file-system doesn't support `.dirstamp'.
-       * m4/lead-dot.m4: New file.
-       * m4/Makefile.am (dist_m4data_DATA): Add lead-dot.m4
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_LEADING_DOT.:
-       * m4/depend.m4 (AM_SET_DEPDIR): Require AM_SET_LEADING_DOT. Define
-       DEPDIR using am__leading_dot.
-       * automake.in (require_build_directory): Define am__dirstamp, a new
-       variable for the dirstamp basename, based on am__leading_dot.
-       * tests/subobj6.test: Move all `test -f' into Makefiles, so we can
-       use $(am__dirstamp).
-       Reported by Richard Dawe.
-
-       * tests/gnits2.test, tests/pr300-prog.test, tests/transform.test:
-       Move all `test -f' into Makefiles, so we can honor $(EXEEXT) when
-       testing for programs.
-       Reported by Richard Dawe.
-
-2003-01-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Suggest using $sleep instead of
-       sleep 2.
-       * tests/defs.in (sleep): New variable.
-       * tests/asm.test, tests/confsub.test, tests/lisp3.test,
-       tests/texinfo16.test, tests/warnopts.test, tests/yaccvpath.test:
-       Use $sleep instead of sleep 2, to work around timestamp
-       inconsistencies in Windows.
-       Reported by Richard Dawe.
-
-       * Makefile.am (maintainer-check): Do not require SHELL=/bin/sh
-       after $MAKE -e.
-       * tests/ansi3.test, tests/ansi5.test, tests/cond22.test,
-       tests/man2.test, tests/subobj3.test, tests/suffix8.test,
-       tests/suffix11.test: Do not set SHELL=/bin/sh after $MAKE -e.
-       $SHELL is overridden by tests/defs, so it won't hurt even
-       if $MAKE -e uses the $SHELL envvar.
-       * tests/ansi.test, tests/insh2.test, tests/texinfo.test,
-       tests/texinfo8.test: Use SHELL=$SHELL, not SHELL=/bin/sh.
-       Reported by Richard Dawe.
-
-       Build elisp files all at once instead of one by one.
-       * automake.in (handle_emacs_lisp): Define am__ELFILES.  Add
-       elc-stamp to all's dependencies.
-       * lib/am/lisp.am (elc-stamp): New rule, build all *.elc files.
-       (.el.elc): Rewrite to call elc-stamp if $@ doesn't exist.
-       (clean-lisp): Clean elc-stamp.
-       * lib/elisp-comp: Reindent.  Erase the temporatry directory
-       from a trap.  Propagate Emacs's exit status.
-       * tests/lisp3.test: New file.
-       * tests/Makefile.am (TESTS): Add lisp3.test.
-       Reported by Ryan T. Sammartino.
-
-2003-01-09  Akim Demaille  <address@hidden>
-
-       * automake.texi: Prefer $(FOO) to @FOO@ in the documentation.
-
-2003-01-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
-       variables.  Suggested by Ryan T. Sammartino.
-
-2003-01-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (macro_define): Add missing `{$cond}' (typo from
-       2002-09-18).
-       ($gen_copyright): Append year 2003.
-       (version): Increase year.
-
-       * tests/defs.in: Substitute aclocaldir instead of running
-       the installed aclocal.  Otherwise Libtool and Gettext
-       tests get skipped when aclocal doesn't preexist.
-       Reported by Imacat.
-       * tests/listval.test, tests/suffix2.test: Remove pointless -I
-       argument to aclocal.
-
------
-
-Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.04 b/ChangeLog.04
deleted file mode 100644
index 5dfcd9e..0000000
--- a/ChangeLog.04
+++ /dev/null
@@ -1,1623 +0,0 @@
-2004-12-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/man2.test, tests/transform.test: Specify --mandir, in order
-       not to fail when Autoconf changes its $mandir default.
-
-2004-12-30  Alexandre Duret-Lutz  <address@hidden>
-
-       Support for `install-dvi', `install-html', `install-ps', and
-       `install-pdf', as recently introduced into the GNU Coding
-       Standard.
-
-       * automake.in (handle_factored_dependencies): Reject
-       uninstall-dvi-local, uninstall-html-local, uninstall-info-local,
-       uninstall-ps-local, and uninstall-pdf-local.  Allow
-       install-info-local even when no-installinfo is not used.
-       (handle_data): Allow datarootdir, dvidir, htmldir, pdfdir, and psdir.
-       (%standard_prefix): Declare these new standard directory variables.
-       * doc/automake.texi (Texinfo, Third-Party Makefiles): Document
-       install-dvi, install-html, install-pdf, and install-ps.
-       (Extending): Document install-local-dvi, install-local-html,
-       install-local-info, install-local-pdf, and install-local-ps.
-       * lib/Automake/Rule.pm (%dependencies): Add new install rules,
-       and remove uninstall-info.
-       * /cvs/automake/automake/lib/am/texinfos.am (install-dvi,
-       install-dvi-am, install-dvi-recursive, install-html,
-       install-html-am, install-html-recursive, install-pdf,
-       install-pdf-am, install-pdf-recursive, install-ps, install-ps-am,
-       install-ps-recursive, uninstall-dvi-am, uninstall-html-am,
-       uninstall-pdf-am, uninstall-ps-am): New rules.
-       (uninstall-info): Delete.
-       * tests/txinfo21.test: Augment to check for these new rules.
-       * tests/exdir2.test: Do not use `htmldir' as example of
-       undefined directory.
-       * tests/overrid.test: Do not be fooled by install-ps and
-       install-html.
-       * tests/txinfo10.test: Do not grep for uninstall-info-recursive.
-
-2004-12-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (Preprocessed Fortran): Fix the definition of FCLINK.
-
-       * Makefile.am (maintainer-check): Refine check for @_ in scalar
-       context.  Check for correct use of PRE_INSTALL, NORMAL_INSTALL,
-       POST_INSTALL, PRE_UNINSTALL, NORMAL_UNINSTALL, and POST_UNINSTALL.
-       * lib/am/texinfos.am (uninstall-info-am): Hide the invocation of
-       $(PRE_UNINSTALL).
-2004-12-27  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/texinfos.am (uninstall-info-am): Show change of
-       directory while uninstalling DJGPP-style info files.
-
-2004-12-27  Alexandre Duret-Lutz  <address@hidden>
-
-       Declare recursive install targets as dependencies of `.MAKE', so
-       that `make -n install' works with BSD Make too.
-
-       * lib/Automake/Rule.pm (reset) <%dependencies>: Add `.MAKE'.
-       * automake.in (target_cmp): Move all `.XYZ' target last, not
-       only `.PHONY'.
-       (handle_factored_dependencies): Add target with hooks to `.MAKE'.
-       Do not let a user definition of .MAKE override ours.
-       * lib/am/install.am (install-am, install-strip): Mark as `.MAKE'.
-       * lib/am/multilib.am (all-multi, install-multi, mostlyclean-multi,
-       clean-multi, distclean-multi, maintainer-clean-multi): Likewise.
-       * lib/am/subdirs.am (mostlyclean-recursive, clean-recursive,
-       distclean-recursive, maintainer-clean-recursive): Likewise.
-
-2004-12-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config-ml.in, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: New upstream versions.
-
-       * doc/automake.texi (gettext): Move the paragraph about
-       dist_list_LISP...
-       (Emacs Lisp): ... here.
-       Report from Bruno Haible.
-
-       * doc/automake.texi: Bump GFDL version to 1.2, since that is
-       what we distribute.
-
-       * doc/automake.texi: Fix more misuses of @ref, @xref and @pxref,
-       including some of the "corrections" below.  Thanks to Karl Berry.
-
-       * doc/automake.texi: Correct several misuses of @xref and @pxref.
-
-2004-12-17  Jim Meyering  <address@hidden>
-
-       * install-sh: Use `(exit N); exit N', not `(exit N); exit'.
-       Otherwise, install-sh could exit with improper exit status when
-       exiting via a trapped interrupt.  Thanks to a report from Bob Proulx.
-
-2004-12-14  Akim Demaille  <address@hidden>
-
-       * doc/automake.texi (Options): Englishoes.
-       (Options): And another.
-
-2004-12-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * ChangeLog.03: New file, extracted from ChangeLog.
-       * Makefile.am (EXTRA_DIST): Add it.
-
-2004-12-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (check_user_variables): New function, extracted
-       from ...
-       (handle_languages): ... here.
-       (handle_languages, define_compiler_variable, define_link_variable):
-       Honore LIBTOOLFLAGS.
-       (handle_single_transform): Check _LIBTOOLFLAGS in
-       addition to other per-target flags for Libtool objects.
-       (handle_libtool): Warn if LIBTOOLFLAGS is defined.
-       * doc/automake.texi (Libtool Flags, Program and Library Variables,
-       Flag Variables Ordering): Document LIBTOOLFLAGS.
-       * tests/libtool7.test: Check basic support for LIBTOOLFLAGS.
-       * tests/libtool8.test: Make sure Automake warns about LIBTOOLFLAGS
-       definitions.
-       * tests/subobj9.test: Adjust.
-
-2004-12-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Per-Object Flags): New node.
-
-2004-12-09  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix PR automake/441:
-       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Do
-       not install *.class if "$(%DIR%_JAVA)" is empty.
-       * tests/java3.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       Report from Johannes Nicolai.
-
-       * doc/automake.texi (Java): Mention dist_ and add an example.
-       * tests/java.test: Do actually compile java files and run distcheck.
-
-2004-12-08  Peter O'Gorman  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/FileUtils.pm (dir_has_case_matching_file,
-       reset_dir_cache): New functions.
-       * automake.in (handle_dist, require_file_internal): Use them, so
-       that CHANGELOG is not confused with ChangeLog on case-insensitive
-       case-preserving file systems.
-       * tests/hfs.test: New file.
-       * tests/Makefile.am (TESTS): Add hfs.test.
-
-2004-12-08  Paul Eggert  <address@hidden>
-
-       * lib/mdate-sh: Don't use "set - x`$ls_command /`", as zsh mishandles
-       the spaces inside $ls_command.  Problem reported by Loulou Pouchet in
-       <http://lists.gnu.org/archive/html/autoconf/2004-12/msg00074.html>.
-       Don't use "set - x"; plain "set x" is enough, and simplifies debugging.
-
-2004-12-05  Toshio Kuratomi  <address@hidden>
-
-       * lib/py-compile: Add --destdir switch to py-compile that takes a
-       path argument that is not compiled into the file when byte compiling.
-       * lib/am/python.am: Use the new py-compile arguments to not include
-       DESTDIR in the byte compiled files.
-       * tests/python12.test: Test that DESTDIR won't be byte compiled into
-       python files.
-
-2004-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Clean): Typo.
-
-       * doc/automake.texi: Use @acindex for Autoconf macros, and @vindex
-       for variables (@cvindex was previously used for both).  Separate
-       these two indices in the output.  Use @code, @file, and @command
-       in @cindex lines wherever appropriate so they render nicely.
-
-2004-12-05  Stepan Kasal  <address@hidden>
-
-       * doc/automake.texi (renamed objects, CVS): Typos.
-
-2004-12-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Flag Variables Ordering): New section.
-       (User Variables, Program and Library Variables): @xref it.
-
-2004-11-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Conditional Subdirectories): More comments
-       about non-distributed subdirectories.
-
-       * Makefile.am (maintainer-clean): Check for unescaped @ in manual.
-
-2004-11-24  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Built sources example): Fix typo.
-
-2004-11-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (parse_arguments): Diagnose abbreviation ambiguous with
-       --help or --version.
-       * automake.in (parse_arguments): Likewise.
-       * tests/aclocal.test, tests/automake.test: Check this.
-       Report from Eric Blake.
-
-2004-11-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (parse_arguments): Diagnose empty arguments, options
-       with missing argument, and support `--'.
-       * aclocal.in (parse_arguments): Diagnose options with missing
-       argument.
-       * tests/aclocal.test: More checks.
-       * tests/automake.test: New file.
-       * tests/postprog.test: Use `--' for fun.
-       * tests/Makefile.am (TESTS): Add automake.test.
-       Report from Eric Blake.
-
-       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Run programs with
-       /dev/null as input, so we do not hang on programs that read their
-       input without supporting --help and --version.
-       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise for scripts.
-       * tests/gnits2.test: Change scriptnok.sh to cat its input.
-       Report and fix from James Youngman.
-
-2004-11-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (%file_seen): Rename as ...
-       (%file_added): ... this, and move it close to add_file(), the only
-       function that uses it.
-
-       * aclocal.in (version): Remove initial blank line and reproduce
-       the layout of automake --version.  From Art Haas.
-
-       * aclocal.in (%file_type, FT_USER, FT_AUTOMAKE_SYSTEM): New variables.
-       (scan_m4_dirs): New function, extracted from ...
-       (scan_m4_files): ... here.  Call scan_m4_files three times, for each
-       FT_ constant.
-       (scan_file): Take a file type argument to update %file_type.
-       (write_aclocal): Do not m4_include files that are not of type FT_USER.
-       * tests/dirlist.test: Make sure m4_include is not used for --acdir
-       files.
-
-       * tests/defs.in (testaclocaldir): New variable.
-       * tests/aclocal.test: Use it to fix the test.  Report from
-       Patrick Welche.
-
-2004-11-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (AM_PATH_PYTHON): Fix the invocation of
-       AC_PATH_PROGS to correctly define PYTHON as `:' when no interpreter
-       is found (this worked correctly only when a minimal version was
-       passed to AM_PATH_PYTHON).  Report from Stepan Kasal.
-       (_AM_PYTHON_INTERPRETER_LIST): Define using m4_define_default,
-       so we can easily override the list from the test suite.
-       * tests/python11.test: New file.
-       * tests/Makefile.am (TESTS): Add python11.test.
-
-       * doc/automake.texi (Libtool Modules): Make clearer that -module
-       should appear explicitly in _LDFLAGS.
-
-2004-11-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (parse_arguments): Correctly recognize --print-ac-dir.
-       * tests/aclocal.test: Check --print-ac-dir and a unknown option.
-
-       * aclocal.in (parse_arguments): Fix detection of unexisting default
-       $(datadir)/aclocal.  Report from Akim.
-
-2004-11-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in ($acdir): Rename as ...
-       (@system_includes): ... this.
-       (@user_includes, @automake_includes): New variables.
-       ($default_acdir, $default_dirlist): Remove.
-       (parse_arguments): Populate @user_includes, @automake_includes, and
-       @system_includes instead of filling a unique @dirlist array.
-       ("MAIN"): Adjust to scan m4 files in @user_includes,
-       @automake_includes, and @system_includes.
-
-2004-11-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (parse_arguments): Correct comment.  From Akim.
-
-2004-11-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in: Use Automake::ChannelDefs, and adjust all output
-       to be done via `fatal', `msg', `verb', or `prog_error'.
-       (version): New function.
-       (parse_arguments): Rewrite using Getopt::Long, call &version, and
-       honor -W and --warning.
-       ($verbose): Remove.
-       (trace_used_macros): Do not trace the first arguments of macros
-       for which we do not need it.  This caused failures because of
-       unexpected newlines in the output.
-       * doc/automake.texi (aclocal options): Document -W and --warning.
-       * tests/defs.in (ACLOCAL): Always use -Werror, to catch Perl
-       warnings about uninitialized variables.
-
-2004-11-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in: Do not distinguish VERBOSE=x from
-       VERBOSE=anything_but_x, always turn on shell traces.
-
-       * aclocal.in (write_aclocal): Make sure $map_traced_defs{$m} exists
-       before using it.  Suppress a warning observable in test/acloca16.test.
-       Report from Ralf Wildenhues.
-
-2004-11-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/XFile.pm (lock): Make sure $ENV{'MAKEFLAGS'} exists
-       before inspecting it; this fixes "uninitialized value in
-       concatenation" diagnostics when flock fails.
-       Report from Gary V. Vaughan.
-
-       * aclocal.in: Use strict and -w.  Declare local variables with `my',
-       and get rid of `local'.
-       (scan_m4_files, add_macro): Reindent these functions while we are
-       at it.
-
-       * lib/config.guess, lib/texinfo.tex: New upstream versions.
-
-       * doc/automake.texi (LIBOBJS): Spelling and grammar corrections
-       from Ralf Wildenhues.
-
-2004-10-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (LIBOBJS): Augment with an example setup.
-       (LTLIBOBJ): Rename as ...
-       (LTLIBOBJS): ... this.  Link to LIBOBJS, and mention LTALLOCA.
-
-2004-10-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi: Untabify, tabs in the examples are poorly
-       rendered.
-       * Makefile.am (maintainer-check): Grep tabs in the manual.
-
-       * tests/comment8.test: Use $MAKE, not make.
-
-2004-10-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/distcom3.test: Typo.
-
-2004-10-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Libtool Convenience Libraries): Explain how
-       to force the linker selection.
-
-       * lib/install-sh: Fix the dirname emulation to ignore trailing
-       slashes, i.e., the direname of `a/b/' is `a', not `a/b/'.  This
-       caused `install-sh a/b/' to fail.
-       * tests/instsh2.test: Augment.
-       Report from Пухальский Юрий Андреевич.
-
-2004-10-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (get_object_extension): The extension to use is know
-       by the caller, and cannot be selected by looking only at the
-       target name.  Simplify this function to simply conditionally
-       prepend $U to the given extension.
-       (handle_programs, handle_libraries, handle_ltlibraries): Hard-code
-       the extension to use.  This way Automake won't mistake a program
-       named `foo.la' as a libtool library.
-       * tests/primary3.test: New file.
-       * tests/Makefile.am (TESTS): Add primary3.test.
-
-2004-10-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Install): Link to node Extending for examples.
-       (Extending): More comments about install-data-hook vs
-       install-exec-hook, and link to Install.
-
-       * configure.ac: Export @address@hidden
-       * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
-       so the test suite runs `autoconf' and not `missing --run autoconf'.
-       * tests/missing.test, tests/missing2.test: Arrange for missing
-       to be used in front of autoconf even if the user has exported
-       AUTOCONF.  This fixes two spurious failures reported by
-       Mark D. Baushke.
-
-       * lib/compile: Handle output.obj in addition to output.o.
-       * tests/compile.test: Check for this.
-
-2004-10-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Sources): Typo, reported by Karl Berry.
-
-2004-10-10  Kelley Cook  <address@hidden>  (tiny change)
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in ($ac_defun_rx): Match AC_DEFUN_ONCE.
-       (trace_used_macros): Trace AC_DEFUN_ONCE.
-       * tests/aclocal5.test: Use AC_DEFUN_ONCE.
-
-2004-10-10  Stepan Kasal  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Extending): Typo.
-
-2004-10-10  Martin Waitz  <address@hidden>  (tiny change)
-
-       * m4/as.m4 (AM_PROG_AS): Check dependency tracking mode for CCAS.
-       * automake.in (cppasm): Use the dependency tracking more for CCAS.
-       * doc/automake.texi (Assembly Support): Note that *.S are
-       preprocessed with CPPFLAGS.
-
-2004-10-10  Ralf Corsepius <address@hidden>
-
-       * automake.in (Languages): Split .s (asm) and .S (cppasm) into
-       separate languages.  Make cppasm (Preprocessed Assembler) aware
-       of CPPFLAGS, AM_CPPFLAGS.
-       (handle_languages): Fix typo.
-       (lang_cppasm_rewrite): New function.
-
-2004-09-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/subobj9.test: Adjust regexes after previous patch.
-
-2004-09-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages, define_compiler_variable): Output
-       Libtool's --tag= option before --mode=compile, because depcomp use
-       --mode=compile as end marker for libtool arguments.
-       (define_linker_variable): Likewise before --mode=link, for
-       uniformity.
-       * tests/pr307.test: Make sure dependency files are updated.  That
-       was not the case because depcomp thought `--tag=CC' was the
-       compiler to get dependencies from.
-       Report from Пухальский Юрий Андреевич.
-
-2004-09-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac: Require Perl 5.6.
-       * lib/Automake/Config.in: Require Perl 5.6 (not done in
-       lib/Automake/General.pm because it is shared with Autoconf),
-       and use `our' instead of `use vars'.
-       * aclocal.in (rel2abs): Remove.
-       (scan_configure_dep): Use File::Spec->rel2abs instead.
-
-       * tests/compile.test, tests/instsh2.test, tests/instspc.test: Use
-       two consecutive spaces in filename instead of one, to catch mistake
-       like `echo $val | ...`.
-       * tests/README: Suggest this.
-       Suggested by Ralf Wildenhues.
-
-2004-09-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Clean): Document -local targets.
-
-2004-09-25  Ralf Wildenhues <address@hidden>
-
-       * doc/automake.texi: Typos.
-
-2004-09-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Timeline): Typos and other English mistakes
-       reported by Jim and Gary.
-
-       * lib/Automake/VarDef.pm (append): Strip comments from augmented
-       variables.
-       * tests/comment8.test: New file.
-       * tests/Makefile.am (TESTS): Add comment8.test.
-       Report from Stepan Kasal.
-
-2004-09-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/compile.test: Fix rm usage.
-
-       * INSTALL, lib/INSTALL, lib/config.sub, lib/config.guess,
-       lib/texinfo.tex: New upstream versions.
-
-       * doc/automake.texi (Timeline): New node.  Thanks to Karl and Tom
-       for their comments on a preliminary version of this, Akim for
-       digging out some old mails, and Jason Molenda for sending the note
-       about Automake in Alias to Tom.
-       (Releases): Rename `ac' to `acl', suggested by Akim.
-
-2004-09-19  Akim Demaille  <address@hidden>
-
-       * AUTHORS, automake.in, aclocal.in: Add Alexandre Duret-Lutz as
-       author.
-
-2004-09-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Releases): New node.
-
-       * doc/automake.texi (Dependencies): Link to Dependency Tracking
-       Evolution.
-       (Dependency Tracking Evolution): Link to GNU make, Sources (for
-       BUILT_SOURCES), and update the paragraph about the "plan" to
-       inline dependency tracking with gcc3.
-
-       * doc/automake.texi (History): New node.
-       (Dependency Tracking Evolution): New node, filled with a Texinfo
-       version of Tom Tromey's ``Dependency Tracking in Automake''
-       document, initially published on the Automake homepage on
-       2001-06-29.
-
-2004-09-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/minuso.m4 (AM_PROG_CC_C_O): Make sure AC_PROG_CC is never
-       called after this macro.
-       * tests/distname.test, tests/subdir5.test, tests/subdir8.test,
-       tests/subobj.test, tests/subobj4.test, tests/subobj5.test,
-       tests/subobj6.test: Adjust.
-       Report from Ralf Wildenhues.
-
-       * lib/Automake/Channels.pm (_print_message): Handle uniq_part with
-       arbitrary string.
-       * automake.in (lang_c_rewrite): Set uniq_part so that the
-       AM_PROG_CC_C_O diagnostic is output only once for subdir objects
-       and only once for objects with per-target flags.
-
-       * automake.in (lang_c_rewrite): Print files and locations
-       for AM_PROG_CC_C_O errors.
-       (handle_single_transform): Pass $var to &$subr so it can
-       print locations.
-
-       * lib/compile, lib/elisp-comp, lib/install-sh, lib/ylwrap: Use $ret
-       instead of $status which is read-only in Zsh.
-
-2004-09-10  Ralf Wildenhues  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/compile: Preserve spaces in arguments (for example
-       -DPACKAGE_STRING="foo 0.1").
-       * tests/compile.test: New file.
-       * tests/Makefile.am (TESTS): Add compile.test.
-
-2004-09-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_clean): Sort rm commands output for
-       mostlyclean-generic, clean-generic, distclean-generic, and
-       maintainer-clean-generic.
-       Report from Bob Friesenhahn.
-
-       * automake.in (lang_c_rewrite): Do not require AM_PROG_CC_C_O for
-       libtool objects.
-       (handle_single_transform): Pass nonansi_obj to &$subr so
-       lang_c_rewrite can distinguish libtool objects.
-       * tests/libtool7.test: Use subdir-objects without using AM_PROG_CC_C_O.
-       Report from Gary V. Vaughan and Patrick Welche.
-
-2004-09-07  Andreas Schwab  <address@hidden>
-
-       * automake.in ($PATH_PATTERN): Add `+'.
-
-2004-09-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/missing3.test: New file (check for Paolo's change below).
-       * tests/Makefile.am (TESTS): Add missing3.test.
-
-2004-09-07  Paolo Bonzini  <address@hidden>
-
-       * missing: Handle all command line options together.  Add a
-       separate case statement to detect failed runs, and fail
-       silently there if --help or --version is passed to the program.
-
-2004-08-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess, lib/texinfo.tex: New upstream versions.
-
-       For PR automake/433:
-       * configure.ac (pkgvdatadir): Define using "$PACKAGE", not "automake".
-
-       Fix PR automake/432:
-       * lib/am/yacc.am [!%?MORE-THAN-ONE%]: Replace `#line's in y.tab.h too.
-       * tests/yacc7.test: Check this.
-
-2004-08-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/DisjConditions.pm (new): Precompute 'string' and 'conds'
-       in place instead of as a side-effect of calling ->string and ->conds.
-       This saves method-lookup time, simplify ->string and ->conds, and
-       allows to create the object only when necessary.
-       (string, conds): Simplify, now that the result is precomputed.
-
-       * automake.in (%am_file_cache): New hash.
-       (make_paragraphs): Cache .am files with comments stripped to save
-       some useless input and substitutions.
-
-       * lib/Automake/Variable.pm (%_primary_dict): New hash.
-       (_new, variable_delete): Update %_primary_dict.
-       (variables): Accept an optional $suffix argument.
-       * automake.in (check_typos, am_primary_prefixes): Use that
-       optional argument to restrict the loops over the variables we are
-       interested in.
-
-2004-08-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Item.pm (def): Rewrite more concisely, it's faster
-       this way.
-
-2004-08-05  Alexandre Duret-Lutz  <address@hidden>
-
-       Speed up make_paragraphs.
-       * automake.in (handle_languages): Always define SUBDIROBJ,
-       DERIVED-EXT, and DIST_SOURCE, because the new transform() will
-       abort on unknown tokens.
-       (transform): Rewrite with different semantics.
-       (make_paragraphs): Make a single pass over the paragraph to
-       transform all template tokens instead of doing as much passes as
-       possible token.
-
-       * automake.in ($libtool_new_api): New variable.
-       (handle_libtool): Do not libtool's aux files if $libtool_new_api.
-       (scan_autoconf_traces) <LT_SUPPORTED_TAG>: Set $libtool_new_api.
-       (scan_autoconf_traces) <AC_REQUIRE_AUX_FILE>: Remember only the
-       first location for required files.
-
-2004-08-04  Alexandre Duret-Lutz  <address@hidden>
-
-       Support AC_REQUIRE_AUX_FILE, and fix requirement of AM_PROG_CC_C_O.
-       * automake.in (%required_aux_file): New hash.
-       (handle_single_transform, lang_c_rewrite): Do not explicitly
-       require 'compile', this is now an internal detail of
-       AM_PROG_CC_C_O.
-       (scan_autoconf_traces): Trace AC_REQUIRE_AUX_FILE and fill
-       %required_aux_file.
-       (scan_autoconf_files): Require all %required_aux_file instead
-       of explicitly requiring install-sh and missing.
-       (generate_makefile): Do not require config.sub and config.guess.
-       (handle_single_transform): Pass $have_per_exec_flags to
-       &lang_c_rewrite.
-       * configure.ac, m4/init.m4: Require Autoconf 2.59a.
-       * doc/automake.texi (Optional): Document AC_REQUIRE_AUX_FILE.
-       (Program and Library Variables, Options, Public macros):
-       AM_PROG_CC_C_O is required when per-target flags or subdir-objects
-       are used with C sources.
-       * m4/minuso.m4: Require `compile' using AC_REQUIRE_AUX_FILE.
-       * m4/missing.m4: Require `missing' similarly.
-       * tests/acsubst2.test, tests/distcom2.test, tests/distcom6.test,
-       tests/specflg.test, tests/specflg2.test, tests/specflg3.test,
-       tests/specflg6.test, tests/specflg7.test, tests/specflg8.test,
-       tests/specflg9.test, tests/subobj7.test, tests/target-cflags.test,
-       tests/yacc6.test: Fix to use AM_PROG_CC_C_O.
-
-2004-08-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (yacc_lex_finish_helper): Fix definition of YLWRAP
-       when ylwrap is installed in a default aux dir found in a parent
-       package.
-       * tests/subpkg.test: Augment to check that YLWRAP is installed
-       properly.
-       * doc/automake.texi (Yacc and Lex): ylwrap is not sought is the
-       current directory.
-       Report from Norman Gray.
-
-2004-08-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Optional): Update documentation for
-       AC_CANONICAL_BUILD, AC_CANONICAL_HOST, and AC_CANONICAL_TARGET.
-
-       * automake.in (AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): Replace by ...
-       (AC_CANONICAL_BUILD, AC_CANONICAL_HOST, AC_CANONICAL_TARGET): ... these.
-       (scan_autoconf_traces): Scan for the latter three macros instead of
-       the former two.
-       (make_paragraphs): Adjust definitions of %BUILD%, %HOST%, and %TARGET%.
-       * tests/hosts.test: New file.
-       * tests/Makefile.am (TESTS): Add hosts.test.
-       Report and test case from Norman Gray.
-
-2004-08-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (scan_file): Update "#Extending%20aclocal" URL, makeinfo
-       4.7 now outputs "#Extending-aclocal".
-
-2004-08-01  Alexandre Duret-Lutz  <address@hidden>
-           Derek R. Price  <address@hidden>
-
-       Disable Lex and Yacc rules whenever possible if AM_MAINTAINER_MODE
-       is used and maintainer-mode disabled.
-       * automake.in (Automake::struct): Define nodist_specific.
-       Set it in languages yacc, yaccxx, lex, and lexxx.
-       (register_language): Default nodist_specific to 0.
-       (handle_single_transform): Honor nodist_specific.
-       * lib/am/yacc.am (am__skipyacc): Define this in maintainer mode.
-       (%EXT%%DERIVED-EXT%, %OBJ%): Use $(am__skipyacc) to disable these
-       rules when needed.
-       * lib/am/lex.am (am__skiplex): Define this in maintainer mode.
-       (%EXT%%DERIVED-EXT%, %OBJ%): Use $(am__skiplex) to disable these
-       rules when needed.
-       * tests/mmodely.test: New file.
-       * tests/pr204.test: Augment to check AM_MAINTAINER_MODE and nodist_
-       parsers.
-       * tests/Makefile.am (TESTS): ADd mmodely.test.
-       * doc/automake.texi (Yacc and Lex): Note dependence on maintainer mode.
-
-2004-07-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.9a.
-
-       * configure.ac, NEWS: Bump version to 1.9.
-
-       * automake.in (generate_makefile): Update misleading comment about
-       libtool scripts.
-
-       * lib/texinfo.tex: New upstream version.
-
-2004-07-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Remove `.' from the mkdir_p
-       definition, it causes `make install' to fails for user with no
-       right to write in the source-tree.
-       * automake.in (handle_configure): Do not use mkdir_p in the
-       definition for $(mkdir_p).
-       Report from Harlan Stenn.
-
-       * lib/am/texi-vers.am (%STAMPVTI%): Typo in comment.
-
-2004-07-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Libtool Modules): Typo in example.
-       Report from Ulrich Eckhardt.
-
-2004-07-21  Andreas Schwab  <address@hidden>  (tiny change)
-
-       * automake.in (check_directory): Quote $dir in regexp.
-
-2004-07-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.8e.
-
-       * configure.ac, NEWS: Bump version to 1.8d.
-
-       * lib/config-ml.in, lib/config.sub, lib/config.guess, lib/texinfo.tex:
-       New upstream versions.
-
-       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,
-       ?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}.
-
-       * tests/installdir.test: installdirs-local should appear three times,
-       since the change from 2004-07-11 will make it PHONY.
-
-       * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now
-       that it is always defined.  This is less confusing for users
-       reading the generated Makefiles.
-       * automake.in (handle_dist): Do not substitute DIST_SUBDIR_NAME.
-
-       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,
-       ?!GENERIC?%DEST_PREFIX%.html): Output .htp, and then rename to .html
-       on success.  In case the target is a directory, this ensures its
-       time stamp is updated and the no files are left over inside.
-       * tests/txinfo21.test: Augment to test missing timestamp update
-       reported by Akim Demaille.
-
-       * doc/automake.texi (Top level): Rename as ...
-       (Directories): ... this, and split into ...
-       (Subdirectories, Conditional Subdirectories): ... these.
-       (Subdirectories): Illustrate the use of `.'.
-       (Conditional Subdirectories): Describe SUBDIRS and DIST_SUBDIRS
-       before the example.  Append a discussion about non-configured
-       conditional directories.
-       (Alternative): Move as a child of Directories.
-       (Subpackages): New section.
-       (Dist): Adjust links to Subdirectories, a Subpackages.
-       (Third-Party Makefiles): Link to Conditional Subdirectories.
-
-2004-07-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (target_hook): Accept %transform as last argument.
-       (handle_single_transform): Pass %transform to target_hook.
-       (handle_source_transform): Define DIST_SOURCE to tell whether
-       a the source of a file is distributed or not.
-       (lang_yacc_target_hook): Check DIST_SOURCE, and do not distribute
-       the generated header if the .y source is not distributed.
-       * tests/pr204.test: Use AM_YFLAGS = -d and make sure generated
-       headers are not distributed.
-
-2004-07-12  Simon Josefsson  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Options): Improve ustar file name length
-       discussion.  Reference tar manual.
-
-2004-07-12  Ray Simard  <address@hidden>  (tiny change)
-
-       * lib/Automake/Variable.pm (define): Fix precondition check.
-
-2004-07-11  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/428:
-       Support for conditionally defined -hook and -local rules.
-       * automake.in (user_phony_rule): New function.
-       (handle_dist, handle_install, handle_all, do_check_merge_target,
-       handle_factored_dependencies): Use user_phony_rule before
-       adding a user -hook or -local rule as a dependency to ensure
-       it is always defined an phony.
-       * tests/cond37.test, tests/condhook.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-       Report from Simon Josefsson and Nik A. Melchior.
-
-2004-07-05  Paul Eggert  <address@hidden>
-
-       * doc/automake.texi (Install): Warn that you should create
-       /tmp/staging before installing into it, to avoid security problems.
-       * lib/install-sh: Remove support for -b= and -t= options; this
-       has been moribund for a decade.
-       Add support for -t and -T options (new in coreutils install).
-       -c option now does nothing (the default is to copy), for
-       compatibility with BSD and coreutils 'install'.
-       Fix usage message; it referred to nonexistent variables.
-       Don't assume 'lasterr' is unset in environment.
-       * tests/instsh2.test: Don't assume that install-sh without -c
-       moves (it now copies).  Add tests for new -t and -T options.
-
-2004-06-16  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug#254372:
-       * doc/automake.texi (Invoking aclocal): Rewrite the paragraph
-       explaining m4_include is used for relative files.
-
-2004-06-10  Alexandre Duret-Lutz  <address@hidden>
-
-       For Debian Bug #251820:
-       * aclocal.in (scan_file): Keep track of the location where each
-       file is included, and display it when reporting a missing file.
-       Pass this location to scan_file as a second argument.
-       (scan_m4_files): Adjust calls to scan_file.
-       * tests/acloca14.test: Add a test for this diagnostic.
-
-2004-06-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/tar.m4 (_AM_PROG_TAR): Split the definition of $_am_tools
-       so it works with Solaris and Tru64 /bin/sh.
-       Report from Nicolas Joly.
-
-2004-06-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/tar.m4 (_AM_PROG_TAR): Introduce $_am_tools to work around a
-       bug in NetBSD /bin/sh.
-       Report from Nicolas Joly.
-
-2004-06-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in (required=icc): Use `-V -help' instead of
-       `-V -dryrun'.  icc 8.0 fails on the latter.
-       * tests/depcomp5.test: Require depmode=icc for icc 7.x, and
-       depmod=gcc otherwise.
-       Report from Ralf Wildenhues.
-
-       * lib/am/clean.am (distclean-generic): Do no
-       `rm -f $(CONFIG_CLEAN_FILES)' if `$(CONFIG_CLEAN_FILES)' is empty.
-       Report from Nicolas Joly.
-
-2004-05-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS: Make clearer that we do not output partial Makefile.ins on
-       error.
-       Suggested by Akim Demaille.
-
-       * lib/depcomp (tru64) [libtool]: Use $dir$base.o.d instead
-       of $dir.libs/$base.o.d.  Libtool 1.5 causes both to be output,
-       and we will clean the second automatically during distclean.
-       Using the latter and leaving the former as we did before cause
-       "files left in build directory" failures during distcheck.
-       Suggested by Nicolas Joly.
-
-       * doc/automake.texi (Built sources example): Explain what
-       nodist_foo_SOURCES is (not) useful to, and use it in all the
-       examples.
-       (Tags): Mention nodist_noinst_HEADERS and nodist_prog_SOURCES.
-       Suggested by Akim Demaille.
-
-2004-05-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.8c.
-
-       * configure.ac, NEWS: Bump version to 1.8b.
-
-       * m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
-       by POSIX; and use option -d in am_untar.
-
-       * tests/defs.in (PATH): Export it.
-
-       * lib/am/multilib.am: Add $(MAKE) comments to multido and
-       multiclean lines, to enable parallel make.  Based on a patch
-       by Alexandre Oliva applied to newlib on 2003-10-15.
-
-2004-05-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): Trace for LT_SUPPORTED_TAG
-       instead of AC_LIBTOOL_TAGS, since that how CVS Libtool has been
-       changed.
-       * tests/libtool3.test: Do not grep for --tag=CC, since CVS
-       Libtool (unlike Libtool 1.5) does not has any CC tag.
-
-       * tests/tar2.test: Skip the test if no pax archiver were found.
-
-       * NEWS: Sync with branch-1-8, and reorganize current entry.
-
-       * automake.in (handle_libraries): Make the diagnostic about
-       non standard libraries a warning in foreign packages.  This
-       is already the case in handle_ltlibraries.
-       (handle_libraries, handle_ltlibraries): Suggest a standard
-       library name in the diagnostic, to help newcomers.
-       * tests/stdlib.test, tests/stdlib2.test: Check for these
-       suggestions.
-
-       Check directory names for unportable names.  Shaking the code
-       to check this also led to the removal of the no-"/"-in-SUBDIRS
-       restriction, and a fix to _do_recursive_traversal.
-
-       * automake.in (check_directory): New function extracted from
-       handle_subdirs, and augmented to check for reserved W32/DOS name.
-       (check_directories_in_var): New function.
-       (handle_subdirs): Call check_directories_in_var.  Doing so also
-       suppress the restriction that SUBDIRS should not contain slashes.
-       (scan_autoconf_traces) <AC_CONFIG_AUX_DIR>: Call check_directory
-       to ensure the argument exists and is safe.
-       * doc/automake.texi (Top level): Do not say that src/subdir
-       cannot be put in SUBDIRS.
-       (Dist): Mention that distdir and top_distdir can be absolute.
-       * lib/Automake/Variable.pm (_do_recursive_traversal) Support
-       undefined $fun_collect, and fix two bugs introduced with
-       skip_ac_subst on 2004-03-07.
-       * lib/am/distdir.am (distdir): Use absolute distdir and
-       top_distdir when recursing, because we can no longer prepend only
-       `..' in case of SUBDIRS with `/'.
-       * tests/auxdir4.test, tests/subdir9.test: New files.
-       * tests/Makefile.am (TESTS): Add auxdir4.test.
-       * tests/cond2.test, tests/subdir7.test: Augment to check location
-       in diagnostics.
-
-2004-05-21  Eric Blake  <address@hidden>  (tiny changes)
-
-       * tests/txinfo22.test (AC_CONFIG_AUX_DIR): Use aux1, not aux, for
-       cygwin compatibility.
-       * tests/yacc6.test (AC_CONFIG_AUX_DIR): Likewise.
-
-       * tests/conflnk3.test: Isolate checking for working `test -e' into
-       a subshell, to skip this test on broken /bin/sh of solaris.
-
-2004-05-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/cond.m4 (AM_CONDITIONAL): Double-quote diagnostic.
-       * tests/condd.test: Define a macro with the same name as a
-       conditional.
-       * tests/pr220.test: Modernize, and make sure the diagnostics
-       contains the macro name.
-       Report from Volker Boerchers.
-
-2004-05-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/texinfo.tex: New upstream version.
-
-2004-05-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_dist): Always define DIST_SUBDIRS, even when
-       the no-dist or cygnus options are used.
-       * tests/clean2.test: New file.
-       * tests/Makefile.am (TESTS): Add clean2.test.
-       Report from Daniel Jacobowitz.
-
-       * aclocal.in (add_macro): Do not error out on undefined required
-       macros.  We are not sure they are really used, and Autoconf
-       already diagnoses them.
-       (scan_configure_dep): Diagnose missing AM_ macros as warnings rather
-       than errors.
-       * tests/aclocal3.test, tests/ammissing.test: Adjust to expect a
-       warning instead of an error.
-       * tests/aclocal8.test: AC_REQUIRE an undefined macro in an unused
-       macro, and ensure aclocal works anyway.
-       * tests/acloca17.test: New file.
-       * tests/error.test: Delete, superseded by tests/acloca17.test.
-       * tests/Makefile.am (TESTS): Add acloca17.test and remove error.test.
-       Report from Jim Meyering.
-
-       * lib/am/texibuild.am (?!GENERIC_INFO?%DEST_INFO_PREFIX%%DEST_SUFFIX%):
-       Fold a few lines to reduce the output by 5 lines.
-       Suggested by Karl Berry.
-
-       * automake.in (parse_arguments, MAIN): Give more precise
-       diagnostics when no input file is found.
-       * tests/output5.test: Adjust.
-       Suggested by Jens Petersen.
-
-2004-05-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/libs.am (AR, ARFLAGS): Move these definition ...
-       * automake.in (handle_libraries): ... here, so that they are
-       output even for EXTRA_LIBRARIES.
-       * tests/ar2.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       Report from Kevin Ryde.
-
-2004-05-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (generate_makefile): Do not output Makefile.in on
-       errors.
-       * tests/werror2.test: New file.
-       * tests/Makefile.am (TESTS): Add werror2.test.
-       * tests/substtarg.test, tests/cond36.test, tests/backsl4.test:
-       Adjust to run automake with -Wno-error when the output is expected
-       in spite of the error.
-       Report from Harlan Stenn.
-
-       * doc/automake.texi (Program and Library Variables): Remove
-       doubled word in footnote.
-
-       * automake.in (handle_source_transform): Also check for a
-       $(srcdir)/old_source rule when computing the default source name.
-       Propagate this $(srcdir) prefix in Automake variables.
-       * tests/ltlibsrc.test (noinst_LTLIBRARIES): Explicitly refer to
-       $(srcdir)/zoo_d_old2_la.c.  This fixes another failure with BSD Make.
-
-2004-05-13  Paul Eggert  <address@hidden>
-
-       * Makefile.am (fetch): Work even with FreeBSD "make", which
-       uses sh -e and thus errors-out if a simple-command fails.
-       * lib/am/check.am (check-TESTS): Likewise.
-       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Likewise.
-       * lib/am/tags.am (TAGS): Likewise.
-
-2004-05-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/lex3.test, tests/yacc6.test: Require GNU Make.
-       Fixing these for BSD Make requires invasive changes (lexers and
-       parsers must be built into $srcdir, and--most annoyingly--all
-       references to parse.h must be changed to $(srcdir)/parse.h).
-       Report from Mark D. Baushke.
-
-2004-05-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make.
-       Report from Mark D. Baushke.
-
-2004-04-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/texinfo.tex: New upstream version.
-
-       * lib/depcomp (tru64): Clarify comments.  Thanks to Nicolas Joly.
-
-       * doc/automake.texi (Headers): Revamp.
-
-2004-04-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (check_typos): Clarify the diagnostic.
-       * tests/warnopts.test: Adjust.
-
-       * lib/Automake/VarDef.pm (append): Turn VAR_ASIS variables into
-       VAR_PRETTY variables to work around make implementation with
-       limited line length, such as OSF1/Tru64 make.
-       * tests/longline.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * tests/pluseq3.test, tests/pluseq8.test: Adjust.
-       Report from Simon Josefsson.
-
-       * lib/am/tags.am (TAGS): Pass `.' to Exuberant Ctags if
-       --etags-include is used but no other files are supplied, so it
-       creates the TAGS file anyway.
-       Report from Akim Demaille.
-
-       * lib/depcomp (tru64) [libtool]: Nicolas Joly reported on
-       2002-06-12 that dependencies were output in $dir.libs/$base.lo.d.
-       Teun Burgers reported on 2004-03-30 they were in
-       $dir.libs/$base.o.d.  Try both.
-
-2004-04-23  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/414:
-       Introduce option filename-length-max=99.
-       * doc/automake.texi (Options): Document it.
-       * configure.ac (AM_INIT_AUTOMAKE): Use it.
-       * lib/Automake/Options.pm (_process_option_list): Recognize it.
-       * automake.in (handle_dist): Set FILENAME_FILTER.
-       * lib/am/distdir.am (distdir) [FILENAME_FILTER]: Diagnose long
-       filenames.
-       * tests/fn99.test: New file.
-       * tests/Makefile.am (TESTS): Add fn99.test.
-
-2004-04-20  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/414:
-       Introduce options tar-v7, tar-ustar, and tar-pax to select
-       tar format.
-       * doc/automake.texi (Options): Document them.
-       * lib/Automake/Options.pm (_process_option_list): Process
-       these new options.
-       * lib/am/distdir.am (dist-gzip, dist-bzip2, dist-tarZ, dist,
-       distcheck): Adjust to use am__tar and am__untar.
-       * m4/tar.m4: New file.
-       * m4/Makefile.am (dist_m4data_DATA): Add tar.m4.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Support the new options
-       and call _AM_PROG_TAR.
-       * tests/tar.test, tests/tar2.test, tests/tar3.test: New files.
-       * tests/Makefile.am (TESTS): Add them.
-
-2004-04-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/distdir.am (distcheck): Typo in shar decompression.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-2004-04-17  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix PR automake/49:
-       * automake.in (scan_autoconf_traces) <AC_CONFIG_AUX_DIR>: Diagnose
-       calls to AC_CONFIG_AUX_DIR followings calls to AM_INIT_AUTOMAKE.
-       * tests/auxdir.test, tests/auxdir2.test, tests/lex5.test,
-       tests/mdate3.test, tests/multlib.test, tests/reqd2.test,
-       tests/symlink.test, tests/txinfo8.test, tests/txinfo22.test,
-       tests/yacc6.test, tests/yacc8.test: Fix to call AC_CONFIG_AUX_DIR
-       before AM_INIT_AUTOMAKE.
-       * tests/auxdir3.test: New file (exercise this diagnostic).
-       * tests/Makefile.am (TESTS): Add auxdir3.test.
-
-2004-04-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (%map_traced_defs): New variable.
-       (scan_m4_files): Normalize filenames.
-       (trace_used_macros): Trace for AC_DEFUN and AU_DEFUN, also
-       ask for the filename and the first argument.  Populate
-       %map_traced_defs.
-       (write_aclocal): Use $map_traced_defs to filter out unused
-       definitions.
-       * tests/acloca16.test: New file.
-       * tests/Makefile.am (TESTS): Add acloca16.test.
-
-2004-04-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in ($automake_needs_to_reprocess_all_files): Remove.
-       ($automake_will_process_aux_dir): New variable.
-       (scan_autoconf_traces): Reorder @input_files so that the Makefile
-       that distributes aux files is processed last.  This way we do not
-       have to process all files twice using
-       $automake_will_process_aux_dir.
-       (require_file_internal): Suggest a full run of automake when
-       appropriate.
-       (MAIN): Remove the loop on $automake_needs_to_reprocess_all_files.
-       * tests/distcom7.test: New file.
-       * tests/reqd2.test: Do not check for the "running more than two"
-       message.
-       * tests/Makefile.am (TESTS): Add distcom7.test.
-
-       * automake.in (@config_aux_path, $config_aux_dir): Rename as ...
-       ($config_aux_dir, $am_config_aux_dir): ... these.
-       ($config_aux_dir_set_in_configure_in): Rename as ...
-       ($config_aux_dir_set_in_configure_ac): ... this.
-       (%require_file_found): Rename as ...
-       (%required_file_not_found): ... this.
-       (handle_languages, handle_texinfo_helper, handle_dist,
-       handle_configure, handle_emacs_lisp, handle_python,
-       scan_autoconf_traces, yacc_lex_finish_helper): Adjust to new names.
-       (scan_autoconf_traces): Call locate_aux_dir.
-       (locate_aux_dir): New function.
-       (@require_file_paths): Remove, not used anymore.
-       (require_file_internal): Look files in only one directory (instead
-       of @require_file_internal) passed in argument.
-       (require_file, require_conf_file): Pass the destination directory
-       to require_file_internal.
-
-       Fix for PR automake/416:
-       * m4/depend.m4 (_AM_DEPENDENCIES): Catch `not supported' ICC 8.0
-       remarks.
-       From Peter Seiderer.
-
-2004-04-10  Andreas Buening  <address@hidden>
-
-       * aclocal.in, automake.in, configure.ac, Makefile.am,
-       tests/aclocal.in, tests/automake.in, tests/defs.in:
-       Use PATH_SEPARATOR from autoconf instead of ':'.
-
-2004-04-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_lib_objects): Pass the condition of
-       the variable definition to handle_LIBOBJS and handle_ALLOCA,
-       not the aggregated conditions.
-       * tests/Makefile.am (TESTS): Add libobj14.test.
-       * tests/libobj14.test: New file.
-       Report from Bill Davidson.
-
-2004-04-02  Mike Nolta  <address@hidden>
-
-       Better support for Fortran 9x.
-       * automake.in: Add "fc" and "ppfc" languages for Fortran 9x.
-       * doc/automake.texi (Fortran 9x Support): New section.
-       * lib/Automake/Variable.pm (%_ac_macro_for_var): Add AC_PROG_FC.
-       * tests/compile_f90_c_cxx.test: New file.
-       * tests/ext.test: Add AC_PROG_FC.
-       * tests/f90only.test: New file.
-       * tests/link_f90_only.test: New file.
-       * tests/Makefile.am (TESTS): Add new tests.
-
-2004-04-01  Paul Eggert  <address@hidden>
-
-       * lib/install-sh: If "mv -f" works, use it, and fall back to
-       the old "test -f" + "rm -f" + "mv" method only if "mv -f" does
-       not work.  This improves performance in the usual case where
-       "mv -f" works.  It also lets us install the "mv" command
-       without worrying about a small window where "mv" does not
-       exist (this problem was reported by Raul Nunez de Arenas
-       Coronado).
-
-2004-03-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (AM_PATH_PYTHON): Make sure am_display_PYTHON is
-       set when $PYTHON has been set by the user.
-       From Esben Haabendal Soerensen.
-
-2004-03-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Default _SOURCES): Typo.
-       (true): Correct _'s placement in example.
-       Report from Stepan Kasal.
-
-2004-03-19  Alexandre Duret-Lutz  <address@hidden>
-
-       Overriding JAVAROOT is legitimate, do not warn about it.
-       * lib/Automake/Variable.pm (%_silent_variable_override): Add JAVAROOT.
-       * tests/java2.test: Run automake without -Wno-override.
-       Report from Simon Josefsson.
-
-2004-03-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_texinfo_helper): Typos in comment.
-
-2004-03-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess: New upstream version.
-
-       Fix for PR automake/285:
-       * automake.in (handle_ltlibraries): Keep track of installation
-       directories for each condition, then define a $(am_TARGET_rpath)
-       variable to hold the -rpath flags of Libtool libraries conditionally
-       installed in different directories.
-       * lib/Automake/DisjConditions.pm (merge): New function.
-       * tests/libtool6.test: Adjust.
-       * tests/libtool8.test: New file.
-       * tests/Makefile.am (TEST): Add libtool8.test.
-
-       * lib/Automake/Variable.pm (traverse_recursively,
-       _do_recursive_traversal): Honor the skip_ac_subst option.
-       * automake.in (handle_dist): Use skip_ac_subst.
-
-2004-02-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (cvs-release): Upload to ~ftp/pub/automake, not
-       ~ftp/automake.
-       * lib/gnupload (Example): Update example.
-
-       * lib/config-ml.in, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: New upstream versions.
-
-       * m4/depend.m4 (_AM_DEPENDENCIES): Use `touch' rather than `: >'
-       to create numbered dependencies.  This fixes a portability issue
-       when CONFIG_SHELL is forced to /bin/sh on Solaris 8.
-       Reported by Mark Phillips.
-
-       * automake.in (lang_yacc_target_hook): Use Automake::Rule::define
-       so that rules for the same headers are not output twice.
-       * lib/Automake/Variable.pm (value_as_list_recursive): Do not
-       call `return' inside `map'.
-       * tests/cond30.test: Make sure `a.c' and `b.c' both appear
-       in the Makefile.in.
-       * tests/cond35.test, tests/cond36.test: New files.
-       * tests/Makefile.am (TESTS): Add cond35.test and cond36.test.
-       Report from Roman Fietze.
-
-       Fix for PR/413:
-       * lib/am/distdir.am (distcheck): Create $dc_destdir with `umask
-       077 && mkdir' instead of `$(mkdir_p)'.  This prevents possible
-       symlink attacks reported by Stefan Nordhausen.
-
-2004-02-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Multiple Outputs): More text, based on
-       comments from Eric Siegerman, Tim Van Holder, and Oren Ben-Kiki.
-
-2004-02-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/mkdirp.m4: Use `mkdir -p' only with GNU mkdir, because
-       Solaris 8's mkdir is not thread-safe.
-       * lib/mkinstalldirs: Likewise.
-       * lib/install-sh: Abort when mkdir fails to create a directory.
-       Report from Nathanael Nerode.
-
-2004-02-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (rel2abs): New function.
-       (scan_configure_dep): Use rel2abs instead of File::Spec->rel2abs,
-       the later does was introduced in Perl 5.6 so using it breaks with
-       Perl 5.005.
-       Report from Werner John.
-
-2004-02-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Future of aclocal): Make clearer that
-       it's ok to install macros into /usr/share/aclocal/.
-
-2004-02-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/lisp.test: Delete (pointless).
-       * tests/Makefile.am (TESTS): Remove lisp.test.
-
-       * lib/Automake/Variable.pm (transform_variable_recursively):
-       Define rewritten variables in all conditions not *covered* by user
-       definitions, not simply in conditions without a previous
-       definition.
-       * tests/cond34.test: New file.
-       * tests/Makefile.am (TESTS): Add cond34.test.
-       Report from Elena A. Vengerova
-
-       * doc/automake.texi (Multiple Outputs): Typo.
-
-       * doc/automake.texi (Emacs Lisp): Typos.
-
-       Support for conditional _LISP.
-       * automake.in (handle_emacs_lisp): Define $(ELCFILES) from LISP, not
-       from $(am__ELCFILES).
-       * lib/am/lisp.am (elc-stamp): Use $(LISP) instead of $(am__ELFILES).
-       * tests/lisp6.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-       * automake.in (handle_emacs_lisp): Define $(ELCFILES) as
-       $(am__ELCFILES), and always push it on @all.  Do not mention
-       elc-stamp.
-       * lib/am/lisp.am (.el.elc): Rewrite as ...
-       ($(am__ELCFILES)): ... this, and depend on elc-stamp.
-       (elc-stamp): Make sure elc-stamp is older that all .elc files, as
-       explained in the manual entry below.
-
-       * doc/automake.texi (Multiple Outputs): New node.
-
-2004-01-31  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/regex.m4: Do not AC_SUBST(LIBOBJS), and quote most arguments.
-       * tests/regex.test: New file.
-       * tests/Makefile.am (TESTS): Add regex.test.
-
-2004-01-28  Alexandre Duret-Lutz  <address@hidden>
-
-       * Makefile.am (maintainer-check): Check for unquoted $(DESTDIR) uses.
-       * lib/am/data.am, lib/am/distdir.am, lib/am/java.am, lib/am/libs.am,
-       lib/am/lisp.am, lib/am/ltlib.am, lib/am/mans.am, lib/am/progs.am,
-       lib/am/python.am, lib/am/scripts.am, lib/am/texinfos.am: Quote
-       installation paths in install, uninstall, and installcheck rules,
-       as well as in am__installdirs variables.  This is for the sake
-       of paths containing spaces.
-       * lib/am/install.am (installdirs-am, installdirs): Do not try
-       to create "" directories.
-       * test/instspc.test: New file.
-       * test/Makefile.am (TESTS): Add instspc.test.
-       Report from James Amundson.
-
-       * doc/automake.texi (Not Enough, Third-Party Makefiles): New nodes.
-       (Extending): Make it a subsection of Not Enough.
-
-       * lib/gnupload (GPG): Use an absolute path.  Suggestion from Gary
-       V. Vaughan.
-       (passphrase): Unset it this variable before using it, in case it
-       was exported.  Report from Scott James Remnant.
-
-2004-01-25  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/gnupload (usage): Fix example.
-       * Makefile.am (cvs-release): Fix call to gnupload.
-       From Jim Meyering.
-
-2004-01-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/gnupload: New script.
-       * lib/Makefile.am (EXTRA_DIST): Distribute gnupload.
-       * Makefile.am (cvs-release): New target.
-
-2004-01-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/python.am (uninstall-%DIR%PYTHON): Remove extra `;'s.
-       Fix python10.test.
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use `s/xx//p'
-       instead of `/xx/ s///p'; the latter fails when GNU sed is run with
-       POSIXLY_CORRECT.  Also strip superfluous -e.
-       Report from Miloslav Trmac.
-
-2004-01-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/lex5.test: Sleep before calling AUTOMAKE the second time,
-       this fixes a spurious failure reported by Andreas Schwab.  Also
-       make sure ylwrap is not installed unless needed, and exercise
-       --no-force.
-
-2004-01-20  Ralf Wildenhues  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Dist): Document limitations of distcheck-hook
-       and DISTCHECK_CONFIGURE_FLAGS with regard to subdirs and
-       subpackages.
-
-2004-01-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Upgrading): New node.
-
-2004-01-20  Gary V. Vaughan  <address@hidden>
-
-       * automake.in (scan_autoconf_traces): AC_LIBTOOL_TAGS can be
-       correctly called without arguments as evidenced by the libtool
-       demo directories.
-
-2004-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/conflnk3.test: Skip if `test -e' does not work.
-       Report from Lars Hecking.
-
-2004-01-13  Jim Meyering  <address@hidden>
-
-       * lib/install-sh: Change `\n \t' to `\n\t ' in `defaultIFS'
-       assignment.  Remove spurious SPACEs before TABs.
-
-2004-01-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/py-compile: Check input files after option processing.
-       Ensure --basedir has an argument.
-       * lib/am/python.am (install-%DIR%PYTHON): Do not run py-compile
-       if nothing was installed.
-       * tests/python10.test: New file.
-       * tests/Makefile.am (TESTS): Add python10.test.
-       Suggested by Sander Niemeijer.
-
-       * tests/txinfo29.test: Remove autom4te.cache.
-       Report from Greg Schafer.
-
-       * lib/install-sh: Do not use "$@" in a context where it may be empty,
-       for the sake of OSF1/Tru64's shell.
-       Report from He Li.
-
-2004-01-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream
-       versions.
-
-       * m4/as.m4, m4/depend.m4, m4/maintainer.m4, m4/multi.m4: Update
-       copyright years and serial.
-
-       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.4.
-
-2004-01-10  Peter Eisentraut  <address@hidden>  (tiny change)
-
-       * m4/as.m4 (AM_PROG_AS): Format and align help string more
-       consistently.
-       * m4/depend.m4 (AM_DEP_TRACK): Likewise.
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
-       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
-       * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
-
-2004-01-10  Paul Eggert  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Don't use \? in sed regular
-       expressions; it doesn't conform to POSIX.
-
-2004-01-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (shadow_unconditionally): New function...
-       (handle_source_transform): ... extracted from here.
-       (am_install_var): Use shadow_unconditionally to define %DISTVAR%.
-       * lib/am/data.am, lib/am/java.am, lib/am/lisp.am, lib/am/python.am,
-       lib/am/script.am: Add %DISTVAR% to DIST_COMMON.
-       * tests/cond33.test: Make sure all conditional files are distributed.
-       Report from Ralf Corsepius.
-
-2004-01-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Append `.' to $(mkdir_p).
-       * lib/install-sh: Accept `install-sh -d' with 0..n arguments,
-       as well as `install-sh sources... dest' with multiple sources.
-       * tests/cond33.test: New file.
-       * tests/instsh2.test: Add more checks for install-sh.
-       * tests/transform.test: Test for installdirs.
-       * tests/Makefile.am (TESTS): Add cond33.test
-       Report from Ralf Corsepius.
-
-       * automake.in (handle_configure): Skip AC_CONFIG_LINKS items which
-       do not look like DEST:SRC.
-       * tests/conflnk3.test: Check for AC_CONFIG_LINKS($computed).
-
-2004-01-07  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/289:
-       * automake.in (Automake::Struct::libtool_tag): New attribute.  Define
-       it for the language that have a Libtool tag.
-       (%libtool_tags): New variable.
-       (handle_languages, define_compiler_variable)
-       (define_linker_variable): Pass --tag=XXX to libtool if supported.
-       (scan_autoconf_traces): Scan for _LT_AC_TAGCONFIG and AC_LIBTOOL_TAGS.
-       * tests/libtool3.test, tests/subobj9.test: Check that --tag=XXX is
-       output.
-
-2003-01-07  Eric Sunshine  <address@hidden>  (tiny change)
-
-       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): Add
-       config.status.lineno.
-
-2004-01-07  Ralf Wildenhues  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Rebuilding): Typo.
-
-2004-01-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/Makefile.am (dist_am_DATA): Really add inst-vars.am.
-
-2004-01-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * THANKS: Add Bruce Korb.
-
-2004-01-05  Alexandre Duret-Lutz  <address@hidden>
-
-       Mimic Paul Eggert's changes to Autoconf.
-       * Makefile.am (automake, aclocal): Use `chmod a-w', not `chmod -w'.
-       * lib/Automake/Makefile.am (Config.pm): Likewise.
-       * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Likewise.
-
-       * lib/am/inst-vars.am: New file, define am__vpath_adj_setup,
-       am__vpath_adj, and am__strip_dir.
-       * lib/am/Makefile.am (dist_am_DATA): Add inst-vars.am.
-       * lib/am/data.am, lib/am/lisp.am, lib/am/python.am,
-       lib/am/scripts.am: Include inst-vars.am, and use $(am__vpath_adj),
-       $(am__vpath_adj_setup), and $(am__strip_dir) in install and
-       uninstall rules.  This fixes installation of nobase_ files in
-       VPATH setups with Sun and OSF1/Tru64 Make.
-       * lib/am/libs.am, lib/am/ltlib.am: Include inst-vars.am, and use
-       $(am__strip_dir) to simplify install and uninstall rules.
-       * tests/nobase.test: Augment to check installation from VPATH builds.
-
-       * automake.in (%transformed_files): New variable.
-       (initialize_per_input): Reset it.
-       (make_paragraphs): Fill %transformed_files, and define %FIRST%
-       each time a file is transformed for the first time.
-       (handle_configure): Do not define %FIRST_CONFIG_HIN%.
-       (am_install_var): Do not define %FIRST%.
-       * lib/am/remake-hdr.am: Use %?FIRST% instead of %?FIRST_CONFIG_HIN%.
-
-2004-01-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/texinfo.tex: New upstream version.
-
-       * m4/mkdirp.m4: Do not use `-m 0755'.  This overrides special bits
-       and break setups where 775 directories are expected.  Just obey
-       umask as we did in the past.
-       Report from Harlan Stenn.
-
-2004-01-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Do not compare $outfile to ''
-       as $outfile might not be defined at all.
-
-       * lib/Automake/Variable.pm (define): Rework the way we check
-       Automake variable definition.  Ensure consistent :=/+=/=
-       definitions only for variables that have been and are defined by
-       Automake, and make it an internal error.  Ignore Automake
-       attempts to touch a user variable, even with += assignments.
-       * tests/txinfo29.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo29.test.
-       Reported by Bruce Korb.
-
-2004-01-02  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Don't generate dist
-       variables when no-dist is set.
-       (generate_makefile): Likewise.
-       * tests/nodist3.test: Ensure that DIST_SOURCES is not created,
-       and that dist target does not exist.
-        Reported by Tom Fitzsimmons.
-
-2004-01-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/libtool5.test, tests/ltcond.test, tests/ltcond2.test,
-       * tests/ltconv.test: Run automake with --add-missing, because
-       the CVS version of libtoolize no longer install config.sub and
-       config.guess by default.
-
-       Fix for PR automake/319:
-       * aclocal.in (scan_m4_files): Scan configure.ac.
-       (trace_used_macros, write_aclocal): Remove configure.ac from the
-       list of files to include.
-       * tests/Makefile.am (TESTS): Add acloca15.test.
-       * tests/acloca15.test: New file.
-
-       * aclocal.in (%file_includes): New variable.
-       (scan_configure_dep): Compile $m4_include_rx and $ac_require_rx once.
-       (scan_file): Scan for included files, and process these files
-       recursively.  Fill %file_includes and %file_contents.  Return the
-       list of included files, not the contents.
-       (scan_m4_files): Adjust calls to scan_files.
-       (strip_redundant_includes): New function.
-       (trace_used_macros): Call it.
-       (write_aclocal): Likewise.  Also check the mtime of included files.
-       * tests/Makefile.am (TESTS): Add acloca14.test.
-       * tests/acloca14.test: New file.
-       Report from Phil Edwards.
-
-2004-01-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_languages): Do not define DEP_FILES.
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Extract included
-       files with $(DEPDIR) in their name instead of DEP_FILES.
-       * tests/depend.test, tests/depend4.test, tests/exsource.test:
-       Adjust.
-       Suggested by Tom Tromey.
-
-       Do not output .lo rules for programs and static libraries objects,
-       and do not output .o/.obj rules for libtool libraries.  This is
-       about explicit rules only, not inference rules.
-       * automake.in (handle_single_transform_list): Rename as ...
-       (handle_single_transform): ... this.  Take a single file
-       to transform (it was only called this way) and accept a new
-       %transform argument.  Fill %lang_specific_files with list
-       references instead of strings, and append %transform to each
-       of these lists.
-       (define_objects_from_sources, handle_source_transform):
-       Take a %transform argument, and forward it to &handle_single_transform.
-       (handle_languages): Adjust to the new format of
-       %lang_specific_files, and honor its %transform part.
-       (handle_programs, handle_libraries, handle_ltlibraries): Override
-       %NONLIBTOOL% and %LIBTOOL% while calling handle_source_transform.
-       (make_paragraphs): Define %NONLIBTOOL% by default.  Make sure
-       %transform settings override global settings.
-       * lib/am/depend2.am (%OBJ%, %OBJOBJ%): Define only if %NONLIBTOOL%.
-       * tests/libtool3.test: Augment to check Makefile.ins for unneeded
-       rules.
-       Suggested by Thomas Fitzsimmons.
-
-       * automake.in, aclocal.in: Bump copyright years.
-
------
-
-Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
-
-;; Variables:
-;; coding: utf-8
-;; End:
diff --git a/ChangeLog.09 b/ChangeLog.09
deleted file mode 100644
index 063c06b..0000000
--- a/ChangeLog.09
+++ /dev/null
@@ -1,5524 +0,0 @@
-2009-12-29  Ralf Wildenhues  <address@hidden>
-
-       Fix and complete copyright notices in Makefile.am files.
-       * Makefile.am: Use single-`#' comment for copyright notice, so
-       that it also appears in the generated Makefile.in file.
-       * doc/Makefile.am: Likewise.
-       * doc/amhello/Makefile.am: Likewise.
-       * doc/amhello/src/Makefile.am: Likewise.
-       * lib/Automake/Makefile.am: Likewise.
-       * lib/Automake/tests/Makefile.am: Likewise.
-       * lib/Makefile.am: Likewise.
-       * lib/am/Makefile.am: Likewise.
-       * m4/Makefile.am: Likewise.
-       * tests/Makefile.am: Add copyright notice.
-       Report of missing copyright notice by Stefano Lattarini.
-
-2009-12-27  Stefano Lattarini  <address@hidden>
-
-       Fixed typo in Makefile.am (extra semicolon removed)
-       * Makefile.am (sc_diff_automake_in_automake): Removed an extra
-       semicolon in target's rules, which prevented a stdout redirection
-       from working.
-
-2009-12-21  Julien Danjou  <address@hidden>  (tiny change)
-
-       Add support for newer python version
-       * m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
-       _AM_PYTHON_INTERPRETER_LIST.
-
-2009-12-21  Karl Berry  <address@hidden>
-
-       mention ncftpput in gnupload --help
-       * lib/gnupload: Mention ncftpput in `--help' output.
-       Report by Bruce Korb.
-
-2009-12-05  Antonio Diaz Diaz  <address@hidden>
-
-       Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
-       * lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
-       instead of the respective un$tool invocation, to avoid depending
-       on another tool.
-       * THANKS: Update.
-
-2009-12-05  Ralf Wildenhues  <address@hidden>
-
-       Use $DJDIR rather than $DJGPP to detect running on DJGPP.
-       * automake.in (Language): Use $ENV{'DJDIR'} for the
-       $ENV{'SHELL'} override.
-       * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
-       bootstrapping under MinGW when $DJGPP has been set.
-
-       Do not rely on Perl symlink status, for MSYS perl.
-       * automake.in (require_file_internal): Ensure presence of
-       symlink target file; MSYS perl symlink doesn't return an error
-       status when the file could not be created (copied, on this
-       system).  Fixes symlink.test failure.
-
-2009-12-04  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Avoid Solaris sh `set -e' bug in vala4.test.
-       * tests/vala4.test: New variable $cwd, holding the full path of the
-       current directory.  Use it instead of `pwd` command substitution,
-       to avoid Heirloom/Solaris Sh bug with `set -e'.
-
-2009-11-28  Jim Meyering  <address@hidden>
-
-       do not put world-writable directories in distribution tarballs
-       * lib/am/distdir.am (distdir): Do not make all directories
-       group- or world-writable.  Instead, use 755.
-       * tests/subpkg4.test (test-distdir-is-readable): Check for new,
-       more restricted permissions.
-
-2009-11-29  Karl Berry  <address@hidden>
-
-       Rewrite `gnupload --help' examples.
-       * lib/gnupload: Use GNU style version numbers, a generic package
-       name, and more useful examples.
-
-2009-11-28  Jim Meyering  <address@hidden>
-
-       avoid a warning from perl-5.11
-       * lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-       "/d" modifier.
-
-2009-11-14  Ralf Wildenhues  <address@hidden>
-
-       Distribute the Automake bootstrap script.
-       * Makefile.am (EXTRA_DIST): Add bootstrap.
-       Report by Jan Engelhardt.
-
-2009-10-31  Jim Meyering  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Don't let an envvar setting of "$fail" cause build failure.
-       Without this change, in a project using an automake-generated
-       Makefile, "make fail=anything" would fail inappropriately,
-       due to the `test -z "$$fail"' at the end of this emitted rule:
-       * lib/am/subdirs.am ($(RECURSIVE_TARGETS)): Initialize "fail=" to keep
-       an envvar setting of that variable from causing unwarranted failure.
-       ($(RECURSIVE_CLEAN_TARGETS)): Likewise.
-       * tests/subdir10.test: New test.
-       * tests/Makefile.am: Update.
-
-2009-10-17  Ralf Wildenhues  <address@hidden>
-
-       Sync auxiliary files from upstream.
-       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: Sync from upstream.
-
-       Doc and comment typos.
-       * automake.in (handle_ltlibraries): Fix typo in comment.
-       * tests/distcom7.test: Likewise.
-       * tests/lisp5.test: Likewise.
-       * doc/automake.texi (Usage of Conditionals): Fix typo.
-
-2009-10-11  Ralf Wildenhues  <address@hidden>
-
-       Fix race condition in werror2.test due to sanity sleep change.
-       * tests/werror2.test: Generate Makefile.in before configure so
-       that a Makefile.am update after configure has run is guaranteed
-       to be newer than Makefile.in.
-       * tests/subdir5.test: Document why this test does not need to be
-       fixed.
-       * tests/subdir8.test: Likewise.
-
-       Improve description of the various *LINK variables.
-       * doc/automake.texi (Program and Library Variables): _LINK also
-       receives libraries to link against.  _LINK may be generated.
-       (Program Variables): Document reasons when per-target _LINK is
-       used instead of LINK.
-       (How the Linker is Chosen): Document how a per-target _LINK
-       variable and per-target link flags override linker selection.
-       * THANKS: Update.
-       Report by Dave Korn against gcc/libstdc++-v3.
-
-       Allow variable override of, rather than by, silent variables.
-       When overriding variables, check the VAR_SILENT status of the
-       old condition, not the new one: we allow non-silent overrides
-       of silent variables (these do not hit ordering bugs in the
-       automake output), but there is no use case for doing so the
-       other way round.  Fixes conditional overrides of variables
-       annotated AM_SUBST_NOTMAKE in configure.ac.
-       * lib/Automake/Variable.pm (_check_ambiguous_condition): Check
-       for VAR_SILENT in $ambig_cond not $cond.
-       * tests/cond44.test, tests/cond45.test: New tests, analogous to
-       cond23.test and cond24.test.
-       * tests/Makefile.am: Update.
-       Spotted originally in binutils/bfd.
-
-       Fix `make clean check' for the Automake package.
-       * lib/Automake/Makefile.am (SUBDIRS): Add `.' before `tests',
-       so that Config.pm is built first.
-
-       Fix in-tree `recheck' after failed test that runs `check'.
-       If a test like pr401b-p.test fails for some reason, a `make
-       recheck' would cause another reason for failure because it sets
-       AM_MAKEFLAGS which gets propagated into the test and causes its
-       `make check' to fail.
-       * tests/defs.in: Also unset AM_MAKEFLAGS.
-
-2009-10-11  Stefano Lattarini  <address@hidden>
-
-       Updated code enabling Bourne-compatibility in test scripts.
-       * tests/defs.in: updated the code enabling Bourne-compatibility
-       mode in the shell (now it's copied from autoconf 2.64).
-
-       Avoid leaking TEST_LOG_COMPILER in environment of test scripts.
-       * tests/defs.in: Unset variable `TEST_LOG_COMPILER'.
-
-2009-10-07  Stefano Lattarini  <address@hidden>
-
-       Testsuite: do not use `chmod -R' when cleaning up.
-       * tests/Makefile.am (clean-local-check): Do not use `chmod -R' on
-       the test directories, as that may change or try to change the mode
-       of installed files: the test directory may contain symlinks to
-       ltmain.sh files from a Libtool installation, and Solaris `chmod -R'
-       touches symlink targets.  Instead, use the cleanup strategy used
-       in distdir.am (which is also employed in tests/defs.in).
-
-2009-10-06  Bruno Haible  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Fix 'compile' script to not call mv when target equals source.
-       * lib/compile: Don't attempt to move the generated file to its
-       target destination when it is already at the target destination.
-       Avoids an mv failure with subdir-objects.
-       * tests/ccnoco3.test: New test.
-       * tests/Makefile.am: Adjust.
-
-2009-10-01  Stefano Lattarini  <address@hidden>  (tiny change)
-
-       Fix recommended way to run automake's test scripts with Zsh.
-       * tests/README (Supported shells): Changed the recommended way
-       to run automake's test scripts with Zsh.  Now we tell to use
-       the Zsh's command line option `-o no_function_argzero', not
-       `--no-function-argzero', since the latter does not work with
-       versions 3.x of Zsh.
-
-2009-09-18  Peter Johansson  <address@hidden>  (tiny change)
-
-       Fix link to "Recursive Make Considered Harmful" paper.
-       * doc/automake.texi (Alternative): Fix broken URL.
-
-2009-09-11  Reuben Thomas <address@hidden>  (tiny patch)
-
-       Fix outdated reference to sh-utils in the manual.
-       * doc/automake.texi (Options): The reference to `sh-utils'
-       should be to `coreutils'.
-
-2009-09-06  Ralf Wildenhues  <address@hidden>
-
-       Avoid sleeping for one second most of the time in sanity check.
-       * m4/sanity.m4 (AM_SANITY_CHECK): Try sanity check first without
-       sleeping for a second, and only if that failed, sleep and try
-       again, to avoid the delay in the common case of a configure
-       script that is older than a second, or a system with sub-second
-       time stamp granularity.
-       Report and different patch by Jim Meyering.
-
-2009-09-06  Stefano Lattarini  <address@hidden>  (tiny change)
-
-       tests/README: warn about zsh incompatibilities.
-       * tests/README (User interface, Getting details from failures):
-       Explicitly state that every test is a "shell script", not just
-       a "script", and that it's run by `/bin/sh' by default.
-       * tests/README (User interface, Supported shells): New subsection,
-       telling about expected portability of the automake test scripts,
-       describing a zsh incompatibility (w.r.t. $0), and a workaround to
-       it (with the `--no-function-argzero' option).
-
-       testsuite: fix a minor glitch.
-       * tests/defs.in (exit trap): Use `$me', not `$as_me', as the
-       name of the current test (used in error messages).
-       * THANKS: Update.
-
-2009-07-08  Jim Meyering  <address@hidden>
-
-       manual: fix a trivial grammar error.
-       * doc/automake.texi (Invoking aclocal): Fix grammar.
-
-2009-06-07  Ralf Wildenhues  <address@hidden>
-
-       AM_PROG_GCJ: use AC_CHECK_TOOLS for gcj, for cross compilation.
-       * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_TOOLS, rather than
-       AC_CHECK_PROGS, when searching for `gcj'.
-       * NEWS: Update.
-       Report by Jack Kelly.
-
-2009-05-24  Jack Kelly  <address@hidden>  (tiny change)
-           Ralf Wildenhues  <address@hidden>
-
-       AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
-       * tests/gcj6.test: New test.
-       * tests/Makefile.am: Update; mark gcj6.test as XFAIL.
-       * THANKS: Update.
-
-2009-05-24  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: avoid GNU make 3.80 substitution bug.
-       * lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
-       `.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
-       to work around GNU make 3.80 substitution reference issue with
-       trailing white space in the variable.
-       * tests/parallel-tests10.test: New test.
-       * tests/parallel-tests6.test: Update comment.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-       Report by Bob Friesenhahn.
-
-2009-05-23  Ralf Wildenhues  <address@hidden>
-
-       testsuite: unset installation directory variables.
-       * tests/defs.in: Before test execution, be sure to unset all
-       installation directory variables, so they cannot have an effect
-       on a `make -e install' command within a test.
-       Report by Dagobert Michelsen.
-
-       testsuite: do not change the mode of installed Libtool files.
-       * tests/defs.in: Do not use `chmod -R' on the test directory, as
-       that may change or try to change the mode of installed files:
-       the test directory may contain symlinks to ltmain.sh files from
-       a Libtool installation, and Solaris `chmod -R' touches symlink
-       targets.  Instead, use the cleanup strategy used in distdir.am.
-       * NEWS: Update.
-       Report by Dagobert Michelsen.
-
-       testsuite: do not fail in cleanup code.
-       * tests/defs.in: Turn off errexit in the cleanup trap, to avoid
-       a test failure due to a nonzero command.
-       * THANKS: Update.
-       Report by Dagobert Michelsen.
-
-2009-05-23  Peter O'Gorman  <address@hidden>
-
-       python: do not install in system directories on Darwin 9.
-       On Darwin 9, get_python_lib returns a path below `/Library/Python'
-       regardless of the `prefix' argument it was passed, causing `make
-       install' to target the system directories regardless of `--prefix'
-       argument used.  Work around this Darwin bug by ignoring the result
-       of get_python_lib if it points outside of the passed prefix, and
-       the prefix was not a system directory.
-       * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
-       initial portion of the pythondir returned by get_python_lib, then
-       ignore it unless the configured prefix is `/usr' or starts with
-       `/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
-       * NEWS: Update.
-
-2009-05-23  Ralf Wildenhues  <address@hidden>
-
-       Clarify how to enable `silent-rules' and other global options.
-       * doc/automake.texi (Options): When introducing options, be more
-       careful to note that not all of them can be specified in
-       AUTOMAKE_OPTIONS statements, and that some do not make sense in
-       subdirectories.  Note more prominently that `silent-rules' can
-       only be specified in configure.ac.
-       * lib/Automake/Options.pm (_process_option_list): Improve error
-       message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
-       options specified in Makefile.am files.
-       Report by Bruno Haible.
-
-2009-05-21  Ralf Wildenhues  <address@hidden>
-
-       Skip specflg10.test without a C++ compiler.
-       * tests/specflg10.test: Require g++.
-       Report by Thien-Thi Nguyen.
-
-2009-05-19  Ralf Wildenhues  <address@hidden>
-
-       Revert last patch, IRIX has an editor named `jot'.
-       * tests/instmany-mans.test: Do not try `jot'.
-       * tests/instmany-python.test: Likewise.
-       * tests/instmany.test: Likewise.
-       Report by Peter O'Gorman.
-
-2009-05-18  Ralf Wildenhues  <address@hidden>
-
-       testsuite: also try `jot' as `seq' replacement.
-       * tests/instmany-mans.test: Try BSD `jot' before resorting to a
-       slow but portable shell loop.
-       * tests/instmany-python.test: Likewise.
-       * tests/instmany.test: Likewise.
-       Suggestion by Peter O'Gorman.
-
-       Fix test failure when pkg.m4 is not found, only pkg-config.
-       * tests/vala5.test: Update comment, this test is not expected to
-       fail any more.  Require valac version 0.7.0.  Skip if configure
-       fails, could be due to unexpanded PKG_CHECK_MODULES or too old
-       valac.
-       Report by Simon Josefsson.
-
-2009-05-17  Ralf Wildenhues  <address@hidden>
-
-       Automake 1.11.
-       * configure.ac: Bump version to 1.11.
-       * doc/automake.texi (Releases): Add line for 1.11.  Remove line
-       for 1.10b.
-
-       Fix maintainer-check failures.
-       * automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
-       of plain `cd'.
-       * tests/vala2.test: Use `rm -f' instead of `rm'.
-
-       Revert Automake license to GPLv2+.
-       Automake will move to GPLv3+ once the Exception statement has
-       been rewritten to use the new GPLv3 exception language.  This
-       change does not impact the COPYING file that may be installed
-       by `automake --add-missing'.
-       * COPYING: Revert to GPLv2.  All uses changed.
-       * NEWS: Update.
-
-       Rewrite NEWS for 1.11.
-       * NEWS: Rewrite, merging 1.10b and 1.10c entries.
-
-       Sync auxiliary files from upstream.
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
-       upstream.
-
-       Update release statistics, improve release-stats rule.
-       * Makefile.am (release-stats): Output stderr of pstops in
-       addition to catching it, for better debugging.
-       * doc/automake.texi (Releases): Add line for 1.10.2.
-
-       Cope with parallel BSD make -jN semantics.
-       When BSD `make -jN' is used without `-B' which enables backwards
-       compatible semantics, it may reuse the same shell for several
-       commands within a rule; so ensure we do not leave it in a
-       different directory, nor `exit 0' early in a multi-command rule.
-       * lib/am/distdir.am (distcheck): After running `distcleancheck',
-       change back to original working directory.
-       * lib/am/remake-hdr.am (%CONFIG_HIN%): Run autoheader in a
-       subshell.
-       * lib/am/mans.am (uninstall-man%SECTION%): Do not `exit 0' early
-       in a rule that consists of several shell invocations.  Parallel
-       NetBSD `make -jN' without `-B' will use only one shell for all
-       commands, but won't respawn one after `exit 0'.  Fixes
-       notrans.test failure.
-       * tests/makej2.test: New test.
-       * tests/Makefile.am: Update.
-
-       Fix typo in comment.
-       * lib/am/install.am: Fix typo.
-
-2009-05-17  Matthias Klose  <address@hidden>  (tiny change)
-           Ralf Wildenhues  <address@hidden>
-
-       Let AM_PATH_PYTHON honor python's idea about the site directory.
-       * m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and
-       pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix'
-       to get_python_lib, so python can determine the name of the site
-       directory depending on the install location.  Afterwards, replace
-       the directory names with the unexpanded values of $PYTHON_PREFIX
-       resp. $PYTHON_EXEC_PREFIX again, to allow override according to
-       the documentation.  Fixes site directory computation for Debian
-       and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local',
-       `site-packages' elsewhere).
-       * NEWS, THANKS: Update.
-
-2009-05-17  Ralf Wildenhues  <address@hidden>
-
-       Vala: for now, require GNU make.
-       * doc/automake.texi (Vala Support): GNU make is currently
-       required for Vala sources.
-       * tests/vala2.test, tests/vala3.test, tests/vala5.test: Require
-       GNU make.
-
-2009-05-17  Jürg Billeter  <address@hidden>
-
-       Vala: Use $(srcdir) in rebuild rules.
-       valac is always run in srcdir as the generated files are distributed.
-       So srcdir needs to be taken into account in the rebuild rules to not
-       wrongly trigger a rebuild in the wrong directory.
-       * automake.in (lang_vala_finish_target): Rebuild files in
-       $(srcdir).
-       * tests/vala2.test: Test rebuild rules from VPATH build.
-
-       Vala: Add and test rebuild rules for generated header and vapi files.
-       valac will generate additional files when using, for example, -H in
-       VALAFLAGS. We need to recognize these options and add appropriate
-       rebuild rules to fix parallel build.
-       * automake.in (lang_vala_finish_target): Recognize -H, -h,
-       --header, --internal-header, --vapi, --internal-api, --gir flags
-       to valac and rebuild rules for generated headers; distribute
-       and maintainer-clean them.
-       * tests/vala2.test: Test rebuild rules.
-
-2009-05-17  Jürg Billeter  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Vala: Fix build when using per-target VALAFLAGS.
-       This does not yet implement full per-target support for VALAFLAGS,
-       however, this change at least fixes building when there is only one
-       target per source file, which is the most common situation.
-       * automake.in: Remove `VALAFLAGS' from `flags' in language struct.
-       (lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually
-       here; check `VALAFLAGS' user variables.
-       * tests/Makefile.am (XFAIL_TESTS): Remove vala5.test.
-       * doc/automake.texi (Vala Support): Document per-target flag
-       limitations.
-
-2009-05-11  Ralf Wildenhues  <address@hidden>
-
-       For PR automake/540:
-       Document some formatting restrictions for Makefile.am files.
-       * doc/automake.texi (General Operation, Usage of Conditionals):
-       Variable assignments should not be indented by TABs, rule commands
-       should.  Conditional keyword statements should not be indented.
-       * THANKS: Update.
-       Report by Luo Yi.
-
-2009-05-03  Ralf Wildenhues  <address@hidden>
-
-       Fix copyright years in *.am files.
-       * lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
-       lib/am/program.am, lib/am/tags.am: Fix copyright years.
-
-       distdir: avoid duplicate `find' traversal with subpackages.
-       * lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
-       `am__skip_mode_fix'.
-       [%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
-       walk.
-       * tests/subpkg4.test: New test, to ensure that we still walk the
-       whole tree while fixing permissions.  We don't ensure it is
-       walked once only.
-       * tests/Makefile.am: Update.
-
-       Disable test cleanup trap with OSF1/Tru64 sh.
-       * configure.ac: Test whether /bin/sh has working 'set -e'
-       in conjunction with an exit trap.  Set $am_cv_sh_errexit_works
-       accordingly, substitute sh_errexit_works, and warn about
-       leftover test directories with broken shells like Tru64 /bin/sh.
-       * tests/defs.in: Do not install any traps with broken shells.
-
-2009-05-02  Bruno Haible  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Recommend *-local hooks without commands, for extensibility.
-       * doc/automake.texi (Clean): Show how to write the clean-local
-       extension with separate phony target.
-       * tests/Makefile.am (clean-local-check): Practice what we preach
-       by marking this phony.  For consistency, rename from ...
-       (check-clean-local): ... this.
-
-2009-04-28  Eric Blake  <address@hidden>
-
-       scripts: normalize all timestamps to UTC
-       * lib/compile (scriptversion): Update emacs hook.
-       * lib/depcomp (scriptversion): Likewise.
-       * lib/elisp-comp (scriptversion): Likewise.
-       * lib/gnupload (scriptversion): Likewise.
-       * lib/install-sh (scriptversion): Likewise.
-       * lib/mdate-sh (scriptversion): Likewise.
-       * lib/missing (scriptversion): Likewise.
-       * lib/mkinstalldirs (scriptversion): Likewise.
-       * lib/py-compile (scriptversion): Likewise.
-       * lib/ylwrap (scriptversion): Likewise.
-
-2009-04-27  Ralf Wildenhues  <address@hidden>
-
-       silent-rules: fix alignment of less verbose output.
-       * automake.in (define_verbose_var): Define `$silent_var' as
-       VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple
-       adjacent spaces.
-       * tests/silent.test: Amend test.
-       Report by Jan Engelhardt.
-
-2009-04-25  Ralf Wildenhues  <address@hidden>
-
-       manual: fix trivial grammar errors.
-       * doc/automake.texi (Subpackages, Vala Support, Java)
-       (Checking the Distribution, Timeline): Fix `a' vs. `an' errors
-       and duplicate `the'.
-       Report by Eric Blake.
-
-       Indent rule commands consistently with a TAB.
-       * lib/am/check.am ($(TEST_SUITE_LOG)): Consistently use TAB, not
-       spaces, for indentation of commands, even if indentation may not
-       be needed at all.
-       * lib/am/texinfos.am (install-info-am): Likewise.
-       * THANKS: Update.
-       Prompted by report from John Calcote.
-
-       parallel-tests: fix recheck* targets for non-GNU make.
-       * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
-       to portably transport the TEST_LOGS settings through the
-       recursive `make' invocations.  Fixes parallel-tests9.test
-       failure with Solaris make.
-       * tests/parallel-tests9.test: Also ensure that the test
-       summary is correct for `recheck'.
-       Suggestion by Akim Demaille.
-
-2009-04-22  Ralf Wildenhues  <address@hidden>
-
-       Avoid racy depmodes with universal builds.
-       * m4/depend.m4 (_AM_DEPENDENCIES): If universal builds are used,
-       avoid racy depmodes.
-       * lib/depcomp: Ignore `-arch' argument for makedepend depmode.
-       Report by Bruno Haible, analysis by Bruno Haible, Peter O'Gorman,
-       and Eric Blake.
-
-2009-04-21  Fabian Alenius  <address@hidden>  (tiny change)
-
-       Fix link to autotools tutorial.
-       * doc/automake.texi (Autotools Introduction): Fix broken link.
-       * THANKS: Update.
-
-2009-04-19  Ralf Wildenhues  <address@hidden>
-
-       testsuite: minor w32 fixes.
-       * tests/depend5.test: Don't fail if the system or file system
-       cannot handle weird characters, instead just try a few.
-       * tests/parallel-tests3.test: Really wait until the serial test
-       has finished, before letting the cleanup trap do its work.
-       Report by Bruno Haible.
-
-       Avoid nonportable `./FILE' instead of `FILE' in test.
-       * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la'
-       in *_LDADD entry if `$(top_builddir)' is `.'.  Fixes test failure
-       with parallel NetBSD make.
-
-       Detect make `include' style also with parallel non-GNU make.
-       Parallel NetBSD make outputs `--- $target ---' messages,
-       parallel HP-UX make outputs `Making target"$target"'.  Just
-       ignore all additional output for the include test.
-       * m4/make.m4 (AM_MAKE_INCLUDE): Ignore additional output
-       produced by `make' to relax `include' style detection.
-
-       manual: add FAQ `Debugging Make Rules'.
-       * doc/automake.texi (Debugging Make Rules): New FAQ section.
-       (Top, FAQ): Adjust menus, and capitalization of the description
-       of the `Hard-Coded Install Paths' node.
-       (Multiple Outputs): Add comment to restore font-lock for vim.
-       Suggestion by Karl Berry.
-
-       Let XFile::lock warn and fail with parallel non-GNU make, too.
-       * lib/Automake/XFile.pm (lock): Also match `-j' for parallel BSD
-       make, and `-P' for parallel HP-UX make.
-
-       Fix AM_PROG_VALAC version requirement detection.
-       * m4/vala.m4 (AM_PROG_VALAC): Remove `Vala ' from valac
-       --version string before comparing versions.
-       * tests/vala2.test: Require version 0.7.0 for the test.
-       Fixes failures of vala2.test and vala3.test with older valac.
-
-       Correctly treat all assignments with bogus trailing comments.
-       Before this patch, automake would silently fail to diagnose and
-       to copy into the output those variable assignments which are
-       preceded by a comment, and end in backslash newline comment.
-       * automake.in (read_am_file): When determining whether an
-       escaped newline followed by a comment is an error, correctly use
-       the parser state, not the contents of a saved comment, which
-       could still be carried over from a comment before an assignment.
-       * NEWS: Update.
-       * tests/commen11.test: New test.
-       * tests/Makefile.am: Update.
-       Report by Karl Berry.
-
-2009-04-14  Karl Berry  <address@hidden>
-
-       manual: improve markup: itemize list in `Extending'.
-       * doc/automake.texi (Extending): Use address@hidden's for user override
-       semantics.
-
-2009-04-13  Ralf Wildenhues  <address@hidden>
-
-       bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
-       * automake.in (am_install_var): For `PROGRAMS' primary, strip
-       `$(EXEEXT)' here already, so the name uniquifying works even
-       when we look at names repeatedly, with inconsistent executable
-       extension; through variable references, we might have added
-       the extension ourselves earlier.
-       (handle_programs): No need to strip `$(EXEEXT)' here any more.
-       * tests/extra8.test: New test.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-       Report by Daniel Richard G.
-
-2009-04-10  Jim Meyering  <address@hidden>
-
-       Fix grammar in comments and documentation.
-       * doc/automake.texi (API versioning): Fix grammar.
-       * automake.in: Fix grammar in comment.
-       * lib/Automake/ChannelDefs.pm: Likewise.
-       * tests/ext2.test: Likewise.
-
-2009-04-19  Ralf Wildenhues  <address@hidden>
-
-       More minor fixups to vala support.
-       * automake.in (lang_vala_finish_target): Fix typo in comment.
-       * doc/automake.texi (Vala Support): Fix typo.  Declare vala
-       support as "initial".
-       * NEWS: Likewise, declare vala support as "initial".
-
-2009-04-05  Jürg Billeter  <address@hidden>
-
-       Improve Vala support.
-       * automake.in: Update to Vala 0.7.0 semantics, recover from removal
-       of built sources, support silent-rules, drop _PKGNAME variables
-       * doc/automake.texi, NEWS: Update.
-       * lib/am/vala.am: Bump copyright years.
-       * m4/vala.m4: Likewise.
-       * tests/vala.test: Remove obsolete grep tests.
-       * tests/vala1.test: Likewise.
-       * tests/vala2.test: Test full build, distcheck, and distclean.
-       * tests/vala3.test: Likewise, also test with subdir-objects.
-       * tests/vala4.test: Bump copyright years.
-       * tests/vala5.test: New test for per-target flags, expected to fail.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-
-2008-10-10  Ralf Wildenhues  <address@hidden>
-
-       Minor fixups for Vala support.
-       * automake.in: $(VALAFLAGS) comes after $(AM_VALAFLAGS).
-       * doc/automake.texi (Vala Support): Add some references,
-       document AM_VALAFLAGS, streamline a bit.
-       * lib/am/vala.am: Copyright blurb.
-       * m4/vala.m4 (AM_PROG_VALAC): Rewrite using AS_VERSION_COMPARE.
-       * tests/vala.test: Fix minor nits.
-       * tests/vala1.test: Likewise.
-       * tests/vala2.test: Likewise.
-       * tests/vala3.test: Likewise.
-       * tests/vala4.test: New test, for version argument of
-       AM_PROG_VALAC.
-       * tests/Makefile.am: Update.
-
-2008-10-09  Mathias Hasselmann  <address@hidden>
-
-       * automake.in: Support Vala in non-recursive builds. Make sure
-       foo_VALAFLAGS really use used. Inject --library switch when building
-       Vala libraries.
-       * doc/automake.texi, NEWS: Document Vala support.
-       * m4/vala.m4: Rename AC_PROG_VALAC to AM_PROG_VALAC.
-       * tests/Makefile.am: Additional Vala tests.
-       * tests/vala.test: Also test VALAFLAGS support.
-       * tests/vala1.test: Test non-recursive Vala support.
-       * tests/vala2.test: Test _PKGNAME variables.
-       * tests/vala3.test: Test compiling of C code generated by Vala.
-
-2008-10-09  Mathias Hasselmann  <address@hidden>
-
-       Initial support for the vala programming language.
-       * automake.in: Add %known_libraries, lang_vala_rewrite,
-       lang_vala_finish and lang_vala_target_hook to support the Vala
-       programming language. Register Vala language hooks.
-       * lib/am/vala.am: Empty rules file to prevent creation of depend2
-       based rules for Vala code.
-       * lib/am/Makefile.am (dist_am_DATA): Add vala.am.
-       * m4/vala.m4: Provide AC_PROG_VALAC for detecting the Vala compiler.
-       * m4/Makefile.am (dist_m4data_DATA): Add vala.m4.
-       * tests/vala.test: Test Vala support.
-       * tests/Makefile.am: Update.
-
-2009-04-14  Ralf Wildenhues  <address@hidden>
-
-       testsuite: do not fail on systems without read permissions.
-       * tests/instfail-info.test: Do not use the `non-root'
-       requirement for testing whether files may be made unreadable;
-       instead use `test -r' and skip the test if that still works.
-       * tests/instfail-java.test: Likewise.
-       * tests/instfail-libtool.test: Likewise.
-       * tests/instfail.test: Likewise.
-       * tests/instmany-mans.test: Likewise.
-       * tests/instmany-python.test: Likewise.
-       * tests/instmany.test: Likewise.
-       * tests/parallel-tests9.test: Likewise.
-
-       testsuite: parallel make fixes.
-       This patch fixes a couple of testsuite bugs exposed with
-       `MAKE=make\ -jN make check'.
-       * tests/libtoo10.test: Do not run `clean' in same $MAKE
-       invocation as `all check'.  Fixes test failure with parallel
-       NetBSD `make -jN'.
-       * tests/nobase.test: Be sure to create a directory before
-       creating files in it.  Fixes test failure with MAKE=`make -jN'
-       for NetBSD make.  This issue is hidden with parallel GNU make
-       due to its parallel breadth first update order.
-       * tests/parallel-tests3.test: Skip if $MAKE contains `-j',
-       GNU make will use the environment variable $MAKE for recursion
-       and thus run in parallel even if `$MAKE -j1' was used on the
-       command line in the test.  Also, after running the test proper,
-       wait long enough so that background jobs have finished and there
-       are no open files left when the cleanup code runs.
-
-2009-04-13  Ralf Wildenhues  <address@hidden>
-
-       silent-rules reorganization, --enable-silent-rules switch.
-       This patch introduces a configure-time option to set the default
-       verbosity.  Since configure now needs to know whether the
-       `silent-rules' automake option was set, the latter can only be
-       set within AM_INIT_AUTOMAKE, or with a new AM_SILENT_RULES macro
-       but not any more through AUTOMAKE_OPTIONS or the automake
-       command line option `--silent-rules'.
-       * automake.in (define_verbose_var): Define the default verbose
-       variable in terms of `$(AM_DEFAULT_VERBOSITY)'.
-       (handle_configure): Do not pass `--silent-rules' to automake.
-       (scan_autoconf_traces): Trace `AM_SILENT_RULES'.  If seen,
-       enable global `silent-rules' option.
-       (usage): Do not document `--silent-rules'.
-       (parse_arguments): Do not accept `--silent-rules'.
-       * doc/automake.texi (Options): Overhaul.  Document
-       AM_SILENT_RULES, --enable-silent-rules, --disable-silent-rules,
-       AM_DEFAULT_VERBOSITY.  Show an example for user-added variables
-       for less verbose output.
-       (Invoking Automake): Remove documentation for `--silent-rules'.
-       (Public Macros): Document `AM_SILENT_RULES'.
-       * NEWS: Update.
-       * lib/Automake/Options.pm (_process_option_list): Accept
-       `silent-rules' only as option in configure.ac.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): If the `silent-rules' option
-       was enabled, require `AM_SILENT_RULES'; move AM_BACKSLASH
-       initialization to ...
-       * m4/silent.m4 (AM_SILENT_RULES): ... this new file, new macro.
-       Deal with `--enable-silent-rules' switch; define
-       AM_DEFAULT_VERBOSITY.
-       * m4/Makefile.am (dist_m4data_DATA): Add silent.m4.
-       * tests/dollarvar.test: Remove tests for `--silent-rules', use
-       `AM_SILENT_RULES'.
-       * tests/flavor.test: Remove test for `--silent-rules'.
-       * tests/silent.test: Use `AM_SILENT_RULES' instead of
-       `AUTOMAKE_OPTIONS = silent-rules'; use `--enable-silent-rules'.
-       * tests/silent2.test: Likewise.
-       * tests/silent3.test: Likewise.
-       * tests/silent4.test: Likewise.
-       * tests/silent5.test: Likewise.
-       * tests/silent6.test: Likewise. Test `AM_SILENT_RULES' as well
-       as `AM_INIT_AUTOMAKE([silent-rules])' instead of
-       `--silent-rules'.
-       * tests/silent7.test: Use `AM_SILENT_RULES' instead of
-       `AUTOMAKE_OPTIONS = silent-rules'; ensure the latter is rejected.
-       Test combinations of --enable-silent-rules and
-       --disable-silent-rules with `make V=0' and `make V=1'.
-       Suggestion for configure-time switch by Bob Friesenhahn.
-
-       manual: Add note about parallelism and tests ordering.
-       * doc/automake.texi (Simple Tests using parallel-tests):
-       Dependencies between test logs work for tests with known
-       extensions only.  Hint that tests should be prepared to be run
-       in parallel.
-
-       Fix maintainer-check failure.
-       * tests/suffix13.test: Use Exit not exit.
-
-2009-04-10  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: more testsuite exposure.
-       * tests/parallel-tests.test: Also test overriding TEST_LOGS and
-       TESTS.
-
-       parallel-tests: let VERBOSE=yes output appear before summary.
-       * lib/am/check.am ($(TEST_SUITE_LOG)): In `VERBOSE=yes' mode,
-       output contents of `$(TEST_SUITE_LOG)' before, rather than after
-       the test suite summary.  This ensures that the email address
-       appears near the end of the output; also, the log file already
-       starts with a result summary anyway.
-
-       parallel-tests: `clean recheck' should not rerun all tests.
-       * lib/am/check.am (recheck, recheck-html): Do not rerun all
-       tests if `$(TEST_SUITE_LOG)' does not exist.
-       * tests/parallel-tests2.test: Adjust recheck test.
-       * tests/parallel-tests9.test: Adjust recheck-html test.
-       * NEWS: Update.
-       Suggestion by Akim Demaille.
-
-2009-04-08  Ralf Wildenhues  <address@hidden>
-           Eric Blake <address@hidden>
-
-       parallel-tests: Fix driver for nonempty executable extension.
-       * automake.in (handle_tests): New substitution `%am__EXEEXT%',
-       defined as 'FALSE' for non-generic rules, or if no programs are
-       built at all.  Otherwise, define it as configure conditional.
-       * lib/am/check2.am [%am__EXEEXT%] (%EXT%$(EXEEXT).log): New
-       conditional generic rule.
-       * m4/init.m4: Hook an m4_provide of `_AM_COMPILER_EXEEXT' onto
-       Autoconf's `_AC_COMPILER_EXEEXT' macro.
-       (AM_INIT_AUTOMAKE): If `_AM_COMPILER_EXEEXT' has been provided
-       at `AC_CONFIG_COMMANDS_PRE' time, then introduce a conditional
-       `am__EXEEXT', defined to true iff `$EXEEXT' is nonempty.
-       * tests/check5.test: Only match `_EXEEXT_[1-9]' here, to avoid
-       false positives stemming from address@hidden@'.
-       * NEWS: Update.
-
-2009-04-08  Ralf Wildenhues  <address@hidden>
-
-       Fix a couple of $(EXEEXT)-related testsuite failure.
-       * tests/check8.test: Allow executable extensions in test suite
-       output.
-       * tests/check9.test: Add `$(EXEEXT)' manually to @substituted@
-       XFAIL_TESTS entries.
-
-       * NEWS: Update for last patch.
-
-2009-04-07  Florian Briegel  <address@hidden>  (tiny change)
-           Stepan Kasal  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Fix renamed objects with subdir-objects and other languages.
-       * automake.in: Fixed bug when building with renamed objects
-       and foreign languages.
-       * tests/suffix13.test: New test.
-       * tests/Makefile.am: Adjust.
-       * THANKS: Update.
-       Reports by Florian Briegel and Stepan Kasal.
-
-2009-04-07  Ralf Wildenhues  <address@hidden>
-
-       Do not remove texinfo outputs upon mostlyclean.
-       * lib/am/texinfos.am: New substitutions %MOSTLYCLEAN%,
-       %MAINTCLEAN%.
-       (clean-aminfo): New target, remove %TEXICLEAN% if nonemtpy,
-       declare phony.  Hook this target to ...
-       (clean-am): ... this and ...
-       (?CYGNUS?clean-info): ... this.
-       (maintainer-clean-aminfo): Remove %MAINTCLEAN% if nonempty,
-       for later.
-       (mostlyclean-aminfo): Remove %MOSTLYCLEAN%.
-       * automake.in (handle_texinfo_helper): Return three arrays
-       $MOSTLYCLEAN, $TEXICLEAN, $MAINTCLEAN, instead of one array.
-       Only put LaTeX helper files in $MOSTLYCLEAN, the rest in
-       $TEXICLEAN for now.
-       (handle_texinfo): Accept these, chop off extra newline, and
-       substitute them in `texinfos.am'.
-       * NEWS: Update.
-       * tests/txinfo33.test: New test.
-       * tests/Makefile.am: Update.
-       Report by Bruno Haible.
-
-2009-04-06  Ralf Wildenhues  <address@hidden>
-
-       testsuite: unset TESTS, TEST_LOGS, to avoid interference.
-       * tests/defs.in: Unset TESTS, TEST_LOGS.
-
-       testsuite: generate $(parallel_tests) just when needed.
-       * tests/Makefile.am (check_SCRIPTS): No need to list
-       $(parallel_tests) here, they can be generated as needed during
-       the test run, following our recommendation in the manual.
-
-       Remove superfluous line from recheck recheck-html.
-       * lib/am/check.am (recheck recheck-html): Remove superfluous
-       line, introduced bogusly in last commit.
-
-2009-04-06  Akim Demaille  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: redo check-html, recheck, recheck-html.
-       * lib/am/check.am (recheck, recheck-am): Remove.
-       (recheck-TESTS): Rename to ...
-       (recheck): ... this and rewrite, factored ...
-       (recheck-html): ... with this rule.  Pass TEST_LOGS rather than
-       RECHECK_LOGS to `check' and `check-html', respectively, to avoid
-       running outdated tests.  Invoking the public macros ensures
-       `check_SCRIPTS' etc. are created in time.  Do not output errors
-       for tests that were not run yet.  If the testsuite has not run
-       at all, run all tests.
-       (check-html): Run `check' target, not `check-TESTS', to ensure
-       `check_SCRIPTS' etc. are created in time.
-       (.PHONY, .MAKE, AM_RECURSIVE_TARGETS): Adjust contents.
-       * tests/parallel-tests2.test: Expose the check-html and
-       recheck-html issues.
-       * tests/parallel-tests9.test: Expose the recheck issues.
-       Bugs in previous version pointed out by Akim, who already had
-       them fixed in his original version.
-
-2009-04-04  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: LOG_COMPILER for tests without known extension.
-       * automake.in (handle_tests): If we don't match a known
-       extension, define `LOG_COMPILER' as `$(LOG_COMPILE)
-       $(AM_LOG_FLAGS) $(LOG_FLAGS)' and use it as %COMPILE% in check2.
-       * doc/automake.texi (Simple Tests using parallel-tests):
-       Document it.  In the examples, suggest using the AM_*LOG_FLAGS
-       flags in Makefile.am rather than the variables without `AM_'
-       prefix.
-       * lib/Automake/tests/Makefile.am (AM_PL_LOG_FLAGS): Renamed from
-       (PL_LOG_FLAGS): ... this variable, intended for the user.
-       * tests/parallel-tests7.test: Extend test.
-       * NEWS: Update.
-       Suggestion by Akim Demaille.
-
-       More node renaming in the manual.
-       * doc/automake.texi (Top): Adjust menu to ...
-       (API Versioning): ... this node being renamed from ...
-       (API versioning): ... this, and ...
-       (Wildcards): ... this being renamed from ...
-       (wildcards): ... this.
-       Report by Karl Berry.
-
-2009-04-03  Andreas Schwab  <address@hidden>
-
-       * tests/instdir-java.test: Don't require gcj.  Skip if javac is
-       not available.
-
-2009-04-01  Ralf Wildenhues  <address@hidden>
-
-       Fix testsuite failures due to nonexistent `dirlist' entries.
-       * tests/defs.in: When parsing `$aclocaldir/dirlist', only add
-       existing directories D to aclocal `-I D' flags, as aclocal
-       errors on nonexisting directories.
-       Report and analysis by Andreas Schwab.
-
-2009-03-31  Akim Demaille  <address@hidden>
-
-       Fix typo in manual.
-       * doc/automake.texi (Simple Tests using parallel-tests): Fix
-       typo.
-
-2009-03-31  Jim Meyering  <address@hidden>
-
-       Avoid test failure due to paranoid TAR_OPTIONS envvar setting.
-       * tests/txinfo18.test: Don't let a TAR_OPTIONS=--keep-old-files
-       environment variable setting cause test failure.  Fixed in
-       texi2dvi 4.13.
-
-       Use more common spelling in diagnostic: s/canonic/canonical/.
-       * automake.in (check_typos): s/canonic/canonical/.
-
-2009-03-31  Ralf Wildenhues  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.10c.
-
-2009-03-29  Ralf Wildenhues  <address@hidden>
-
-       * configure.ac, NEWS: Bump version to 1.10b.
-       * doc/automake.texi (Releases): Add statistics for 1.10b.
-
-       * NEWS: Minor update.
-
-       Reorganize nodes in the manual.
-       Avoid texinfo sectioning commands without nodes, by either
-       introducing new nodes along with menus, or using headings
-       commands.  Adjust all references.
-       * doc/automake.texi: Throughout the manual, adjust references to
-       new or changed node names.  Rename `non-configured' to
-       `unconfigured', capitalize headings and section names better.
-       (Top): List new menus and nodes introduced below.
-       (Length Limitations): Renamed from ...
-       (Length limitations): ... this.
-       (aclocal Options): Renamed from ...
-       (aclocal options): ... this.
-       (Macro Search Path): Renamed from ...
-       (Macro search path): ... this.  Rename subsubsections to
-       subsubheadings.
-       (Public Macros, Obsolete Macros, Private Macros): Renamed from
-       (Public macros, Obsolete macros, Private macros): ... these.
-       (Conditional Subdirectories): Introduce sub menu and split ...
-       (SUBDIRS vs DIST_SUBDIRS, Subdirectories with AM_CONDITIONAL)
-       (Subdirectories with AC_SUBST, Unconfigured Subdirectories):
-       ... into these new nodes.  Adjust subsection names to node
-       names.
-       (Conditional Sources): Rename subsubsections to subsubheadings.
-       (Conditional Programs): Likewise.
-       (Program Variables): Renamed from ...
-       (Program variables): ... this.
-       (Libtool Issues): Introduce sub menu and split into ...
-       (Required file ltmain.sh not found)
-       (Objects created both with libtool and without): ... these new
-       nodes.
-       (Other Objects, Built Sources): Renamed from ...
-       (Other objects, Built sources): ... these.
-       (Built Sources Example): Renamed from ...
-       (Built sources example): this.  Rename unnumberedsubsecs to
-       subsubheadings.
-       (Man Pages): Renamed from ...
-       (Man pages): ... this.
-       (Install): Introduce sub menu and split into ...
-       (Basics of Installation, The Two Parts of Install)
-       (Extending Installation, Staged Installs)
-       (Install Rules for the User): ... these new nodes.
-       (Dist): Introduce sub menu and split into ...
-       (Basics of Distribution, Fine-grained Distribution Control)
-       (The dist Hook, Checking the Distribution)
-       (The Types of Distributions): ... these new nodes.
-       (Tests): Introduce sub menu and split into ...
-       (Simple Tests, Simple Tests using parallel-tests, DejaGnu Tests)
-       (Install Tests): ... these new nodes.
-       (Conditionals): Move the portability paragraph up, introduce sub
-       menu and split into ...
-       (Usage of Conditionals, Limits of Conditionals): ... these new
-       nodes.  Link to several sections throughout the manual that deal
-       with specific usage of conditionals.
-       (CVS): Rename subsections to subheadings.
-       (maintainer-mode): Likewise.
-       (Limitations on File Names): Renamed from ...
-       (limitations on file names): ... this.
-       (Flag Variables Ordering): Rename subsections to subheadings.
-       (Renamed Objects): Renamed from ...
-       (Renamed objects): ... this.
-       (Dependency Tracking Evolution): Introduce sub menu and split
-       into ...
-       (First Take on Dependencies, Dependencies As Side Effects)
-       (Dependencies for the User, Techniques for Dependencies)
-       (Recommendations for Tool Writers)
-       (Future Directions for Dependencies): ... these new nodes.
-       Report by Karl Berry.
-
-2009-03-29  Ralf Wildenhues  <address@hidden>
-
-       Update AM_RECURSIVE_TARGETS for parallel-tests.
-       * lib/am/check.am [PARALLEL_TESTS] (AM_RECURSIVE_TARGETS):
-       Add check, recheck, check-html, recheck-html.
-
-2009-03-29  Ralf Wildenhues  <address@hidden>
-           Akim Demaille  <address@hidden>
-
-       parallel-tests: New target recheck-html.
-       * lib/am/check.am [PARALLEL_TESTS] (recheck-html): New phony,
-       recursive target.  Factor common implementation with
-       `check-html'.
-       * doc/automake.texi (Tests): Document recheck-html.
-       * tests/parallel-tests2.test: Test it.
-
-2009-03-28  Ralf Wildenhues  <address@hidden>
-           Akim Demaille  <address@hidden>
-
-       parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
-       Replace the LAZY_TEST_SUITE API with a simpler yet more powerful
-       one: RECHECK_LOGS specifies those tests which are to be removed
-       in any case before testing.  Provide a `recheck' convenience
-       target to set RECHECK_LOGS to all failed and unexpectedly passed
-       tests.  Document several ways to limit the set of tests run.
-       * lib/am/check.am [PARALLEL_TESTS] (RECHECK_LOGS): New variable,
-       default to $(TESTS_LOGS).
-       (check-TESTS): Remove $(RECHECK_LOGS) not $(TEST_LOGS).  Drop use
-       of LAZY_TEST_SUITE.
-       ($(TEST_SUITE_LOG)): Do not output note about lazy rerun, as
-       LAZY_TEST_SUITE is gone.
-       (recheck): New target.
-       (recheck-am, recheck-TESTS): New internal targets.
-       * doc/automake.texi (Tests): Update @vindex for TESTS and
-       TEST_LOGS.  Replace description of LAZY_TEST_SUITE with a list
-       of ways the set of tests to be run can be modified.  Document
-       RECHECK_LOGS and the recheck target.
-       * tests/defs.in: Unset RECHECK_LOGS not LAZY_TEST_SUITE.
-       * tests/parallel-tests.test: Adjust, replacing LAZY_TEST_SUITE
-       with corresponding RECHECK_LOGS settings.
-       * tests/parallel-tests9.test: New tests.
-       * tests/Makefile.am: Update.
-       Suggestion and different implementation by Akim Demaille.
-
-       parallel-tests: do not mark check-TESTS as `.MAKE'.
-       * lib/am/check.am [PARALLEL_TESTS] (.MAKE): Remove check-TESTS.
-       This rule removes files, which should not be executed with BSD
-       `make -n'.
-
-       parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
-       * automake.in (handle_tests): Warn about portability issue
-       concerning generated TESTS files listed with a `$(srcdir)/'
-       or `$(top_srcdir)/' prefix.
-       * doc/automake.texi (TESTS): Document this issue.  Mention that
-       the parallel-tests driver is still experimental.
-       * tests/parallel-tests8.test: New test.
-       * tests/Makefile.am: Update.
-
-       check-html: Always create HTML output, note conversion failure.
-       * lib/am/check.am (check-html): Create `$(TEST_SUITE_HTML)' in
-       any case.  Exit unsuccessfully if HTML creation failed.
-       * tests/parallel-tests2.test: Amend test to expose this.
-
-2009-03-24  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
-       For test files with extension <ext>, introduce the internal
-       variable <EXT>_LOG_COMPILE, which expands to
-       $(<EXT>_LOG_COMPILER) $(AM_<EXT>_LOG_FLAGS) $(<EXT>_LOG_FLAGS).
-       Turn also the lib/Automake/tests testsuite over to the new
-       test driver.
-       * doc/automake.texi (Tests): Document `EXT_LOG_COMPILER' and
-       `EXT_LOG_FLAGS'.
-       * lib/am/check2.am: Insert `%COMPILE%' right before test.
-       * automake.in (handle_tests): Substitute `COMPILE' for check2,
-       empty for tests without extension, and `$(ext_LOG_COMPILE)' for
-       extension `ext'.  In the latter case, define it from the public
-       components.
-       * configure.ac (AM_INIT_AUTOMAKE): Use `parallel-test' globally.
-       * tests/Makefile.am (AUTOMAKE_OPTIONS): Remove, not needed here
-       any more.
-       * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Split ...
-       (PL_LOG_COMPILER, PL_LOG_FLAGS): ... into these new variables.
-       (TESTS_EXTENSIONS): New variable, initialize to `.pl'.
-       * tests/parallel-tests7.test: New test.
-       * tests/Makefile.am: Update.
-       Suggestion by Akim Demaille.
-
-2009-03-22  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: also record logs of SKIPped tests.
-       * lib/am/check.am [PARALLEL_TESTS] ($(TEST_SUITE_LOG)): Record
-       SKIPs as well.
-       Suggested by Jim Meyering.
-
-       Minor optimization in parallel-tests text box creation.
-       * lib/am/check.am [PARALLEL-TESTS] (am__text_box): Use only one
-       awk invocation, rather than several tools, to create a text box.
-       Suggestion from Akim Demaille.
-
-2009-03-29  Ralf Wildenhues  <address@hidden>
-
-       Rewrite maintainer-check in separate tests, parallelizable.
-       * Makefile.am (sc_diff_automake_in_automake, sc_perl_syntax)
-       (sc_no_brace_variable_expansions, sc_rm_minus_f)
-       (sc_no_for_variable_in_macro, sc_mkinstalldirs)
-       (sc_pre_normal_post_install_uninstall, sc_perl_no_undef)
-       (sc_perl_no_split_regex_space, sc_cd_in_backquotes)
-       (sc_cd_relative_dir, sc_perl_at_uscore_in_scalar_context)
-       (sc_perl_local_no_parens, sc_perl_local)
-       (sc_AMDEP_TRUE_in_automake_in, sc_tests_make_without_am_makeflags)
-       (sc_tests_plain_make, sc_tests_plain_autoconf)
-       (sc_tests_plain_autoupdate, sc_tests_plain_automake)
-       (sc_tests_here_document_format, sc_tests_Exit_not_exit)
-       (sc_tests_automake_fails, sc_tests_plain_aclocal)
-       (sc_tests_plain_perl, sc_tests_required_after_defs)
-       (sc_tests_overriding_macros_on_cmdline, sc_tests_plain_sleep)
-       (sc_tests_plain_egrep_fgrep, sc_mkdir_p, sc_perl_at_substs)
-       (sc_unquoted_DESTDIR, sc_tabs_in_texi, sc_at_in_texi): New rules,
-       all phony, all listed in ...
-       (syntax_check_rules): ... this new variable and split out from ...
-       (maintainer-check): ... this rule.  Depend on $(syntax_check_rules).
-
-       * Makefile.am (maintainer-check): Do not complain if DESTDIR is
-       passed as argument to `make'.
-
-       * doc/automake.texi (Cross-Compilation): Fix underfull hbox.
-
-       Sync auxiliary files from upstream.
-       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: Sync from upstream.
-
-2009-03-28  Ralf Wildenhues  <address@hidden>
-
-       manual: minor cleanups.
-       * doc/automake.texi (Yacc and Lex): Adjust spacing in example.
-       (Mixing Fortran 77 With C and C++): Drop unneeded @page breaks.
-
-       Sane (un)install for empty directory variables.
-       This patch fixes all install and uninstall rules to behave
-       sanely when $(wheredir) is the empty string, but $(where_HOW) is
-       nonempty, for all kinds of values of `where' and `HOW'.
-       * lib/am/data.am (install-%DIR%%PRIMARY%, uninstall-%DIR%%PRIMARY%):
-       Do not touch the install tree if the corresponding directory variable
-       $(%NDIR%dir) is empty.
-       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Likewise.
-       * lib/am/libs.am (install-%DIR%LIBRARIES, uninstall-%DIR%LIBRARIES):
-       Likewise.
-       * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Likewise.
-       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES, 
uninstall-%DIR%LTLIBRARIES):
-       Likewise.
-       * lib/am/mans.am (install-man%SECTION%, uninstall-man%SECTION%):
-       Likewise.
-       * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS):
-       Likewise.
-       * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
-       Likewise.
-       * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS):
-       Likewise.
-       * lib/am/texinfos.am (install-dvi-am, install-html-am, install-pdf-am)
-       (install-ps-am, uninstall-dvi-am, uninstall-html-am, uninstall-pdf-am)
-       (uninstall-ps-am): Likewise.
-       * tests/instdir2.test, tests/instdir-java.test,
-       tests/instdir-lisp.test, tests/instdir-ltlib.test,
-       tests/instdir-prog.test, tests/instdir-python.test,
-       tests/instdir-texi.test: New tests.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-       Suggestion by Akim Demaille.
-
-       Ensure that empty directory variables work with empty content variables.
-       This test ensures that, if both $(wheredir) and $(where_HOW) are
-       the empty string, then the `install' and `uninstall' rules behave
-       sanely, for several directory variables `wheredir' and several
-       primaries `HOW'.
-       * tests/instdir.test: New test.
-       * tests/Makefile.am: Update.
-
-2009-03-23  Ralf Wildenhues  <address@hidden>
-
-       Use --tag=FC with libtool also for .f90 files.
-       * automake.in: Set 'libtool_tag' for language `fc'.
-       * tests/fort5.test: Grep for the tag.
-       * THANKS: Update.
-       Report by John R. Cary.
-
-2009-03-22  Peter Breitenlohner  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       For PR automake/533:
-       DISTFILES containing a directory and files in that directory.
-       When the source tree contains non-writable files or directories
-       (as happens during distcheck), and directories or entries
-       thereof are listed multiple times in variables to be
-       distributed, then the corresponding directories below $(distdir)
-       need to be made writable recursively.  Since file modes should
-       not change, they need to be copied recursively using `cp -f'.
-       * lib/am/distdir.am: Handle this situation.
-       * tests/distdir.test: Extend test to those cases.
-       * NEWS: Update.
-       Report by Peter Breitenlohner.
-
-2009-03-22  Jim Meyering  <address@hidden>
-
-       Fix a documentation typo.
-       * doc/automake.texi (Headers): Clarify the note telling when it's
-       better not to use noinst_HEADERS.
-
-2009-03-22  Ralf Wildenhues  <address@hidden>
-
-       Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile.
-       This new macro lists all public targets which invoke `make'
-       recursively, or depend on targets which do so.  It allows to
-       prevent parallelism selectively, when multiple targets are
-       passed on the `make' command line.
-       * lib/am/distdir.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS): New
-       macro.
-       * lib/am/subdirs.am (AM_RECURSIVE_TARGETS): Likewise.
-       * lib/am/tags.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS):
-       Likewise.
-
-2009-03-11  Ralf Wildenhues  <address@hidden>
-
-       Fix LAZY_TEST_SUITE handling and $(TEST_SUITE_LOG) recreation.
-       * lib/am/check.am (check-TESTS): Expand `$(TEST_LOGS)' only once
-       in the rule command, for systems with low command line limits.
-       Remove $(TEST_SUITE_LOG) even in LAZY_TEST_SUITE mode.
-       ($(TEST_SUITE_LOG)): Always recreate $(TEST_SUITE_LOG).  Mention
-       lazy mode in the summary output.
-       * tests/parallel-tests.test: Test LAZY_TEST_SUITE semantics.
-
-2009-03-10  Ralf Wildenhues  <address@hidden>
-
-       Fix parallel-tests with empty $(TESTS) for BSD make.
-       * lib/am/check.am [PARALLEL_TESTS] ($(TEST_SUITE_LOG)): Ignore
-       empty line stemming from empty $(TEST_LOGS), to avoid counting
-       zero tests as one.
-       (check-TESTS): If `$(TESTS)' is empty, override TEST_LOGS to be
-       empty, rather than `.log', for BSD make.
-       * tests/parallel-tests6.test: New test.
-       * tests/Makefile.am: Update.
-
-       Mark check-html and check-TESTS as recursive for BSD make.
-       * lib/am/check.am [PARALLEL_TESTS] (.MAKE): Add check-TESTS
-       and check-html prerequisites.
-
-       Match XFAIL_TESTS correctly with Solaris make.
-       * lib/am/check.am [PARALLEL_TESTS]: VPATH rewriting may have
-       changed test names, so srcdir needs to be taken into account
-       explicitly when checking against the list of tests expected
-       to fail.  Fixes spurious FAILures from XFAIL_TESTS.
-
-       Use append mode to capture parallel test output.
-       * tests/lisp8.test: Use append mode for output from `make -j',
-       to avoid dropped lines.
-       * tests/parallel-tests3.test: Likewise.
-
-       parallel-tests: Fix summary output.
-       * lib/am/check.am (am__text_box): Fix unportable sed script,
-       replacing `\n' in the right hand side of an `s' command with
-       a literal newline.  Kudos to Bruno Haible for the newline idea.
-       * tests/parallel-tests.test: Update test to expose this.
-
-2009-03-08  Ralf Wildenhues  <address@hidden>
-
-       Overhaul of tests/README.
-       * tests/README: General overhaul.  Mention parallel test suite
-       execution, the test-suite.log file; document `Exit' vs. `exit',
-       `defs' vs. `defs-p', the naming of `parallel-tests' tests.
-       * README: Simplify, point to tests/README.
-
-       Documentation for the parallel-tests driver.
-       * doc/automake.texi (Tests, Options): Document the `parallel-tests'
-       option, including new features of the test driver.
-       * NEWS: Update.
-
-       New tests for `parallel-tests'.
-       * tests/parallel-tests.test: New file, to expose a bunch of
-       features of `parallel-tests': VERBOSE, clean, TEST_SUITE_LOG,
-       test dependencies, DISABLE_HARD_ERRORS.
-       * tests/parallel-tests2.test: New file, test check-html.
-       * tests/parallel-tests3.test: New file, test concurrency.
-       * tests/parallel-tests4.test: New file, test suffix rules.
-       * tests/parallel-tests5.test: New file, demonstrate compile/test
-       concurrency.
-       * tests/defs.in: Add a `required' check for rst2html.
-       * tests/Makefile.am: Update.
-
-       parallel-tests: Ensure backward-compatible semantics.
-       For each test in Automake's test suite that uses TESTS, generate
-       an identical one that uses the `parallel-tests' option, for
-       coverage of backward-compatible functionality.
-       * tests/gen-parallel-tests: New file, generates distributed
-       Makefile.am snippet tests/parallel-tests.am to list all tests
-       that use the TESTS interface but not yet the `parallel-tests'
-       option, with names mangled to use suffix `-p.test', in ...
-       (parallel_tests): ... this new make macro.
-       * tests/Makefile.am ($(srcdir)/parallel-tests.am)
-       ($(parallel_tests), defs-p): New rules.
-       (TESTS): Add check11.test and $(parallel_tests).
-       (check_SCRIPTS): Add defs-p, $(parallel_tests).
-       (check-clean-local): Remove `defs-p'.
-       (EXTRA_DIST): Distribute gen-parallel-tests.
-       (MAINTAINERCLEANFILES): New variable, remove $(parallel_tests).
-       * bootstrap: Generate parallel-tests.am.
-       * tests/check8.test: Check for circular dependencies in rules.
-       * tests/check11.test: New test, check that SKIPs are not counted
-       as passed tests.
-       * tests/defs.in: Unset DISABLE_HARD_ERRORS, LAZY_TEST_SUITE,
-       VERBOSE, so the tests are not influenced by the way our test
-       suite is invoked.
-
-2009-03-08  Akim Demaille  <address@hidden>
-           Jim Meyering  <address@hidden>
-           Benoit Sigoure  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Parallel test execution: new option `parallel-tests'.
-       * automake.in (handle_tests): Set new conditional PARALLEL_TESTS
-       when reading check.am.  Handle option `parallel-tests' and all
-       its new semantics.  Define macros TEST_SUFFIXES, TEST_SUITE_LOG,
-       TEST_SUITE_HTML, TEST_LOGS, TEST_LOGS_TMP, suffix rules if
-       applicable, and per-target rules for other tests.  Add all log
-       files to %clean_files at the `MOSTLY_CLEAN' level.
-       * lib/Automake/Options.pm (_process_option_list): Accept
-       `parallel-tests'.
-       * lib/am/check.am [!PARALLEL_TESTS] (check-TESTS): Move existing
-       testsuite driver under this new conditional.
-       [PARALLEL_TESTS]
-       (am__rst_title, am__rst_section, am__text_box am__sh_e_setup)
-       (am__check_pre, am__check_post): New internal macros.
-       ($(TEST_SUITE_LOG), check-TESTS, .log.html, check-html): New
-       rules.
-       * lib/am/check2.am: New file.
-       * lib/am/Makefile.am (dist_am_DATA): Add check2.am.
-       * tests/Makefile.am (AUTOMAKE_OPTIONS): Use `parallel-tests'.
-       (clean-local): Renamed from distclean-local.
-       * tests/defs.in: Drop VERBOSE handling, not needed here any more.
-
-2009-03-12  Ralf Wildenhues  <address@hidden>
-
-       Rename `silent' mode to `silent-rules' mode.
-       * automake.in (define_verbose_var, verbose_flag)
-       (define_verbose_tagvar, handle_options, handle_languages)
-       (handle_configure, parse_arguments): Rename the `silent' option
-       to `silent-rules', so it coincides with the `--silent-rules'
-       command line option; adjust all code and comments.
-       * lib/Automake/Options.pm (_process_option_list): Likewise.
-       * doc/automake.texi (Invoking Automake, Libtool Flags, Options):
-       Likewise.
-       * NEWS: Adjust.
-       * tests/dollarvar.test, tests/silent.test, tests/silent2.test,
-       tests/silent3.test, tests/silent4.test, tests/silent5.test,
-       tests/silent6.test, tests/silent7.test: Likewise.
-       Suggestion by Jan Engelhardt.
-
-2009-03-11  Ralf Wildenhues  <address@hidden>
-
-       `silent' mode unconditionally overrides portability-recursive.
-       * automake.in (parse_arguments): Don't handle a global `silent'
-       option here; instead, ...
-       (handle_options): ... handle the "normal" `silent' option here.
-       Override `portability-recursive' here, at the last point we deal
-       with options, instead ...
-       * lib/Automake/Options.pm (_process_option_list): ... of here.
-       * tests/silent6.test: Replace unportable make snippet, remove
-       FIXME note, add more test cases of options passed in the various
-       locations.
-
-       Drop extra line from compile rules when `silent' is not used.
-       * lib/am/depend2.am [!%FASTDEP%]: Only use the `%VERBOSE%
-       @AM_BACKSLASH@' extra line if ?VERBOSE?.
-       Report by Ralf Corsepius.
-
-2009-03-10  Ralf Wildenhues  <address@hidden>
-
-       Keep `--silent-rules' across triggered automake reruns.
-       * automake.in (usage): Reformat to be a bit clearer.
-       (handle_configure): Remove substitutions %STRICTNESS% and
-       %USE-DEPS% in favor of a new substitution %AUTOMAKE-OPTIONS%
-       that carries over all needed flags.
-       * lib/am/configure.am (%MAKEFILE-IN%): Adjust rule.
-       * tests/flavor.test: New test, to ensure --$flavor (gnu,
-       gnits, foreign, cygnus), --ignore-deps, and --silent-rules are
-       preserved across automake reruns.
-       * tests/Makefile.am: Update.
-
-2009-03-09  Ralf Wildenhues  <address@hidden>
-
-       Provide variables for silencing of user rules.
-       * automake.in (handle_languages): Always define `AM_V_GEN' and
-       `AM_V_at'.
-       * doc/automake.texi (Options): Document these flags.
-       * tests/silent7.test: New test.
-       * tests/Makefile.am: Update.
-
-       Redo variable naming for `silent' machinery.
-       The public variables are named `AM_V_' plus the compiler
-       short-hand now, e.g.: AM_V_CC, AM_V_CXXLD, AM_V_GEN.  The
-       dispatch variables are internal details and begin with
-       `am__v_'.
-       * automake.in (verbose_var): Update comment.
-       (verbose_private_var): New function.  Order functions so that
-       ones not needed outside this section are listed first.
-       (verbose_dispatch): Remove, no need to factor this.
-       (define_verbose_var, define_verbose_libtool): Use
-       verbose_private_var.
-       (define_verbose_tagvar): Likewise; and simplify.
-       Report by Jan Engelhardt.
-
-       Let -Wportability turn on/off the portability-recursive channel.
-       * lib/Automake/ChannelDefs.pm (switch_warning): switch
-       `portability-recursive' channel as well if changing the
-       `portability' channel.
-       * tests/dollarvar2.test: New test.
-       * tests/Makefile.am: Update.
-
-2009-03-07  Ralf Wildenhues  <address@hidden>
-
-       New automake command line option `--silent-rules'.
-       * automake.in (parse_arguments): Accept `--silent-rules; let it
-       override command line warning settings.
-       (usage): Document it.
-       * doc/automake.texi (Invoking Automake): Document it.
-       * NEWS: Update.
-       * tests/dollarvar.test: Also test `--silent-rules'.
-       * tests/pr300-ltlib.test: Use `$MAKE V=1' to enable verbose
-       output, which is matched later in the test.
-       * tests/silent6.test: New test.
-       * tests/Makefile.am: Update.
-
-       Documentation and tests for the `silent' option.
-       * NEWS: Update.
-       * doc/automake.texi (Invoking Automake): `silent' turns off some
-       portability warnings.
-       (Libtool Flags): `silent' silences libtool.
-       (Options): Document the `silent' flag.
-       * tests/dollarvar.test, tests/silent.test, tests/silent2.test,
-       tests/silent3.test, tests/silent4.test, tests/silent5.test: New
-       tests.
-       * tests/Makefile.am: Update.
-       * Makefile.am (maintainer-check): Ignore `DESTDIR' and `V' when
-       checking for make variables that should not be overridden from
-       the command line.
-
-2009-03-07  Jan Engelhardt  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Implement `silent' build rules.
-       * automake.in (ccer): New field in the language structure.
-       Initialize it for all registered languages.
-       (verbose_var, verbose_flag, verbose_dispatch)
-       (silent_flag, define_verbose_var, define_verbose_tagvar)
-       (define_verbose_libtool): New functions.
-       (handle_languages, handle_programs, handle_libraries)
-       (handle_ltlibraries, handle_configure)
-       (define_compiler_variable, define_linker_variable)
-       (define_per_target_linker_variable): Use them where appropriate
-       to define variables to implement the silent output machinery.
-       * lib/Automake/Options.pm (_process_option_list): Accept
-       `silent', turning off `portability-recursive'.
-       * lib/am/depend2.am: Add %VERBOSE% and %SILENT% prefixes where
-       appropriate.
-       * lib/am/lex.am: Likewise.
-       * lib/am/library.am: Likewise.
-       * lib/am/ltlibrary.am: Likewise.
-       * lib/am/program.am: Likewise.
-       * lib/am/yacc.am: Likewise.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Substitute, but do not define,
-       AM_BACKSLASH.
-       * tests/defs.in: Unset `V', to avoid influencing inner tests.
-
-2009-03-07  Ralf Wildenhues  <address@hidden>
-
-       New channel `portability-recursive'.
-       Add new channel for portability warnings about recursive make
-       variable expansions `$(var1$(var2))'.  Enable it alongside
-       `-Wportability'.
-       * lib/Automake/ChannelDefs.pm (Automake::ChannelDefs): Register
-       channel `portability-recursive'.
-       * lib/Automake/Variable.pm (_VARIABLE_CHARACTERS)
-       (_VARIABLE_RECURSIVE_PATTERN): New variables.
-       (check_variable_expansions): Diagnose recursive variable
-       expansions through the new channel.
-
-2009-03-14  Ralf Wildenhues  <address@hidden>
-
-       * NEWS: Update.
-
-2009-03-12  Ralf Wildenhues  <address@hidden>
-
-       Ignore warnings from autom4te about Libtool macros.
-       * tests/ltinstloc.test: When testing for presence of warnings,
-       filter out any that are not interesting for this test, e.g.,
-       warnings about installed files or about bogusly named cache
-       variables in libtool.m4, emitted by recent Autoconf when older
-       Libtool is used.
-
-2009-03-09  Ralf Wildenhues  <address@hidden>
-
-       Relax depcomp test for MSVC to not require minuso.
-       * m4/depend.m4 (_AM_DEPENDENCIES): When checking the msvisualcpp
-       and msvcmsys depmodes, do not require `-c -o' to work just yet.
-       It is not needed by the depcomp script for these depmodes, and
-       works around the ordering issue between the tests.
-       Report by Peter Rosin.
-
-2009-03-09  Peter Rosin  <address@hidden>
-
-       * tests/compile2.test: Fix typo.
-
-2009-03-07  Ralf Wildenhues  <address@hidden>
-
-       Improve NetBSD 'make -n' output for many standard targets.
-       * automake.in (handle_tags): Let .MAKE depend on
-       `tags-recursive' and `ctags-recursive' if appropriate.
-       (handle_all): Likewise for `all'.
-       (do_check_merge_target): Likewise for `check-am' and `check'.
-       * lib/am/ansi2knr.am (.MAKE): Depend on %ANSI2KNR-DIR%/ansi2knr.
-       * lib/am/install.am [%?maybe_BUILT_SOURCES%] (.MAKE): Depend on
-       `install'.
-       * tests/maken3.test, tests/maken4.test: New tests.
-       * tests/Makefile.am: Update.
-
-       Improve `make -n dist' and `make -n distcheck' for GNU make.
-       Ensure that `make -n dist' and `make -n distcheck' do not change
-       files, due to GNU make executing rules containing `$(MAKE)'.
-       * lib/am/distdir.am (distdir): Separate the creation of
-       `$(distdir)/$$subdir' for `$(DIST_SUBDIRS)' and the recursion
-       into the `$(DIST_SUBDIRS)' in two separate rule commands.
-       (distcheck): Exit recursive rule early when run with `make -n',
-       as detected by a witness file.
-       * tests/maken.test, tests/maken2.test: New tests.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-
-2009-03-07  Ralf Wildenhues  <address@hidden>
-
-       Solaris make testsuite fixes.
-       * tests/check10.test: When a rule fails, Solaris make will
-       output the complete command that failed; in this case the test
-       suite driver.  Adjust the test to not bogusly match lines from
-       the driver, rather than its output.
-       * tests/distcleancheck.test: Avoid triggering VPATH rewriting,
-       not desirable in this test.
-       * tests/specflg10.test: Use BUILT_SOURCES to specify an
-       intermediate target, so Solaris make knows what to do.
-
-       testsuite: SKIP compile tests if configure found no compiler.
-       * tests/depend6.test: configure will exit 77 if AC_PROG_CC found
-       no working compiler.  Allow the test to be SKIPped in that case.
-       * tests/postproc.test: Likewise.
-       * tests/pr243.test: Likewise.
-       * tests/pr266.test: Likewise.
-
-       Fix maintainer-check fallout.
-       * tests/compile2.test: Use `Exit', not `exit'.
-
-2009-03-07  Peter Breitenlohner  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Extract correct man section from files in man_MANS.
-       * lib/am/mans.am: Extract correct man section in the presence of
-       multiple dots in the file base name and/or directory components.
-       * tests/man5.test: New test case.
-       * tests/Makefile.am: Update.
-
-2009-03-06  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (maintainer-mode): Fix logic in
-       AM_MAINTAINER_MODE description.
-       * THANKS: Update.
-       Report by Daniel Kahn Gillmor.
-
-2009-03-05  Ralf Wildenhues  <address@hidden>
-
-       * lib/gnupload: Change conffile name to `.gnuploadrc'.
-
-2009-03-04  William Pursell  <address@hidden>
-
-       Replace bare `automake' with address@hidden' or `Automake'.
-       * doc/automake.texi: Avoid bare `automake' in the manual,
-       replacing occurrences with address@hidden' when the command
-       is meant, and `Automake' when speaking about the software
-       package in general.
-
-2009-03-04  Ralf Wildenhues  <address@hidden>
-
-       * lib/depcomp: Various portability and quoting nits.
-
-       reformat gnupload script.
-       * lib/gnupload: Reformat and reindent.
-
-       gnupload touchups.
-       * lib/gnupload (conffile): New variable.  Use throughout.
-       (dry_run): Use `false' and `:' values.  Show, don't execute,
-       gpg signing commands upon --dry-run.
-       (usage): Typo and formatting fixes.  Mention that commands are
-       applied in order.
-       (argument loop): Factorize a bit, fix quoting.
-       (dprint, mkdirective, mksymlink, upload): Formatting and
-       portability fixes.
-
-2009-03-04  Sergey Poznyakoff  <address@hidden>
-
-       Various gnupload improvements.
-       Add support for uploading to download.gnu.org.ua.
-       Add support for a .gnupload configuration file.
-       Support creating and removing symlinks.
-       Allow for several operations in a single invocation.
-       Add debugging features.
-       * lib/gnupload: New options --delete, --symlink, --rmsymlink,
-       --symlink-regex, --dry-run; support `--' to separate options and
-       commands from files.  New target download.gnu.org.ua.  Expand
-       `.gnupload' file contents before command line arguments.
-       (usage): Expand.
-       (dprint, mkdirective, mksymlink, upload): New functions.
-       * THANKS: Update.
-
-2009-03-03  Peter Rosin  <address@hidden>
-
-       Add depmode=msvcmsys for Microsoft Visual C++ on MSYS.
-       * lib/depcomp [msvisualcpp]: Fork fewer processes. Filter out
-       libtool in the preprocessor invocation (as is done in
-       depmode=cpp). Silence compiler stderr.
-       [msvcmsys]: New depmode as a derivative of depmode=msvisualcpp.
-       msvcmsys transforms any backslashes into forward slashes to
-       make the grep in depend.m4 match, instead of the "cygpath -u"
-       that is used in msvisualcpp.
-
-2009-03-03  Ralf Wildenhues  <address@hidden>
-           Peter Rosin  <address@hidden>
-
-       Fix w32 path handling in the `compile' script.
-       * lib/compile: Handle colons and backslashes in win32 paths.
-       * tests/compile2.test: New test.
-       * tests/Makefile.am: Update.
-       Report and initial patch by Peter Rosin.
-
-2009-03-03  Ralf Wildenhues  <address@hidden>
-
-       Fix `use constant' usage for MSYS Perl 5.6.0.
-       * automake.in (QUEUE_MESSAGE, QUEUE_CONF_FILE, QUEUE_LOCATION)
-       (QUEUE_STRING): Define using one `use constant' each; as perl
-       5.6.0 (on MSYS) does not understand `use constant { ... }'.
-       * THANKS: Update.
-       Report by Peter Rosin.
-
-2009-03-01  Ralf Wildenhues  <address@hidden>
-
-       Fix recursive html and install-* doc rules for BSD make.
-       * automake.in (%required_targets): Add html-am,
-       install-html-am, install-dvi-am, install-pdf-am, install-ps-am,
-       install-info-am.
-       * tests/txinfo32.test: New test.
-       * tests/Makefile.am: Update.
-
-       Fix comment typo.
-       * lib/am/distdir.am (distcheck): Fix typo in comment.
-
-       Ignore generated files below doc/amhello for git.
-       * doc/amhello/.gitignore: New file.
-
-2009-02-17  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Program variables): Add cross reference to
-       `Flag Variables Ordering' node.
-       Report by Karl Berry.
-
-2009-01-31  Ralf Wildenhues  <address@hidden>
-
-       Fix mmodely.test to work on Solaris 10.
-       * tests/mmodely.test: Define yylex, to satisfy needed symbol in
-       libfl.  Return from main instead of using exit, undeclared.
-       * THANKS: Update.
-       Report by Chris Hoogendyk.
-
-2009-01-30  Karl Berry  <address@hidden>
-
-       * lib/gnupload: Add download URL to --help output.
-
-2009-01-23  Eric Blake  <address@hidden>
-
-       Use no-arg macros via AC_REQUIRE for consistency.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require, rather than directly
-       expand, AM_PROG_INSTALL_SH and AM_PROG_INSTALL_STRIP.
-       * configure: Regenerate.
-
-2009-01-20  Ralf Wildenhues  <address@hidden>
-
-       Bump copyright years.
-       * aclocal.in (write_aclocal, version): Bump copyright years.
-       * automake.in (gen_copyright, version): Likewise.
-       * doc/automake.texi: Likewise.
-
-2008-12-29  Chris Pickett  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (LIBOBJS): Clarify overriding of
-       `*_DEPENDENCIES'.
-       * THANKS: Update.
-
-2008-12-21  Ralf Wildenhues  <address@hidden>
-
-       Revamp semantics for `missing help2man' and manpage distribution.
-       Previously, `missing help2man' would create a missing man page
-       containing an error message, and exit 1.  This does not play
-       well with `make': the next run will see this particular man page
-       as being up to date, and will only error out on the next
-       generated man page, if any; repeat until all pages are done.
-       This patch changes `missing' to exit successfully in this case,
-       but `make dist' will ensure that no such man pages are packaged.
-       * lib/missing: Exit successfully even if we create a replacement
-       page due to missing help2man.
-       * automake.in (make_paragraphs): Define %HAVE-MANS% to be true
-       if this makefile deals with man pages.
-       * lib/am/distdir.am (distdir): If %INSTALL-MAN% and %HAVE-MANS%,
-       check that no man page in $(MANS) contains the replacement text
-       from `missing'.
-       * tests/man4.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS: Reorder a bit, update.
-       * THANKS: Update.
-       Report by Werner Lemberg and Karl Berry.
-
-       Do not use 'global' for makefile-wide settings.
-       * doc/automake.texi (Linking, Libtool Flags)
-       (Program and Library Variables, Flag Variables Ordering):
-       Reword instances of `global variables' that really mean
-       makefile-wide ones.
-       * THANKS: Update.
-       Report by Andreas Bergmeier.
-
-       Fix config.status depfiles failure.
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Commands are
-       again a single shell brace group, so they are correctly skipped
-       when dependencies are turned off.  The failure is noisy with
-       ksh only.
-       * tests/depend6.test: New test.
-       * tests/Makefile.am: Adjust.
-       * THANKS: Update.
-       Report and different suggested patch by Markus Duft.
-
-2008-12-21  Zoltan Rado  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (DESTDIR): Fix a couple of typos.
-       * THANKS: Update.
-
-2008-12-13  Ralf Wildenhues  <address@hidden>
-
-       Fix nonportable sed script in 'missing'.
-       * lib/missing: In sed script, do not use ';' after 't' commands.
-
-2008-12-07  Ralf Wildenhues  <address@hidden>
-
-       PR automake/531:
-       * doc/automake.texi (amhello Explained)
-       (Mixing Fortran 77 With C and C++): Fix broken links to
-       Autoconf manual.
-       Report by Michael Ploujnikov.
-
-2008-12-07  Michael Ploujnikov  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Optional, Future of aclocal): Various
-       spelling and grammar fixes.
-       * THANKS: Update.
-
-2008-12-03  William Pursell  <address@hidden>
-
-       Simple typographical and grammar errors in automake.texi.
-       * doc/automake.texi: Fix object/article consistency (eg "an
-       flag" becomes "a flag"), correct minor punctuation errors, etc.
-
-       * doc/automake.texi (Auxiliary Programs, Python, Rebuilding):
-       Replace 'configure' with '@command{configure}' as appropriate.
-
-2008-11-29  Ralf Wildenhues  <address@hidden>
-
-       Fixup release rules.
-       * Makefile.am (cvs-diff): Remove.
-       (git-dist): Do not use clcommit any more.  Use new-style tag
-       name.  Pass $(AM_MAKEFLAGS) to $(MAKE).
-       (git-diff): Adjust.
-       (git-release): Do not upload to sources.redhat.com.
-
-2008-11-27  Ralf Wildenhues  <address@hidden>
-
-       Fix portability issues in distcleancheck_listfiles doc example.
-       * doc/automake.texi (Dist): In the `distcleancheck_listfiles'
-       code example, add `.' path, for Solaris `find', also rewrite so
-       `{}' appears only once and as separate argument, for Posix.
-       * tests/distcleancheck.test: New test.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-       Report by Jan Engelhardt and Andreas Schwab.
-
-2008-11-27  Ralf Wildenhues  <address@hidden>
-           Jim Meyering  <address@hidden>
-
-       Cope with whitespace in $MISSING and $install_sh.
-       * configure.ac (am_AUTOHEADER): New substitution, save the value
-       of $AUTOHEADER before AM_INIT_AUTOMAKE may add $MISSING.
-       * tests/defs.in: Use am_AUTOHEADER.
-       * lib/am/install.am: Fix typo.
-       * m4/install-sh.m4 (AM_PROG_INSTALL_SH): Add suitable
-       single-quote quoting to install_sh, but only if needed.
-       * m4/missing.m4 (AM_MISSING_HAS_RUN): Add suitable double-quote
-       quoting to MISSING, but only if needed.
-       * m4/sanity.m4 (AM_SANITY_CHECK): Abort configure if `pwd` or
-       $srcdir contain shell meta-characters that cannot be handled;
-       space and tab are allowed in the former only.
-       * tests/sanity.test: New test.
-       * tests/Makefile.am: Adjust.
-       * NEWS: Update.
-       Reports by Jim Meyering and others.
-
-2008-11-24  Ralf Wildenhues  <address@hidden>
-
-       Let `missing' also work with versioned and prefixed programs.
-       * lib/missing: Ignore prefixes of `gnu-', `gnu', and `g' when
-       testing for known programs; also, ignore suffixes.
-       * tests/missing.test: Amend test.
-       * NEWS, THANKS: Update.
-       Report by Tim Rice.
-
-2008-11-23  William Pursell  <address@hidden>
-
-       * doc/automake.texi (Macro search path, Extending aclocal)
-       (Local Macros, Serials, Public macros, Directories)
-       (Conditional Subdirectories, Nesting Packages)
-       (Building a program, Libtool Modules)
-       (Program and Library Variables, Default _SOURCES, LIBOBJS):
-       Correct verb/object tense agreement, swap some words,
-       and general trivial cleanup.
-
-2008-11-22  William Pursell  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (VPATH Builds, Nested Packages)
-       (Length limitations, Auxiliary Programs, Invoking Automake)
-       (Requirements, Optional): Fix typos and grammaros, correct URL
-       to 'config' source repository.  Rewrite description of AC_SUBST.
-       (true): Cross-reference to `Default _SOURCES' node.
-
-2008-11-22  William Pursell  <address@hidden>
-
-       * configure.ac: Quote APIVERSION.
-
-2008-11-22  Jim Meyering  <address@hidden>
-
-       * tests/xz.test: Fix typo introduced by Ralf in last patch.
-
-       Add xz compression support.
-       * NEWS: Mention xz as well as lzma (xz will displace lzma).
-       * automake.in (handle_dist): Recognize dist-xz.
-       (make_paragraphs): Map XZ to dist-xz.
-       * doc/automake.texi (Dist): Add dist-xz.
-       (Options): Likewise.
-       * lib/Automake/Options.pm (_process_option_list): Accept
-       dist-xz.
-       * lib/am/distdir.am (dist-xz): New rule.
-       (dist dist-all): Add command to create an xz-compressed tarball.
-       (distcheck): Handle xz-compressed tarballs just like the others.
-       * tests/xz.test: New file, based on nogzip.test.
-       * tests/Makefile.am (TESTS): Add xz.test.
-
-2008-11-22  Ralf Wildenhues  <address@hidden>
-
-       When installing COPYING, recommend adding the file to VCS.
-       * automake.in (require_file_internal): If installing `COPYING',
-       mention that we install the GPLv3 file and recommend adding the
-       file to version control.
-       * doc/automake.texi (Invoking Automake): Point to `Gnits' node
-       for `--add-missing'.
-       (Gnits): Clarify semantics: that for strictness gnu or higher,
-       INSTALL is installed, and that COPYING is installed as GPLv3
-       if no COPYING file exists.
-       * tests/license2.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS, THANKS: Update.
-       Report by Brian Cameron.
-
-2008-11-20  William Pursell  <address@hidden>
-
-       * doc/automake.texi (Timeline): Fix typos and grammaros.
-
-2008-11-12  Karl Berry  <address@hidden>
-
-       New gnupload option --delete to remove archive files.
-       * lib/gnupload: Accept --delete to remove files from
-       alpha.gnu.org or ftp.gnu.org.
-
-2008-11-12  Ralf Wildenhues  <address@hidden>
-
-       Testsuite fixes for ksh.
-       * tests/check10.test: Add ':' as last command in subshell, for
-       zero exit status of the subshell.
-       * tests/parallel-am.test: Do not let failing 'unset' of
-       nonexistent variable exit the test.
-       * tests/parallel-am2.test: Likewise.
-       * tests/parallel-am3.test: Likewise.
-
-2008-11-11 Charles Wilson  <address@hidden>  (tiny change)
-          Ralf Wildenhues  <address@hidden>
-
-       Cleanup config.lt in case LT_OUTPUT is in use.
-       * lib/am/libtool.am [TOPDIR_P] (distclean-libtool): clean up
-       config.lt as well as libtool.
-       * tests/libtoo11.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-
-2008-11-11  Ralf Wildenhues  <address@hidden>
-
-       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: Sync from upstream.
-
-2008-11-10  Ralf Wildenhues  <address@hidden>
-
-       Update to GFDL 1.3.
-       * doc/fdl.texi: Update to GFDL 1.3.
-       * doc/automake.texi (GNU Free Documentation License): Adjust.
-       * NEWS: Update.
-
-       * NEWS: Fix typos.
-       * automake.in: Fix typos in comments.  Remove extraneous
-       whitespace.
-
-2008-11-06  Ralf Wildenhues  <address@hidden>
-
-       Cope with absent Perl modules threads and Thread::Queue.
-       * automake.in: Instead of `use threads', use `require threads;
-       import threads' inside a BEGIN section.  Likewise for
-       Thread::Queue.
-       * lib/Automake/ChannelDefs.pm (Automake::ChannelDefs): Likewise.
-       * lib/Automake/tests/Condition-t.pl: Likewise.
-       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
-       * configure.ac: Likewise, use `require' and `import'.
-       Report by Eric Blake, fix suggested by Ben Pfaff.
-
-2008-11-04  Ralf Wildenhues  <address@hidden>
-
-       Multiple 'make uninstall' should not fail even for TEXINFOS.
-       * lib/am/texinfos.am (uninstall-info-am): Do not fail due to
-       install-info if the installed file does not exist (any more).
-       * tests/txinfo26.test: Issue multiple `make uninstall'.
-       * tests/instmany-mans.test: Likewise.
-       * tests/instmany-python.test: Likewise.
-       * tests/instmany.test: Likewise.
-       * tests/txinfo26.test: Likewise.
-       * NEWS: Update.
-
-2008-11-03  Ralf Wildenhues  <address@hidden>
-
-       New public macro AM_SUBST_NOTMAKE.
-       * m4/substnot.m4 (AM_SUBST_NOTMAKE): New public macro; invoke
-       _AM_SUBST_NOTMAKE with arguments.
-       * doc/automake.texi (Optional): Document it.
-       * NEWS: Update.
-       * tests/subst4.test: New test.
-       * tests/Makefile.am: Update.
-       Suggestion by Bruno Haible.
-
-       Fix regression introduced by AM_DEFAULT_SOURCE_EXT.
-       * automake.in (handle_source_transform): Use the right variable
-       when determining whether to apply the old rule for the libtool
-       library default source name.
-       Testsuite failure exposed by Bob Proulx' build daemon.
-
-2008-11-02  Ralf Wildenhues  <address@hidden>
-
-       New maintainer target release-stats.
-       * Makefile.am (release-stats): New target, to help computing the
-       entries in the statistics table in automake.texi.
-       * doc/automake.texi (Releases): Reformat a bit.  Add number of
-       generated files.  Add entry for 1.10.1.
-
-       Choose default source extension: AM_DEFAULT_SOURCE_EXT.
-       * automake.in (handle_source_transform): Accept unconditional
-       literal extension in AM_DEFAULT_SOURCE_EXT as override for the
-       default source extension `.c'.  If set, ignore the old default
-       source rule for libtool libraries.
-       * doc/automake.texi (Default _SOURCES): Document this.
-       * NEWS: Update.
-       * tests/specflg10.test: New test.
-       * tests/Makefile.am: Update.
-       Suggestion by Akim Demaille.
-
-       Fix maintainer-check failure.
-       * tests/parallel-am.test: Rename variable to not match pattern
-       used in maintainer-check.
-
-2008-10-27  Ralf Wildenhues  <address@hidden>
-
-       * NEWS: Fix typo.
-       Spotted by Jim Meyering.
-
-2008-10-26  Ralf Wildenhues  <address@hidden>
-
-       Parallel automake --add-missing: serialized file installs.
-       * automake.in (QUEUE_CONF_FILE, QUEUE_LOCATION, QUEUE_STRING):
-       New serialization keys.
-       ($required_conf_file_queue): New file global.
-       (queue_required_conf_file, require_queued_conf_file): New
-       functions, to queue and dequeue requirements for aux dir files.
-       (require_conf_file): Enqueue if needed.
-       (get_number_of_threads): Can do threads with --add-missing now.
-       (handle_makefiles_threaded): Let worker threads enqueue, let
-       master attend to queued requirements at the right time.
-       * tests/parallel-am.test: Explain the purpose of the include
-       chain used here.
-       * tests/parallel-am2.test: Also cope with --add-missing.
-       * tests/parallel-am3.test: New test, test absence of races with
-       concurrent same-file installs stemming from --add-missing.
-       * tests/Makefile.am: Adjust.
-
-       Implement serialization for Locations.
-       * lib/Automake/Location.pm (serialize, deserialize): New
-       functions.  They allows to serialize a Location in an array, and
-       to restore a Location from a thread queue.  The API is
-       unsymmetric (array vs. queue) because enqueuing data needs to
-       happen atomically.
-
-       Parallel automake: ordered output messages.
-       * lib/Automake/Channels.pm (%_default_options): New options
-       `ordered' default enabled, `queue', default zero (no queue),
-       `queue_key' default undefined.
-       (_merge_options): Ensure `ordered' channels cannot have fatal
-       messages or backtrace output.
-       (_enqueue, _dequeue): New functions, to push messages onto a
-       Thread::Queue, and output messages from such a queue, suitably
-       weeded for duplicates in the same manner as _print_message.
-       (_print_message): If the channel is ordered and has an
-       associated queue, then enqueue messages instead of printing
-       them.
-       (setup_channel_queue, pop_channel_queue): New functions,
-       to set a Thread::Queue for channels, and to flush a queue.
-       * lib/Automake/ChannelDefs.pm: Unset channel option `ordered'
-       for fatal, automake, and verb channels.
-       * automake.in (QUEUE_MESSAGE): New global constant, used as
-       serialization key.
-       (handle_makefiles_threaded): Create message queues for each
-       input file; workers queue messages, and the master outputs them
-       ordered, using the new Channels.pm functions.
-       * tests/parallel-am.test: Also check for ordered output (in the
-       absence of --add-missing races).
-       * tests/parallel-am2.test: New test; check for ordered output of
-       warning and (regular) error messages.
-       * tests/Makefile.am: Adjust.
-
-       Parallel automake execution: AUTOMAKE_JOBS.
-       * lib/Automake/Config.in (perl_threads): New global.
-       * automake.in: Use it.  If the perl supports interpreter-based
-       threading, then use `threads' and `Thread::Queue'.
-       (handle_makefile, handle_makefiles_serial): New functions,
-       factored out from main.
-       (get_number_of_threads): New function, compute number of threads
-       to use, based on environment variable `AUTOMAKE_JOBS' and number
-       of independent makefiles.
-       (handle_makefiles_threaded): New function.  Spawn threads, use
-       thread queue to distribute handling the different makefiles.
-       Collect $exit_code values from threads.
-       (main): Use new functions.
-       * aclocal.in: No threads here.
-       * configure.ac: Substitute PERL_THREADS; enabled with perl >=
-       5.7.2 and when ithreads are available.
-       * bootstrap (dosubst): Likewise.
-       * Makefile.am (do_subst): Likewise.
-       * lib/Automake/Makefile.am (do_subst): Likewise.
-       * lib/Automake/ChannelDefs.pm: Use `Automake::Config' and
-       `threads'.
-       (verb): Prepend thread ID (tid) to verbose messages.
-       * lib/Automake/Channels.pm (msg): Before exiting, flush stderr,
-       needed for worker threads.
-       * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Also
-       include the build tree path, so Config.pm is found.
-       * tests/parallel-am.test: New test.
-       * tests/Makefile.am: Update.
-       * doc/automake.texi (Invoking Automake): Document AUTOMAKE_JOBS.
-       * NEWS, THANKS: Update.
-       Report about long execution times by Joakim Tjernlund and others.
-
-2008-10-26  Ralf Wildenhues  <address@hidden>
-
-       Minor file checking optimization: set_dir_cache_file.
-       * lib/Automake/FileUtils.pm (set_dir_cache_file): New function.
-       * automake.in (require_file_internal): Instead of resetting the
-       cache when a file has been installed, simply correct the cache
-       using set_dir_cache_file.
-
-       No uniquifying for fatal, prog_error, and verbose messages.
-       There is no point in dropping critical messages, even if they
-       are duplicates (unlikely to happen unless they have been sent
-       as non-critical messages before), and verbose messages should
-       enable to show progress, even using duplicate statements.
-       * lib/Automake/ChannelDefs.pm (fatal, automake, verb): Set
-       `uniq_part' to `UP_NONE' when registering these channels.
-
-       Fix 'config.status --file=... depfiles' with new Autoconf.
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Eval
-       $CONFIG_STATUS contents if we detect the quoting used by
-       Autoconf 2.62 and newer for --file=.
-       * tests/depend5.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS, THANKS: Update.
-       Report by Sam Steingold against gnulib.
-
-2008-10-26  Johan Dahlin  <address@hidden>
-
-       Support for Python 3.0, drop support for pre-2.0.
-       * lib/py-compile: Do not import string; use sys.stdout.write
-       instead of print, files.split instead of string.split.
-       * m4/python.m4 (AM_PATH_PYTHON): Also look for python3 and
-       phython3.0; do not look for python1.5.  Use sys.stdout.write.
-       (AM_PYTHON_CHECK_VERSION): Do not use string; adjust to xrange
-       removal in Python 3.0, and changed semantics of map.
-       * doc/automake.texi (Python, Hard-Coded Install Paths): Update
-       Python versions mentioned in the manual, using 2.5 everywhere.
-       * NEWS, THANKS: Update.
-
-2008-10-22  Ralf Wildenhues  <address@hidden>
-
-       * lib/Automake/Channels.pm (@chain): Drop unused variable.
-
-       Cleanup of per-input global variables in automake.in.
-       * automake.in ($output_vars, $output_all, $output_header)
-       ($output_rules, $output_trailer): Fix comment, and sort
-       declarations in the order they will appear in the output.
-       ($all_target): Unused variable, remove.
-       (Variables not reset by &initialize_per_input.): New section,
-       clarify that %am_file_cache is not reset.
-       (initialize_per_input): Reset $am_file_name, $am_relative_dir,
-       $in_file_name, $relative_dir, and $topsrcdir to `undef' rather
-       than the empty string; $topsrcdir was not reset at all.  Sort
-       remaining variables in the same order as in the section
-       `Variables reset by &initialize_per_input'.
-
-       Let stderr output end up on fd 2 in testsuite.
-       * tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
-       descriptor 2.
-       * tests/getopt.test: Fix erroneous multiple redirection,
-       uncovered by above change.
-
-2008-10-19  Ralf Wildenhues  <address@hidden>
-
-       Fix DisjConditions module to be thread-safe for perl >= 5.7.2.
-       Self-hashes of blessed references are not correctly transported
-       through thread creation.  This patch fixes that by recreating
-       the hashes upon thread creation with a CLONE special subroutine,
-       which is automatically invoked by new enough Perl versions.
-       * lib/Automake/DisjConditions.pm (CLONE): New special
-       subroutine to fix self hashes upon thread creation.
-       * lib/Automake/tests/Condition-t.pl: New, sister test to
-       Condition.pl, but spawns a new threads after each creation of a
-       new condition; skip test if perl is too old or ithreads are not
-       available.
-       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
-       * lib/Automake/tests/Makefile.am (TESTS): Add them.
-
-2008-10-18  Ralf Wildenhues  <address@hidden>
-
-       Fix comment typos.
-       * automake.in (require_file_internal): Fix typos in comments.
-       * m4/amversion.in: Likewise.
-       * lib/Automake/Variable.pm: Likewise.
-       * lib/Automake/XFile.pm: Likewise.
-
-       Diagnose unsupported uses of `backname' helper function.
-       * automake.in (backname): Error out if the path points outside
-       the directory it started in.
-
-2008-10-12  Ralf Wildenhues  <address@hidden>
-
-       Nicer 'make dist' output.
-       * lib/am/distdir.am (distdir): Hide the complex script
-       used for computing the relative subdirs; echo the sub-make
-       command.
-
-2008-10-12  William Pursell <address@hidden>  (tiny patch)
-
-       * tests/defs.in: Fix comment typo.
-
-2008-10-12  William Pursell <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Fix grammar w.r.t. plurals in test reports.
-       * lib/am/check.am: Fix singular/plural forms in test reports.
-       * tests/check10.test: New test.
-       * tests/Makefile.am: Update.
-
-2008-10-08  Ralf Wildenhues  <address@hidden>
-
-       Require texi2dvi in tests, makeinfo may not be enough.
-       * tests/txinfo16.test: RHEL 5.2 has makeinfo and texi2dvi in
-       separate packages, so also list the latter as required, as the
-       test generates DVI and/or PDF output (through distcheck).
-       * tests/txinfo18.test: Likewise.
-       * tests/txinfo21.test: Likewise.
-       * tests/txinfo22.test: Likewise.
-       * tests/txinfo3.test: Likewise.
-       * tests/version7.test: Likewise.
-       * THANKS: Update.
-       Report by Alexander Martens.
-
-       Fix bootstrap to remove read-only directories right.
-       * bootstrap: Remove automake-$APIVERSION correctly.
-
-2008-10-06  Ralf Wildenhues  <address@hidden>
-
-       Improve test coverage of current TESTS semantics.
-       * tests/check8.test: New test, for subdir tests and setting of
-       $srcdir.
-       * tests/check9.test: New test, check @substituted@ TESTS.
-       * tests/Makefile.am: Update.
-
-2008-10-05  Ralf Wildenhues  <address@hidden>
-
-       * m4/minuso.m4 (AM_PROG_CC_C_O): Work around shell quoting issue
-       with AIX sh; fixes depcomp6.test failure.
-       * NEWS, THANKS: Update.
-       Report by Rainer Tammer.
-
-       Print captured output before failing.
-       * tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
-       tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
-       tests/check4.test, tests/color.test, tests/fn99.test,
-       tests/fn99subdir.test, tests/help.test, tests/init.test,
-       tests/lisp8.test, tests/missing3.test, tests/pr220.test,
-       tests/python11.test, tests/python4.test, tests/python5.test,
-       tests/unused.test, tests/version8.test: When Exit is called
-       after a command that has stdout or stderr redirected to a file
-       for later inspection, output the file before failing the test.
-
-       Fix some comment typos.
-       * automake.in: Fix some comment typos.
-       * lib/Automake/Condition.pm: Likewise.
-       * lib/Automake/DisjConditions.pm: Likewise.
-       * lib/Automake/Variable.pm: Likewise.
-       * lib/Automake/tests/DisjConditions.pl: Likewise.
-
-2008-09-22  Ralf Wildenhues  <address@hidden>
-
-       * tests/aclibobj.test: Fix race condition.
-
-2008-09-21  Ralf Wildenhues  <address@hidden>
-
-       Fix man page creation without installed files.
-       * doc/Makefile.am (update_mans): Use wrappers in tests/
-       directory.
-       ($(srcdir)/aclocal-$(APIVERSION).1): Use versioned wrapper as
-       input program to help2man.
-       ($(srcdir)/automake-$(APIVERSION).1): Likewise.
-       Report by Eric Blake.
-
-2008-09-20  Ralf Wildenhues  <address@hidden>
-
-       Remove unneeded per-rule *INSTALL variables.
-       * NEWS: Update.
-       * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
-       (install-%DIR%%PRIMARY%): Adjust.
-       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
-       (install-%DIR%LIBRARIES): Adjust.
-       * lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
-       (install-%DIR%LTLIBRARIES): Adjust.
-       * lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
-       (install-%DIR%PROGRAMS): Adjust.
-       * lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
-       (install-%DIR%PYTHON): Adjust.
-       * lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
-       (install-%DIR%SCRIPTS): Adjust.
-
-       Compactify program rules using ternary operators.
-       * lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
-       using ternary operators `%KEY?TRUE:FALSE%'.
-       (uninstall-%DIR%PROGRAMS): Likewise.
-
-       New doc section about command line length limits.
-       * doc/automake.texi (Length limitations): New node.
-       (Alternative): `nobase_' is not always equivalent to several
-       base variables.
-       (Install): Mention multi-file install.
-       * NEWS: Expand on the issue, list some more user-visible
-       consequences.
-
-       Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.
-       * automake.in (generate_makefile): If nobase_lib_LTLIBRARIES are
-       used, add an ugly hack to install them before bin_PROGRAMS, just
-       like done with lib_LTLIBRARIES.
-       * tests/ltorder.test: Add program, to expose this.
-
-       Do not reorder nobase ltlib installation.
-       This patch changes back the order of installation of nobase
-       LTLIBRARIES to that in which files are listed in the variables.
-       It does not fix the issue of strict dependency ordering, as
-       implied by *_LIBADD, but as before allows to steer the order by
-       listing the libraries in nobase_*_LTLIBRARIES appropriately.
-       As an advantage over the state of 1.10, multiple consecutive
-       nobase libraries to be installed in the same directory are
-       passed to libtool in one invocation.
-       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES) [!%?BASE%]: Do not
-       reorder libraries upon installation.  Remove spurious empty
-       line.
-       * tests/ltorder.test: New test.
-       * tests/Makefile.am: Update.
-
-       Fix -rpath arguments for nobase_*_LTLIBRARIES.
-       * automake.in (handle_ltlibraries): New hash %instsubdirs to
-       track the dirname of nobase ltlibraries, and tack it onto the
-       end of the -rpath argument.  Also, fix the warning about ltlibs
-       installed in multiple locations to fit a bit better.
-       * tests/pr300-ltlib.test: Expose this bug here.
-       * tests/ltinstloc.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-
-       Man pages for automake and aclocal.
-       * configure.ac (HELP2MAN): New substitution.
-       * doc/Makefile.am (dist_man1_MANS, MAINTAINERCLEANFILES)
-       (update_mans): New macros.
-       ($(srcdir)/aclocal-$(APIVERSION).1)
-       ($(srcdir)/automake-$(APIVERSION).1): New rules, generate
-       man pages from the command line help with help2man.
-       ($(srcdir)/aclocal.1, $(srcdir)/automake.1): New rules, for
-       `.so' man page links to the versioned pages.
-       * NEWS: Update.
-
-2008-09-13  Ralf Wildenhues  <address@hidden>
-
-       Faster install for libtool outputs.
-       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Invoke `libtool
-       --mode=install' with multiple libraries at once.
-       (%DIR%LTLIBRARIES_INSTALL): No need to use install_sh any more.
-       * lib/am/progs.am (install-%DIR%PROGRAMS): Likewise, remove much
-       of the libtool special-casing by invoking it for multiple
-       programs at once.
-
-2008-09-07  Ralf Wildenhues  <address@hidden>
-
-       Fast install and uninstall for SCRIPTS.
-       * lib/am/scripts.am [%?INSTALL%]: Include inst-vars.am
-       independent of `%?BASE%'.
-       (install-%DIR%SCRIPTS): Install multiple scripts at once,
-       using awk and a number of sed scripts.
-       (uninstall-%DIR%SCRIPTS): Compute the installed names, and
-       remove them, all at once.
-       (%DIR%SCRIPT_INSTALL) [!BASE]: No need to use install-sh any
-       more.
-
-       Multi-file install for PROGRAMS.
-       * lib/am/progs.am (install-%DIR%PROGRAMS): Allow to install
-       several programs with one install invocation, when not using
-       libtool; employs some trickery to cater for nobase_, $(EXEEXT),
-       create needed directories, libtool, while only forking a
-       constant number of times in the fast path; uses awk and sed also
-       in the default path.
-       (%DIR%PROGRAMS_INSTALL) [!BASE]: No need to use install-sh any
-       more.
-
-       Enhance cleaning of programs in libtool mode.
-       * lib/am/progs.am (clean-%DIR%PROGRAMS) [?LIBTOOL?]: Fork less
-       often, avoid removing programs twice if $(EXEEXT) is empty.
-       * tests/nobase-libtool.test: Also test PROGRAMS, in order to
-       exercise the code path.
-       * THANKS: Update.
-       Report by Toralf Förster.
-
-2008-09-07  Ralf Wildenhues  <address@hidden>
-           Jim Meyering <address@hidden>
-
-       Reliable multi-file install for man pages.
-       * lib/am/mans.am: Include inst-vars.am.
-       (install-man%SECTION%): Gather lists of man pages to install,
-       and install up to 40 of those that do not have to be renamed
-       at once.  Fail if installation of any file fails.
-       (uninstall-man%SECTION%): Rewrite to use fewer sed invocations.
-       * doc/automake.texi (Man pages): Hint the user to the fast path.
-       Indentation fix.
-       * tests/instmany-mans.test: New test.
-       * tests/Makefile.am: Update.
-
-2008-09-07  Ralf Wildenhues  <address@hidden>
-
-       Faster `make uninstall'; fast install for JAVA.
-       * lib/am/inst-vars.am (am__nobase_strip_setup)
-       (am__nobase_strip): New macros.
-       (am__nobase_list): Factorize.
-       * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use them, for a
-       constant number of forks per uninstall.
-       * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
-       * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
-       * lib/am/progs.am (uninstall-%DIR%PROGRAMS): Fast uninstall.
-       * lib/am/python.am (uninstall-%DIR%PYTHON): Fast uninstall.
-       Echo all `rm' commands that are are executed.
-       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA):
-       Fast install and uninstall.
-
-       AIX ranlib dislikes spaces in the argument.
-       * lib/am/libs.am (install-%DIR%LIBRARIES): Fix instsh.test
-       failure on AIX due to ranlib and whitespace in the directory.
-       * THANKS: Update.
-       Report by John F Trudeau.
-
-       Fail upon install or ranlib failure, part two.
-       * lib/am/java.am (install-%DIR%JAVA): Fail upon install failure.
-       * lib/am/lisp.am (install-%DIR%LISP): Likewise.
-       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Likewise.
-       * lib/am/libs.am (install-%DIR%LIBRARIES): Likewise, for
-       `install' as well as `ranlib'.
-       * lib/am/progs.am (install-%DIR%PROGRAMS): If `install' fails,
-       return its exit failure, not 1.
-       * tests/instfail.test: New test, for PROGRAMS (without libtool),
-       LIBRARIES, including nobase variants.
-       * tests/instfail-info.test: Likewise, for TEXINFOS.
-       * tests/instfail-java.test: Likewise, for JAVA.
-       * tests/instfail-libtool.test: Likewise, for PROGRAMS (with
-       libtool) and LTLIBRARIES.
-       * tests/Makefile.am: Adjust.
-
-       Exit upon `install' failure, part one.
-       * lib/am/data.am (install-%DIR%%PRIMARY%): Exit if any install
-       command fails.
-       * lib/am/python.am (install-%DIR%PYTHON): Likewise.
-       * lib/am/scripts.am (install-%DIR%SCRIPTS): Likewise.
-       * lib/am/texinfos.am (install-dvi-am, install-html-am)
-       (install-info-am:, install-pdf-am): Likewise.
-       * tests/instmany.test: New test, for SCRIPTS, DATA, and HEADERS.
-       * tests/instmany-python.test: New test, for PYTHON.
-       * tests/Makefile.am: Adjust.
-
-2008-09-06  Ralf Wildenhues  <address@hidden>
-
-       Fix multi-file installation for files in srcdir.
-       For files that can live in the build tree or the source tree,
-       we have to expect that prepending `$(srcdir)/' to each name
-       will let the install command line exceed length limitations.
-       Thus use a new macro, $(am__base_list), to install in chunks
-       of 40 files, similar to what we do for nobase_* files.  There,
-       lower the limit to 40, too.
-       * lib/am/inst-vars.am (am__install_max): Lower to 40.
-       (am__base_list): New macro.
-       * lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it.
-       * lib/am/texinfos.am (install-dvi-am, install-html-am)
-       (install-info-am, install-pdf-am, install-ps-am): Likewise.
-
-2008-09-06  Ralf Wildenhues  <address@hidden>
-
-       Use `Exit' instead of `exit' in test suite.
-       Cater to Bourne shells like Solaris sh that do not pass the
-       `exit' argument as status to the cleanup trap.
-       * Makefile.am (maintainer-check): Check that here-documents
-       use only `END' or `EOF' as delimiter in the test suite.
-       Check that, outside of here-documents, the tests do not use
-       `exit' with an argument, but use `Exit' instead.
-       * tests/defs.in (Exit): New function.  Use it throughout,
-       starting with the introduction of the exit trap.
-       * tests/aclibobj.test, tests/acloca10.test, tests/acloca11.test,
-       tests/acloca12.test, tests/acloca13.test, tests/acloca14.test,
-       tests/acloca15.test, tests/acloca16.test, tests/acloca17.test,
-       tests/acloca18.test, tests/acloca19.test, tests/acloca20.test,
-       tests/acloca21.test, tests/acloca22.test, tests/aclocal.test,
-       tests/aclocal3.test, tests/aclocal4.test, tests/aclocal5.test,
-       tests/aclocal6.test, tests/aclocal7.test, tests/aclocal8.test,
-       tests/aclocal9.test, tests/acoutbs.test, tests/acoutbs2.test,
-       tests/acoutnoq.test, tests/acoutpt.test, tests/acoutpt2.test,
-       tests/acoutqnl.test, tests/acsilent.test, tests/acsubst.test,
-       tests/acsubst2.test, tests/all.test, tests/alloca.test,
-       tests/alloca2.test, tests/alpha.test, tests/alpha2.test,
-       tests/amassign.test, tests/ammissing.test, tests/amopt.test,
-       tests/amsubst.test, tests/ansi.test, tests/ansi10.test,
-       tests/ansi2.test, tests/ansi3.test, tests/ansi3b.test,
-       tests/ansi4.test, tests/ansi5.test, tests/ansi6.test,
-       tests/ansi7.test, tests/ansi8.test, tests/ansi9.test (main),
-       tests/ar.test, tests/ar2.test, tests/asm.test, tests/asm2.test,
-       tests/asm3.test, tests/automake.test, tests/auxdir.test,
-       tests/auxdir2.test, tests/auxdir3.test, tests/auxdir4.test,
-       tests/backsl.test, tests/backsl2.test, tests/backsl3.test,
-       tests/backsl4.test, tests/badline.test, tests/badopt.test,
-       tests/badprog.test, tests/block.test, tests/bsource.test,
-       tests/canon-name.test, tests/canon.test, tests/canon2.test,
-       tests/canon3.test, tests/canon4.test, tests/canon5.test,
-       tests/ccnoco.test, tests/ccnoco2.test, tests/check.test,
-       tests/check2.test, tests/check3.test, tests/check4.test,
-       tests/check5.test, tests/check6.test, tests/check7.test,
-       tests/checkall.test, tests/clean.test, tests/clean2.test,
-       tests/colneq.test, tests/colneq2.test, tests/colon.test,
-       tests/colon2.test, tests/colon3.test, tests/colon4.test,
-       tests/colon5.test, tests/colon6.test, tests/colon7.test,
-       tests/color.test (test_no_color), tests/commen10.test,
-       tests/comment.test, tests/comment2.test, tests/comment3.test,
-       tests/comment4.test, tests/comment5.test, tests/comment6.test,
-       tests/comment7.test, tests/comment8.test, tests/comment9.test,
-       tests/compile.test, tests/compile_f90_c_cxx.test,
-       tests/compile_f_c_cxx.test, tests/cond.test, tests/cond10.test,
-       tests/cond11.test, tests/cond13.test, tests/cond14.test,
-       tests/cond15.test, tests/cond16.test, tests/cond17.test,
-       tests/cond18.test, tests/cond19.test, tests/cond2.test,
-       tests/cond20.test, tests/cond21.test, tests/cond22.test,
-       tests/cond27.test, tests/cond3.test, tests/cond37.test,
-       tests/cond39.test, tests/cond4.test, tests/cond40.test,
-       tests/cond41.test, tests/cond5.test, tests/cond6.test,
-       tests/cond7.test (AC_INIT), tests/cond8.test, tests/cond9.test,
-       tests/condd.test, tests/condhook.test, tests/condinc.test,
-       tests/condinc2.test, tests/condlib.test, tests/condman.test,
-       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
-       tests/conff.test, tests/conff2.test, tests/confh.test,
-       tests/confh4.test, tests/confh5.test, tests/config.test,
-       tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
-       tests/conflnk3.test, tests/conflnk4.test, tests/confsub.test,
-       tests/confvar.test, tests/confvar2.test, tests/copy.test,
-       tests/ctarget1.test, tests/cxx.test, tests/cxx2.test,
-       tests/cxxansi.test, tests/cxxcpp.test, tests/cxxlibobj.test,
-       tests/cxxlink.test, tests/cxxnoc.test, tests/cxxo.test,
-       tests/cygwin32.test, tests/dash.test, tests/defs.in (else),
-       tests/defun.test, tests/defun2.test, tests/dejagnu.test,
-       tests/dejagnu2.test, tests/dejagnu3.test, tests/dejagnu4.test,
-       tests/dejagnu5.test, tests/dejagnu6.test, tests/dejagnu7.test,
-       tests/depacl2.test, tests/depcomp.test, tests/depcomp2.test,
-       tests/depcomp3.test, tests/depcomp4.test, tests/depcomp5.test,
-       tests/depcomp6.test, tests/depcomp7.test, tests/depdist.test,
-       tests/depend.test, tests/depend2.test, tests/depend3.test,
-       tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
-       tests/dirlist.test, tests/dirlist2.test, tests/discover.test,
-       tests/distcom2.test, tests/distcom3.test, tests/distcom4.test,
-       tests/distcom5.test, tests/distcom6.test, tests/distcom7.test,
-       tests/distdir.test, tests/distname.test, tests/dollar.test,
-       tests/double.test, tests/dup2.test, tests/else.test,
-       tests/empty.test, tests/empty2.test, tests/empty3.test,
-       tests/empty4.test, tests/exdir.test, tests/exdir2.test,
-       tests/exdir3.test, tests/exeext.test, tests/exeext2.test,
-       tests/exeext3.test, tests/exeext4.test, tests/exsource.test,
-       tests/ext.test, tests/extra.test, tests/extra2.test,
-       tests/extra3.test, tests/extra4.test, tests/extra5.test,
-       tests/extra6.test, tests/extra7.test, tests/f90only.test,
-       tests/flibs.test, tests/fn99.test, tests/fn99subdir.test,
-       tests/fnoc.test, tests/fo.test, tests/fonly.test,
-       tests/fort1.test, tests/fort2.test, tests/fort4.test,
-       tests/fort5.test, tests/fortdep.test, tests/fpinst2.test,
-       tests/fpinstall.test, tests/gcj.test, tests/gcj2.test,
-       tests/gcj3.test, tests/gcj4.test, tests/gcj5.test,
-       tests/getopt.test, tests/gettext.test, tests/gettext2.test,
-       tests/gettext3.test, tests/gnits.test, tests/gnits2.test (main),
-       tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
-       tests/gnuwarn2.test, tests/header.test, tests/help.test,
-       tests/hosts.test, tests/implicit.test, tests/include.test,
-       tests/include2.test, tests/info.test, tests/init.test,
-       tests/insh2.test, tests/install2.test, tests/installdir.test,
-       tests/instdat.test, tests/instdat2.test, tests/instexec.test,
-       tests/insthook.test, tests/instman.test, tests/instman2.test,
-       tests/instsh.test, tests/instsh2.test, tests/instsh3.test,
-       tests/instspc.test, tests/interp.test, tests/interp2.test,
-       tests/java.test, tests/java2.test, tests/java3.test,
-       tests/javaprim.test, tests/javasubst.test, tests/ldadd.test,
-       tests/ldflags.test, tests/lex.test, tests/lex2.test,
-       tests/lex3.test, tests/lex4.test, tests/lex5.test (main),
-       tests/libexec.test, tests/libobj10.test, tests/libobj11.test,
-       tests/libobj12.test, tests/libobj13.test, tests/libobj2.test,
-       tests/libobj3.test, tests/libobj4.test, tests/libobj5.test,
-       tests/libobj7.test, tests/libobj8.test, tests/library.test,
-       tests/library2.test, tests/library3.test, tests/libtoo10.test,
-       tests/libtool.test, tests/libtool2.test, tests/libtool3.test
-       (main), tests/libtool4.test, tests/libtool5.test,
-       tests/libtool6.test, tests/libtool7.test, tests/libtool8.test,
-       tests/libtool9.test (main), tests/license.test,
-       tests/link_c_cxx.test, tests/link_dist.test,
-       tests/link_f90_only.test, tests/link_f_only.test,
-       tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
-       tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
-       tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
-       tests/lisp8.test, tests/listval.test, tests/location.test,
-       tests/longlin2.test, tests/longline.test, tests/ltcond.test,
-       tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
-       tests/ltlibobjs.test, tests/ltlibsrc.test, tests/lzma.test,
-       tests/maintclean.test, tests/make.test, tests/makej.test,
-       tests/makevars.test, tests/man.test, tests/man2.test,
-       tests/man3.test, tests/mclean.test, tests/mdate.test,
-       tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
-       tests/mdate5.test, tests/missing.test, tests/missing2.test,
-       tests/missing3.test, tests/missing4.test, tests/missing5.test,
-       tests/missing6.test, tests/mkinst2.test, tests/mkinst3.test,
-       tests/mkinstall.test, tests/mmode.test, tests/mmodely.test,
-       tests/multlib.test, tests/nobase-libtool.test,
-       tests/nobase-python.test, tests/nobase.test, tests/nodef.test,
-       tests/nodef2.test, tests/nodep.test, tests/nodep2.test,
-       tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
-       tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
-       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
-       tests/nostdinc.test, tests/notrans.test, tests/number.test,
-       tests/objc.test, tests/objc2.test, tests/obsolete.test,
-       tests/order.test, tests/outdir.test, tests/output-order.test,
-       tests/output.test, tests/output10.test, tests/output11.test,
-       tests/output12.test, tests/output13.test, tests/output2.test,
-       tests/output3.test, tests/output4.test, tests/output5.test,
-       tests/output6.test, tests/output7.test, tests/output8.test,
-       tests/output9.test, tests/overrid.test, tests/parse.test,
-       tests/pluseq.test, tests/pluseq10.test, tests/pluseq2.test,
-       tests/pluseq3.test, tests/pluseq4.test, tests/pluseq5.test,
-       tests/pluseq6.test, tests/pluseq7.test, tests/pluseq8.test,
-       tests/pluseq9.test, tests/postproc.test, tests/ppf77.test,
-       tests/pr2.test, tests/pr204.test, tests/pr211.test,
-       tests/pr220.test, tests/pr224.test, tests/pr229.test,
-       tests/pr243.test, tests/pr266.test, tests/pr279-2.test,
-       tests/pr279.test, tests/pr287.test, tests/pr300-lib.test,
-       tests/pr300-ltlib.test, tests/pr300-prog.test, tests/pr307.test,
-       tests/pr401.test, tests/pr401b.test, tests/pr401c.test,
-       tests/pr72.test, tests/pr87.test, tests/pr9.test,
-       tests/prefix.test, tests/primary.test, tests/primary2.test,
-       tests/primary3.test, tests/proginst.test, tests/python.test,
-       tests/python10.test, tests/python11.test, tests/python12.test,
-       tests/python2.test, tests/python3.test, tests/python4.test,
-       tests/python5.test, tests/python6.test, tests/python7.test,
-       tests/python8.test, tests/python9.test, tests/recurs.test,
-       tests/recurs2.test, tests/regex.test, tests/remake.test,
-       tests/remake2.test, tests/remake3.test, tests/remake4.test,
-       tests/remake5.test, tests/remake6.test, tests/remake7.test,
-       tests/req.test, tests/reqd.test, tests/reqd2.test,
-       tests/rulepat.test, tests/scripts.test, tests/seenc.test,
-       tests/sinclude.test, tests/space.test, tests/specflg.test,
-       tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
-       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
-       tests/spell.test, tests/spell2.test, tests/spell3.test,
-       tests/spelling.test, tests/spy.test, tests/srcsub.test,
-       tests/srcsub2.test, tests/stamph2.test, tests/stdinc.test,
-       tests/stdlib.test, tests/stdlib2.test, tests/strip.test,
-       tests/subcond.test, tests/subcond2.test, tests/subcond3.test,
-       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
-       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
-       tests/subdir7.test, tests/subdir8.test, tests/subdir9.test,
-       tests/subdirbuiltsources.test, tests/subobj.test,
-       tests/subobj10.test, tests/subobj2.test, tests/subobj3.test,
-       tests/subobj4.test, tests/subobj5.test, tests/subobj6.test,
-       tests/subobj7.test, tests/subobj8.test, tests/subobj9.test,
-       tests/subobjname.test, tests/subpkg.test, tests/subpkg2.test,
-       tests/subpkg3.test, tests/subst.test, tests/subst2.test,
-       tests/subst3.test, tests/substre2.test, tests/substref.test,
-       tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
-       tests/suffix11.test, tests/suffix12.test, tests/suffix2.test,
-       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
-       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
-       tests/suffix9.test, tests/symlink.test, tests/symlink2.test,
-       tests/symlink3.test, tests/syntax.test, tests/tags.test,
-       tests/tagsub.test, tests/tar.test, tests/tar2.test,
-       tests/tar3.test, tests/target-cflags.test,
-       tests/targetclash.test, tests/transform.test, tests/txinfo.test,
-       tests/txinfo10.test, tests/txinfo13.test, tests/txinfo16.test,
-       tests/txinfo17.test, tests/txinfo18.test, tests/txinfo19.test,
-       tests/txinfo2.test, tests/txinfo20.test, tests/txinfo21.test,
-       tests/txinfo22.test, tests/txinfo23.test, tests/txinfo24.test,
-       tests/txinfo25.test, tests/txinfo26.test, tests/txinfo27.test,
-       tests/txinfo28.test, tests/txinfo29.test, tests/txinfo3.test,
-       tests/txinfo30.test, tests/txinfo31.test, tests/txinfo4.test,
-       tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
-       tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
-       tests/upc.test, tests/upc2.test, tests/upc3.test,
-       tests/vars.test, tests/vars3.test, tests/vartar.test,
-       tests/version.test, tests/version2.test, tests/version3.test,
-       tests/version4.test, tests/version6.test, tests/version7.test,
-       tests/version8.test, tests/vpath.test, tests/vtexi.test,
-       tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
-       tests/werror2.test, tests/whoami.test, tests/xsource.test,
-       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
-       tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
-       tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
-       tests/yaccvpath.test: Use `Exit $arg' instead of `exit $arg'
-       throughout, except inside created files.
-
-2008-09-04  Ralf Wildenhues  <address@hidden>
-
-       Avoid Heisenbug with verbose testing on HP-UX.
-       * tests/output-order.test: Remove spurious redirection line
-       from output for comparison.
-
-       For all possibly-relative subdirs, use $(am__cd).
-       Up to now, $(am__cd) was only used within backquotes, to avoid
-       extraneous output.  This patch also uses it for every `cd' to a
-       relative subdir, to prevent CDPATH from entering an unwanted
-       directory.
-       * Makefile.am (maintainer-check): Fix current check for
-       $(am__cd) within backquotes a bit.  Add new check for `cd' to a
-       relative subdir.
-       * automake.in (handle_tags, handle_configure):  Adjust rules.
-       * lib/am/ansi2knr.am: Likewise.
-       * lib/am/configure.am: Likewise.
-       * lib/am/distdir.am: Likewise.
-       * lib/am/remake-hdr.am: Likewise.
-       * lib/am/subdirs.am: Likewise.
-       * lib/am/tags.am: Likewise.
-       * lib/am/texibuild.am: Likewise.
-
-       Fix nobase-python.test for BSD make.
-       * tests/nobase-python.test: Listing a dependency to be found
-       via VPATH search explicitly, without the path, as a target,
-       will turn off VPATH search for FreeBSD make.  So move the
-       creation of the files outside of the Makefile.
-
-2008-09-01  Ralf Wildenhues  <address@hidden>
-
-       Implement AM_MAINTAINER_MODE([DEFAULT-MODE]).
-       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Allow for an optional
-       first argument of `enable' or `disable', setting the default.
-       * doc/automake.texi (Optional, maintainer-mode): Document.
-       * tests/mmode.test: New test.
-       * tests/Makefile.am: Adjust.
-       * NEWS: Update.
-       Suggestion by Vincent Lefevre.
-
-2008-08-31  Ralf Wildenhues  <address@hidden>
-
-       Copyright year updates.
-       * lib/am/header-vars.am: Update copyright years.
-       * lib/am/remake-hdr.am: Likewise.
-       * lib/am/tags.am: Likewise.
-
-2008-08-28  Ralf Wildenhues  <address@hidden>
-
-       * THANKS: Use Cyrillic name instead of ASCII transcription.
-
-2008-08-22  Ralf Wildenhues  <address@hidden>
-
-       Fix rebuilding of removed subdir/Makefile.in files.
-       * lib/am/configure.am (%MAKEFILE-IN%) [?!TOPDIR_P?]: If
-       subdir/Makefile.in was removed, am--refresh would not update
-       it.  Fix up for it by running the per-directory rebuild rule.
-       * tests/remake6.test, tests/remake7.test: New tests.
-       * tests/Makefile.am: Adjust.
-       * NEWS, THANKS: Update.
-       Report and initial patch by Ilya N. Golubev.
-
-2008-08-19  Ralf Wildenhues  <address@hidden>
-
-       * tests/notrans.test: Use multiple man files of each type.
-
-       Fix maintainer-check failures.
-       * doc/automake.texi (Conditionals): Drop TAB.
-       * tests/missing6.test: Use 'rm -f'.
-
-2008-08-19  Reuben Thomas <address@hidden>  (tiny patch)
-
-       * doc/automake.texi (Flag Variables Ordering, Per-Object Flags):
-       Fix grammaros.
-
-2008-08-02  Karl Berry  <address@hidden>
-
-       * lib/gnupload: Provide also a simple example.
-
-2008-06-25  Thien-Thi Nguyen  <address@hidden>
-
-       Small doc fix.
-       * doc/automake.texi (Public Macros): Close open paren.
-
-2008-06-18  Ralf Wildenhues  <address@hidden>
-
-       Introduce macro $(am__mv) to facilitate 'libtool --dry-run'.
-       * lib/am/depend.am (am__mv): New macro, set to 'mv -f'.
-       * lib/am/depend2.am: Use throughout to move the temporary
-       depfile *.Tpo to its final destination *.Po.
-
-2008-06-18  Rafael Espindola  <address@hidden>
-
-       * lib/config-ml.in: don't handle --enable-shared and --enable-static.
-
-2008-06-18  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/inst-vars.am (am__install_max): New variable.
-       (am__nobase_list): Use it.
-
-       Fix conditional rules competing with config.status rules.
-       * automake.in (handle_configure): Teach targets about the
-       conditional config.status rule.
-       * tests/cond39.test: Adjust test to expose this.
-
-       For AC_CONFIG_LINKS(X,X), do not clean X in a non-VPATH build.
-       * automake.in (rewrite_inputs_into_dependencies): Do distribute
-       inputs where input and output name are equal.  This relies on
-       the assumption that it only happens with AC_CONFIG_LINKS.
-       (handle_configure) <CONFIG_CLEAN_VPATH_FILES>: New variable, for
-       links where source and dest are equal.
-       * lib/am/clean.am (distclean-generic): Remove, if build tree not
-       equal source tree.
-       * tests/conflnk4.test: New test.
-       * tests/Makefile.am: Adjust.
-       * NEWS: Update.
-
-2008-06-06  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Extending): Fix ambivalent wording.
-       Report by Ben Pfaff.
-
-2008-06-04  Karl Berry  <address@hidden>
-
-       * doc/automake.texi (Install, Hard-Coded Install Paths):  Fix
-       punctuation and markup.
-       (Extending): Improve wording and clarify order semantics of
-       *-local and *-hook targets.
-
-2008-06-01  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Extending): Fix grammar.
-       Report by Karl Berry.
-
-2008-05-13  Stepan Kasal  <address@hidden>
-
-       Fix typos.
-       * doc/automake.texi (Timeline): Reported by Reuben Thomas.
-       * lib/am/remake-hdr.am: A few typos in comments.
-
-2008-04-10  Eric Blake  <address@hidden>
-
-       Prefer a released version of autoconf.
-       * NEWS: Bump requirement to autoconf 2.62.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
-       * configure.ac: Likewise.
-       (AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead.
-
-       AC_AUTOCONF_VERSION can inadvertently expand to a macro name.
-       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper
-       m4 quoting.
-       * aclocal.in (write_aclocal): Likewise.
-       * tests/missing6.test: New test.
-       * tests/Makefile.am (TESTS): Run it.
-       * tests/missing4.test: Adjust.
-
-2008-04-02  Eric Blake  <address@hidden>
-
-       Make gnupload friendlier for VPATH usage.
-       * lib/gnupload: Allow uploads from separate directory.
-
-2008-03-26  Ralf Wildenhues  <address@hidden>
-
-       Implement conditional AC_CONFIG_FILES: AM_COND_IF.
-       * automake.in (%ac_config_files_condition): New.
-       (scan_autoconf_config_files): Record condition if any.
-       (scan_autoconf_traces): Trace _AM_COND_IF, _AM_COND_ELSE,
-       _AM_COND_ENDIF, updating @cond_stack as appropriate.
-       (handle_configure): Prefix config.status rule with condition.
-       Check that m4 quotation is done consistently.
-       * m4/cond.m4 (AM_CONDITION): Define `_AM_COND_VALUE_name'
-       with `name' being the name of the condition, to its shell
-       condition.
-       * m4/cond-if.m4: New file.
-       (_AM_COND_IF, _AM_COND_ELSE, _AM_COND_ENDIF): New trace helpers.
-       (AM_COND_IF): New macro, implements conditionals.
-       * m4/Makefile.am: Adjust.
-       * doc/automake.texi (Requirements, Optional, Conditionals):
-       Document AM_COND_IF.
-       * NEWS: Update.
-       * tests/cond39.test, tests/cond40.test, tests/cond41.test,
-       tests/cond42.test, tests/cond43.test: New tests.
-       * tests/Makefile.am: Adjust.
-
-2008-03-24  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (@ovar): New macro, from autoconf.texi.
-       (Python): Use it.
-       Suggestion by Eric Blake.
-
-2008-03-20  Ralf Wildenhues  <address@hidden>
-
-       * lib/texinfo.tex: Sync from upstream.
-
-2008-03-17  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Requirements, Linking, Extending):
-       Fix underfull and overfull lines, fix wording a bit.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
-       upstream.
-
-       * Makefile.am (WGET_SV_GIT_CF): New.
-       (fetch): Pull config.guess and config.sub from git repo now.
-
-       * lib/Autom4te/FileUtils.pm (handle_exec_errors): New argument
-       $hint, show if the executing program does not exist.
-       (xsystem_hint): New function, like xsystem but allows to pass
-       a hint.
-
-2008-03-11  Peter Breitenlohner  <address@hidden>
-
-       Implement the `notrans_' prefix for untransformed manpages.
-       * automake.in (handle_man_pages), lib/am/mans.am: Implement
-       notrans_ prefix for MANS primary and rework dependencies for
-       install-man%SECTION%; use only vars defined in Makefile.am.
-       * doc/automake.texi (Renaming, Uniform, Man pages):
-       Document notrans_ prefix.
-       * NEWS: Update.
-       * tests/notrans.test: New test.
-       * tests/Makefile.am: Update.
-
-       * automake.in (handle_man_pages): Reindent, for next patch.
-
-2008-03-08  Ralf Wildenhues  <address@hidden>
-
-       Use `install' with multiple files at once for some primaries.
-       With nobase targets, at most 50 files are installed at once,
-       to avoid quadratic string concatenation and line length limits.
-       This isn't yet done with base targets.  One hope is that there,
-       the typical file name length is lower.  If this turns out to be
-       a problem, it should be revisited.
-
-       * lib/am/inst-vars.am (am__nobase_list): New helper macro for
-       installation of multiple nobase files at once: sorts and lists
-       files keyed by their target directory.
-       * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to
-       $(install_sh_DATA) any more, not even for nobase targets.
-       (install-%DIR%%PRIMARY%): Split base and nobase cases.
-       Rewrite to pass lists of files which all go in the same
-       directory to `install'.  In the nobase case, make use of
-       $(am__nobase_list) and $(MKDIR_P) each directory before
-       populating it.  Take care of files in source and build trees,
-       and avoid creating directories where no files are to be
-       installed.
-       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise.
-       (install-%DIR%LIBRARIES): Likewise.
-       * lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise.
-       (install-%DIR%PYTHON): Likewise.  Also take care to keep note of
-       a list for byte compilation after installation.
-       * lib/am/texinfos.am (install-dvi-am, install-html-am)
-       (install-info-am, install-pdf-am, install-ps-am): Use file lists
-       to install multiple files at once.
-       * NEWS: Update.
-       Suggested by Akim Demaille.
-
-2008-03-08  Ralf Wildenhues  <address@hidden>
-
-       Require unreleased Autoconf for fixed AC_PROG_INSTALL.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Bump AC_PREREQ to 2.61-341,
-       regenerate files.
-       * configure.ac: Also require Autoconf 2.61-341, to catch
-       failure early and provide a sensible error message.
-
-       Drop usage of obsolete macros AC_EXEEXT and AC_OBJEXT.
-       * tests/ansi4.test: Drop AC_OBJEXT and AC_EXEEXT.
-       * tests/ansi6.test: Likewise.
-       * tests/ansi7.test: Likewise.
-       * tests/condlib.test: Likewise.
-       * tests/cygwin32.test: Likewise.
-       * tests/exeext2.test: Likewise.
-       * tests/libobj11.test: Likewise.
-       * tests/library.test: Likewise.
-       * tests/txinfo5.test: Likewise.
-
-2008-03-03  Ralf Wildenhues  <address@hidden>
-
-       Skip instsh3.test if `touch -t' does not work.
-       * tests/instsh3.test: Test for `touch -t', fails with Solaris
-       /usr/ucb/touch.
-       * THANKS: Update.
-       Report by Younes Younes.
-
-2008-02-27  Reuben Thomas  <address@hidden>
-
-       * doc/automake.texi (wildcards): Improve "Why doesn't Automake
-       support wildcards" node's English and sense.
-
-2008-02-23  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/check.am (check-TESTS): In the case patterns for
-       XFAILed tests, add literal bracket expression for matching
-       whitespace, as NetBSD 4.99.54 ksh does not understand a
-       bracket expression resulting from variable expansion.
-       * README: Explain how to run the Automake test suite, including
-       setting MAKE to test gmake.
-       Report by Patrick Welche.
-
-2008-02-19  Ralf Wildenhues  <address@hidden>
-
-       PR automake/498
-       * m4/options.m4 (_AM_SET_OPTIONS): Use m4_foreach_w instead of
-       obsolete AC_FOREACH.
-       Report by NightStrike and address@hidden
-
-2008-02-17  Colin Watson  <address@hidden>  (tiny change)
-
-       * lib/am/tags.am (ID): Fix typo in workaround for old awk.
-
-2008-02-05  Ralf Wildenhues  <address@hidden>
-
-       * doc/.gitignore: Ignore files generated by `make ps pdf html'.
-
-2008-02-05  Reuben Thomas  <address@hidden>
-
-       * doc/automake.texi (CVS): configure.ac will appear newer, not
-       older, than configure.  Use `lexical' instead of `alphabetical'.
-
-2008-01-30  Ralf Wildenhues  <address@hidden>
-
-       * tests/man3.test: Avoid `make VAR=value'.
-
-       * tests/subst3.test: New test.
-       * tests/Makefile.am: Update.
-
-       * tests/instsh2.test: Split off testing of `install-sh -C' ...
-       * tests/instsh3.test: ... to this new test, requiring non-root.
-       * tests/Makefile.am: Adjust.
-       * THANKS: Update.
-       Report by Theodoros V. Kalamatianos.
-
-2008-01-23  Ralf Wildenhues  <address@hidden>
-
-       * tests/nobase.test: Extend test to generated files.
-
-       * tests/nobase-python.test: New test, nobase for python files.
-       * tests/Makefile.am: Update.
-
-       * tests/nobase.test: Split off libtool part of nobase.test for
-       increased test exposure, to ...
-       * tests/nobase-libtool.test: ... this new test.
-       * tests/Makefile.am: Update.
-
-2008-01-23  Eric Blake  <address@hidden>
-
-       Fix color.test when using BSD grep.
-       * tests/color.test: Ensure that grep can handle non-printing
-       characters.
-
-2008-01-23  Ralf Wildenhues  <address@hidden>
-
-       * tests/lisp3.test: Fix typo.
-
-2008-01-22  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/mans.am (install-man%SECTION%): Prefer generated manpages
-       over distributed ones.
-       Report and patch by Peter Breitenlohner.
-       * tests/man3.test: New test.
-       * tests/Makefile.am: Update.
-
-2008-01-21  Ralf Wildenhues  <address@hidden>
-
-       * tests/tar.test: Skip if no appropriate tar was found.
-
-2008-01-19  NightStrike  <address@hidden>
-
-       * doc/automake.texi (Dependency Tracking): Fix typo.
-
-2008-01-19  Ralf Wildenhues  <address@hidden>
-
-       * lib/config-ml.in, lib/config.guess, lib/config.sub,
-       lib/symlink-tree: Sync from upstream.
-
-       * Makefile.am (WGET_SV_CVS): Renamed from WGETSGO.
-       (WGET_SV_GIT_AC, WGET_SV_GIT_GL, WGET_GCC): New.
-       (fetch): Update to match current upstream locations.
-
-2008-01-14  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (DESTDIR, Built sources example): Fix wording.
-       * THANKS: Update.
-       Reports and suggestions by William Pursell and address@hidden
-
-2008-01-13  Ralf Wildenhues  <address@hidden>
-
-       Do not fail if `autoupdate' is not present.
-       * tests/obsolete.test: Check for presence of autoupdate.  Apparently,
-       FreeBSD may install the other Autoconf programs without a version
-       suffix but not autoupdate.
-
-       Fix Heisenbug trying to unset a sometimes-not-set variable.
-       * tests/check5.test: Do not error out upon `unset TESTS' due to
-       `set -e', in case TESTS was not set.
-       * tests/color.test: Likewise.
-
-       * doc/automake.texi (amhello Explained): Fix odd sentence.
-       Report by address@hidden
-
-2008-01-12  Ralf Wildenhues  <address@hidden>
-
-       * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more
-       resistant to different quoting styles of $1.
-
-       Clarify texinfo.tex and TEXINFO_TEX semantics.
-       * doc/automake.texi (Texinfo): Clarify that by default,
-       texinfo.tex is searched in the same directory as the Makefile.am
-       that needs it.  Clarify that TEXINFO_TEX has precedence over
-       AC_CONFIG_AUX_DIR, and that it requires the user to install and
-       distribute it.
-       * tests/txinfo22.test: Ensure TEXINFO_TEX is not distributed.
-       * THANKS: Update.
-       Reports by Dilyan Palauzov and Roumen Petrov.
-
-2008-01-11  Bruno Haible  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * tests/output-order.test: New test, for the stable output fix.
-       * tests/Makefile.am: Update.
-
-2008-01-08  Ralf Wildenhues  <address@hidden>
-
-       * Makefile.am (dist-hook): New, ensure world-executable tests.
-       * THANKS: Update.
-       Report by Arto C. Nirkko.
-
-       * tests/acloca20.test: Use `--force' with the second $AUTOCONF,
-       to force update on fast machines where both autoconf invocations
-       happen within the same second.
-       Report by Greg Schafer.
-
-2008-01-07  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (scan_autoconf_files): Sort loop over
-       %required_aux_file, for stable verbose output.
-       Report by Bruno Haible.
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
-       upstream.
-
-       * tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
-       to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
-       * THANKS: Update.
-       Report and analysis by Carsten Lohrke and Mike Frysinger.
-
-2008-01-07  Stepan Kasal  <address@hidden>
-
-       * automake.in (handle_texinfo_helper, handle_lib_objects): Fix
-       typos in comments.
-
-2008-01-02  Ralf Wildenhues  <address@hidden>
-
-       Bump copyright years.
-       * aclocal.in (write_aclocal, version): Likewise.
-       * automake.in ($gen_copyright, version): Likewise.
-       * doc/automake.texi: Likewise.
-
-2007-12-18  Jim Meyering  <address@hidden>
-
-       * lib/gnupload (GPG): Don't use an absolute path.
-       This reverts part of the 2004-01-28 change.
-
-2007-12-08  Ralf Wildenhues  <address@hidden>
-
-       * lib/Automake/FileUtils.pm (open_quote): New function.
-       (update_file, contents): Use it.
-
-       Reword the copyright notices to match what's suggested in GPLv3.
-
-2007-12-08  Ralf Wildenhues  <address@hidden>
-
-       * tests/defs.in: Quote $srcdir, $PATH; skip libtool and gettext
-       tests if the absolute source or build tree name contain whitespace.
-
-       Modify some tests for absolute trees containing whitespace.
-       * tests/missing.test: Use "./missing" instead of "`pwd`/missing".
-       * tests/missing2.test: Likewise.
-       * tests/mmodely.test: Add `pwd` to $PATH instead of absolute
-       references to myyacc.sh and mylex.sh.
-       * tests/multlib.test: Likewise for mycc.
-       * tests/txinfo26.test: Skip if `pwd` contains whitespace, as
-       an absolute --srcdir does not work there.
-
-       * INSTALL, lib/INSTALL, lib/config-ml.in, lib/config.guess,
-       lib/config.sub, lib/texinfo.tex: Sync from upstream.
-
-       Fix the distdir target to cope with spaces in absolute file names.
-       * lib/am/distdir.am: Quote all instances of $(distdir) and
-       $(top_distdir).  They could contain white space, coming from
-       a toplevel package bootstrapped with an older Automake version.
-       (am__relativize): New macro, taken from gnulib code, written by
-       Bruno Haible.
-       (distdir): Use it to compute relative paths to distdir and
-       top_distdir for enclosed subpackages.
-       Also, quote $(distuninstallcheck_dir).
-       * lib/am/texinfos.am: Likewise, quote $(distdir).
-
-2007-11-26  Ralf Wildenhues  <address@hidden>
-
-       Quote file names in tests that can be absolute.
-       * tests/auxdir.test, tests/check3.test, tests/check4.test,
-       tests/compile.test, tests/cond33.test, tests/condhook.test,
-       tests/distdir.test, tests/dollar.test, tests/empty.test,
-       tests/gnits2.test, tests/gnits3.test, tests/include2.test,
-       tests/insthook.test, tests/java.test, tests/libtool7.test,
-       tests/lisp4.test, tests/lisp5.test, tests/lisp6.test,
-       tests/ltcond.test, tests/ltconv.test, tests/mkinst2.test,
-       tests/multlib.test, tests/nobase.test, tests/nodist2.test,
-       tests/obsolete.test, tests/pr287.test, tests/pr300-lib.test,
-       tests/pr300-ltlib.test, tests/pr300-prog.test, tests/python10.test,
-       tests/python3.test, tests/strip.test, tests/transform.test,
-       tests/txinfo13.test, tests/txinfo19.test, tests/txinfo22.test,
-       tests/txinfo23.test, tests/txinfo26.test, tests/txinfo27.test:
-       Likewise.
-
-       Quote @abs_top_builddir@ and @address@hidden
-       * tests/aclocal.in: Likewise.
-       * tests/automake.in: Likewise.
-
-       Fix TAGS and GTAGS rules to cope with whitespace in `pwd`.
-       * lib/am/tags.am (TAGS): Use positional parameters to avoid
-       the need to quote absolute file names.
-       (GTAGS): Quote absolute file name.
-       (CTAGS): Simplify, dropping unused variable `$tags'.
-
-2007-11-25  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/ltlib.am (uninstall-%DIR%LTLIBRARIES): Fix another instance
-       of am__strip_dir.  Fixes nobase and pr300-ltlib test failures.
-
-2007-11-25  Akim Demaille  <address@hidden>
-
-       Several *-local in a rule do not work.
-       * tests/all.test: Check this case.
-       Use set -e.
-       * tests/Makefile.am (XFAIL_TESTS): Add it.
-
-2007-11-25  Akim Demaille  <address@hidden>
-
-       Fix uses of am__strip_dir.
-       * lib/am/libs.am, lib/am/ltlib.am: Catch up with the change of
-       definition of am__strip_dir.
-
-2007-11-25  Akim Demaille  <address@hidden>
-
-       Define and use register_action.
-       * lib/Automake/Rule.pm: Fix a few typos in the doc.
-       (&rule): Use || to simplify the code.
-       (&register_action): New.
-       Export it.
-       * automake.in (&handle_factored_dependencies, &file_contents_internal):
-       Use it.
-
-2007-11-25  Akim Demaille  <address@hidden>
-
-       * bootstrap: Fix typos on redirections.
-
-2007-11-24  Akim Demaille  <address@hidden>
-
-       Skip comments and empty lines in dirlist in the tests.
-       * defs.in (extra_includes): Skip comments and empty lines in dirlist.
-
-2007-11-24  Akim Demaille  <address@hidden>
-
-       Ternary operator in lib/am files.
-       * automake.in (&transform_token): New.
-       (&transform): Use it.
-       Support %KEY?TRUE:FALSE%.
-       (&make_paragraphs): Adjust the regexp to call %transform.
-       * lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
-       * lib/am/progs.am, lib/am/python.am, lib/am/scripts.am:
-       Use %KEY?TRUE:FALSE%.
-       * lib/am/inst-vars.am (am__strip_dir): Assign the result to f
-       to be more alike am__vpath_adj.
-       Adjust dependencies.
-
-2007-11-24  Akim Demaille  <address@hidden>
-
-       * automake.in: Normalize white spaces.
-
-2007-11-24  Ralf Wildenhues  <address@hidden>
-
-       * configure.ac (ACLOCAL, AUTOMAKE): Fix quoting for rebuilding
-       rules, if the absolute build directory name contains white space.
-
-2007-11-22  Ralf Wildenhues  <address@hidden>
-
-       * aclocal.in (trace_used_macros): Quote input files.
-
-       * lib/ylwrap: Cope with white space in `PROGRAM' and `pwd`.
-
-       * lib/am/tags.am (ID, TAGS, CTAGS): Make awk scripts portable again.
-       (CTAGS): Drop unneeded variable `here'.
-
-2007-11-18  Ralf Wildenhues  <address@hidden>
-
-       * tests/output13.test: New test.
-       * tests/Makefile.am: Adjust.
-       Prompted by report from Bruno Haible in
-       <http://lists.gnu.org/archive/html/bug-gnulib/2007-10/msg00479.html>.
-
-       Fix signal handling in aclocal.
-       * aclocal.in (unlink_tmp): If invoked by a signal, note so
-       in verbose mode.  Reinstall default signal handler and reraise,
-       to transport the interrupt information.
-
-2007-11-13  Bob Proulx  <address@hidden>
-
-       Fix color test failure on dumb (and other) terminals.
-       * tests/color.test: Set TERM to `ansi'.
-
-2007-11-12  Ralf Wildenhues  <address@hidden>
-
-       Avoid spurious test failure with `make check TESTS=check5.test'.
-       * tests/check5.test: unset TESTS.
-
-       Fix maintainer-check failure.
-       * tests/color.test: unset TESTS, use `make -e' rather than
-       `make MACRO=val'.
-
-2007-11-10  Ralf Wildenhues  <address@hidden>
-
-       * configure.ac (AM_INIT_AUTOMAKE): Require version 1.10a.
-
-       * automake.in (handle_tests): Remove debugging leftover.
-
-       Run each test in a process-private subdirectory.
-       * tests/defs.in: Employ a trap to clean up at the end of the
-       test in case the test succeeded.  This needs to be revisited
-       because we would like to keep the output of XPASSing tests.
-       Also, note when we were interrupted by a signal.  Code taken
-       from Autoconf's _AC_INIT_PREPARE.
-       If $keep_testdirs is set, keep them even for successful tests.
-       * tests/Makefile.am (check-clean-local): New target.  Remove all
-       tests subdirs, but also make them writable first.  The latter
-       was already needed without per-test subdirs.
-       (distclean-local): Depend upon check-clean-local.
-       * tests/Makefile.in: Regenerate.
-       * tests/.cvsignore, tests/.gitignore: Adjust.
-
-       Fix default includes ordering to be `-I. -I$(srcdir) ...' again.
-       * automake.in (handle_compile): Put -I$(srcdir) before include
-       paths for config headers, as was done before Automake 1.10, but
-       keep uniquified list without multiple adjacent spaces.
-       * doc/automake.texi (Program variables): List include paths
-       in order.
-       * NEWS: Mention 1.10 regression.
-       * tests/stdinc.test: New test.
-       * tests/Makefile.am: Adjust.
-       * THANKS: Update.
-       Report by Kent Boortz.
-
-2007-11-08  Akim Demaille  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-           Bob Proulx  <address@hidden>
-
-       Implement colorized test output.
-       * automake.in (handle_tests): Set COLOR depending on `color-tests'.
-       * configure.ac (AM_INIT_AUTOMAKE): Use `color-tests'.
-       * doc/automake.texi (Tests, Options): Document test results,
-       document new option, document AM_COLOR_TESTS.
-       * lib/Automake/Options.pm (_process_option_list): Handle it.
-       * lib/am/check.am (am__tty_colors): New variable.  Enable colored
-       output if TERM is not dumb and depending on AM_COLOR_TESTS and
-       whether stdout is connected to a terminal.
-       (check-TESTS): Use am__tty_colors.
-       * NEWS: Mention color-tests.
-       * tests/color.test: New test.
-       * tests/Makefile.am: Adjust.
-
-2007-11-08  NightStrike  <address@hidden>  (tiny change)
-
-       For PR automake/526:
-       * doc/automake.texi (Basic Installation): Fix typo.
-
-2007-10-29  Ralf Wildenhues  <address@hidden>
-
-       Accommodate for new macro AC_AUTOCONF_VERSION.
-       * aclocal.in (write_aclocal): Use AC_AUTOCONF_VERSION rather
-       than m4_PACKAGE_VERSION.  Define the former if not defined.
-       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Likewise.
-       * tests/missing4.test: Use AC_AUTOCONF_VERSION.
-
-2007-10-29  Bruno Haible  <address@hidden>
-
-       * doc/automake.texi (Program variables): Clarify that
-       Automake does not put DEFAULT_INCLUDES in AM_CPPFLAGS, but
-       passes it directly to compilation commands.
-
-2007-10-29  Ralf Wildenhues  <address@hidden>
-
-       Move to git as primary source repository.
-       * Makefile.am (git-dist, git-release): Renamed and adjusted from ...
-       (cvs-dist, cvs-release): ... these.
-       (git-diff): New target, taken and adjusted from cvs-diff.
-       * Makefile.in: Regenerate.
-       * bootstrap: Adjust.
-       * NEWS: Announce change.
-       * doc/automake.texi (General Operation): cvs-dist is git-dist now.
-       (Timeline): Mention change.
-
-2007-10-09  Ralf Wildenhues  <address@hidden>
-
-       * automake.in: Treat extension .sx also like preprocessed
-       assembler (.S), following GCC.
-       * NEWS: Update.
-       * doc/automake.texi (Assembly Support): Adjust.
-       * tests/asm3.test: New test.
-       * tests/Makefile.am: Update.
-
-2007-10-09  Jim Meyering  <address@hidden>
-
-       Add lzma compression support.
-       * NEWS: Mention it.
-       * automake.in (handle_dist): Recognize dist-lzma.
-       (make_paragraphs): Map LZMA to dist-lzma.
-       * doc/automake.texi (Dist): Add dist-lzma.
-       (Options): Likewise.
-       * lib/Automake/Options.pm (_process_option_list):
-       (dist dist-all): Add command to create an lzma-compressed tarball.
-       (distcheck): Handle lzma-compressed tarballs just like the others.
-       * tests/defs.in: Test for lzma, too.
-       * tests/lzma.test: New file, based on nogzip.test.
-       * tests/Makefile.am (TESTS): Add lzma.test.
-       Suggestion from Karl Berry.
-
-2007-09-30  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (TARGET_PATTERN): Allow leading digit.
-       * tests/exeext3.test: Adjust to expose this.
-       Report by Claudio Fontana and Laurence Finston.
-
-2007-08-23  Ralf Wildenhues  <address@hidden>
-
-       * tests/defs.in (required): For gcj, check whether `gcj -v'
-       works, to avoid broken installations without libgcj.spec.
-       Export $GCJ.
-       * tests/gcj4.test: Setting GCJ not needed any more.
-       * THANKS: Update.
-       Report by Jesse Chisholm.
-
-2007-08-20  Ralf Wildenhues  <address@hidden>
-
-       * lib/config-ml.in, lib/config.guess, lib/config.sub,
-       lib/symlink-tree, lib/texinfo.tex: New upstream versions.
-
-2007-08-19  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (gettext): Fix link to gettext manual.
-
-2007-08-18  Ralf Wildenhues  <address@hidden>
-
-       In ChangeLog files, use more-permissive notice rather than GPL,
-       as per usual GNU standards these days.
-
-2007-08-16  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_programs): Also clean .libs/_libs
-       directory for _PROGRAMS.
-       * tests/libtoo10.test: New test.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-       Report by Guillermo Ontañón.
-
-2007-08-09  Ralf Wildenhues  <address@hidden>
-
-       * configure.ac: Actually require version 2.60 in the test for
-       Autoconf, and recommend it in the error messages.
-       * THANKS: Update.
-       Report by Robert Swafford.
-
-2007-07-22  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (VPATH Builds): Fix wording.
-       Report by Reuben Thomas.
-
-2007-07-22  Noah Misch  <address@hidden>
-
-       * tests/subst.test: Move the AC_SUBST into a macro definition.
-       Avoids an error from CVS Autoconf.
-       * THANKS: Update.
-       Report by Benoit Sigoure.
-
-2007-07-22  Ralf Wildenhues  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target
-       $(am__aclocal_m4_deps) without any dependencies, to avoid the
-       "deleted .m4 file" problem.
-       * tests/acloca22.test: New test.
-       * tests/Makefile.am: Update.
-       * NEWS: Update.
-
-2007-07-22  Francesco Salvestrini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES)
-       (uninstall-%DIR%LTLIBRARIES): Use $(AM_LIBTOOLFLAGS) and
-       $(LIBTOOLFLAGS).
-       * lib/am/progs.am (install-%DIR%PROGRAMS)
-       (uninstall-%DIR%PROGRAMS): Likewise.
-       * tests/libtool7.test: Update test for `install' and
-       `uninstall' cases.
-       * NEWS, THANKS: Update.
-
-2007-07-16  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi: Remove Front-Cover and Back-Cover Texts,
-       this manual is not printed by the FSF.
-
-2007-07-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS: Clarify that COPYING files are not updated.
-
-2007-07-11  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi: New Back-Cover Text.
-       Report by Karl Berry.
-
-2007-07-07  Ralf Wildenhues  <address@hidden>
-
-       * aclocal.in (version): Fix output to match GCS requirements.
-       * automake.in (version): Likewise.
-       Report by Eric Blake.
-
-       * COPYING, lib/COPYING: Update to GPLv3.  All uses changed.
-       * NEWS: Update.
-
-2007-06-30  Ralf Wildenhues  <address@hidden>
-
-       * lib/gnupload: Fix shell portability issues with for loops.
-       Report by Karl Berry.
-
-2007-06-23  Paul Eggert  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * aclocal.in (write_aclocal): Warn about autoconf
-       incompatibilities instead of making them fatal.
-       * tests/missing4.test: Adjust.
-       * NEWS: Update.
-       Problem reported by Bruno Haible in
-       <http://lists.gnu.org/archive/html/bug-automake/2007-06/msg00010.html>.
-
-2007-05-03  Stepan Kasal  <address@hidden>
-
-       * doc/automake.texi, lib/Automake/Rule.pm: Fix typos.
-       * automake.in: Likewise.
-       (am_primary_prefixes): Keep the intentional typo there.
-
-2007-04-25  Eric Blake  <address@hidden>
-
-       * doc/stamp-vti: Remove generated file from revision control.
-       * doc/version.texi: Likewise.
-
-2007-04-23  Reuben Thomas  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Python): Fix typo.
-
-2007-03-30  Eric Blake  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * lib/mdate-sh (ls_command): Use -n when available to avoid
-       problems with spaces in user/group names.
-       * tests/mdate5.test: New test.
-       * tests/Makefile.am: Adjust.
-
-2007-03-30  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_tests): Rewrite XFAIL_TESTS just like
-       TESTS, appending $(EXEEXT), so that matching continues to work
-       on w32.
-       * NEWS: Mention this.
-       * doc/automake.texi (EXEEXT, Extending): Update.
-       * tests/check7.test: New test.
-       * tests/Makefile.am: Adjust.
-       Bug report by Ed Hartnett.
-
-2007-03-30  Ralf Wildenhues  <address@hidden>
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search
-       the whole file, but use sed to reduce the line length.
-       Fixes 1.10 regression.  Report by David Byron.
-       * THANKS, NEWS: Update.
-
-2007-03-29  Ralf Wildenhues  <address@hidden>
-
-       * lib/depcomp (aix): Rewrite depmode in the spirit of the tru64
-       one.  Fixes failure to catch dependencies with libtool and xlc
-       in case of enable_static=no (which is the default on AIX without
-       runtimelinking).
-       * tests/depcomp7.test: Run test once with --disable-shared and
-       once with --disable-static, to expose failure systematically.
-       * NEWS: Update.
-
-2007-03-29  Stepan Kasal  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_LIBOBJS_or_ALLOCA): Fix the error message.
-       * tests/pr401.test: Update to expose the error.
-       * tests/pr401b.test: Likewise.
-       * tests/pr401c.test: Likewise.
-
-2007-03-28  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (scan_autoconf_config_files): Warn about leading
-       `./' in config file names.
-       * tests/canon-name.test: New test.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-       Suggestion by Claudio Fontana.
-
-       * tests/yacc6.test: Add the generated headers to `BUILT_SOURCES'
-       as documented in the manual.  Fixes parallel make failure.
-       Report by Dieter Jurzitza.
-       * THANKS: Update.
-
-       * ChangeLog, TODO, tests/exdir3.test: Fix copyright notice.
-
-       * TODO: Kill a couple of outdated items.
-       * tests/exdir3.test: New test.
-       * tests/Makefile.am: Update.
-
-2007-01-27 Bruno Haible  <address@hidden>
-
-       * doc/automake.texi (Multiple Outputs): Fix the multiple outputs
-       with locking example.
-
-2007-01-27  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Subpackages): Fix ambiguous wording.
-       Report and suggestions by Reuben Thomas.
-       * THANKS: Update.
-
-2007-01-10  Ralf Wildenhues  <address@hidden>
-
-       * tests/defs.in (is_newest): Cope with multiple newer files.
-       * NEWS: mention `install-sh -C'.
-
-2006-12-25  Paul Eggert  <address@hidden>
-
-       * lib/install-sh (initialize_posix_glob): New var.
-       Use it instead of setting posix_glob inline.
-       (posix_glob): Use '?'/''/: instead of ''/yes/no, for convenience.
-       (cmpprog, CMPPROG): New vars, since we use cmp rather than the diff
-       of Akim's patch.
-       Use LC_ALL before invoking 'ls' when we depend on its output format.
-       Don't use awk; just use the shell's builtin features.
-       Clean up $dsttmp if -C detects no installation is needed.
-       * tests/defs.in (is_newest): Renamed from is_younger; the new
-       name is more accurate.  All uses changed.
-       (old_timestamp): New var.
-       * tests/instsh2.test: Rewrite to avoid the need for sleeping.
-
-2006-12-25  Akim Demaille  <address@hidden>
-
-       * lib/install-sh: Implement install-sh -C.
-       (This patch is the remaining part of the patch proposed in
-       
<http://lists.gnu.org/archive/html/automake-patches/2006-10/msg00077.html>.)
-       (usage): Document it.
-       (copy_on_change): New var.
-       * tests/defs.in (is_younger): New function.
-       * tests/instsh2.test: Check install-sh -C.
-
-2006-12-24  Paul Eggert  <address@hidden>
-
-       * lib/install-sh: Fix typo in previous patch for handling --.
-       Use more-consistent style for ';;'.
-       Prefer || to if-then-else-:.
-       * tests/install2.test: Rework to avoid set -e problems.
-
-2006-12-24  Akim Demaille  <address@hidden>
-
-       Simplify install-sh and its test.  This shouldn't change any behavior.
-       (This patch is a subset of the patch proposed in
-       
<http://lists.gnu.org/archive/html/automake-patches/2006-10/msg00077.html>.)
-       * lib/install-sh (usage): Use usual GNU style.
-       (dstarg): Rename as...
-       (dst_arg): this for consistency.
-       Simplify quoting of assignments.
-       Sort them.
-       Don't use '\' to continue commands: && suffices.
-       Remove useless "continue" in the argument processing,
-       and factor the shifts.
-       * tests/defs.in: Some improvements to make it set -e clean.
-       Use the traditional ":" trick to protect loops from being empty.
-       Remove an empty straightforward piece of code prepared to define
-       additional variables.
-       Use test instead of [], for consistency.
-       * tests/install2.test: Use set -e, to simplify code.
-
-2006-12-20  Reuben Thomas  <address@hidden>  (tiny change)
-
-       * doc/automake.texi: Fix typo.
-
-2006-11-12  Ralf Wildenhues  <address@hidden>
-
-       * doc/Makefile.am: Use $(MAKE) $(AM_MAKEFLAGS) for building
-       amhello, to prevent gmake from invoking make with MAKEFLAGS
-       it does not understand.
-       Report by Patrick Welche.
-
-       * lib/gnupload: Revert last change.  Add pointer to upload
-       instructions of the GNU Maintenance Instructions.
-       Suggestion by Karl Berry.
-
-2006-11-08  Ralf Wildenhues  <address@hidden>
-
-       * lib/gnupload: Add missing 'gnu' to example URL.
-       Report by Karl Berry.
-
-2006-10-28  Bobby Jack <address@hidden>  (tiny change)
-
-       * doc/automake.texi (amhello Explained): autoconf creates
-       configure, not configure.ac.
-       * THANKS: Update.
-
-2006-10-20  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Dist, Dependency Tracking Evolution):
-       Fix some typos.
-       * lib/Automake/Condition.pm: Likewise.
-       * lib/Automake/DisjConditions.pm: Likewise.
-       * lib/Automake/ItemDef.pm: Likewise.
-       * lib/Automake/Options.pm: Likewise.
-       * lib/Automake/Rule.pm: Likewise.
-       * lib/Automake/VarDef.pm: Likewise.
-       * lib/Automake/Variable.pm: Likewise.
-       * lib/Automake/Wrap.pm: Likewise.
-       * lib/Automake/XFile.pm: Likewise.
-       * m4/substnot.m4: Likewise.
-
-2006-10-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/gnupload: Update to version 1.1 of directive file.
-
-2006-10-16  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/depend2.am (%SOURCEFLAG%): New substitution, goes
-       right before the expanded source file name.
-       * automake.in (%sourceflags): New global: per-extension flag
-       to denote that the next compiler argument is the source file.
-       (scan_autoconf_traces): Trace AC_FC_SRCEXT; initialize
-       %sourceflags accordingly.
-       (handle_single_transform): Store source file extension in...
-       (%lang_specific_files): ...this and...
-       (handle_languages): ...adjust here.  Pass flag in SOURCEFLAG.
-       * doc/automake.texi (Optional): Add AC_FC_SRCEXT.
-       (Fortran 9x Support): Update.
-       * tests/fort2.test: New test.
-       * tests/Makefile.am: Adjust.
-       * NEWS, THANKS: Update.
-       Suggested by Steven G. Johnson.
-
-       For PR automake/480.
-       * automake.in (lang_f77_rewrite, lang_fc_rewrite)
-       (lang_ppfc_rewrite, lang_ppf77_rewrite, lang_ratfor_rewrite):
-       return `lang_sub_obj' to support subdir-object mode for the
-       Fortran dialects.
-       * tests/fort4.test, tests/fort5.test: New tests.
-       * tests/Makefile.am: Update.
-       * NEWS, THANKS: Update.
-       Report by Davyd Madeley and Shannon L. Brown.
-
-       * lib/am/header-vars.am (pkglibexecdir): New variable.
-       * automake.in (%standard_prefix): Add it.
-       * doc/automake.texi (Uniform): Document it.
-       (Program Sources): Adjust.
-       * NEWS: Update.
-       * tests/libexec.test: New test.
-       * tests/Makefile.am: Update.
-       Suggested by Eric Blake.
-
-2006-10-15  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/gnupload: Update to version 1.1 of directive file.
-
-       * configure.ac, NEWS: Bump version to 1.10a.
-
-       * configure.ac, NEWS: Bump version to 1.10.
-       * doc/automake.texi (Releases): Update for 1.10.
-
-       * lib/config.sub, lib/texinfo.tex: New upstream versions.
-
-       * lib/am/depend2.am: Typo.
-       * lib/depcomp (scriptversion): Bump, to account for recent changes.
-
-       * doc/automake.texi (Examples): Introduce the example, and point
-       to Hello World.
-       (Hello): Remove this obsolete node.
-
-2006-10-15  Hans Ulrich Niedermann  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       For PR automake/507:
-       * lib/am/distdir.am (distdir): filename-length-max check is not
-       done in sub-packages.
-       * doc/automake.texi (Options): Document this.
-       * tests/fn99subdir.test: New test.
-       * tests/Makefile.am: Update.
-       * THANKS: Update.
-
-2006-10-14  Alfred M. Szmidt  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Third-Party Makefiles): Fix typo.
-       * THANKS: Update.
-
-2006-10-14  Ralf Wildenhues  <address@hidden>
-
-       * aclocal.in (write_aclocal): Improve warning for mismatched
-       Autoconf version.
-
-       * automake.in: For preprocessed assembler, add `$(DEFS)
-       $(DEFAULT_INCLUDES) $(INCLUDES)' to the compile rule.
-       * doc/automake.texi (Assembly Support): Update.
-       * NEWS: Update.
-       Suggested by Thomas Schwinge and Ralf Corsepius.
-
-       For PR automake/492.
-       * automake.in (output_flag): Set to `-o' for Assembler and
-       preprocessed Assembler, assuming that all understand `-c -o'.
-       * THANKS, NEWS: Update.
-       * tests/subobj10.test: New test.
-       * tests/Makefile.am: Update.
-       Report by Thomas Schwinge.
-
-       * automake.in (%_macro_for_cond): New variable.
-       (cond_stack_if): Use it for better error message about
-       missing dependency tracking conditionals.
-       * tests/asm2.test: New test, modeled after asm.test.
-       * tests/Makefile.am: Adjust.
-       Report by Ralf Corsepius.
-
-       * doc/automake.texi (Options): `no-dependencies' is similar
-       to `--ignore-deps', not `--include-deps'.
-       * m4/as.m4 (AM_PROG_AS): If `no-dependencies', do not invoke
-       _AM_DEPENDENCIES.
-       * tests/nodep2.test: New test.
-       * tests/Makefile.am: Adjust.
-
-       * automake.in (handle_LIBOBJS_or_ALLOCA): If we are in the
-       LIBOBJDIR, then we should not add a DEPDIR prefix.
-       * tests/pr401.test: Update test.
-       * tests/pr401b.test: Likewise.
-       * tests/pr401c.test: Likewise.
-       Report by Jim Meyering and Eric Blake.
-
-       * lib/depcomp (gcc3): Put dependency extraction flags before the
-       `-c' flag, so they appear at the same position as in %FASTDEP%
-       mode in depend2.am.  Fixes build failure for FreeBSD's c89,
-       which ignores unknown options only after the first non-option.
-       Bug report against M4 by Nelson H. F. Beebe.
-
-2006-10-14  Bruno Haible  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * automake.in ($seen_gettext_intl): New variable.
-       (handle_gettext): Consider it.
-       (scan_autoconf_traces): Add AM_GNU_GETTEXT_INTL_SUBDIR to the list.
-       Set $seen_gettext_intl when it is seen.
-       * doc/automake.texi (gettext, Optional): Update.
-       * tests/gettext3.test: New test.
-       * tests/Makefile.am: Update.
-
-2006-10-14  Paul Eggert  <address@hidden>
-
-       * lib/install-sh (posix_mkdir): Reject FreeBSD 6.1 mkdir -p -m,
-       which incorrectly sets the mode of an existing destination
-       directory.  In some cases the unpatched install-sh could do the
-       equivalent of "chmod 777 /" or "chmod 0 /" on a buggy FreeBSD
-       system.  We hope this is rare in practice, but it's clearly worth
-       fixing.  Problem reported by Alex Unleashed in
-       <http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00012.html>.
-       Also, don't bother to check for -m bugs unless we're using -m;
-       suggested by Stepan Kasal.
-
-2006-10-14  Geoffrey Keating  <address@hidden> (tiny change)
-
-       * m4/multi.m4: Non-default multilibs may be cross compilation.
-
-2006-10-14  Ralf Wildenhues  <address@hidden>
-
-       * automake.in: Fix some typos in comments.
-       * lib/Automake/Variable.pm: Likewise.
-
-2006-10-10  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_compile): Use subst, for maintainer-check.
-
-2006-10-09  Andreas Köhler  <address@hidden>  (tiny change)
-
-       For PR automake/505:
-       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES):
-       Fix typo: `config.status.lineno', not `configure.status.lineno'.
-
-2006-09-05  Ralf Wildenhues  <address@hidden>
-
-       * NEWS: Mention that `install-sh' needs executable permissions.
-       * tests/nobase.test: Adjust.
-       Report by Patrick Welche.
-
-2006-09-01  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/check.am (check-TESTS): Fix matching of XFAIL_TESTS
-       against currently running test for the first and last element
-       of $(TESTS): add spacing so Solaris make does VPATH expansion
-       on these words, too.
-       * tests/check6.test: Update.
-
-2006-08-30  Paul Eggert  <address@hidden>
-
-       For PR automake/501:
-       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?!GENERIC?%OBJ%):
-       Abbreviate output a bit by not bothering to quote the .Po file
-       name (the quoting doesn't suffice in general anyway), and by not
-       bothering to remove junk .Tpo files (as they'll be removed later).
-       This also lets 'make' run faster by avoiding a subshell.
-
-2006-08-30  Ralf Wildenhues  <address@hidden>
-
-       * automake.in: Fortran 77 and Fortran should require variables
-       F77 resp. FC to be defined, and suggest the respective Autoconf
-       macros otherwise.
-       * tests/fort1.test: New test.
-       * tests/Makefile.am: Update.
-
-       * tests/ext.test: Add extensions f95, F90, F95.
-
-2006-08-30  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/500:
-       * automake.in (handle_compile) <$default_includes>: Do not output
-       the same -I twice.  Use @am__isrc@ instead of ` -I$(srcdir)'.
-       * m4/init.m4: Define am__isrc as ` -I$(srcdir)' only in
-       non-VPATH builds since we always have `-I.'.
-       * tests/subpkg.test: Make sure config headers are found in VPATH
-       and non-VPATH builds.
-
-2006-08-28  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi, lib/Automake/Rule.pm: Fix some typos.
-       * NEWS: Likewise.  Clarify that only one LIBOBJDIR is supported.
-
-2006-08-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/ChannelDefs.pm (usage): Mention that -Wportability
-       is enabled by default with gnu and gnits strictness.
-       Report from Bruno Haible.
-
-2006-08-22  Paul Eggert  <address@hidden>
-
-       * NEWS: Mark de-ANSI-fication as being obsolete.
-       * doc/automake.texi: Likewise.
-
-2006-08-21  Stepan Kasal  <address@hidden>
-
-       * Makefile.am, THANKS: Fix typos.
-
-2006-08-20  Alexandre Duret-Lutz  <address@hidden>
-
-       * NEWS, configure.ac: Bump version to 1.9c.
-
-       * NEWS, configure.ac: Bump version to 1.9b.
-
-       * Makefile.am (maintainer-check): Check for mkdir_p in automake.in
-       too.
-       * automake.in (require_build_directory): Use MKDIR_P, not mkdir_p.
-
-       * m4/mkdirp.m4: Typo in previous patch.
-
-       * Makefile.am (maintainer-check): Fine-tune the "Unescaped @"
-       check so it doesn't complain about the '@ 's in node "Standard
-       Directory Variables".
-
-       * INSTALL, lib/INSTALL, lib/texinfo.tex, lib/config.sub: New
-       upstream versions.
-
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Prefix mkdir_p with
-       $(top_builddir)/ if it is a relative directory.
-
-2006-08-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/lex.am, lib/am/yacc.am: Drop the inline rules, always use
-       ylwrap.  Suggested by Akim Demaille long ago, to ease maintenance.
-       * automake.in (handle_languages): Do not define MORE-THAN-ONE.
-       (yacc_lex_finish_helper, lang_yacc_finish, lang_lex_finish): Always
-       require ylwrap.
-       * doc/automake.texi (Auxiliary Programs, Yacc and Lex): Update the
-       documentation of ylwrap.
-       * tests/lex.test, tests/lex4.test, tests/mmodely.test,
-       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
-       tests/yaccpp.test: Adjust.
-
-       * doc/automake.texi (Releases): Update statistics until 1.9.6.
-
-       * Makefile.am (maintainer-check): Check for mkdir_p.
-       * automake.texi (Obsolete macros): Document AM_PROG_MKDIR_P.
-       * lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
-       lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
-       lib/am/mans.am, lib/am/progs.am, lib/am/python.am,
-       lib/am/scripts.am, lib/am/texinfos.am: Use MKDIR_P instead of mkdir_p.
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Define mkdir_p using $MKDIR_P, not
-       as '$(MKDIR_P)', otherwise it will break `Makefile.in's that use
-       mkdir_p without defining MKDIR_P.
-       * tests/distdir.test, tests/instman.test, tests/txinfo21.test:
-       Adjust.
-
-       * Makefile.am (SUBDIRS): Build lib first, for lib/Automake/Config.pm.
-       * configure.ac (ACLOCAL): Use --acdir=m4 in addition to
-       -I m4.  Running aclocal during the rebuild rules will fail
-       if the default acdir does not exist.
-
-       * NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4:
-       Require Autoconf 2.60 instead of some intermediate development
-       version.
-
-       * doc/automake.texi (Standard Directory Variables): Fix multitable
-       width.
-       (Autotools Introduction): Fix @uref usage.
-
-2006-08-19  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi: Fix some typos in the introduction,
-       adjust some spacing; spell `GNU Build System' consistently.
-       (menu): Unify node naming.
-       (Standard Directory Variables): Clarify that this list is not
-       exhaustive.
-       (DESTDIR): Fix example.
-
-2006-08-19  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Autotools Introduction) New chapter.
-       Thanks to Ben Pfaff and Ralf Wildenhues for comments.
-       (Auxiliary Programs, Install, Dist, Third-Party Makefiles)
-       (distcleancheck): More cross references.
-       * doc/amhello/configure.ac, doc/amhello/README,
-       doc/amhello/Makefile.am, doc/amhello/src/Makefile.am,
-       doc/amhello/src/main.c: New files.
-       * doc/Makefile.am (dist_noinst_DATA): Distribute them.
-       ($(srcdir)/amhello-1.0.tar.gz): New rule.
-       (dist_doc_DATA): Install amhello-1.0.tar.gz.
-       * Makefile.am (SUBDIRS): Update comment.
-
-2006-08-15  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi: Fix some typos.
-
-2006-08-14  Jonathan Higa <address@hidden>
-
-       * automake.in: Register "Unified Parallel C" as language.
-       (lang_upc_rewrite): New function.
-       (resolve_linker): Consider UPCLINK.
-       * lib/Automake/Variable.pm (%_ac_macro_for_var): Suggest
-       AM_PROG_UPC for UPC and UPCFLAGS.
-       * m4/upc.m4: New file.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Add UPC case.
-       * m4/Makefile.am (dist_m4data_DATA): Add upc.m4.
-       * doc/automake.texi (Unified Parallel C Support): New node.
-       (Public macros): Mention AM_PROG_UPC.
-       (Program and Library Variables, Flag Variables Ordering):
-       Mention UPCFLAGS.
-       * tests/upc.test, tests/upc2.test, tests/upc3.test: New file.
-       * tests/Makefile.am (TESTS): Add them.
-       * tests/ext.test: Also test upc files.
-
-2006-08-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Scripts): Fix some errors in previous patch.
-
-       * doc/automake.texi (Scripts): Revamp.  Show an example of script
-       built from configure.ac.  Discuss CLEANFILES and EXTRA_DIST for
-       other built scripts.
-
-       * m4/init.m4: Suggest fixing the call to AC_INIT when
-       AC_PACKAGE_NAME or AC_PACKAGE_VERSION is undefined.  This is for
-       newcomers who call AC_INIT and AM_INIT_AUTOMAKE without arguments.
-       * tests/init.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2006-08-04  Stepan Kasal  <address@hidden>
-
-       * automake.in (dist_dirs, fill_dist_dirs): Remove.
-       * lib/am/distdir.am (DISTDIRS): Remove.
-       * tests/distdir.test, tests/pr2.test: Do not grep, use
-       `make distdir' instead.
-
-2006-08-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Conditionals): Split in two sections, "Usage"
-       and "Portability", and add a third one, "Limits" to explain how
-       conditional definitions inside multi-lines definitions can be
-       handled.
-       * automake.in (handle_options): Do not assume that
-       AUTOMAKE_OPTIONS is defined in TRUE, but diagnose conditional
-       definitions of AUTOMAKE_OPTIONS.
-       Report from Bas Wijnen.
-       * tests/amopt.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-
-       * aclocal.in (install_file): Cannot use /dev/null while diffing
-       new files, because Tru64's diff do not handle /dev/null.  So
-       create an empty destination file before running diff on a new
-       file, and erase it afterward.  Fall back to using /dev/null only
-       if we cannot create this file.
-       Report and initial patch from Ralf Wildenhues.
-       (unlink_tmp): New function.
-       * test/acloca18.test: Make sure the empty file has been erased.
-
-2006-08-04  Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_LIBOBJS_or_ALLOCA): With subdir-objects,
-       do not prefix `$(top_builddir)/' aka `./' to nonempty LIBOBJDIR,
-       to help BSD Make find the files also in a VPATH build.
-       Also return the same path, possibly prefixed, for correct
-       depdir computation.
-       * tests/pr401.test: Update to expose wrong depdir computation.
-       Rewrite to not use the same file name for library object and
-       main program.
-       * tests/pr401b.test, tests/pr401c.test: Likewise.
-
-2006-07-09  Paul Eggert  <address@hidden>
-
-       * lib/install-sh: Don't incorrectly claim that this implementation
-       can install only one file at a time.
-       (doit_exec): New var, for using 'exec' if possible, to save a process.
-       (test_mode, intermediate_mode): Remove.
-       (mode): Check for IFS or globbing characters in mode, since they might
-       cause weird behavior with the other changes below.  All later uses
-       of '"$mode"' changed to '$mode', since the ""s no longer matter.
-       Use octal modes if the invoker specifies an octal mode, and use
-       octal umask values if 'umask' outputs octal values; this is more
-       likely to work with older operating systems since Automake uses
-       octal modes, and also works around a bug with HP-UX 11.23
-       'mkdir -p -m u=rwx,g=rx,o=rx,u+wx' reported by Ralf Wildenhues in
-       <http://lists.gnu.org/archive/html/bug-automake/2006-06/msg00024.html>.
-       (cp_umask, mkdir_umask): New variables, to avoid
-       temporarily creating files or directories with too-permissive modes.
-       (mkdir_mode): Use the FreeBSD 'install' method for computing modes of
-       intermediate directories; this is safer.
-       (posix_mkdir): Also test mkdir -p -m ... by making a directory in
-       /tmp and checking the resulting mode with 'ls', to catch a bug in
-       HP-UX 11.23 and IRIX 6.5 mkdir reported by Ralf in the same message.
-       Use ':' for true, not 'true'; this is a bit faster on
-       traditional implementations.
-
-2006-07-09  Jim Meyering  <address@hidden>
-
-       * lib/depcomp: "in in" -> "in" in comment.
-
-2006-07-06  Ralf Wildenhues  <address@hidden>
-
-       * tests/defs.in (AUTOMAKE_run): Redirect stdout before stderr,
-       for consistency with the recommendation prompted by this report:
-       <http://lists.gnu.org/archive/html/bug-coreutils/2006-06/msg00225.html>.
-
-2006-06-24  Stepan Kasal  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Set `mkdir_p' to
-       `'$(MKDIR_P)'', so that it retains the per-directory value
-       computed by config.status.
-       * lib/am/distdir.am (distdir): do not use `$(mkdir_p)' from
-       a changed directory.  Bugs reported by Ralf Menzel.
-       * THANKS: Update.
-
-2006-06-24  Eric Dorland  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * automake.in (scan_texinfo_file): Fix matching file extension.
-       * tests/txinfo31.test: New test.
-       * tests/Makefile.am: Update.
-
-2006-06-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (handle_LIBOBJS): Don't rely on the caller defining $1.
-
-2006-06-07  Stepan Kasal  <address@hidden>
-
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Rewrite using AC_PROG_MKDIR_P.
-
-2006-06-06  Stepan Kasal  <address@hidden>
-           Ralf Wildenhues <address@hidden>
-
-       * lib/am/distdir.am: Do not call $(mkdir_p) for each
-       distributed file, collect them and create them in one run,
-       and strip $(srcdir) and $(top_srcdir) all at once.
-       Fix some comment typos.
-
-2006-06-06  Ralf Wildenhues  <address@hidden>
-
-       * m4/depend.m4 (_AM_DEPENDENCIES): The IRIX MIPSpro compiler
-       7.4.4m may omit the first included header dependency information
-       with `-MDupdate'.  Refine test to catch this.
-
-       * configure.ac (ACLOCAL): Use `-I m4' to match `./bootstrap'
-       procedure.
-
-       * tests/gettext.test: AM_PROG_GETTEXT of gettext >= 0.14.3
-       requires `config.rpath' to be present, and automake now enforces
-       this.  Test this, but only if the gettext installation works and
-       is recent enough to provide this diagnosis.
-       * tests/gettext.test: Provide a dummy `config.rpath' for all
-       subsequent checks.
-       * tests/gettext2.test, tests/subcond.test: Likewise.
-
-       * tests/pr401.test: Replace "perl -i" with sed and mv, for
-       MinGW perl.
-       * tests/pr401b.test, tests/pr401c.test, tests/python11.test,
-       * tests/yacc6.test, tests/yacc8.test: Likewise.
-
-       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Do not use
-       plain `grep' on the Makefile, as its line length may exceed that
-       for grep.  Bug report against coreutils by Sam Sirlin.
-       * THANKS: Update.
-
-2006-05-26  Sergey Poznyakoff  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Options): Add anchor `tar-formats'.
-
-2006-05-25  Noah Misch  <address@hidden>
-
-       * lib/Automake/XFile.pm (lock): Allow EOPNOTSUPP, besides
-       ENOLCK.  Only mention `make -j' when applicable.  Only raise
-       fatal errors when `make -j' is involved.  Improve error message.
-
-2006-05-17  Ralf Wildenhues  <address@hidden>
-
-       * lib/Automake/Configure_ac.pm (find_configure_ac): Use
-       `$configure_in' instead of `configure.in', to preserve
-       directory component.
-       * lib/Automake/Configure_ac.pm: Add note that Automake owns
-       this file.
-       * lib/Automake/Channels.pm: Likewise.
-       * lib/Automake/FileUtils.pm: Likewise.
-       * lib/Automake/Struct.pm: Likewise.
-
-2006-05-16  Ralf Wildenhues  <address@hidden>
-
-       * INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex:
-       New upstream versions.
-
-2006-05-15  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Auxiliary Programs): Fix URL to GCC
-       repository, they use SVN now.
-
-2006-05-13  Werner Lemberg  <address@hidden>
-
-       * lib/gnupload: Add support for savannah.gnu.org and
-       savannah.nongnu.org.
-
-2006-05-13  Ralf Wildenhues  <address@hidden>
-
-       * lib/Automake/Channels.pm, lib/Automake/Condition.pm,
-       lib/Automake/DisjConditions.pm, lib/Automake/Options.pm,
-       lib/Automake/VarDef.pm, lib/Automake/Wrap.pm: Fix some typos.
-
-2006-05-11  Paul Eggert  <address@hidden>
-
-       * lib/install-sh: Sync from Autoconf, as follows:
-       Don't use 'path' to talk about file names,
-       as per GNU coding standards.  Close a race condition reported by Ralf
-       Wildenhues and Stepan Kasal.  There is still a race condition
-       on hosts that predate Posix 1003.1-1992, but we can't help this.
-       Don't mishandle weird characters like space on pre-Posix hosts.
-       Invoke mkdir at most once per dir arg on pre-Posix hosts.
-
-2006-05-11  Ralf Wildenhues  <address@hidden>
-
-       * tests/missing.test, tests/missing2.test: Do not require
-       GNUmake.
-       * Makefile.am (maintainer-check): Make sure `required=' does not
-       follow `. ./defs' in the tests.
-
-       * tests/ansi10.test: Use AC_PROG_CC_STDC.  Fix test that
-       ac_cv_prog_cc_stdc isn't just used by Automake code in
-       `configure'.
-       * tests/ansi6.test, tests/ansi7.test: Likewise.
-       * tests/ansi9.test: Likewise.  Do not override by setting
-       $U and $(ANSI2KNR) at `make' time; that will be fragile.
-       * tests/libobj8.test: Use AC_PROG_CC_STDC.
-       * tests/subobj3.test: Likewise.  Use `set -e'.
-
-       * lib/install-sh: Initialize IFS, so field splitting isn't
-       turned off later.
-       * lib/mkinstalldirs: Likewise.
-
-       * lib/am/java.am (class%DIR%.stamp): Do not assume `$?' has
-       the path of the prerequisite added; IRIX 6.5 make does not add
-       it, Solaris 2.6 make is inconsistent about adding it.  Fixes
-       java.test failure.
-
-       * tests/distdir.test: Do not use leading `./' in EXTRA_DIST for
-       files in the source tree.  Fixes failures with HP-UX and Tru64
-       make.
-
-       * lib/am/ansi2knr.am (ansi2knr): Rename target as...
-       (./ansi2knr): ...this, for BSD make.
-       (%ANSI2KNR-DIR%/ansi2knr): Adjust.
-
-2006-05-10  Ralf Wildenhues  <address@hidden>
-
-       * tests/depcomp6.test, tests/depcomp7.test: Cater for OpenBSD
-       /bin/sh -e issue with failing commands in if clauses.
-
-       * tests/defs.in (Be Bourne compatible): Update from current
-       Autoconf.
-
-       * configure.ac: Recommend perl-5.8.2.
-       * tests/automake.test: Do not fail because of buggy Getopt::Long
-       in perl < 5.8.2.
-
-       * tests/longlin2.test: Do not use `grep' on Makefile.am:
-       it has long lines and is thus not a text file; AIX 5.1 grep
-       fails to scan non-plain patterns from long lines.
-
-       * tests/overrid.test: Change all regexes for warning messages to
-       match after a colon, so that the prepended file names do not
-       cause false matches.  Tighten overrides regex.  Fix typo
-       `cleam-am-local' -> `clean-am-local'.
-
-       * tests/java.test: `configure' uses a trap, so use `(exit 77);
-       exit 77' to portably set the exit status similar to AS_EXIT.
-       * tests/fn99.test: propagate nonzero exit status from subshell.
-
-       * tests/mkinst3.test: Fix `mkdir' wrapper to not be confused
-       if ``pwd`' contains the string `-p'.  Create the wrapper in a
-       subdirectory so that `.' in $PATH does not lead to an endless
-       loop.
-
-       * lib/depcomp (ia64hp): Rename dependency style to..
-       (hp2): ..this, as it works with aCC on HPPA, too; adjust
-       comment.  Report by Olivier Fourdan (PR automake/481).
-       * THANKS: Update.
-
-       * tests/aclocal7.test: Add `$sleep's between file touching
-       and automake resp aclocal+automake invocations, to ensure
-       they complete with a time stamp strictly later than the touched
-       file.
-
-       * lib/missing: Remove superfluous quotes.  Replace all uses of
-       `[' by `test', for consistency, and for..
-       * tests/missing5.test: ..this new test.
-       * tests/Makefile.am: Update.
-
-       * lib/missing (sed_minuso, sed_output): New variables.
-       (autom4te, help2man, makeinfo): Use them.  Unifies detection of
-       `-o FILE', `--output FILE', `--output=FILE', stricter regex.
-       Fixes `missing' to detect `--output' for help2man.  Fixes
-       PR automake/483.  Report by Dennis J. Linse.
-       (autom4te): Document in `missing --help'.
-       * THANKS: Update.
-
-2006-04-26  Thien-Thi Nguyen  <address@hidden>  (tiny change)
-
-       * doc/automake.texi (Dependency Tracking Evolution): Fix typo.
-
-2006-04-25  Stepan Kasal  <address@hidden>
-
-       * lib/install-sh: Simplify the expr implementation of dirname.
-
-2006-04-24  Paul Eggert  <address@hidden>
-
-       * lib/install-sh: Handle --, and diagnose unknown options.
-       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): In the normal case, set
-       mkdir_p='mkdir -p', not to 'mkdir -p --', for consistency with
-       the other ways that mkdir_p might be set.
-
-2006-04-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/amversion.in (_AM_AUTOCONF_VERSION): New macro.
-       (AM_SET_CURRENT_AUTOMAKE_VERSION): Call it.
-       * aclocal.in (trace_used_macros): Trace _AM_AUTOCONF_VERSION.
-       (write_aclocal): Output a check for Autoconf's version in aclocal.m4.
-       Doing so ensures that users cannot build configure and Makefiles
-       with two different autoconf versions.  Report from Noah Misch.
-       * tests/missing4.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2006-04-20  Paul Lunau  <address@hidden>  (tiny change)
-           Ralf Wildenhues  <address@hidden>
-
-       * lib/am/dejagnu.am (check-DEJAGNU): Fail when at least one test
-       failed, instead of when the last one failed (PR automake/488).
-       Report from Paul Lunau.
-       * tests/dejagnu4.test: Update to expose this.
-       * THANKS: Update.
-
-2006-04-19  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/check.am (check-TESTS): Match XFAIL_TESTS delimited by
-       TABs as well as spaces.  Fixes PR automake/490.
-       * tests/check6.test: New test.
-       * tests/Makefile.am, THANKS: Update.
-       Report from Diab Jerius <address@hidden>.
-
-2006-04-17  Stepan Kasal  <address@hidden>
-
-       * lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the
-       description; eliminate the duplicate error message.
-       * doc/automake.texi (@direntry): `Invoking Automake' is the name
-       of the usage node for `automake'
-       * lib/Automake/Variable.pm (%_gen_varname): Fix typos in the
-       comment.
-
-2006-04-17  Ralf Wildenhues  <address@hidden>
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Require Autoconf 2.59c,
-       because it uses `datarootdir'.  Bump copyright year and serial.
-
-2006-04-10  Stepan Kasal  <address@hidden>
-
-       * NEWS: Fix typo.
-
-2006-04-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (_hash_varname, _hash_values): New functions.
-       (_gen_varname): Use _hash_values, and return a flag indicating whether
-       the variable name was generated or reused.
-       (transform_variable_recursively): Do not redefine variables that
-       are reused, and try to reuse the variable being transformed.
-       * tests/check2.test: Make sure TESTS hasn't been redefined.
-       * tests/check5.test, tests/exeext4.test: Make sure variables have
-       been reused.
-       * tests/subst2.test: Make sure bin_PROGRAMS gets rewritten.
-
-       * automake.in (%ignored_configure_vars): New variable.
-       (scan_autoconf_traces): Trace for _AM_SUBST_NOTMAKE and fill
-       %ignored_configure_vars.
-       (define_configure_variable): Declare ignored configure variables
-       as VAR_SILENT.  Do not special-case AMDEPBACKSLASH and ANSI2KNR
-       w.r.t. VAR_SILENT.
-       * m4/substign.m4: New file.
-       * m4/Makefile.am (dist_m4data_DATA): Add substign.m4.
-       * m4/cond.m4: _AM_SUBST_NOTMAKE $1_TRUE and $1_FALSE (PR automake/477).
-       * m4/depend.m4: _AM_SUBST_NOTMAKE AMDEPBACKSLASH.
-       * m4/protos.m4: _AM_SUBST_NOTMAKE ANSI2KNR.
-       * tests/cond.test: Make sure TEST_FALSE and TEST_TRUE are not defined.
-       * tests/amsubst.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2006-04-09  Stepan Kasal  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * automake.in (handle_single_transform): Preserve directories in
-       direct suffix rules.
-       * tests/suffix12.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       Report from John Ratliff.
-
-2006-03-25  Mike Frysinger  <address@hidden>  (tiny change)
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in ($m4_include_rx): Do not recognize `include', and
-       adjust scan_configure_dep and scan_file accordingly.
-       (scan_configure_dep): Do not search white lines.
-       (scan_file): Strip comments from current line after checking
-       for serial, so that aclocal does not trip on `m4_include' macros
-       in comments.  Report from Mike Frysinger.
-       * tests/acloca21.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-
-2006-03-24  Stepan Kasal  <address@hidden>
-
-       * tests/mmodely.test: Fix the test on systems with no lex.
-
-2006-03-23  Stepan Kasal  <address@hidden>
-
-       * automake.in (libtool_new_api): Fix a typo in the comment.
-       * lib/Automake/Makefile.am (Config.pm): Likewise.
-       * lib/am/depend2.am: Likewise.
-       * tests/xsource.test: With `set -e', `|| exit 1' is no longer
-       needed.
-
-2006-03-23  Ralf Wildenhues  <address@hidden>
-
-       * tests/depcomp6.test, tests/depcomp7.test: Change back to
-       using `$MAKE && exit 1', but make sure the last command in the
-       test is successful.
-
-2006-03-21  Clifford Wolf  <address@hidden>  (tiny change)
-           Stepan Kasal  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * aclocal.in (parse_arguments): Added wildcard support to the
-       dirlist parser.
-       * doc/automake.texi (Macro search path): Document it.
-       * tests/dirlist2.test: New test.
-       * m4/dirlist, tests/Makefile.am: Adjust.
-
-2006-03-20  Ralf Wildenhues  <address@hidden>
-
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Add `_AM_DEPENDENCIES(OBJC)'
-       to `AC_PROG_OBJC' if provided, to fix Objective C depmode
-       handling.
-       * lib/Automake/Variable.pm (%_ac_macro_for_var): Add entries for
-       OBJC and OBJCFLAGS.
-       * tests/ext.test: Adjust.
-       * tests/objc.test, tests/objc2.test: New tests.
-       * tests/Makefile.am: Adjust.
-       * doc/automake.texi (Objective C Support): New node.
-       (Support for Other Languages): Adjust.
-
-2006-03-19  Ralf Wildenhues  <address@hidden>
-
-       * lib/Automake/RuleDef.pm (DESCRIPTION): Typo.
-
-       * tests/depcomp6.test, tests/depcomp7.test: Fix failure logic
-       to work with `set -e'.
-
-       * tests/depcomp6.test, tests/depcomp7.test: New tests,
-       for general `depcomp' functionality, with and without
-       `subdir-objects', with and without `libtool'.
-       * tests/Makefile.am: Adjust.
-
-       * aclocal.in (write_aclocal): Unlink `aclocal.m4' before
-       writing into it, to break a symlinked file.
-       * tests/acloca20.test: New test.
-       * tests/Makefile.am: Updated.
-
-2006-03-19  Ralf Wildenhues  <address@hidden>
-
-       Allow package trees (packages with subpackages) to share
-       common distributed auxiliary files (and directories) that
-       reside within a subpackage.
-
-       * lib/am/distdir.am (distdir %?TOPDIR_P%): Do not fail if
-       `$(distdir)' already exists.
-       (%?SUBDIRS%): Set `am__remove_distdir' to `:' to prevent
-       removal of subpackage trees for distribution.
-       * tests/subpkg3.test: New test.
-       * tests/Makefile.am: Update.
-
-2006-03-18  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/check5.test, tests/nobast.test: Fix $MAKE and rm
-       invocations to please maintainer-check.
-
-2006-03-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (lang_c_rewrite): Typo in previous change.
-       * tests/ccnoco2.test: New file.
-       * tests/Makefile.am (TESTS): Add ccnoco2.test.
-
-       * automake.in (lang_c_rewrite): Make the AM_PROG_CC_C_O requirement
-       a 'portability' warning, so that people can ignore it.  Suggested
-       by Ralf Wildenhues.
-
-       * lib/Automake/ChannelDefs.pm: Make -Wportability the default in
-       gnu and gnits modes.
-       * doc/automake.texi (Invoking Automake): Adjust.
-
-2006-02-21  Ralf Wildenhues  <address@hidden>
-
-       * doc/automake.texi (Yacc and Lex): Document that `.ypp' and
-       `.lpp' file extensions are recognized.
-
-2006-02-21  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Complete, Extending aclocal, Public macros)
-       (Python, Conditionals, API versioning): Always quote macro arguments.
-       Report from Stepan Kasal.
-
-2006-02-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Python): More examples.
-
-2006-02-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (distcleancheck): Fix bad wording.  Report
-       from Bob Rossi.
-       (Man pages): Show dist_man_MANS, not EXTRA_DIST = $(man_MANS).
-
-2006-01-29  Alexandre Duret-Lutz  <address@hidden>
-
-       Append $(EXEEXT) to programs that may be listed in TESTS.
-       Report from Simon Josefsson.
-
-       * automake.in (%known_programs): New global.
-       (initialize_per_input): Reset it.
-       (append_exeext): Take a predicate as first argument to select
-       the filename to rewrite.
-       (handle_programs): Fill %known_programs.
-       (handle_tests): Append $(EXEEXT) to all tests that are in
-       %known_programs.
-       (am_install_var): Update call to append_exeext.
-       * doc/automake.texi (EXEEXT): TESTS is also rewritten.
-       (Tests): More about the difference between check_PROGRAMS and TESTS.
-       Give an example of TEST_ENVIRONMENT.
-       * tests/cond32.test: Augment with a nested condition.
-       * tests/exeext4.test: Also check TESTS.
-       * tests/check5.test: New file.
-       * tests/Makefile.am (TESTS): Add check5.test.
-
-2006-01-12  Paul Eggert  <address@hidden>
-
-       * lib/install-sh (dstdir): Don't use semicolons inside { } in
-       sed scripts, as Posix says it's not portable.
-       * lib/missing (file): Likewise.
-       * lib/am/distdir.am (distcheck): Likewise.
-       * tests/comment7.test, tests/comment9.test, tests/confh.test: Likewise
-       * tests/distcom2.test, tests/distcom3.test: Likewise.
-       * tests/distcom4.test, tests/distcom5.test: Likewise.
-       * tests/distcom6.test, tests/include.test, tests/pluseq8.test: Likewise.
-
-2006-01-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * ChangeLog: Move 2004's entries to ...
-       * ChangeLog.04: ... this new file.
-       * Makefile.am (EXTRA_DIST): Add ChangeLog.04.
-
-       * tests/txinfo13.test: Test fix below.
-
-2006-01-12  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
-       extra files in distribution.  Reported by Vincent Lefevre.
-
-2006-01-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Linking, Program and Library Variables):
-       Mention the file extensions that usually appear in _DEPENDENCIES,
-       and point to BUILT_SOURCES and example of _DEPENDENCIES uses.  A
-       couple of people have been listing sources files in _DEPENDENCIES
-       lately.
-
-       * doc/automake.texi: Bump copyright year.
-       * automake.in ($gen_copyright, version): Likewise.
-       * aclocal.in (write_aclocal, version): Likewise.
-
-2006-01-05  Stepan Kasal  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (topsrcdir): New global.
-       (generate_makefile): Compute it.
-       (fill_dist_dirs): New function extracted from handle_dist.
-       (handle_dist, handle_configure): Use fill_dist_dirs.
-       * tests/distdir.test: Test for cases where $(top_srcdir) or
-       $(srcdir) appear in EXTRA_DIST.  Report from Sander Niemeijer.
-
-2006-01-05  Zack Weinberg  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       * lib/depcomp: Add 'ia64hp' dependency style.
-       Zack's original patch was contributed to GCC on 2005-06-13.
-       (tru64): Typo.
-
-2005-11-01  Stepan Kasal  <address@hidden>
-
-       * lib/install-sh: Use "trap '' 0" instead of "trap - 0", so that
-       the code is portable to both POSIX and pre-POSIX shells.
-
-2005-10-17  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nobase.test: Use `chmod a-x' instead of `chmod -x',
-       suggested by Eric Blake.
-
-2005-10-17  Stepan Kasal  <address@hidden>
-
-       * doc/automake.texi (Program and Library Variables): Typo.
-       * lib/Automake/Variable.pm (transform_variable_recursively): Typo
-       in a comment.
-
-2005-10-03  Stepan Kasal  <address@hidden>
-
-       * ChangeLog.03, automake.in, tests/overrid.test: Typos.
-
-2005-10-03  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/nobase.test: Exercise previous patch.
-
-2005-10-03  Peter O'Gorman  <address@hidden>  (tiny change)
-
-       * lib/am/distdir.am: Remove $(SHELL) when calling install_sh
-       * m4/strip.m4: Ditto.
-       * m4/install-sh.m4: Add $(SHELL) to the definition of install_sh
-
-2005-09-13  Paul Eggert  <address@hidden>
-
-       * doc/automake.texi (limitations on file names): New section.
-       * lib/install-sh: Rewrite to support '*' in file names.
-       Also, tune so that we don't invoke so many commands in the usual case.
-       This has the side effect of fixing `install-sh -d' to not fail if it
-       loses the race in creating the last path component against another
-       process.
-       * tests/instspc.test: The "*" test is now fixed.
-
-2005-09-13  Stepan Kasal  <address@hidden>
-
-       * automake.in (Languages) <cppasm>: Fix typo in the comment.
-
-2005-09-13  Ralf Wildenhues  <address@hidden>
-
-       * lib/am/ltlib.am (uninstall-%DIR%LTLIBRARIES): Do not put
-       shell in verbose mode.
-
-2005-08-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (variable_value): Do not read the TRUE
-       value of a conditionally defined variable.
-       Report from Juergen Leising.
-
-       * automake.in (lang_yacc_target_hook): Use AM_MAKEFLAGS in recursive
-       $(MAKE) invocations.
-       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
-       Likewise.
-       * lib/am/texi-vers.am (%STAMPVTI%): Likewise.
-       * lib/am/remake-hdr.am (%CONFIG_H%): Likewise.
-       * Makefile.am (maintainer-check): Check for this.
-       Report from Stepan Kasal.
-
-       * m4/mkdirp.m4: Update misleading comment about `mkdir -p .'.
-       Prompted by Stepan Kasal.
-
-2005-08-07  Stepan Kasal  <address@hidden>
-
-       * lib/am/texinfos.am (uninstall-info-am): Call install-info only if
-       the $(infodir) exists.
-
-2005-07-31  Stepan Kasal  <address@hidden>
-
-       * tests/library3.test: Fix a typo which made the test fail.
-
-2005-07-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Linking, Program and Library Variables):
-       Suggest reserving -l for third-party libraries.
-
-       * lib/Automake/Variable.pm (require_variables): Mention aclocal's
-       search path when suggesting to add a macro in configure.ac.
-       People are confused when Automake suggests adding a macro (such as
-       AC_PROG_LIBTOOL) that is already in configure.ac.
-       * automake.in (require_file_internal): Suggest `automake --add-missing'
-       for missing files that can be installed.
-       * tests/library3.test: Adjust.
-
-2005-07-27  Stepan Kasal  <address@hidden>
-
-       * tests/defs.in: When required matches both `*libtool*' and
-       `*gettext*', check for both m4 files.
-
-       * doc/automake.texi (Auxiliary Programs): Fix a typo.
-       * tests/suffix11.test: Fix a typo.
-       * tests/colon3.test: s/EGREP/FGREP/.
-
-2005-07-19  Paul Eggert  <address@hidden>
-
-       * tests/instspc.test: Major rewrite to test for many other
-       problematic file names, e.g., '$', '"', '('.  Automake and
-       Autoconf can't handle many of them, so do not report a failure
-       if the usual candidates show up.
-
-2005-07-19  Stepan Kasal  <address@hidden>
-
-       * Makefile.am (automake, aclocal): Merge the rules.
-
-2005-07-10  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
-       versions.
-
-2005-07-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/install-sh: Use IFS=/ to split directories on /, don't translate
-       / into % as it prevents directory names using %...
-
-2005-07-09  Stepan Kasal  <address@hidden>
-
-       * doc/automake.texi (Public macros): Typo.
-       * aclocal.in: Typo in comment.
-
-2005-07-09  Zack Weinberg  <address@hidden>  (tiny change)
-
-       * lib/depcomp: Handle "#line" markers as well as "# " markers in
-       "cpp" style, so it can work with newer HP compilers (for their
-       ia64 systems).
-
-2005-07-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Public macros) <AM_WITH_DMALLOC>: Reword to
-       fix an underful hbox.
-       * lib/INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex:
-       New upstream versions.
-
-2005-07-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.5.
-
-2005-06-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (make_paragraphs): Do not define %TOPDIR%, now that
-       lib/am/header-vars.am no longer uses it.
-       * lib/am/libtool.am (distclean-am, distclean-libtool): Define
-       if TOPDIR_P is true, not TOPDIR.
-       Suggested by Stepan Kasal.
-
-       * automake.in (read_am_file): Correctly diagnose comments following
-       trailing backslash.
-       * tests/commen10.test: New file.
-       * tests/Makefile.am (TESTS): Add commen10.test.
-       Report from Harald Dunkel.
-
-       * automake.in (scan_autoconf_traces): Scan AC_SUBST_TRACE instead
-       of AC_SUBST.
-       * lib/am/header-vars.am (srcdir, top_srcdir, top_builddir, INSTALL):
-       Do not define, they are AC_SUBST_TRACEd by Autoconf.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.59c.
-       * tests/include.test: Call AC_OUTPUT.
-
-2005-06-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/mkinstalldirs: Fix support for directory name with spaces if
-       `mkdir -p' does not work.
-       * tests/Makefile.am (TESTS): Add mkinst3.test.
-       * tests/mkinst3.test: New file.
-       Report from Noah Friedman.
-
-       * doc/automake.texi (Include, Extending aclocal): Typos.
-       Report from Karl Berry.
-
-2005-06-28  Stepan Kasal  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/mdate-sh: Avoid infinite loop with GNU ls when TIME_STYLE is set.
-       * tests/txinfo28.test: Set TIME_STYLE.
-       Report from Vincent Lefevre and James Youngman.
-
-2005-06-24  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/Automake/Variable.pm (define, _new): Remember the helper
-       variable created for the last conditional += on each variable, and
-       only append further += in the same condition to this last helper
-       variable, not to older helper variables.  This way the order of
-       the items appended to the variable is preserved.
-       * tests/cond21.test: Adjust.
-       * tests/cond38.test: New file.
-       * tests/Makefile.am (TESTS): Add cond38.test.
-       Report from Ed Hartnett.
-
-2005-06-22  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/aclocal5.test: Adjust to recent CVS Autoconf changes.
-
-       * automake.in (handle_footer): Do not output an unformatted
-       definition of SOURCES, it is already done correctly in
-       generate_makefile.  This superfluous definition introduced long
-       lines in some Makefiles, hence breakages in tools with a limited
-       line length.  Report from Mathias Froehlich.
-
-2005-06-11  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
-       Fix redirections in previous patch.
-
-2005-06-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
-       Do not backup any file if makeinfo is not installed.
-       * lib/missing (makeinfo): Do not touch a missing info file.
-       * tests/txinfo30.test: New file.
-       * tests/Makefile.am (TESTS): Add txinfo30.test.
-       Report from Bob Proulx.
-
-       * doc/automake.texi (Extending aclocal): Typo.
-
-2005-05-24  Brian Gough  <address@hidden>  (tiny change)
-
-       * lib/am/texinfos.am (.dvi.ps): Add $(am__TEXINFO_TEX_DIR) to TEXINPUTS.
-
-2005-05-15  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix PR automake/461:
-       * automake.in (require_build_directory): Canonicalize directories
-       with different names, such as `foo/bar' and `./foo//bar'.
-       * tests/subobj9.test: Augment to test that.
-       Report from Tom Tromey.
-
-2005-05-14  Alexandre Duret-Lutz  <address@hidden>
-
-       * COPYING, ChangeLog, ChangeLog.00, ChangeLog.01, ChangeLog.02,
-       ChangeLog.03, ChangeLog.96, ChangeLog.98, HACKING, Makefile.am,
-       NEWS, README, TODO, aclocal.in, automake.in, bootstrap, configure,
-       configure.ac, doc/Makefile.am, doc/fdl.texi, lib/COPYING,
-       lib/Makefile.am, lib/acinstall, lib/compile, lib/config-ml.in,
-       lib/config.guess, lib/config.sub, lib/depcomp, lib/elisp-comp,
-       lib/gnupload, lib/mdate-sh, lib/missing, lib/py-compile,
-       lib/symlink-tree, lib/texinfo.tex, lib/ylwrap,
-       lib/Automake/ChannelDefs.pm, lib/Automake/Channels.pm,
-       lib/Automake/Condition.pm, lib/Automake/Config.in,
-       lib/Automake/Configure_ac.pm, lib/Automake/DisjConditions.pm,
-       lib/Automake/FileUtils.pm, lib/Automake/General.pm,
-       lib/Automake/Item.pm, lib/Automake/ItemDef.pm,
-       lib/Automake/Location.pm, lib/Automake/Makefile.am,
-       lib/Automake/Options.pm, lib/Automake/Rule.pm,
-       lib/Automake/RuleDef.pm, lib/Automake/Struct.pm,
-       lib/Automake/VarDef.pm, lib/Automake/Variable.pm,
-       lib/Automake/Version.pm, lib/Automake/Wrap.pm,
-       lib/Automake/XFile.pm, lib/Automake/tests/Condition.pl,
-       lib/Automake/tests/DisjConditions.pl,
-       lib/Automake/tests/Makefile.am, lib/Automake/tests/Version.pl,
-       lib/Automake/tests/Wrap.pl, lib/am/Makefile.am,
-       lib/am/ansi2knr.am, lib/am/check.am, lib/am/clean-hdr.am,
-       lib/am/clean.am, lib/am/compile.am, lib/am/configure.am,
-       lib/am/data.am, lib/am/dejagnu.am, lib/am/depend.am,
-       lib/am/depend2.am, lib/am/distdir.am, lib/am/footer.am,
-       lib/am/header-vars.am, lib/am/header.am, lib/am/inst-vars.am,
-       lib/am/install.am, lib/am/java.am, lib/am/lang-compile.am,
-       lib/am/lex.am, lib/am/library.am, lib/am/libs.am,
-       lib/am/libtool.am, lib/am/lisp.am, lib/am/ltlib.am,
-       lib/am/ltlibrary.am, lib/am/mans-vars.am, lib/am/mans.am,
-       lib/am/multilib.am, lib/am/program.am, lib/am/progs.am,
-       lib/am/python.am, lib/am/remake-hdr.am, lib/am/scripts.am,
-       lib/am/subdirs.am, lib/am/tags.am, lib/am/texi-vers.am,
-       lib/am/texibuild.am, lib/am/texinfos.am, lib/am/yacc.am,
-       m4/Makefile.am, tests/aclibobj.test, tests/acloca10.test,
-       tests/acloca11.test, tests/acloca12.test, tests/acloca13.test,
-       tests/acloca14.test, tests/acloca15.test, tests/acloca16.test,
-       tests/acloca17.test, tests/acloca18.test, tests/acloca19.test,
-       tests/aclocal.test, tests/aclocal3.test, tests/aclocal4.test,
-       tests/aclocal5.test, tests/aclocal6.test, tests/aclocal7.test,
-       tests/aclocal8.test, tests/aclocal9.test, tests/acoutbs.test,
-       tests/acoutbs2.test, tests/acoutnoq.test, tests/acoutpt.test,
-       tests/acoutpt2.test, tests/acoutqnl.test, tests/acsilent.test,
-       tests/acsubst.test, tests/acsubst2.test, tests/all.test,
-       tests/alloca.test, tests/alloca2.test, tests/alpha.test,
-       tests/alpha2.test, tests/amassign.test, tests/ammissing.test,
-       tests/ansi.test, tests/ansi10.test, tests/ansi2.test,
-       tests/ansi3.test, tests/ansi3b.test, tests/ansi4.test,
-       tests/ansi5.test, tests/ansi6.test, tests/ansi7.test,
-       tests/ansi8.test, tests/ansi9.test, tests/ar.test, tests/ar2.test,
-       tests/asm.test, tests/autohdr.test, tests/autohdr2.test,
-       tests/autohdr3.test, tests/autohdr4.test, tests/automake.test,
-       tests/auxdir.test, tests/auxdir2.test, tests/auxdir3.test,
-       tests/auxdir4.test, tests/backsl.test, tests/backsl2.test,
-       tests/backsl3.test, tests/backsl4.test, tests/badline.test,
-       tests/badopt.test, tests/badprog.test, tests/block.test,
-       tests/bsource.test, tests/canon.test, tests/canon2.test,
-       tests/canon3.test, tests/canon4.test, tests/canon5.test,
-       tests/ccnoco.test, tests/check.test, tests/check2.test,
-       tests/check3.test, tests/check4.test, tests/checkall.test,
-       tests/clean.test, tests/clean2.test, tests/colneq.test,
-       tests/colneq2.test, tests/colon.test, tests/colon2.test,
-       tests/colon3.test, tests/colon4.test, tests/colon5.test,
-       tests/colon6.test, tests/colon7.test, tests/comment.test,
-       tests/comment2.test, tests/comment3.test, tests/comment4.test,
-       tests/comment5.test, tests/comment6.test, tests/comment7.test,
-       tests/comment8.test, tests/comment9.test, tests/compile.test,
-       tests/compile_f90_c_cxx.test, tests/compile_f_c_cxx.test,
-       tests/cond.test, tests/cond10.test, tests/cond11.test,
-       tests/cond13.test, tests/cond14.test, tests/cond15.test,
-       tests/cond16.test, tests/cond17.test, tests/cond18.test,
-       tests/cond19.test, tests/cond2.test, tests/cond20.test,
-       tests/cond21.test, tests/cond22.test, tests/cond23.test,
-       tests/cond24.test, tests/cond25.test, tests/cond26.test,
-       tests/cond27.test, tests/cond28.test, tests/cond29.test,
-       tests/cond3.test, tests/cond30.test, tests/cond31.test,
-       tests/cond32.test, tests/cond33.test, tests/cond34.test,
-       tests/cond35.test, tests/cond36.test, tests/cond37.test,
-       tests/cond4.test, tests/cond5.test, tests/cond6.test,
-       tests/cond7.test, tests/cond8.test, tests/cond9.test,
-       tests/condd.test, tests/condhook.test, tests/condinc.test,
-       tests/condinc2.test, tests/condlib.test, tests/condman.test,
-       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
-       tests/conff.test, tests/conff2.test, tests/confh.test,
-       tests/confh4.test, tests/confh5.test, tests/config.test,
-       tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
-       tests/conflnk3.test, tests/confsub.test, tests/confvar.test,
-       tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
-       tests/cxx.test, tests/cxx2.test, tests/cxxansi.test,
-       tests/cxxcpp.test, tests/cxxlibobj.test, tests/cxxlink.test,
-       tests/cxxnoc.test, tests/cxxo.test, tests/cygwin32.test,
-       tests/dash.test, tests/defs.in, tests/defun.test,
-       tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
-       tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
-       tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
-       tests/depcomp.test, tests/depcomp2.test, tests/depcomp3.test,
-       tests/depcomp4.test, tests/depcomp5.test, tests/depdist.test,
-       tests/depend.test, tests/depend2.test, tests/depend3.test,
-       tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
-       tests/dirlist.test, tests/discover.test, tests/distcom2.test,
-       tests/distcom3.test, tests/distcom4.test, tests/distcom5.test,
-       tests/distcom6.test, tests/distcom7.test, tests/distdir.test,
-       tests/distname.test, tests/dollar.test, tests/double.test,
-       tests/dup2.test, tests/else.test, tests/empty.test,
-       tests/empty2.test, tests/empty3.test, tests/empty4.test,
-       tests/exdir.test, tests/exdir2.test, tests/exeext.test,
-       tests/exeext2.test, tests/exeext3.test, tests/exeext4.test,
-       tests/exsource.test, tests/ext.test, tests/ext2.test,
-       tests/extra.test, tests/extra2.test, tests/extra3.test,
-       tests/extra4.test, tests/extra5.test, tests/extra6.test,
-       tests/extra7.test, tests/f90only.test, tests/flibs.test,
-       tests/fn99.test, tests/fnoc.test, tests/fo.test, tests/fonly.test,
-       tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
-       tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
-       tests/gcj5.test, tests/getopt.test, tests/gettext.test,
-       tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
-       tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
-       tests/gnuwarn2.test, tests/header.test, tests/help.test,
-       tests/hfs.test, tests/hosts.test, tests/implicit.test,
-       tests/include.test, tests/include2.test, tests/info.test,
-       tests/insh2.test, tests/install2.test, tests/installdir.test,
-       tests/instdat.test, tests/instdat2.test, tests/instexec.test,
-       tests/insthook.test, tests/instman.test, tests/instman2.test,
-       tests/instsh.test, tests/instsh2.test, tests/instspc.test,
-       tests/interp.test, tests/interp2.test, tests/java.test,
-       tests/java2.test, tests/java3.test, tests/javaprim.test,
-       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
-       tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
-       tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
-       tests/libobj12.test, tests/libobj13.test, tests/libobj14.test,
-       tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
-       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
-       tests/library.test, tests/library2.test, tests/library3.test,
-       tests/libtool.test, tests/libtool2.test, tests/libtool3.test,
-       tests/libtool4.test, tests/libtool5.test, tests/libtool6.test,
-       tests/libtool7.test, tests/libtool8.test, tests/libtool9.test,
-       tests/license.test, tests/link_c_cxx.test, tests/link_dist.test,
-       tests/link_f90_only.test, tests/link_f_only.test,
-       tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
-       tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
-       tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
-       tests/lisp8.test, tests/listval.test, tests/location.test,
-       tests/longlin2.test, tests/longline.test, tests/ltcond.test,
-       tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
-       tests/ltlibobjs.test, tests/ltlibsrc.test, tests/maintclean.test,
-       tests/make.test, tests/makej.test, tests/makevars.test,
-       tests/man.test, tests/man2.test, tests/mclean.test,
-       tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
-       tests/mdate4.test, tests/missing.test, tests/missing2.test,
-       tests/missing3.test, tests/mkinst2.test, tests/mkinstall.test,
-       tests/mmodely.test, tests/multlib.test, tests/nobase.test,
-       tests/nodef.test, tests/nodef2.test, tests/nodep.test,
-       tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
-       tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
-       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
-       tests/nostdinc.test, tests/number.test, tests/obsolete.test,
-       tests/order.test, tests/outdir.test, tests/output.test,
-       tests/output10.test, tests/output11.test, tests/output12.test,
-       tests/output2.test, tests/output3.test, tests/output4.test,
-       tests/output5.test, tests/output6.test, tests/output7.test,
-       tests/output8.test, tests/output9.test, tests/overrid.test,
-       tests/parse.test, tests/percent.test, tests/percent2.test,
-       tests/phony.test, tests/pluseq.test, tests/pluseq10.test,
-       tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
-       tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
-       tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
-       tests/ppf77.test, tests/pr2.test, tests/pr204.test,
-       tests/pr211.test, tests/pr220.test, tests/pr224.test,
-       tests/pr229.test, tests/pr243.test, tests/pr266.test,
-       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
-       tests/pr300-lib.test, tests/pr300-ltlib.test,
-       tests/pr300-prog.test, tests/pr307.test, tests/pr401.test,
-       tests/pr401b.test, tests/pr401c.test, tests/pr72.test,
-       tests/pr87.test, tests/pr9.test, tests/prefix.test,
-       tests/primary.test, tests/primary2.test, tests/primary3.test,
-       tests/proginst.test, tests/python.test, tests/python10.test,
-       tests/python11.test, tests/python12.test, tests/python2.test,
-       tests/python3.test, tests/python4.test, tests/python5.test,
-       tests/python6.test, tests/python7.test, tests/python8.test,
-       tests/python9.test, tests/recurs.test, tests/recurs2.test,
-       tests/regex.test, tests/remake.test, tests/remake2.test,
-       tests/remake3.test, tests/remake4.test, tests/remake5.test,
-       tests/req.test, tests/reqd.test, tests/reqd2.test,
-       tests/rulepat.test, tests/scripts.test, tests/seenc.test,
-       tests/sinclude.test, tests/space.test, tests/specflg.test,
-       tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
-       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
-       tests/spell.test, tests/spell2.test, tests/spell3.test,
-       tests/spelling.test, tests/spy.test, tests/srcsub.test,
-       tests/srcsub2.test, tests/stamph2.test, tests/stdlib.test,
-       tests/stdlib2.test, tests/strip.test, tests/subcond.test,
-       tests/subcond2.test, tests/subcond3.test, tests/subdir.test,
-       tests/subdir2.test, tests/subdir3.test, tests/subdir4.test,
-       tests/subdir5.test, tests/subdir6.test, tests/subdir7.test,
-       tests/subdir8.test, tests/subdir9.test,
-       tests/subdirbuiltsources.test, tests/subobj.test,
-       tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
-       tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
-       tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
-       tests/subpkg.test, tests/subpkg2.test, tests/subst.test,
-       tests/subst2.test, tests/substre2.test, tests/substref.test,
-       tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
-       tests/suffix11.test, tests/suffix2.test, tests/suffix3.test,
-       tests/suffix4.test, tests/suffix5.test, tests/suffix6.test,
-       tests/suffix7.test, tests/suffix8.test, tests/suffix9.test,
-       tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
-       tests/syntax.test, tests/tags.test, tests/tagsub.test,
-       tests/tar.test, tests/tar2.test, tests/tar3.test,
-       tests/target-cflags.test, tests/targetclash.test,
-       tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
-       tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
-       tests/txinfo18.test, tests/txinfo19.test, tests/txinfo2.test,
-       tests/txinfo20.test, tests/txinfo21.test, tests/txinfo22.test,
-       tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test,
-       tests/txinfo26.test, tests/txinfo27.test, tests/txinfo28.test,
-       tests/txinfo29.test, tests/txinfo3.test, tests/txinfo4.test,
-       tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
-       tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
-       tests/vars.test, tests/vars3.test, tests/vartar.test,
-       tests/version.test, tests/version2.test, tests/version3.test,
-       tests/version4.test, tests/version6.test, tests/version7.test,
-       tests/version8.test, tests/vpath.test, tests/vtexi.test,
-       tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
-       tests/werror2.test, tests/whoami.test, tests/xsource.test,
-       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
-       tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
-       tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
-       tests/yaccvpath.test: Update FSF postal mail address.
-
-       * tests/cxxnoc.test: Adjust grep pattern for CC, because CVS
-       Autoconf currently defines a CCC variable.
-
-       * tests/output11.test, tests/output12.test: Use rm -f.
-
-2005-04-25  Gary V. Vaughan  <address@hidden>
-           Alexandre Duret-Lutz  <address@hidden>
-
-       Support for remote LIBOBJS (and friends) with subdir-objects.
-       Fixes PR automake/401.
-
-       * automake.in (config_libobj_dir): New variable.
-       (scan_autoconf_traces): Set config_libobj_dir from AC_CONFIG_LIBOBJ_DIR.
-       (handle_LIBOBJS_or_ALLOCA, require_libsource_with_macro): New functions.
-       (handle_LIBOBJS, handle_ALLOCA): Use them.  Adjust location of
-       dependency files, possibly in a subdirectory.
-       * tests/pr401.test, tests/pr401b.test, tests/pr401c.test: New tests.
-       * tests/Makefile.am (TESTS): Add them.
-       * doc/automake.texi (Optional) <AC_CONFIG_LIBOBJ_DIR>: Document.
-       (LIBOBJS): Document changes in behaviour of
-       LIBOBJS, ALLOCA, LTLIBOBJS & LTALLOCA in the presence of
-       subdir-objects and an invocation of AC_CONFIG_LIBOBJ_DIR.
-
-2005-04-18  Jim Meyering  <address@hidden>
-
-       * doc/automake.texi (Dist): Correct English.
-
-2005-03-31  Stepan Kasal  <address@hidden>
-
-       * doc/automake.texi: When the phrase "for instance" introduces a
-       sentence, it should be delimited by a comma.
-
-       * doc/automake.texi: Fix a few typos.
-
-2005-03-30  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Uniform): Use xmldir instead of htmldir as
-       example, since the GCS now define htmldir.
-       (Auxiliary Programs): Mention config-ml.in and symlink-tree.
-       Give a URL for texinfo.tex.
-       (Public macros): Sort alphabetically, and move obsolete macros...
-       (Obsolete macros): ... here.
-       Prompted by Karl Berry.
-
-2005-03-29  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Multiple Outputs): Fix mistakes reported by
-       Jim Meyering.
-
-       * lib/am/lisp.am ($(am__ELCFILES)): Prevent races if the recover
-       rule is run with `make -j'.
-       * doc/automake.texi (Multiple Outputs): Adjust.
-       * tests/lisp6.test: Augment it.
-       * tests/lisp8.test: New file.
-       * tests/Makefile.am (TESTS): Add lisp8.test.
-       Suggested by Bruno Haible.
-
-2005-03-27  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi: Use @:, @., @!, and @tie{} where appropriate.
-
-2005-03-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/lisp.am ($(am__ELCFILES)): Do not attempt to recover
-       a missing *.elc file if it cannot be created because emacs does
-       not exist.
-       * tests/lisp7.test: New file.
-       * tests/Makefile.am (TESTS): Add lisp7.test.
-       Report from Greg Schafer.
-
-2005-03-05  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi: Replace wicked whiches by thats.
-
-2005-03-04  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (scan_configure_dep, scan_file): Include file names
-       are relative to the directory of configure.ac, not to the
-       directory of the file doing the include.  Remove code for this
-       latter case.
-       * tests/acloca13.test: Run distcheck and make sure all macros are
-       actually distributed.
-
-2005-03-03  Alexandre Duret-Lutz  <address@hidden>
-
-       For PR automake/450:
-       * aclocal.in (scan_file, scan_configure_dep): Skip missing sincluded
-       files.
-       * automake.in (scan_autoconf_traces): Likewise.
-       * tests/sinclude.test: Augment.
-       Report from Peter Breitenlohner.
-
-       For PR automake/450:
-       * aclocal.in (write_aclocal, trace_used_macros): Do not add/remove
-       acinclude.m4 and configure.ac to the include map in these two
-       places ...
-       (strip_redundant_includes): ... do it here.  This completes the
-       previous change from 2005-03-01, that did not update
-       write_aclocal.
-       * tests/acloca19.test: Augment.
-       Report from Peter Breitenlohner.
-
-2005-03-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * tests/comment9.test: Typo.
-
-2005-03-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * automake.in (read_am_file): Preserve backslashes preceding ##-lines.
-       * tests/comment9.test: New file.
-       * tests/Makefile.am (TESTS): Add comment9.test.
-       Report from Julien Sopena.
-
-       For PR automake/450:
-       * aclocal.in (trace_used_macros): Do not explicitly trace files
-       included by configure.ac.
-       * tests/acloca19.test: New file.
-       * tests/Makefile.am (TESTS): Add acloca19.test.
-       Report from Peter Breitenlohner.
-
-2005-02-27  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/448:
-       * automake.in (handle_factored_dependencies): Flag install-hook as
-       an error.
-       * tests/insthook.test: Exercise this.
-
-       * m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
-       * doc/automake.texi (Hard-Coded Install Paths): Adjust.
-
-       * doc/automake.texi: Replace many uses of @samp by @code, and
-       vice versa.  Use @command, @option, and @env where appropriate.
-
-2005-02-26  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi: "filename" -> "file name", for consistency
-       with GNU Coding Standards.  See also Paul's change on 2004-08-20
-       in Autoconf.
-
-       * doc/automake.texi (A Library, Libtool Libraries): Show how to link
-       a program with a static or libtool library.
-       (Program and Library Variables): Make clearer that _LDADD and
-       _LIBADD may also list libraries.
-       Prompted by a mail from Bruce Korb.
-
-       * doc/automake.texi (Alternative): Show how to rewrite nobase_
-       variables using custom directory variables, and link to node
-       Uniform.  Suggested by Leonardo Boiko.
-
-       * doc/automake.texi (Flag Variables Ordering, User Variables):
-       Make clearer who the maintainer is, and that he can AC_SUBST AM_
-       variables in configure.ac.  Suggested by Norman Gray.
-       (Uniform, Public macros, Libtool Issues, Java Support,
-       Conditionals): Use `---' for em dash, and stick them to the
-       enclosing text.
-
-       * doc/automake.texi: Reword a few sentences to fix all underflow
-       and overflow warnings during `make dvi'.
-       (Auxiliary Programs) <configure.guess, config.sub>: Update URL.
-       (Public macros) <AM_WITH_DMALLOC>: Likewise.
-
-2005-02-12  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/INSTALL, lib/config-ml.in, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: New upstream versions.
-
-       * doc/automake.texi (Hard-Coded Install Paths): New node.
-       (Extending, Extending aclocal, Python): Link to it.
-       (Extending): Don't show how to install a file in /etc/ directly,
-       this is insane.
-
-       * automake.in (read_am_file): Define variables containing long
-       lines as VAR_PRETTY to work around tools with limited input width.
-       * tests/longlin2.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       Report from Albert Chin.
-
-2005-02-09  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix for PR automake/447:
-       * lib/depcomp (tru64) [libtool]: Also check for $dir.libs/$base.o.d.
-       Report from Mathias Doreille.  Add some old comments from
-       Nicolas Joly for reference.
-
-2005-02-08  Stepan Kasal  <address@hidden>
-
-       * lib/mdate-sh: Check the size of the word following the month to
-       catch Darwin.  This way the filename can contain spaces.
-
-       * doc/automake.texi (Requirements, Options): Typos.
-
-2005-02-08  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/missing (makeinfo): Compute the output file if neither -o
-       nor @setfilename is used.
-       Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.
-
-2005-02-07  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Requirements): Show one example of
-       AC_CONFIG_FILES with multiple outputs, and correct a few typos.
-
-       * aclocal.in ($serial_line_rx): Expect at least one space between
-       `serial' and the following number.
-       Report from Jim Meyering.
-
-       * lib/mdate-sh: Cope with Darwin's Day/Month/Year output.
-       Report from Peter O'Gorman.
-
-2005-02-06  Alexandre Duret-Lutz  <address@hidden>
-
-       * aclocal.in (usage, parse_arguments): New --dry-run and --diff
-       options.
-       (install_file, write_aclocal): Honor --dry-run and --diff.
-       * doc/automake.texi (aclocal options): Document --dry-run and --diff.
-       (Serials): Mention --diff.
-       * lib/Automake/FileUtils.pm (handle_exec_errors): Accept an
-       $expected_exit_code argument.
-       (xsystem): Take a list of arguments, not a string.
-       * tests/acloca18.test: Use --dry-run and --diff.
-       Suggested by Paul Eggert.
-
-       * doc/automake.texi (aclocal options, Macro search path,
-       Extending aclocal, Local Macros, Serials, Future of aclocal): Make
-       these subsection of ...
-       (Invoking aclocal): ... this.
-
-       * aclocal.in ($serial_line_rx): Allow trailing garbage after the
-       serial number.
-       (scan_file): Explicitly mark the "ill-formed serial" message
-       as a warning.
-       * doc/automake.texi (aclocal options, Local Macros): Link to...
-       (Serials): ... this new section.
-
-2005-02-02  Paul Eggert  <address@hidden>
-
-       * lib/compile: Likewise.
-
-2005-02-02  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/elisp-comp: Use `(exit N); exit N', not `(exit N); exit';
-       see 2004-12-17.
-       * lib/mdate-sh, lib/py-compile, lib/ylwrap: Exit with nonzero
-       status if a write failure occurs with --help or --version option,
-       as below.
-
-2005-02-02  Paul Eggert  <address@hidden>
-
-       * lib/depcomp: Exit with nonzero status if a write failure occurs
-       with --help or --version option.
-       * lib/elisp-comp: Likewise.
-       * lib/gnupload: Likewise.
-       * lib/install-sh: Likewise.
-       * lib/missing: Likewise.
-       * lib/mkinstalldirs: Likewise.
-
-2005-02-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (aclocal options): Typo.
-
-       * aclocal.in (list_compare): New functions.
-       (scan_file): Honor #serial lines.
-       * tests/acloca18.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * doc/automake.texi (aclocal options, Local Macros): Document
-       #serial.
-
-2005-01-30  Alexandre Duret-Lutz  <address@hidden>
-
-       Preliminary support for `aclocal --install'.
-       This still lacks #serial support.
-       * aclocal.in (reset_maps, install_file): New functions.
-       (write_aclocal): Copy files if --install.
-       (usage, parse_arguments): Recognize --install.
-       ("MAIN"): Start aclocal again if some file were installed.
-       * tests/acloca10.test: Augment to test --install.
-       * tests/aclocal.in, tests/defs.in: Add support for
-       ACLOCAL_TESTSUITE_FLAGS, used by acloca10.test.
-       * doc/automake.texi (aclocal options, Local Macros): Document
-       --install.
-       (Future of aclocal): Adjust.
-
-       * doc/automake.texi (Macro search path): Using --acdir is not
-       obvious, it's erroneous.
-
-       * doc/automake.texi (direntry): Let `info Automake' point to the
-       manual, and `info automake' to the `Invoking automake' node.  Like
-       in Autoconf.
-
-2005-01-27  Akim Demaille  <address@hidden>
-
-       * lib/Automake/Configure_ac.pm: s/filename/file_name/g.
-       From Paul Eggert.
-
-2005-01-24  Akim Demaille  <address@hidden>
-
-       * lib/Automake/FileUtils.pm: Rename filename as file_name to be
-       consistent with the terminology of the GNU coding standards.
-       From Paul Eggert.
-       (update_file): Accept a $force argument, so that --force always
-       updates the time stamps.
-
-2005-01-23  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (How the Linker is Chosen): Explain how the
-       linker is chosen without diagram, and update to match the code.
-       Suggestion from Adrian Bunk.
-
-2005-01-16  Alexandre Duret-Lutz  <address@hidden>
-
-       * lib/am/subdirs.am ($(RECURSIVE_TARGETS), $(RECURSIVE_CLEAN_TARGETS)):
-       Process all words of $MAKEFLAGS when checking for -k.
-       * tests/check4.test: New file.
-       * tests/Makefile.am (TESTS): Add check4.test.
-       Report from Eric Blake.
-
-2005-01-13  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/amversion.in (AM_AUTOMAKE_VERSION): Point users to
-       AM_INIT_AUTOMAKE if the version passed is incorrect.
-       * tests/version8.test: New file.
-       * tests/Makefile.am (TESTS): Add version8.test.
-
-2005-01-09  Alexandre Duret-Lutz  <address@hidden>
-
-       * m4/amversion.in, m4/as.m4, m4/auxdir.m4, m4/ccstdc.m4,
-       m4/cond.m4, m4/depend.m4, m4/depout.m4, m4/dmalloc.m4, m4/gcj.m4,
-       m4/header.m4, m4/init.m4, m4/install-sh.m4, m4/lead-dot.m4,
-       m4/lex.m4, m4/lispdir.m4, m4/maintainer.m4, m4/make.m4,
-       m4/minuso.m4, m4/missing.m4, m4/mkdirp.m4, m4/multi.m4,
-       m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4, m4/options.m4,
-       m4/protos.m4, m4/python.m4, m4/regex.m4, m4/runlog.m4,
-       m4/sanity.m4, m4/strip.m4, m4/tar.m4: Use the same all-permissive
-       license that is used in aclocal.m4.  Relicensing backed by RMS.
-
-       * doc/automake.texi (A Library, LIBOBJS): Mention that empty
-       libraries are not portable.
-
-2005-01-05  Akim Demaille  <address@hidden>
-
-       * aclocal.in ($ac_defun_rx): Match AU_ALIAS.
-       * tests/aclocal5.test (MORE_DEFS): Rename as...
-       (AM_TEST): this so that undefined macros are caught.
-       And make it an alias of AC_SUBST.
-       Test AU_ALIAS.
-       Reported by Martin Bravenboer.
-
-2005-01-03  Alexandre Duret-Lutz  <address@hidden>
-
-       Fix handling of per-target flags in link rules.
-       * automake.in (define_per_target_linker_variable): New function.
-       (handle_programs, handle_ltlibraries): Use it.
-       (%link_languages): New map.
-       (register_language): Fill it.
-       * lib/am/ltlibrary.am (%LTLIBRARY%): Do not append
-       $(%XLTLIBRARY%_LDFLAGS) to the command, this is now done by
-       define_per_target_linker_variable if needed.
-       * lib/am/program.am (%PROGRAM%%EXEEXT%): Likewise with
-       $(%XPROGRAM%_LDFLAGS).
-       * doc/automake.texi (Program and Library Variables): Mention
-       AM_LDFLAGS and AM_LIBTOOLFLAGS in the definition of maude_LDFLAGS
-       and maude_LIBTOOLFLAGS.
-       * tests/libtool9.test: New file.
-       * tests/Makefile.am (TESTS): Add it.
-       * NEWS: Explain the backward incompatibility.
-       Report from Akim Demaille.
-
-2005-01-01  Alexandre Duret-Lutz  <address@hidden>
-
-       * doc/automake.texi (Requirements) <AC_CONFIG_FILES>: Discuss
-       specifications with shell variables.
-       (Optional) <AC_CONFIG_HEADERS, AC_CONFIG_LINKS>: Point to
-       AC_CONFIG_FILES for this explanation.
-       * automake.in (substitute_ac_subst_variables_worker,
-       substitute_ac_subst_variables): Mew functions.
-       (rewrite_inputs_into_dependencies): Use substitute_ac_subst_variables
-       to ignore dependencies that contain unAC_SUBSTed shell variables.
-       (handle_configure): Likewise, do not output rules for
-       AC_CONFIG_HEADERS, AC_CONFIG_FILES, and AC_CONFIG_LINKS targets that
-       unAC_SUBSTed contain shell variables.
-       * tests/autohdr4.test: Use an AC_SUBST variable in a specification.
-       * tests/output11.test, tests/output12.test: New files.
-       * tests/Makefile.am (TESTS): Add output11.test and output12.test.
-
-       * aclocal.in (parse_arguments, write_aclocal): Bump copyright year.
-       * automake.in ($gen_copyright, version): Likewise.
-
------
-
-Copyright (C) 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
-
-;; Variables:
-;; coding: utf-8
-;; End:
diff --git a/ChangeLog.11 b/ChangeLog.11
deleted file mode 100644
index 880aaba..0000000
--- a/ChangeLog.11
+++ /dev/null
@@ -1,4995 +0,0 @@
-2011-12-27  Stefano Lattarini  <address@hidden>
-
-       tests: drop unnecessary requirement in 'subpkg.test'
-       * tests/subpkg.test ($required): Drop "bison", it is not required
-       anymore since commit `v1.11-502-g7e5ae80'.
-
-2011-12-27  Stefano Lattarini  <address@hidden>
-
-       gitlog-to-changelog: new auxiliary script, synced from gnulib
-
-       We have plans to stop maintaining a version-controlled ChangeLog
-       file in the Automake repository, and instead begin to generate it
-       automatically from the git log messages.  To do so, we will use
-       the `gitlog-to-changelog' script from gnulib.
-
-       * lib/gitlog-to-changelog: New, synced from gnulib.
-       * Makefile.am (fetch): Fetch and sync it.
-       * lib/Makefile.am (EXTRA_DIST): Distribute it.
-
-2011-12-27  Stefano Lattarini  <address@hidden>
-
-       docs: "aclocal --install -I /abs/dir" actually copies files
-
-       This change is for automake bug#8407.
-
-       In the past, there had been some debate and confusion about
-       whether "aclocal --install" should copy third-party .m4 files
-       in the first directory passed to the `-I' option even when
-       such directory was given as an absolute path, or whether it
-       was better to do so only for directories specified with a
-       relative path.
-
-       The rationale for this latter behaviour was that, before the
-       existence of the `ACLOCAL_PATH' variable, the only way (a poor
-       way, I might add) for a common user to extend the search path
-       of a system-wide installation of aclocal was to export something
-       like ACLOCAL="aclocal -I /my/extra/macros" in the environment.
-       Today, the correct way to proceed is undoubtedly through the
-       use of ACLOCAL_PATH, so we can settle the question once and for
-       all, and start verifying the correct behaviour of `-I' with a
-       new test.
-
-       * tests/aclocal-install-absdir.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * doc/automake.texi (aclocal Options): Be more explicit about
-       this part of `--install' semantics.
-
-2011-12-26  Stefano Lattarini  <address@hidden>
-
-       docs: fix node names for automake and aclocal invocations
-
-       With the older node names, an "info automake" command issued
-       from the command line would have opened the node about the
-       invocation of the automake program, rather than the Top node
-       of the automake documentation.  To invoke the Top node, one
-       had to issue the command "info Automake" instead (note the
-       different capitalization).  This was suboptimal, and certainly
-       confusing.
-
-       With this change, "info automake" will open the Top node of the
-       automake documentation; to access the nodes about the invocation
-       of the automake and aclocal program, one has now to issue "info
-       automake-invocation" and "info aclocal-invocation" respectively.
-
-       This change fixes automake bug#8071.
-
-       See also commits `v2.61a-22-ge9215d1' and `v2.61a-72-g8c07b48' in
-       the autoconf git repository, which tackled a similar issue.
-
-       * doc/automake.texi (@direntry): Rename nodes `aclocal' and
-       `automake' to `aclocal-invocation' and `automake-invocation'
-       respectively.
-       * NEWS: Update.
-
-2011-12-26  Stefano Lattarini  <address@hidden>
-
-       tests: tweak tests on silent-rules for makes without nested vars
-       * tests/silent-nested-vars.test: Define $MAKE to `./mymake' in
-       the environment, so that it will be automatically picked up by
-       configure.  Related tweaks and simplifications.
-       Remove the checks verifying that silent rules are respected also
-       when the 'subdir-objects' option is set, the checks testing the
-       old syntax for user-defined silent rules, and the tests using
-       the default $MAKE programs: they are redundant w.r.t. other test
-       cases.  Related simplifications.
-       Remove the temporary files used in a sanity check as soon as they
-       are not needed anymore.
-       Do not capture also the standard error of configure: we only want
-       to grep its standard output.
-       Consistently use `stdout' for the name of files where to save the
-       standard output captured from make and configure, for consistency
-       with other tests.
-       Make grepping of configure output and of the generated Makefile
-       stricter.
-       Improve and tweak the `mymake' script a little.
-       * tests/silent6.test: Make grepping of make stdout slightly
-       stricter.  After having configured with silent rules disabled,
-       try to force the use silent rules with `make V=1'.
-
-2011-12-25  Paul Eggert  <address@hidden>
-
-       silent-rules: fallback for makes without nested vars
-
-       This fixes two problems reported for Automake (Bug#9928, Bug#10237)
-       and is in response to a bug report for building coreutils on HP
-       NonStop OS (Bug#10234).  The problem is that HP NonStop 'make'
-       treats a line like "AM_V_CC = $(am__v_CC_$(V))" as one that
-       expands a macro with the funny name am__v_CC_$(V instead of the
-       desired name am__v_CC_1 or am__v_CC_0, and since the funny macro
-       is not defined the line is equivalent to "AM_V_CC = )"; this
-       inserts a stray ")" when $(AM_V_CC) is used, which eventually
-       causes 'make' to fail.
-
-       The basic idea is that instead of generating Makefile.in lines like
-       "AM_V_CC = $(am__v_CC_$(V))", we generate
-       "AM_V_CC = $(address@hidden@)".  We then AC_SUBST $(V) for @AM_V@
-       in the usual case where `make' supports nested variables,
-       and substitute 1 (or 0) otherwise.  Similarly for usages like
-       $(am__v_CC_$(AM_DEFAULT_VERBOSITY)).
-
-       With this change, make implementations that doesn't grasp nested
-       variable expansions will still be able to run Makefiles generated
-       using the silent-rules option.  They won't allow the user to
-       override the make verbosity at runtime through redefinition of
-       $(V) (as in "make V=0"); but this is still an improvement over not
-       being able to work at all.
-
-       * NEWS: Document this.
-       * automake.in (define_verbose_var): When defining the variables,
-       use @AM_V@ rather than $(V), and use @AM_DEFAULT_V@ rather than
-       $(AM_DEFAULT_VERBOSITY).
-       * doc/automake.texi (Automake silent-rules Option): Explain new system.
-       * m4/silent.m4 (AM_SILENT_RULES): Check whether `make' supports
-       nested variables, and substitute AM_V and AM_DEFAULT_V accordingly.
-       * tests/silent-nested-vars.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-
-2011-12-24  Stefano Lattarini  <address@hidden>
-
-       gitignore: use only one .gitignore file, in the top-level directory
-       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
-       lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their
-       contents merged into ...
-       * .gitignore: ... this top-level file.  Since we are at it, improve
-       it by anchoring files where it makes sense.
-
-2011-12-24  Stefano Lattarini  <address@hidden>
-
-       tests: one more fixlet for gettext macros requirement
-       * tests/gettext-macros.test (configure.in): Add calls to
-       AC_INIT and AC_PROG_CC, to avoid a spurious failure in the
-       later aclocal invocation.
-       Luckily, this wart wasn't causing any spurious SKIP or FAIL,
-       but only the redundant addition to the `-Wno-syntax' option
-       to some aclocal invocations in the gettext tests.
-
-2011-12-24  Stefano Lattarini  <address@hidden>
-
-       tests: fix handling of gettext macros requirement
-
-       The code introduced in the earlier change `v1.11-581-gb7d67d5'
-       and aimed at automatically fetching all the .m4 files provided by
-       gettext has proven inadequate, since it hasn't managed to truly
-       and always get *all* the required .m4 files.  For example, it has
-       failed to fetch the file `intldir.m4' (present in gettext 0.18.1,
-       and where the macro `AM_GNU_GETTEXT_INTL_SUBDIR' is defined),
-       which in turn has caused spurious SKIPs of at least the test
-       `gettext3.test'.
-
-       The reason for this debacle is that autopoint looks at the version
-       specified in AM_GNU_GETTEXT_VERSION to decide which version of the
-       gettext infrastructure to bring in; since we were unconditionally
-       specifying the older 0.10.35 version, the newer `.m4' files weren't
-       brought in.
-
-       * tests/gettext-macros.test: In AM_GNU_GETTEXT_VERSION, instead
-       of unconditionally specifying the older 0.10.35 version, specify
-       the version of the available `gettextize' or `autopoint' program,
-       dynamically extracted with the help of ...
-       (extract_program_version):... this new function, and saved ...
-       ($autopoint_version): ... in this new variable.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       tests: fix failure due to debugging code forgotten into a test
-       * tests/missing-tar.test: Don't ever call the `missing' script
-       with `sh -x'; this was used for debugging, but an instance of
-       it slipped into the committed test case.  Bug revealed by a
-       failure on a Solaris 10 system with GNU tar installed as `gtar'.
-
-2011-12-23  Stefano Lattarini  <address@hidden>
-
-       tests: avoid spurious failure of libtool and gettext tests
-
-       On Solaris 10 (and presumably earlier), /bin/sh trips up on
-       here-documents that contains a command substitution *and* are
-       fed to a shell function:
-
-         # All as expected.
-         $ cat <<END
-         `pwd`
-         END
-         /home/stefano
-         $ echo status = $?
-         status = 0
-
-         # An apparently innocuous function ...
-         $ kitty () { cat; }
-         # ... but hilarity ensues!
-         $ kitty <<END
-         `pwd`
-         END
-         /tmp/sh137723: cannot open
-         $ echo status = $?
-         status = 1
-
-       We need to work around this misbehaviour in a couple of our
-       tests (whose failures where causing cascading failures in a
-       lot of other tests).
-
-       * tests/gettext-macros.test: Avoid the use of command substitution
-       in a here-document passed to the `indent' function, by using the
-       `echo' builtin instead.
-       * tests/libtool-macros.test: Likewise.
-
-       See also:
-       <http://lists.gnu.org/archive/html/bug-autoconf/2011-12/msg00001.html>
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       hacking: distribute it, and mention it in the ChangeLog
-       Not distributing the HACKING file might make it more difficult,
-       for some random curious user, to get informed about or interested
-       in the Automake development process, or to send us patches.
-       * Makefile.am (EXTRA_DIST): Add HACKING.
-       * HACKING: It's OK to distribute this file, and to mention it in
-       the ChangeLog.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       regex: deprecate the obsolete macro AM_WITH_REGEX
-       This is a backport of commit v1.11-433-g37b0aee.
-       Today, practically nobody uses the GNU rx library, which, according
-       to its own website <http://www.gnu.org/software/rx/rx.html>, has
-       been "decommissioned".  Consequently, the automake-provided macro
-       AM_WITH_REGEX is not used nor required anymore.  Deprecate it, so
-       that it will be possible to safely remove it in the next major
-       automake version.
-       * m4/regex.m4 (AM_WITH_REGEX): Give a warning of the class
-       `obsolete' when this macro is used.
-       * doc/automake.texi (Public Macros): Move description of
-       `AM_WITH_REGEX' from here ...
-       (Obsolete Macros): ... to here, and declare it as obsolete
-       and "to be removed in a future version".
-       * tests/regex-obsolete.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * NEWS: Update.
-       See also:
-       
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00131.html>
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       maint: distribute .xz tarballs, not .bz2 ones
-       Many GNU packages are moving towards xz-compressed tarballs, so
-       let's follow suit, by dropping the creation and distribution of
-       a bzip2-compressed tarball and switching to xz instead.
-       For compatibility and safeness, we will continue to create and
-       distribute a gzip-compressed tarball as well.
-       * configure.ac (AM_INIT_AUTOMAKE): Drop `dist-bzip2', add
-       `dist-xz'.
-       * NEWS: Update
-       Suggested by Jim Meyering.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       include: avoid "deleted .am file" problem
-       * automake.in (handle_configure): When processing `configure.am',
-       also expand `HAVE-MAKEFILE-IN-DEPS' to a boolean telling whether
-       `MAKEFILE-IN-DEPS' is empty or not.
-       * lib/am/configure.am [?HAVE-MAKEFILE-IN-DEPS?]
-       (%MAKEFILE-IN-DEPS%): New target without dependencies, to
-       avoid the "deleted .am file" problem.  Emit this only when
-       `?HAVE-MAKEFILE-IN-DEPS?' is true, to avoid generating an
-       "empty" dependency declaration.
-       * tests/deleted-am.test: Make grepping of error message stricter.
-       * tests/dist-missing-am.test: Likewise.
-       * tests/remake-deleted-am.test: New test.
-       * tests/remake-deleted-am-2.test: Likewise.
-       * tests/remake-deleted-am-subdir.test: Likewise.
-       * tests/remake-renamed-am.test: Likewise.
-       * tests/makefile-deps.test: Likewise.
-       * tests/Makefile.am (TESTS): Add the new tests.
-       * NEWS: Update.
-       Fixes automake bug#9768.
-       Report by Peter Johansson.
-       See also commit `Release-1-10-40-gd0ebf71', which fixed a similar
-       problem for .m4 files included by configure.ac.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       maint: better use of autoconf 2.68 features
-       * configure.ac: Now that Automake requires autoconf 2.68 for its
-       own bootstrapping and build system, we can assume that PACKAGE_URL
-       gets automatically AC_SUBT'd.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       cosmetics: use proper m4 quoting in configure.ac
-       * configure.ac (AC_CONFIG_SRCDIR): Use proper m4 quoting
-       for its arguments.
-       (AC_CONFIG_AUX_DIR): Likewise.
-       (AC_PROG_PATH): Likewise.
-
-2011-12-14  Stefano Lattarini  <address@hidden>
-
-       tests: better handling of gettext and libtool requirements
-
-       This change fixes automake bug#9807.
-
-       Before this change, the automake testsuite only looked for the
-       `.m4' files containing libtool and gettext macros definitions in
-       the directory `${prefix}/share/aclocal' (and in the directories
-       specified by the `dirlist' file in there, if any), where ${prefix}
-       was the configure-time automake installation prefix (defaulting
-       to `/usr/local').
-
-       This approach had various shortcomings and disadvantages.  Let's
-       briefly describe the three major ones.
-
-       First, on most GNU/Linux systems, a libtool or gettext installed
-       from distro-provided packages (e.g., by dpkg on Debian/Ubuntu, or
-       by rmp on RedHat/Fedora) would have `/usr', not `/usr/local', as
-       its ${prefix}; so, trying to run the automake testsuite with a
-       simple "./configure && make && make check" would have failed to
-       execute the libtool and gettext tests on most GNU/Linux distros.
-       It's true that it was quite easy to work around this issue, by
-       creating a proper `/usr/local/share/aclocal/dirlist' file with
-       an entry pointing to `/usr/share/aclocal' (a workaround in fact
-       used by most automake developers); but the typical user wasn't
-       aware of the necessity of this trick, so the libtool and gettext
-       tests was usually skipped on testsuite runs "in the wild", thus
-       needlessly reducing coverage.
-
-       Second, the older testsuite behaviour made more difficult for
-       the developers to run the testsuite with non-default libtool or
-       gettext.  For example, assume the developer is working on a system
-       that has a default libtool version 1.5 installed in the /usr/local
-       hierarchy; to improve coverage, the developer installs also a more
-       modern libtool version, say 2.4, in its home directory, let's say
-       in ~/libtool-2.4; he then tries to run the automake testsuite with
-       this more modern libtool by doing an (apparently) simple:
-         $ PATH=$HOME/libtool-2.4:$PATH make check
-       But the automake testsuite would still look for libtool macros in
-       /usr/local/share/aclocal, not in ~/libtool-2.4/share/aclocal, so
-       the wrong version of the macros would be picked up, and the tests
-       would either fail spuriously or (which would be worse) pass without
-       truly covering the libtool version the developers was thinking to
-       be testing with.
-       Worse again, the automake testsuite would *unconditionally* look
-       for libtool macros in /usr/local/share/aclocal, so even something
-       like:
-         $ export ACLOCAL_PATH=$HOME/libtool-2.4/share/aclocal
-         $ PATH=$HOME/libtool-2.4:$PATH make check
-       wouldn't work.
-
-       Third and last, during a "make distcheck", automake is configured
-       with a ${prefix} pointing to a proper subdirectory of the build
-       directory (usually `pwd`/_inst), which gets created on-the-fly;
-       in this case, with the old approach, the automake testsuite never
-       found the libtool and gettext macro files, ans so the libtool and
-       gettext tests was *always* skipped in a "make distcheck".
-
-       * tests/libtool-macros.test: New helper test, looking (with the
-       help of the `libtoolize' script) for libtool macro files required
-       by most libtool tests, and making them easily accessible.
-       * tests/gettext-macros.test: New helper test, looking (with the
-       help of the `libtoolize' script) for libtool macro files required
-       by most libtool tests, and making them easily accessible.
-       * tests/defs.in: Update to make it rely on the results and setups
-       of `libtool-macros.test' and `gettext-macros.test'.
-       * tests/Makefile.am: Declare dependency of all the logs of libtool
-       tests from `libtool-macros.log', and all the logs of gettext tests
-       from `gettext-macros.log'.
-       (TESTS): Add the new tests.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       fix: typos and grammaros in comments of the new test
-       * tests/get-sysconf.test: Fix few typos, grammaros and botched
-       wording.  Reported by Eric Blake.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       tests: report useful system information in 'test-suite.log'
-       It has already happened various times that a user has run the
-       automake testsuite, experienced a failure, read the messages
-       telling him "See tests/test-suite.log" and "Please report to
-       address@hidden", and done exactly that -- sending us only
-       the contents of `tests/test-suite.log', which are usually not
-       enough to start debugging the reported failure.  So we have to
-       ask him for more details, and usually also for the `config.log'
-       file generated by configure.  It's time to fix this recurring
-       feedback inefficiency.  We do so by creating a dummy test case
-       that takes care of copying the contents of `config.log', plus
-       other useful system information, in the final `test-suite.log'.
-       * tests/get-sysconf.test: New test, gathering system information
-       and then always terminating with a SKIP, so that its output gets
-       copied in `test-suite.log'.
-       * tests/Makefile.am (TESTS): Add it.
-
-2011-12-07  Reuben Thomas  <address@hidden>  (tiny change)
-
-       python: remove relics for Python 1.5 support
-       * m4/python.m4: The comments in here claim to support only
-       Python >= 2.0, yet this file still has specific support for
-       Python 1.5.  Just remove it, python 1.5 is 12 years old now,
-       and practically defunct.
-       * NEWS: Update.
-       See also commit `Release-1-10-205-gd5bec12', "Support for
-       Python 3.0, drop support for pre-2.0."
-
-2011-12-21  Stefano Lattarini  <address@hidden>
-
-       configure: remove extraneous 'eval's from AM_RUN_LOG invocations
-       * configure.ac: Remove extra 'eval's from AM_RUN_LOG invocations;
-       for example, instead of "AM_RUN_LOG([eval $PERL --version])",
-       simply use "AM_RUN_LOG([$PERL --version])"
-
-2011-12-21  Stefano Lattarini  <address@hidden>
-
-       configure: report TeX version in config.log
-       * configure.ac: If possible, report the version of the selected
-       TeX program; this should render the logs more informative.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       maint: snapshots from `maint' are still development snapshots
-       The maintenance-oriented development line in the `maint' branch,
-       while being usually pretty stable and 99% backward-compatible,
-       is not always right off production-quality; but until now, the
-       Automake package version declared in configure.ac hid this fact,
-       since it appeared to be the version of a stable release (e.g.,
-       11.1).  Fix this.
-       * configure.ac (AC_INIT): Bump version to "1.11.0a".
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       configure: print proper message for test releases
-       * configure.ac: If the current release is detected to be a test
-       release or a development snapshot, print a proper warning for
-       the user.
-       * README-alpha: Delete, it's obsolete now (and in fact this file
-       hasn't been touched in eleven years, since release 1.4b or so).
-       * HACKING (Release procedure): Don't say to update README-alpha.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       devel: help in comparing Makefile.in from different commits
-       Now that the generated Makefile.in, configure and aclocal.m4 files
-       are no longer committed in Automake's git repository, a simple
-       "git diff" or "git log" no longer shows if and how a change in
-       Automake results in changes to the Makefile.in files and/or
-       configure script of its own build system.  Still, the ability to
-       peek so easily at such differences has proved itself quite useful
-       in the past, often revealing inconsistencies and blunders, and
-       sometimes even bugs; so it would be a pity to lose that altogether.
-       With this change, we add a new maintainer recipe that re-introduces
-       much of that capability, by generating and comparing on the fly the
-       Makefile.in, configure and aclocal.m4 derived from two arbitrary
-       commits of the Automake repository.
-       * Makefile.am (autodiffs, compare-autodiffs): New phony targets.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       repo: don't commit generated files in the git repository anymore
-       It has been quite some time since autoconf and libtool have stopped
-       committing the generated autotools files in their git repositories,
-       with no significant ill effects we're aware of.  It's true that the
-       autoconf bootstrap process has now the minor annoyance that a
-       pre-installed autoconf is required to complete it; but luckily
-       automake will not have a similar annoyance, since our bootstrap
-       script take care, through some hoops, to use the very automake and
-       aclocal versions from the current git checkout to generate the
-       required aclocal.m4 and Makefile.in files.  In fact, this has been
-       a necessity also in the past, because automake has been known to
-       use in its own build system new development features that hadn't
-       been present in any previously released automake distribution.
-       * .gitignore: Ignore configure, aclocal.m4, and all the
-       Makefile.in files.
-       * configure.ac (AC_PREREQ): New macro call, to require the
-       latest autoconf (2.68 for the moment).
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       missing: don't try to re-run tar with a munged command line
-       * lib/missing: If the default `tar' program fails with the given
-       arguments, and GNU tar is not available, don't try to re-run the
-       default `tar' with a munged command line (e.g., ditching possibly
-       unportable options), as that could be subtly alter the intended
-       semantics (and maybe even create a somewhat corrupted tarball).
-       Also, it's worth noting that the main purpose of the `missing'
-       script is to allow a non-developer to build the package in the
-       face of slightly-skewed timestamps, not to provide wrappers for
-       all the maintainer tools -- so we don't have to try too hard
-       when `missing' is just called to wrap `tar'.
-       * tests/missing-tar.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       missing: inform the user if GNU tar is called
-       * lib/missing: If the code trying to run GNU tar is reached, it
-       means that the previous attempt to run the default tar program
-       has failed, very likely producing some error message.  At this
-       point, just running GNU tar without further comments might be
-       confusing.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       missing: if GNU tar exists but fails when called, give up
-       * lib/missing: If the code trying to run GNU tar is reached,
-       don't continue if the invoked GNU tar program fails, as there
-       is little point in doing so (and can even be confusing and
-       counter-productive).
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       missing: miscellaneous fixlets
-       * lib/missing: Some shells, such as Solaris or FreeBSD /bin/sh,
-       warn about missing programs before performing redirections.
-       Therefore, where we have to silently check whether a program
-       exists, perform redirections on a subshell.
-       Remove redundant uses of double-quotes in variable definitions.
-       Delete an extra blank line.
-
-2011-12-22  Stefano Lattarini  <address@hidden>
-
-       maint: remove executable bit from automake.in
-       * automake.in: This file is not meant to be executed, only to
-       be preprocessed to create the `automake' script; so don't leave
-       it executable.
-
-2011-12-20  Peter Rosin  <address@hidden>
-
-       tests: fix spurious failure on systems lacking unistd.h
-       This is for automake bug#10324.
-       * tests/silent-lex-generic.test (foo.l): Add a dummy #define of
-       YY_NO_UNISTD_H, so that the generated foo.c file won't require
-       unistd.h to be present (it is not present when compiling with,
-       e.g., MSVC 9).
-
-2011-12-16  Stefano Lattarini  <address@hidden>
-
-       test defs: hack to support autoconf-wrapper programs
-       * tests/defs.in ($AUTOCONF): Add a dummy `-B' option to the
-       autoconf invocation, so that, when the Debian autoconf wrapper
-       is involved, it will correctly dispatch an autoconf >= 2.50
-       instead of defaulting to autoconf 2.13.
-       ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
-       autoreconf respectively.
-       Reported by Bruno Haible:
-       <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
-
-2011-12-16  Stefano Lattarini  <address@hidden>
-
-       tests: fix a minor spurious failure with FreeBSD make
-       * tests/remake-am-pr10111.test: Avoid using `#' comments in
-       makefile recipes, as these have been confusing FreeBSD make.
-       The failure was masked by the fact that this test is currently
-       expected to fail.
-       Suggested by a report from Bruno Haible.
-
-2011-12-16  Stefano Lattarini  <address@hidden>
-
-       tests: make two test scripts executable
-       * tests/remake-am-pr10111.test: Make executable.
-       * tests/remake-m4-pr10111.test: Likewise.
-
-2011-12-14  Stefano Lattarini  <address@hidden>
-
-       readme: reference webpages for automake mailing lists
-       * README: Rationalize and reorganize the (brief) description of
-       the automake mailing lists.   In particular, instead of suggesting
-       the reader to write to the `-request' addresses to subscribe to
-       mailing lists, point him to the relevant webpages, where he can
-       also subscribe via a web form.
-
-2011-12-14  Stefano Lattarini  <address@hidden>
-
-       readme: update advice about testsuite execution
-       * README: Now that the automake testsuite uses the parallel-tests
-       driver, there is no need for the user to capture the stdout of
-       "make check" to determine which tests have failed: a detailed log
-       is automatically saved into the `tests/test-suite.log' file.
-       Since we are at it, improve the wording by dropping an extra
-       "please".
-
-2011-12-14  Stefano Lattarini  <address@hidden>
-
-       readme: don't reference the old homepage at sources.redhat.com
-       * README: Don't reference the old homepage at sources.redhat.com,
-       which is no longer active; reference the homepage on www.gnu.org
-       instead.  See also automake bug#10157 and bug#10248.
-       * tests/README: Likewise, and remove related extra-pedantic advice
-       about copyright papers for test cases (we'll ask for those papers
-       explicitly when we think they are warranted).
-
-2011-12-12  Stefano Lattarini  <address@hidden>
-
-       hacking: some more fixlets
-       * HACKING (Release Procedure): Place the list of pre-release
-       bootstrap-and-test commands on a line of its own, so it's easy to
-       select and then paste it into a terminal window.
-       Fix the explanation of "make git-release", as, since the previous
-       change, "make git-release" would simply run "make dist" rather
-       than "make distcheck".
-       Suggestion from Jim Meyering.
-
-2011-12-12  Peter Rosin  <address@hidden>
-
-       * NEWS: Fix typo in 'make dist-bzip2' description.
-
-2011-12-10  Stefano Lattarini  <address@hidden>
-
-       release: don't run "make distcheck" automatically
-       * Makefile.am (git-dist): The developers should test extensively
-       before finally creating the release tarball; so don't run "make
-       distcheck" on their behalf here; instead ...
-       * HACKING (Release procedure): ... state here that "make check"
-       and "make distcheck" should be run before calling "make git-dist".
-
-2011-12-09  Jim Meyering  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings
-       Before the present change, automake-generated `dist-xz' rule used
-       a hard-coded `xz -9'.  That was a problem because on this front,
-       xz differs from gzip and bzip2.  While the latter two don't incur
-       any run-time decompression penalty for using a higher compression
-       level, specifying -9 with xz imposes a potentially fatal virtual
-       memory requirement on any client that wants to decompress your
-       tar.xz file.
-       People have complained that a tarball compressed with -9 cannot
-       be uncompressed in a low-memory environment (wrt-based embedded).
-       Hence, instead of defaulting to -9, which is useful only for very
-       large tarballs, it defaults to -e (equivalent to -6e).  This
-       limits the default memory requirements imposed on decompressors,
-       yet still gives very good compression ratios.
-       * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that made
-       it impossible to override.  Actually don't default to -9, either,
-       since that induced inordinately large virtual memory usage when
-       merely decompressing.  Instead, use its XZ_OPT envvar, defaulting
-       to -e if not defined.  Suggested by Lasse Collin.
-       (dist, dist-all) [?XZ?]: Likewise
-       (dist-bzip2): Similarly, do not hard-code -9, but do continue to
-       use -9 by default.  Honor the BZIP2 envvar.
-       (dist, dist-all) [?BZIP2?]: Likewise
-       * NEWS: Update.
-       * doc/automake.texi (The Types of Distributions): Describe the
-       newly enabled environment variables.
-
-2011-12-09  Stefano Lattarini  <address@hidden>
-
-       * NEWS: Fix typos, grammaros and suboptimal wording.
-       Reported by Jim Meyering.
-
-2011-12-07  Stefano Lattarini  <address@hidden>
-
-       maint: sync auxiliary files from upstream
-       * lib/texinfo.tex: Synced from upstream, by "make fetch".
-       * lib/config.guess: Likewise.
-       * lib/config.sub: Likewise.
-
-2011-12-04  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures due to missing 'yywrap()' function
-
-       The AC_PROG_LEX Autoconf macro does not diagnose a failure to find
-       the "lex library" expected to provide a `yywrap' function (function
-       which is required to link most lex-generated programs).  On the
-       contrary, when all the link attempts (i.e., with `-ll' and `-lfl')
-       fail, configure declares that no lex library is needed, and simply
-       proceeds with the configuration process -- only for the build to
-       possibly fail later, at make time.
-
-       This behaviour is intended; the Autoconf manual reads:
-        ``You are encouraged to use Flex in your sources, since it is
-          both more pleasant to use than plain Lex and the C source it
-          produces is portable.  In order to ensure portability, however,
-          you must either provide a function `yywrap' or, if you don't use
-          it (e.g., your scanner has no `#include'-like feature), simply
-          include a `%noyywrap' statement in the scanner's source.''
-
-       This AC_PROG_LEX behaviour is causing some spurious failures of
-       the Automake testsuite in environments which lack a proper library
-       providing `yywrap' (this happens for example on Fedora-based
-       systems).   The proper workaround is to simply provide a fall-back
-       implementation of `yywrap' in our lexers.
-
-       See also partially-overlapping commit `v1.11-871-geb147a1' (from
-       the 'testsuite-work' branch), which was motivated by similar
-       spurious failures experienced when cross-compiling.
-
-       From a report by Jim Meyering:
-       
<http://lists.gnu.org/archive/html/automake-patches/2011-10/msg00092.html>
-
-       * tests/cond35.test: Provide a dummy `yywrap' function.
-       * tests/lex3.test: Likewise.
-       * tests/silent-lex-generic.test: Likewise.
-       * tests/silent-lex-gcc.test: Likewise.
-       * tests/silent-many-generic.test: Likewise.
-       * tests/silent-many-gcc.test: Likewise.
-
-2011-12-04  Paul Eggert  <address@hidden>
-
-       depcomp: spelling fix
-       * lib/depcomp (-h): Fix misspelling in usage diagnostic.
-
-2011-11-28  Peter Rosin  <address@hidden>
-
-       tests: fix 'distcheck-override-infodir.test' on Cygwin
-       * tests/distcheck-override-infodir.test (Makefile.am): Do not add
-       any `/' between $(DESTDIR) and the following paths.  Otherwise,
-       when $(DESTDIR) is empty, the recipes will try to access files
-       with a leading double slash, which have an implementation-defined
-       interpretation (e.g., for Cygwin, they mean UNC paths).
-
-2011-11-24  Stefano Lattarini  <address@hidden>
-
-       cosmetics: typofix in comments
-       * tests/remake-am-pr10111.test (Makefile.am): Fix typo in comments.
-       * THANKS: Update.
-       Reported by Krzysztof Żelechowski.
-
-2011-11-22  Stefano Lattarini  <address@hidden>
-
-       coverage: undistributed '.am' and '.m4' files are diagnosed
-       The stub rules emitted to work around the "deleted header problem"
-       for `.m4' files (included by autoconf in e.g., configure.ac) and
-       for `.am' files (included by automake in e.g., Makefile.am) should
-       not prevent "make" from correctly complaining when such a required
-       file is missing from a distribution tarball.
-       * tests/dist-missing-am.test: New test.
-       * tests/dist-missing-m4.test: Likewise.
-       * tests/dist-missing-included-m4.test: Likewise.
-       * tests/Makefile.am (TESTS): Add them.
-       Suggestion by Ralf Wildenhues.
-
-2011-11-22  Stefano Lattarini  <address@hidden>
-
-       coverage: required but missing '.am' and '.m4' files are diagnosed
-       The stub rules emitted to work around the "deleted header problem"
-       for `.m4' files (included by autoconf in e.g., configure.ac) and
-       for `.am' files (included by automake in e.g., Makefile.am) should
-       not prevent the remake rules from correctly erroring out when a
-       still-required file is missing.
-       * tests/deleted-am.test: New test.
-       * tests/deleted-m4.test: Likewise.
-       * tests/Makefile.am (TESTS): Add them.
-
-2011-11-22  Stefano Lattarini  <address@hidden>
-
-       coverage: expose automake bug#10111 in the testsuite
-       * tests/remake-am-pr10111.test: New test, xfailing.
-       * tests/remake-m4-pr10111.test: Likewise.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
-
-2011-11-19  Stefano Lattarini  <address@hidden>
-
-       texinfo: work around Solaris 10 xpg4 shell bug in install rules
-       * lib/am/texinfos.am (install-html-am): Use an extra variable
-       indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
-       Bug revealed by a failure of `txinfo21.test'.  See also:
-       <http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
-       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
-
-2011-11-17  Stefano Lattarini  <address@hidden>
-
-       configure: report perl version in config.log
-       * configure.ac: Report the version of the selected perl interpreter
-       in config.log; this should render the logs more informative.
-
-2011-11-13  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure with older install-info
-       * tests/install-info-dir.test (foo.texi): Also add proper
-       address@hidden', address@hidden' and address@hidden' directive, 
otherwise
-       older versions of `install-info' (e.g., 4.8) will fail to create
-       the `dir' index file in ${infodir}.
-       Problem revealed by a failure on NetBSD 5.1.
-
-2011-11-12  Stefano Lattarini  <address@hidden>
-
-       maintcheck: fix spurious failure in 'color2.test'
-       * tests/color2.test: Avoid creative quoting to avoid a spurious
-       failure of the `sc_tests_Exit_not_exit' maintainer check.
-
-2011-11-12  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious error in 'uninstall-fail.test' on Solaris
-       * tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add
-       a line number before the `:' in the error messages issued by shell
-       builtins.  Account for that in our grepping of make output.
-
-2011-11-12  Stefano Lattarini  <address@hidden>
-
-       tests: fix typo in 'uninstall-fail.test'
-       * tests/uninstall-fail.test: Always use `$rm_f_is_silent_on_error'
-       instead of the bogus `$rm_f_is_silent_on_failure'.
-
-2011-11-10  Stefano Lattarini  <address@hidden>
-
-       tests: avoid a spurious failure of 'ltinit.test' MinGW
-       * tests/ltinit.test: Be laxer in grepping configure output, to
-       avoid spurious failures on systems which lack POSIX dynamic
-       linking (e.g., MinGW), or when cross-compiling for such systems.
-       See also commit `v1.11-855-ge9e5d4a'.
-       Report and suggestion from Peter Rosin.
-
-2011-11-08  Stefano Lattarini  <address@hidden>
-
-       tests: testsuite is now safe to run with dmake in parallel mode
-       * tests/defs.in: Unset variables DMAKE_CHILD, DMAKE_DEF_PRINTED
-       and DMAKE_MAX_JOBS, which are exported by Solaris dmake when run
-       in parallel mode, and which might confuse make processes spawned
-       by our testsuite.
-
-2011-11-08  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures w.r.t. parallel make and colorization
-       * tests/color2.test: Skip the test if the $MAKE program fails to
-       consider the standard output as a tty when spawned by `expect'.
-       This is required for make implementations, like FreeBSD make and
-       Solaris dmake, that redirect the output of recipes to temporary
-       files or pipes when run in parallel mode.  Since we are at it,
-       simplify the detection of a working `expect' program, and throw
-       in other minor simplifications.
-
-2011-11-07  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure in 'distcheck-override-infodir.test'
-       * tests/distcheck-override-infodir.test ($required): Add
-       'install-info'.
-
-2011-11-07  Stefano Lattarini  <address@hidden>
-
-       tests: avoid another failure of 'uninstall-fail.test' on Solaris
-       * tests/uninstall-fail.test: On Solaris 10, if `/bin/rm' is run
-       with the `-f' option, it doesn't print any error message when
-       failing to remove a file (due to e.g., "Permission denied").
-       Yikes.  Cater to this incompatibility, by relaxing the test when
-       a faulty `rm' is detected.
-
-2011-11-10  Stefano Lattarini  <address@hidden>
-
-       tests: various minor tweakings, mostly related to AM_PROG_AR
-       * tests/alloca2.test: Ensure we don't experience a spurious failure
-       due to a missing `AM_PROG_AR' macro or a missing `ar-lib' auxiliary
-       script.
-       * tests/libtool4.test: Likewise.
-       * tests/ldadd.test: Likewise.  Since we are at it, make grepping of
-       automake stderr stricter.
-       * tests/reqd2.test: Likewise.
-       * tests/pr211.test: Ensure automake fails also with `-Wnone', since
-       the error we are testing for is an hard error, not a mere warning.
-       * tests/syntax.test: Likewise, and ensure we don't fail to other
-       errors by removing use of `lib_LTLIBRARIES' in Makefile.am.  Since
-       we are at it, make grepping of automake stderr stricter.
-
-2011-11-05  Stefano Lattarini  <address@hidden>
-
-       ar-lib: fix configure output for "unrecognized archiver interface"
-       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
-       to determine the archiver interface kind, the "checking archiver
-       interface" message from configure is properly terminated before
-       an error message is printed, to avoid slightly garbled output.
-       * tests/ar4.test: Enhance.
-       * tests/ar5.test: Likewise.
-
-2011-11-04  Stefano Lattarini  <address@hidden>
-
-       warnings: fix buglets for portability warnings
-       * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
-       correct implications and inter-dependencies between warnings
-       in the categories `portability', `extra-portability' and
-       `recursive-portability' are respected.  Also add detailed
-       explicative comments, and references to the relevant tests.
-       * tests/dollarvar2.test: Update and extend.  Also, remove
-       some unnecessary uses of `--force' option in automake calls.
-       * tests/extra-portability3.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-
-2011-11-04  Stefano Lattarini  <address@hidden>
-
-       tests: extend tests on 'extra-portability' warning category
-       * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
-       have complete control over the automake options.  Extend by using
-       also a setup where no `portability' warning is present (only an
-       `extra-portability' warning is).  Other minor extensions.  Remove
-       some redundant, verbose comments about the expected diagnostic.
-
-2011-11-03  Stefano Lattarini  <address@hidden>
-
-       tests: various minor tweakings, mostly related to AM_PROG_AR
-       * tests/alloca.test: Adjust to new portability requirements due
-       to the new AM_PROG_AR macro.
-       * tests/discover.test: Likewise.
-       * tests/libobj3.test: Likewise.
-       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
-       expected error message stricter.
-       * tests/stdlib.test: Likewise, and extend the test a bit.
-       * tests/parse.test (configure.in): Remove redundant call to
-       AC_PROG_RANLIB.
-       * tests/library2.test: Adjust to new portability requirements
-       due to the new AM_PROG_AR macro.  Also ...
-       (configure.in): ... add call to AC_PROG_CC, to ensure automake
-       really fails for the expected reason.
-
-2011-11-03  Zack Weinberg <address@hidden>  (tiny change)
-           Stefano Lattarini  <address@hidden>
-
-       maint-mode: fix botched configure messages
-       This change fixes automake bug#9890.
-       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..."
-       configure message related to the enabling/disabling of maintainer
-       mode.
-       * tests/help-maintainer.test: Renamed ...
-       * tests/maintmode-configure-msg.test: ... to this, and extended
-       to cover the fixed bug.  Also, since we are at it, make grepping
-       of configure help screens stricter, and throw in some few other
-       changes to reduce code duplication and enhance readability.
-       * tests/Makefile.am (TESTS): Update.
-       * THANKS: Update with Zack's new e-mail address.
-       Report and initial patch by Zack Weinberg, test cases added by
-       Stefano Lattarini.
-
-2011-10-23  Stefano Lattarini  <address@hidden>
-
-       info: allow user to inhibit creation/update of '${infodir}/dir'
-       With this change, we allow the user to request the install-info
-       rules not to update the `${infodir}/dir' file, by setting the
-       environment variable `AM_UPDATE_INFO_DIR' to the value "no".
-       This is especially useful to distro packagers, and is a definite
-       improvement over our previous hack of looking whether the
-       `install-info' program was the Debian or GNU version -- hack
-       which had been silently broken with recent versions of debian
-       install-info BTW (probably since dpkg 1.15.4, 2009-09-06).
-       This change fixes automake bug#9773.  See also Debian Bug#543992.
-       * lib/am/texinfos.am: Don't look anymore at the output of
-       `install-info --version' to decide whether to use it to update
-       the `${infodir}/dir' or not; instead, honour the environment
-       variable `AM_UPDATE_INFO_DIR'.
-       * tests/install-info-dir.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
-       interferences from the environment.
-       * doc/automake.texi (Texinfo): Update.
-       * NEWS: Likewise.
-       * THANKS: Likewise.
-       Report by Jonathan Nieder.
-
-2011-10-20  Stefano Lattarini  <address@hidden>
-
-       deps: partially revert commit `v1.11-512-geeee551'
-       This change partly reverts commit "Create subdirs for generated
-       sources even when not dep tracking", of 2011-04-02.
-       That commit had caused the bugs #8485 and #8526.  Since we are
-       nearing the bug-fixing automake release 1.11.2, the safest policy
-       at the moment is to just revert the problematic hunks: an older,
-       known bug is better than a regression.
-       * automake.in (handle_single_transform): Don't add a dirstamp
-       dependency, even when $object is derived and lands in a subdir.
-       * tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test,
-       remove yacc-dist-nobuild-subdir.test.
-
-2011-10-25  Stefano Lattarini  <address@hidden>
-
-       tests: few improvements to some `ar-lib' related tests
-
-       * tests/ar-lib5a.test (Makefile.am): Also check that the target
-       library has truly been created.
-       (ar-lib): Use the real `ar-lib' script (mildly patched) rather
-       than a dummy one, to ensure better "real-life coverage".  Fix
-       botched shebang line.
-       * tests/ar-lib5b.test: Extend the PATH variable to make the dummy
-       `lib' script accessible, instead of explicitly calling it by its
-       relative/absolute path.
-       (ar-lib): Fix botched shebang line.
-       (bin/lib): Likewise.  Also, add explicative comments, and make
-       slightly stricter.
-
-2011-10-24  Peter Rosin  <address@hidden>
-
-       Merge branch 'maint' into msvc
-
-       * tests/subpkg-yacc.test: Adjust to new portability requirements due
-       to the new AM_PROG_AR macro.
-
-2011-10-19  Stefano Lattarini  <address@hidden>
-
-       dejagnu: allow the package developer to extend site.exp
-       Fixes automake bug#7873.
-       * lib/am/dejagnu.am (site.exp): Depend from the files listed in
-       $(EXTRA_DEJAGNU_SITE_CONFIG), if any.  Append their contents to
-       the generated site.exp (still preserving user edits).
-       * doc/automake.texi (Dejagnu Tests): Update.
-       * tests/dejagnu-siteexp-append.test: New test.
-       * tests/dejagnu-siteexp-extend.test: Likewise.
-       * tests/dejagnu-siteexp-useredit.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-       Suggestion by Rainer Orth.
-
-2011-10-19  Stefano Lattarini  <address@hidden>
-
-       dejagnu: ensure 'srcdir' is defined as a relative directory
-       This change fixes automake bug#7833.
-       * lib/am/dejagnu.am (check-DEJAGNU): Prefer using plain $(srcdir)
-       over calculating and using the absolute path of $(srcdir).
-       * tests/dejagnu-relative-srcdir.test: New test.
-       * tests/dejagnu-absolute-builddir.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-       Report by Ian Lance Taylor.  Suggestions by Ralf Wildenhues.
-
-2010-12-13  Ralf Wildenhues  <address@hidden>
-
-       Fix testsuite failure of check12.test without DejaGNU.
-       * tests/check12.test: Require runtest.
-
-2010-12-10  Stefano Lattarini  <address@hidden>
-
-       Extend and improve tests on DejaGnu support.
-       * tests/dejagnu.test: Do not create useless dummy test script.
-       Add trailing `:' command.  In heading comments, add reference
-       to ...
-       * tests/check12.test: ... this new "semantic" test, covering
-       concurrent use of dejagnu tests, simple tests and `check-local'
-       target.
-       * tests/dejagnu2.test: Make test more reliable, by avoid weak
-       grepping of make output.  Prefer `cat' over `echo' to append
-       to configure.in.  Quote literal dots in grep regexps.  Prefer
-       `grep -c ...' over `grep ... | wc -l'.  Make grepping of
-       automake stderr slightly stricter.  Add trailing `:' command.
-       * tests/dejagnu3.test: Prefer `cat' over `echo' to append to
-       configure.in.  Check stderr of expected-to-fail "make" call.
-       Remove extra blank lines from Makefile.am.
-       * tests/dejagnu4.test: Prefer `cat' over `echo' to append to
-       configure.in.  Prefer `mv -f' over plain `mv' when the target
-       file already exists.  Avoid extra mkdir calls by creating more
-       directories at once.  Better use of blank lines.  Check that
-       the `*.log' and `*.sum' files are created by runtest also when
-       "make check" fails.
-       * tests/dejagnu7.test: Prefer `cat' over `echo' to append to
-       configure.in.  Better use of blank lines.  Add a trailing `:'
-       command.
-       * tests/dejagnu6.test: Likewise, and give the dejagnu test a
-       more descriptive name.
-       * tests/dejagnu5.test: Likewise.  Also, simply define package
-       name to `$me' rather than using a non-obvious sed script to
-       extract it from `AC_INIT', and write the Makefile.am with only
-       one command.
-       * tests/Makefile.am (TESTS): Updated.
-
-2011-10-21  Peter Rosin  <address@hidden>
-
-       * THANKS: Fix whitespace issue.
-
-2011-10-18  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure with FreeBSD make and Yacc in VPATH
-       * tests/subpkg.test: Some cosmetic adjustments.  Move the tests
-       checking that $(YLWRAP) is defined and installed properly when
-       ylwrap is in a default auxdir found in a parent package ...
-       * tests/subpkg-yacc.test: ... into this new test, which carefully
-       avoids to trigger the known bug#7884 (combo FreeBSD make plus Yacc
-       plus VPATH build).
-       * tests/Makefile.am (TESTS): Update.
-
-2011-10-18  Stefano Lattarini  <address@hidden>
-
-       tests: avoid spurious failure in 'parallel-tests3.test'
-       This fixes automake bug#8788.
-       * tests/parallel-tests3.test: To ensure that the serial run of
-       the dummy testsuite is still ongoing when the parallel run has
-       terminated, use `kill -0', not a bare `kill'.  This will prevent
-       a testsuite crash on NetBSD 5.1, and a testsuite hang on FreeBSD
-       8.2.  Also, since we are at it, try harder to avoid possible
-       hangs of the script in other unusual situations.
-
-2011-10-20  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures with "chatty" make implementations
-       * tests/distcheck-missing-m4.test: On failure, some make
-       implementations (such as Solaris make) print the whole failed
-       recipe on standard output.  This was causing a spurious failure
-       in the checks grepping the output from make.  Work around this.
-       * tests/distcheck-outdated-m4.test: Likewise.
-
-2011-10-20  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure on fast machines
-       * tests/aclocal-path-precedence.test: Also remove the `configure'
-       script between different test runs, to ensure it is always remade
-       by autoconf.  Add proper explicative comments.
-
-2011-10-20  Stefano Lattarini  <address@hidden>
-
-       tests: avoid spurious failure of 'uninstall-fail.test' on Solaris
-       * tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
-       /bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
-       directory with the `cd' builtin, print a message like:
-         "sh: /root: permission denied"
-       which doesn't report the `cd' builtin anywhere.  Relax the grepping
-       of the error message accordingly.
-
-2011-10-19  Stefano Lattarini  <address@hidden>
-
-       tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
-       * tests/uninstall-fail.test: Be sure to really skip this test
-       on systems that allows files to be removed from unwritable
-       directories.  Motivated by a spurious failure on Cygwin 1.5.
-
-2011-10-17  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure with autoconf 2.62
-       * tests/aclocal-path-precedence.test: Rewrite configure.in,
-       rather than appending to it, to avoid spurious failures (at
-       least with autoconf 2.62) due to repeated calls to AC_INIT.
-       Also, add package name and version arguments to AC_INIT, to
-       avoid spurious errors from automake.
-
-2011-10-16  Stefano Lattarini  <address@hidden>
-
-       docs: avoid using colon character inside arguments of @pxref
-       Fixes automake bug#9753
-       * doc/automake.texi (VPATH Builds): Avoid using colon character
-       `:' inside arguments of @pxref, as this can cause problems in
-       the generated `.info' files, and such an usage will be explicitly
-       forbidden by future texinfo documentation.
-       * THANKS: Update.
-       Reported by Дилян Палаузов.
-
-2011-10-07  Stefano Lattarini  <address@hidden>
-
-       parallel-tests: warn on conditional TEST_EXTENSIONS definition
-       Before this change, automake would have still bailed out, but
-       with a confusing error message (about an invalid redefinition
-       of TEST_EXTENSIONS).
-       * automake.in (handle_tests): Warn explicitly if TEST_EXTENSIONS
-       has conditional contents.
-       * tests/test-extensions-con.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * NEWS: Update.
-
-2011-10-06  Stefano Lattarini  <address@hidden>
-
-       parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS
-       Even after the last commit `v1.11-476-g90bea64', the checks
-       performed by automake on entries in $(TEST_EXTENSIONS) tried to
-       allow for @substitited@ stuff.  This however ends up allowing
-       quite brittle setups, which, most importantly, are of no real
-       practical usefulness anyway.  So it's better to just disallow
-       @substitutions@ in TEST_EXTENSIONS altogether, offering a clear
-       error message, instead of risking weird bugs and unexpected
-       behaviors in the generated Makefile.in.
-       * automake.in ($TEST_EXTENSION_PATTERN): Turned from a regular
-       expression ...
-       (is_valid_test_extension): ... into this subroutine.  Don't allow
-       generic @substitutions@ anymore (possibly making an exception for
-       address@hidden@' under the proper circumstances).
-       * tests/test-extensions.test: Adjust and extend.
-
-2011-10-06  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure in 'insthook.test'
-       * tests/insthook.test (Makefile.am): Add a proper `uninstall-hook'
-       target to remove the symlink created by the `install-exec-hook'
-       target; this prevents "make distcheck" from failing spuriously.
-       Since we are at it, delete an extra blank line, and add a trailing
-       `:' command.
-
-2011-10-06  Stefano Lattarini  <address@hidden>
-
-       maintcheck: fix spurious failure
-       * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
-       complaints from the `sc_no_brace_variable_expansions' maintainer
-       check.
-
-2011-10-06  Stefano Lattarini  <address@hidden>
-
-       fix: make a test script executable
-       * tests/nobase-nodist.test: Make executable.
-
-2011-10-06  Stefano Lattarini  <address@hidden>
-
-       coverage: expose automake bug#9651
-       * tests/dist-auxfile.test: New test, xfailing.
-       * tests/dist-auxfile-2.test: Likewise.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
-
-2011-10-01  Stefano Lattarini  <address@hidden>
-
-       parallel-tests: automake error our on invalid TEST_EXTENSIONS
-       This change fixes automake bug#9400.
-       * automake.in (handle_tests): Bail out if a suffix specified in
-       TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER'
-       variable or an invalid suffix rule.  Before this change, automake
-       would have issued a confusing error messages (about invalid or
-       non-POSIX variables being defined), and in some situations would
-       have even produced a broken `Makefile.in' file.
-       ($TEST_EXTENSION_PATTERN): New helper variable.
-       * doc/automake.texi (Simple Tests using parallel-tests): Document
-       the limitations on TEST_EXTENSIONS explicitly.
-       * NEWS: Update.
-       * tests/test-extensions.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-09-28  Stefano Lattarini  <address@hidden>
-
-       docs: don't suggest installing `.m4' files in hard-coded location
-       This change fixes automake bug#7988.
-       * doc/automake.texi (aclocal Options): State that the use of
-       the `--print-ac-dir' option to determine the directory where
-       third-party packages can install their `.m4' files is discouraged
-       now.
-       (Extending aclocal): Suggest telling the user about ACLOCAL_PATH.
-       * THANKS: Update.
-       Report by Peter Johansson.
-
-2011-09-26  Stefano Lattarini  <address@hidden>
-
-       distuninstallcheck: fail also when only one file is left installed
-       This change fixes automake bug#9579.
-       * lib/am/distdir.am (distuninstallcheck): Be stricter in ignoring
-       a potential `dir' file created by install-info and left installed.
-       Also, be more careful about "this can't happen" kind of errors.
-       (am__distuninstallcheck_listfiles): New internal helper macro.
-       * tests/distcheck-pr9579.test: New test.
-       * tests/distcheck-override-infodir.test: Likewise.
-       * tests/Makefile.am (TESTS): Add them.
-       * NEWS, THANKS: Update.
-       Report by Nick Bowler.
-
-2011-09-28  Stefano Lattarini  <address@hidden>
-
-       maintcheck: fix usage of `cd' instead of `$(am__cd)'
-       * lib/am/inst-vars.am (am__uninstall_files_from_dir): Use
-       `$(am__cd)', not plain `cd'.
-
-2011-09-24  Stefano Lattarini  <address@hidden>
-
-       uninstall: "make uninstall" before "make install" works
-       This change fixes automake bug#9578.
-       * lib/am/inst-vars.am (am__uninstall_files_from_dir): New internal
-       macro, that defines a shell code fragment to uninstall files from
-       a given directory.
-       * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use it, to reduce code
-       duplication and improve consistency and correctness.
-       * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
-       * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
-       * lib/am/mans.am (uninstall-man%SECTION%): Likewise.
-       * lib/am/python.am (uninstall-%DIR%LIBRARIES): Likewise.
-       * lib/am/scripts.am (uninstall-%DIR%SCRIPTS): Likewise.
-       * tests/uninstall-pr9578.test: New test.
-       * tests/uninstall-fail.test: New test.
-       * tests/Makefile.am (TESTS): Add them.
-       * NEWS, THANKS: Update.
-       Report by Nick Bowler.
-
-2011-09-22  Stefano Lattarini  <address@hidden>
-
-       tests: fix tests on aclocal search path precedences
-       * tests/aclocal-path-precedence.test: Call `$ACLOCAL' with the
-       proper overridden system acdir.
-
-2011-09-20  Stefano Lattarini  <address@hidden>
-
-       * NEWS: Fix typo.
-
-2011-09-20  Stefano Lattarini  <address@hidden>
-
-       docs: document planned precedence changes in aclocal search path
-       * doc/automake.texi (Macro Search Path): Explicitly state that the
-       lookup order for extra directories of `.m4' files will be changed
-       in the next major release.
-       * NEWS: Likewise.
-
-2011-09-19  Paolo Bonzini  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       aclocal: handle ACLOCAL_PATH environment variable
-       * aclocal.in (parse_ACLOCAL_PATH): New function, parse ACLOCAL_PATH
-       as a colon-separated list of directories to be included in the
-       search path.
-       * doc/automake.texi (Macro Search Path): Document new behavior and
-       the precedence rules for various elements of the search path.
-       * tests/aclocal-path.test: New test.
-       * tests/aclocal-path-install.test: Likewise.
-       * tests/aclocal-path-install-serial.test: Likewise.
-       * tests/aclocal-path-precedence.test: Likewise.
-       * tests/aclocal-path-nonexistent.test: Likewise.
-       * tests/Makefile.am (TESTS): Add them.
-       * NEWS: Update.
-       * tests/distcheck-missing-m4.test: Extend by also checking
-       interactions with ACLOCAL_PATH.
-       * tests/distcheck-outdated-m4.test: Likewise, and fix a couple
-       of botched comments since we are at it.
-
-2011-09-19  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure in 'primary-prefix-valid-couples.test'
-       * tests/primary-prefix-valid-couples.test: After commit
-       v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
-       combination by default anymore: one has to explicitly define
-       $(javadir) to make it so.  So just drop `java_JAVA' from our
-       Makefile.am  Also, since we are at it, ...
-       (configure.in): ... remove AM_PROG_GCJ from here, as it's not
-       really required.
-
-2011-09-19  Stefano Lattarini  <address@hidden>
-
-       docs: deprecate JAVA primary
-       * doc/automake.texi (Java): Deprecate the JAVA primary, stating
-       that it will become obsolete in automake 1.12 and probably removed
-       altogether in automake 1.13.  Reflect this in the section title,
-       by appending the string "(deprecated feature)".
-       (@menu, @detailmenu): Update.
-       (Java Support with gcj): The cross-referenced support for bytecode
-       compilation with the JAVA primary is rudimentary and deprecated.
-       State that explicitly.
-
-2011-09-19  Stefano Lattarini  <address@hidden>
-
-       docs: clearer distinction between `.java' with javac and with gcj
-       * doc/automake.texi (Java support): Rename this node ...
-       (Java support with gcj): ... to this, and change its title from
-       "Compiling Java sources" to "Compiling Java sources using gcj".
-       (@detailmenu, @menu, @cindex): Update and make more precise.
-       (Java): Change the title of this node from simply "Java" to
-       "Java bytecode compilation".
-       (@detailmenu, @menu, @cindex): Update and make more precise.
-
-2011-09-18  Stefano Lattarini  <address@hidden>
-
-       java: complain if java_JAVA is used but $(javadir) is undefined
-       Fixes automake bug#8461.
-       * automake.in (handle_java): Remove inappropriate "java" argument
-       from the calls to `&am_install_var' and `&am_primary_prefixes'.
-       * tests/instdir-java.test (Makefile.am): Define `$(javadir)'.
-       * tests/javadir-undefined.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-       * NEWS: Update.
-
-2011-09-12  Stefano Lattarini  <address@hidden>
-
-       cosmetics: fix various typos and grammaros
-       * NEWS: Fix typos.
-       * tests/py-compile-basic.test: Likewise.
-       * tests/py-compile-basedir.test: Fix botched wording in comments.
-       * tests/py-compile-option-terminate.test: Fix typo and incomplete
-       comment.
-       Suggestions by Peter Rosin.
-
-2011-09-18  Stefano Lattarini  <address@hidden>
-
-       coverage: test interactions of `nobase_' and `nodist_'
-       * tests/nobase-nodist.test: New test.
-       * tests/Makefile.am (TESTS): Add it.
-
-2011-09-18  Stefano Lattarini  <address@hidden>
-
-       java: fix various blunders in test 'java-mix.test'
-       * tests/java-mix.test: Add missing call to `set -e'.  Fix inverted
-       semantics (`.java' files are expected *not* to be distributed by
-       default, not the other way round).  Fix various typos in the name
-       of the `.java' files.  Correct other minor blunders.  Improve some
-       comments.
-
-2011-04-23  Stefano Lattarini  <address@hidden>
-
-       java: allow both JAVA and nobase_JAVA in the same Makefile.am
-       * automake.in (handle_java): Also strip `nobase_' from the given
-       prefix, when needed.
-       * tests/java-clean.test: Update and extend.
-       * tests/java-compile-install.test: Likewise.
-       * tests/java-no-duplicate.test: Likewise.
-       * tests/java-sources.test: Likewise.
-       * tests/java-noinst.test: Likewise.
-       * tests/java-mix-dist-nodist.test: Renamed to ...
-       * tests/java-mix.test: ... this, and extended.
-       * tests/java-nobase.test: New test, still xfailing due to
-       unrelated issues.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
-
-2011-04-18  Stefano Lattarini  <address@hidden>
-
-       java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
-       Fixes automake bug#8434.
-       * automake.in (handle_java): Strip `dist_' and `nodist_' from
-       the given prefix.  Define a new internal Makefile variable
-       `am__java_sources'.  Related adjustments.
-       * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
-       first time this am file is processed.
-       (class%DIR%.stamp): Stamp file renamed ...
-       (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
-       prefixes are stripped from the name of the stampfile.  Adjust
-       declaration of dependencies by using the new automake-generated
-       internal variable `$(am__java_sources)'.  In the rule, use `$@'
-       as the name of the target, rather than hard-coding it.
-       * tests/java.test: Update and extend.
-       * tests/java-no-duplicate.test: New test.
-       * tests/java-mix-dist-nodist.test: Likewise.
-       * tests/java-compile-and-install.test: Likewise.
-       * tests/java-clean.test: Likewise.
-       * tests/java-sources.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-09-11  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure on fast machines
-       * tests/aclocal-acdir.test: Avoid spurious failures due to caching
-       issues, by cleaning the autom4te cache between all the aclocal
-       invocations, and by always calling autoconf with the `--force'
-       flag.
-
-2011-09-09  Stefano Lattarini  <address@hidden>
-
-       aclocal: better URL reference in error message
-       * aclocal.in (scan_file): In the error message about underquoted
-       definitions, reference the automake page at `www.gnu.org', not
-       at `sources.redhat.com'.
-
-2011-09-09  Stefano Lattarini  <address@hidden>
-
-       coverage: distcheck-hook to catch missing/outdated *.m4 files
-       Related to automake bug#9037.
-       * tests/distcheck-missing-m4.test: New test.
-       * tests/distcheck-outdated-m4.test: Likewise.
-       * tests/distcheck-hook-m4.am: New data file, used by the new
-       tests.
-       * tests/Makefile.am (distcheck-m4-missing.log,
-       distcheck-m4-outdated.log): Depend on it.
-       (EXTRA_DIST): Distribute it.
-       (TESTS): Add the new tests.
-
-2011-09-06  Stefano Lattarini  <address@hidden>
-
-       aclocal: more granularity in acdir overriding
-       Before this change, using the `--acdir' option caused aclocal to
-       redefine both the directory of automake-provided m4 macros and the
-       directory of third-party system-wide m4 macros.  With this change,
-       we deprecate the `--acdir' aclocal option, and introduce two new
-       options `--automake-acdir' and `--system-acdir', to allow for more
-       granularity.
-       * aclocal.in (@automake_includes, @system_includes,
-       @user_includes): Fix and extend comments.
-       (usage): Update.
-       (handle_acdir_option): New function.
-       (parse_arguments): Recognize new options `--system-acdir' and
-       `automake-acdir', and handle `--acdir' using the new function
-       above.  Simplify logic by assuming that the directory of
-       third-party system-wide m4 files always exists.
-       * tests/aclocal.in: Update to use the new options, instead of
-       the deprecated. `--acdir'.
-       * m4/dirlist: Move ...
-       * m4/acdir/dirlist: ... here.
-       * m4/Makefile.am (EXTRA_DIST): Update.
-       (m4datadir): Rename ...
-       (automake_acdir): ... to this.  Accordingly, ...
-       (dist_m4data_DATA): ... rename this ...
-       (dist_automake_ac_DATA): ... to this.
-       (system_acdir): New, directory.
-       (dist_system_ac_DATA): New, defined to an empty value; this will
-       ensure that the $(system_acdir) directory will be created by
-       "make install".
-       * tests/aclocal.test: Remove check about the `--print-ac-dir'
-       option of aclocal, it has been moved into ...
-       * tests/aclocal-print-acdir.test: ... this new test, and quite
-       extended.
-       * tests/aclocal-acdir.test: New test.
-       * tests/Makefile.am (TESTS): Add the new tests.
-       * NEWS, bootstrap: Update.
-       * doc/automake.texi (aclocal Options, Macro Search Path): Update.
-
-2011-10-21  Peter Rosin  <address@hidden>
-
-       warnings: new 'extra-portability' category, for AM_PROG_AR
-       * lib/Automake/ChannelDefs.pm: Register new extra-portability
-       warning channel.
-       (switch_warning): Turn off extra-portability if portability is
-       turned off, and turn on portability if extra-portability is
-       turned on.
-       (set_strictness): Silence extra-portability for --gnits, --gnu
-       and --foreign.
-       * tests/extra-portability2.test: New test, checking that the
-       extra-portability channel is silenced by --gnits, --gnu and
-       --foreign.
-       * doc/automake.texi (Invoking Automake): Document the new warning
-       category and its interaction with the portability category.
-       * tests/extra-portability.test: New test, checking the interaction
-       between the portability and extra-portability warning categories.
-       * automake.in (handle_libraries, handle_ltlibraries): Move the
-       AM_PROG_AR warnings to the new extra-portability channel.
-       * tests/ar2.test: Adjust to the new warning channel.
-       * tests/pr300-lib.test: Likewise.
-       * tests/pr300-ltlib.test: Likewise.
-       * tests/pr307.test: Likewise.
-       * tests/pr401.test: Likewise.
-       * tests/pr401b.test: Likewise.
-       * tests/pr401c.test: Likewise.
-       * tests/pr72.test: Likewise.
-       * NEWS: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-10-21  Peter Rosin  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       Add new 'AM_PROG_AR' macro, triggering the 'ar-lib' script.
-       * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an
-       archiver and triggers the auxiliary 'ar-lib' script if needed.
-       * m4/Makefile.am (dist_m4data_DATA): Update.
-       * automake.in ($seen_ar): New variable.
-       (scan_autoconf_traces): Set it.
-       (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for
-       portability.
-       * doc/automake.texi (Public Macros): Mention the new
-       'AM_PROG_AR' macro.
-       (Subpackages): Add AM_PROG_AR to the example.
-       (A Library): Adjust recommendations for AR given the new
-       AM_PROG_AR macro.
-       * All relevant tests: Adjust to new portability requirements due
-       to the new AM_PROG_AR macro.
-       * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers
-       install of ar-lib.
-       * tests/ar-lib3.test: New test, checking that lib_LIBRARIES
-       requires AM_PROG_AR.
-       * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES
-       requires AM_PROG_AR.
-       * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers
-       use of ar-lib when the archiver is Microsoft lib.
-       * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers
-       use of ar-lib when the archiver is a faked lib.
-       * tests/ar-lib6a.test: New test, checking the ordering of
-       AM_PROG_AR and LT_INIT.
-       * tests/ar-lib6b.test: New test, checking the ordering of
-       AM_PROG_AR and AC_PROG_LIBTOOL.
-       * tests/ar-lib7.test: New test, checking that automake warns
-       if ar-lib is missing.
-       * tests/ar3.test: New test, checking that AR and ARFLAGS may
-       be overridden by the user even if AM_PROG_AR is used.
-       * tests/ar4.test: New test, checking that AM_PROG_AR bails out
-       if it cannot determine the archiver interface.
-       * tests/ar5.test: New test, checking that AM_PROG_AR runs its
-       optional argument if it cannot determine the archiver interface.
-       * tests/defs.in: New required entry 'lib'.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-
-2011-09-05  Peter Rosin  <address@hidden>
-
-       * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
-
-2011-09-04  Stefano Lattarini  <address@hidden>
-
-       fix: list test 'vala-vpath.test' in XFAIL_TESTS
-       * tests/Makefile.am (XFAIL_TESTS): Update.
-
-2011-09-02  Stefano Lattarini  <address@hidden>
-
-       tests: simplify wrapper for aclocal
-       * tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
-       extra `-I' flags; they are not really required, since the file
-       `m4/amversion.m4' is generated in the srcdir anyway.
-       * tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
-       * tests/acloca18.test: Likewise.
-       * tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
-       not export it.
-
-2011-09-02  Stefano Lattarini  <address@hidden>
-
-       coverage: vala support failing for VPATH from-scratch builds
-       * tests/vala-vpath.test: New test, xfailing.
-       * tests/Makefile.am (TESTS): Update.
-       * THANKS: Update.
-       From a report by Zbigniew Jędrzejewski-Szmek.
-       Related to automake bug#8753.
-
-2011-09-01  Stefano Lattarini  <address@hidden>
-
-       docs: report few more automake parsing limitations
-       Partly motivated by automake bug#8360.
-       * doc/automake.texi (General Operation): Report few more automake
-       limitations w.r.t. parsing of unusual makefile constructs.  Related
-       minor reorderings.
-       * tests/doc-parsing-buglets-colneq-subst.test: New test.
-       * tests/doc-parsing-buglets-tabs.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-08-25  Stefano Lattarini  <address@hidden>
-
-       tests: list "forgotten" test script in TESTS
-       * tests/Makefile.am (TESTS): Also list ...
-       * tests/java-empty-classpath.test: ... this test.  Since we are
-       at it, remove trailing whitespace from a couple of lines.
-
-2011-08-25  Eric Blake  <address@hidden>
-
-       ylwrap: fix unusual indentation whitespace
-       * lib/ylwrap: Convert tabs to spaces.
-       Reported by Karl Berry.
-
-2011-08-17  Stefano Lattarini  <address@hidden>
-
-       * THANKS (Daniel Richard G.): Update e-mail address.
-
-2011-08-16  Daniel Richard G. <address@hidden>  (tiny change)
-           Stefano Lattarini  <address@hidden>
-
-       java: avoid compilation errors when CLASSPATH is empty
-       * lib/am/java.am (CLASSPATH_ENV): When redefining `$CLASSPATH',
-       do not append an empty component in case the previous value of
-       CLASSPATH is empty or unset.
-       * tests/java-empty-classpath.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       Fixes automake bug#9306.
-
-2011-08-16  Stefano Lattarini  <address@hidden>
-
-       parallel-tests: no more spurious successes for FreeBSD make
-       Work around a bug of FreeBSD make bug that was causing the
-       automake-generated "check" target to complete with success
-       even if some tests failed; this happened only when FreeBSD
-       make was run in concurrent mode (as in, e.g., "make -j2
-       check").  The bug is not present in NetBSD make.
-       This change fixes automake bug#9245:
-        <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>
-       See also FreeBSD PR bin/159730:
-        <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>
-       * lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a
-       more "safe" (and apparently redundant) idiom to exit with error,
-       so that the non-zero exit status is picked up also by FreeBSD
-       make when it's running in concurrent mode.
-       * NEWS: Update.
-       * tests/check-concurrency-bug9245.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-08-11  Stefano Lattarini  <address@hidden>
-
-       hacking: we now require autoconf 2.68
-       * HACKING ("Working in git"): Use autoconf and autom4te 2.68,
-       not 2.67, in the examples.
-
-2011-08-08  Stefano Lattarini  <address@hidden>
-
-       test defs: more environment cleanup
-       * tests/defs.in: Also unset variables AM_COLOR_TESTS and
-       AM_TESTS_ENVIRONMENT.
-
-2011-08-08  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure with Solaris make
-       * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
-       liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
-       so introduced, in conjunction with single quotes, might confuse
-       Solaris make.
-
-2011-08-03  Stefano Lattarini  <address@hidden>
-
-       maintcheck: fix maintainer-check failures, both real and spurious
-       * tests/amhello-binpkg.test: Use "$MAKE", not bare "make".
-       * Makefile.am (sc_perl_local): Also allow perl special variable
-       `$~' to be localized.  And be slightly laxer in the regexp, to
-       allow for usages like "local $_ = $foo;".
-       (sc_tests_overriding_macros_on_cmdline): Also allow for command
-       line overriding of the `DISABLE_HARD_ERRORS' make variable.  Try
-       to avoid false positives for usages like "$MAKE || st=$?".
-
-2011-08-03  Bruno Haible  <address@hidden>
-
-       docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
-       * doc/automake.texi (Program Variables): Recommend -I options to
-       both the build directory and the source directory when needed.
-
-2011-07-23  Stefano Lattarini  <address@hidden>
-
-       tests: relax a test on amhello examples to cater to Solaris tar
-       * tests/amhello-binpkg.test: When the tar implementation in use
-       is not GNU tar, relax the tests on tar output, to avoid spurious
-       failures.  For example, "tar cvf ..." with GNU tar can output
-       lines like "./usr/bin/hello" on the standard output, while with
-       Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
-       standard output, and with Heirloom tar it can output lines like
-       "a ./usr/bin/hello 15 tape blocks" on standard error.
-
-2011-07-15  Benoit Sigoure  <address@hidden>
-
-       docs: add references between the 2 sections on java support
-       * doc/automake.texi (Java Support, Java): Add cross-references.
-
-2011-07-20  Ralf Wildenhues  <address@hidden>
-
-       Sync auxiliary files from upstream.
-       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
-       lib/texinfo.tex: Sync from upstream.
-
-2011-07-08  Stefano Lattarini  <address@hidden>
-
-       tests: fix weakness in 'tests-environment-backcompat.test'
-       * tests/tests-environment-backcompat.test: Do not override the
-       content of xfailing test `baz.test' with a "weaker" version that
-       fails unconditionally: the test must fail only when the 'strict'
-       pragma is in use, in order not to reduce coverage.
-
-2011-07-08  Stefano Lattarini  <address@hidden>
-
-       docs, tests: synchronize examples on silent-rules from config.site
-       * doc/automake.texi (Automake silent-rules Option): Reference test
-       'silent-configsite.test' in comments.
-
-2011-07-08  Stefano Lattarini  <address@hidden>
-
-       tests: portability fixes in tests on amhello examples
-       * tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
-       extract a gzip-compressed tarball, that's unportable to some
-       tar implementations; use the "gzip -dc fo.tar.gz | tar xf -"
-       idiom instead.
-       * tests/amhello-cflags.test: Likewise.
-       * tests/amhello-cross-compile.test: Likewise.
-       Suggestion from Ralf Wildenhues.
-
-2011-07-04  Stefano Lattarini  <address@hidden>
-
-       remake: add test ensuring that slower remakes don't hang
-       * tests/remake-subdir-long-time.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       Suggestion by Ralf Wildenhues.
-
-2011-07-04  Stefano Lattarini  <address@hidden>
-
-       remake: fix outdated comment in configure.am
-       * lib/am/configure.am: Fix comment falsified by changes in
-       commit `v1.11-366-gbee9871'.
-       Suggestion by Ralf Wildenhues.
-
-2011-07-01  Stefano Lattarini  <address@hidden>
-
-       docs, tests: synchronize examples from docs to tests
-       * tests/README (Writing test cases): Give suggestions on how to
-       keep test cases and examples in the documentation synchronized.
-       * doc/automake.texi: Improve or fix existing testcase-referencing
-       comments, and add many new ones.
-       * HACKING (Administrivia): Suggest to test complex examples and
-       idioms from the manual.
-       * tests/specflg8.test: Improve synchronization with the example
-       in the manual.
-       * tests/output11.test:Likewise.
-       * tests/txinfo21.test:Likewise.
-       * tests/interp.test: Likewise.  Since we are at it, and enable
-       the `errexit' shell flag, do related changes, and add trailing
-       `:'command.
-       * tests/amhello-cflags.test: New test.
-       * tests/amhello-cross-compile.test: Likewise.
-       * tests/amhello-binpkg.test: Likewise.
-       * tests/tests-environment-backcompat.test: Likewise.
-       * tests/parallel-tests-log-compiler-example.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-06-23  Stefano Lattarini  <address@hidden>
-
-       docs: avoid a footnote, some related rewordings and improvements
-       * doc/automake.texi (Dist): Reword the part about automatically
-       distributed files to avoid a footnote.  Since we are at it, extend
-       a bit, and add an example and a reference to a relevant test case.
-
-2011-06-23  Stefano Lattarini  <address@hidden>
-
-       docs: minor cosmetic fixes
-       * doc/automake.texi: Break few overly long lines, throughout the
-       file.
-       ("Simple Tests"): Move @vindex for XFAIL_TESTS to the correct
-       position, i.e., before and not after the paragraph where it is
-       introduced.
-       ("Options" @item ansi2knr): Use @pxref instead of @xref.  This
-       fixes a texinfo warning.
-       ("Other things Automake recognizes" @item AM_C_PROTOTYPES): Use
-       @pxref instead of @ref.
-
-2011-06-23  Stefano Lattarini  <address@hidden>
-
-       help: improve text about automatically-distributed files
-       This change fixes automake bug#7819.
-       * automake.in (usage): Distinguish between files that are always
-       automatically distributed when found, and those which are only
-       "under certain conditions".
-       * doc/automake.texi (Basics of Distribution): Update accordingly.
-       * tests/autodist-subdir.test: Update.
-       * tests/autodist-no-duplicate.test: Likewise.
-       * tests/autodist.test: Likewise.
-       (configure.in): Remove useless call to AM_MAINTAINER_MODE.
-
-2011-06-23  Stefano Lattarini  <address@hidden>
-
-       refactor: split 'usage' subroutine in automake
-       This change is related to automake bug#7819.
-       * automake.in (print_autodist_files): New subroutine,
-       extracted from ...
-       (usage): ... this, which now uses it.
-       * tests/autodist-no-duplicate.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-06-23  Stefano Lattarini  <address@hidden>
-
-       tests: fix bug in 'autodist.test'
-       * tests/autodist.test: Avoid spurious failure due to no
-       `defs-static' file being found in the parent directory.
-
-2011-06-21  Stefano Lattarini  <address@hidden>
-
-       maintcheck: extend 'sc_tests_plain_*' checks
-       * Makefile.am (sc_tests_plain_autom4te): New check.
-       (sc_tests_plain_autoreconf): Likewise.
-       (sc_tests_plain_autoheader): Likewise.
-       (syntax_check_rules): Update.
-
-2011-06-20  Stefano Lattarini  <address@hidden>
-
-       maintcheck: avoid few spurious failures
-       * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl,
-       sc_tests_plain_autoconf, sc_tests_plain_automake,
-       sc_tests_plain_autoupate): Be stricter in matching an erroneous
-       literal command, i.e., `aclocal', `automake', `perl', etc.
-
-2011-06-20  Bert Wesarg <address@hidden>  (tiny change)
-
-       check: don't use multi-line coloring for the report
-       "less -R" can't handle multi-line coloring as it is done for the
-       check reports of the serial and parallel testsuite, because of
-       performance reasons.  Thus, color each line of the check report
-       by its own.
-       * lib/am/check.am (am__text_box): Accept colors for lines, and
-       color each line by its own.
-       [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Let am__text_box handle
-       the line coloring.
-       [!%?PARALLEL_TESTS%] $(check-TESTS): Color each report line by
-       its own.
-       * THANKS: Update.
-
-2011-06-18  Stefano Lattarini  <address@hidden>
-
-       docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
-       * doc/automake.texi (Checking the Distribution): Explain that the
-       developers should take care of making their code buildable without
-       requiring any special configure options, so that in general
-       AM_DISTCHECK_CONFIGURE_FLAGS shouldn't be used.  Give an example
-       of where its use is legitimate.
-       Suggestions from Ralf Wildenhues and Eric Blake.
-
-2011-06-14  Stefano Lattarini  <address@hidden>
-
-       ansi2knr: deprecate, it will go away in the next major release
-       * doc/automake.texi: Loudly and repeatedly state that the old
-       de-ANSI-fication features are now deprecated and will be removed
-       in the next major Automake release.  Other related adjustments.
-       * lib/Automake/Options.pm (_process_option_list ): Give a warning
-       in the `obsolete' category when the `ansi2knr' option is used.
-       * m4/protos.m4 (AM_C_PROTOTYPES): Deprecate this macro: a warning
-       in the `obsolete' category will be emitted it if is used.
-       * tests/ansi2knr-deprecation.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * tests/ansi.test: Adjust, by calling autoconf and/or automake
-       with the `-Wno-obsolete' flag.
-       * tests/ansi10.test: Likewise.
-       * tests/ansi2.test: Likewise.
-       * tests/ansi3.test: Likewise.
-       * tests/ansi3b.test: Likewise.
-       * tests/ansi4.test: Likewise.
-       * tests/ansi5.test: Likewise.
-       * tests/ansi6.test: Likewise.
-       * tests/ansi7.test: Likewise.
-       * tests/ansi8.test: Likewise.
-       * tests/ansi9.test: Likewise.
-       * tests/cxxansi.test: Likewise.
-       * tests/libobj8.test: Likewise.
-       * NEWS: Update about the future planned backward-incompatibility
-       due to the removal of de-ANSI-fication feature.
-
-2011-06-19  Stefano Lattarini  <address@hidden>
-
-       docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
-       * doc/automake.texi (Program Sources): pkglib_PROGRAMS is not a
-       valid combination anymore, so don't document it.  Inconsistency
-       introduced in commit `v1.11-373-g9ca6326'.
-
-2011-06-19  Jim Meyering  <address@hidden>
-
-       docs: replace obsolete @vindex entry with a useful one
-       * doc/automake.texi (Program Sources): Do not index obsolete
-       pkglib_PROGRAMS here.  Do index pkglibexec_PROGRAMS.
-
-2011-06-13  Stefano Lattarini  <address@hidden>
-
-       tests: optimize tests on primary/prefix mismatch for speed
-       * tests/primary-prefix-invalid-couples.test: Partial rewrite, in
-       order to use just a single automake invocation rather than one
-       invocation for each invalid primary/prefix couple.  This improves
-       the test script execution time by an order of magnitude.
-       Since we are at it, throw in some other improvements to avoid
-       unrelated automake warnings and failures that could potentially
-       cause false positives w.r.t. the automake exit status.
-
-2011-06-13  Stefano Lattarini  <address@hidden>
-
-       news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
-       * NEWS (Miscellaneous changes): Update.
-
-2011-06-10  Stefano Lattarini  <address@hidden>
-
-       maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
-       * Makefile.am (sc_tests_overriding_macros_on_cmdline): It's now
-       acceptable that the test scripts override DISTCHECK_CONFIGURE_FLAGS
-       on the make command line.  Update comments accordingly.  Since we
-       are at it, make the relevant grepping rules slightly tighter.
-
-2011-06-10  Stefano Lattarini  <address@hidden>
-
-       distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
-       * doc/automake.texi (Checking the Distribution): Suggest to use
-       AM_DISTCHECK_CONFIGURE_FLAGS, not DISTCHECK_CONFIGURE_FLAGS, to
-       define (in the top-level Makefile.am) extra flags to be passed
-       to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS
-       should be reserved for the user.  Add proper address@hidden' directive.
-       Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a
-       subpackage Makefile.am, but the flags in it are passed down to
-       the configure script of the subpackage.
-       * lib/am/distdir.am (distcheck): Also pass the flags in
-       $(AM_DISTCHECK_CONFIGURE_FLAGS) to the configure invocation.
-       Update comments.
-       * tests/defs.in.test (AM_DISTCHECK_CONFIGURE_FLAGS,
-       DISTCHECK_CONFIGURE_FLAGS): Unset in case they are exported in
-       the environment, they might improperly influence our testsuite.
-       * tests/distcheck-configure-flags.test: New test.
-       * tests/distcheck-configure-flags-am.test: Likewise.
-       * tests/distcheck-configure-flags-subpkg.test: Likewise.
-       * distcheck-hook.test: Likewise.
-       * distcheck-hook2.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-       Closes automake bug#8784.
-
-2010-06-09  Stefano Lattarini  <address@hidden>
-
-       docs: better documentation for silent make rules
-       * doc/automake.texi (Options): Detailed description of the
-       automake option `silent-rules' moved from here ...
-       (Silent Make): ... into this new chapter, expanded, improved,
-       and subdivided into ...
-       (Make verbosity, Tricks For Silencing Make,
-       Automake silent-rules Option): ... these new sections.
-       (@menu, @detailmenu): Update.
-       * tests/silent-configsite.test: New test, checking that the
-       user can control default mode of silent-rules from config.site,
-       as is documented in the manual.
-       * tests/Makefile.am (TESTS): Updated.
-
-2011-06-11  Stefano Lattarini  <address@hidden>
-
-       Warnings about primary/prefix mismatch fixed and extended.
-       * automake.in (%standard_prefix): Add `doc' and `locale'.
-       Rename `pkgdatadir' to `pkgdata'.  Similarly for`pkglibdir',
-       `pkgincludedir' and `pkglibexecdir'.
-       (handle_programs): List `pkglibexec', not `pkglib', among the
-       prefixes valid for the `PROGRAMS' primary.
-       (handle_data): List also `doc' among the prefixes valid for
-       the `DATA' primary.  This is required by automake's own build
-       system.
-       * tests/dirforbid.test: Test removed, superseded by ...
-       * tests/primary-prefix-invalid-couples.test: ... this new test.
-       * tests/primary-prefix-valid-couples.test: New test.
-       * tests/primary-prefix-couples-documented-valid.test: Likewise.
-       * tests/primary-prefix-couples-force-valid.test: Likewise.
-       * tests/java3.test: Adjusted, and extended a bit.
-       * tests/Makefile.am (TESTS): Updated.
-       * NEWS: Updated.
-       From a report by Eric Blake.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       test defs: new function 'fatal_', for hard errors
-       Before this patch, the only way offered by tests/defs to
-       properly signal a hard error was the `framework_failure_'
-       function.  But the error message issued by that function,
-       as its name would suggest, refers to a set-up failure in the
-       testsuite, while hard errors can obviously also be due to
-       other reasons.  The best way to fix this inconsistency is to
-       introduce a new function with a more general error message.
-       Inspired by a recent similar change to Gnulib's tests/init.sh.
-       * tests/defs.in (fatal_): New function.
-       * tests/README (Section "Writing test cases" subsection "Do"):
-       Suggest the use of `fatal_', not of `framework_failure_', for
-       generic hard errors.  The latter should be reserved for "real"
-       set-up failures.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       py-compile: '--' and non-option arguments terminate the option list
-       * lib/py-compile: Any non-option argument, or the special `--'
-       argument, now explicitly terminates the list of options.
-       * tests/py-compile-option-terminate.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       py-compile: complain on unrecognized options
-       * lib/py-compile: Complain on unrecognized options.  Don't be too
-       lax in matching `--help' and `--version' options.
-       * tests/py-compile-usage.test: Extend accordingly.
-       * NEWS: Update.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       py-compile: normalize error and help messages
-       * lib/py-compile: Now error messages do not begin with a capital
-       letter, nor end with a period, as per GNU standards.  Prepend the
-       error messages with the name of the script, not with its path.
-       When an invalid usage is recognized, always display the customary
-       message "Try `py-compile --help' ..." on a line of its own.
-       ($me): New variable, containing the name of the
-       program, i.e., `py-compile'.  Use it throughout.
-       (usage_error): New function, used to display error messages about
-       invalid usage.
-       * tests/py-compile-usage.test: Extend and tighten accordingly.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       python tests: add "unit tests" on py-compile
-       * tests/py-compile-basic.test: New test.
-       * tests/py-compile-basic2.test: New test.
-       * tests/py-compile-basedir.test: Likewise.
-       * tests/py-compile-destdir.test: Likewise.
-       * tests/py-compile-env.test: Likewise.
-       * tests/py-compile-usage.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-       Tested with python 2.0.1, 2.4.6, 2.6.6, 2.7.1, and 3.1.3.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       py-compile: the '--destdir' option now accepts a blank argument
-       * lib/py-compile (Option parsing): Do not count an empty argument
-       to `--destdir' or `--basedir' as a missing argument.
-       * lib/python.am: Simplify accordingly, passing the `--destdir'
-       option to py-compile unconditionally, even if `$(DESTDIR)' is
-       empty.
-       * NEWS: Update.
-
-2011-06-08  Stefano Lattarini  <address@hidden>
-
-       python: run the 'py-compile' script with $(SHELL)
-       * lib/python.am (install-%DIR%PYTHON): Run each instance of
-       py-compile using $(SHELL).  Since we are at it, break overly
-       long lines.
-       (am__py_compile): New variable, to reduce code duplication.
-
-2011-06-02  Stefano Lattarini  <address@hidden>
-
-       maintcheck: fix some failures, extend some checks
-       * Makefile.am (sc_diff_automake_in_automake): Update, as we
-       now expect 9 lines, not 8, to be changed from `automake.in'
-       to `automake'.
-       (sc_diff_aclocal_in_aclocal): New maintainer check, similar to
-       the above, and checking that only 10 lines are changed from
-       `aclocal.in' to `aclocal'.
-       (syntax_check_rules): Update.
-       (sc_tests_Exit_not_exit): Exempt self tests `self-check-*.test'
-       from this check, as they can legitimately use the bare `exit'
-       builtin in various places.
-       * doc/automake.texi (Python): Remove stray `@' from the end of
-       a line.  Typo introduced in commit `v1.11-312-g5bf7af6'.
-       * tests/depcomp8a.test: Pass DISTCHECK_CONFIGURE_FLAGS to make
-       from the environment rather than from the command line, to
-       pacify the `sc_tests_overriding_macros_on_cmdline' maintainer
-       check.
-       * tests/depcomp8b.test: Likewise.
-
-2011-05-29  Stefano Lattarini  <address@hidden>
-
-       remake: behave better with non-GNU make in subdirectories
-       Currently, with every decent make program, it is possible to
-       rebuild out-of-date autotools-generated files with a simple
-       "make Makefile" -- but for this to work reliably with non-GNU
-       make implementations, the command must be issued from the
-       top-level directory.  This patch removes such limitation.
-       * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
-       * tests/defs.in (using_gmake): New function, backported from the
-       `master' branch (and simplified).
-       * tests/remake-subdir.test: New test.
-       * tests/remake-subdir2.test: Likewise.
-       * tests/remake-subdir-gnu.test: Likewise.
-       * tests/remake-subdir-from-subdir.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-05-29  Stefano Lattarini  <address@hidden>
-
-       automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
-       Currently, the Automake's own configure script allow definition
-       of AUTOCONF and AUTOM4TE, expected to point respectively to an
-       autoconf and autom4te programs.  But while these definitions are
-       honoured in the Automake's build systems and test suite, they
-       were *not* honoured in the generated `automake' and `aclocal'
-       scripts.  This behaviour, apart from being wrong in that it does
-       not allow the user enough freedom in choosing his tools, also
-       caused inconsistencies in the test suite, brining to spurious
-       failures.
-       Problem reported by Graham Reitz on the automake list; see thread:
-       <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>
-       * automake.in ($traces): Use address@hidden', not simply `autoconf'.
-       * aclocal.in ($traces): Use address@hidden', not simply `autom4te'.
-       * Makefile.am (do_subst): Substitute also address@hidden' and
-       address@hidden'.
-       * NEWS: Update.
-       * THANKS: Update.
-
-2011-05-29  Stefano Lattarini  <address@hidden>
-
-       build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
-       Our build system allows the user to override AUTOCONF and AUTOHEADER
-       at configure time, and honours these overrides in our testsuite.
-       But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
-       This change fixes that inconsistency.
-       * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
-       AC_SUBSTitutions.  Update comments.
-       * tests/defs.in ($AUTOUPDATE): Default to address@hidden@' now.
-       ($AUTOM4TE): New variable, defaulting to address@hidden@'.
-       ($AUTORECONF): New variable, defaulting to address@hidden@'.
-       * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
-
-2011-05-22  Ralf Wildenhues  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       tests/README: fix example about `make -e' usage
-       * tests/README (Section "Writing test cases" subsection "Do"): When
-       some variable is never initialized in the Makefile, `-e' is not
-       necessary in order to override it.  DESTDIR is such a variable: we
-       ensure that we do not ever initialize it.  And as such, it is quite
-       portable to use:
-         $ make DESTDIR=/foo/bar install
-       and in fact, quite widely used.
-       So our example about when `make -e' is required, which references
-       the `DESTDIR' variable, is poorly chosen, if not downright wrong.
-       Rewrite it to use `prefix' as the overridden variable instead.
-
-2011-05-22  Stefano Lattarini  <address@hidden>
-
-       parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
-       * tests/parallel-tests-harderror.test: New test, doing more
-       in-depth checks on DISABLE_HARD_ERRORS.
-       * tests/parallel-tests.test: Remove tests on DISABLE_HARD_ERRORS,
-       now redundant.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-05-20  Stefano Lattarini  <address@hidden>
-
-       testsuite: avoid re-running few tests with 'parallel-tests' option
-       Some tests in our testsuite use the 'simple-tests' driver only
-       marginally, or simply as a mean to conveniently check unrelated
-       invariants.  It makes little sense to force these tests to also
-       run with the 'parallel-tests' Automake option active, as doing so
-       offers no real gain in coverage, while often causing a measurable
-       overhead in execution time (for an already too-slow testsuite).
-       * tests/pr401.test (parallel_tests): Define to "no", to prevent
-       the generation of a sibling test script using the 'parallel-tests'
-       driver.
-       * tests/pr401b.test: Likewise.
-       * tests/pr401c.test: Likewise.
-
-2011-05-20  Stefano Lattarini  <address@hidden>
-
-       testsuite: allow tests to avoid the use of 'parallel-tests' option
-       * tests/gen-parallel-tests: Do not generate "siblings" for tests
-       that explicitly define the `parallel_tests', whether to "yes" or
-       to any other value.  Extend heading comments to give a rationale
-       for this behaviour.
-       * tests/README: Update.
-
-2011-05-20  Stefano Lattarini  <address@hidden>
-
-       tests/README: update obsoleted advice
-       * tests/README (Section "Writing test cases" subsection "Do"):
-       Do not suggest to use the `*-p.test' pattern for the names of
-       hand-written tests which use the `parallel-tests' Automake option.
-       Not only is this not respected by the existing tests, but it is
-       more likely to cause conflicts with auto-generated tests.
-       So, suggest to *avoid* using the `*-p.test' pattern in names
-       of hand-written tests instead.
-       (Section "Writing test cases" subsection "Do not"):  When
-       suggesting not to override Makefile variables using command
-       line arguments, do not use the badly outdated variables `U'
-       and 'ANSI2KNR' in the example; instead, use the more common
-       and typical `DESTDIR'.
-
-2011-05-19  Stefano Lattarini  <address@hidden>
-
-       test defs: rename requirement 'non-cross' -> 'native'
-       * tests/defs.in (non-cross): Rename requirement ...
-       (native): ... to this, which is clearer and fits the
-       existing lingo better.
-       Suggestion by Ralf Wildenhues.
-
-2011-05-15  Stefano Lattarini  <address@hidden>
-
-       testsuite: be more cross-compile friendly
-       * tests/defs.in (cross_compiling): New subroutine.
-       (am__tool_prefix): New internal variable.
-       (gcc, g++, gcj): Force the use of the correct "tool prefix"
-       when cross compiling.
-       (gfortran, g77, non-cross): New requirements.
-
-2011-05-11  Stefano Lattarini  <address@hidden>
-
-       check: document and test $(TEST_SUITE_LOG) overriding
-       * doc/automake.texi (Simple Tests using parallel-tests): Explain
-       how and why TEST_SUITE_LOG can be overridden at runtime.
-       * tests/parallel-tests-log-override-1.test: New test, check that
-       the newly documented idiom and similar usages are truly supported.
-       * tests/parallel-tests-log-override-2.test: Likewise.
-       * tests/parallel-tests-log-override-recheck.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-05-07  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure of txinfo21.test on FreeBSD
-       * tests/txinfo21.test: Use the `is_newest' subroutine instead of
-       the `ls -t' hack to to determine whether a file has been updated.
-       This is required because at least FreeBSD `ls' do not sort files
-       with the same timestamp in alphabetical order when using the `-t'
-       option.
-
-2011-05-04  Stefano Lattarini  <address@hidden>
-
-       tests defs: allow requirements for compilers (mostly dummy)
-       Most of the new requirements that are now accepted in `$required'
-       as consequence of this patch are still dummy.  They are planned
-       to be implemented only in master (or in some derived branch), but
-       having them here (even just as no-op) will allow for an easier
-       integration/backporting of potential new testcases.
-       * tests/defs.in (cc, c++, fortran, fortran77): New requirements,
-       still dummy.
-       (flex): New requirement, picking LEX for configure.
-       (lex): New requirement, alias for `flex'.  A more appropriate
-       implementation, looking for a generic `lex' program, will follow
-       in the future.
-       (yacc): New requirement, alias for `bison'.  A more appropriate
-       implementation, looking for a generic `yacc' program, will follow
-       in the future.
-
-2011-04-24  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failure in a test on TESTS (VPATH-related)
-       * tests/check-tests-in-builddir.test: When not using the
-       parallel-tests option, do not check that VPATH components are
-       not present in the displayed test name, since the simple-tests
-       driver do not try to strip them.
-
-2011-04-23  Stefano Lattarini  <address@hidden>
-
-       test: self check subroutines for skipping/failing of tests
-       * tests/self-check-report.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-04-23  Jim Meyering  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       test defs: new subroutines for test skipping/failing
-       * tests/defs.in (Exit): Move definition of this function earlier.
-       (warn_, skip_, fail_, framework_failure_): New functions, inspired
-       to the homonyms in gnulib's tests/init.sh.
-       ($stderr_fileno_): New global variable, used by the new functions
-       above.
-       * tests/README: Updated.
-       From a suggestion by Ralf Wildenhues.
-
-2011-04-23  Stefano Lattarini  <address@hidden>
-
-       tests: fix typo (copy & paste blunder) in heading comment
-       * tests/maintclean-vpath.test: Correctly refer to the sister test
-       as `maintclean.test', not as `maintclean-vpath.test'.
-
-2011-04-23  Stefano Lattarini  <address@hidden>
-
-       tests: remove redundant test `mclean.test'
-       * tests/mclean.test: Remove, it's a weak grepping test completely
-       superseded by the much more complete `maintclean.test'.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-04-22  Stefano Lattarini  <address@hidden>
-
-       testsuite: more environment sanitization
-       * tests/defs.in: Sanity check: abort if any of `parallel_tests'
-       or `required' is in the environment.
-       ($sed_unindent_prog): Initialize to empty, to avoid interferences
-       from the environment.
-       * tests/self-check-me-in-env.test: Renamed to ...
-       * tests/self-check-env-sanitize.test: ... this, and extended.
-       * tests/Makefile.am (TESTS): Update.
-       (TESTS_ENVIRONMENT): Unset variables `parallel_tests' and
-       `required'.  Adjust comments.
-
-2011-04-18  Stefano Lattarini  <address@hidden>
-
-       tests: don't allow `$me' to be overridden from the environment
-       * tests/defs.in: Sanity check: abort if $me is in the environment.
-       * tests/self-check-me-in-env.test: New test.
-       * tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'.
-       (TESTS): Update.
-       Suggestion by Ralf Wildenhues.
-
-2011-04-17  Stefano Lattarini  <address@hidden>
-
-       test defs: allow overriding of `$me'
-       * tests/defs.in ($me): Allow overriding by the including test
-       script.  Add some explicative comments.
-
-2011-04-17  Stefano Lattarini  <address@hidden>
-
-       depcomp tests: don't reject slower dependency extractors
-       * tests/depcomp8b.test: Add the `--enable-dependency-tracking'
-       option to `configure' invocations, so that slower dependency
-       extractors are not rejected.
-       * tests/depcomp8a.test: Likewise.  Also ...
-       (foo.c): ... since we are at it, fix spacing to be consistent
-       with GNU coding standards.
-
-2011-04-17  Stefano Lattarini  <address@hidden>
-
-       m4: add missing serial numbers to a few files
-       Related to automake bug#8483.
-       * m4/amversion.in: Add serial number.
-       * m4/auxdir.m4: Likewise.
-       * m4/gcj.m4: Likewise.
-       * m4/install-sh.m4: Likewise.
-       * m4/mkdirp.m4: Likewise.
-       * m4/python.m4: Likewise.
-       * m4/runlog.m4: Likewise.
-       * m4/strip.m4: Likewise.
-       * m4/upc.m4: Likewise.
-
-2011-04-16  Jim Meyering  <address@hidden>
-
-       depcomp: correct invalid sed invocation
-       * lib/depcomp: Insert missing -e before '/:$/d'.
-       Otherwise, that use of sed would treat '/:$/d' as a file name.
-
-2011-04-14  Stefano Lattarini  <address@hidden>
-
-       maintainer check: quote literal `$' in Makefile rule
-       * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
-       character in double-quoted string.  Fix a bug in which the rule
-       emitted an erroneously empty substring in its error message.
-
-2011-04-12  Stefano Lattarini  <address@hidden>
-
-       coverage: test for automake bug#8485 (known regression)
-       * tests/yacc-dist-nobuild-subdir.test: New test.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
-
-2011-04-12  Stefano Lattarini  <address@hidden>
-
-       test defs: define default $distdir (help reducing duplication)
-       * tests/defs.in ($distdir): New variable, might be used in
-       testcases checking distribution-related features.
-       * tests/pr9.test: Use it.
-       * tests/subdir9.test: Likewise.
-       * tests/vtexi3.test: Add comment explaining why we redefine
-       $distdir in this test.
-
-2011-04-11  Stefano Lattarini  <address@hidden>
-
-       depcomp: fix bugs in tests and in the depcomp script
-       * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation.
-       * tests/depcomp10.test: Make it executable.  Fix a blunder that
-       has left part of an intended comment not prefixed by `#', thus
-       causing shell syntax errors.  In this same comment, break a
-       too-long reported error message on multiple lines, for clarity.
-       Add reference to the relevant bug report.  Add a comment which
-       explains why the test result 'skipped' if the first "make" call
-       fails.  Add other useful comments.
-       * tests/depcomp9.test: Slightly improve comments.
-
-2011-04-11  Ralf Wildenhues  <address@hidden>
-
-       Fix hp depmode for VPATH builds with GNU make.
-       * lib/depcomp: Be sure to remove VPATH-prefixed object from
-       dependency output when creating stub rule.
-       * tests/depcomp10.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-       Report by Bruno Haible.
-
-2011-04-10  Stefano Lattarini  <address@hidden>
-
-       test defs: fix 'javac' requirement for older JDK versions
-       The Java compiler from JDK 1.5 (and presumably earlier versions)
-       cannot handle the `-version' option by itself; and while it does
-       print the version number, it then errors out with an usage error:
-         $ javac -version
-         javac 1.5.0_22
-         javac: no source files
-         Usage: javac <options> <source files>
-         ...
-       Luckily, adding the `-help' option to the `javac' invocation
-       seems to fix this problem.
-       * tests/defs.in (javac): Pass also the `-help' option to the
-       `javac' program.  Add a comment explaining why it is needed.
-       Report from Ralf Wildenhues.
-
-2011-04-10  Stefano Lattarini  <address@hidden>
-
-       test defs: new requirement for the default java compiler
-       * tests/defs.in (for tool in $required): New requirement 'javac'.
-       * tests/java.test: Use it instead of ad-hoc configure check.
-       * tests/java-check.test: Likewise.
-       * tests/instfail-java.test: Likewise.
-       * tests/instdir-java.test: Likewise.
-
-2011-04-09  Stefano Lattarini  <address@hidden>
-
-       java: check_JAVA does not cause compilation by "make all" anymore
-       Fixes automake bug#8234.
-       * automake.in (handle_java): Make stamp of class files built from
-       java sources in $(check_JAVA) a dependency of `check' target, not
-       `all' target.
-       * tests/java-check.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-       * THANKS: Update.
-       Report from Petteri Räty.
-
-2011-04-09  Ralf Wildenhues  <address@hidden>
-
-       Clarify regex code in depcomp.
-       * lib/depcomp: Add comment why we don't need regex-escaping here.
-       Suggested by Stefano Lattarini.
-
-2011-04-08  Ralf Wildenhues  <address@hidden>
-
-       Fix makedepend depmode for VPATH builds.
-       * lib/depcomp [makedepend]: Remove any VPATH prefix from the
-       object file name, so a rebuild doesn't attempt to update the
-       .Po files in the source tree.
-       * tests/depcomp9.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-
-2011-04-02  Stefano Lattarini  <address@hidden>
-
-       tests: fix timestamp-related failures
-       Fixes automake bug#8365.
-       * tests/aclocal6.test: Sleep before modifying m4 files that should
-       trigger remake rules.  Remove incorrect/obsoleted comments.
-       * tests/subdir5.test: Likewise, and extend a bit.
-       * tests/subdir8.test: Likewise.
-       * tests/pr8365-remake-timing.test: New xfailing test.
-       * tests/Makefile.am (TESTS): Update.
-       Report from Sam Steingold.
-
-2011-04-02  Ralf Wildenhues  <address@hidden>
-
-       Create subdirs for generated sources even when not dep tracking.
-       * automake.in (handle_single_transform): If $object is derived
-       and lands in subdir, be sure to output a dirstamp dependency.
-       * tests/yacc5.test: Avoid falsely matching the dirstamp
-       dependency when grepping for a rule.
-       * tests/lex-subobj-nodep.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * THANKS: Update.
-       Report by Ignacy Gawedzki.
-
-       Fix locale issue in check-exported-srcdir.test.
-       * tests/check-exported-srcdir.test: Reformulate glob to not fail
-       in a locale that ignores or interleaves character case.
-
-2011-04-01  Stefano Lattarini  <address@hidden>
-
-       docs: better visibility for aclocal in the index
-       * doc/automake.texi (@menu): Rename title for entry 'configure'
-       from "Scanning configure.ac or configure.in" to the more precise
-       "Scanning configure.ac, using aclocal".
-       (@detailmenu): Adjust.
-       (@node configure): Adjust, and extend @cindex calls accordingly.
-       * THANKS: Update.
-       From a report by Maynard Johnson.
-
-2011-03-30  Stefano Lattarini  <address@hidden>
-
-       tests: improve tests on "maintainer-clean" target
-       * tests/aclocal6.test: Move checks related to "maintainer-clean"
-       functionalities into ...
-       * tests/maintclean-vpath.test: ... this new test.
-       * tests/maintclean.test: Update heading comments.  Extend to also
-       test subdirs.  Remove useless disabling of YACC.  Fix m4 quoting
-       in configure.in.  Add a trailing `:' command.  Remove extra blank
-       lines.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-03-21  Ralf Wildenhues  <address@hidden>
-
-       tests: fix unindent to use printf not echo for script.
-       * tests/defs.in: Use printf rather than echo, as the latter may
-       interpret the backslashes in the sed script.  Fixes test
-       failures with dash as /bin/sh.
-
-2011-03-17  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       maintcheck: look for problematic names of testcases
-       The configure.in stub created by default by `tests/defs' obtains
-       the first argument of AC_INIT from the test name, and this can
-       cause some supported autoconf versions to fail with a spurious
-       error if that test name contains the name of an m4 or m4sugar
-       builtin or macro (e.g., `defn' or `m4_undefine').
-       See for example the bug fixed by commit v1.11-287-g1325a8a.
-       This change add a maintainer check that warns about test names
-       which are possibly problematic in this regard.
-       * Makefile.am (sc_test_names): New maintainer-check target.
-       (syntax_check_rules): Add it.
-       (m4_builtins): New helper variable.
-       (TESTS): Updated according to the following renamings.
-       * tests/include.test: Renamed ...
-       * tests/hdr-vars-defined-once.test: ... to this.
-       * tests/sinclude.test: Renamed ...
-       * tests/m4-inclusion.test: ... to this, and simplified
-       accordingly.
-       * tests/include2.test: Renamed ...
-       * tests/dist-included-parent-dir.test: ... to this, for
-       consistency.
-
-2011-03-04  Stefano Lattarini  <address@hidden>
-
-       tests: fix bug in alloca*.test
-       * tests/alloca.test: Make grepping of automake stderr stricter,
-       add a trailing `:' command; also, add AC_PROG_CC to configure.in,
-       and create a dummy alloca.c file, to ensure that we fail for the
-       proper reason.
-       * tests/alloca2.test: Likewise.  Also, look for LT_INIT, not
-       AC_PROG_LIBTOOL, in the error message (bug introduced with commit
-       v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
-       primary is used").
-       From a report by Patrick Welche.
-
-2011-03-04  Stefano Lattarini  <address@hidden>
-
-       tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
-       * tests/comments-in-var-defn.test: The configure.in stub created
-       by default, which has the AC_INIT first argument obtained by the
-       test name, causes autoconf 2.62 to fail with a spurious error
-       message like: "configure.in:1: error: defn: undefined macro:".
-       Thus, to prevent this, the test is renamed to ...
-       * tests/comments-in-var-def.test: ... this.
-       * tests/Makefile.am (TESTS): Updated.
-
-2011-03-04  Stefano Lattarini  <address@hidden>
-
-       cosmetics: convert encoding from ISO-8859 to UTF-8
-       * ChangeLog.03: Convert encoding to UTF-8.
-       * ChangeLog.96: Likewise.
-       * ChangeLog.98: Likewise.
-       * NEWS: Likewise.
-       * TODO: Likewise.
-
-2011-03-01  Peter Rosin  <address@hidden>
-
-       test defs: unindent without temporary file
-       * tests/defs.in (commented_sed_unindent_prog): Commented Sed program
-       that strips the "proper" amount of leading whitespace.
-       (unindent): Lazily strip comments from the above program and use it
-       to unindent without using a temporary file.
-
-2011-02-26  Stefano Lattarini  <address@hidden>
-
-       libtool: suggest LT_INIT if LTLIBRARIES primary is used
-       When the LTLIBRARIES primary was used, but $(LIBTOOL) wasn't
-       defined, automake suggested to add a call to AC_PROG_LIBTOOL
-       in configure.ac.  But that macro is deprecated since Libtool
-       version 1.9b (2004-08-29), in favor of the newer LT_INIT.  So
-       suggest the use of this latter macro instead.
-       * lib/Automake/Variable.pm (%_am_macro_for_var): Pair 'LIBTOOL'
-       with 'LT_INIT', not with 'AC_PROG_LIBTOOL'.
-       * tests/libtool4.test: Adjust and extend.  Also, add a call to
-       macro AC_PROG_CC in configure.in, to help ensuring that automake
-       does not fail for the wrong reasons.
-       * tests/ltinit.test: New test, ensure that automake's libtool
-       support works with LT_INIT-based interface.
-       Thanks to Jack Kelly for the suggestion.
-
-2011-02-20  Stefano Lattarini  <address@hidden>
-
-       tests: tempdirs with restrictive permissions are cleaned correctly
-       Before this change, the removal of a temporary test directory
-       containing subdirectories with restrictive permissions (such as
-       'r--r--r--') could fail.
-       * tests/defs: Ensure that all the subdirectories of a temporary
-       test directory have the 'read', 'write' and 'execute' bits set,
-       before trying to remove it with `rm -rf'.
-       * tests/Makefile.am (clean-local-check): Likewise.
-
-2011-02-16  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       test defs: add subroutine for input unindenting
-       * tests/defs.in (unindent): New subroutine.
-
-2011-02-15  Stefano Lattarini  <address@hidden>
-
-       python: report the 'PYTHON' influential environment variable
-       * m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
-       * doc/automake.texi (Python): Update and extend.
-       * tests/help-python.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * THANKS (Jack Kelly): Update e-mail address.
-       Suggestion by Jack Kelly.
-
-2011-02-10  Stefano Lattarini  <address@hidden>
-
-       tests defs: clear TESTS_ENVIRONMENT variable
-       * tests/defs.in (TESTS_ENVIRONMENT): Unset it, so that values
-       from environment won't interfere with the testcases.
-       Suggestion by Ralf Wildenhues.
-
-2011-02-06  Stefano Lattarini  <address@hidden>
-
-       tests: tweak few tests on simple and parallel test drivers
-       * tests/check-exported-srcdir.test: Improve heading comments.
-       * tests/check-tests-in-builddir.test: Likewise.  Also, unset the
-       `FOO_EXIT_STATUS' variable, so that any pre-existing value in the
-       environment won't risk to interfere with the test.
-       Suggestions by Ralf Wildenhues.
-
-2011-02-01  Stefano Lattarini  <address@hidden>
-
-       coverage: more tests on simple and parallel test drivers
-       * tests/parallel-tests-subdir.test: New test.
-       * tests/check-exported-srcdir.test: Likewise.
-       * tests/check-tests-in-builddir.test: Likewise.
-       * tests/check-tests_environment.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-01-29  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures in lflags*.test
-       * tests/lflags.test: Remove 'LEX' from the environment, so
-       that it won't be erroneously picked up by `make -e'.
-       * tests/lflags2.test: Likewise.
-
-2011-01-24  Stefano Lattarini  <address@hidden>
-
-       docs: color-tests issues with parallel make
-       * doc/automake.texi (Simple Tests): Document that automatic
-       recognition of a capable terminal attached to stdout can fail
-       with some make implementation when running in parallel mode,
-       thus causing colored test output not to be automatically
-       activated when it should.
-
-2011-01-23  Ralf Wildenhues  <address@hidden>
-
-       tests: avoid instspc.test failures due to make's whitespace trimming
-       * tests/instspc.test: Prepend './' when passing the test
-       characters, to avoid leading whitespace characters to be trimmed
-       from macros set from environment variables.  Fixes testsuite
-       failures with HP-UX, IRIX, and Tru64/OSF make.
-
-2011-01-23  Stefano Lattarini  <address@hidden>
-
-       coverage: test semantics of "dummy" per-target flags
-       * tests/specflg-dummy.test: New test, ensuring that even "dummy"
-       per-target flags triggers the use of renamed objects.
-       * tests/Makefile.am (TESTS): Update.
-       Suggestion by Ralf Wildenhues.
-
-2011-01-23  Stefano Lattarini  <address@hidden>
-
-       tests defs: sanitize IFS
-       * tests/defs.in ($IFS): Define to <space>, <tab>, <newline>.
-       ($sp): New variable, holding a single whitespace character.
-       ($tab): New variable, holding a tabulation character.
-       ($nl): New variable, holding a newline character.
-
-2011-01-22  Ralf Wildenhues  <address@hidden>
-
-       tests: fix VPATH auto-expansion workarounds.
-       * tests/parallel-tests8.test, tests/suffix13.test:
-       Ensure $< is not surrounded by white space, to prevent Solaris
-       make from applying automatic VPATH text expansion.
-
-2011-01-22  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures in yflags*.test
-       * tests/yflags.test: Remove 'YACC' from the environment, so
-       that it won't be erroneously picked up by `make -e'.
-       * tests/yflags2.test: Likewise.
-
-2011-01-22  Ralf Wildenhues  <address@hidden>
-
-       tests: avoid fn99*.test failures due to buggy AIX 5.3 cp -R.
-       * tests/fn99.test, tests/fn99subdir.test: Skip if an initial
-       `cp -R' of the subdir tree already fails; AIX 5.3 cp messes
-       up its internal memory when copying this tree.
-
-2011-01-22  Ralf Wildenhues  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       Add comment to check-TESTS rule working around make 3.80 bug.
-       * lib/am/check.am (check-TESTS): Update comment.
-
-2011-01-20  Ralf Wildenhues  <address@hidden>
-
-       tests: less strict double-colon spy.test again.
-       * tests/spy.test: We know BSD make doesn't invoke more than one
-       double-colon rule, so no need to expose that failure.
-
-2011-01-19  Ralf Wildenhues  <address@hidden>
-
-       install-sh: avoid Tru64 sh `test' operator precedence issues.
-       * lib/install-sh: Protect file names and directory components
-       that consist of `=', `(', `)', or `!'.  Move protection as early
-       as possible, to avoid errors such as with Tru64 sh `test -z ='.
-       * tests/instsh2.test: Extend test to cover more possibilities.
-       Fixes 1.12 instspc-equal-install.test failure on Tru64/OSF 5.1.
-
-2011-01-19  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       docs: automake testsuite doesn't use TESTS_ENVIRONMENT anymore
-       * doc/automake.texi (Simple Tests): Do not claim Automake uses
-       TESTS_ENVIRONMENT for the perl driver.  Instead, point to the
-       parallel-tests driver.
-
-2011-01-19  Ralf Wildenhues  <address@hidden>
-
-       Allow _AM_DEPENDENCIES to be used later in configure.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing
-       conftest.dir before recreating it.
-       Fixes bug#7864.
-       Report by Eric Blake, from report by Scott McCreary against M4.
-
-2011-01-18  Ralf Wildenhues  <address@hidden>
-
-       tests: avoid failure on w32 file systems.
-       * tests/parallel-tests-unreadable-log.test: SKIP if file cannot
-       be turned unreadable.
-
-2011-01-17  Ralf Wildenhues  <address@hidden>
-
-       tests: allow double-colon spy.test to work with HP-UX make.
-       * tests/spy.test: Fix comment typos.  Ensure prerequisites we
-       do not want to depend on are strictly older than the target.
-       Also test with a target out of date wrt. more than one rule.
-
-2011-01-16  Stefano Lattarini  <address@hidden>
-
-       tests: remove useless requirements from cond36.test
-       * tests/cond36.test ($required): Remove.
-       Since we are at it, add a trailing `:' command.
-
-2011-01-16  Ralf Wildenhues  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
-       * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
-       Test file readability before redirecting input from it, to avoid
-       exiting Tru64/OSF 5.1 sh which treats read as special builtin.
-       * tests/parallel-tests-unreadable-log.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-       * NEWS: Update.
-
-2011-01-16  Ralf Wildenhues  <address@hidden>
-
-       * NEWS, README: Update copyright years.
-
-       Fix parallel-tests.test failure with HP-UX make.
-       * tests/parallel-tests.test: Sleep inside inner tests, so logs
-       are newer than logs of tests they depend on, for HP-UX make.
-
-2011-01-15  Ralf Wildenhues  <address@hidden>
-
-       docs: ensure example are separated with empty lines in the input
-       * doc/automake.texi (Extending aclocal, Emacs Lisp, Rebuilding)
-       (API Versioning, Renamed Objects, Multiple Outputs): Add empty
-       lines before address@hidden' and after address@hidden example' lines, 
so info
-       output is rendered correctly, and a following @noindent honored.
-       Report by Stefano Lattarini.
-
-2011-01-15  Jim Meyering <address@hidden>
-
-       tests: fix comment typo
-       * tests/substref.test: Fix grammar in a comment.
-
-2011-01-13  Stefano Lattarini  <address@hidden>
-
-       tests: fix spurious failures in two texinfo tests
-       * tests/txinfo.test ($required): Add 'makeinfo'.
-       * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
-       that make won't try to run makeinfo (which could be unavailable)
-       to build it.
-       Found by NixOS Hydra, reported by Ralf Wildenhues.
-
-2011-01-13  Ralf Wildenhues  <address@hidden>
-
-       Avoid testsuite failures due to Autoconf Fortran change.
-       Autoconf v2.68-21-g727ce95 causes AC_F77_LIBRARY_LDFLAGS to
-       require computing the canonical host name.  Ensure config.guess
-       and config.sub files are present for respective checks.
-       * tests/compile_f_c_cxx.test: Add stub files.
-       * tests/flibs.test: Likewise.
-       * tests/fort4.test: Use $AUTOMAKE -a for installing files.
-
-2011-01-12  Stefano Lattarini  <address@hidden>
-
-       docs: clustered '-d' not recognized in YFLAGS
-       This change fixes automake bug#7828.
-       * doc/automake.texi (Yacc and Lex): Document that automake
-       recognizes '-d' in AM_YFLAGS only if it's not clustered with
-       other options.
-       From a report by Юрий Пухальский.
-
-2011-01-10  Stefano Lattarini  <address@hidden>
-
-       tests: add checks on automatically-distributed files
-       Related to automake bug#7819.
-       * tests/autodist.test: New test.
-       * tests/autodist-subdir.test: Likewise.
-       * tests/autodist-acconfig.test: Likewise.
-       * tests/autodist-acconfig-no-subdir.test: Likewise.
-       * tests/autodist-aclocal-m4.test: Likewise.
-       * tests/autodist-config-headers.test: Likewise.
-       * tests/autodist-configure-no-subdir.test: Likewise.
-       * tests/autodist-stamp-vti.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
-2011-01-11  Stefano Lattarini  <address@hidden>
-
-       tests: work around a texi+cygnus bug causing a spurious XFAIL
-       * tests/txinfo5b.test: New test, like txinfo5.test but calling
-       automake with the `-Wno-override' option to work around a bug
-       in the texinfo + cygnus interaction.
-       * tests/txinfo5.test: Update heading comments.
-       * tests/Makefile.am (TEST): Updated.
-
-2011-01-09  Dave Hart  <address@hidden>  (tiny change)
-
-       Fix another typo in Rule.pm comment.
-       * lib/Automake/Rule.pm: Fix typo.
-
-2011-01-11  Stefano Lattarini  <address@hidden>
-
-       Improve, extend and tweak tests on Texinfo support.
-       * tests/instdir-texi.test: Add a call to `ls -l' after that to
-       `make', for debugging.  When looking for required tools, do not
-       redirect the output of "$tool --help" to /dev/null, and do not
-       uselessly run it in a subshell.
-       * tests/txinfo.test: Rewritten to run autoconf, ./configure and
-       make.  All checks moved into Makefile.am.
-       * tests/txinfo8.test: Likewise, and modernize the generated
-       configure.in.
-       * tests/txinfo2.test: Moved checks into Makefile.am, and other
-       minor improvements.
-       * tests/txinfo5.test: Enable `errexit' shell flag, and related
-       changes.  Add trailing `:' command.
-       * tests/txinfo6.test: Likewise, and make grepping of generated
-       Makefile.in stricter.
-       * tests/txinfo7.test: Enable `errexit' shell flag, and related
-       changes.  Add trailing `:' command.  Do not add unnecessary stuff
-       to Makefile.am.
-       * tests/txinfo9.test: Verify that more targets which are expected
-       to be generated only once really are.  Make grepping less strict,
-       to avoid exposing too much internal details.  More minor changes.
-       * tests/txinfo16.test: Add trailing `:'.  Prefer cat over echo
-       for appending to configure.in.  Updated/fixed heading comments.
-       * tests/txinfo23.test: Likewise, and extended a little by making
-       it check that no info file is created in the $(srcdir).
-       * tests/txinfo24.test: Likewise.
-       * tests/txinfo25.test: Likewise.
-       * tests/txinfo18.test: Add trailing `:'.  Prefer cat over echo
-       for appending to configure.in.  Also, check that index files are
-       cleaned also by "make clean", not only by "make distclean".
-       * tests/txinfo22.test: Prefer `$me' over hard-coded test name,
-       and added trailing `:' command.  This testcase also used to check
-       that automake ignores in-line comments when using variables, but
-       preserves them in the output; these checks (added in commit
-       "Release-1-7f-4-g9177ef8") do not really pertain to this test,
-       so they have been moved ...
-       * tests/comments-in-var-defn.test: ... into this new test.
-       * tests/txinfo4.test: Escape literal dots in grep regexps.  Add
-       trailing `:' command.
-       * tests/txinfo29.test: Likewise.  Relax grepping of generated
-       Makefile.in w.r.t. whitespaces.  Prefer `cat' over `echo' to
-       append to configure.in.
-       * tests/txinfo3.test: Likewise.
-       * tests/vtexi.test: Improve grepping of Makefile.in (sometimes
-       make it stricter, sometimes laxer).  Move `set -e' setting just
-       after the inclusion of ./defs.  De-uglify a sed command.  Other
-       minor cosmetic improvements.
-       * tests/vtexi2.test: Make grepping of Makefile.in stricter.  Add
-       trailing `:' command.
-       * tests/vtexi3.test: New test on version.texi support.
-       * tests/vtexi4.test: Likewise.
-       * tests/Makefile.am (TESTS): Updated.
-
-2011-01-09  Peter Rosin  <address@hidden>
-
-       Fix another typo in Rule.pm comment.
-       * lib/Automake/Rule.pm: Fix typo.
-
-2011-01-09  Stefano Lattarini  <address@hidden>
-
-       cosmetics: remove trailing whitespaces
-       * doc/automake.texi: Remove trailing whitespaces.
-       * tests/cond13.test: Likewise.
-       * tests/cond14.test: Likewise.
-       * tests/fort4.test: Likewise.
-       * tests/fort5.test: Likewise.
-       * tests/suffix7.test: Likewise.
-       * tests/vtexi2.test: Likewise.
-
-       automake: minor fixes in comments
-       * automake.in: Some minor fixes and enhancements in comments.
-
-2011-01-09  Ralf Wildenhues  <address@hidden>
-
-       Add test coverage for deleted header files.
-       * tests/depcomp6.test, tests/depcomp7.test: Update tests to
-       also check for the deleted header bug.  If no dependency
-       tracking mechanism could be found, SKIP rather than exit
-       successfully.  Use GNU style spacing and ANSI C prototypes.
-
-       Fix typos in Rule.pm comments.
-       * lib/Automake/Rule.pm: Fix typos in comments.
-
-       docs: split 'amhello Explained' node.
-       * doc/automake.texi (amhello Explained): Split node ...
-       (amhello's configure.ac Setup Explained)
-       (amhello's Makefile.am Setup Explained) : ... into these two.
-       (Top, Hello World): Adjust, and add @anchor for stable URL links.
-       Suggestion by Karl Berry in automake bug#7766.
-
-2011-01-08  Karl Berry  <address@hidden>
-           Eric Blake  <address@hidden>
-
-       docs: reference defining directories in amhello node.
-       * doc/automake.texi (amhello Explained): Point to Autoconf
-       manual for how to convert directory values into macros.
-       (Optional): Fix grammar nit.
-
-2011-01-02  Stefano Lattarini  <address@hidden>
-
-       * NEWS: Fix typo (forgotten word).
-
-2011-01-02  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       docs: how to work around checks on invalid primary/directory couples
-       * doc/automake.texi (Uniform): Document the blessed idiom which can
-       be used to work around automake checks on invalid primary/directory
-       couples (such as `lib_PROGRAMS' or `doc_LIBRARIES').
-
-2011-01-02  Ralf Wildenhues  <address@hidden>
-
-       Sync auxiliary files from upstream.
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex:
-       Sync from upstream.
-
-       Fix maintainer-check regression.
-       * tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
-       environment.
-
-       Bump copyright years.
-       * aclocal.in (write_aclocal, version): Bump copyright years.
-       * automake.in (gen_copyright, version): Likewise.
-       * doc/automake.texi: Likewise.
-
-2010-12-23  Ralf Wildenhues  <address@hidden>
-           Stefano Lattarini  <address@hidden>
-
-       Work around a bug in file-inclusion mechanism of Solaris make.
-       * automake.in (handle_single_transform): In the name of the
-       dependency file: collapse multiple slash characters into a single
-       one.
-       * tests/subobj11a.test: New test.
-       * tests/subobj11b.test: Likewise.
-       * tests/subobj11c.test: Likewise.
-       * tests/depcomp8a.test: Likewise.
-       * tests/depcomp8b.test: Likewise.
-       * tests/Makefile.am (TESTS): Updated.
-       * NEWS: Updated.
-       Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
-       patch and tests by Stefano Lattarini.
-
-2010-12-22  Stefano Lattarini  <address@hidden>
-
-       Fix two spurious testsuite failures on IRIX 6.5.
-       * tests/suffix13.test (Makefile.am): Account for VPATH issues on
-       weaker make implementations (e.g. IRIX 6.5).
-       * tests/parallel-tests8.test: Likewise, plus a required related
-       change.
-       Reported by Ralf Wildenhues.  The bugs have been there from the
-       first versions of the affected test scripts.
-
-2010-12-22  Stefano Lattarini  <address@hidden>
-
-       docs: cygnus mode doesn't require AM_CYGWIN32 macro.
-       * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
-       the AM_CYGWIN32 macro (and indeed hasn't required it since at
-       least commit Release-1-2-31-g3038064 "merged changes from
-       Cygnus" of 1997-08-25).
-
-2010-12-22  Stefano Lattarini  <address@hidden>
-
-       distlinksbrk.test: Work around botched "make -k".
-       * tests/distlinksbrk.test: Run "make" multiple times and grep
-       its output each time for a single error message, rather than
-       running "make -k" one single time and grepping its output for
-       all the expected error messages.  This should work around make
-       implementations with limited (broken?) `-k' support; for more
-       information, see these subthreads on the automake-patches list:
-         - 2010-11-15, "Testsuite failures on HP-UX 11.23",
-           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
-         - 2010-11-15, "Testsuite failures on IRIX 6.5",
-           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
-
-2010-12-21  Stefano Lattarini  <address@hidden>
-
-       Fix sed-related buglet in test "subdir5.test"
-       * tests/subdir5.test: Always terminate text passed to the
-       `i' sed command with a newline, to work around limitations
-       in e.g. older OpenBSD sed.
-
-2010-12-18  Stefano Lattarini  <address@hidden>
-
-       docs: fix blunder in example about python extension modules
-       * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
-       not `quaternion_SOURCES', to declare the sources of python
-       extension module `quaternion.la'.
-
-2010-12-16  Stefano Lattarini  <address@hidden>
-
-       docs: list LTLIBRARIES among Automake primaries
-       * doc/automake.texi (Uniform): List `LTLIBRARIES' among
-       the Automake primaries.
-
-2010-12-14  Stefano Lattarini  <address@hidden>
-
-       Improve tests on generated portions of configure help screen.
-       * tests/help-depend.test: Grepping of configure help screen
-       relaxed to cater for possible line wrapping, and tightened in
-       other respects.
-       * tests/help-depend2.test: Likewise.
-       * tests/help-dmalloc.test: Likewise.
-       * tests/help-lispdir.test: Likewise.
-       * tests/help-maintainer.test: Likewise.
-       * tests/help-multilib.test: Likewise.
-       * tests/help-silent.test: Likewise.
-       * tests/help-upc.test: Likewise.
-       * tests/help-init.test: Grepping of configure help screen
-       tightened.
-
-2010-12-10  Ralf Wildenhues  <address@hidden>
-
-       Avoid running installed automake from 'libtool --help'.
-       * tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
-       Together with fixed Libtool, this fixes check-coverage to not
-       invoke installed automake.
-
-2010-11-25  Stefano Lattarini  <address@hidden>
-
-       Fix spurious failures in `silent*.test' for $CC != gcc
-       In some tests on automake-produced silent rules, we forced the
-       use of gcc depmode to improve testsuite coverage; but this has
-       unsurprisingly led to spurious failures when some non-GNU C
-       compilers were used.  So we are now careful to require GCC in
-       tests that force gcc depmode.
-       From reports by Ralf Wildenhues.
-       * tests/silent5.test: Test removed, its content split into ...
-       * tests/silent-many-generic.test, tests/silent-many-gcc.test: ...
-       these new sister tests, the latter of which forces gcc depmode
-       and lists "gcc" in $required.
-       * tests/silentlex.test: Test removed, its content split into ...
-       * tests/silent-lex-generic.test, tests/silent-lex-gcc.test: ...
-       these new sister tests, the latter of which forces gcc depmode
-       and lists "gcc" in $required.
-       * tests/silentyacc.test: Test removed, its content split into ...
-       * tests/silent-yacc-generic.test, tests/silent-yacc-gcc.test: ...
-       these new sister tests, the latter of which forces gcc depmode and
-       lists "gcc" in $required.
-       * tests/Makefile.am (TESTS): Updated.
-
-2010-11-21  Stefano Lattarini  <address@hidden>
-
-       Tests: consistently use "|| Exit 1" after ". ./defs".
-       * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
-       `. ./defs', for consistency with other tests.
-       * tests/autohdr2.test: Likewise.
-       * tests/autohdr3.test: Likewise.
-       * tests/autohdr4.test: Likewise.
-       * tests/cond23.test: Likewise.
-       * tests/cond24.test: Likewise.
-       * tests/cond25.test: Likewise.
-       * tests/cond26.test: Likewise.
-       * tests/cond27.test: Likewise.
-       * tests/cond28.test: Likewise.
-       * tests/cond29.test: Likewise.
-       * tests/cond30.test: Likewise.
-       * tests/cond31.test: Likewise.
-       * tests/cond32.test: Likewise.
-       * tests/cond33.test: Likewise.
-       * tests/cond34.test: Likewise.
-       * tests/cond35.test: Likewise.
-       * tests/cond36.test: Likewise.
-       * tests/cond37.test: Likewise.
-       * tests/cond38.test: Likewise.
-       * tests/cond39.test: Likewise.
-       * tests/cond40.test: Likewise.
-       * tests/cond41.test: Likewise.
-       * tests/cond42.test: Likewise.
-       * tests/cond43.test: Likewise.
-       * tests/cond44.test: Likewise.
-       * tests/cond45.test: Likewise.
-       * tests/dollarvar.test: Likewise.
-       * tests/dollarvar2.test: Likewise.
-       * tests/hfs.test: Likewise.
-       * tests/libobj14.test: Likewise.
-       * tests/percent.test: Likewise.
-       * tests/percent2.test: Likewise.
-       * tests/phony.test: Likewise.
-       * tests/silent.test: Likewise.
-       * tests/silent2.test: Likewise.
-       * tests/silent3.test: Likewise.
-       * tests/silent4.test: Likewise.
-       * tests/silent5.test: Likewise.
-       * tests/silent6.test: Likewise.
-       * tests/silent7.test: Likewise.
-       * tests/silent9.test: Likewise.
-       * tests/silentcxx.test: Likewise.
-       * tests/silentf77.test: Likewise.
-       * tests/silentf90.test: Likewise.
-       * tests/silentlex.test: Likewise.
-       * tests/silentyacc.test: Likewise.
-
-       Avoid useless cleaning in some `silent*.test' tests.
-       * tests/silentf77.test: Removed useless calls to "make clean"
-       and "make maintainer-clean".
-       * tests/silentf90.test: Likewise.
-       * tests/silent3.test: Removed useless call to "make distclean".
-       * tests/silent4.test: Likewise.
-       * tests/silent9.test: Likewise.
-
-2010-11-19  Ian Lance Taylor  <address@hidden>
-
-       Sync config-ml.in from GCC.
-       * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
-       compiler/flag environment variables.
-
-2010-11-19  Stefano Lattarini  <address@hidden>
-
-       Automake::Config: remove extra trailing semicolon.
-       * lib/Automake/Config.in: Remove extra trailing semicolon.
-
-       help4.test: fix botched heading comment.
-       * tests/help4.test: Fixed the heading comment, since it
-       didn't correctly describe what checks the testcase was
-       supposed to perform.
-
-       help2.test: add checks on aclocal too.
-       * tests/help2.test: Check that also `aclocal --version' and
-       `aclocal --help' work with configure.in and acinclude.m4 both
-       broken.
-
-2010-11-17  Stefano Lattarini  <address@hidden>
-
-       Fix spurious failures of silent-rules tests with Sun Fortran.
-       * tests/silentf77.test: Strip from the make output some verbose
-       messages possibly printed by the SunStudio fortran compilers, to
-       avoid spurious failures.  Add a trailing `:' command.
-       * tests/silentf90.test: Likewise.
-
-2010-11-17  Stefano Lattarini  <address@hidden>
-
-       Fix spurious failures of silent5.test with Sun Fortran.
-       * tests/silent5.test: Strip from the make output some verbose
-       messages possibly printed by the SunStudio fortran compilers,
-       to avoid spurious failures.  This bug has been there from the
-       very first version of this test script.
-
-2010-11-16  Stefano Lattarini  <address@hidden>
-
-       Fix regression in colon{5,6}.test (failures on AIX 5.3).
-       * tests/colon5.test: Also substitute address@hidden@' with `$SHELL' when
-       post-processing the generated Makefile.in, to work around a bug
-       of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
-       on the commend line.  Calls to `$MAKE' adjusted accordingly.
-       * tests/colon6.test: Likewise.
-       Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
-       improve and/or extend tests `colon*.test", and reported by Ralf
-       Wildenhues.
-
-2010-11-16  Stefano Lattarini  <address@hidden>
-
-       Fix regression in ansi.test (failure on AIX 5.3).
-       * tests/ansi.test: Remove redundant hackish check done using a
-       hand-postprocessed Makefile.in.  This check worked by setting
-       the `$(SHELL)' macro on the command line of make, but this is
-       not supported by the AIX 5.3 make implementation.
-       This bug has been lurking for a long time, and was activated by
-       commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
-       tests".  Report by Ralf Wildenhues.
-
-2010-11-16  Ralf Wildenhues  <address@hidden>
-
-       tests: avoid '##'-style comments inside recipe commands.
-       * tests/confh.test, tests/confh8.test: Remove
-       double-hash comments from makefile rule commands, they
-       are not part of the Automake API.
-
-2010-11-14  Ralf Wildenhues  <address@hidden>
-
-       tests: work around dash quoting issue in case statements.
-       * tests/color.test, tests/color2.test: Quote variable in case
-       pattern, to avoid skipping tests with dash 0.5.5.1.
-
-2010-11-14  Ralf Wildenhues  <address@hidden>
-
-       Rebuild menus in the manual.
-       * doc/automake.texi: Rebuild menus (using ^C ^U ^A in emacs).
-       Thanks to Ian Lance Taylor for the suggestion.
-
-       Fix install-strip when $(STRIP) contains several words.
-       * lib/am/install.am (install-strip): Update comment.  Use
-       separate sub-make invocations for empty and nonempty $(STRIP),
-       to fix quoting issues.
-       * tests/strip2.test, tests/strip3.test: New tests.
-       * tests/Makefile.am (TESTS): Adjust.
-
-2010-11-10  Ralf Wildenhues  <address@hidden>
-
-       Fix yaccdry.test failure: require bison.
-       * tests/yaccdry.test: Require bison.
-       Found by NixOS Hydra.
-
-2010-11-07  Stefano Lattarini  <address@hidden>
-
-       Fix a bug in variable concatenation with `+='.
-       * lib/Automake/VarDef.pm (append): Since the content of the
-       "appended-to" variable is going to be unconditionally normalized
-       later, simply separate the appended value with a single whitespace
-       character, instead of trying to be uselessly smarter by using
-       escaped newlines.  This fixes a bug in which extra backslashes
-       where erroneously inserted in the variable's final value.
-       * tests/pluseq11.test: New test, exposing the bug.
-       * tests/Makefile.am (TESTS): Update.
-       Reported by Andy Wingo.
-
-2010-11-06  Stefano Lattarini  <address@hidden>
-
-       Fix bug in rules for creating vala vapi/header files.
-       * automake.in (lang_vala_finish_target): Add forgotten "fi" in an
-       if control structure in a generated make rules.  Bug introduced
-       by previous commit `v1.11-221-gd7c1679', and revealed by failure
-       of test `vala2.test'.
-
-2010-11-01  Ralf Wildenhues  <address@hidden>
-
-       Fix and document rules to not touch the tree with `make -n'.
-       * doc/automake.texi (Multiple Outputs): Document the problem of
-       modifications during dry-run execution, propose solution.
-       * NEWS: Update.
-       * automake.in (lang_vala_finish_target): Split recipe so the
-       stamp file is not removed with GNU `make -n'.
-       (lang_yacc_target_hook): Separate removal of parser output file
-       and header remaking.
-       * lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
-       passed to make, take care not to remove any files in that case.
-       * lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
-       %STAMP% file from induced remaking of config header.
-       * tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
-       New tests.
-       * tests/Makefile.am (TESTS): Update.
-
-2010-11-01  Ralf Wildenhues  <address@hidden>
-
-       Add FAQ entry for bug reporting instructions.
-       * doc/automake.texi (Reporting Bugs): New section.
-       (Introduction): Refer to it.
-
-2010-10-04  Stefano Lattarini  <address@hidden>
-
-       Add support for newer python versions.
-       * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
-       _AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
-       line and fix indentation.
-       * THANKS: Updated.
-       From a report by Thomas Klausner.
-
-       Add test for `AM_WITH_DMALLOC' macro.
-       * tests/dmalloc.test: New test.
-       * tests/Makefile.am (TESTS): Update.
-
-       Fix nits and bugs in tests `help*.test'.
-       * tests/help4.test: Fix broken sed commands used to strip `-W...'
-       flags away from "$AUTOMAKE" and "$ACLOCAL".
-       * tests/help3.test: Likewise, and fix a botched comment.
-       * tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
-       instead of "$AUTOMAKE ... && Exit 1", for consistency and to
-       please maintainer-check.
-       * tests/help2.test: Likewise.
-
-2010-10-03  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Improve tests `help*.test' (also fixes maintcheck failures).
-       * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
-       flags stripped away rather than hard-coded `automake-$APIVERSION',
-       to better honour user-overrides.  Similarly for aclocal.
-       * tests/help2.test: Likewise.
-       * tests/help3.test: Likewise.
-       * tests/help4.test: Likewise.
-
-2010-10-03  Ralf Wildenhues  <address@hidden>
-
-       Document and fix expansion of variables before rules.
-       * doc/automake.texi (General Operation): Document that variables
-       are expanded before rules.
-       * lib/am/check.am (am__check_post): Reword a bit so it does not
-       get matched as a rule.
-       Suggestion by Ben Pfaff.
-
-2010-10-02  Ralf Wildenhues  <address@hidden>
-
-       Revert "parallel-tests: avoid command-line length limit issue."
-       This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
-       because it re-opened the bug fixed by v1.11-10-g218e678.
-
-       2010-09-07  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: avoid command-line length limit issue.
-       * automake.in (handle_tests): New argument $makefile, new
-       substitution %MAKEFILE%.
-       (generate_makefile): Adjust.
-       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
-       sanitized TEST_LOGS value as makefile snippet on standard
-       input to $(MAKE), to avoid exceeding the command line limit on
-       w32 (MSYS).
-       * NEWS: Update.
-       Report by Bob Friesenhahn.
-
-2010-09-26  Stefano Lattarini  <address@hidden>
-
-       Extend tests on `--help' and `--version' options.
-       * tests/help.test: Create a new empty directory and chdir into
-       it, rather than removing already present files.  Run the aclocal
-       and automake wrapper scripts directly, instead of relying on
-       $AUTOMAKE and $ACLOCAL.  Be sure to correctly match literal dots
-       in aclocal's and automake's stderr.  Add a trailing `:' command.
-       * tests/help2.test: New test, checking that options `--help' and
-       `--version' works in directories with broken `configure.in'.
-       * tests/help3.test: New test, checking that options `--help' and
-       `--version' take precedence on the other options.
-       * tests/help4.test: New test, checking that the first among the
-       `--help' and `--version' options to be specified on the command
-       line wins.
-       * tests/Makefile.am (TESTS): Updated.
-
-2010-09-25  Stefano Lattarini  <address@hidden>
-
-       Testsuite: Use `$PATH_SEPARATOR', not `:', when extending PATH.
-       * tests/compile2.test: Do no uselessly (implicitly) repeat the
-       computation of PATH_SEPARATOR again.
-       * tests/instmany-mans.test: Use `$PATH_SEPARATOR', not `:', when
-       extending/redefining PATH.
-       * tests/instmany-python.test: Likewise.
-       * tests/instmany.test: Likewise.
-       * tests/man4.test: Likewise.
-       * tests/mkinst3.test: Likewise.
-       * tests/mmodely.test: Likewise.
-       * tests/multlib.test: Likewise.
-       * tests/txinfo30.test: Likewise.
-       * tests/README (Section "Writing test cases" subsection "Do"):
-       Updated.
-       * Makefile.am (sc_tests_PATH_SEPARATOR): New maintainer check.
-       (syntax_check_rules): Updated.
-
-       Testsuite: new variables `$PATH_SEPARATOR' and `$APIVERSION'.
-       * tests/defs.in ($APIVERSION):  New AC_SUBST'd variable.
-       ($ACLOCAL, $AUTOMAKE): Use it.
-       ($PATH_SEPARATOR):  New AC_SUBST'd variables.
-       ($PATH): Use it.
-
-2010-09-22  Stefano Lattarini  <address@hidden>
-
-       Manual: be more agnostic w.r.t. version control system used.
-       * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
-       directories as a type of probably-unwanted files that are copied
-       regardless when adding directories to EXTRA_DIST.
-       (The dist Hook): Show a dist-hook example which removes Subversion
-       `.svn' private directories from distdir, rather than CVS private
-       directories.
-       (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
-       the version control system used.
-
-       Manual: index refer to target "git-dist", not "cvs-dist".
-       * doc/automake.texi (General Operation): Index the non-standard
-       example about "git-dist" under the "git-dist" label, not under
-       the "cvs-dist" one.
-
-       Perl modules: remove references to "Automake CVS repository".
-       * lib/Automake/Channels.pm: Update comments to refer to "Automke's
-       git repository" rather than to "Automake's CVS repository".
-       * lib/Automake/Configure_ac.pm: Likewise.
-       * lib/Automake/FileUtils.pm: Likewise.
-       * lib/Automake/Struct.pm: Likewise.
-       * lib/Automake/XFile.pm: Likewise.
-       * lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git
-       branches" rather than "CVS branches".
-
-       Remove obsolete .cvsignore files.
-       * .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore,
-       lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore,
-       m4/.cvsignore, tests/.cvsignore: Files deleted.  Even when using
-       savannah's CVS readonly mirror there's no way to commit back to
-       the real repository, so this files are not worth maintaining or
-       keeping around.
-
-2010-09-21  Stefano Lattarini  <address@hidden>
-
-       * m4/dmalloc.m4: Bump serial number and copyright years.
-
-2010-09-20  Stefano Lattarini  <address@hidden>
-
-       Fix broken link in `AM_WITH_DMALLOC' help screen.
-       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Refer only to the dmalloc site
-       `http://www.dmalloc.com', not to the dmalloc tarball there (which
-       seems to have been removed, substituted by multiple release
-       tarballs now).
-
-2010-09-17  Eric Blake  <address@hidden>
-
-       Avoid triple-space after period.
-       * automake.in (handle_single_transform): Avoid 3 spaces at
-       sentence end.
-       * ChangeLog.03: Likewise.
-       * lib/Automake/ChannelDefs.pm: Likewise.
-       * lib/Automake/Channels.pm (_print_message): Likewise.
-       * lib/Automake/Rule.pm (rule): Likewise.
-       * lib/Automake/Variable.pm (var): Likewise.
-       * lib/am/distdir.am: Likewise.
-       * tests/insthook.test: Likewise.
-
-2010-09-15  Stefano Lattarini  <address@hidden>
-
-       Test automake-generated portions of configure help screen.
-       * tests/help-depend.test: New test.
-       * tests/help-depend2.test: Likewise.
-       * tests/help-dmalloc.test: Likewise.
-       * tests/help-init.test: Likewise.
-       * tests/help-lispdir.test: Likewise.
-       * tests/help-maintainer.test: Likewise.
-       * tests/help-multilib.test: Likewise.
-       * tests/help-regex.test: Likewise.
-       * tests/help-silent.test: Likewise.
-       * tests/help-upc.test: Likewise.
-       * tests/mmode.test: Remove tests on `configure --help' output,
-       they are superseded by tests in `help-maintainer.test'.
-       * tests/Makefile.am (TESTS): Update.
-
-2010-09-14  Stefano Lattarini  <address@hidden>
-
-       * tests/README: Don't put GCS mandated tools in $required.
-
-2010-09-13  Ralf Wildenhues  <address@hidden>
-
-       * HACKING: Hint at old commits with `git describe' output.
-
-2010-09-12  Stefano Lattarini  <address@hidden>
-
-       Fix regression in test `colon4.test'.
-       * tests/colon4.test: Fix botched editing to `configure.in'
-       that made the test useless.  Since we are at it, improve
-       comments and make grepping of generated Makefile.in slightly
-       stricter.
-       Regression introduced by change "Modernize, improve and/or
-       extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
-
-2010-09-08  Stefano Lattarini  <address@hidden>
-
-       Do not require "gzip" explicitly in tests.
-       The gzip utility is simply expected to be present on any decent
-       target system for Automake.  So it's pointless to put it in
-       $required.
-       * tests/install2.test ($required): Do not require "gzip".
-       * tests/lex3.test: Likewise.
-       * tests/pr9.test: Likewise.
-       From a suggestion by Ralf Wildenhues.
-
-       Make some `confh*.test' tests more "semantic" (plus tweakings).
-       * tests/confh.test: Run "autoconf", "configure" and "make check",
-       instead of munging/grepping the generated `Makefile.in'.
-       * tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
-       white spaces.  Do not create useless dummy source file `foo.c'
-       and useless dummy header file `acconfig.h'.
-       (configure.in): Remove superfluous call to `AC_OUTPUT'.
-       * tests/confh6.test: Add trailing `:' command.
-       * tests/confh7.test: In comments, add reference to ...
-       * tests/confh8.test: ... this new test, "semantic" sister
-       of `confh7.test'.
-       * tests/Makefile.am (TESTS): Updated.
-       Prompted by a report from Ralf Wildenhues.
-
-       Remove useless whitespace padding in XFAIL_TESTS definition.
-       * tests/Makefile.am (XFAIL_TESTS): Remove whitespace padding.
-
-2010-09-07  Ralf Wildenhues  <address@hidden>
-
-       parallel-tests: avoid command-line length limit issue.
-       * automake.in (handle_tests): New argument $makefile, new
-       substitution %MAKEFILE%.
-       (generate_makefile): Adjust.
-       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
-       sanitized TEST_LOGS value as makefile snippet on standard
-       input to $(MAKE), to avoid exceeding the command line limit on
-       w32 (MSYS).
-       * NEWS: Update.
-       Report by Bob Friesenhahn.
-
-       Posix 2008 requires make to set errexit.
-       * lib/am/check.am: Update comment.
-
-2010-08-27  Stefano Lattarini  <address@hidden>
-
-       Fix bug in test missing6.test.
-       * tests/missing6.test: Fix the hack used to edit `configure.in',
-       to avoid producing a configure script that breaks with shells
-       that do not support $LINENO.  Also throw in a couple of cosmetic
-       changes.
-
-2010-08-21  Ralf Wildenhues  <address@hidden>
-
-       Improve robustness of mdate-sh script.
-       * lib/mdate-sh: Sanitize zsh behavior on startup, to ensure
-       $ls_command is word-split properly upon invocation.
-       (error): New function.
-       (main): Use it.  Improve error checking to avoid endless loop
-       in case $ls_command gave bogus output.  Fix eval quotation.
-       * tests/mdate6.test: New test, to expose eval quotation error.
-       * tests/Makefile.am: Update.
-
-2010-08-18  Stefano Lattarini  <address@hidden>
-
-       Fix potential regressions in depcomp{3,5}.test.
-       * tests/depcomp3.test: Do not uselessly escape the character `$'
-       in makefile rules, when it's used to expand a make macro.
-       * tests/depcomp5.test: Likewise.
-
-2010-08-17  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Docs: clarify how to avoid automatic dependencies tracking.
-       * doc/automake.texi (Automatic dependency tracking): Mention that
-       automatic dependencies tracking is enabled by default, but that
-       the package developer can disable it altogether.  Add a reference
-       to the proper section for a more in-depth explanation.
-
-       Fix typo in manual (`Makefile.in' instead of `Makefile.am').
-       * doc/automake.texi (Automatic dependency tracking): Fix typo.
-
-2010-08-16  Bruno Haible  <address@hidden>
-
-       Don't hide the table of contents.
-       * doc/automake.texi: Move the table of contents to the beginning.
-
-2010-08-10  Stefano Lattarini  <address@hidden>
-
-       Tweak and/or extend some `acloca*.test' tests.
-       * tests/aclocal8.test:  Ensure verbose printing of captured
-       output.
-       * tests/aclocal.test: Likewise.  Also, add trailing `:'
-       command.
-       * tests/acloca19.test: Likewise.
-       * tests/aclocal5.test: Add trailing `:' command, and prefer
-       `$me' over hard-coded test name.
-       * tests/aclocal6.test: Likewise.
-       * tests/aclocal18.test: Add trailing `:' command, and make
-       some grepping slightly stricter.
-       * tests/acloca14.test: Likewise.  Also, prefer `diff' over
-       `cmp', and add some "cosmetic" blank lines.
-
-2010-08-09  Stefano Lattarini  <address@hidden>
-
-       Tweak and extend tests `pr[!0-9]*.test'.
-       * tests/primary3.test: Add trailing `:' command.
-       * tests/primary.test: Make grepping of Automake's stderr stricter.
-       Also, add trailing `:' command, and cosmetic changes in spacing.
-       * tests/primary2.test: Likewise.
-       * tests/prefix.test: Enable `errexit' shell flags, and related
-       changes.  Add a trailing `:' command.
-       * tests/proginst.test: Likewise.
-
-       Modernize, improve and extend tests for PR (`pr[0-9]*.test').
-       * tests/pr2.test: Add trailing `:' command.
-       * tests/pr229.test: Likewise.
-       * tests/pr401.test: Likewise.
-       * tests/pr401b.test: Likewise.
-       * tests/pr401c.test: Likewise.
-       * tests/pr300-prog.test: Likewise, plus cosmetic changes in
-       spacing.
-       * tests/pr300-lib.test: Likewise.
-       * tests/pr300-ltlib.test: Likewise, and ensure verbose printing
-       of captured make stdout.
-       * tests/pr211.test: Add trailing `:' command.  Also, use the
-       `configure.in' stub created by ./defs, rather than writing it
-       from scratch.
-       * tests/pr204.test: Likewise, plus cosmetic spacing changes.
-       * tests/pr287.test: Likewise, and move setting of `errexit' shell
-       flag earlier in the script (just after inclusion of ./defs).
-       * tests/pr220.test: Make grepping of Automake's stderr stricter.
-       Also, add trailing `:' command, and cosmetic changes in spacing.
-       * tests/pr224.test: Move setting of `errexit' shell flag earlier
-       in the script (just after inclusion of ./defs).  Do not export
-       `CC=gcc' to configure explicitly (it's already exported globally
-       in ./defs, since we have "gcc" in $required).  Use the stub for
-       `configure.in' created by ./defs, rather than writing it from
-       scratch.  Do not create dummy files required by "gnu" mode (e.g.
-       README, NEWS), since we run automake in foreign mode anyway.
-       * tests/pr72.test: Enable `errexit' shell flags, and related
-       changes.  Extend existing checks a bit.
-       * tests/pr9.test: Likewise.  Also, avoid obsolescent constructs in
-       the generated `configure.in', and extend existing checks over the
-       generated tarball a bit.
-       * tests/pr87.test: Enable `errexit' shell flags, and related
-       changes.  Add a trailing `:' command.  Also, do not create dummy
-       files required by "gnu" mode (e.g. README, NEWS), since we run
-       automake in foreign mode anyway.
-       * tests/pr243.test: Avoid obsolescent constructs in the generated
-       `configure.in'.  Enable the `errexit' shell flag, and related
-       changes.  Cosmetic changes to spacing, add trailing `:' command,
-       and add a "FIXME" comment.
-       * tests/pr266.test: Likewise, and add explicit command line switch
-       `--enable-dependecy-tracking' to the ./configure call.
-       * tests/pr279.test: Avoid obsolescent constructs in the generated
-       `configure.in'; also, use the `configure.in' stub created by
-       ./defs, rather than writing it from scratch.  Enable `errexit'
-       shell flag, and related changes.  Add trailing `:' command.
-       * tests/pr279-2.test: Likewise, and make grepping of Makefile.in
-       stricter.
-       * tests/pr307.test: Move setting of `errexit' shell flag earlier
-       in the script (just after inclusion of ./defs).  Escape literal
-       dots in grep regular expressions.  Also, add a trailing `:'
-       command, and cosmetic changes to spacing.
-
-       Tests for PR: add excerpts from original bug report, for clarity.
-       * tests/pr2.test: Ditto.
-       * tests/pr9.test: Likewise.
-       * tests/pr72.test: Likewise.
-       * tests/pr87.test: Likewise.
-       * tests/pr211.test: Likewise.
-       * tests/pr220.test: Likewise.
-       * tests/pr224.test: Likewise.
-       * tests/pr229.test: Likewise.
-       * tests/pr243.test: Likewise.
-       * tests/pr266.test: Likewise.
-       * tests/pr279.test: Likewise, and tell to keep it in sync
-       with its sister test.
-       * tests/pr279-2.test: Likewise.
-
-2010-08-08  Stefano Lattarini  <address@hidden>
-
-       Tweak, extend and improve tests `cond[a-z]*.test'.
-       * tests/condd.test: Add trailing `:' command.  Typofix in
-       comment.
-       * tests/condhook.test: Make sure target `install-data-hook' is
-       not called by `make install', but that data files are installed.
-       Use proper m4 quoting in configure.in. Add trailing `:' command.
-       * tests/condhook2.test: New test, sister test of condhook, with
-       inverted semantic.
-       * tests/condinc2.test: Use proper m4 quoting in configure.in.
-       Prefer trailing `:' command over trailing `Exit 0'.
-       * tests/condman2.test: Enable errexit shell flag, and related
-       changes.  Add trailing `:' command.
-       * tests/condman.test: Likewise.  Also, do not create useless
-       dummy manpages, and use proper m4 quoting in configure.in.
-       * tests/condman3.test: New test, similar to condman.test, but
-       it also runs ./configure and "make install", and check the
-       installed files.
-       * tests/Makefile.am (TESTS): Updated.
-
-       Modernize, improve and/or extend tests `colon*.test.
-       * tests/colon.test: Rely on the `configure.in' stub created by
-       `./defs', rather than writing one from scratch.  Do not create
-       a useless dummy file.  Add trailing `:' command.
-       * tests/colon4.test: Enable the `errexit' shell flag, and
-       related changes.  Rely on the `configure.in' stub created by
-       `./defs', rather than writing one from scratch.
-       * tests/colon7.test: Enable `errexit' shell flag, and related
-       changes.  Improve the generated `configure.in' file.  Add
-       trailing `:' command.
-       * tests/colon2.test: Likewise.  Also, add some new checks.
-       * tests/colon5.test: Improve the generated `configure.in' file.
-       Add new, much deeper checks.  Add trailing `:' command.
-       * tests/colon6.test: Likewise.
-       * tests/colon3.test: Add trailing `:' command.  Remove useless
-       comments and echos.  Improve the generated `configure.in' file.
-       make some grepping tests stricter.  Add a "FIXME" comments about
-       planned improvements.
-
-       Improve and extend tests `asm*.test'.
-       * tests/asm.test: Use configure.in stub generated by ./defs,
-       and avoid obsoleted autoconf constructs.  Make grepping of
-       Automake stderr stricter.  Do not create useless source file.
-       Improve verbose messages.  Minor cosmetic changes.  Tell to
-       keep it in sync with other sister tests asm*.test.
-       * tests/asm2.test: Likewise.
-       * tests/asm3.test: Likewise.
-
-       Modernize, improve and/or extend test scripts `conf*.test'.
-       * tests/confh5.test: Cosmetic changes.
-       * tests/conff.test: Likewise.
-       * tests/confdeps.test: Likewise.
-       * tests/conflnk.test: Likewise.
-       * tests/conflnk2.test: Likewise.
-       * tests/confsub.test: Likewise.
-       * tests/confvar.test: Likewise, and make grepping of Makefile.in
-       stricter.
-       * tests/confvar2.test: Likewise.
-       * tests/conflnk3.test: Cosmetic changes.  Re-enable a temporarily
-       disabled test (which didn't work with autoconf <= 2.59, but now we
-       are requiring autoconf 2.62, so...)
-       * tests/conflnk4.test: Cosmetic changes, and extend existing tests
-       accordingly to "TODO" comments.
-       * tests/conff2.test: Make grepping of Automake's stderr stricter.
-       Add some comments explaining why we don't use the `configure.in'
-       stub preset be ./defs.
-       * tests/confh.test: Use the `configure.in' stub created by ./defs,
-       rather than writing one from scratch, and do not call AC_OUTPUT.
-       Enable `errexit' shell flag, and related changes.  Prefer diff over
-       cmp to compare text files. Prefer perl over sed to fetch the value
-       of $(DIST_COMMON) from Makefile.in.  Make grepping of the contents
-       of $(DIST_COMMON) stricter.
-       * tests/confh4.test: Use the `configure.in' stub created by ./defs,
-       rather than writing one from scratch.  Make grepping of Makefile.in
-       stricter.
-       * tests/confh5.test: Make grepping of `config.h' stricter.  Add a
-       comment.
-       * tests/configure.test: Avoid obsolescent constructs in generated
-       `configure.ac'.  Do not write `configure.in' two times.  Escape
-       literal dots in grep regular expressions.
-       * tests/confincl.test:  Enable `errexit' shell flag, and related
-       changes.  Prefer fgrep over grep.  Other cosmetic changes.
-       * tests/config.test: Renamed to ...
-       * tests/confh6.test: ... this.  Fix m4 quoting in `configure.in',
-       and make grepping of `config.h' and `config.h.in' stricter.
-       * tests/conf2.test: Renamed ...
-       * tests/confh7.test: ... to this.  Use the `configure.in' stub
-       created by ./defs, rather than writing one from scratch.  Try to
-       run the checks both with and without AC_PROG_CC and AC_OUTPUT in
-       `configure.in'.
-       * tests/Makefile.am (TESTS): Updated.
-
-       Minor improvements and fixes in tests `depcomp*.test'.
-       * tests/depcomp.test: Do not create useless dummy source files.
-       Add a trailing `:' command.
-       * tests/depcomp2.test: Use `unset' on the CFLAG variable to ensure
-       it's not in in the environment, rather than exporting it with an
-       empty value.  Do not pass CC=gcc to configure, as that's already
-       done in ./defs since we have gcc in $required.  Ensure verbose
-       printing of captured stderr, and normalize its checking.  Add a
-       trailing `:' command.
-       * tests/depcomp3.test: Quote literal dots and dollar characters in
-       grep regexps.  Always use `: >' rather than `touch' to create empty
-       files.  Explicitly declare phony targets as such in the created
-       Makefile.am.  Add a trailing `:' command.
-       * tests/depcomp4.test: Quote literal dots and dollar characters in
-       grep regexp.  Explicitly declare phony targets as such in the
-       created Makefile.am.  Ensure verbose printing of captured makes'
-       stoud/stderr.  Add a trailing `:' command.
-       * tests/depcomp5.test: Move setting of `errexit' shell flag earlier
-       in the script (just after inclusion of ./defs).  Quote literal dots
-       and dollar characters in grep regexps.  Explicitly declare phony
-       targets as such in the created Makefile.am.  Add a trailing `:'
-       command.
-       * tests/depcomp6.test: Consistently use m4 quoting in the generated
-       configure.in.  Cosmetic fixes to spacing.  Make the "dummy" `if'
-       statement required by OpenBSD's sh `set -e' more robust, and add
-       explanatory comments to it.
-       * tests/depcomp7.test: Likewise, and add  a trailing `:' command.
-
-       Separate failing part of test `all.test'.
-       * tests/all.test: Keep only (x)failing part of the test.  Working
-       checks moved out to ...
-       * tests/all2.test: ... this new test.
-       * tests/Makefile.am (TESTS): Updated.
-
-       Modernize, improve and extend tests `subobj*.test'.
-       * tests/subobjname.test:  Add trailing `:' command.
-       * tests/subobj.test: Make grepping of `Makefile.in' stricter.
-       Escape literal dots in grep regexps.
-       * tests/subobj2.test:  Add trailing `:' command.  Do not use the
-       unportable fgrep option `-e'.
-       * tests/subobj3.test: Add trailing `:' command.
-       (configure.in): Use proper m4 quoting, and avoid obsolescent
-       constructs.
-       * tests/subobj8.test: Likewise.  Also, enable `errexit' shell
-       flag, with related changes
-       * tests/subobj4.test: Likewise.  Also, make grepping of
-       `Makefile.in' stricter.
-       * tests/subobj5.test: Add trailing `:' command.  Move setting of
-       `errexit' shell flag earlier in the script (just after inclusion
-       of ./defs).
-       (configure.in): Use the stub created by `./defs', rather than
-       writing it from scratch, and avoid obsolescent constructs.
-       * tests/subobj6.test: Add trailing `:' command.  Move setting of
-       `errexit' shell flag earlier in the script (just after inclusion
-       of ./defs).  Do not create useless dummy ac-init file `f'.
-       * tests/subobj7.test: Do not create useless dummy ac-init file
-       `f'.
-       (configure.in): Use the stub created by `./defs', rather than
-       writing it from scratch, and avoid obsolescent constructs.
-       * tests/subobj9.test: Move setting of `errexit' shell flag earlier
-       in the script (just after inclusion of ./defs).  Fail the test if
-       `make distcheck' fails.  Ensure verbose printing of captured make
-       stdout.  Avoid useless fork by doing simple grep instead of using
-       test -n "`COMMAND | grep ...`".
-       (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
-       (Makefile.am): Explicitly mark target "print" as phony.
-       * tests/subobj10.test: Removed duplicated call to `set -e'.  Add
-       trailing `:' command.
-       (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
-
-       Remove a couple of obsoleted tests.
-       * tests/fpinstall.test: Removed.
-       * tests/fpinst2.test: Likewise.
-       * tests/Makefile.am (TESTS): Updated.
-
-       Bootstrap: updated HACKING entry.
-       * HACKING ("Working with git"): Explain how to override the
-       autoconf and autom4te programs used by the bootstrap process.
-
-       Bootstrap: fixlet.
-       * bootstrap: Do not remove `lib/Automake/Config.pm' anymore,
-       since we don't generate it.  Correctly quote arguments of
-       `eval' builtin.  Fixed a botched error message.  Removed an
-       extra blank line.
-
-       Bootstrap: don't search perl in $PATH.
-       * bootstrap: Do not explicitly search perl in $PATH anymore.
-       ($PATH_SEPARATOR): Removed, it's no more needed.
-
-       Bootstrap: let the user choose which autoconf to use.
-       * bootstrap ($AUTOCONF): New variable, from the environment.
-       ($AUTOM4TE): Likewise, for clarity.
-       Use "$AUTOCONF" instead of calling "autoconf" directly.
-
-       Minor improvements to tests ar*.test.
-       * tests/ar.test: Add trailing `:' command.
-       * tests/ar2.test: Likewise, and make grepping of generated
-       Makefile.in stricter.
-
-2010-08-08  Ralf Wildenhues  <address@hidden>
-
-       Fix maintainer-check failure.
-       * tests/cond5.test: Quote sleep argument, this isn't about
-       time stamp differences.
-
-       Sync auxiliary files from upstream.
-       * lib/config.guess, lib/config.sub, lib/texinfo.tex:
-       Sync from upstream.
-
-2010-08-06  Stefano Lattarini  <address@hidden>
-
-       Work around a nasty bug (segfault) of Solaris make.
-       * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
-       from $list, to avoid triggering a nasty bug (potential segfault)
-       on Solaris make.
-
-2010-08-06  Peter Rosin  <address@hidden>
-
-       Make cond5.test more robust on MSYS.
-       * tests/cond5.test: Add delay before the first kill attempt to
-       cater for problems with MSYS bash.
-
-2010-11-16  Peter Rosin  <address@hidden>
-
-       Skip MSVC oriented tests if the shell is not capable.
-       * tests/defs: New required entry 'xsi-shell'.
-       * tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
-       Require a XSI capable shell.
-       Reported by Ralf Wildenhues.
-
-2010-11-15  Peter Rosin  <address@hidden>
-
-       compile: clear the `eat' variable earlier.
-       * lib/compile: Clear the `eat' variable earlier.
-       ($scriptversion): Update.
-       * tests/compile3.test: Prevent regressions.
-
-2010-10-07  Peter Rosin  <address@hidden>
-
-       depcomp: add new one-pass depmode for MSVC 7 and later.
-       * lib/depcomp: Add new depmodes 'msvc7' and 'msvc7msys' which
-       make use of the -showIncludes option added in MSVC 7.
-       * m4/depend.m4 (_AM_DEPENDENCIES): Handle the new depmodes
-       similarly to 'msvisualcpp' and 'msvcmsys' as MSVC does not
-       support the -o option.
-
-2010-10-03  Ralf Wildenhues  <address@hidden>
-
-       tests: fix ar-lib.test for echo that interprets backslashes.
-       * tests/ar-lib.test: Use printf instead of echo.  Avoid test -a.
-       More robust quoting.
-
-2010-09-21  Peter Rosin  <address@hidden>
-
-       compile: implement library search to support MSVC static linking
-       * lib/compile (func_cl_wrapper): Implement library search and
-       -static option so that the user can select whether to prefer
-       dll import libraries or static libraries.  This enables MSVC to
-       link against dlls generated by libtool without requiring libtool
-       or workarounds such as -lfoo.dll etc.  Makes the tests/static.at
-       test case in libtool pass.
-       * tests/compile3.test: Don't trip up if there happens to exist
-       a "foo" library in the library search path.
-       * tests/compile6.test: New test, verifying the library search.
-       * tests/Makefile.am (TESTS): Update.
-
-2010-09-02  Peter Rosin  <address@hidden>
-
-       Make ar-lib support backslashed files in archives.
-       * lib/ar-lib: If an archive member contains a backslash, make sure
-       it is escaped when the archive member is extracted.
-       * tests/ar-lib.test: Test the above.
-
-2010-08-31  Peter Rosin  <address@hidden>
-
-       Do file name conversion for object files in the compile wrapper.
-       * lib/compile (func_cl_wrapper): Do file name conversion for object
-       files (i.e. extensions .obj, .OBJ, .o and .O) if needed.
-       * tests/compile4.test: Test the above.
-
-2010-08-16  Peter Rosin  <address@hidden>
-
-       Optimize compile script on MSYS.
-       * lib/compile (func_file_conv): Add new argument 'lazy' which
-       takes an optional list of conversion types where the requested
-       conversion isn't needed.
-       (func_cl_wrapper): Take advantage of the above for cases where
-       MSYS is doing the conversion for us.
-       Suggested by Ralf Wildenhues.
-
-2010-08-16  Peter Rosin  <address@hidden>
-
-       Support more C++ file extensions for MSVC in the compile script.
-       * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
-       file extension as C++, unless it's given a hint. So hint about
-       .cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on
-       .c, .cpp, .CPP, .lib, .LIB and .Lib files.
-       * tests/compile3.test: Test the C++ hinting.
-
-2010-08-12  Peter Rosin  <address@hidden>
-
-       Enable the use of "link -lib" as the wrapped archiver.
-       * lib/ar-lib: Enable the use of "link -lib" as the wrapped
-       archiver, as well as allowing some other options to be passed
-       through to the wrapped archiver.
-       * tests/ar-lib.test: Test the above.
-
-2010-08-06  Peter Rosin  <address@hidden>
-
-       Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
-       * lib/ar-lib: New auxiliary script.
-       * lib/Makefile.am: Add above.
-       * tests/ar-lib.test: New test.
-       * tests/Makefile.am: Add above.
-       * automake.in (@common_files): Distribute the 'ar-lib' script.
-       * doc/automake.texi (Auxiliary Programs): Mention the new
-       'ar-lib' script.
-       (Optional): Mention 'ar-lib' in AC_CONFIG_AUX_DIR.
-       * NEWS: Update.
-
-2010-08-07  Ralf Wildenhues  <address@hidden>
-
-       Fix shell pattern negation in compile script.
-       * lib/compile (func_file_conv): Use `!' not `^' for pattern
-       negation.
-
-2010-08-01  Peter Rosin  <address@hidden>
-
-       Wrap some MSVC options in the compile script.
-       * lib/compile: MSVC supports naming the output file, the option
-       is just not called -o, so transform -o into the appropriate form
-       for MSVC. Also wrap some other options while at it (-L, -l, -Wl,
-       -Xlinker and -I) and convert file names to windows form where
-       needed for those options to make MSVC more usable in an
-       autotooled environment.
-       * doc/automake.texi (Auxiliary Programs): Document the above
-       extension of the compile script.
-       * NEWS: Updated.
-       * tests/defs.in: New required entry 'cl'.
-       * tests/compile3.test: New test.
-       * tests/compile4.test: New test.
-       * tests/compile5.test: New test.
-       * tests/Makefile.am: Update.
-
-2010-07-31  Ralf Wildenhues  <address@hidden>
-
-       Add example git work flow; discuss merge --log in HACKING.
-       * HACKING: Update.
-       Suggestion by Stefano Lattarini.
-
-       Add more hints for debugging make rules.
-       * doc/automake.texi (Debugging Make Rules): Show command to find
-       out expanded values of variables; point to makefile debugger.
-       * THANKS: Update.
-       Prompted by suggestion from Ludovic Courtès and Andy Wingo.
-
-2010-07-27  Patrick Welche  <address@hidden>  (tiny change)
-
-       Fix typo in the manual.
-       * doc/automake.texi (Scripts): Fix typo.
-
-2010-07-27  Ralf Wildenhues  <address@hidden>
-
-       Document current policy for development with git.
-       * HACKING (Working with git): Overhaul.
-       Prompted by suggestion from Stefano Lattarini.
-
-       Fix AM_COND_IF for gone-invalid condition shell expression.
-       * m4/cond-if.m4 (AM_COND_IF): test contents of $COND_TRUE
-       variable, rather than re-evaluating the shell expression for
-       the condition.
-       * tests/cond40.test: Extend test.
-       * NEWS: Update.
-
-       Avoid syntax error if IF-TRUE part of AM_COND_IF expands empty.
-       * m4/cond-if.m4 (AM_COND_IF): Ensure IF-TRUE part is never empty
-       to avoid shell syntax error if the m4 expansion is empty.
-       * tests/cond40.test: Enhance test.
-
-       Coverage: bogus option to AM_INIT_AUTOMAKE.
-       * tests/init2.test: New test.
-       * tests/Makefile.am: Update.
-
-2010-07-21  Stefano Lattarini  <address@hidden>
-
-       Modernize and improve test scripts `subdir*.test'.
-       * tests/subdir.test: Enable `errexit' shell flag, and related
-       changes.  Use the `configure.in' stub created by `./defs',
-       rather than writing one from scratch.
-       * tests/subdir2.test: Likewise.
-       * tests/subdir4.test: Likewise.
-       * tests/subdir3.test: Enable `errexit' shell flag, and related
-       changes.  Do not create useless dummy source files.
-       * tests/subdir5.test: Make grepping of Makefile.in (in topdir
-       and in subdirs) stricter.  Some minor changes to keep it more
-       in sync with the related test `subdir8.test'.
-       * tests/subdir8.test: Likewise (but with the related test being
-       `subdir5.test' here).
-       * tests/subdir6.test: Cosmetic change in spacing.
-       * tests/subdir9.test: Define and use new variable `$distdir'.  Add
-       trailing `:' command.
-       * tests/subdir10.test: Cosmetic consistency-related change.
-       * tests/subdirbuiltsources.test: Cosmetic changes in spacings.
-       (configure.in): Use stub created by `./defs', rather than writing
-       it from scratch.  Do not use obsoleted and/or deprecated forms of
-       autoconf/automake macros.
-
-       Modernize and improve test scripts `dist*.test'.
-       * tests/distcleancheck.test: Do not add useless `-e' option to
-       a $MAKE call.  Extend test by grepping stderr of make.
-       * tests/distcom2.test: Do not run the same test script on the
-       Makefile.in twice, but save its output in an intermediate file
-       instead.  Make grepping of DIST_COMMON definition stricter.
-       Display the content of more files, to ease debugging.  Add a
-       trailing `:' command.  Improved heading comments w.r.t. sister
-       test(s).
-       * tests/distcom6.test: Likewise, and avoid to uselessly run
-       autoconf.
-       * tests/distcom3.test: Ensure verbose printing of captured stdout
-       and stderr.  Make grepping of captured stderr stricter.  Also,
-       add trailing `:' command.
-       * tests/distcom4.test: Declare the target `test' in the generated
-       Makefile.am as `.PHONY'.  Display content of more files, to ease
-       debugging.  Add trailing `:' command.
-       * tests/distcom5.test: Likewise.  Also, factor out common sed
-       script in subroutine `extract_distcommon'.
-       * tests/distcom7.test: Prefer cat + here-doc over echo to write
-       test Makefile.am files.  Add a trailing `:' command.
-       * tests/distname.test: Prefer `gzip -d' over `gunzip'.  Move the
-       call to `set -e' earlier.  Be stricter and more verbose in the
-       checking of the generated tarball.
-       (configure.in): Use the stub provided by ./defs, instead of
-       writing it from scratch.  Avoid obsoleted constructs.  Remove
-       useless call to `AM_PROG_CC_C_O'.
-       * tests/distdir.test: Various minor improvements/normalizations.
-       * tests/distlinks.test: Likewise.
-
-2010-07-18  Stefano Lattarini  <address@hidden>
-
-       Improve and extend test cond5.test.
-       * tests/cond5.test: Do not blindly sleep 60 seconds before polling
-       the background automake process, but poll it every 10 seconds for
-       at most 30 times (this makes the test both faster on good machines,
-       and more resilient to spurious timeout-due failures when in low
-       priority or on heavily-loaded systems).
-       Check also that automake writes the expected error messages on the
-       standard error.
-       Enable `errexit' flag, and related changes.
-       Rely on the `configure.in' stub created by `./defs', rather than
-       writing one from scratch.
-
-2010-06-26  Ralf Wildenhues  <address@hidden>
-
-       Update program --help output to match current GCS.
-       * configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
-       is not defined, for compatibility to Autoconf < 2.64.
-       * Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
-       PACKAGE_URL.
-       (sc_diff_automake_in_automake): Update number of diff lines for
-       additional substitutions.
-       * aclocal.in (usage): Use PACKAGE_BUGREPORT.  Point to Automake
-       home page and GNU general help page.
-       * automake.in (usage): Likewise.
-       * doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
-       address.
-       (Introduction, Creating amhello, amhello Explained, Options):
-       Use it throughout.
-       * lib/Automake/Makefile.am (do_subst): Substitute
-       PACKAGE_BUGREPORT.
-       * lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
-       * lib/Automake/ChannelDefs.pm: Use it for footer of fatal
-       messages.
-
-       Clean up @var handling in the manual.
-       * doc/automake.texi: Throughout the manual, lower-case @var
-       names, replace a few one-character names.
-
-2010-06-26  Stefano Lattarini  <address@hidden>
-
-       Fix typo-related bug in test script silent5.test.
-       * tests/silent5.test: Use $EGREP, not $GREP (which is not even
-       defined).
-
-       Tests: remove useless repetitions of `foreign' automake option.
-       * tests/multlib.test (configure.in): Remove useless use of
-       `foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
-       already in $AUTOMAKE by default, so no point in repeating it).
-       * tests/subobj10.test: Likewise.
-       * tests/subobj9.test: Likewise.
-       * tests/lex3.test (Makefile.am): Similarly, remove useless use
-       of `foreign' option in AUTOMAKE_OPTIONS.
-       * tests/lex5.test: Likewise.
-       * tests/pr279.test: Likewise.
-       * tests/pr279-2.test: Likewise.
-       * tests/specflg3.test: Likewise.
-       * tests/target-cflags.test: Likewise.
-
-       Drop useless requirement "gzip" in lex5.test.
-       * tests/lex5.test ($required): Do not list "gzip", as it's
-       never used.
-
-2010-06-24  Stefano Lattarini  <address@hidden>
-
-       Fix bugs in test script silent5.test.
-       * tests/silent5.test: Fixed a nasty bug (due to the use of grep
-       instead of egrep) that could have led to false negatives.
-
-2010-06-21  Stefano Lattarini  <address@hidden>
-
-       Add a test checking that distributed broken symlinks cause
-       `make dist' to fail.
-       * tests/distlinksbrk.test: New test.
-       * tests/Makefile.am (TESTS): Updated.
-
-2010-06-21  Ralf Wildenhues  <address@hidden>
-
-       Fix minor testsuite issues, update docs, for Yacc/Lex changes.
-       * doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
-       and AM_LFLAGS, LFLAGS in the order in which they now appear in
-       the rules.
-       * NEWS: Update.
-       * tests/lflags.test, tests/lflags2.test, tests/yflags.test,
-       tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
-       please maintainer-check.  Ensure generated C files contain a
-       declaration, to please compilers.
-
-2010-06-21  Stefano Lattarini  <address@hidden>
-
-       Fix bugs in Automake Yacc/Lex support w.r.t. $(AM_FLAGS) and
-       $(FLAGS) precedence.
-       * automake.in: Fix registration of languages "Lex", "Lex (C++)",
-       "Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
-       $(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
-       * tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
-       * NEWS: Updated.
-
-       New tests, exposing bugs in Automake Yacc/Lex support w.r.t.
-       $(AM_FLAGS) and $(FLAGS) precedence.
-       * tests/lflags.test: New test, check that user $(LFLAGS) takes
-       precedence over automake (AM_LFLAGS) and (foo_LFLAGS).  Still
-       xfailing.
-       * tests/lflags2.test: Likewise.
-       * tests/yflags.test: New test, check that user $(YFLAGS) takes
-       precedence over automake (AM_YFLAGS) and (foo_YFLAGS).  Still
-       xfailing.
-       * tests/yflags2.test: Likewise.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
-
-2010-06-20  Stefano Lattarini  <address@hidden>
-
-       Modernize, improve and extend tests `suffix*.test'.
-       * tests/suffix3.test: Enable `errexit' shell flag, and related
-       changes.
-       * tests/suffix4.test: Likewise.
-       * tests/suffix6.test: Likewise, and do not create a useless dummy
-       source file.
-       * tests/suffix7.test: Likewise.
-       * tests/suffix5.test: Enable `errexit' shell flag, and related
-       changes.  Make grepping of Makefile.in slightly stricter.
-       * tests/suffix.test: Enable `errexit' shell flag, and related
-       changes.  Also, do not redirect grep output to /dev/null, as this
-       might unmotivatedly hide useful information.
-       * tests/suffix2.test: Move setting of `errexit' shell flag earlier
-       in the script (just after inclusion of ./defs).  Use a more
-       idiomatic way to count text occurrences in Makefile.in with
-       grep.  Do not create useless dummy source files.
-       * tests/suffix10.test: Ensure verbose printing of captured make
-       stdout.  Minor cosmetic changes.
-       * tests/suffix8.test: Likewise.  Also, drop useless call to the
-       env(1) utility, and make grepping of make output stricter by using
-       $FGREP rather than plain grep.
-       * tests/suffix11.test: Likewise.
-       * tests/suffix12.test: Likewise.
-       * tests/suffix9.test: Prefer cat + here-doc over echo to append to
-       the `configure.in' stub.  Cosmetic changes.
-       * tests/suffix13.test: Cosmetic spacing change.
-
-2010-06-13  Stefano Lattarini  <address@hidden>
-
-       Add useful comment in test script ext.test.
-       * tests/ext.test: Add a comment explaining why an apparently
-       useless `if' statement is indeed required.
-
-       Add useful comment in test script obsolete.test.
-       * tests/obsolete.test: Add a comment explaining why we need
-       an indirection in adding $AUTOUPDATE to $required.
-
-       Normalize whitespaces in 'tests/Makefile.am'.
-       * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
-       definition of this variable.
-
-2010-06-12  Ralf Wildenhues  <address@hidden>
-
-       Remove a couple of unneeded conditionals from tests.
-       * tests/pr243.test, tests/pr266.test, tests/strip.test: No need
-       for the FOOTEST conditional.
-
-2010-06-12  Stefano Lattarini  <address@hidden>
-
-       Modernize, improve and/or fix various test scripts.
-       * tests/symlink3.test: Deleted, separated into two new, more
-       complete tests ...
-       * tests/forcemiss.test: ... this one ...
-       * tests/forcemiss2.test: ... and this one.
-       * tests/symlink2.test: Enable `errexit' shell flag, make test
-       stricter, and skip it if symlink creation is not supported.
-       * tests/postproc.test: Enable `errexit' shell flag, related
-       changes, and a couple of unrelated cosmetic changes.
-       * tests/recurs.test: Use the `configure.in' stub created by
-       `./defs', rather than writing one from scratch.  Make grepping
-       of Automake stderr slightly stricter.
-       * tests/substtarg.test: Likewise.
-       * tests/strip.test: Likewise, and move the call to `set -e'
-       earlier (just after the inclusion of `./defs'). Also, make sure
-       that the script installed by `make install-script' is equal to
-       the original one.
-       * tests/substref.test: Use the `configure.in' stub created by
-       `./defs', rather than writing one from scratch.  Move the call
-       to `set -e' earlier (just after the inclusion of `./defs').
-       Avoid to explicitly export CC for configure (that's already done
-       in ./defs).  Avoid potential problems with unpredictable make
-       output.  Finally, make grepping of Makefile.in stricter.
-       * tests/substre2.test: Ensure verbose printing of the captured
-       make's output, and make its grepping slightly stricter.
-       * tests/cygwin32.test: Enable `errexit' shell flag, and related
-       changes.  Also, do not create useless dummy source/data files.
-       * tests/scripts.test: Likewise.
-       * tests/recurs2.test: Likewise.  Also, use the `configure.in'
-       stub created by `./defs'.
-       * tests/Makefile.am (TESTS): Updated.
-
-       Modernize, improve and/or fix tests `pluseq*.test.
-       * tests/pluseq5.test: Append to configure.in using cat with an
-       here-doc, not using echo.
-       * tests/pluseq10.test: Make sure that the captured output of
-       `make' command is always displayed. Where possible, use $FGREP
-       instead of grep (this change makes some checks slightly stricter).
-       * tests/pluseq8.test: Enable `errexit' shell flag, with related
-       changes.
-       * tests/pluseq.test: Likewise.  Also, do not create useless dummy
-       data files, and use better m4 quoting in generated configure.in.
-       * tests/pluseq2.test: Likewise.  Also, append to configure.in
-       using cat with an here-doc, not using echo.
-       * tests/pluseq3.test: Likewise.
-       * tests/pluseq4.test: Likewise.
-       * tests/pluseq6.test: Likewise.
-       * tests/pluseq7.test: Do not create useless dummy source file.
-       * tests/pluseq9.test: Slightly extended w.r.t. the grepping of
-       Automake stderr.  Some unrelated cosmetic changes.
-
-       Testsuite: ensure verbose printing of captured stderr.
-       * tests/acloca18.test: Print captured stderr before either failing
-       or grepping it.  Be sure to send captured stderr to stderr, not to
-       stdout.
-       * tests/ansi3b.test: Likewise.
-       * tests/cond39.test: Likewise.
-       * tests/configure.test: Likewise.
-       * tests/missing3.test: Likewise.
-       * tests/missing6.test: Likewise.
-       * tests/output-order.test: Likewise.
-       * tests/pr300-ltlib.test: Likewise.
-       * tests/python6.test: Likewise.
-       * tests/python7.test: Likewise.
-       * tests/python8.test: Likewise.
-       * tests/python9.test: Likewise.
-       * tests/subobj.test: Likewise.
-       * tests/vars3.test: Likewise.
-       * tests/missing4.test: Likewise, and fix a call to grep not to use
-       the `-c' flag.
-       * tests/ansi3.test: Likewise, and rely on the `configure.in' stub
-       created by `./defs', rather than writing one from scratch.
-
-       Enable `errexit' shell flag in various tests.
-       * tests/backsl.test: Enable the `errexit' shell flag, and
-       related changes.
-       * tests/backsl2.test: Likewise.
-       * tests/block.test: Likewise.
-       * tests/canon2.test: Likewise.
-       * tests/canon4.test: Likewise.
-       * tests/comment2.test: Likewise.
-       * tests/condlib.test: Likewise.
-       * tests/cond15.test: Likewise, and prefer $FGREP over grep.
-       * tests/canon3.test: Likewise.  Also, avoid to create an useless
-       dummy source file.
-       * tests/acoutpt2.test: Enable the `errexit' shell flag, and some
-       related changes.  Do some cosmetic improvements in the generated
-       `configure.in' file.
-       * tests/cond4.test: Likewise.
-       * tests/cond14.test: Likewise.
-       * tests/condinc.test: Likewise.
-       * tests/cond7.test: Likewise.  Also, remove useless setting of
-       AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am.
-       * tests/ansi.test: Enable the `errexit' shell flag, and related
-       changes.  Extended, esp. by running autoconf, ./configure and
-       make, and by looking into the distdir.
-
-2010-06-12  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Extend tests/README w.r.t. trailing `:' in test scripts.
-       * tests/README (section "Writing test cases" subsection "Do"):
-       Explain why apparently redundant trailing `:' and `Exit 0' in
-       test scripts can indeed be useful.
-
-2010-06-11  Stefano Lattarini  <address@hidden>
-
-       Improve determination of PATH separator in bootstrap script.
-       * bootstrap: Determine what the PATH separator is the same way
-       autoconf does.
-
-       Minor improvements in bootstrap script.
-       * bootstrap: Consistently use two-spaces indentation.  Cosmetic
-       improvement to comments.
-       ($me): New variable, containing program basename.
-       Prepend it to all error messages.
-
-       Testsuite now works with BSD make in parallel mode.
-       * tests/defs.in: Unset variables __MKLVL__ and MAKE_JOBS_FIFO,
-       which are exported by BSD make when run in parallel mode, and
-       which can confuse make processes spawned by our testsuite.
-       This change fixes a lot of spurious failure when the testsuite
-       is run with BSD make in parallel mode.
-
-2010-06-09  Stefano Lattarini  <address@hidden>
-
-       Modernize, improve and/or fix various test scripts.
-       * tests/sanity.test: Rely on the `configure.in' stub created by
-       `./defs', rather than writing one from scratch.
-       * tests/depend2.test: Likewise.  Also, call `set -e' just after
-       the inclusion of `./defs', instead that later in the script.
-       * tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
-       $AUTOMAKE, and improve the positioning of an $ACLOCAL call.
-       * tests/exeext4.test: Use $FGREP instead of grep, where possible.
-       Make auxiliary rules in the generated Makefile more silent.
-       These changes make some checks slightly stricter.
-       * tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
-       * tests/gettext2.test: Place final `:' at the end of the script,
-       rather than in the middle.
-       * tests/exeext.test: Call `set -e' just after the inclusion of
-       `./defs', instead that later in the script.
-       * tests/extra5.test: Likewise.
-       * tests/confdeps.test: Likewise.  Also, prefer `mv -f' over
-       plain `mv', just to be sure.
-       * tests/depcomp.test: Enable `errexit' shell flag, with related
-       changes.  Also, modernize the generated configure.in.
-       * tests/cond9.test: Likewise.  Also, rely on the `configure.in'
-       stub created by `./defs', rather than writing one from scratch.
-       * tests/cond10.test: Likewise.
-       * tests/depcomp2.test: Likewise.
-       * tests/depend3.test: Likewise.
-       * tests/distcom7.test: Likewise.
-       * tests/fortdep.test: Likewise.  Also, remove definition of
-       AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
-       since that flag is already provided by $AUTOMAKE.
-       * tests/mdate.test: Made stricter, by checking that Automake
-       actually failed, and by making a stricter grep on the error
-       message.  Also, set shell `errexit flag'.
-       * tests/python2.test: Improved verbose messages.
-
-       Make test `ammissing.test' stricter.
-       * tests/ammissing.test: Fail if $ACLOCAL succeeds unexpectedly.
-       Enable `errexit' shell flag.
-
-2010-06-08  Stefano Lattarini  <address@hidden>
-
-       Enable `errexit' shell flag in some test scripts.
-       * tests/subcond.test: Enabled `errexit' shell flag, and related
-       minor changes.
-       * tests/subst.test: Likewise.
-       * tests/vars.test: Likewise.
-       * tests/version4.test: Likewise.
-       * tests/vpath.test: Likewise.
-       * tests/vtexi2.test: Likewise.
-       * tests/werror.test: Likewise.
-       * tests/whoami.test: Likewise.
-       * tests/tags.test: Likewise, and avoid to crate an useless dummy
-       header file.
-       * tests/acsilent.test: Likewise, and don't use an easily-avoided
-       command substitution.
-       * tests/unused.test: Likewise, and don't use an easily-avoided
-       command substitution.
-       * tests/version.test: Likewise, and avoid deprecated constructs
-       in the generated `configure.in'.
-       * tests/version2.test: Likewise, and avoid deprecated constructs
-       in the generated `configure.in'.
-
-2010-06-06  Ralf Wildenhues  <address@hidden>
-
-       Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
-       * tests/ldadd.test: Enable errexit.  Use AUTOMAKE_fails so
-       the verbose log contains all output.
-       * tests/mdate.test: Likewise.
-       Prompted by Stefano Lattarini's change to discover.test.
-
-2010-06-06  Stefano Lattarini  <address@hidden>
-
-       Improve tests link*.test (enable `errexit' shell flag).
-       * tests/link_c_cxx.test: Enable `errexit shell flag, and related
-       changes.  Also, do not create useless source files.
-       * tests/link_dist.test: Likewise.
-       * tests/link_f90_only.test: Likewise.
-       * tests/link_f_only.test: Likewise.
-       * tests/link_fc.test: Likewise.
-       * tests/link_fccxx.test: Likewise.
-       * tests/link_fcxx.test: Likewise.
-
-2010-06-06  Ralf Wildenhues  <address@hidden>
-
-       Improve ext.test semantics, avoid OpenBSD sh errexit issue.
-       * tests/ext.test: Inside shell compound command, use
-       `if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to
-       fix failure with OpenBSD sh introduced with last patch.
-       Actually ensure that a rule for .EXT.o is created for each
-       known extension EXT.
-
-2010-06-06  Stefano Lattarini  <address@hidden>
-
-       Enable `errexit' shell flag in some test scripts.
-       * tests/dash.test: Enable `errexit' shell flag, and related
-       changes.
-       * tests/defun.test: Likewise.
-       * tests/defun2.test: Likewise.
-       * tests/dejagnu.test: Likewise.
-       * tests/double.test: Likewise.
-       * tests/distcom2.test: Likewise.
-       * tests/empty2.test: Likewise.
-       * tests/empty3.test: Likewise.
-       * tests/empty4.test: Likewise.
-       * tests/exdir.test: Likewise.
-       * tests/ext.test: Likewise.
-       * tests/extra.test: Likewise.
-       * tests/extra2.test: Likewise.
-       * tests/extra3.test: Likewise.
-       * tests/extra4.test: Likewise.
-       * tests/flibs.test: Likewise.
-       * tests/fnoc.test: Likewise.
-       * tests/fo.test: Likewise.
-       * tests/instexec.test: Likewise.
-       * tests/ltdeps.test: Likewise.
-       * tests/nodep.test: Likewise.
-       * tests/nodepcomp.test: Likewise.
-       * tests/f90only.test: Likewise, and remove botched/obsoleted
-       comments and unnecessary commands.
-       * tests/fonly.test: Likewise, and remove botched/obsoleted
-       comments and unnecessary commands.
-       * tests/discover.test: Likewise, and made stricter.
-
-       Enable `errexit' shell flag in all tests cxx*.test.
-       * tests/cxx.test: Enabled `errexit' shell flag, and related
-       minor changes.
-       * tests/cxxansi.test: Likewise.
-       * tests/cxxcpp.test: Likewise.
-       * tests/cxxlibobj.test: Likewise.
-       * tests/cxxlink.test: Likewise.
-       * tests/cxxo.test: Likewise.
-
-       Enable `errexit' shell flag in various tests.
-       * tests/acoutnoq.test: Enabled `errexit' shell flag, and related
-       minor changes.
-       * tests/acoutpt.test: Likewise.
-       * tests/acoutqnl.test: Likewise.
-       * tests/amassign.test: Likewise.
-       * tests/ansi2.test: Likewise.
-       * tests/ansi4.test: Likewise.
-       * tests/badprog.test: Likewise.
-       * tests/checkall.test: Likewise.
-       * tests/clean.test: Likewise.
-       * tests/colneq2.test: Likewise.
-       * tests/colon.test: Likewise.
-       * tests/colon5.test: Likewise.
-       * tests/colon6.test: Likewise.
-       * tests/comment.test: Likewise.
-       * tests/compile_f90_c_cxx.test: Likewise.
-       * tests/compile_f_c_cxx.test: Likewise.
-       * tests/cond3.test: Likewise.
-       * tests/cond6.test: Likewise.
-       * tests/cond13.test: Likewise.
-       * tests/conf2.test: Likewise.
-       * tests/confvar.test: Likewise.
-       * tests/confvar2.test: Likewise.
-       * tests/cond8.test: Likewise, plus a cosmetic change.
-       * tests/confh4.test: Likewise.  Also, add in the heading comments
-       an excerpt from the original bug report which motivated the
-       creation of this test, to make its purpose clearer.
-
-2010-06-06  Ralf Wildenhues  <address@hidden>
-
-       Rewrite manual to be gender-neutral.
-       * doc/automake.texi (GNU Build System)
-       (Standard Directory Variables, General Operation, CVS)
-       (Hard-Coded Install Paths, Dependencies As Side Effects):
-       Rewrite text to not contain gender-specific pronouns when
-       speaking about developers or users, either by avoiding pronouns
-       or by addressing them as `you' instead.
-       * THANKS: Update.
-       Report by Christina Gratorp.
-
-       * AUTHORS: Update.
-
-2010-06-06  Stefano Lattarini  <address@hidden>
-
-       Make tests on user extensibility of silent-rules mode stricter.
-       * tests/silent6.test: Made stricter w.r.t. the grepping of the
-       output produced by `make'.
-       * tests/silent7.test: Likewise.
-
-       Tests on silent-mode for C/Libtool made stricter.
-       * tests/silent.test: Made stricter w.r.t. the grepping of the
-       output produced by `make'.
-       * tests/silent2.test: Likewise.
-       * tests/silent4.test: Likewise.
-       * tests/silent9.test: Likewise.
-       * tests/silent3.test: Likewise, and add a final `make distclean'
-       command to keep it better in sync with tests/silent{4,9}.test.
-
-       Improved test silent5.test.
-       * tests/silent5.test: Remove by hand all generated C files after
-       non-verbose builds, to ensure the following builds are clean.
-       Try to clean and rebuild with the same verbosity and without
-       removing generated sources in between, to check that this does
-       not trigger a different set of rules.  Make grepping of make's
-       output stricter.  Improved/added some comments.
-
-       New tests for Automake silent-mode with Fortran.
-       * tests/silentf77.test: New test.
-       * tests/silentf90.test: Likewise.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-
-       New test `silentcxx.test' (Automake silent-mode with C++).
-       * tests/silentcxx.test: New test.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-
-       New test `silentyacc.test' (Automake silent-mode with Yacc).
-       * tests/silentyacc.test: New test.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-
-       New test `silentlex.test' (Automake silent-mode with Lex).
-       * tests/silentlex.test: New test.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-
-       Relax tests on silent-rules to cater to overly verbose makes.
-       * tests/silent.test: When testing silent builds, don't fail if
-       make's output simply contains the `mv' substring, but only if
-       it contains the `mv ' substring (note the trailing space).
-       * tests/silent2.test: Likewise.
-       * tests/silent3.test: Likewise.
-       * tests/silent4.test: Likewise.
-       * tests/silent5.test: Likewise.
-       * tests/silent9.test: Likewise.
-
-2010-01-24  Ralf Wildenhues  <address@hidden>
-
-       Fix silent-rules output for disabled dependency tracking.
-       * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
-       expansion code to also work in the case where %AMDEP% expands
-       to FALSE at config.status time, using new substitution string
-       %VERBOSE-NODEP%.
-       * automake.in (verbose_nodep_flag): New function, appending
-       address@hidden@' to the verbose-variable name.
-       (handle_languages): If dependencies are not disabled, use it to
-       set %VERBOSE-NODEP%.
-       * m4/depend.m4: Substitute am__nodep as '_no', so the second
-       verbose-variable will always expand to an empty string, if
-       dependencies are enabled.
-       * tests/silent5.test: Also test --disable-dependency-tracking;
-       also test per-target flags for non-C language files.
-       * tests/silent9.test: New test, like silent4.test but disable
-       dependency tracking.
-       * tests/Makefile.am: Adjust.
-       * NEWS, THANKS: Update.
-       Report by Dmitry V. Levin <address@hidden>.
-
-2010-05-23  Stefano Lattarini  <address@hidden>
-
-       Extend test on `nostdinc' automake option.
-       * tests/nostdinc.test: Enable `errexit' shell flag.  Related and
-       unrelated minor changes.  Make the grepping of the generated
-       Makefile.in slightly stricter.  Generate and run configure, so that
-       the generated Makefile can be grepped too.
-
-2010-05-23  Ralf Wildenhues  <address@hidden>
-
-       Make gnupload portable to EBCDIC hosts.
-       * lib/gnupload: Use literal newline as argument for 'tr' rather
-       than \015, for EBCDIC hosts.  Also, avoid unportable nested
-       double-quotes and backquotes.
-       * THANKS: Update.
-       Report from Eric Blake and Steve Goetze via gnulib.
-
-2010-05-23  Stefano Lattarini  <address@hidden>
-
-       Fix Autoconf version required by Automake's configure.
-       Automake configure script used to tell that automake required
-       autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
-       and if that was not found, it gave an error saying that Automake
-       required configure 2.61a-341 or later.  This change should
-       eliminate such inconsistencies.
-       * configure.ac ($required_autoconf_version): New variable.
-       Use it throughout.
-
-2010-05-23  Ralf Wildenhues  <address@hidden>
-
-       Fix unportable sed script in maintainer-check test.
-       * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
-       not contain semicolon after 'b' or brace commands, for NetBSD.
-
-       Wildcards are not portable to NetBSD make.
-       * doc/automake.texi (Wildcards): Document portability issue.
-       * tests/extra10.test, tests/extra11.test, tests/extra12.test:
-       Require GNU make.
-
-2010-05-23  Stefano Lattarini  <address@hidden>
-
-       Make test for configure.in vs. configure.ac stricter.
-       * tests/configure.test: Use a configure.in file that provokes
-       an automake error, to ensure configure.ac is preferred.
-
-       Avoid possible false negatives in dejagnu7.test.
-       * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
-       unportable use of fgrep option `-e'.
-
-       Fix conflnk3.test to work with Solaris/Heirloom Sh.
-       * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
-       instead of respectively `test -e FILE' and `test ! -e FILE',
-       since Solaris Sh doesn't grok the latter.  Do not SKIP the test
-       if the shell doesn't support `test -e'.
-
-2010-04-25  Ralf Wildenhues  <address@hidden>
-
-       Fix typo in manual.
-       * doc/automake.texi (Simple Tests using parallel-tests): Add
-       missing closing parenthesis.
-
-       Fix leftover call to removed function macros_dump.
-       * automake.in (read_main_am_file): Call variables_dump, not
-       macros_dump.  Print actual error before list of variables.
-
-2010-04-25  Stefano Lattarini  <address@hidden>
-
-       Minor improvements in comments of test `silent3.test'.
-       * tests/silent3.test: Tell to keep it in sync with `silent9.test'
-       too.
-
-2010-04-25  Ralf Wildenhues  <address@hidden>
-
-       testsuite: ensure verbose printing of captured output.
-       * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
-       tests/fort2.test, tests/help.test, tests/missing3.test,
-       tests/missing6.test: Print captured stdout or stderr before
-       grepping it.
-
-2010-04-20  Stefano Lattarini  <address@hidden>
-
-       Make test badopt.test stricter (by enabling `set -e').
-       * tests/badopt.test: Add call to `set -e'.  Due to this change,
-       an unexpected failure in the call to `$ACLOCAL' (whose outcome
-       was previously unchecked) would cause the whole test to fail.
-       Also, bumped the copyright years.
-
-       Make test for configure.in vs. configure.ac stricter.
-       * tests/configure.test: Use a configure.in file that provokes
-       an automake error, to ensure configure.ac is preferred.
-
-       Use `set -e' in confsub.test (avoids possible false negatives).
-       * tests/confsub.test: Enable shell `errexit' flag, and related
-       changes (this helps avoiding some possible minor false negatives).
-       Also, bumped copyright years.
-
-2010-04-20  Ralf Wildenhues  <address@hidden>
-
-       Fix -Werror handling for presence of configure.in and configure.ac.
-       * lib/Automake/Variable.pm (Automake::Variable): Do not initialize
-       $configure_ac at the global level, before command-line arguments
-       have been parsed.
-       (require_variables): Initialize it here.
-       * tests/configure.test: New test.
-       * tests/Makefile.am: Update.
-       Report by Stefano Lattarini.
-
-2010-04-20  Stefano Lattarini  <address@hidden>
-
-       Avoid possible false negatives in confh5.test.
-       * tests/confh5.test: Enable shell `errexit' flag, and bumped
-       copyright years.  Due to this change, any unexpected failure
-       in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
-       a failure in grepping expected text in output files should now
-       cause the whole test to fail.
-
-2010-04-17  Stefano Lattarini  <address@hidden>
-
-       Fixed typo in POD documentation of Automake::Channels.
-       * lib/Automake/Channels.pm: Fixed typo in POD documentation:
-       @<...> was used instead of C<...>.
-
-2010-04-14  Stefano Lattarini  <address@hidden>
-
-       Refactor tests on Automake TESTS color output.
-       * tests/color.test: Tests using the expect program moved out to...
-       * tests/color2.test: ... this new file.
-       * tests/Makefile.am (TESTS): Extended accordingly.
-
-2010-04-12  Stefano Lattarini  <address@hidden>
-
-       Fix typos in comments in test confh5.test
-       * tests/confh5.test: Fix a couple of typos in comments.
-
-       Avoid possible false negatives in canon-name.test.
-       * tests/canon-name.test: Enable shell `errexit' flag.  Improve
-       test description.
-
-2010-04-11  Ralf Wildenhues  <address@hidden>
-
-       Fix per-Makefile.am setting of -Werror.
-       Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
-       Makefile.am would carry over to other Makefile.am files
-       treated afterwards by the same thread, causing inconsistent
-       and unstable exit status values.
-       * lib/Automake/Channels.pm (dup_channel_setup)
-       (drop_channel_setup): Save and restore the setting of
-       $warnings_are_errors.
-       * tests/werror3.test: New test.
-       * tests/Makefile.am: Adjust.
-       * NEWS: Update.
-
-2010-04-11  Stefano Lattarini  <address@hidden>
-
-       Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
-       * tests/confh5.test: In the generated Makefile.am: do not use
-       `test ! -e FILE' to check for the non-existence of a file, since
-       that is not supported by Solaris/Heirloom Sh.
-
-       Make test `aclocal3.test' stricter.
-       * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
-       succeds unexpectedly.
-
-       Add tests checking that symlinks are resolved by `make dist'.
-       * tests/distlinks.test: New test.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-       Suggested by observations from Ralf Wildenhues.
-
-2010-04-11  Ralf Wildenhues  <address@hidden>
-
-       Use -9 for maximum xz compression with dist-xz.
-       * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
-       * NEWS, THANKS: Update.
-       Report by Pavel Sanda.
-
-2010-03-30  Stefano Lattarini  <address@hidden>
-
-       Avoid an unportable use of `$status' shell variable.
-       * Makefile.am (path-check): Don't use the `$status' shell variable
-       in the target's rules, as it's special in Zsh (equivalent to `$?',
-       and readonly).
-
-       Avoid another use of `chmod -R'.
-       * Makefile.am (path-check): To be safe, do not use `chmod -R' on
-       $(distdir) before removing it (as Solaris `chmod -R' touches
-       symlink targets).  Instead, use the cleanup strategy used in
-       distdir.am.
-
-2010-03-28  Ralf Wildenhues  <address@hidden>
-
-       Remove uses of @acronym and @sc.
-       * doc/automake.texi (Public Macros, Limitations on File Names):
-       Remove all usage of @acronym and @sc in the manual.
-       Suggested by Karl Berry.
-
-2010-03-13  Karl Berry  <address@hidden>
-
-       GNU hello uses fdl.texi, not gpl.texi.
-       * doc/automake.texi (Texinfo): Adjust example to upstream
-       change.
-
-2010-03-06  Ralf Wildenhues  <address@hidden>
-
-       Formatting cleanups in macro comments.
-       * automake.in, lib/Automake/Channels.pm,
-       lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
-       lib/Automake/Variable.pm, lib/Automake/XFile.pm,
-       m4/options.m4, m4/substnot.m4: Fix macro comment format.
-
-2010-03-04  Stefano Lattarini  <address@hidden>
-           Ralf Wildenhues  <address@hidden>
-
-       Avoid generation of `tests/defs-p' file.
-       * tests/defs.in: In the generated `configure.in' snippet: call
-       `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
-       variable `parallel_tests' is set to `yes'.
-       * tests/Makefile.am (defs-p): Target removed.
-       (check_SCRIPTS): Removed `defs-p'.
-       (clean-local-check): Do not unlink `defs-p' anymore.
-       ($(parallel_tests)): Transformation rules for the test scripts
-       adjusted.
-       * tests/gen-parallel-tests: Selection rules for the test
-       scripts adjusted.
-       * tests/parallel-tests.test: Set `$parallel_tests' to `yes'
-       then include `./defs' (rather than simply including `./defs-p').
-       * tests/parallel-tests2.test: Likewise.
-       * tests/parallel-tests3.test: Likewise.
-       * tests/parallel-tests4.test: Likewise.
-       * tests/parallel-tests5.test: Likewise.
-       * tests/parallel-tests6.test: Likewise.
-       * tests/parallel-tests7.test: Likewise.
-       * tests/parallel-tests8.test: Likewise.
-       * tests/parallel-tests9.test: Likewise.
-       * tests/parallel-tests10.test: Likewise.
-       * tests/README (Section "Writing Test Cases" subsection "Do"):
-       Adjusted the parts referring to tests checking `parallel-tests'
-       behaviour.  Some other minor related improvements.
-       * tests/.gitignore (defs-p): Removed.
-
-2010-03-04  Stefano Lattarini  <address@hidden>
-
-       Remove redundant unset of variable TESTS from some test scripts.
-       * tests/color.test: Do not unset the `TESTS' variable, as it's
-       already unset in the `defs' file.
-       * tests/check5.test: Likewise.
-       * tests/check8.test: Likewise.
-       * tests/check9.test: Likewise.
-       * tests/check10.test: Likewise.
-       * tests/check11.test: Likewise.
-       * tests/parallel-tests.test: Likewise.
-       * tests/parallel-tests3.test: Likewise.
-       * tests/parallel-tests4.test: Likewise.
-       * tests/parallel-tests5.test: Likewise.
-       * tests/parallel-tests6.test: Likewise.
-       * tests/parallel-tests7.test: Likewise.
-
-2010-02-22  Karl Berry  <address@hidden>
-
-       Improve help message of mdate-sh.
-       * mdate-sh: mention actual output format in help message.
-
-2010-02-22  Ralf Wildenhues  <address@hidden>
-
-       Deprecate dist-lzma in favor of dist-xz.
-       * doc/automake.texi (The Types of Distributions, Options):
-       Adjust text to reflect renaming of lzma to xz.
-       * NEWS: Update.
-       Missing deprecation noted by Antonio Diaz Diaz.
-
-2010-02-20  Stefano Lattarini  <address@hidden>
-
-       Add tests about support of wildcards in EXTRA_DIST.
-       * tests/extra10.test: New test, check basic support of wildcards
-       in EXTRA_DIST.
-       * tests/extra11.test: New test, check more complex usage of
-       wildcards in EXTRA_DIST.
-       * tests/extra12.test: New test, check usage of wildcards in
-       EXTRA_DIST when $builddir != $srcdir.
-       * tests/Makefile.am (TESTS): Updated accordingly.
-       Necessity of these new tests suggested by Braden McDaniel
-       and Ralf Wildenhues.
-
-2010-02-08  Simon Josefsson  <address@hidden>
-
-       Fix copyright statement in gnupload script.
-       * lib/gnupload: Fix copyright statement.
-
-2010-02-06  Dmitry V. Levin  <address@hidden>  (tiny change)
-           Ralf Wildenhues  <address@hidden>
-
-       Fix exit status of signal handlers in shell scripts.
-       The value of `$?' on entrance to signal handlers in shell scripts
-       cannot be relied upon, so set the exit code explicitly to
-       128 + SIG<SIGNAL>.
-       * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
-       * lib/elisp-comp: Likewise.
-       * lib/install-sh: Likewise.
-       * lib/ylwrap: Likewise.  Also, fix script to trap signal 13, not 3.
-       * NEWS, THANKS: Update.
-       Bug report, analysis, and initial patch by Dmitry V. Levin.
-
-2010-02-06  Karl Berry  <address@hidden>
-
-       Improve gnupload usage text.
-       * gnupload (usage): Shorten to make more likely to fit on a tty
-       line.  Mention CMD in the synopsis.  With ..., plural is implied.
-
-2010-01-28  Christos Kontas  <address@hidden>  (tiny change)
-
-       Fix some typos in the manual
-       * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
-
-2010-01-17  Stefano Lattarini  <address@hidden>
-
-       Slighty improve tests acoutbs.test and acoutbs2.test.
-       * tests/acoutbs2.test: Enable `errexit' shell flag.  Check that
-       autoconf and configure work, that the file `zot' is created by
-       configure, and that no file containing a backslash in its name is
-       created.
-       * tests/acoutbs.test: Likewise, plus updated copyright years.
-
-       Fix test acoutbs2.test.
-       * tests/acoutbs2: In the generated configure.in: add proper calls
-       to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
-       PACKAGE and VERSION. Add a call to aclocal before calling automake.
-       Updated copyright years.
-       * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
-
-       Add forgotten test scripts to $(TESTS).
-       * tests/Makefile.am (TESTS): Added test scripts present on the
-       filesystem, which were erroneously left out from $(TESTS):
-       acoutbs2.test, badopt.test, extra2.test.
-       (XFAIL_TESTS): Added acoutbs2.test.
-
-2010-01-17  Ralf Wildenhues  <address@hidden>
-
-       Sync auxiliary files from upstream.
-       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
-       Sync from upstream.
-
-       Bump copyright years.
-       * aclocal.in (write_aclocal, version): Bump copyright years.
-       * automake.in (gen_copyright, version): Likewise.
-       * doc/automake.texi: Likewise.
-
-       Rotate ChangeLog.
-       * ChangeLog.09: New file, rotated from ...
-       * ChangeLog: ... here.
-       * Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
-
------
-
-Copyright (C) 2010, 2011  Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
-
-;; Variables:
-;; coding: utf-8
-;; End:
diff --git a/ChangeLog.96 b/ChangeLog.96
deleted file mode 100644
index 07f71c2..0000000
--- a/ChangeLog.96
+++ /dev/null
@@ -1,3685 +0,0 @@
-Wed Dec 18 15:27:09 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Sort configure_vars before adding to
-       output_vars.
-       (handle_yacc_lex_cxx): Sort de_ansi_objects.
-       (handle_man_pages): Sort %section keys.
-
-Tue Dec 10 00:41:17 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (AC_SUBST_PATTERN): Check for alphanumeric variable
-       names only.  Test subst.test.
-       (scan_one_configure_file): Skip AC_DEFUN lines.  Test
-       defun2.test.
-
-Mon Dec  9 08:18:42 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (file_contents_with_transform): Use ne, not !=, to
-       compare strings.  Compare against correct string.  From Jim
-       Meyering.
-       (handle_texinfo): Use rm -f to remove info files.  From Gord
-       Matzigkeit.
-
-       * Released 1.1l.
-
-       * automake.in (handle_texinfo): Put .ps on @suffixes.
-
-Sun Dec  8 12:29:52 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Directory with 'exec' in its name
-       is installed by install-exec.
-
-       * subdirs.am (maintainer-clean-recursive): Make commands quiet.
-       * texinfos.am: Make commands quiet.
-       * scripts.am: Make commands quiet.
-       * progs.am: Make commands quiet.
-       * ltlibs.am: Make comamnds quiet.
-       * lisp.am: Make commands quiet.
-       * libs.am: Make commands quiet.
-       * header.am: Make commands quiet.
-       * data.am: Make commands quiet.
-
-       * automake.in (variable_value_as_list): Handle := substitution
-       references.
-       (am_conf_line_error): Take file argument.  Changed all callers.
-       (scan_one_configure_file): Skip config header of [$1].
-       (scan_dependency_file): Don't add top_builddir to regex if it is
-       ".".  Don't include top_builddir in output if it is ".".
-       (scan_one_configure_file): Skip version of [$2].
-
-Sat Dec  7 11:34:39 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): New sub.
-       (scan_configure): Scan aclocal.m4 as well as configure.in.
-       (handle_configure): Makefile.in now depends on $(ACLOCAL), because
-       automake scans it.
-
-       * automake.in (handle_configure): Put full path to file onto
-       @rewritten_inputs.  Test output4.test.
-
-       * automake.in (handle_configure): Put proper name onto @inputs.
-       Test output3.test.
-
-       * automake.in (handle_configure): Pass correct args to automake
-       invocations.  Test remake2.test.
-
-       * automake.in (handle_configure): Check dirname of $file, not of
-       $local.  Test output2.test.
-
-       * automake.in (handle_dependencies): Added some missing ";"s in
-       transforms.
-       (get_object_extension): Ditto.
-       (handle_tags): Ditto.
-       (handle_tests): Ditto.
-       (read_am_file): Ditto.
-       (am_install_var): Ditto.
-       (file_contents_with_transform): Die if transform missing trailing
-       ";".
-
-       * automake.in (am_install_var): Quote $ in regexp substitution.
-       From Ulrich Drepper.
-
-Fri Dec  6 18:54:10 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Require actual input files, not
-       rewritten input files.  From Ulrich Drepper.
-
-Thu Dec  5 02:52:20 1996  Tom Tromey  <address@hidden>
-
-       Suggestion from Mark Galassi:
-       * texinfos.am (DVIPS): New macro.
-       (.dvi.ps): New rule.
-
-       * automake.in (handle_dependencies): Check to make sure
-       --build-directory specified before searching for .P files.
-       (handle_configure): Correctly handle ":" syntax when running
-       config.status.
-
-       * remake.am: Removed rules to regenerate Makefile and Makefile.in;
-       now handled by handle_configure.
-
-       * remake-subd.am: Removed.
-
-       * automake.in (scan_configure): Handle multiple ":"s in AC_OUTPUT
-       arg.
-       (parse_arguments): Ditto.
-       (handle_configure): Ditto.
-       (%other_output_files): Removed.
-       (rewrite_inputs_into_dependencies): New sub.
-       (handle_configure): Use it.
-       (handle_configure): Ditto.
-
-       From Gord Matzigkeit:
-       * automake.in (generate_makefile): Handle ":" in AC_OUTPUT arg.
-       (handle_configure): Ditto.
-
-       * automake.in (handle_single_transform_list): .S is assembly
-       source.  From Anthony Green.
-
-       * automake.in (handle_single_transform_list): Correctly rewrite
-       C++ and Fortran source to objects ending in ".o".  Test
-       cxxo.test.
-
-       * automake.in: Better error message if file missing.
-
-       * aclocal.in (@obsolete_macros): ud_GNU_GETTEXT is obsolete.
-       * automake.in (handle_gettext): Use AM_GNU_GETTEXT, not
-       ud_GNU_GETTEXT.
-       (scan_configure): Ditto.  ud_GNU_GETTEXT is now obsolete.
-
-Wed Dec  4 00:41:23 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): Skip empty elements when adding to
-       libsources.  Perl 4 bug reported by Greg A Woods.
-
-       * Makefile.am (perl4-check): New target.
-       (cvs-dist): Run perl4-check.
-
-       Perl 4 fixes.  Reported by Greg A. Woods:
-       * automake.in (file_contents_with_transform): If transform caused
-       all chars to go away, then skip rest of loop.
-       (handle_texinfo): Don't use "next" in arg to
-       file_contents_with_transform.
-       (handle_dependencies): Ditto.
-       (handle_tests): Ditto.
-
-       * m4/regex.m4 (AM_WITH_REGEX): Check for GNU regex in libc.  From
-       Andreas Schwab.
-
-       * automake.in (parse_arguments): Removed --strictness.
-       (handle_dist_worker): Don't use --strictness.
-       (handle_configure): Ditto.
-       (initialize_global_constants): Don't mention --strictness.
-
-       * automake.in (handle_merge_targets): Use all-recursive-am instead
-       of all-recursive-hack.  The latter is ugly, according to Joel
-       Weber.
-
-       * automake.in (handle_emacs_lisp): Push $(ELCFILES) onto @all.
-
-       * automake.in (do_one_clean_target): Allow -local version of clean
-       targets.
-
-Tue Dec  3 18:58:40 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Skip C-only lines in
-       depend2.am when appropriate.
-       * depend2.am (.deps/%.P): Omit modification of $o if language is
-       not C.
-
-Tue Dec  3 11:29:01 1996  Gordon Matzigkeit  <address@hidden>
-
-       * compile-kr.am: Quote arguments to echo.
-
-       * progs.am: Fix up problems when LIBTOOL is not defined (by
-       setting shell variable instprog to the installation program).
-
-       * aclocal.in (scan_file): Allow the acinclude.m4 file to override
-       any other macro files (but still prevent multiple definitions
-       within acinclude.m4).
-
-Tue Dec  3 10:40:48 1996  Tom Tromey  <address@hidden>
-
-       From Ulrich Drepper:
-       * automake.in (handle_emacs_lisp): Typo fix.
-       (scan_configure): Only recognize VERSION after whitespace.
-
-       * texinfos.am: install-info requires path to info file.
-
-       * progs.am: Use @LIBTOOL@, not $(LIBTOOL).
-
-       * automake.in (am_install_var): If -ltlibs passed, substitute
-       @address@hidden
-
-Mon Dec  2 13:51:11 1996  Gordon Matzigkeit  <address@hidden>
-
-       * automake.in (get_object_extension): Unshift ansi2knr onto the
-       all target, so that it builds before any other targets.
-       [de_ansi_objects]: Delete, since unshifting ansi2knr is an easier
-       solution.
-
-Mon Dec  2 12:13:27 1996  Tom Tromey  <address@hidden>
-
-       * Released 1.1i.
-
-       From Janos Farkas:
-       * automake.in (handle_texinfo): Must quote $ for make.
-
-Sun Dec  1 15:08:09 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Correctly handle common case of
-       multiple non-Makefiles in AC_OUTPUT.  Require all input files when
-       using ":" syntax.
-
-Sun Nov 24 00:33:50 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Don't define
-       EXTRA_prog_SOURCES unnecessarily.  Test extra2.test.
-
-       * automake.in (initialize_per_input): New variables
-       included_generic_compile, included_knr_compile,
-       included_libtool_compile.
-       (get_object_extension): Use them.
-
-       * automake.in (handle_single_transform_list): Removed
-       Objective-C/C++ support (didn't really work anyway).
-       (handle_single_transform_list): Handle assembly specially.
-
-       * automake.in (handle_yacc_lex_cxx): Set --mode=compile or
-       --mode=link when running libtool.
-
-       * ltlibs.am: Set --mode=install when running libtool.
-       (address@hidden@PROGRAMS): Set --mode=uninstall when running
-       libtool.
-       * libtool.am (.c.lo): Set --mode=compile when running libtool.
-       * progs.am: Set --mode=install when running libtool.
-
-       Fix for bug reported by François Pinard:
-       * automake.in (do_check_merge_target): New sub.
-       (do_one_merge_target): No longer handle `check'.
-       (handle_merge_targets): Use do_check_merge_target.
-       (initialize_per_input): Set @check_tests.
-       (handle_tests): Push onto @check_tests, not @check.
-
-       * automake.in (am_install_var): Typo fix.
-       (handle_configure): Require $inputs[0].
-
-Fri Nov 22 00:01:45 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_lib_objects): Fixed error message
-       processing.
-
-Thu Nov 21 22:29:30 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): AC_FUNC_FNMATCH doesn't add to
-       LIBOBJS.
-       (handle_configure): Support multi-":" mode for AC_OUTPUT.
-
-       * m4/header.m4: New file.
-
-       * automake.in (scan_configure): Recognize AM_CONFIG_HEADER.
-
-Wed Nov 20 00:23:42 1996  Tom Tromey  <address@hidden>
-
-       * acinstall: Allow commentary at end of "serial" line.  From Gord
-       Matzigkeit.
-
-       * automake.in (handle_yacc_lex_cxx): Only replace output header if
-       it has changed.
-
-Tue Nov 19 19:03:30 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_primary_prefixes): Allow configure variables to
-       be named after primary.
-       (am_install_var): Ditto.
-
-       * automake.in (initialize_per_input): Initialize output_header.
-       (generate_makefile): Set up output_header; print it before
-       output_rules.
-       (handle_footer): Put .SUFFIXES into output_header, for AIX.
-
-Mon Nov 18 19:11:53 1996  Gordon Matzigkeit  <address@hidden>
-
-       * automake.in: Added a lot of libtool support.  New variable
-       prog_LDFLAGS to pass linker flags.  Use libtoolize to install
-       libtool support files.
-
-Mon Nov 18 13:29:55 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_lib_objects): Push @LIBOBJS@ and @ALLOCA@
-       onto dependency list.
-
-       * aclocal.in (obsolete_macros): Include AM_SANITY_CHECK_CC; now
-       part of autoconf proper.
-       * m4/ccsanity.m4: Removed.
-
-Sun Nov 17 12:25:17 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (check_typos): Check to make sure EXTRA_ variables
-       don't contain configure subs.
-       (handle_dist_worker): Removed EXTRA_DIST_DIRS; not needed.
-
-Fri Nov 15 18:58:04 1996  Tom Tromey  <address@hidden>
-
-       * tags-subd.am: Removed.
-
-       * tags.am (tags-recursive): Removed.
-       (TAGS): Depend on @DIRS@, @address@hidden  Use @CONFIG@ in rule.
-       (ID): From tags-subd.am.
-       
-       * aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH.
-       * automake.in (scan_configure): Recognize AC_FUNC_FNMATCH.
-       * m4/fnmatch.m4: Removed (now in autoconf).
-
-       * automake.in (initialize_per_input): Init de_ansi_objects.
-       (handle_single_transform_list): Error if extension unrecognized.
-       Set elements of de_ansi_objects.
-       (get_object_extension): Don't push ANSI2KNR onto @all.
-       (handle_yacc_lex_cxx): Put ANSI2KNR into dependency of all ._o
-       files.
-       (pretty_print_internal): Initialize $bol depending on the column.
-
-Fri Nov 15 16:22:15 1996  Gordon Matzigkeit  <address@hidden>
-
-       * library.am: Fixed references to LIBRARY according to new scheme.
-
-       * libs.am, libs-clean.am: Removed references to LIBFILES.
-
-       * automake.texi (A Library): doc fix
-
-       * automake.in (handle_libraries): Deleted references to *LIBFILES,
-       since we now have the full library name in the *LIBRARIES
-       variable.
-       (am_install_var): Removed `-no-all' option, which was only required
-       for the LIBFILES hack.
-
-Fri Nov 15 16:39:29 1996  Tom Tromey  <address@hidden>
-
-       * automake.in: Applied libtool-related patches from Gord.
-       (scan_configure): Set CC configure var if AM_PROG_LIBTOOL seen.
-       Also indicate that AC_CANONICAL_HOST was run.
-
-       * Makefile.am (pkgdata_DATA): Removed aclocal.m4.
-
-Thu Nov 14 23:11:09 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Don't auto-define YACC, LEX,
-       CXX, CC.
-
-       * dejagnu.am: Print warning if runtest missing.
-
-       From Joerg-Martin Schwarz:
-       * automake.in (handle_aclocal_m4): Find aclocal.m4 in srcdir.
-       (require_file_internal): Unlink file before creating it.
-
-       * depend2.am (.deps/%.P): Don't print commands when running.
-
-Mon Nov 11 10:35:08 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Simplified C++
-       matching expression.
-
-Fri Nov  8 09:49:09 1996  Tom Tromey  <address@hidden>
-
-       * Released 1.1g.
-
-       * compile-kr.am ($(OBJECTS)): Removed.
-
-       * automake.in (get_object_extension): Define ANSI2KNR.  Push onto
-       @all if ansi2knr is in this directory.
-
-       * configure.in: Don't run AC_ARG_PROGRAM, AC_PROG_MAKE_SET.
-
-       * m4/init.m4: Run AM_SANITY_CHECK.
-
-       * m4/sanity.m4: New file.
-
-       * automake.in (handle_dist_worker): In Cygnus mode, possibly find
-       files to dist in build dir, not srcdir.
-       (%omit_dependencies): New global.
-       (scan_dependency_file): Handle OMIT_DEPENDENCIES.
-       (scan_configure): Put rx.h, regex.h on %omit_dependencies.  Ditto
-       libintl.h.
-       (handle_tests): Remove CYGNUS strings in Cygnus mode.
-       (handle_texinfo): Ditto.
-
-       * texinfos.am (dist-info): New target.
-
-       * automake.in (handle_dist_worker): Use DISTFILES, not
-       DEP_DISTFILES.
-       (initialize_per_input): Initialize dist_targets.
-       (handle_texinfo): Don't compute @infos_list; don't define or use
-       INFOS.  Put dist-info onto @dist_targets.
-       (handle_dist_worker): Handle @dist_targets.  Don't use the "echo
-       trick" for expanding DISTFILES any more.
-
-       * dist-vars.am (DEP_DISTFILES): Removed.
-       (DISTFILES): Don't include INFOS.
-
-       * automake.in (handle_texinfo): Handle Cygnus mode.
-       * texinfos.am (.texi.info, .texinfo.info): Handle Cygnus mode.
-
-       * automake.in (handle_single_transform_list): New sub.
-       (handle_source_transform): Use it.
-       (handle_built_sources): New sub.
-
-Thu Nov  7 14:49:16 1996  Tom Tromey  <address@hidden>
-
-       * remake.am ($(srcdir)/Makefile.in): Pass @ARGS@ to automake.
-       * remake-subd.am ($(srcdir)/Makefile.in): Pass @ARGS@ to
-       automake.
-       * automake.in (handle_configure): Pass --cygnus when running
-       automake again.
-
-       * remake-hdr.am ($(srcdir)/stamp-h.in): Depend on @FILES@, not
-       ACCONFIG, CONFIG_TOP, CONFIG_BOT.
-       * automake.in (handle_aclocal_m4): Always find aclocal.m4 in
-       top_srcdir.
-       (handle_configure): Don't define ACCONFIG, CONFIG_TOP, CONFIG_BOT;
-       instead substitute files directly.
-
-Wed Nov  6 10:22:26 1996  Tom Tromey  <address@hidden>
-
-       * remake-hdr.am (stamp-h): Look in top_builddir for
-       config.status.
-       ($(srcdir)/stamp-h.in): Look in top_srcdir for configure.in.
-
-Thu Oct 31 10:55:59 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texi.dvi): Set MAKEINFO when running texi2dvi.
-       From Jim Meyering.
-
-       * automake.in (handle_texinfo): Push install-info-am, not
-       install-info.
-       (handle_merge_targets): Handle no-installinfo option.
-
-       * texinfos.am (install-info-am): Renamed from install-info.
-
-       * automake.in (handle_subdirs): Include install-info-recursive if
-       no-installinfo given.
-
-       * subdirs.am: Include INSTALLINFO token.
-
-       * automake.in (handle_texinfo): Explicitly define MAKEINFO,
-       TEXI2DVI.
-       (cygnus_mode): New global.
-       (handle_dist_worker): Pass --cygnus to automake.
-       (initialize_global_constants): Document --cygnus.
-       (check_cygnus): New sub.
-       (handle_texinfo): Don't require texinfo.tex in Cygnus mode.
-
-       * texi-vars.am: Removed.
-
-       * dejagnu.am (check-DEJAGNU): Don't define rootme.
-
-       * automake.in (handle_tests): Define EXPECT, RUNTEST.
-
-       * dejagnu.am (EXPECT): Removed.
-       (RUNTEST): Removed.
-
-       * automake.in (define_program_variable): New sub.
-
-Mon Oct 28 10:43:48 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Use -M, not -MM, for C++
-       dependencies.
-
-Thu Oct 24 20:21:50 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (check_libobjs_sources): New sub.  Test
-       libobj4.test.
-       (handle_source_transform): Don't check for auto-discovered source
-       files here.
-       (handle_programs): Run check_libobjs_sources here.
-       (handle_libraries): Ditto.
-
-       * automake.in (define_configure_variable): New function.
-       (get_object_extension): Use define_configure_variable.
-       (handle_yacc_lex_cxx): Ditto.
-       (handle_emacs_lisp): Ditto.
-       (configure_vars): New global.
-       (AC_CHECK_PATTERN): New global.
-       (seen_ranlib, seen_prog_cc, seen_prog_cxx, seen_prog_lex):
-       Removed.
-       (handle_yacc_lex_cxx): Use configure_vars, not seen_prog_*.
-       (AC_SUBST_PATTERN): New global.
-       (scan_configure): Use AC_SUBST_PATTERN; don't set seen_prog_*.
-       (handle_libraries): Don't use seen_ranlib.
-       (read_am_file): Run define_configure_variable on each discovered
-       variable.
-
-Mon Oct 21 23:06:49 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): Handle AM_INIT_GUILE_MODULE.
-       (handle_libraries): Pass configure substitutions directly on to
-       LIBFILES.
-
-       * automake.in (AM_PACKAGE_VERSION_PATTERN): New global.
-       (scan_configure): Use it.  Test version.test.
-
-Sun Oct 20 12:08:46 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Explicitly pass distdir to
-       dist-hook make.  From Tatu Ylonen.
-
-       * m4/strtod.m4: Use correct cache variable.
-
-Thu Oct 17 13:45:20 1996  Tom Tromey  <address@hidden>
-
-       Lisp fixes from Erick Branderhorst:
-       * m4/lispdir.m4: Define lispdir, not LISPDIR.
-       * lisp.am: Added missing \.
-
-Fri Oct 11 00:44:49 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Only rewrite c, yacc, lex
-       to use de-ansi-fication.
-       (scan_configure): Handle multi-line AC_REPLACE_FUNCS.  Test
-       libobj5.test.
-
-       * automake.in (handle_lib_objects): Added $lex_seen argument.
-       Error if lex file used but LEXLIB not seen.
-       (handle_programs): Ditto.
-       (handle_yacc_lex_cxx): Define LEXLIB variable.
-       (handle_lib_objects): Don't allow LEXLIB to end up on dependency
-       list.
-
-Thu Oct 10 16:12:38 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_gettext): Moved check for SUBDIRS and
-       ABOUT-NLS here.
-
-       * automake.in (handle_configure): Run mkinstalldirs under
-       $(SHELL).
-       (handle_yacc_lex_cxx): Run interlock under $(SHELL).
-
-       * remake-subd.am (Makefile): Run config.status under $(SHELL).
-       * remake-hdr.am (stamp-h): Run config.status under $(SHELL).
-       * remake.am (Makefile): Run config.status under $(SHELL).
-       (config.status): Ditto.
-
-       * automake.in (read_am_file): Removed UNMAINT code.
-       (file_contents_with_transform): Ditto.
-       * m4/maintainer.m4: Removed bogus UNMAINT code.
-
-       * automake.in (handle_emacs_lisp): Define EMACS variable.
-       (handle_emacs_lisp): Make sure EMACS is in environment when
-       elisp-comp is run.
-
-       * elisp-comp: Exit with status 1 if usage bad.
-       Use "emacs -q".  Use EMACS environment variable if set (unless set
-       to t).
-
-       * m4/lispdir.m4: Unset EMACS if it is set to `t'.
-
-       * automake.in (handle_dist_worker): Allow EXTRA_DIST items to be
-       in subdirs.
-       (do_one_merge_target): Use all-am, not all, in subdirs case.
-       (handle_merge_targets): Always generate all-am in subdirs case.
-
-       * remake.am (Makefile): Depend on BUILT_SOURCES.
-       * remake-subd.am (Makefile): Depend on BUILT_SOURCES.
-       * depend.am (.deps/.P): Don't depend on BUILT_SOURCES.
-
-       * automake.in (handle_yacc_lex_cxx): Handle y.tab.h in non-ylwrap
-       case.
-
-       * ylwrap: Bug fix.  From Jim Meyering.
-
-Wed Oct  9 22:51:16 1996  Tom Tromey  <address@hidden>
-
-       * m4/mktime.m4: Don't define AC_HEADER_SYS_TIME_H; instead just
-       check directly for header.
-
-Mon Oct  7 13:08:15 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): fp_WITH_DMALLOC and fp_WITH_REGEX
-       are obsolete.
-
-Sun Oct  6 00:43:01 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (AC_CONFIG_AUX_DIR_PATTERN): New global.
-       (AM_INIT_AUTOMAKE_PATTERN): New global.
-       (scan_configure): Use them.
-
-       * aclocal.in (add_file): Search contents of included files.  Test
-       req.test.
-       (scan_m4_files): Don't skip acinclude.m4 when constructing
-       search.  Test acsilent.test.
-       (scan_m4_files): Scan acinclude.m4.
-
-       * aclocal.in (add_file): Removed debugging print.
-       (scan_configure): Set $file_contents when scanning acinclude.m4.
-       Test acinclude.test.
-
-       * configure.in: Upped to 1.1g.
-
-       * Released 1.1f.
-
-       * texinfos.am: Run : after install-info.
-
-       * aclocal.in (parse_arguments): Better error message.
-       * automake.in (parse_arguments): Better error message.
-
-       * remake.am (Makefile): Depend on $(srcdir)/Makefile.in, to work
-       around broken makes.  From David A. Swierczek.
-       * remake-subd.am (Makefile): Ditto.
-
-Sat Oct  5 11:29:48 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (generate_makefile): Put BUILT_SOURCES onto @all if
-       appropriate.
-       (handle_source_transform): Error if discovered source file is
-       mentioned.
-       (do_one_merge_target): Move all-vs-check test here.
-
-       * m4/obstack.m4: New file.
-       * m4/error.m4: New file.
-
-       * automake.in (scan_configure): Support AM_FUNC_MKTIME,
-       AM_FUNC_ERROR_AT_LINE, AM_FUNC_OBSTACK.
-
-       * texinfo.tex: New version from texinfo 3.9.
-
-       * automake.in (handle_yacc_lex_cxx): Updated for new ylwrap.
-       Also, handle y.tab.h file when "yacc -d" is used.
-       (do_one_merge_target): Use pretty_print_rule.
-
-       * ylwrap: Changed usage.
-
-       * m4/mktime.m4: New file.
-
-       * m4: Renamed all .m4 files to fit into 14-char limits.
-
-       * m4/Makefile.am (EXTRA_DIST): New macro.
-
-       * aclocal.in ($ac_defun_rx, %map, %file_contents): New globals.
-       (scan_m4_files): Use $ac_defun_rx.
-       (add_file): Ditto.
-       Run scan_m4_files.
-       (scan_configure): Scan acinclude.m4 before anything else.
-       (scan_file): New sub.
-       (check_acinclude): New sub.
-       (add_file): Rewrote.
-
-       * progs-clean.am, progs.am: Renamed from programs-clean.am,
-       programs.am.
-       * libs-clean.am, libs.am: Renamed from libraries-clean.am,
-       libraries.am.
-       * texi-vars: Renamed from texinfos-vars.am.
-       * comp-vars.am: Renamed from compile-vars.am.
-       * texi-vers.am: Renamed from texi-version.am.
-
-       * automake.in (require_file_internal): Give error if symlink can't
-       be made.
-       (require_config_file): Error message references configure.in.
-       (handle_yacc_lex_cxx): Fix order of arguments to ylwrap; from
-       Joerg-Martin Schwarz.
-       (handle_texinfo): Use texi-vers, not texi-version.
-       (get_object_extension): Use comp-vars, not compile-vars.
-       (handle_texinfo): Use texi-vars, not texinfos-vars.
-       (handle_libraries): Use `libs' prefix, not `libraries'.
-       (handle_programs): Use `progs' prefix, not `programs'.
-
-Fri Oct  4 01:14:08 1996  Tom Tromey  <address@hidden>
-
-       * aclocal.in (scan_m4_files): New sub.
-
-       * m4/AM_FUNC_STRTOD.m4 (am_cv_func_strtod_needs_libm): Set
-       am_cv_func_strtod_needs_libm, so we can avoid linking with -lm
-       everywhere.
-
-Thu Oct  3 20:11:16 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (uninstall-info): Run install-info --remove.
-
-       * automake.in (read_am_file): Define all variables after reading
-       .am file.  Test vpath.test.  Reported by Anthony Green.
-
-Mon Sep 30 08:31:51 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am: Run install-info.
-
-       * automake.in (variable_value_as_list): Just return if comment
-       seen.  Report from Mark Galassi.
-       (handle_options): Don't bother with explicit comment checking.
-
-Tue Sep 24 09:15:46 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Cleaned up dejagnu variables.
-
-Mon Sep 23 00:04:48 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (parse_arguments): New usage to conform to GNU
-       standards.
-
-       * aclocal.in (parse_arguments): New usage to conform to GNU
-       standards.
-
-       * automake.in (handle_scripts): Push new target onto @check.
-       * scripts.am (address@hidden@SCRIPTS): New target.
-
-       * automake.in (initialize_global_constants): Define %dist,
-       dist_header, dist_trailer.
-       (handle_dist): Make dist-all target.
-       (generate_makefile): Run check_typos later.
-       (examine_variable): New sub.
-       (handle_tags): Examine TAGS_DEPENDENCIES.  Test spell3.test.
-       Error if TAGS_DEPENDENCIES but no sources used.
-       (handle_configure): Examine CONFIGURE_DEPENDENCIES.
-
-Sat Sep 21 13:59:15 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): More error checking.
-
-Fri Sep 20 09:06:37 1996  Tom Tromey  <address@hidden>
-
-       * tags.am (TAGS): Minor cleanup.
-
-       * clean.am (distclean-generic): Don't remove CONFIG_HEADER.
-
-       * remake-hdr.am (mostlyclean-hdr, clean-hdr, distclean-hdr,
-       maintainer-clean-hdr): New targets.
-
-       * automake.in (handle_configure): Define CONFIG_HEADER correctly
-       when it is in current directory.
-       (handle_configure): Push "hdr" on @clean.
-
-       * remake-hdr.am (stamp-h): Run config.status in top_builddir.
-       ($(srcdir)/stamp-h.in): Run autoheader in top_srcdir.
-
-       * automake.in (scan_configure): Check for install.sh here.
-       (basename): New sub.
-       (handle_configure): Handle case where config.h is in subdir.
-       (handle_configure): Make stamp-in.h for user if it doesn't already
-       exist.
-       (touch): New sub.
-
-Tue Sep 17 23:35:14 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (EXTRA_DIST): Include pkgdata_DATA.
-
-       * dist-vars.am (DISTFILES): Don't distribute BUILT_SOURCES or
-       DATA.
-       (DEP_DISTFILES): Ditto.
-
-Mon Sep 16 22:28:56 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (check_typos): Renamed.
-       (check_typos): Check for _LDADD, _LIBADD, and _DEPENDENCIES.
-       (variable_defined): Note variable as being "seen".
-       (handle_lib_objects): Don't push configure substitutions onto
-       _DEPENDENCIES.
-
-Sun Sep 15 22:45:43 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_per_input): Init content_seen.
-       (variable_value_as_list): Set content_seen entry.
-       (define_variable): Ditto.
-       (define_pretty_variable): Ditto.
-       (check_source_typos): New sub.
-       (generate_makefile): Call it.
-
-Thu Sep 12 15:03:19 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Removed extraneous
-       space.  Test implicit.test.
-       (read_am_file): Make sure "canonical" variables are mentioned in
-       %contents.
-       (scan_configure): AC_CHECK_TOOL sets $seen_canonical to
-       $AC_CANONICAL_HOST conditionally.
-       (handle_footer): Don't use define_pretty_variable in all cases.
-
-Wed Sep 11 11:54:44 1996  Tom Tromey  <address@hidden>
-
-       * clean.am (distclean-generic): Remove CONFIG_CLEAN_FILES here,
-       per GNU/Gnits standards.
-
-       * libraries.am (address@hidden@LIBRARIES): Use two loops, so new
-       NORMAL_INSTALL and POST_INSTALL variables can work when empty.
-
-       * automake.in (handle_options): Rewrote version handling.  Now
-       returns error indicator.
-       (MACRO_PATTERN, BOGUS_MACRO_PATTERN): Handle `:=' definitions.
-       (RULE_PATTERN): Exclude `:=' from being a rule.
-
-       * m4/AM_PROG_CC_STDC.m4 (ac_save_CC): Bug fix from Jim Meyering.
-
-       * automake.in (variable_value_as_list): Always use am_line_error.
-       (define_variable): New sub.
-       (get_object_extension): Use define_variable.
-       (handle_yacc_lex_cxx): Ditto.
-       (handle_source_transform): Ditto.
-       (handle_programs): Ditto.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (handle_dependencies): Ditto.
-       (handle_aclocal_m4): Ditto.
-       (define_pretty_variable): New sub.
-       (handle_source_transform): Use define_pretty_variable.
-       (handle_lib_objects): Ditto.
-       (handle_libraries): Ditto.
-       (handle_dist): Ditto.
-       (handle_dependencies): Ditto.
-       (handle_configure): Ditto.
-       (handle_footer): Ditto.
-       (handle_emacs_lisp): Ditto.
-       (am_install_var): Ditto.
-
-       * Released version 1.1e.
-
-       * automake.in ($GNITS_VERSION_PATTERN): Handle non-alpha
-       releases.
-
-       * configure.in: Version 1.1e.
-
-       * automake.in (handle_texinfo): Distribute .info file.
-
-Sun Sep  8 09:00:37 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (EXTRA_DIST): New macro.
-       (maintainer-clean): Don't run "make check".
-       (pathchk): New target.
-
-       * automake.in (check_gnits_standards): Only check version number
-       syntax at top level.
-       ($package_version_line): New variable.
-       (scan_configure): Set it.
-       (check_gnits_standards): Use am_conf_line_error.
-       (scan_configure): Remove extraneous whitespace from version
-       number.
-       (handle_dist): Handle distcheck-hook.
-
-       * m4/AM_PROG_CC_STDC.m4: Applied patch from Jim Meyering.
-
-       * automake.in (scan_configure): Handle AM_WITH_REGEX.
-       (handle_lib_objects): Require .h files in %libsources but don't
-       generate dependencies for them.
-       (scan_configure): Also require rx.h and regex.h.
-
-       * m4/Makefile.am (m4data_DATA): Don't include AM_PROG_LIBTOOL,
-       AM_FEATURE_CTYPE, AM_FEATURE_ERRNO, AM_FEATURE_EXIT,
-       AM_SYSTEM_HEADER.
-
-       * texi-version.am: Use "cp; rm" and not "mv", to work around
-       broken mvs.
-
-       * automake.in ($package_version): New global.
-       (scan_configure): Set it.
-       (check_gnits_standards): Verify version string; require
-       README-alpha if alpha version.
-       (scan_configure): Recognize AM_FUNC_FNMATCH,
-       AM_REPLACE_GNU_GETOPT.
-
-       * Makefile.am (installcheck-local): Check all scripts.
-
-Sat Sep  7 19:22:32 1996  Tom Tromey  <address@hidden>
-
-       * tags-clean.am: Do deletions here again.
-
-Thu Sep  5 09:06:23 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (usage): Include bug-reporting information.
-       (handle_lib_objects): Error if LIBOBJS seen but never set.
-
-       * aclocal.in ($acdir): Use @datadir@/aclocal.
-       (usage): Include bug-reporting information.
-
-Wed Sep  4 11:36:06 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): .deps no longer in
-       srcdir.
-       (handle_lib_objects): Ditto.
-       (handle_dist_worker): Pass --build-dir to automake.
-       ($build_directory): New global.
-       (parse_arguments): Handle --build-dir.
-       (initialize_global_constants): Include --build-dir in help.
-       (scan_dependency_file): New sub.
-       (handle_dependencies): Use it.  Also, use $build_directory.
-       (initialize_global_constants): Added --srcdir-name.
-       (parse_arguments): Ditto.
-       (handle_dist_worker): Ditto.
-       ($srcdir_name): New global.
-       ($srcdir_rx): New global.
-       (parse_arguments): Set it.
-
-       * depend2.am: Removed all mention of $(srcdir).
-
-       * depend.am (MKDEP): Use gcc -M, not gcc -MM.
-       Removed all mention of $(srcdir); dependencies now put into build
-       dir.
-
-       * depend2.am ($(srcdir)/.deps/%.P): Fixed computation of `top'.
-       Don't do work silently.
-
-       * automake.in (handle_merge_targets): Error if invalid uninstall
-       targets are given.
-       (read_am_file): Fix for test block.test.
-
-Tue Sep  3 18:50:32 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (install-info): Added NORMAL_INSTALL.
-       * scripts.am (address@hidden@SCRIPTS): Added NORMAL_INSTALL.
-       * programs.am (address@hidden@PROGRAMS): Added NORMAL_INSTALL.
-       * lisp.am (address@hidden@LISP): Added NORMAL_INSTALL.
-       * libraries.am (address@hidden@LIBRARIES): Added NORMAL_INSTALL.
-       Also, use POST_INSTALL when running ranlib.
-       * header.am (address@hidden@HEADERS): Added NORMAL_INSTALL.
-       * data.am (address@hidden@DATA): Added NORMAL_INSTALL.
-
-       * automake.in (handle_man_pages): Added NORMAL_INSTALL invocation.
-       (handle_merge_targets): Ditto.
-       (handle_merge_targets): Error if PRE_INSTALL, POST_INSTALL, or
-       NORMAL_INSTALL defined.
-
-       * m4/AM_PROG_INSTALL.m4: INSTALL_SCRIPT defaults to
-       ${INSTALL_PROGRAM}.  From François Pinard.
-
-Tue Aug 27 08:25:05 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (file_contents_with_transform): Correctly remove
-       @(UN)?MAINT@ from input when maintainer mode not active.
-       (handle_aclocal_m4): Handle no-maintainer-mode case.
-
-       * remake-hdr.am ($(CONFIG_HEADER)): Removed @address@hidden
-
-       * m4/AM_SANITY_CHECK_CC.m4: New file (from Jim Meyering).
-
-Mon Aug 26 21:37:32 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_lib_objects): Bug fix from Steve M Robbins.
-       (handle_libraries): Don't include libraries from EXTRA_LIBRARIES
-       in LIBFILES definition.  Reported by Steve M Robbins.  Test
-       alllib.test.
-
-       * automake.in (variable_value_as_list): New sub.
-       (handle_source_transform): Use it.
-       (handle_lib_objects): Ditto.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (am_install_var): Ditto.
-       (handle_options): Ditto.
-
-Sat Aug 24 09:30:46 1996  Tom Tromey  <address@hidden>
-
-       Reported by Jim Meyering:
-       * automake.in (get_object_extension): Look in "./" for ansi2knr if
-       no path found.
-       (handle_aclocal_m4): Protect aclocal.m4 rule with @address@hidden
-
-       * remake.am (.PHONY): New target.
-
-       * m4/AM_MAINTAINER_MODE.m4: Also define UNMAINT.
-
-       * automake.in (check_gnu_standards): Disallow no-installman,
-       no-installinfo.
-       (read_am_file): Sed out UNMAINT too.
-       (file_contents_with_transform): Ditto.
-
-       * acinstall: New file.
-
-       * m4/AM_INIT_AUTOMAKE.m4: Define PACKAGE and VERSION.
-
-       * m4/AM_WITH_REGEX.m4: New version from François Pinard.
-
-       * m4/AM_TYPE_PTRDIFF_T.m4: Use am_cv, not ac_cv.
-       * m4/AM_C_PROTOTYPES.m4: Ditto.
-       * m4/AM_FUNC_STRTOD.m4: Ditto.
-       * m4/AM_PROG_CC_STDC.m4: Ditto.
-       * m4/AM_PROG_LIBTOOL.m4: Ditto.
-
-Fri Aug 23 22:23:50 1996  Tom Tromey  <address@hidden>
-
-       * m4/Makefile.am (m4datadir): New macro
-       (m4data_DATA): Renamed.
-
-       * Makefile.am (cvs-dist): Depend on distcheck target.
-
-Mon Aug 19 15:37:32 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): [common_files]
-       Include acinclude.m4.
-
-       * m4/AM_PROG_CC_STDC.m4: Patch from Jim Meyering/Kaveh Ghazi.
-
-Sat Aug 17 11:27:14 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Push `depend'-clean targets
-       on @clean.
-       * depend.am (mostlyclean-depend, clean-depend, distclean-depend,
-       maintainer-clean-depend): New targets.
-
-Tue Aug 13 17:53:58 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texinfo.info): New target.
-       (.texinfo.dvi): New target.
-
-       From Jim Meyering:
-       * automake.in (handle_texinfo): Use `.info[-0-9]*' as pattern to
-       match info files.
-       (handle_texinfo): Handle `.texinfo' files.
-
-Mon Aug 12 10:28:46 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file_internal): Special-case `.' when
-       finding files to distribute.  Test libobj2.test.
-
-       * aclocal.in (add_file): Fixed regexp for matching AC_DEFUN.  Test
-       order.test.
-
-       * m4/AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL.m4: New file.
-       * m4/AM_SYS_POSIX_TERMIOS.m4: New file.
-
-       * compile-kr.am: Removed duplicate ansi2knr rules.
-
-Sun Aug 11 00:20:16 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Bug fix from Josh MacDonald.
-       (handle_yacc_lex_cxx): Put C++ extensions on suffix list.
-       (mkdir): Removed.
-
-       * automake.in (initialize_global_constants): [common_files]
-       Include interlock and ylwrap.
-
-       * Released version 1.1c.
-
-       * aclocal.in (obsolete_macros): md_TYPE_PTRDIFF_T and
-       ud_PATH_LISPDIR are obsolete names.
-
-       * m4/AM_LC_MESSAGES.m4, m4/AM_WITH_NLS.m4, m4/AM_GNU_GETTEXT.m4:
-       Removed.
-
-       * automake.in (handle_lib_objects): Changed interface.  Now
-       generates _DEPENDENCIES variable if appropriate.
-       (handle_emacs_lisp): Use AM_PATH_LISPDIR.
-       (scan_configure): Ditto.
-
-       * Makefile.am (CLEANFILES): Removed.
-
-       * automake.in (handle_configure): Define CONFIG_CLEAN_FILES.
-
-       * clean.am (clean-generic): Remove $(CONFIG_CLEAN_FILES).
-
-       * compile-vars.am (CC, CFLAGS, COMPILE, LINK): Removed.
-
-       * automake.in (handle_yacc_lex_cxx): Require ylwrap in
-       multi-lex/yacc case.
-       (handle_source_transform): Changed return result.
-       (handle_programs): Use linker returned by
-       handle_source_transform.
-       (seen_prog_cc, seen_prog_cxx): New globals.
-       (scan_configure): Recognize AC_PROG_CC and AC_PROG_CXX.
-       (handle_yacc_lex_cxx): Error message if AC_PROG_CXX or
-       AC_PROG_YACC missing.
-       (seen_decl_yytext, seen_prog_lex): New globals.
-       (scan_configure): Set them.
-       (handle_yacc_lex_cxx): Warn about missing AC_PROG_LEX or
-       AC_DECL_YYTEXT.
-       (handle_yacc_lex_cxx): Use $(LEX_OUTPUT_ROOT).
-       (initialize_per_input): Initialize seen_c_source.
-       (handle_yacc_lex_cxx): Define CC, CFLAGS, COMPILE, LINK only when
-       C source seen.
-       (handle_source_transform): Set seen_c_source.
-
-       * interlock: Changed usage.
-
-       * ylwrap: New file.
-
-       * automake.in (handle_yacc_lex_cxx): Renamed.
-
-       * automake.in (handle_dependencies): Handle %cxx_extensions.
-       Include depend2.am when appropriate.
-
-       * depend2.am: New file; contents from depend.am but templatized.
-
-       * automake.in (initialize_per_input): Initialize
-       %cxx_extensions.
-       (handle_source_transform): Set %cxx_extensions.
-
-Sat Aug 10 10:29:30 1996  Tom Tromey  <address@hidden>
-
-       * interlock: New file.
-
-       * automake.in (handle_yacc_lex): New sub.
-       (handle_source_transform): Removed most yacc/lex handling.
-       (initialize_per_input): Init yacc_sources, lex_sources.
-       (generate_makefile): Run handle_yacc_lex.
-       (handle_merge_targets): Use `scalar' and not $# to find length of
-       array.
-
-       * m4/AM_FEATURE_EXIT.m4: Wrote.
-       * m4/AM_FEATURE_CTYPE.m4: Wrote.
-       * m4/AM_FEATURE_ERRNO.m4: Wrote.
-
-       * aclocal.in (macro_seen): New global.
-       (add_file): Set macro_seen entry.  Only push required macro on
-       @rlist if not already seen.  Test defun.test.
-
-       * automake.in (get_object_extension): Handle directory prefix on
-       `ansi2knr' option.
-
-       * kr-extra.am: New file.
-
-       * kr-vars.am: Removed.
-
-       * automake.in (handle_options): Handle directory prefix on
-       `ansi2knr' option.
-
-       * automake.in (scan_configure): Recognize AM_FUNC_STRTOD.
-
-       * aclocal.in (add_file): Error if macro is duplicated.  Test
-       dup.test.
-
-Fri Aug  9 09:18:46 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_programs): Substitute @address@hidden  Make sure
-       linker variable is transformed name.
-       * program.am (@PROGRAM@): Use @XLINK@ to link.
-
-       * automake.in (handle_scripts): Fixed call to
-       am_primary_prefixes.
-       (handle_libraries): Better error message when AC_PROG_RANLIB
-       required.
-
-       * automake.in (handle_libraries): Canonicalize library name.  Test
-       canon4.test.
-       * library.am (address@hidden@.a): Use @XLIBRARY@ where appropriate.
-       (address@hidden@.a): Look at _DEPENDENCIES variable.
-
-Thu Aug  8 10:57:21 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_scripts): Correctly compute
-       $scripts_installed.  Test scripts.test.
-
-Wed Aug  7 12:13:15 1996  Tom Tromey  <address@hidden>
-
-       * ansi2knr.c: New version.
-
-Tue Aug  6 10:58:37 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Handle more C++ file
-       extensions.  "Handle" Objective C.  Handle more FORTRAN
-       extensions.
-
-       * compile-vars.am (LEX): Removed.
-       (YACC): Removed.
-
-       * automake.in (handle_source_transform): Correctly handle lex
-       source.  Test lex.test.
-       (handle_source_transform): Skip more C++ headers.  Generate macro
-       definitions for YACC and LEX on first use.
-
-       * aclocal.in (parse_arguments): Mention GNU.
-       * automake.in (parse_arguments): Mention GNU.
-
-Mon Aug  5 00:12:45 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_programs): Define program_LINK.
-       * program.am (@PROGRAM@): Use program_LINK to link.
-
-       * Released version 1.1b
-
-       * automake.in (scan_configure): AM_INIT_AUTOMAKE sets
-       seen_prog_install to `2'.
-
-       * configure.in: Don't run AM_PROG_INSTALL.
-
-       * automake.in (parse_arguments): Use $PACKAGE.
-       ($PACKAGE): New global.
-       ($am_c_prototypes): Renamed.
-       (get_object_extension): Use am_c_prototypes.
-       (scan_configure): Ditto.
-       (scan_configure): Use AM_MAINTAINER_MODE.
-       (scan_configure): Warn about obsolete macros.
-
-       * aclocal.in (parse_arguments): Use $PACKAGE.
-       ($PACKAGE): New global.
-
-       * Makefile.am (CLEANFILES): Added aclocal.
-       (ETAGS_ARGS): Added aclocal.in.
-       (TAGS_DEPENDENCIES): Ditto.
-       (maintainer-check): Depend on aclocal.
-       (maintainer-check): Check aclocal.
-       (bin_SCRIPTS): Include aclocal.
-
-       * automake.in (scan_configure): Handle AM_INIT_AUTOMAKE.
-       (scan_configure): Use AM_PROG_INSTALL.
-
-       * configure.in: Use AM_INIT_AUTOMAKE.
-
-       * automake.in (keyed_aclocal_warning): Warning tells about
-       aclocal.
-       (handle_aclocal_m4): New sub.
-       (handle_configure): Use it.
-
-       * aclocal.in (output_file): New global.
-       (usage): Handle --output.
-       (parse_arguments): Handle --output.
-
-       * m4/AM_INIT_AUTOMAKE.m4: New file.
-
-       * m4/AM_PROG_CC_STDC.m4: Require AC_PROG_CC.
-       Don't touch CFLAGS.
-
-       * automake.in (handle_dist_worker): Reverted erroneous "-chmod".
-       (handle_texinfo): Don't generate `.info-[0-9]' as a filename.
-
-       * texinfos.am (.texi.info): Force .info file to be built in
-       srcdir.  From Franc,ois Pinard.
-
-       From Jim Meyering:
-       * m4/AM_PROG_CC_STDC.m4: (fp_PROG_CC_STDC): Include sys/stat.h in
-       test program so that DYNIX/ptx V4.1.3 doesn't use `-Xc
-       -D__EXTENSIONS__' -- with those options on that system, sys/stat.h
-       gets compile errors.  With help from Marcus Daniels.
-
-       * automake.in (initialize_global_constants): Put elisp-comp into
-       @common_files.  Bug from Glenn Amerine.
-
-Sun Aug  4 12:52:43 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Use fgrep, not grep.
-
-       * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
-
-       * automake.in (handle_emacs_lisp): Include lisp-clean.am in
-       output.
-       (initialize_global_constants): [install_man_format] Don't hide
-       "ugliness" at install time.
-
-       * lisp-clean.am: New file.
-
-       * tags-clean.am (maintainer-clean-tags): Remove TAGS and ID here.
-
-       * automake.in (handle_man_pages): Patch from Janos Farkas to fix
-       bug when installing man pages.  Test man.test.
-       (initialize_global_constants): [install_man_format] Make sure man
-       page can actually be found in either source or build dirs.
-       (handle_dist_worker): Use "755" permissions on distdir.
-
-       * automake.in (handle_dist): Allow chmod's to fail.
-       (am_primary_prefixes): New function.
-       (am_install_var): Use it.
-       (handle_libraries): Use it.  Test libfiles.test.
-       (handle_dist): For dist-tarZ, assume traditional "tar" and
-       "compress".
-
-       * m4/AM_FUNC_STRTOD.m4: New file.
-
-       * automake.in (handle_dist): Only generate `distdir' variable if
-       it doesn't already exist.
-
-       Fix for bug reported by Harlan Stenn.  Test tags.test.
-       * automake.in (initialize_per_input): Define dir_holds_sources.
-       (handle_tags): Check dir_holds_headers.
-       (handle_headers): Set dir_holds_headers.
-
-       * automake.in (handle_texinfo): Generate "version.texi" dependency
-       for .dvi file.  Bug reported by Glenn Amerine.  Test vtexi2.test.
-
-       * automake.in (handle_configure): Require file $input, not
-       "$local.in".  From Nyul Laszlo.  Test colon.test.
-
-Sun Jul 28 11:14:52 1996  Tom Tromey  <address@hidden>
-
-       * aclocal.in: New file.
-       * configure.in: Generate m4/Makefile, aclocal.
-       * Makefile.am (SUBDIRS): Include m4.
-       * m4/Makefile.am: New file.
-
-Fri Jul 19 10:12:27 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Put ansi2knr.c and
-       ansi2knr.1 into common_files.  Bug report from François Pinard.
-
-Mon Jul 15 10:28:29 1996  Tom Tromey  <address@hidden>
-
-       * install-sh: Updated copyright notice.
-
-Fri Jul  5 08:23:00 1996  Tom Tromey  <address@hidden>
-
-       * subdirs.am (maintainer-clean-recursive): Don't be so noisy.
-       Report from Josh MacDonald.
-
-       Bugs from Gord Matzigkeit:
-       * automake.in (handle_footer): Push contents of $(SUFFIXES), not
-       `$(SUFFIXES)'.
-       (handle_dist): Ignore chmod return results.
-
-       * programs-clean.am (address@hidden@PROGRAMS): Work around failing
-       Solaris "rm -f".  Bug from Kaveh R. Ghazi.
-       * libraries-clean.am (address@hidden@LIBRARIES): Likewise.
-
-Fri Jun 21 10:42:06 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (install-info): Use "if", not "&&", to avoid
-       install problem when glob doesn't match.
-
-       * automake.in (initialize_global_constants): [USAGE] Added
-       --no-force.
-       (force_generation): New global.
-       (parse_arguments): Handle --no-force.
-       (generate_makefile): Handle --no-force.
-
-       * Makefile.am (maintainer-check): Ensure all invocations of
-       mkinstalldirs are correct.
-
-Tue Jun 18 10:53:54 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Don't directly generate site.exp.
-
-Sun Jun 16 22:21:16 1996  Harlan Stenn  <address@hidden>
-       
-       * automake.in:  Treat an initial `#' on a word in AUTOMAKE_OPTIONS
-       as a comment start.  Add support for a dist-tarZ target.
-
-Tue Jun 11 22:14:21 1996  Marcus Daniels  <address@hidden>
-
-       * depend.am ($(srcdir)/.deps/%.P): Convert absolute $(top_srcdir)
-       paths into relative paths.
-
-Mon Jun 10 21:11:20 1996  Tom Tromey  <address@hidden>
-
-       * texinfo.tex: New version.
-
-       * automake.in: Look for AM_PROG_LIBTOOL.  From Gord Matzigkeit.
-       (initialize_global_constants): Added libtool to
-       @common_sometimes.
-       (handle_source_transform): Pass YFLAGS to yacc and LFLAGS to lex.
-
-Sun Jun  9 17:45:48 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (install-info): Don't install ~ files.  Bug report
-       from Greg McGary.
-       * automake.in (handle_texinfo): Don't push '.info*' onto
-       @infos_list.
-
-       * automake.in (handle_gettext): Ensure po and intl in SUBDIRS when
-       using gettext.
-       (handle_dist): Pass --with-included-gettext to configure if using
-       gettext.
-
-       * compile-kr.am (._c._o): Pass -c to $(COMPILE).
-       (.c._o): Ditto.
-       * compile.am (.c.o): Pass -c to $(COMPILE).
-       * compile-vars.am (COMPILE): Don't include -c.
-
-       * remake.am ($(srcdir)/Makefile.in): Pass --strictness to
-       automake.
-       * automake.in (handle_configure): Supply --strictness arg to
-       automake.
-
-Fri Jun  7 12:31:31 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Fix quoting on `pwd`.
-       (handle_options): Recognize no-installinfo option.
-       (handle_man_pages): Don't put man directory on @installdirs if
-       no-installman is specified.
-       (handle_texinfo): Handle no-installinfo option.
-       (handle_options): Compare version against $num_version, not
-       $VERSION.
-       (handle_source_transform): Generate rules for output of lex,
-       yacc.  Bug report from Thomas Morgan.  Test yacc.test.
-       (handle_dist): "distcheck" now runs "make dvi".
-       (handle_tests): Support $(TESTS_ENVIRONMENT).  Idea from Ulrich
-       Drepper.
-
-       * dejagnu.am (check-DEJAGNU): Depend on site.exp.
-
-Sun Jun  2 10:33:10 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_emacs_lisp): New function.
-       (initialize_global_constants): Added elisp-comp to
-       @common_sometimes.
-       (seen_lispdir): New global.
-       (scan_configure): Handle ud_PATH_LISPDIR.
-
-       * elisp-comp: New file.
-
-       * lisp.am: New file.
-
-       * automake.in (generate_makefile): Run handle_emacs_lisp.
-
-       * aclocal.m4 (ud_PATH_LISPDIR): New macro, from Ulrich Drepper.
-
-       * automake.in (initialize_global_constants): Removed version.texi
-       from common_sometimes.
-       (initialize_global_constants): Added texinfo.tex to common_files.
-       Test texinfo.test.
-       (handle_tests): Allow dejagnu- and automake-style test suites to
-       coexist.  Test dejagnu.test.
-       (initialize_global_constants): New constants AC_CANONICAL_HOST,
-       AC_CANONICAL_SYSTEM.
-       (scan_configure): Use new constants.
-       (handle_tests): Put target specific information into site.exp if
-       AC_CANONICAL_* used.
-       (read_am_file): Generate some extra variables when AC_CANONICAL_*
-       used.
-       (handle_options): Allow version number to have letters appended.
-       (handle_tests): Error if RUNTEST, RUNTESTFLAGS defined but dejagnu
-       option not specd.
-       (initialize_global_constants): install_man_format changed to
-       handle built man pages.
-
-Wed May 29 10:35:01 1996  Tom Tromey  <address@hidden>
-
-       * config.guess, config.sub: New versions.
-
-Tue May 28 19:27:11 1996  Tom Tromey  <address@hidden>
-
-       * configure.in (VERSION): Upped to 1.0.
-
-Sat May 25 10:19:53 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Handle dejagnu.
-       (handle_options): Recognize dejagnu option.
-
-       * dejagnu.am: New file.
-
-Thu May 23 10:01:13 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Run installcheck target from
-       distcheck.
-
-       * configure.in (VERSION): Upped to 0.34.
-
-       * automake.in (scan_configure): Always allow upgrading to
-       fp_PROG_INSTALL.  Test fpinstall.test.
-
-Wed May 22 14:45:28 1996  Joshua Cowan  <address@hidden>
-
-       (handle_dist): Make `distcheck' check `install' target, too.
-
-Wed May 22 09:49:27 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_per_input): Don't initialize
-       $output_directory here; initialize it globally.  From Joshua
-       Cowan.  Test outdir.test.
-
-Sat May 18 10:57:40 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Don't push TESTS onto dist_common.
-       (initialize_global_constants): Put install-sh and mkinstalldirs
-       into @common_files.  Test insh2.test.
-
-Fri May 17 09:02:02 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Don't generate _OBJECTS
-       when no source files specified.  Test number.test.
-
-       From Joerg-Martin Schwarz:
-       * automake.in (seen_package, seen_version): New globals.
-       (scan_configure): Look for PACKAGE= and VERSION=.
-
-       * automake.in (handle_options): Recognize dist-zip.
-       (handle_dist): Handle dist-zip.
-       (handle_options): Use ' ', not \s+, with split.  Test
-       backsl.test.
-       (handle_source_transform): Likewise.
-       (handle_lib_objects): Likewise.
-       (handle_libraries): Likewise.
-       (handle_texinfo): Likewise.
-       (handle_man_pages): Likewise.
-       (handle_subdirs): Likewise.
-       (handle_gettext): Likewise.
-       (handle_footer): Likewise.
-       (handle_tests): Likewise.
-       (scan_configure): Likewise.
-       (am_install_var): Likewise.
-
-       * Makefile.am (TAGS_DEPENDENCIES): New macro.
-
-       * tags.am (tags-recursive): New target.
-       (TAGS): Depend on it.
-
-       * automake.in (handle_tags): Put tags-recursive on @phony.
-
-       * tags-subd.am (TAGS): Depend on HEADERS, SOURCES,
-       TAGS_DEPENDENCIES.
-       * tags.am (TAGS): Depend on HEADERS, SOURCES, TAGS_DEPENDENCIES.
-
-Thu May 16 09:21:48 1996  Tom Tromey  <address@hidden>
-
-       * remake.am (configure): Depend on $(CONFIGURE_DEPENDENCIES).
-
-       * automake.in (scan_configure): Look for install-sh and
-       mkinstalldirs here.
-       (initialize_global_constants): Moved mdate-sh from
-       common_sometimes to common_files.  Test mdate2.test.
-
-Tue May 14 21:52:01 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (seen_maint_mode): New global.
-       (scan_configure): Handle jm_MAINTAINER_MODE.
-       (read_am_file): Handle seen_maint_mode.
-       (file_contents_with_transform): Handle seen_maint_mode.
-       (handle_source_transform): Changed interface, all callers.
-
-       From Jim Meyering:
-       * remake-hdr.am, remake-subd.am, remake.am, texi-version.am:
-       Handle @address@hidden
-       * aclocal.m4 (jm_MAINTAINER_MODE): New macro.
-
-       * automake.in (handle_configure): Check $config_aux_dir against
-       empty string.  From Markku Rossi.  Test mkinstall.test.
-
-Fri May 10 14:38:47 1996  Gord Matzigkeit  <address@hidden>
-
-       * automake.in (distcheck): Added new rule to top level
-       Makefile.in.
-
-Wed May  8 21:57:21 1996  Gord Matzigkeit  <address@hidden>
-
-       * automake.in (scan_configure): Make sure that gm_PROG_LIBTOOL
-       sets seen_ranlib.
-       (generate_makefile): libtool, config.sub, and config.guess should
-       only ever appear in the top directory of a package.
-
-Tue May 14 10:24:30 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Added libversion.in
-       to @common_files.
-
-       * configure.in (VERSION): Upped to 0.33.
-
-       * automake.in (am_install_var): Fixed problem in EXTRA_ handling.
-       Test extra.test.
-
-Mon May 13 10:41:41 1996  Tom Tromey  <address@hidden>
-
-       * install-sh (transformbasename): Correct misspelling of
-       transformbasename.  From Ian Lance Taylor.
-
-Sat Apr 27 11:39:10 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Set mkinstalldirs variable
-       here.
-       (handle_dist_worker): Explicitly set distdir in subdir makes.
-       (handle_dist): Handle separate distdir target.
-       (handle_dist_worker): Only generate distdir target.
-
-       * texinfos.am (install-info): Use $(mkinstalldirs).
-       * scripts.am (address@hidden@SCRIPTS): Use $(mkinstalldirs).
-       * programs.am (address@hidden@PROGRAMS): Use $(mkinstalldirs).
-       * libraries.am (address@hidden@LIBRARIES): Use $(mkinstalldirs).
-       * header.am (address@hidden@HEADERS): Use $(mkinstalldirs).
-       * data.am (address@hidden@DATA): Use $(mkinstalldirs).
-
-       * automake.in (read_am_file): Set mkinstalldirs variable.
-       (handle_man_pages): Use it.
-       (handle_installdirs): Ditto.
-
-Fri Apr 26 15:10:48 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_man_pages): Fix mkinstalldirs invocation.
-
-Thu Apr 25 18:40:06 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Use $(TAR), not tar.
-       (handle_merge_targets): Make sure config header is built before
-       recursing into subdirs.
-       (handle_libraries): Generate LIBFILES for check_LIBRARIES.
-       (handle_merge_targets): Handle case where nothing is installed but
-       something must be built -- "make install" must still work.
-
-       * dist-vars.am (TAR): New macro.
-
-       * automake.in (scan_configure): Support AC_REPLACE_GNU_GETOPT.
-       (handle_configure): Require stamp-h.in when config header used.
-
-Tue Apr 23 17:57:13 1996  Andreas Schwab  <address@hidden>
-
-       * doc/mdate-sh: Extract the last field from the date output, not
-       the sixth, which will fail when the timezone name has more than
-       one word or is missing.
-
-Wed Apr 24 20:29:26 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Use delete, not undef, to remove
-       EXTRA entry.  From Gord Matzigkeit.
-
-Mon Apr 22 17:48:50 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Handle case where last line doesn't
-       end in newline.
-
-Tue Apr  9 22:53:16 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (variable_defined): New function.
-       (read_am_file): Ensure a blank line comes before starting comments
-       from Makefile.am.
-       (initialize_per_input): Initialize %targets.
-       (read_am_file): Set appropriate entry in %targets.
-       Many changes to use variable_defined.
-       (check_gnu_standards): Only require ChangeLog at top level.  From
-       Gord Matzigkeit.
-       (handle_tests): check-TESTS depends on $(TESTS).  From Gord
-       Matzigkeit.
-
-Mon Apr  8 22:51:41 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (parse_arguments): Added short options.
-       (initialize_global_constants): Ditto.
-
-Fri Apr  5 00:22:14 1996  Tom Tromey  <address@hidden>
-
-       * mkinstalldirs (errstatus): Don't necessarily die if mkdir
-       fails.
-
-       * automake.in (handle_source_transform): Typo fix.
-
-Thu Apr  4 15:10:50 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Renamed dist-local to
-       dist-hook.
-       (handle_merge_targets): Added install-data-hook and
-       install-exec-hook.
-       (handle_source_transform): Handle EXTRA_prog_SOURCES form.
-
-       * automake.in (handle_scripts): Never allow scripts_installed to
-       become 0.
-
-       * scripts.am (address@hidden@SCRIPTS): Scripts can be found in
-       srcdir.
-
-       * automake.in (generate_makefile): Derived file names from given
-       input; don't assume Makefile.in and Makefile.am.
-       (am_file_name, in_file_name): New globals.
-       (read_am_file): Use them.
-
-       * program.am (@PROGRAM@): Use transformed program name.
-
-       * remake-hdr.am (stamp-h): Actually touch stamp-h.
-
-Wed Apr  3 15:16:06 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file_internal): Use correct file for error
-       messages.  Test insh.test.
-
-Mon Apr  1 09:47:44 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texi.info): Build output file in srcdir.
-
-       * automake.in (require_file_internal): If $dir is ".",then look in
-       relative directory.
-       (handle_texinfo): Canonicalize name of texi file before looking
-       for dependency variable.
-
-Thu Mar 28 08:33:21 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (require_conf_file_with_conf_line): Yet another
-       function of this form.
-       (libtool_line): New variable.
-       (handle_libraries): Handle libtool.
-
-       * libraries-vars.am: Removed.
-
-       * automake.in (seen_libtool): New variable.
-       (scan_configure): Look for gm_PROG_LIBTOOL or AC_PROG_LIBTOOL.
-
-       * automake.in (handle_dist_worker): Handle dist-local.
-
-       * Makefile.am (maintainer-check): Do "make check" after all syntax
-       checks.
-
-       * texi-version.am (address@hidden@): Look for mdate-sh in appropriate
-       directory.
-
-       * automake.in ($seen_arg_prog): New global.
-       (handle_programs): Error if AC_ARG_PROGRAM not seen.
-       (handle_scripts): Ditto.
-       (handle_configure): mkinstalldirs now a config file.
-       (handle_installdirs): Find mkinstalldirs in config_aux_dir.
-       (handle_dist_worker): Removed DIST_SUBDIRS.
-       (require_file_path): New variable.
-       (require_file_with_conf_line): Set it.
-       (require_file_with_line): Ditto.
-       (require_file): Ditto.
-       (require_file_internal): Incorporated code from
-       require_config_file.
-       (require_config_file): Rewrote.
-       (require_conf_file_with_line): New function.
-       (handle_texinfo): Use it for mdate-sh.
-       (handle_texinfo): Look for mdate-sh in appropriate directory.
-
-Tue Mar 26 13:47:54 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (cvs-dist): Find NEWS in srcdir.
-       * automake.in (handle_dist_worker): Find NEWS in srcdir.
-       ($RULE_PATTERN): Include chars "$(){}/" in allowable patterns in a
-       rule.
-       (require_config_file): Set config_aux_path when file found.
-       ($config_aux_dir): New variable.
-       (require_config_file): Set it.
-       (handle_man_pages): Find mkinstalldirs in config_aux_dir.
-
-Mon Mar 25 15:32:57 1996  Tom Tromey  <address@hidden>
-
-       * data.am (address@hidden@DATA): Also allow data to be in build
-       directory.
-
-Sun Mar 24 19:56:28 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Don't look in EXTRA_primary
-       variable any more; it is handled in the main loop.
-
-Wed Mar 20 16:22:35 1996  Tom Tromey  <address@hidden>
-
-       * data.am (address@hidden@DATA): Find data in srcdir.
-
-Fri Mar 15 18:30:31 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (require_config_file): Use correct filename when
-       looking for errors.  Also, install file in `.' if not found.  Bug
-       reported by Gord Matzigkeit.  Test installsh.test.
-
-Thu Mar 14 09:28:21 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (cvs-diff): New target.
-
-       Fix for bug when install var substitutes empty.  Test empty.test.
-       * header.am (address@hidden@HEADERS): Allow empty list of headers.
-       (address@hidden@HEADERS): Ditto.
-       * scripts.am (address@hidden@SCRIPTS): Allow empty list of scripts.
-       (address@hidden@SCRIPTS): Ditto.
-       * libraries.am (address@hidden@LIBRARIES): Allow empty list of
-       libraries.
-       (address@hidden@LIBRARIES): Ditto.
-       * data.am (address@hidden@DATA): Allow empty list of data.
-       (address@hidden@DATA): Ditto.
-       * programs.am (address@hidden@PROGRAMS): Added missing semicolon.
-       From François Pinard.
-       (address@hidden@PROGRAMS): Fixed bug when list of programs empty.
-       (address@hidden@PROGRAMS): Ditto.
-
-Wed Mar 13 19:50:23 1996  Tom Tromey  <address@hidden>
-
-       * tags-subd.am (ID): Name of ID file must be flush against -f.
-
-       * configure.in (VERSION): Version 0.32.
-
-Mon Mar 11 17:50:58 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (seen_linguas, all_linguas_line): New variables.
-       (handle_gettext): New function.
-       (generate_makefile): Run it.
-       (scan_configure): Recognize ALL_LINGUAS.
-
-Mon Mar 11 14:34:36 1996  Gord Matzigkeit  <address@hidden>
-
-       * automake.texi: doc fix.
-
-       * automake.in (am_install_var): Added support for check and
-       installcheck special prefixes.
-
-Sun Mar 10 10:44:42 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_subdirs): Don't do SUBDIRS check for
-       gettext.
-
-Tue Mar  5 18:12:04 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (OBJECT_PATTERN): Removed.
-       (am_install_var): No error if name is invalid.
-       (handle_programs): Canonicalize program names.
-       (BOGUS_MACRO_PATTERN): New variable.
-       (read_am_file): Error if bad macro name given.
-       (require_file_internal): Use am_line_error, not am_conf_error.
-
-       * program.am (@PROGRAM@): Recognize @address@hidden
-
-Mon Mar  4 19:30:24 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_lib_objects): New function.
-       (handle_libraries): Use it.
-       (handle_programs): Ditto.
-       (handle_dist_worker): Deprecate DIST_SUBDIRS.
-       (am_install_var): Allow extended directory mechanism to work.
-       Test exdir.test.
-
-       * dist-vars.am (DISTFILES): Use EXTRA_DIST.
-       (DEP_DISTFILES): Ditto.
-
-       * automake.in (OBJECT_PATTERN): New variable.
-       (am_install_var): Use it.
-       (handle_dist): DIST_OTHER is an anachronism.
-
-Sat Mar  2 17:04:38 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Only cause Automake to be
-       re-run if not making a distribution.  Fixes bug reported by
-       Joerg-Martin Schwarz.
-       (require_file_with_line): New function.
-       (require_file): Use it.
-       (am_line_error): Don't print line number if $symbol is empty.
-       (get_object_extension): Use require_file_with_line.
-       (handle_libraries): Use require_file_with_line.
-       (handle_texinfo): Use require_file_with_line.
-       (handle_configure): Use am_conf_line_error and
-       require_file_with_conf_line.
-       (handle_subdirs): Use require_file_with_conf_line.
-       (handle_configure): Use require_file_with_conf_line.
-       (handle_tests): Push check-TESTS on @phony.
-       (am_conf_line_error): New function.
-       (require_file_with_conf_line): New function.
-       (require_file_internal): New function.
-       (require_file_with_line): Use it.
-       (require_file): Ditto.
-       (am_conf_line_error): Handle empty line number.
-       (ac_gettext_line, ac_output_line): New variables.
-       (scan_configure): Set them.
-
-Fri Mar  1 00:13:04 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (parse_arguments): Default strictness is gnu.
-       Changed `normal' to `foreign' everywhere.
-       (parse_arguments): Handle --foreign.
-       (initialize_global_constants): Document --foreign.
-       (handle_dependencies): Better error message.
-       (handle_texinfo): Don't push $vtexi on @texis.
-       (handle_texinfo): Only push $vtexi on @texi_deps if not null.
-       (handle_configure): install-sh is a config file; require it as
-       such.
-       (parse_arguments): Renamed --install-missing to --add-missing.
-       (add_missing): Renamed from install_missing.
-       (am_install_var): Check to make sure contents of install variable
-       are correct if primary requires it.  Test badprog.test.
-       (initialize_global_constants): Initialize
-       %primary_uses_subobjects.
-       (handle_source_transform): Skip configure substitutions.  Test
-       depend.test.  Also, skip empty elements.
-
-Thu Feb 29 22:00:30 1996  Tom Tromey  <address@hidden>
-
-       * texinfo.tex: New version.
-
-       * automake.in (am_install_var): Allow extended range of
-       installation directories.
-
-       * automake.in (get_object_extension): Don't allow
-       @CONFIG_INCLUDE_SPEC@ in the Makefile.in when config.h not used.
-       From Gord Matzigkeit.  Test confincl.test.
-
-       * texinfos.am (install-info): Changed usage of install-info (in
-       comment).  Per Feb 25 GNU Standards document.
-
-Wed Feb 28 07:40:55 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): New function.
-       (generate_makefile): Call it.
-       (handle_subdirs): Skip directories whose names look like configure
-       substitutions.
-       (handle_subdirs): Require intl and po, not @INTLSUB@ and @POSUB@,
-       when using gettext.
-       (scan_configure): Clear in_ac_output if "]" found.  Test
-       acoutqnl.test.
-       (require_config_file): New function.
-       (generate_makefile): Use require_config_file.
-       (config_aux_path): New variable.
-       (scan_configure): Check for AC_CONFIG_AUX_DIR.
-       (handle_merge_targets): Add install-strip rule.
-
-Tue Feb 27 20:00:36 1996  Tom Tromey  <address@hidden>
-
-       * mdate-sh: New version from Ulrich Drepper.
-
-       * automake.in (handle_source_transform): Changed fill back to
-       empty string.
-       (handle_libraries): Ditto.
-       (handle_dist): Ditto.
-       (handle_dependencies): Ditto.
-       (handle_footer): Ditto.
-       (handle_phony): Ditto.
-
-       * Makefile.am (DIST_SUBDIRS): Removed.
-       (installcheck-local): Use Perl, not test -x.
-       (PERL): New macro.
-       (maintainer-check): Use $(PERL), not @address@hidden
-
-       * configure.in (VERSION): Upped to 0.31.
-
-Sat Feb 24 18:02:19 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): AC_CHECK_TOOL requires config.sub
-       and config.guess.
-
-       * automake.in: Use keyed_aclocal_warning when warning about
-       fp_PROG_INSTALL.
-       (get_object_extension): Use keyed_aclocal_warning when warning
-       about fp_C_PROTOTYPES.
-       (keyed_aclocal_warning): New function.
-
-       * Makefile.am (pkgdata_DATA): Install aclocal.m4.
-       * aclocal.m4: Include fp_C_PROTOTYPES, fp_PROG_CC_STDC.
-
-       * automake.in (get_object_extension): Only give error about
-       fp_C_PROTOTYPES once.
-
-       * automake.in (seen_ranlib): New variable.
-       (scan_configure): Recognized AC_PROG_RANLIB.
-       (handle_libraries): Error if ranlib not checked for.
-
-       * automake.in (default_strictness): Default to GNU.
-       (default_strictness_name): Ditto.
-
-Wed Feb 21 18:15:02 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Removed @kr@ support.
-       (get_object_extension): Ditto.
-
-       * Makefile.am (pkgdata_DATA): Include ansi2knr.c and ansi2knr.1.
-
-Tue Feb 20 17:25:18 1996  Tom Tromey  <address@hidden>
-
-       * depend.am ($(srcdir)/.deps/%.P): Regexp fix.
-
-Mon Feb 19 19:53:09 1996  Tom Tromey  <address@hidden>
-
-       * remake.am ($(srcdir)/Makefile.in): Depend on configure.in.
-       * remake-subd.am ($(srcdir)/Makefile.in): Depend on configure.in.
-
-       * automake.in (handle_scripts): Ensure $scripts_installed set to
-       boolean value.  Test proginst.test.
-
-       * Makefile.am (installcheck-local): New target.
-
-       * automake.in (require_file): No error if missing file is
-       installed.
-
-Sun Feb 18 17:10:00 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_scripts): SCRIPTS no longer automatically
-       cleaned.  Now possible to install scripts in pkgdatadir.
-       ($seen_canonical): New variable.
-       (generate_makefile): Check for config.guess and config.sub here;
-       fixes bug reported by Gord Matzigkeit.
-
-       * Makefile.am (pkgdata_SCRIPTS): New variable.
-       (CLEANFILES): New macro.
-
-       * scripts-clean.am: Removed.
-
-Sat Feb 17 00:15:20 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Error if primary variable actually
-       defined.
-       (am_install_var): Skip elements that look like configure
-       substitutions.
-       (am_install_var): "EXTRA" is a valid prefix.
-       (am_install_var): Push contents EXTRA_PRIMARY onto @result.
-       (handle_merge_targets): Treat "all" target like "install".
-       (handle_subdirs): Don't push all-recursive.
-
-       * header.am (address@hidden@HEADERS): Don't depend on all.
-       * data.am (address@hidden@DATA): Don't depend on all.
-       * libraries.am (address@hidden@LIBRARIES): Don't depend on all.
-       * programs.am (address@hidden@PROGRAMS): Don't depend on all.
-       * scripts.am (address@hidden@SCRIPTS): Don't depend on all.
-
-       * automake.in (am_install_var): Push generated install targets
-       onto @phony.
-
-       * subdirs.am: No longer depend on Makefile and $(CONFIG_HEADER).
-       * automake.in (handle_merge_targets): Correctly handle recursive
-       calls of uninstall, install-exec, and install-data.
-       (handle_merge_targets): Put Makefile, and possibly $config_name,
-       onto @all.
-       (handle_merge_targets): Push 'all' onto @install as appropriate.
-
-Fri Feb 16 18:27:04 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): config.status is in
-       $(top_builddir), not $(top_srcdir).  Reported by Anthony Green.
-
-       * automake.in (scan_configure): Recognize (AC|fp)_FUNC_FNMATCH.
-
-Thu Feb 15 19:12:45 1996  Tom Tromey  <address@hidden>
-
-       * automake.in: (seen_prog_yacc): New variable.
-       (scan_configure): Look for yacc.
-       (handle_source_transform): Skipp C++ header files.
-       (handle_source_transform): .cxx is a C++ source file.
-
-Wed Feb 14 08:36:02 1996  Tom Tromey  <address@hidden>
-
-       * depend.am ($(srcdir)/.deps/.P): Use "echo", not ":".
-
-       Implemented --verbose feature; idea from Greg Woods:
-       * automake.in (verbose): New global.
-       (generate_makefile): Print creating message if verbose.
-       (grep_for_vers_texi): Print message if verbose.
-       (handle_dependencies): Ditto.
-       (scan_configure): Ditto.
-       (read_am_file): Ditto.
-       (parse_arguments): Added --verbose.
-       (initialize_global_constants): Ditto.
-
-       * automake.in (get_object_extension): Use am_line_error.
-       (handle_source_transform): Ditto.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (handle_dist): Ditto.
-       (handle_dist): Ditto.
-       (handle_subdirs): Ditto.
-       (handle_configure): Ditto.
-       (handle_merge_targets): Ditto.
-       (am_install_var): Ditto.
-       (am_line_error): Allow actual line number as argument.
-       (handle_configure): Use am_line_error.
-       (scan_configure): Set config_header_line.
-       (config_header_line): New global.
-       Use @PERL@ to find perl during exec.  From Greg Woods.
-
-Tue Feb 13 22:06:51 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_per_input): Init %content_lines.
-       (read_am_file): Set appropriate content_lines elements while
-       reading.
-       (am_line_error): New function.
-       (read_am_file): Use it.
-       (handle_options): Ditto.
-
-       * automake.in (scan_configure): Handle case where more than one .o
-       is put into LIBOBJS at once.  Test libobj.test.
-
-Mon Feb 12 20:39:28 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): Ignore "\" in AC_OUTPUT line.
-       Test acouttbs.test.
-       (handle_subdirs): Restored intl, po warnings.
-
-       * automake.in (scan_configure): Delete everything after "," or
-       ")".  Test acoutnoq.test.
-       (handle_dist): Use $relative_dir, not nonexistent $subdir.
-       (handle_subdirs): 'po' and 'intl' are sometimes substituted into
-       SUBDIRS; don't warn about their absence.
-
-Sun Feb 11 16:55:15 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Removed bogus error message.
-
-       * automake.in (handle_texinfo): Push $(INFO_DEPS), not 'info',
-       onto @all.
-       (handle_options): Handle version number.
-
-       * automake.in ($maint_charset, $dist_charset): New variables.
-       (initialize_per_input): Init $local_maint_charset.
-       (handle_dist): Handle DIST_CHARSET and MAINT_CHARSET.
-       (generate_makefile): Don't print "creating...".
-
-Sat Feb 10 16:45:07 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (get_object_extension): Substitute
-       @CONFIG_INCLUDE_SPEC@ if CONFIG_HEADER defined.
-       (handle_source_transform): Use $1, not \1.
-       (pretty_print_internal): Handle Tabs in fill when computing indent
-       on new line.
-       (handle_merge_targets): Always generate install-exec and
-       install-data targets.  Test instexec.test.
-       Fixed error message if fp_PROG_INSTALL missing.
-
-       * compile-vars.am (DEFS): Include -I., -I$(srcdir), and
-       @address@hidden
-
-       * automake.in (scan_configure): Delete everything after "]".  Test
-       acoutput.test.
-
-       * configure.in (AC_OUTPUT): Create tests/Makefile.
-       * Makefile.am (SUBDIRS): New macro.
-
-       * automake.in (handle_texinfo): Put $vtexi on texi_deps.  From Jim
-       Meyering.
-
-       * configure.in (AC_OUTPUT): Ensure automake is executable.
-
-Thu Feb  8 17:30:29 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_subdirs): Error if directory in SUBDIRS does
-       not exist.
-
-       * automake.in (handle_configure): Handle AC_OUTPUT ":" syntax.
-
-       From Jim Meyering:
-       * libraries.am (address@hidden@LIBRARIES): Depend on all, not
-       (@address@hidden).
-       * header.am (address@hidden@HEADERS): Depend on all, not
-       $(@address@hidden).
-       * data.am (address@hidden@DATA): Depend on all, not $(@address@hidden).
-       * scripts.am (address@hidden@SCRIPTS): Depend on all, not
-       $(@address@hidden).
-       * programs.am (address@hidden@PROGRAMS): Depend on all, not
-       $(@address@hidden).
-
-       * automake.in (initialize_per_input): Initialize
-       $use_dependencies.
-       ($seen_path_xtra): New variable.
-       (scan_configure): Look for AC_PATH_XTRA.
-       (get_object_extension): Add variables to output if X seen.
-
-Thu Feb  8 10:02:45 1996  Greg A. Woods  <address@hidden>
-
-       * automake.in (handle_programs): add pkglib to list of
-       directories for C
-       (various): include a tab as fill for continuation lines
-       printed with pretty_print*, esp. for macro variable assignments.
-       [ changed to 4 spaced by me ]
-
-Wed Feb  7 18:00:29 1996  Tom Tromey  <address@hidden>
-
-       * configure.in (VERSION): Upped to 0.30.
-
-       * Makefile.am (automake): Removed.
-       (DIST_OTHER): Removed.
-
-       * automake.in (handle_source_transform): All dep_files are
-       relative to $(srcdir).
-       (handle_libraries): Ditto.
-       (scan_configure): Test for AC_PROG_INSTALL as well as
-       fp_PROG_INSTALL.  Don't error here.
-       (seen_prog_install): Now global.
-       (scripts_installed): New global.
-       (handle_scripts): Set it.
-       Give error if appropriate install macro not seen.
-       (handle_subdirs): Ensure $seen_gettext before requiring
-       gettext-specific files.
-       (handle_configure): Automatically rebuild 
-
-        From Jim Meyering:
-       * automake.in (handle_source_transform): Use \W when quoting
-       regexp.  When blah_SOURCES not explicitly defined, still create
-       entry in %deps.
-       * depend.am ($(srcdir)/.deps/%.P): Don't use \< in regexp.
-       * subdirs.am (maintainer-clean-recursive): Now depends on
-       $(CONFIG_HEADER) and Makefile.
-
-       * automake.in (handle_source_transform): Skip macro references.
-
-Mon Feb  5 14:58:58 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Include "rm" when deleting files.
-
-       * Makefile.am (maintainer-check): Expect only one ${...}.
-       * texinfos.am (install-info): Remove unneeded ${...}.  From Jim
-       Meyering.
-
-       * automake.in (handle_configure): Only define CONFIG_HEADER if
-       $config_name.
-       ($seen_gettext): New variable.
-       (handle_subdirs): Do all gettext-related checking here.
-       (scan_configure): Just set $seen_gettext.
-       (handle_man_pages): Properly quote $(MANS).
-
-Wed Jan 31 09:51:30 1996  Tom Tromey  (address@hidden)
-
-       * depend.am: Don't use srcdir anywhere.
-       * automake.in (handle_libraries): Don't make .deps relative to
-       srcdir.
-       (handle_options): Recognize no-dependencies.
-
-       * depend.am (MKDEP): From Jim Meyering: Do nothing if srcdir is
-       ".".  Properly quote regexp.
-
-Tue Jan 30 12:19:09 1996  Tom Tromey  (address@hidden)
-
-       * automake.in (handle_configure): Only defined CONFIG_HEADER if
-       $config_name.
-       (read_am_file): Quote regexp when substituting top_builddir.
-       (handle_source_transform, handle_libraries): Look in
-       $(srcdir)/.deps for .P files.
-
-Fri Jan 26 00:15:25 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (am_conf_error): New function.
-       (scan_configure): Use it.
-       (scan_configure): A comma also ends AC_OUTPUT macro.
-
-       * automake.in (read_am_file): Compute top_builddir when including
-       header-vars.am.
-       (handle_configure): Use $top_builddir, not $top_reldir.
-       (other_input_files): New variable.
-       (dirname): Fixed bug where dirname of 'a/b/c' was 'a', not 'a/b'.
-
-       Changes from Gord Matzigkeit to enabled hierarchies deeper than 2:
-       * automake.in (input_files, seen_make_set): Declare globally.
-       (parse_arguments): Use input_files, not make_list.
-       Only scan configure.in once.
-       (handle_dist): Use SUBDIRS to determine when to make
-       subdirectories and recurisvely dist.  Use $(topdir), not "..", to
-       find top of dist tree.
-       (handle_configure): Check for AC_PROG_MAKE_SET here.  Don't require
-       configure.in (done elsewhere).
-       (scan_configure): seen_make_set is global.  Allow arbitrary space
-       in LIBOBJS assignment.
-       (top_builddir): New variable.
-       * header-vars.am (top_builddir): New variable.
-       * remake-subd.am (Makefile): Look in top_builddir, not .., when
-       remaking.
-       * automake.in (handle_merge_targets): Run 'all' before
-       check-recursive.
-
-       * automake.in (file_contents_with_transform): Changed error
-       message.
-       (handle_configure): Define $contents{'CONFIG_HEADER'}.
-
-       * texi-version.am: Many changes to support multiple .texi files.
-       Replaced "version.texi" with "@VTEXI@".  Replaced "vti" with
-       "@VTI@".
-       * automake.in (handle_configure): install.sh is an anachronism.
-       (handle_texinfo): Generalized for multiple .texi files.  Handle
-       'clean-info' internally.
-       * texi-clean.am: Removed.
-       * Makefile.am: Updated for removal.
-
-Wed Jan 24 22:55:32 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (grep_for_vers_texi): New function.
-       (handle_texinfo): Use grep_for_vers_texi, not system("grep").
-       (handle_texinfo): Changes to generalize to multiple .texi files.
-
-Tue Jan 23 14:22:16 1996  Tom Tromey  <address@hidden>
-
-       Fixes from Gord Matzigkeit:
-       * libraries.am (address@hidden@LIBRARIES): Use top_srcdir, not
-       topsrcdir.
-       * header.am: New file.
-       * Makefile.am (pkgdata_DATA): Install header.am.
-       * automake.in (handle_headers): Use header.am, not data.am.
-       (am_install_var): Allow pattern to be compiled multiple times.
-
-       * config.guess, config.sub: New files.
-       * Makefile.am (pkgdata_DATA): Install config.guess and
-       config.sub.
-       * automake.in (scan_configure): Recognize AC_CANONICAL_HOST and
-       AC_CANONICAL_SYSTEM.
-
-Sun Jan 21 15:51:48 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Use info_TEXINFOS, not TEXINFOS.
-       (handle_man_pages): Use man_MANS, not MANS.
-
-       * Makefile.am (info_TEXINFOS): Renamed.
-
-       * automake.in (scan_configure): Remove comments from input line.
-       (am_variable): Removed.
-
-       * remake-hdr.am (stamp-h): Use new macro CONFIG_HEADER_IN.
-
-       * automake.in (config_name, config_header): New globals.
-       (scan_configure): Look for AC_CONFIG_HEADER.
-       (handle_configure): Handle more uses of AC_CONFIG_HEADER.
-
-Sat Jan 20 15:54:24 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Bug fix.
-
-Fri Jan 19 00:50:29 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (require_file): Install missing files only according
-       to desired strictness.
-       (initialize_per_input): Don't init libsources.
-       (scan_configure): Reinit libsources.
-       (handle_libraries): Search _LIBADD for @LIBOBJS@ and @address@hidden
-       (fp_c_prototypes): New global.
-       (scan_configure): Set it.
-       (get_object_extension): Error if fp_C_PROTOTYPES not in
-       configure.in when using ansi2knr.
-       (handle_source_transform): Skip header files.
-
-       * automake.in (handle_dist_worker): Explicitly make 'dist' in
-       subdirs.
-
-Thu Jan 18 00:25:56 1996  Tom Tromey  <address@hidden>
-
-       From François Pinard:
-       * automake.in (handle_source_transform): Transform $o file into .P
-       file.
-       (handle_dist_worker): Handle case where DISTFILES includes
-       wildcard.  Bug fix in subdir case.
-
-       * automake.in (parse_arguments): Initialize strictness to
-       'normal'.
-
-Sun Jan 14 13:54:16 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_configure): Look for NLS support.
-
-       Changes from François Pinard:
-       * texinfos.am (install-info): Correctly install when build dir is
-       not srcdir.
-       * tags-subd.am (ID): Indentation change.
-       * kr-vars.am (o): Use "address@hidden@o", not "@address@hidden".
-       * depend.am ($(srcdir)/.deps/%.P): Remove temporary file.
-       * automake.in (handle_dist_worker): Fixlets.
-       (handle_dist): Sort keys going into dist_common.
-
-Sat Jan 13 00:18:06 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): If Gnits, don't allow release
-       until NEWS is updated.
-
-       * configure.in (VERSION): Version 0.29.
-
-       * Makefile.am (maintainer-check): Look for perl4.036 in path.
-
-       * dist-vars.am (DISTFILES):  Include BUILT_SOURCES.
-       (DEP_DISTFILES): Ditto.
-
-       * automake.in (handle_dist_worker): Depend on DEP_DISTFILES.
-       * dist-vars.am (DEP_DISTFILES): New variable.
-
-       * automake.in (handle_options): Support dist-shar option.
-       (handle_dist_worker): New function.
-       (handle_dist): Use it.
-
-       * texi-version.am (mostlyclean-vti): Remove version.tmp, not
-       *.tmp.
-
-       * automake.in (handle_dist): Chmod distdir 777.  From François
-       Pinard.
-
-       * automake.in (scan_configure): New function.
-       (initialize_per_input): Init libsources.
-       (generate_makefile): Run handle_configure first.
-       (handle_configure): Run scan_configure.
-       (handle_configure): Don't look for AC_PROG_MAKE_SET here.
-
-Thu Jan 11 23:14:18 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (AUTOMAKE_OPTIONS): New variable.
-
-       * automake.in (strictness, strictness_name): Renamed.
-       (initialize_per_input): Set strictness, strictness_name.
-       Initialize %options.
-       (generate_makefile): Run handle_options.
-       (handle_options): New function.
-       (handle_man_pages): Make install-man depend on $(MANS).  Turn off
-       man page install if no-installman option given.
-       (read_am_file): Deprecate @address@hidden
-       (get_object_extension): Look at ansi2knr option.
-       (parse_arguments): Take global strictness from command-line
-       options.
-
-Tue Jan  9 11:24:14 1996  Tom Tromey  <address@hidden>
-
-       Fixes from François Pinard:
-       * depend.am ($(srcdir)/.deps/%.P): Handle deansification.
-       * automake.in (get_object_extension): Use $o, not $(kr)o.
-       (handle_source_transform): Don't look for $(kr)c files.
-       * kr-vars.am (o): New macro.
-       (kr): Removed.
-
-       * depend.am (DEP_FILES): Removed.
-       * automake.in (handle_source_transform): Push .P file onto
-       dep_files.
-       (initialize_per_input): New variable %dep_files.
-       (handle_dependencies): Generate DEP_FILES here.
-
-Mon Jan  8 22:27:33 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (do_one_clean_target): Only remove config.status in
-       top-level directory.
-       (handle_tags): Removed 'id' from .PHONY list.  From Jim Meyering.
-
-       * clean.am (maintainer-clean-generic): Remove BUILT_SOURCES.
-
-       * automake.in (handle_dist): Make "ln" quiet.
-
-       * tags-subd.am (ID): Depend on HEADERS and SOURCES.
-
-Sat Jan  6 10:58:23 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): 'check' shouldn't depend on
-       'all' at top level.
-       (file_contents_with_transform): New function.
-       (am_install_var): Use file_contents_with_transform.
-       (handle_programs): Ditto.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_merge_targets): Let 'install' depend on 'all' if no other
-       dependencies exist.  From Jim Meyering.
-       (check_gnu_standards): GNU requires AUTHORS file.  (See
-       maintain.text).
-       (require_file): Put body in loop.
-       (get_object_extension): Only call require_file once.
-       (handle_configure): Ditto.
-
-       From Jim Meyering:
-       * depend.am ($(srcdir)/.deps/.P): Depend on $(BUILT_SOURCES).
-       * tags-subd.am (id): Removed.
-
-Fri Jan  5 10:31:19 1996  Tom Tromey  <address@hidden>
-
-       * Added copyright notice to each .am file.
-
-       * automake.in: Cleanups from François Pinard to avoid $#.
-       (require_argument): Fixed sense of test.
-       (set_strictness): Bug fix.
-
-Thu Jan  4 21:21:29 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (pkgdata_DATA): Removed old dist files.
-
-       * dist-subd-top.am, dist-subd.am, dist.am: Removed.
-
-       * automake.in (set_strictness): Set $strictness_name.
-       (strictness_name): New variable.
-       (handle_dist): Substantially rewrote.
-
-       * configure.in: Point AC_INIT at automake.in.
-
-       * automake.in (generate_makefile): Report errors against
-       Makefile.in, not Makefile.am.
-
-Wed Jan  3 00:05:40 1996  Tom Tromey  <address@hidden>
-
-       * mdate-sh: Bug fix from Jim Meyering.
-
-       * dist.am (dist): Changed in parallel with dist-subd-top.am.
-
-       * mkinstalldirs: Reverted.
-
-       * automake.in (initialize_global_constants): Allow COPYING.LIB
-       again.
-       (check_gnits_standards): Disallow COPYING.LIB.
-
-       * texinfos.am (install-info): Only look in $(srcdir) for info
-       files.
-
-       * automake.in (initialize_global_constants): New variable
-       gen_copyright.
-       (read_am_file): Put a copyright in each Makefile.in.
-
-       * dist-vars.am (DISTFILES): Put DIST_COMMON first.
-
-       * automake.in (am_install_var): Put space before "=".
-       (handle_dist): Put README first in DIST_COMMON.
-
-       * Makefile.am (pkgdata_DATA): Include COPYING.
-
-       * COPYING: New file.
-
-       * automake.in (parse_arguments): Added --gnu and --gnits as
-       synonyms.
-       (initialize_global_constants): Ditto.
-       (initialize_global_constants): Don't auto-distribute COPYING.LIB.
-       (initialize_global_constants): Look for README first.
-       (initialize_global_constants): Auto-distribute AUTHORS, BACKLOG,
-       ABOUT-GNU.
-       (check_gnu_standards): Require file COPYING.
-
-       From François Pinard:
-       * automake.in (file_contents): Comment out "warn"s.
-       (usage): Use 4 columns.
-       (USAGE_FORMAT): Ditto.
-
-       * texinfos.am (install-info): Look for info file relative to $$d.
-
-       * Makefile.am (cvs-dist): Suppress output of "grep".
-
-       * configure.in (VERSION): Version 0.28.
-
-       * automake.in (pretty_print_internal): Fix for Perl 4
-       compatibility.
-
-       * configure.in (VERSION): Version 0.27.
-
-       * depend.am ($(srcdir)/.deps/%.P): Must regexp-quote srcdir in sed
-       invocation.
-
-       * automake.in (initialize_global_constants): Don't quote "@" in
-       $install_man_format.
-       (handle_merge_targets): use "@:" as empty command, not ":".
-
-Tue Jan  2 23:33:24 1996  Tom Tromey  <address@hidden>
-
-       * texinfos.am (install-info): Look in $d for info files.  From
-       François Pinard.
-
-       * depend.am ($(srcdir)/.deps/%.P): Fixed regexp.
-
-       * automake.in (read_am_file): Correctly deal with continued
-       variable definitions.
-
-Mon Jan  1 15:43:25 1996  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): 'check' target depends on
-       'all'.
-       (file_contents): Don't be so verbose.
-       (read_am_file): Ditto.
-       (read_am_file): Must use substr to check for trailing \.
-       (am_install_var): Use push_phony_cleaners.
-       (file_contents): Set $was_rule when assuming a rule is seen.
-       (read_am_file): Ditto.
-       (do_one_clean_target): Removed spurious newline.
-
-       Some changes from François Pinard:
-       * Removed trailing whitespace from all '.am' files.
-       * tags-subd.am (ID): Use &&, not ;.
-       (TAGS): Ditto.
-       * automake.in (parse_arguments): Removed useless message.
-       (parse_arguments): Don't explicitly referenced STDERR.
-       (require_argument): Ditto.
-       (am_error): Ditto.
-       (set_strictness): Ditto.
-       (file_contents): Ditto.
-       (read_am_file): Ditto.
-       (generate_makefile): Style tweaks.
-       (handle_programs): Ditto.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (handle_tags): Ditto.
-       (handle_dist): Ditto.
-       (handle_subdirs): Ditto.
-       (handle_configure): Ditto.
-       (handle_footer): Don't put newline before footer.am contents.
-       (handle_merge_targets): Style tweaks.
-       (do_one_clean_target): Ditto.
-       (dirname): Ditto.
-       (am_variable): Ditto.
-       Defined some new constants.
-       (generate_makefile): Don't call generate_header.
-       (generate_header): Removed.
-       (file_contents): Rewrote.
-       (read_am_file): Rewrote.
-
-       * automake.in (generate_makefile): Handle phony target.
-       (do_one_clean_target): Pretty-print dependencies.
-       (handle_installdirs): Pretty-print rule.
-
-       * Makefile.am (maintainer-check): Made some commands silent.
-
-       * automake.in (initialize_global_constants): Don't install or
-       uninstall cat'd man pages.
-       (initialize_per_input): Added phony target.
-       (push_phony_cleaners): New function.
-       (get_object_extension): Handle phony targets.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (handle_tags): Ditto.
-       (handle_dist): Ditto.
-       (handle_subdirs): Ditto.
-       (handle_installdirs): Ditto.
-       (handle_merge_targets): Ditto.
-       (handle_clean): Ditto.
-       (do_one_merge_target): Ditto.
-       (am_install_var): Ditto.
-       (handle_phony): New function.
-       (generate_makefile): Call it.
-       (pretty_print_internal): New function.
-       (pretty_print_rule): Ditto.
-
-Sun Dec 31 13:04:59 1995  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Don't print body of
-       loop at make time.
-
-       Changes from François Pinard:
-       * depend.am (MKDEP): Include DEFS, INCLUDES, CPPFLAGS, CFLAGS.
-       (DEP_FILES): Put dependency files in $(srcdir).
-       Look in $(srcdir) when including dependency files.
-       ($(srcdir)/.deps/.P): .deps/.P is in $(srcdir).
-       (.deps/%.P): MKDEP includes all macro expansions.
-       * dist-subd-top.am (dist): Get absolute path for distdir.  Don't
-       be so verbose.
-       * dist-subd.am (dist): Don't be so verbose.
-       * dist.am (dist): Don't be so verbose.
-
-       * automake.in (do_one_clean_target): Remove config.status in
-       maintainer-clean.  From Jim Meyering.
-
-       * programs-clean.am (address@hidden@PROGRAMS): Bug fix.  From Jim
-       Meyering.
-
-       * automake.in (handle_merge_targets): Add dummy command for empty
-       install target.  From Jim Meyering.
-
-Tue Dec 12 10:06:28 1995  Tom Tromey  <address@hidden>
-
-       * texinfos.am (uninstall-info): Bug fix.
-
-       * Makefile.am (maintainer-check): Error if ${...} used.
-       * depend.am (DEP_FILES): Prefer $(...).
-
-       * scripts.am (address@hidden@SCRIPTS): Only install script if it
-       exists.
-       * libraries.am (address@hidden@LIBRARIES): Only install library if
-       it exists.
-       * programs.am (address@hidden@PROGRAMS): Only install program if it
-       exists.
-
-       * texinfos-vars.am (TEXFILES): Removed.
-
-       * Makefile.am (pkgdata_DATA): Removed libprograms.am.
-
-       * automake.in (do_one_merge_target): Never generate trailing
-       whitespace.
-       (pretty_print): New function.
-       (handle_footer): Prettyprint definitions.
-       (am_install_var): Ditto.
-       (handle_source_transform): Ditto.
-       (handle_dist): Ditto.
-       (handle_libraries): Ditto.
-       (read_am_file): Put comments nearer appropriate code.
-
-       * texi-clean.am (mostlyclean-info): Use continued lines, not
-       multiple rm's.  From Jim Meyering.
-
-Sun Dec 10 11:59:33 1995  Tom Tromey  <address@hidden>
-
-       * Makefile.am (pkgdata_DATA): Cause INSTALL, install-sh, mdate-sh,
-       mkinstalldirs, texinfo.tex to be installed.
-       * automake.in (symlink_exists): New global.
-       (install_missing): Ditto.
-       (require_file): Install missing files if possible.
-       (parse_arguments): Handle --install-missing option.
-       (initialize_global_constants): Document --install-missing.
-
-       * Makefile.am (cvs-dist): Don't release unless NEWS updated.
-       Ensure 'checks' pass before release.
-       (maintainer-check): Renamed.  Look in $(srcdir) for sources.  From
-       Franc,ois Pinard.
-       (cvs-dist): Depend on maintainer-check instead of explicitly
-       running check.
-
-       * configure.in (VERSION): Version 0.26.
-
-       * Makefile.am (check-local): Only look at [a-z]*.am.  Fixed sense
-       of 'if' test.
-
-       * depend.am (DEP_FILES): Bug fix.
-
-       * automake.in (do_one_clean_target): Typo.
-
-       * Makefile.am (check-local): Run syntax check under Perl 4.
-
-       * automake.in: Fixes for Perl 4, from Gord Matzigkeit.
-       (handle_source_transform): Loop variable is now $_.  From Gor
-
-       * Makefile.am (check-local): Check for 'true' in source.
-       * texinfos.am (install-info): Can't use "true" in any rule.
-
-Sat Dec  9 10:16:48 1995  Tom Tromey  <address@hidden>
-
-       * Makefile.am (cvs-dist): New target.
-
-       * tags.am (TAGS): Use "test -z ... ||" to avoid spurious
-       failures.
-
-       * texinfos.am (install-info): Don't do install-info for now.
-
-       * clean.am (distclean-generic): Don't remove config.status here.
-       * automake.in (do_one_clean_target): Remove config.status later,
-       for 'make -j2'.  From Jim Meyering.
-
-Fri Dec  8 16:30:48 1995  Tom Tromey  <address@hidden>
-
-       * configure.in (VERSION): Version 0.25.
-
-       * automake.in (handle_texinfo): Use "$? >> 8", not "$?".
-       (handle_configure): Check for AC_PROG_MAKE_SET.
-
-       * depend.am (DEP_FILES): Handle deANSIfication case.  From Jim
-       Meyering.
-
-       * automake.in (am_install_var): Changed how 'clean' handled for
-       uniform name targets.
-       * Makefile.am (pkgdata_DATA): Added new files.
-       * data-clean.am: New file.
-       * scripts-clean.am: New file.
-       * libraries-clean.am: New file.
-       * programs-clean.am: New file.
-
-Wed Dec  6 00:06:11 1995  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Error if variable name
-       "misspelled".
-       (handle_source_transform): Automatically include .c file
-       corresponding to .y or .l.
-
-Tue Dec  5 00:46:14 1995  Tom Tromey  <address@hidden>
-
-       * programs.am: Changed for uniform naming scheme.
-
-       * automake.in (read_am_file): Allow '-' and '.' in target names.
-       (generate_makefile): Don't pass arguments to handle_libraries.
-       (initialize_per_input): Define @sources, @objects.
-       (generate_makefile): Init @sources, @objects if needed.
-       (handle_source_transform): Push onto @sources, @objects here.
-       (am_install_var): Push primary onto @all, for configure-time
-       customization.
-       (handle_programs): Use new uniform naming scheme.
-
-       * Makefile.am (check-local): New target.
-
-       * automake.in (handle_libraries): Use uniform naming scheme.
-
-       * libraries.am: Rewrote for uniform naming scheme.
-
-       * scripts.am: Updated names of all clean targets.
-
-       * automake.in (handle_programs): Split on all whitespace.
-       (handle_libraries): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_man_pages): Ditto.
-       (am_install_var): Changed return result.
-       (am_install_var): Changed interface.
-       (am_install_var): Push onto @clean@ if requested.
-       (handle_scripts): Pass -clean to am_install_var.
-
-Mon Dec  4 11:55:36 1995  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Push target onto @all.
-       (get_object_extension): Use $(...).
-       (handle_source_transform): Ditto.
-       (handle_programs): Ditto.
-
-       * automake.in (require_argument): New function.
-       (parse_arguments): Use it.
-       (push_dist_common): New function.
-       (generate_makefile): Use it.
-       (handle_texinfo): Ditto.
-       (handle_dist): Ditto.
-       (handle_configure): Ditto.
-       (require_file): Ditto.
-       (generate_makefile): Don't pass arguments to handle_scripts.
-       (handle_configure): Require configure.in.
-       (check_gnu_standards): New function.
-       (check_gnits_standards): Ditto.
-       (generate_makefile): Check standards.
-
-       * Makefile.am (bin_SCRIPTS): Changed name from SCRIPTS.
-
-       * automake.in (LENIENT, GNU, GNITS): New constants.
-       (initialize_per_input): New function.
-       (generate_makefile): Use it.
-       (initialize_global_constants): Renamed from init_globals.
-       (require_file): Added strictness argument.
-       (parse_arguments): Added --strict option.
-       (set_strictness): New function.
-       (parse_arguments): use it.
-       (initialize_global_constants): Document --strictness.
-
-       * automake.in: Use ${1+"$@"} to preserve quoting when running
-       under sh.
-
-       * texinfos.am (install-info): Don't use "true".
-       * tags.am (TAGS): Don't use "true".
-
-       * dist.am, dist-subd-top.am, remake-hdr.am, remake-subd.am,
-       remake.am, subdirs.am, texinfos.am: Use "&&" after cd.
-
-       * program.am (@PROGRAM@): Use LINK macro.
-       * compile.am (.c.o): Use COMPILE macro.
-
-       * clean.am, remake-hdr.am, remake.am, texinfos.am: Use $(...), not
-       ${...}.
-
-       * subdirs.am (RECURSIVE): Removed macro.
-
-       * clean.am: Changed to not be so verbose.
-
-       * Makefile.am (pkgdata_DATA): Include texi-clean.am.
-       * automake.in (handle_texinfo): Transform texi-clean and put into
-       output rules.
-       * texinfos-vars.am (TEXFILES): Removed.
-       * texinfos.am: Removed 'clean' targets.
-       * texi-clean.am: New file.
-
-       * Makefile.am (ETAGS_ARGS): Just use 'automake.in'.
-
-       * texinfos-vars.am (TEXFILES): Added *.op.
-
-       * dist-vars.am (DISTFILES): Renamed from DIST_FILES, per GNU
-       standards.
-       * dist.am (dist): Use DISTFILES.
-       * dist-subd.am (dist): Use DISTFILES.
-       * dist-subd-top.am (dist): Use DISTFILES.
-
-Sun Dec  3 00:24:08 1995  Tom Tromey  <address@hidden>
-
-       * Makefile.am (ETAGS_ARGS): Define.
-
-       * depend.am (.deps/.P): Use ":", not "echo timestamp".  From Jim
-       Meyering.
-
-       * dist-vars.am (DIST_FILES): Removed PACKAGEDATA.
-
-       * automake.in (handle_scripts): Use am_install_var.
-
-       * scripts.am: Rewrote for new uniform naming scheme.
-
-       * Makefile.am (pkgdata_DATA): Removed libscripts.am.
-
-       * libscripts.am: Removed.
-
-       * packagedata.am: Removed.
-
-       * Makefile.am (PACKAGEDATA): Removed packagedata.am.
-       (pkgdata_DATA): Renamed from PACKAGEDATA.
-
-       * automake.in (handle_data): Use am_install_var.
-       (init_globals): Init %exec_dir_p.
-
-       * data.am: Rewrote for new uniform naming scheme.
-
-       * automake.in (get_object_extension): New function.
-       (handle_programs): Use it.
-       (dir_holds_sources): Changed interpretation.
-       (handle_headers): New function.
-       (am_install_var): New function.
-       (generate_makefile): Call handle_headers.
-
-       * header-vars.am (pkgdatadir): New macro.
-       (pkglibdir): Ditto.
-       (pkgincludedir): Ditto.
-
-       * automake.in (handle_source_transform): New function.
-       (am_error): New function.
-       (generate_makefile): Use it.
-       (handle_source_transform): Ditto.
-       (handle_texinfo): Ditto.
-       (handle_dependencies): Ditto.
-       (handle_merge_targets): Ditto.
-       (require_file): Ditto.
-
-Sat Dec  2 21:39:56 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: Updated FSF address.  From Jim Meyering.
-       * header-vars.am: Updated FSF address.
-
-       * distname.am: Removed.
-
-       * automake.in (file_contents): Strip "##" comments.
-       * Various files: Added "##" comments for strange things.
-
-       * automake.in (handle_tags): Generate TAGS rule for every
-       directory.
-
-       * subdirs.am (RECURSIVE): Include installcheck-recursive.
-       * automake.in (installcheck): New variable.
-       (generate_makefile): Initialize it.
-       (handle_subdirs): Push 'installcheck-recursive'.
-       (handle_merge_targets): Handle installcheck target.
-
-Thu Nov 30 20:13:16 1995  Tom Tromey  <address@hidden>
-
-       * automake.in ($PACKAGE): Removed.
-
-       * header-vars.am (ALL): Removed.
-
-       * automake.in: Reworked 'all' target handling.
-
-       * automake.in (generate_makefile):
-       Don't use AM_ forms in call to am_variable.
-
-       * automake.in: Changes for Perl 5, from Gord Matzigkeit
-
-       * clean.am (MOSTLYCLEANFILES, MAINTAINERCLEANFILES): New variables.
-
-       * automake.in (handle_footer): Allow SUFFIXES variable.
-
-       * automake.in (am_variable): New function.
-       (handle_texinfo): Use it.
-       (generate_makefile): Use it.
-
-       * configure.in: Version 0.24.
-
-Wed Nov 29 23:50:14 1995  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_libraries):
-       Generate blah_LIBADD defines if required.
-
-       * library.am (address@hidden@.a): Look at $(@address@hidden)
-
-       * libraries-vars.am (LIBOBJS, ALLOCA): Removed.
-
-       * compile-kr.am: ($(OBJECTS)): Depend on $(ANSI2KNR), not ansi2knr.
-
-       * configure.in: Version 0.23
-
-       * dist-subd-top.am (dist): Don't die if a subdirectory already exists.
-
-       * dist-subd-top.am, dist.am (dist): Give automake --output-dir option.
-
-       * automake.in: New option --output-dir
-
-       * automake.in (handle_configure): Fixed typo.
-
-       * automake.in (handle_installdirs): Always make installdirs target.
-
-       * subdirs.am (RECURSIVE): Removed uninstall-data-recursive and
-       uninstall-exec-recursive.  Added installdirs-recursive.
-
-       * automake.in (handle_installdirs): Handle installdirs-recursive.
-       (handle_man_pages): 'all' depends on $(MANS)
-
-       * Makefile.am: Removed mans.am.
-
-       * automake.in: More man-related fixes
-
-       * automake.in: Bug fixes
-
-       * automake.in: Rewrote man page handling.
-
-       * texi-version.am, remake-hdr.am, depend.am: Don't use touch.
-
-       * automake.in (handle_installdirs): New function.
-       (@installdirs): New global.
-       Many changes to deal with installdirs.
-
-       * clean.am (clean-generic): Always supply 'else' clause to 'if'
-
-       * automake.in (generate_header): Don't use header.am.
-       (handle_dist): Don't use dist-subd-vars.am.
-
-       * Makefile.am (PACKAGEDATA): Removed dist-subd-vars.am, header.am.
-
-       * Makefile.am (DISTCLEANFILES): Removed.
-
-       * clean.am (clean-generic): Bug fix.
-
-       * clean.am (clean-generic): Only remove CLEANFILES if nonempty
-
-       * texi-version.am (clean-vti): No such macro as VTI
-
-Tue Nov 28 19:56:07 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: Bug fix for maintainer-clean
-
-       * automake.in (do_one_clean_target):
-       Print special text in maintainer-clean.
-       (handle_clean): Always include clean.am
-
-       * clean.am: Use -generic clean targets.
-
-       * compile.am: Added clean targets.
-
-       * configure.in: Version 0.22.
-
-       * automake.in (handle_dependencies):
-       Put trailing newline after all deps.
-
-       * automake.in (handle_dependencies): Another dependency bug fix.
-
-       * automake.in (handle_dependencies):
-       Bug fix when including dependencies.
-
-       * automake.in (handle_configure):
-       Verify existence of install-sh, mkinstalldirs
-
-       * automake.in (handle_texinfo): Include stamp-vti in distribution
-
-       * dist-subd-vars.am, dist-vars.am (DIST_FILES):
-       Include DATA, PACKAGEDATA.
-
-       * Makefile.am: Nothing
-
-       * Makefile.am (DIST_OTHER): Don't distribute gettext-sh
-
-       * automake.in (handle_texinfo): Typo
-
-       * automake.in: If script ends up in shell, feed to perl
-
-       * automake.in: Rewrote 'clean' rules.
-       Documentation made and installed first.
-       'all' depends on 'info'
-
-Mon Nov 27 23:57:29 1995  Tom Tromey  <address@hidden>
-
-       * configure.in, Makefile.am: Turned off internationalization.
-
-       * clean-kr.am: Rewrote for new clean scheme.
-
-       * tags-clean.am: Remove TAGS in distclean, not maintainer-clean
-
-       * Makefile.am (PACKAGEDATA): Include tags-clean.am
-
-       * subdirs.am: Removed bogus local clean targets
-
-       * tags-clean.am: Initial revision
-
-       * texi-version.am: Added clean targets
-
-       * texinfos.am: Fixes to clean targets.
-
-       * texinfos.am, libscripts.am, scripts.am, libraries.am, libprograms.am, 
programs.am:
-       Added clean targets
-
-       * compile-kr.am (ansi2knr.o): Depend on CONFIG_HEADER
-
-       * automake.in: Completely revamped automatic de-ANSI-fication
-
-       * compile-kr.am: (ansi2knr, $(OBJECTS)): New targets
-
-       * compile-vars.am (LINK): New macro
-
-       * kr-vars.am: Trailing blank line
-
-       * compile-kr.am: Rewrote
-
-       * compile-vars.am (COMPILE): New macro
-
-       * compile-vars.am (ANSI2KNR): Removed
-
-       * Makefile.am (PACKAGEDATA): Removed all sed scripts.  Added kr-vars.am
-
-       * kr-vars.am: Initial revision
-
-       * automake.in (require_file): New function.
-       (handle_texinfo): Require 'mdate-sh'
-       (common_sometimes): New variable
-       (usage): Use it.
-
-       * texi-version.am (stamp-vti): Use Ulrich's mdate-sh script
-
-       * mdate-sh: Initial revision
-
-       * automake.in (handle_footer): Don't define SOURCES or OBJECTS if empty
-
-       * automake.in (generate_makefile):
-       Put Makefile.in, Makefile.am in @dist_common
-       (handle_configure): Use @dist_common as appropriate
-
-       * dist-subd-vars.am, dist-vars.am (DIST_CONF): Removed
-
-       * configure.in: Abort if perl not found
-
-       * configure.in: Look for perl
-
-       * automake.in: Reimplemented in Perl
-
-       * automake.in: Fixlet
-
-Sun Nov 26 08:09:30 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: Always print ".SUFFIXES:" rule.
-
-       * automake.in: Distribution config.h.in if required
-
-       * automake.in: Bug fix when including texi-version.am
-
-       * automake.in: Bug fix when looking for .texi file in $am_reldir
-
-       * depend.am: Comment fix
-
-       * automake.in: Look for .texi file in $am_reldir
-
-       * automake.in: Fixlet
-
-       * automake.in: Blank line after targets from user's Makefile.am
-
-       * automake.in: Move footer items to actual footer
-
-       * automake.in: Include stamp-h.in in DIST_COMMON if necessary
-
-       * automake.in (common):
-       Don't include acconfig.h, config.h.top, config.h.bot
-
-       * Makefile.am (CONFIG_HEADER): Renamed from CONFIG_H
-
-       * Makefile.am (CONFIG_H): Define
-
-       * acconfig.h: Initial revision
-
-       * configure.in: Use AC_CONFIG_HEADER.
-
-       * automake.in: Put blah_TEXINFOS into DIST_COMMON
-
-       * automake.in: .info file explicitly depends on primary .texi file
-
-       * texinfos.am (install-info): Always supply 'else' clause to 'if'
-
-       * tags.am (TAGS): Always supply 'else' clause to 'if'
-
-       * subdirs.am (.NOEXPORT): Removed (now in footer.am)
-
-       * automake.in: Always include footer.am in output
-
-       * mans.am (install-man): Always supply 'else' clause to 'if'
-
-       * automake.in: More version.texi fixes
-
-       * automake.in: Only do version.texi processing if requested.
-
-       * automake.in: Minor internationalization fixes.
-       Subshell can now exit with nonzero status.
-       Fixed up .texi handling; now uses texi-version.am
-       Make sure '.c' and '.o' are in .SUFFIXES if required.
-
-       * Makefile.am (PACKAGEDATA): Include texi-version.am
-       (stamp-vti, version.texi): Removed
-       (TEXINFOS): Don't reference version.texi
-
-       * texi-version.am: Initial revision
-
-       * dist.am, dist-subd-top.am (dist):
-       [DIST_SUBDIRS] Follow symlinks when copying.
-
-       * dist-subd-top.am (dist): Removed unneeded subdir= option to make
-
-Sat Nov 25 23:23:39 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: Added --amdir option
-
-       * Makefile.am, configure.in: Turned on internationalization
-
-       * Makefile.am: Set EDITION
-
-       * configure.in: Version 0.21
-
-       * tags.am, tags-subd.am: Don't use double-colon rules
-
-       * automake.in: Redid install-data, install-exec, uninstall handling
-
-       * configure.in: Turn off i18n
-
-Fri Nov 24 23:51:37 1995  Tom Tromey  <address@hidden>
-
-       * automake.in (common): Remove NLS
-
-       * automake.in (common): Include ABOUT-NLS.
-
-       * automake.in: Test for install-sh and mkinstalldirs
-
-       * automake.in: Blank line after OBJECTS= line
-
-       * automake.in: Start subshell in loop after check for Makefile.am
-
-       * automake.in: --use-deps now the default
-
-       * automake.in (am_dir): Don't apply transform to install directory name
-
-       * packagedata.am: Don't apply transform to install directory name
-
-       * Makefile.am (SUBDIRS): Hold off on internationalization
-
-Thu Nov 23 18:02:38 1995  Tom Tromey  <address@hidden>
-
-       * automake.in:
-       Write 'SOURCES =' line after copying Makefile.am variables
-
-       * automake.in: Fixed bug in "--" option processing
-
-       * subdirs.am: ($(RECURSIVE)): Removed trailing \ from last line
-
-       * Makefile.am (DIST_OTHER): Include gettext-sh
-
-       * Makefile.am (SUBDIRS): Define
-
-       * configure.in: Include internationalization bits
-
-       * automake.in: Many changes to avoid double-colon rules.
-
-       * subdirs.am: ($(RECURSIVE)): Print name of target actually used
-
-       * subdirs.am: Removed "::" rules
-
-       * header.am: Removed install, uninstall
-
-       * header.am: Added install, uninstall targets
-
-       * hack-make.sed: Rewrite targets like "all-local" to "all_local"
-
-       * header.am, libraries.am, mans.am, texinfos.am, footer.am:
-       Removed "::" rules
-
-       * Makefile.am (PACKAGEDATA): Include libscripts.am
-
-       * libprograms.am: Don't install libscripts here
-
-       * libscripts.am: Initial revision
-
-       * scripts.am, programs.am, libprograms.am: Removed "::" rules
-
-       * automake.in (am_dir): Run package name through name transform.
-
-       * automake.in: Don't use packagedata.sed or data.sed
-
-       * Makefile.am (PACKAGEDATA): Removed data.sed, packagedata.sed.  Added
-       packagedata.am
-
-       * data.am: No longer run through sed
-
-       * packagedata.am: Initial revision
-
-Wed Nov 22 22:31:02 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: No blank line after Usage
-
-       * automake.in: Removed "NLS nuisances" section.
-       Now uniformly uses $echo for user-visible messages (in advance of
-       internationalization)
-
-       * subdirs.am (maintainer-clean): Don't use realclean-local
-
-       * Makefile.am: Use PACKAGEDATA, not custom code
-
-       * data.am: Use @LONG@, not $(@LONG@)
-
-       * automake.in: Handle DATA and PACKAGEDATA
-
-       * packagedata.sed: Initial revision
-
-       * data.am: Use @DIR@, not $(@DIR@)
-
-       * data.sed: Use $(datadir), not datadir
-
-       * data.sed: Initial revision
-
-       * data.am: Wrote uninstall targets
-
-       * data.am: Initial revision
-
-       * dist-subd.am (dist): Don't link a file that has already been linked
-
-       * dist-subd-top.am, dist.am (dist):
-       Run `automake --include-deps' before making distribution
-
-       * automake.in: More dependency-tracking bug fixes
-
-       * dist-vars.am (DIST_FILES): Rearranged to be like dist-vars-subd.am
-
-       * dist-subd-vars.am (DIST_FILES): Include DIST_COMMON
-
-       * tags-subd.am, tags.am: Added trailing blank line
-
-       * depend.am: Use ".P", not "empty.P", as placeholder.
-
-       * automake.in: Only include depend.am if SOURCES not empty
-
-       * automake.in: Added --use-deps and --include-deps options.
-       Handle auto-generating dependencies.
-
-       * Makefile.am (am_DATA): Include depend.am
-
-       * depend.am: Initial revision
-
-       * automake.in: Look for acconfig.h, config.h.top, and config.h.bot
-
-       * automake.in: Put blank line after .SUFFIXES
-
-       * scripts.am: Added blank line at end
-
-       * scripts.am: Removed unnecessary comment
-
-       * scripts.am: Removed unnecessary workarounds
-
-       * automake.in: Don't include programs.am if PROGRAMS empty
-
-       * header-vars.am (INSTALL_SCRIPT): Typo
-
-       * texinfos.am, compile-kr.am: Don't include .SUFFIXES
-
-       * automake.in: Handle .SUFFIXES here.
-
-       * configure.in: Use fp_PROG_INSTALL
-
-       * header-vars.am: Changes for autoconf 2.5.
-       Now includes INSTALL_SCRIPTS.
-
-       * texinfos.am (install-info): Bug fix
-
-       * automake.in:
-       Include scripts.am or libscripts.am in output if appropriate
-
-       * programs.am (install-programs, uninstall-programs):
-       Don't install SCRIPTS
-
-       * Makefile.am (am_DATA): Include scripts.am
-
-       * scripts.am: Initial revision
-
-Tue Nov 21 09:11:38 1995  Tom Tromey  <address@hidden>
-
-       * automake.in:
-       Cleaned up how "prog_SOURCES" variable is found in input.
-       Ditto prog_OBJECTS.
-       Put static sed scripts into separate, installed files.
-
-       * Makefile.am (am_DATA): Include hack-make.sed and nl-remove.sed
-
-       * hack-make.sed, nl-remove.sed: Initial revision
-
-       * texinfos.am (install-info): Rewrote
-
-       * subdirs.am (all-recursive): Put with other -recursive rules
-
-       * configure.in: Version 0.20
-
-       * automake.in: Another bug fix
-
-       * automake.in: Bug fix when looking for texinfo.tex
-
-       * texinfo.tex: Initial revision
-
-       * automake.in:
-       If TEXINFOS defined but texinfo.tex does not exist, give warning.
-
-       * subdirs.am (all): Renamed from _all.  Now uses all-recursive
-       (all-recursive): Don't fail immediately if -k specified.
-
-Mon Nov 20 22:48:03 1995  Tom Tromey  <address@hidden>
-
-       * subdirs.am (_all):
-       New target.  Now use Jim Meyering's formulation of AIX
-       workaround.
-       (install-exec, install-data): New targets
-
-Sat Nov 18 19:07:30 1995  Tom Tromey  <address@hidden>
-
-       * remake.am (Makefile.in): automake "Makefile", not "Makefile.am"
-
-       * automake.in: Use @datadir@
-
-       * automake.in: Added @configure_input@ line
-
-Fri Nov 17 23:32:43 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: "--help" option now prints auto-recognized file names.
-       Allow AM_ overriding of more variables.
-
-       * texinfos.am (install-info):
-       Don't cd to srcdir to avoid breaking install-sh
-       Other bug fixes
-
-       * Makefile.am: Handle automake.texi
-
-Thu Nov 16 18:43:43 1995  Tom Tromey  <address@hidden>
-
-       * subdirs.am (all): Separated out due to AIX 3.2.5 bug.
-
-       * tags.am (TAGS): bug fix
-
-       * automake.in: Use am_dir, not AM_DIR.
-       Use version, not VERSION.
-       Bug fix in TAGS code.
-
-       * Makefile.am (am_DATA): Include tags.am and tags-subd.am
-
-       * subdirs.am: TAGS target now in tags.am
-
-       * footer.am: TAGS and ID targets now in tags-subd.am
-
-       * tags-subd.am, tags.am: Initial revision
-
-       * automake.in: Cleaned up AM_PROGRAM code.
-       Handle TAGS target better
-
-       * remake.am, remake-subd.am (Makefile.in): Bug fix.
-
-       * automake.in (usage): Updated
-
-       * remake-subd.am, remake.am:
-       Added rule where Makefile.in depends on Makefile.am
-
-       * automake.in: Entire body of 'for' loop now in subshell
-
-       * automake.in (common): config.guess and config.sub are common files.
-
-       * dist-subd-top.am, dist.am (dist): Bug fix.
-
-       * Makefile.am (DIST_OTHER): Don't include TODO
-
-       * automake.in: Auto-include TODO and THANKS files.
-
-       * dist-subd-top.am, dist.am (dist): Don't depend on DIST_DIRS
-
-       * automake.in: More bug fixes in "look for Makefile.am" code.
-
-       * automake.in: Bug fix in "look for Makefile.am" code.
-
-       * automake.in:
-       If no arguments given, look for all Makefile.am's in this
-       directory and in immediate subdirs
-
-       * automake.in: Bug fixes for LDADD-override feature.
-
-       * program.am: Use @address@hidden, and put after LDFLAGS
-
-       * automake.in: Allow `prog_LDADD', if specified, to override LDADD.
-
-       * automake.in: Use AM_PROGRAMS, not ALLPROGRAMS, and invert sense.
-
-       * header-vars.am (ALL): Use PROGRAMS, not ALLPROGRAMS.
-
-Wed Nov 15 01:54:43 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: No longer look for _SOURCES or _OBJECTS
-
-       * header-vars.am:
-       Remove "automatically created" header (now in automake).
-       Updated copyright.
-
-       * automake.in: Put version info in Makefile header
-
-Tue Nov 14 23:38:17 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: Minor cleanups
-
-       * dist-subd-top.am, dist.am (dist):
-       Don't link or copy file if it already exists.
-
-       * automake.in:
-       Look for _SOURCES (common sources) and generate _OBJECTS.
-
-       * footer.am (ID, TAGS): Include HEADERS
-
-       * dist-vars.am, dist-subd-vars.am (DIST_FILES): Include HEADERS
-
-Mon Nov 13 22:20:02 1995  Tom Tromey  <address@hidden>
-
-       * dist-subd.am (distdir): Is relative to ".."
-
-       * dist-subd-vars.am (PACKAGE, VERSION): Define
-
-       * dist-subd.am (dist): Don't handle DIST_DIRS.
-
-       * mans.am (uninstall-man): Another bug fix.
-
-       * mans.am (uninstall-man): Bug fix.
-
-       * dist.am, dist-subd-top.am (dist): Bug fix
-
-       * Makefile.am (DIST_SUBDIRS): New macro
-
-       * dist-subd-top.am, dist.am (dist): Handle DIST_SUBDIRS
-
-       * Makefile.am (DIST_OTHER): Include automake.in
-
-       * Makefile.am (DISTCLEANFILES): New macro.
-
-       * automake.in (common): Include COPYING.LIB
-
-       * Makefile.am (automake): New rule.
-
-       * texinfos.am (install-info): Changed per GNU standards
-
-       * remake-hdr.am (stamp-h.in):
-       Use "touch", not "date", per GNU standards.
-
-       * automake.in (common): Include texinfo.tex
-
-Sun Nov 12 23:59:08 1995  Tom Tromey  <address@hidden>
-
-       * automake.in: More fixes when finding common files.
-
-       * Makefile.am (DIST_OTHER): Another removal.
-
-       * automake.in: Special-case when amdir=.
-
-       * Makefile.am (DIST_OTHER): Removed auto-detected files.
-
-       * automake.in:
-       Search for commonly-used files and auto-include them in distribution
-
-       * dist-vars.am (DIST_FILES): Include DIST_COMMON.
-       (DIST_CONF): Removed files searched for by automake.
-
-       * automake.in: More arg-parsing bug fixes.
-
-       * Makefile.am (DIST_OTHER): Include install-sh
-
-       * Makefile.am (DIST_OTHER): Don't include auto-included files.
-
-       * automake.in: Bug fixes to argument parsing code.
-
-       * automake.in: Handle --version and --help.
-       NLS stuff from autoconf.
-
-       * Makefile.am (amdatadir): Fixed typo.
-       (install): Make install directories
-
-       * Makefile.am: Use "install::", not "install:"
-
-       * install-sh, mkinstalldirs: Initial revision
-
-       * configure.in: Use AC_PROG_INSTALL
-
-       * automake.in: Set AM_DIR based on configure results.
-
-       * Makefile.am (install): New target.
-       (amdatadir): New variable.
-
-       * automake.in: Use "#! /", not "#!/".
-
-       * Makefile.am, configure.in: Initial revision
-
-       * automake.in: Renamed from "automake".
-       Set VERSION.
-
-       * dist.am (PACKAGE, VERSION): Now in dist-vars.am
-
-       * automake.in: Insert remake-subd.am if appropriate.
-
-       * subdirs.am (TAGS): Include $(CONFIG_HEADER) when making tags.
-
-       * automake.in: Handle ALLPROGRAMS variable.
-
-       * header-vars.am (ALL): Use ALLPROGRAMS, not PROGRAMS.
-
-       * automake.in: Fixlet when printing "subdir=DIR"
-
-       * automake.in: Put "subdir=DIR" into subdir Makefile
-
-       * automake.in: Don't refer to distname.am.
-       Only put footer.am in subdir Makefiles.
-
-       * subdirs.am (id, ID): New target.
-       (.NOEXPORT): Copied from footers.am.
-
-       * subdirs.am (TAGS): Bug fixes.
-
-       * subdirs.am (TAGS): Don't fail if a subdir doesn't have TAGS target.
-
-       * subdirs.am (maintainer-clean-local): Remove TAGS
-
-       * subdirs.am (TAGS): Make tags file that includes all subdir tags files
-
-       * subdirs.am: Use maintainer-clean, per GNU standards
-
-       * dist-subd-top.am: Some variables defined in dist-vars.am
-
-       * dist-vars.am (PACKAGE, VERSION):
-       New variables, initialized by configure
-
-       * footer.am (id, ID): New targets
-       (TAGS): Put TAGS file in build, not source, directory
-
-       * remake-subd.am (Makefile): Don't assume subdir is 'src'
-
-       * dist.am: Changed to assume PACKAGE and VERSION are set by configure.
-
-       * dist-subd.am: Changed to conform to new top-level dist target.
-
-       * dist-subd-top.am:
-       Changed to assume PACKAGE and VERSION are set by configure.
-
-       * clean-kr.am, clean.am (maintainer-clean):
-       Updated rules per GNU standards.
-
-       * clean.am, clean-kr.am (maintainer-clean): Renamed from realclean.
-
-Sat Nov  5 14:39:50 1994  djm  <address@hidden>
-
-       * automake.in, texinfos.am: kludge for multiple-part info files
-
-Thu Nov  3 13:33:44 1994  djm  <address@hidden>
-
-       * clean.am, clean-kr.am: remove INFOS
-
-Wed Nov  2 06:15:42 1994  djm  <address@hidden>
-
-       * texinfos.am: add path
-
-       * remake.am, remake-hdr.am: account for VPATH limitations
-
-Mon Oct 24 23:01:59 1994  djm  <address@hidden>
-
-       * automake.in, dist-subd-top.am, dist-subd.am, dist.am, header-vars.am, 
libprograms.am, programs.am:
-       handle SCRIPTS and LIBSCRIPTS similar to PROGRAMS
-
-Sun Oct 23 01:50:41 1994  djm  <address@hidden>
-
-       * texinfos.am: install-info depends on info files
-
-       * dist-subd-vars.am, dist-vars.am: distrib info files
-
-Sun Oct  2 02:03:06 1994  djm  <address@hidden>
-
-       * clean-kr.am, clean.am: fix up distclean
-
-       * subdirs.am: fix typo
-
-       * clean.am: do more in distclean
-
-Sat Oct  1 23:52:51 1994  djm  <address@hidden>
-
-       * libraries.am: make install depend on all
-
-       * automake.in: fix typo
-
-Wed Sep 28 21:15:26 1994  djm  <address@hidden>
-
-       * dist-subd-vars.am, dist-vars.am, header-vars.am: fix doc bugs
-
-       * automake.in, compile-vars.am, dist.am: fix dist for no subdirs
-
-       * dist-subd-top.am: Initial revision
-
-       * automake.in, header-vars.am, libraries-vars.am, mans-vars.am, 
texinfos-vars.am:
-       centralize prefix var setting
-
-       * header-vars.am: set all the std vars based on prefix
-
-Tue Sep 27 01:32:22 1994  djm  <address@hidden>
-
-       * automake.in: don't add kr stuff if not needed
-
-       * dist-vars.am: add config vars to dist
-
-Mon Sep 26 23:09:09 1994  djm  <address@hidden>
-
-       * program.am: add LDADD
-
-       * compile-vars.am: remove LDADD from LDFLAGS
-
-       * clean.am: move knr stuff to another file
-
-       * automake.in: use different clean file for ansi2knr
-
-       * clean-kr.am: Initial revision
-
-Thu Sep 22 03:45:02 1994  djm  <address@hidden>
-
-       * automake.in, dist-subd.am, dist.am: fix rules and dist
-
-Tue Sep 20 21:29:40 1994  djm  <address@hidden>
-
-       * compile.am, automake.in: split out knr
-
-       * compile-kr.am: Initial revision
-
-       * libprograms.am: fix typo
-
-       * automake.in, clean.am, compile-vars.am, header-vars.am, 
libprograms.am:
-       make libprograms work
-
-       * libprograms.am: Initial revision
-
-       * automake.in, compile.am, header-vars.am: fix little bugs
-
-       * compile.am: allow parallel K&R
-
-       * clean.am: remove kerb temps
-
-       * automake.in: fix recognizing start of rules
-
-       * dist-subd.am, dist.am: fix dist
-
-       * automake.in, compile.am, footer.am, texinfos.am: fix ansi2knr
-
-Mon Sep 19 23:39:21 1994  djm  <address@hidden>
-
-       * automake.in: works on m4 too
-
-       * automake.in, mans.am: works on fileutils
-
-       * automake.in, clean.am, compile.am, dist-subd.am, dist.am, footer.am, 
header-vars.am, header.am, libraries.am, library.am, mans-vars.am, mans.am, 
programs.am, remake-hdr.am, remake-subd.am, remake.am, subdirs.am, texinfos.am:
-       works on fileutils except for all
-
-       * automake.in: vars thing
-
-       * header-vars.am: Initial revision
-
-       * texinfos-vars.am, mans-vars.am, libraries-vars.am, dist-vars.am, 
dist-subd-vars.am:
-       entered into RCS
-
-       * compile-vars.am: Initial revision
-
-       * automake.in: many improvements
-
-       * footer.am: Initial revision
-
-       * dist.am: remove distname
-
-       * automake.in: namespace cleanup
-
-       * distname.am: Initial revision
-
-       * automake.in, clean.am, compile.am, dist-subd.am, dist.am, header.am, 
libraries.am, library.am, mans.am, program.am, programs.am, remake-hdr.am, 
remake.am, subdirs.am, texinfos.am:
-       might work
-
-       * mans.am, libraries.am, texinfos.am, library.am, compile.am, 
program.am, programs.am, clean.am, subdirs.am, remake-subd.am, remake.am, 
remake-hdr.am, dist.am, dist-subd.am, header.am, automake.in:
-       Initial revision
-
-
------
-
-Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/ChangeLog.98 b/ChangeLog.98
deleted file mode 100644
index 1fcc56c..0000000
--- a/ChangeLog.98
+++ /dev/null
@@ -1,2191 +0,0 @@
-1998-12-22  Marcus G. Daniels  <address@hidden>
-
-       * automake.in (handle_dependencies): Transform EXT & PFX in
-       Objective C case.
-
-1998-12-11  Marcus G. Daniels  <address@hidden>
-
-       * automake.in: Register Objective C language.
-       (finish_languages): Consider Objective C to be non_c.
-       (lang_objc_rewrite, lang_objc_finish): New functions.
-       (resolve_linker): Recognize OBJCLINK before LINK.
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Handle empty $config_aux_dir.
-
-       * automake.in (handle_texinfo): Set $conf_pat correctly when
-       config_aux_dir not used.
-       (handle_texinfo): Run maintainer-clean-aminfo rules in srcdir.
-       From Erez Zadok.
-       * texi-vers.am (address@hidden@): Prefix file names with
-       $(srcdir).  From Erez Zadok.
-       ($(srcdir)/address@hidden@): Don't run mdate-sh from srcdir.
-
-1999-01-08  Thomas Tanner  <address@hidden>
-
-       * depend.am: remove the dependencies (.deps)
-       in "make distclean", not "make maintainer-clean"
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * aclocal.in (write_aclocal): Updated copyright.
-       (parse_arguments): Likewise.
-       * automake.in (parse_arguments): Updated copyright.
-       (initialize_global_constants): Likewise.
-
-       * Makefile.am (pkgdata_DATA): Renamed from pkgdata_SCRIPTS.
-       (install-data-hook): New hook.  Report from Petter Reinholdtsen.
-
-       * remake-hdr.am: Provide `else' clause for each `if'.
-
-1999-01-10  Alexandre Oliva  <address@hidden>
-
-       * remake-hdr.am: recover from removal of config headers, and try
-       to get real timestamps, which is useful for CVS files
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): Don't special-case "-local"
-       targets.  Test all.test.
-
-       * automake.in (handle_texinfo): Prepend $(srcdir) to directory
-       used to find texinfo.tex.  Report from Glenn Amerine.
-
-1999-01-07  Tom Tromey  <address@hidden>
-
-       Based on report from Marcus G. Daniels.  Fixes include.test.
-       * automake.in (generate_makefile): Call read_main_am_file.
-       (read_main_am_file): New sub.
-       (read_am_file): Moved header generation code into
-       read_main_am_file.
-
-1999-01-06  Gary V. Vaughan  <address@hidden>
-
-       * automake.in (require_file_internal): qub perl on win32 hangs
-       on a call to unlink for a non-existant file, which in turn causes
-       tests/symlink.test to hang on win32.  Check that the file exists
-       before unlinking it!
-
-1998-12-24  Thomas Tanner  <address@hidden>
-
-       * automake.in (handle_ltlibraries): check whether -module was
-       defined for libraries names without 'lib' prefix.
-
-Fri Dec 11 10:20:42 1998  Matthew D. Langston  <address@hidden>
-
-       * compile_f_c_cxx.test: Change to use F77 and F77LINK instead of
-       FC and FLINK, respectively.
-       * flibs.test: same
-       * fnoc.test: same
-       * fo.test: same
-       * fonly.test: same
-       * link_f_c.test: same
-       * link_f_c_cxx.test: same
-       * link_f_cxx.test: same
-       * link_f_only.test: same
-
-Fri Dec 11 10:23:17 1998  Matthew D. Langston  <address@hidden>
-
-       * automake.in, automake.texi: Change all of the Fortran 77 code to
-       use the new `F77' prefix instead of the older `FC' prefix.
-       Specifically this changed FC, FCOMPILE, LTFCOMPILE, FLINK and FLD
-       to F77, F77COMPILE, LTF77COMPILE, F77LINK and F77LD, respectively.
-
-1999-01-05  Tom Tromey  <address@hidden>
-
-       * depend2.am (%.o): Use \012, not \n, to avoid losing `tr's.  From
-       Bill Currie.
-       (%.lo): Likewise.
-
-1998-12-22  Alexandre Oliva  <address@hidden>
-
-       * depend2.am: Don't assume backslash can't occur in the middle of
-       filename; it loses on M$W
-
-1998-12-21  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_libraries): Reverted Thomas Tanner's
-       change.  Non-libtool libraries still must fit naming
-       requirements.
-
-1998-12-21  Alexandre Oliva  <address@hidden>
-
-       * automake.in (handle_configure): Dist inputs for AC_OUTPUT.
-
-1998-12-21  Alexandre Oliva  <address@hidden>
-
-       * depend2.am: don't use .p and .P for dependencies; it loses on
-       case-insensitive filesystems.
-       Reported by Henrik Frystyk Nielsen <address@hidden>
-
-1998-12-20  Thomas Tanner  <address@hidden>
-
-       * automake.in (handle_libraries, handle_ltlibraries): relax the
-       name checking to not enforce `^lib.*' for the sake of building libtool 
-       modules.
-
-1998-12-21  Tom Tromey  <address@hidden>
-
-       * automake.in (do_one_merge_target): Special case
-       install-data-hook and install-exec-hook.
-       (handle_merge_targets): Removed install-data-hook and
-       install-exec-hook code.  Test insthook.test.
-
-1998-12-16  Tom Tromey  <address@hidden>
-
-       * tags.am (ID): Uniquify list of sources.  Report from Jim
-       Meyering.
-
-1998-12-11  Tom Tromey  <address@hidden>
-
-       Bug report from Paul D. Smith:
-       * automake.in (handle_merge_targets): Set
-       AM_INSTALL_PROGRAM_FLAGS, not INSTALL_PROGRAM.
-       * header-vars.am (INSTALL_PROGRAM): Added
-       AM_INSTALL_PROGRAM_FLAGS.
-
-1998-12-03  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Print prettier banner when
-       `make dist' succeeds.  From Akim Demaille.
-
-1998-12-02  Tom Tromey  <address@hidden>
-
-       * configure.in: Upped version to 1.3e (1.3d was just released).
-
-       * configure.in: Upped version to 1.3d.
-
-       * texinfo.tex, config.guess, config.sub, install-sh: New
-       versions.
-       * ansi2knr.c: New version.
-
-       * automake.in (handle_configure): Quote @MAINTAINER_MODE_TRUE@ to
-       avoid problems where AM_MAINTAINER_MODE is put into automake's own
-       configure.in.
-
-       * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir.
-
-       Some bugs from François Pinard:
-       * automake.in (usage): Remove duplicates in file list.
-
-       * automake.in (usage): Print files in column-major order.
-       (handle_gettext): Only require ABOUT-NLS for GNU programs.
-
-1998-12-01  Tom Tromey  <address@hidden>
-
-       * automake.texi (Dist): Documented GZIP_ENV.
-       * automake.in (handle_dist): Define and use GZIP_ENV, not GZIP.
-       (initialize_global_constants): Use GZIP_ENV, not GZIP.
-
-1998-11-27  Tom Tromey  <address@hidden>
-
-       * automake.in (quote_cond_val): Use "\002", not '\002', to
-       represent null string.
-       (unquote_cond_val): Removing all "\002" strings from result.  Test
-       cond7.test.
-
-       * automake.texi: Formatting changes for latest texinfo.
-
-       * automake.in (handle_java): Removed debugging print.
-
-1998-11-18  Tom Tromey  <address@hidden>
-
-       * automake.in (finish_languages): Use CCLD, not CLD.
-
-       * automake.in (finish_languages): Define CLD; use it in LINK
-       definition.
-       (lang_cxx_finish): Define CXXLD; use it in CXXLINK definition.
-       (lang_f77_finish): Define FLD; use it in FLINK definition.
-       (lang_ppf77_finish): Likewise.
-       (lang_ratfor_finish): Likewise.
-
-1998-11-10  Matthew D. Langston  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Recognize
-       AC_F77_LIBRARY_LDFLAGS, and recognize FLIBS as a configure
-       substitution.
-
-       * automake.texi: Fix several little Fortran 77 references to now
-       point to autoconf.texi.  Rename associated Fortran 77 macros from
-       `AM_' to `AC_'.
-
-1998-11-10  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): Handle configure_vars case.  Test
-       pluseq4.test.
-
-1998-11-09  Tom Tromey  <address@hidden>
-
-       * automake.in (read_am_file): `conditional_stack' isn't a
-       function.  Correctly add new value to existing value in `+='
-       case.
-
-1998-10-29  Gary V. Vaughan <address@hidden>
-
-       * automake.in (parse_arguments): Fixed type of -c for copying
-
-1998-10-30  Tom Tromey  <address@hidden>
-
-       * automake.texi (Install): Documented DESTDIR more fully.  From
-       Jeff Garzik.
-
-       * automake.in (MACRO_PATTERN): Recognize `+='.
-       (BOGUS_MACRO_PATTERN): Likewise.
-       (read_am_file): Handle `+=' assignments.
-
-1998-10-28  Tom Tromey  <address@hidden>
-
-       * Makefile.am (maintainer-check): Changed code to be acceptable to
-       bash 2.01.1.
-
-       * automake.in (do_one_clean_target): Special-case config.status.
-       Report from Jeff Garzik.
-
-       * m4/Makefile.am (m4data_DATA): Don't mention f77.m4.
-       * m4/f77.m4: Removed; macro now in autoconf proper.
-
-1998-10-24  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Typo fix in code testing to
-       see if subdir is `.'.  From Raja R Harinath.
-
-       * m4/lispdir.m4: Fixed sed invocation.  From Akim Demaille.
-
-1998-10-20  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_dependency_file): Fixed test on `while' loop.
-       Fixes depend2.test.  Report from Akim Demaille.
-
-1998-10-16  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_ltlibraries): Specify `noinst' when
-       computing valid prefixes.  From Ulrich Drepper.
-
-       * automake.in (scan_dependency_file): Don't give an error if there
-       is text after the last line.  Report from Matthew D. Langston.
-
-       * m4/mktime.m4: Detect glibc mktime bug.  From Jim Meyering.
-
-       * Makefile.am (SUBDIRS): Added `.' again.
-
-       * Makefile.am (EXTRA_DIST): Removed automake.spec.in.  From
-       Matthew D. Langston.
-       (info_TEXINFOS): Removed am-f77.texi.
-
-       * automake.in (handle_ltlibraries): Allow `noinst' LTLIBRARIES.
-       These are libtool convenience libraries.
-
-1998-10-13  Tom Tromey  <address@hidden>
-
-       * m4/f77.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Added f77.m4.
-
-Thu Oct  8 15:00:57 1998  Matthew D. Langston  <address@hidden>
-
-       * automake.in (resolve_linker): Put the Fortran 77 linker where it
-       needs to be.
-
-       * automake.in (lang_f77_finish): Add support for Fortran 77.
-
-       * automake.in (f77_extensions): New helper function for function
-       `lang_f77_finish'.
-
-       * automake.in (lang_f77_rewrite): Change to return success.
-
-       * automake.in (scan_one_configure_file): Add test for the Fortran
-       77 compiler.
-
-       * automake.in (finish_languages): Changed tests for "C++ only" to
-       "C++ and/or Fortran 77 only", and renamed `all_cxx' to `non_c'.
-
-       * automake.in: Registered the ppf77 language (`.F' extension) for
-       preprocessed Fortran 77.
-       
-       * automake.in: Registered the ratfor language (`.r' extension).
-
-       * automake.in: Registered Fortran 77 header files with the "header
-       language" (`.inc' extension).
-
-Tue Sep  8 14:50:50 1998  Matthew D. Langston  <address@hidden>
-
-       * automake.texi: Added several new index entries.
-
-Sun Aug 30 16:10:31 1998  Matthew D. Langston  <address@hidden>
-
-       * automake.texi:
-       - Add address@hidden' (output variable index).
-       - Merge address@hidden' (Autoconf macros) and address@hidden' to the 
General
-         Index.
-
-       * automake.texi (Macros):
-       - Changed the address@hidden @code' list of macros to address@hidden'.
-       - Add `AC_PROG_FC' and `MDL_F77_LIBRARY_LDFLAGS' to the list.
-
-Tue Aug 11 10:42:39 1998  Matthew D. Langston  <address@hidden>
-
-       * automake.texi (C++): Change address@hidden' to address@hidden'.
-
-       * automake.texi (Fortran 77): Add Fortran 77 documentation.
-
-1998-10-11  Tom Tromey  <address@hidden>
-
-       Preliminary (completely untested) multilib support.
-       * automake.texi (Macros): Document AM_ENABLE_MULTILIB.
-       * m4/Makefile.am (m4data_DATA): Added multi.m4.
-       * Makefile.am (amfiles): Added multilib.am.
-       * automake.in (seen_multilib): New global.
-       (scan_one_configure_file): Recognize AM_ENABLE_MULTILIB.
-       (generate_makefile): Call handle_multilib.
-       (handle_multilib): New function.
-       * multilib.am: New file.
-       * m4/multi.m4: New file.
-
-1998-10-08  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Always include configure.in and
-       configure in distribution.  Fixes confdist.test.
-
-       * automake.in (do_one_merge_target): Be silent when running
-       install-exec-am and install-data-am.  Fixes extra3.test and
-       extra4.test.
-
-1998-10-07  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Added -noextra option.
-       (handle_data): Pass -noextra to am_install_var.
-
-Sun Oct  4 22:24:10 1998  Tom Tromey  <address@hidden>
-
-       * m4/winsz.m4 (AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use
-       3-argument form of AC_DEFINE.
-       * m4/regex.m4 (AM_WITH_REGEX): Use 3-argument form of AC_DEFINE.
-       * m4/ptrdiff.m4 (AM_TYPE_PTRDIFF_T): Use 3-argument form of
-       AC_DEFINE.
-       * m4/protos.m4 (AM_C_PROTOTYPES):Use 3-argument form of
-       AC_DEFINE.
-       * m4/obstack.m4 (AM_FUNC_OBSTACK): Use 3-argument form of
-       AC_DEFINE.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use 3-argument form of
-       AC_DEFINE.
-       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Use 3-argument form of
-       AC_DEFINE.
-
-Tue Oct  6 00:02:15 1998  Tom Tromey  <address@hidden>
-
-       * depend2.am (%.lo): Handle case where compiler does not put space
-       before ":".  From Raja R Harinath.
-
-Mon Oct  5 13:05:43 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): AC_CONFIG_HEADER is not
-       obsolete; it simply isn't preferred with automake.
-       (scan_one_configure_file): Likewise for AC_DECL_YYTEXT and
-       AC_PROG_LEX.
-
-       * automake.in (am_line_error): Handle case where variable defined
-       in configure.in.  Fixes test badline.test.
-       (%configure_vars): Redefined meaning of values.
-       (scan_one_configure_file): Set $configure_vars values
-       appropriately.
-
-Sat Oct  3 14:53:34 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_aclocal_m4): Use new MAINTAINER_MODE
-       conditional.
-       (handle_configure): Likewise.
-       (read_am_file): Likewise.
-       (file_contents_with_transform): Likewise.
-       (scan_one_configure_file): Recognize that AM_MAINTAINER_MODE
-       defines a conditional.
-       * automake.texi (Optional): Document new AM_MAINTAINER_MODE.
-       * texi-vers.am ($(srcdir)/@VTEXI@): Look at MAINTAINER_MODE
-       conditional.
-       (address@hidden@): Likewise.
-       * remake.am ($(srcdir)/configure): Look at MAINTAINER_MODE
-       conditional.
-       * remake-hdr.am ($(srcdir)/@CONFIG_HEADER_IN@): Look at
-       MAINTAINER_MODE conditional.
-       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Defined MAINTAINER_MODE
-       conditional.
-
-1998-10-03  Jim Blandy  <address@hidden>
-
-       * depend2.am (%.lo): When editing the dependency file to add the
-       .lo file to the targets, allow for whitespace between the end of
-       the filename and the colon.  Some compilers (notably the Cygnus
-       release of GCC 2.7-97r1) put space there: "alist.o : ..."
-
-Sat Oct  3 12:07:21 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Handle case where there is no
-       Makefile in the config header directory.  Fixes test config.test.
-
-Thu Oct  1 00:51:51 1998  Tom Tromey  <address@hidden>
-
-       * depend2.am (%.o): Append sed results to .P file in this case
-       too.  From Raja R Harinath.
-
-       * m4/lispdir.m4 (AM_PATH_LISPDIR): Correctly find xemacs and
-       xemacs install directories.  From Robert Bihlmeyer.
-
-       * depend2.am: Don't bother trying to delete source file from
-       list.
-
-       * depend2.am (%.o): Handle deleted header file problem.
-       (%.lo): Likewise.
-
-       * texinfos.am (install-info-am): Handle case where INFO_DEPS is
-       empty.  Reported by Andrew Cagney.
-       (uninstall-info): Likewise.
-       (dist-info): Likewise.
-
-       * automake.in (handle_texinfo): Error if user tries to generate
-       HTML.
-
-Wed Sep 30 00:41:40 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (do_one_clean_target): Don't push previous clean
-       target if this target is `mostly'.  Report from Raja R Harinath.
-
-       * subdirs.am (mostlyclean-recursive ...): Build local_target, not
-       target.  From Raja R Harinath.
-
-       Completely changed how languages and source files are handled:
-       * automake.in: Call register_language for each language.
-       (lang_c_rewrite): New function.
-       (lang_cxx_rewrite): Likewise.
-       (lang_header_rewrite): Likewise.
-       (lang_yacc_rewrite): Likewise.
-       (lang_yaccxx_rewrite): Likewise.
-       (lang_lex_rewrite): Likewise.
-       (lang_lexxx_rewrite): Likewise.
-       (lang_asm_rewrite): Likewise.
-       (lang_fortran_rewrite): Likewise.
-       (register_language): Likewise.
-       (extension_map): New global.
-       (language_map): Likewise.
-       (resolve_linker): New function.
-       (handle_single_transform_list): Rewrote to use lang_X_rewrite
-       functions.  Changed meaning of first argument.
-       (initialize_per_input): Removed seen_any_source.  Initialize
-       language_scratch, extension_seen.  Removed cxx_extensions,
-       seen_c_source, dir_holds_headers, dir_holds_sources.
-       (handle_source_transform): Don't compute $objpat.  Pass $obj
-       directly to handle_single_transform_list.
-       (handle_built_sources): Fixed call to
-       handle_single_transform_list.
-       (lang_c_finish): New function.
-       (lang_cxx_finish): Likewise.
-       (lang_header_finish): Likewise.
-       (lang_yacc_finish): Likewise.
-       (lang_yaccxx_finish): Likewise.
-       (lang_lex_finish): Likewise.
-       (lang_lexxx_finish): Likewise..
-       (lang_asm_finish): Likewise.
-       (lang_fortran_finish): Likewise.
-       (yacc_lex_finish_helper): Likewise.
-       (libtool_compiler): Likewise.
-       (saw_extension): New function.
-       (handle_lib_objects_cond): Use saw_extension, not old variables.
-       (handle_yacc_lex_cxx): Removed.
-       (finish_languages): New function.
-       (get_object_extension): Don't set dir_holds_sources.
-       (handle_headers): Don't set dir_holds_headers.  Instead, call
-       saw_extension.
-       (saw_sources_p): New function.
-       (handle_tags): Use it.
-       (handle_dependencies): Likewise.
-       (cxx_extensions): New function.
-       (handle_dependencies): Use it.
-       (generate_makefile): Call finish_languages, not
-       handle_yacc_lex_cxx.
-
-1998-05-24  Andreas Schwab  <address@hidden>
-
-       * texi-vers.am: Use the correct target names.  Fix generation of
-       stamp file.
-
-       * automake.in (handle_tests): In commands generating site.exp copy
-       the old contents from site.exp, not site.bak, which does not
-       exist.
-
-Tue Sep 29 00:10:22 1998  Tom Tromey  <address@hidden>
-
-       Fixed noinst.test again:
-       * automake.in (do_one_merge_target): Special-case `install-am'.
-       (handle_merge_targets): Don't compute @install variable.
-
-       Fixes for recurs2.test.  Report from Jim Meyering.
-       * automake.in (vars_scanned): Define globally.
-       (variable_value_as_list_worker): Delete $var entry in
-       %vars_scanned after local work is done.
-
-1998-05-26  Marcus G. Daniels  <address@hidden>
-
-       * automake.in: New pattern: INCLUDE_PATTERN.
-       (read_am_file):  Make AM_FILE a local filehandle.
-       For INCLUDE_PATTERN, store included paths on @include_stack and call 
-       read_am_file with argument.
-       (handle_configure): When printing the dependencies for
-       Makefile.in, print the items on include_stack (if any) as
-       dependencies, too.
-
-       * automake.texi: Make a command index `cm' that goes into the
-       concept index.  Put if, endif, else, and include in the command index.
-       (Include): Show usage of include directive.  
-
-Mon Sep 28 00:03:45 1998  Tom Tromey  <address@hidden>
-
-       `.' in SUBDIRS changes order of builds:
-       * Makefile.am (SUBDIRS): Added `.'.  Put tests last.
-       * tags.am (TAGS): Don't look for TAGS file in `.'.
-       * automake.texi (Top level): Document SUBDIRS change.
-       * automake.in (handle_installdirs): Create separate installdirs-am
-       target.
-       (handle_merge_targets): Don't put all-am onto @all.  Fixed error
-       message.  Correctly handle install-info.  Give error if
-       install-info-local inappropriately defined.  Don't special-case
-       install-data, install-exec, install, uninstall, or all.
-       (handle_subdirs): Don't push `-recursive' target names onto
-       corresponding lists.
-       (do_one_merge_target): Always define `-am' form of rule, and point
-       ordinary form to `-am' or `-recursive' as appropriate.
-       Special-case `all'.
-       (do_check_merge_target): Generate check-am target.
-       (handle_dist_worker): Use target_defined.
-       (handle_dist): Likewise.
-       (handle_merge_targets): Likewise.
-       (do_one_merge_target): Likewise.
-       (do_check_merge_target): Likewise.
-       (do_one_clean_target): Likewise.
-       (initialize_per_input): Initialize $all_target.
-       (do_one_clean_target): Always generate -am form of rule; other
-       changes for new SUBDIRS change.
-       (handle_clean): Always generate clean-am form of rule.
-       (handle_tags): Only build subdir if not `.'.
-       (handle_dist_worker): Skip `.' directory.
-       * subdirs.am: Allow `.' to be specified in SUBDIRS.
-
-Sun Sep 27 20:02:21 1998  Tom Tromey  <address@hidden>
-
-       * automake.texi (Dist): Document EXTRA_DIST change.
-       * automake.in (handle_dist_worker): Allow subdirs in EXTRA_DIST.
-
-       * automake.in (handle_ltlibraries): Wrote better comment about
-       EXTRA_LTLIBRARIES.
-
-       * automake.texi (Invoking Automake): Document --copy.
-       * automake.in (copy_missing): New global.
-       (parse_arguments): Recognize --copy/-c.
-       (require_file_internal): Handle $copy_missing.  Fixed error
-       message.
-       (initialize_global_constants): Document -c/--copy.
-
-       * automake.texi: Document LIBOBJS trick.
-
-       * automake.in (handle_dist_worker): If DIST_SUBDIRS defined, use
-       it even when SUBDIRS not conditional.
-
-       * automake.in (quote_cond_val): Turn tabs into \003.
-       (unquote_cond_val): Turn \003 back into tabs.  Fixes test
-       cond6.test.
-
-       * automake.in (read_am_file): Treat backslash-newline as
-       whitespace.  Test parse.test.
-
-Sat Sep 26 19:31:22 1998  Tom Tromey  <address@hidden>
-
-       * configure: Rebuilt.
-       * configure.in: Upped version to 1.3c.
-
-       Track recent autoconf changes:
-       * m4/Makefile.in: Rebuilt.
-       * m4/Makefile.am (m4data_DATA): Updated for deleted files.
-       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AC_PROG_INSTALL.
-       * m4/mingw.m4: Removed.
-       * m4/cygwin.m4: Removed.
-       * m4/install.m4: Removed.
-       * m4/exeext.m4: Removed.
-       * automake.in (scan_one_configure_file): Don't look for
-       AM_EXEEXT.
-       (check_cygnus): Only mention AC_EXEEXT.
-       (obsolete_macros): Mention AM_PROG_INSTALL, AM_EXEEXT,
-       AM_CYGWIN32, AM_MINGW32.
-       ($seen_prog_install): Changed interpretation; changed all users.
-       (scan_one_configure_file): Don't look for AM_PROG_INSTALL.
-       ($scripts_installed): Removed.
-       (handle_scripts): Use local $scripts_installed.
-       * aclocal.in (obsolete_macros): Added AM_PROG_INSTALL, AM_EXEEXT,
-       AM_CYGWIN32, AM_MINGW32.
-
-Mon Jul  6 14:52:49 1998  Ian Lance Taylor  <address@hidden>
-
-       * compile.am (mostlyclean-compile): If OBJEXT, remove *.$(OBJEXT)
-       along with *.o.
-
-Thu May 28 18:49:47 1998  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (seen_objext): New variable.
-       (get_object_extension): If seen_objext, use .$(OBJEXT) rather than
-       .o.  When including compile.am, keep or discard OBJEXT lines
-       according to whether seen_objext is set.  If seen_objext, add .obj
-       to @suffixes.  If seen_objext, use .$(OBJEXT) rather than .o when
-       building ansi2knr.
-       (handle_yacc_lex_cxx): If seen_objext, add a rule to create .obj
-       files.  If seen_objext, use .$(OBJEXT) rather than .o when
-       building ansi2knr.
-       (scan_one_configure_file): Check for .obj as well as .o in
-       LIBOBJS.  Set seen_exeext if we see AC_EXEEXT.  Look for
-       AC_OBJEXT, and if found set seen_objext and set OBJEXT in
-       configure_vars.
-       (check_cygnus): Change error message to permit AC_EXEEXT.
-       * compile.am: Add OBJEXT lines for .c.obj compilation.
-       * Makefile.in: Rebuild.
-       * m4/Makefile.in: Rebuild.
-       * tests/Makefile.in: Rebuild.
-
-Mon Sep 11 16:07:55 1997  Chris Provenzano <address@hidden>
-
-       * header-vars.am: address@hidden@
-       Ran aclocal, autoconf, and automake.
-
-Sat Sep 26 16:31:29 1998  Tom Tromey  <address@hidden>
-
-       * ltlib.am: Use $(INSTALL) and not $(INSTALL_DATA).
-
-Mon Sep 14 08:27:38 1998  Per Cederqvist  <address@hidden>
-
-       * automake.in (handle_texinfo): The logic for when to provide
-       texinfo.tex was broken.  Attempt to fix.
-
-Mon Sep 14 00:55:12 1998  Per Cederqvist  <address@hidden>
-
-       Fix for Dynix 3.1.1.
-       * automake.in (handle_yacc_lex_cxx): Transform "# " to "#line";
-       some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the
-       output from the preprocessor.
-
-Tue Aug 25 18:40:51 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): Don't create site.exp target if it
-       is already in Makefile.am.
-
-Sun Aug 16 23:26:26 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Use @inputs, not
-       @rewritten_inputs, when constructing CONFIG_FILES.  Use different
-       list to test for file existence.  Test colon6.test.
-       (rewrite_inputs_into_dependencies): Added add_srcdir argument.
-       Updated all callers.
-
-Wed Aug 12 14:16:57 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.3b.
-
-Tue Aug 11 12:18:59 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_clean): Added missing close-paren.  Quote
-       `$' so it doesn't expand when replacing.  From Markus
-       F.X.J. Oberhumer.
-
-       * aclocal.in (usage): Changed bug address.
-       * automake.in (usage): Changed bug address.
-
-       * clean.am (distclean-generic): Don't mention
-       DISTCONFIGCLEANFILES.  From Markus F.X.J. Oberhumer.
-
-Mon Aug 10 20:57:35 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Redirect ansi2knr output to
-       correct file.  From Kave Ghazi.
-
-Sun Aug  2 16:05:16 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.3a.
-
-       * config.sub, config.guess, texinfo.tex: New versions from FSF.
-
-Sun Jul 19 00:04:25 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (variable_conditions): Initialize %vars_scanned.
-       (variable_conditions_sub): Check it.  Test cond5.test.
-
-Sat Jul 18 00:24:14 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (variable_value_as_list_worker): Renamed from
-       variable_value_as_list.  Set entry in vars_scanned, and give error
-       if variable recursively defined.  Test recurs.test.
-       (value_to_list): Call it instead.
-       (variable_value_as_list): New function.
-
-       * automake.in (variable_conditions_sub): If var is not
-       conditional, but does have conditional subvariables, then return
-       value should be all permutations of subvariable conditions.  Test
-       cond4.test.
-       (handle_source_transform): Define _OBJECTS variable with each
-       condition; no need to define multiple new variables.
-
-Fri Jul 17 12:56:14 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Use DESTDIR, not DATADIR.  From
-       Motoyuki Kasahara.
-
-       * automake.in (scan_dependency_file): Recognize DOS-style paths as
-       absolute.
-       * ylwrap: Recognize DOS-style paths as absolute.  From Ian Lance
-       Taylor.
-
-Fri Jul 17 07:37:20 1998  H.J. Lu  (address@hidden)
-
-       * ylwrap: Don't use absolute path if the input is in the
-       current directory.
-
-Fri Jul 17 11:58:27 1998  Ian Lance Taylor  <address@hidden>
-
-       * automake.in: Use $(AM_MAKEFLAGS) in every invocation of $(MAKE).
-       * subdirs.am: Likewise.
-
-Thu Jul 16 18:09:03 1998  Ian Lance Taylor  <address@hidden>
-
-       * remake.am (config.status): Depend upon
-       $(CONFIG_STATUS_DEPENDENCIES).
-       * automake.in (handle_configure): Examine
-       CONFIG_STATUS_DEPENDENCIES.
-
-Tue Jul 14 13:37:48 1998  Tom Tromey  <address@hidden>
-
-       * Makefile.am: Always look in srcdir for automake.in.
-
-Tue Jun 23 14:00:27 1998  Ian Lance Taylor  <address@hidden>
-
-       * progs.am: Don't let $(EXEEXT) interfere with $(transform).
-       Report from Mike Stump <address@hidden>.
-
-Tue Jun  2 13:27:34 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Make CONFIGURE file
-       handle local.  From Kevin Street.
-
-       * automake.in (read_am_file): Error if blank line or comment
-       follows trailing backslash.  Test syntax.test.
-       (file_contents_with_transform): Likewise.
-
-Thu May 28 18:49:47 1998  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (handle_configure): Always use $(SHELL) when running
-       config.status.
-
-Mon Jun  1 14:23:29 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Use AM_CPPFLAGS, AM_CXXFLAGS,
-       AM_CFLAGS.
-       (output_yacc_build_rule): Use AM_YFLAGS, AM_LFLAGS.
-       (handle_dependencies): Don't define CXXMKDEP.
-
-       * clean.am (mostlyclean-generic): Prefix rule with MOSTLYCLEAN.
-       (clean-generic): Prefix rule with CLEAN.
-       (distclean-generic): Prefix rule with DISTCLEAN.
-       (maintainer-clean-generic): Prefix rule with MAINTAINERCLEAN.
-       BUILT_SOURCES now handled in automake itself.
-       * automake.in (initialize_per_input): Initialize
-       maintainer_clean_files.
-       (handle_yacc_lex_cxx): Put lex and yacc output files onto
-       @maintainer_clean_files.
-       (handle_clean): Handle @maintainer_clean_files.  Transform
-       clean.am when installing; try to remove unnecessary tests in
-       generated code.
-
-       * automake.in (do_check_merge_target): Only generate $(MAKE)
-       command if there are check targets to make.  Report from Karl
-       Heuer.
-
-Sun May 17 23:05:55 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.in (write_aclocal): Fixed generated copyright message.
-       From Eleftherios Gkioulekas.
-
-       * automake.in (parse_arguments): Typo fix from Paul D. Smith.
-
-Fri May  8 12:14:03 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Put lex and yacc output files
-       onto @clean.
-
-Wed May  6 01:18:05 1998  Tom Tromey  <address@hidden>
-
-       * header-vars.am (DESTDIR): Changed from DISTDIR.
-
-Fri Apr 24 10:16:20 1998  Tom Tromey  <address@hidden>
-
-       * libs.am: Don't display loop while it runs.
-
-Sun Apr  5 13:58:24 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.3.
-
-       * automake.in (handle_options): Correctly handle trailing alpha
-       version letter or lack thereof.  Test version3.test.
-
-       * automake.in (am_conf_line_warning): Perl 4 fixlet; typo fix.
-
-       * automake.in (handle_ltlibraries): Examine _DEPENDENCIES
-       variable.  Report from Chris Provenzano.  Test library.test.
-       (handle_libraries): Likewise.
-
-       * m4/lex.m4: Allow AM_PROG_LEX to be called with no arguments.
-
-Sun Apr  5 13:54:25 1998  Alexandre Oliva <address@hidden>
-
-       * automake.in (scan_one_configure_file): Only warn about
-       AC_DECL_YYTEXT and AC_PROG_LEXX.
-       (am_conf_line_warning): New function.
-
-Fri Apr  3 15:43:46 1998  Doug Evans  <address@hidden>
-
-       * automake.in (handle_configure): Fix setting of colon_infile
-       in case where multiple files are used to build Makefile.
-       [ Test colon5.test ]
-       
-Fri Apr  3 13:07:58 1998  Tom Tromey  <address@hidden>
-
-       * ansi2knr.c, texinfo.tex: New versions from respective
-       maintainers.
-
-       * automake.in (scan_one_configure_file): Exclude INSTALL_DATA from
-       configure_vars.  Test instdata.test.
-
-Tue Mar 31 21:07:42 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_yacc_lex_cxx): Changed to use new version of
-       ansi2knr.
-       * ansi2knr.c: New version from L. Peter Deutsch.
-
-Thu Mar 26 11:00:04 1998  Tom Tromey  <address@hidden>
-
-       * m4/exeext.m4: Correctly eliminate bad cases when computing
-       am_cv_exeext.  Report from Markus F.X.J. Oberhumer.
-
-Wed Mar 25 15:09:56 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_options): Support alpha version numbers.
-
-       * lisp.am (address@hidden@LISP): Allow .el files to appear in build
-       directory.  From Gary V Vaughan.
-
-Mon Mar 23 07:55:04 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.2h.
-
-       * header.am (address@hidden@HEADERS): A header can appear in the
-       build directory as well as the source directory.  From Gary V
-       Vaughan.
-
-       * automake.in (handle_yacc_lex_cxx): Push lib sources onto
-       de_ansi_files before generating ._c dependencies.  Test
-       libobj8.test.
-
-       * m4/mktime.m4: New version from Jim Meyering.
-
-       * aclocal.in (usage): Document --print-ac-dir.
-       (parse_arguments): Added --print-ac-dir.
-
-       * ansi2knr.c, ansi2knr.1: New versions from ghostscript.
-       (main): Reapplied "-" change from Harlan Stenn.
-
-Fri Mar 20 22:42:30 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Use &am_conf_line_error,
-       not warn.  Check to make sure warnings happen only for
-       configure.in, not for "not aclocal.m4".
-
-Fri Mar 20 22:35:31 1998  Alexandre Oliva <address@hidden>
-
-       * automake.in: understand AM_PROG_LEX as a replacement for
-       AC_PROG_LEX and AC_DECL_YYTEXT
-       warn if the replaced macros are used.
-       * m4/Makefile.am: add lex.m4
-       * m4/lex.m4 (AM_PROG_LEX): new file and macro
-       * missing: added lex/flex support
-       instead of touching flex and bison output files, try to copy
-       them from a filename based on the last given argument
-
-Fri Mar 20 00:26:10 1998  Tom Tromey  <address@hidden>
-
-       * m4/protos.m4: Require AC_PROG_CPP.
-
-       * aclocal.in (add_file): If &search fails, and macro matches AM_,
-       then print error.  Test aclocalii.test.
-
-       De-ansi-fication fixes from Harlan Stenn:
-       * ansi2knr.c (main): Accept "-" argument to mean stdin.
-       * automake.in (handle_yacc_lex_cxx): Preprocess C source before
-       running through ANSI2KNR.
-       (get_object_extension): Generate rule for <dir>/ansi2knr.o.
-
-       * texinfos.am: Include $(DESTDIR).
-       * lisp.am: Include $(DESTDIR).
-       * java.am: Include $(DESTDIR).
-       * mans.am (address@hidden@): Include $(DESTDIR).
-       * automake.in (handle_man_pages): Include $(DESTDIR) in
-       installdirs variable.
-       (handle_texinfo): Likewise.
-       (am_install_var): Likewise.
-       * header-vars.am (DISTDIR): Define.
-       * data.am, header.am, libs.am, ltlib.am, progs.am, scripts.am:
-       Support $(DESTDIR) at install time.  From Assar Westerlund.
-
-       * automake.in (handle_java): Put Java sources in distribution.
-
-Thu Mar 19 01:33:35 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_java): Put JAVACFLAGS after -d option.  From
-       Per Bothner.
-
-       * automake.in (handle_java): Use $(JAVAROOT) in place of `../..'
-       in default CLASSPATH.
-       (am_install_var): Allow `JAVA' variable to be defined.  Don't
-       define `JAVA' primary.
-
-       * automake.in (scan_one_configure_file): Check for `sinclude' and
-       turn into recursive call.
-
-       * automake.in (initialize_per_input): Set $output_all.
-       (generate_makefile): Don't set $output_header or generate
-       `default' target.  Print $output_all before $output_header.
-       (handle_merge_targets): Put `all' target into $output_all.
-
-Wed Mar 18 14:48:44 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Put secondary dependencies from
-       multi-":" AC_OUTPUT entry into dependency list for file created by
-       config.status, not file created by automake.  Test colon3.test.
-       (generate_makefile): Pass $output, not $makefile, to
-       handle_merge_targets.
-
-       * Makefile.am (pkgdata_DATA): Added java.am, java-clean.am.
-       * java-clean.am: New file.
-       * java.am: New file.
-       * automake.in (generate_makefile): Call handle_java.
-       (handle_java): New sub.
-       (am_install_var): Only push primary variable on @all if not doing
-       Java.
-
-Sun Mar  8 15:43:09 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): When recognizing AC_OUTPUT ":"
-       syntax, make regexp less greedy.  From Maciej W. Rozycki.  Test
-       colon4.test.
-
-Fri Mar  6 21:20:53 1998  Tom Tromey  <address@hidden>
-
-       * m4/exeext.m4 (AM_EXEEXT): Ignore am_c_test.o.  From Bruno
-       Haible.
-
-Tue Feb 24 12:10:44 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.2f.
-
-       * mans.am (address@hidden@, address@hidden@): Quote
-       `$' in sed expression.
-
-       * config.guess, config.sub, texinfo.tex: New versions from FSF.
-
-       * Makefile.am (pkgdata_DATA): Added mans.am.
-       * automake.in (handle_man_pages): Rewrote for new man page
-       handling.
-       (initialize_global_constants): Removed install_man_format,
-       uninstall_man_format.
-       * mans.am: New file.
-
-       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs.am,
-       scripts.am, texinfos.am: Put `@' before NORMAL_UNINSTALL
-       invocation.
-
-Mon Feb 23 13:38:56 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (get_object_extension): Remove .c.lo rule from
-       libtool when dependencies turned on.
-       * libtool.am (.c.lo): Disable when dependency checking turned on.
-
-       Dependency fixes from Alexandre Oliva:
-       * automake.in (handle_dependencies): Fixed quoting when
-       substituting @PFX@ and @address@hidden  Don't look for the `.P' file.
-       * depend2.am (%.o): Use @PFX@ and @address@hidden
-       (%.lo): New rule.
-
-       * texinfos.am (.txi.info, .txi.dvi, .txi): New rules.
-       * automake.in (handle_texinfo): Recognize .txi files.  From Karl
-       Berry.
-
-       * automake.in (handle_single_transform_list): $objpat now a
-       parameter.  Set $objpat when suffix rule found.
-
-       * aclocal.in (parse_arguments): Only put current year in --version
-       output.
-       * automake.in (parse_arguments): Only put current year in
-       --version output.
-
-Mon Feb 16 00:12:03 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_aclocal_m4): When processing -I options,
-       directory is separate argument.  Test aclocali.test.
-
-Fri Feb 13 14:35:39 1998  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (handle_texinfo): Correct condition for whether
-       texinfo.tex is required.  [Test texinfo5.test]
-
-Fri Feb 13 00:28:53 1998  Tom Tromey  <address@hidden>
-
-       * Released 1.2e.
-
-       * Makefile.am: Removed bogus line.
-
-Thu Feb 12 22:27:05 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (get_object_extension): Conditionally include .c.o
-       rule from compile.am.
-       (handle_dependencies): Generate correct code when including new
-       depend2.am.
-       (file_contents_with_transform): Better error reporting.
-       * depend.am (MKDEP): Removed.
-       (.deps/.P): Removed.  Don't include .deps/.P.
-       * compile.am (.c.o): Now conditional on dependencies not being
-       generated by compiles.
-       * depend2.am (%.o): New rule.
-       (.deps/%.P): Removed.
-
-       * tags.am (TAGS): Uniquify list of files.  From Harlan Stenn.
-
-       * aclocal.in (scan_m4_files): Reverse-sort keys when constructing
-       `search' function.  From Johan Danielsson.
-
-Tue Sep 16 14:13:15 1997  Paul D. Smith  <address@hidden>
-
-       * automake.in: Create new option --generate-deps.  This option has
-       automake generate a .dep_segment file containing just the
-       dependencies created from the .P list.  This is needed to maintain
-       other makefiles that automake doesn't deal with (Makefile.DOS,
-       SMakefile, etc.)
-       * automake.texi (Invoking Automake): Document it.
-
-Thu Feb 12 19:45:16 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.in (scan_configure): Tightened regexp a bit.  Test
-       whoami.test.  From Johan Danielsson.
-
-       Report from H.J. Lu.
-       * automake.in (output_yacc_build_rule): Don't write rule to create
-       `.h' file.
-       (handle_yacc_lex_cxx): Generate rule to build each .h file.
-
-       * automake.in (handle_options): Set readme-alpha and check-news
-       for Gnits after main processing.  Test alpha.test.  From Jim
-       Meyering.
-
-       * aclocal.in (usage): Updated bug-reporting address.
-       * automake.in (usage): Updated bug-reporting address.
-
-       * compile.am: Remove *.core for 4.4BSD systems.  From Assar
-       Westerlund.
-
-       * automake.in (handle_single_transform_list): Don't set
-       seen_any_source if all sources are C++.
-
-Wed Feb 11 17:30:01 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.in (write_aclocal): Write to $output_file, not
-       aclocal.m4.  From Alexandre Oliva.
-
-Thu Feb  5 13:38:55 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Put CXCPP before CXX in
-       regexp.  From Garth Corral.  Test cxxxcpp.test.
-
-Sun Jan 25 11:16:53 1998  Tom Tromey  <address@hidden>
-
-       * automake.in (generate_makefile): Run handle_minor_options before
-       handle_dist, to make sure README-alpha ends up in distribution.
-       From Jim Meyering.
-
-Tue Jan 13 09:19:33 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.in (add_file): Hack for Perl 4.  From Seth Alves.
-
-Thu Dec 11 12:29:46 1997  Ian Lance Taylor  <address@hidden>
-
-       * scripts.am: Don't add @EXEEXT@ to installed scripts.  Scripts
-       are not executables.
-
-Tue Dec  2 20:07:18 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Bug fix in
-       uninstall_man_format.  Report from Eric Backus.
-
-Mon Dec  1 13:52:39 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Correctly generate
-       _OBJECTS when _SOURCES is defined conditionally.  Reported by Rob
-       Savoye.  Test cond3.test.
-
-       Fixes for test objc.test:
-       * automake.in (initialize_per_input): New global seen_any_source.
-       (handle_yacc_lex_cxx): Use seen_any_source to decide when to
-       define LINK, et al.
-       (handle_single_transform_list): Set seen_any_source.
-       (handle_lib_objects_cond): Likewise.
-
-Wed Nov 26 13:41:57 1997  Tom Tromey  <address@hidden>
-
-       * Released 1.2d.
-
-       * m4/ccstdc.m4: Don't force AM_PROG_CC_STDC before AC_PROG_CPP.
-       Temporary hack.
-
-       * m4/mktime.m4 (AM_FUNC_MTIME): New version from Paul Eggert.
-
-       * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL,
-       NORMAL_UNINSTALL, PRE_UNINSTALL, POST_UNINSTALL): Define as `:',
-       not `true'.
-
-       * automake.in (output_yacc_build_rule): Don't overwrite .h file in
-       non-ylwrap case.
-
-       * tags.am (ID): Scan lisp files.
-       (TAGS): Make tags for lisp files.
-
-Tue Nov 25 14:20:42 1997  Tom Tromey  <address@hidden>
-
-       * ltlib.am: Use INSTALL_DATA, not INSTALL_PROGRAM.  From Gord
-       Matzigkeit.
-
-Fri Nov 21 15:15:50 1997  Tom Tromey  <address@hidden>
-
-       * m4/mingw.m4, m4/cygwin.m4: Argument to AC_TRY_COMPILE is
-       function body, not entire function.  From Ian Taylor.
-
-Sat Oct 25 12:39:19 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Skip empty string for
-       Perl 4.  From Assar Westerlund.
-
-       * config.guess, config.sub, texinfo.tex: New versions from FSF.
-
-Fri Oct 24 23:15:09 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (output_yacc_build_rule): Use YFLAGS again.
-       (handle_yacc_lex_cxx): Error if YACCFLAGS used.
-
-Wed Aug 27 19:26:45 1997  Rob Savoye  <address@hidden>
-
-       * compile.am: Add suffix rules for ".s.o" and ".S.o" so assembler
-       files can be used.
-       * libtool.am: Add suffix rules for ".s.lo" and ".S.lo" so assembler
-       files can be used.
-       * automake.in: Add .S and .s to the standard list of suffixes so
-       assembler files can be used.
-
-Fri Oct 24 13:39:01 1997  Tom Tromey  <address@hidden>
-
-       * m4/exeext.m4: Require AM_MINGW32.  Check MINGW32 setting.
-
-Thu Oct 23 21:16:28 1997  Tom Tromey  <address@hidden>
-
-       * m4/init.m4 (missing_dir): AC_REQUIRE AM_SANITY_CHECK,
-       AC_ARG_PROGRAM, and AC_PROG_MAKE_SET.
-
-Tue Oct 21 16:49:36 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_options): Recognize `cygnus'.
-
-Tue Sep  9 17:09:47 1997  Rob Savoye  <address@hidden>
-
-       * m4/mingw.m4: New file for mingw32 support.
-       * m4/exeext.m4: Also check for the mingw32 environment.
-
-Tue Oct 21 00:39:44 1997  Tom Tromey  <address@hidden>
-
-       * m4/Makefile.am (m4data_DATA): Added mingw.m4.
-
-       * automake.in (handle_lib_objects_cond): Don't require @address@hidden
-       (handle_programs): Likewise.
-
-       * subdirs.am (check-recursive installcheck-recursive
-       info-recursive dvi-recursive): Handle case when SUBDIRS is empty.
-       (maintainer-clean-recursive): Likewise.  From Assar Westerlund.
-
-       * aclocal.in (scan_m4_files): If macro recognized, &search will
-       return 1.
-       (scan_configure): If AM_ macro not found, give error.
-
-       * m4/sanity.m4: If `ls' completely fails, die.  From Jim
-       Meyering.
-
-Mon Oct 20 16:13:48 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_single_transform_list): Fixlet for Fortran.
-       From Bernard Urban.
-
-       * libtool.am: Remove _libs, for libtool 1.0d.  From Gord
-       Matzigkeit.
-
-Sun Oct 19 22:59:35 1997  Tom Tromey  <address@hidden>
-
-       * texinfos.am: Bug fix.  From John W. Coomes.
-
-Mon Sep 29 12:57:00 1997  Tom Tromey  <address@hidden>
-
-       * Released 1.2c.
-
-       * automake.in (handle_dist_worker): In topmost directory of
-       project, use `distdir', not `top_distdir', as argument to
-       --output-dir; likewise when building in subdirs.
-
-Sun Sep 28 15:55:46 1997  Tom Tromey  <address@hidden>
-
-       * m4/sanity.m4: Test $*, not address@hidden  From Akim Demaille.
-
-       * automake.in (handle_minor_options): New sub.
-       (check_gnits_standards): Don't handle README-alpha here.
-       (handle_dist_worker): Check NEWS file if `check-news' option
-       requested.
-       (generate_makefile): Run handle_minor_options.
-       (handle_options): Handle readme-alpha and check-news.  Set them if
-       --gnits.
-
-       * depend.am (MKDEP): Use $(CC), not gcc.
-
-Wed Sep 24 23:48:26 1997  Tom Tromey  <address@hidden>
-
-       * Release 1.2b.
-
-       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Make sure this is run before
-       AC_PROG_CPP.  From Markus Oberhumer.
-
-Fri Sep 12 00:04:19 1997  Paul Eggert  <address@hidden>
-
-       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Don't look at __STDC__;
-       look only at whether function prototypes are supported.
-
-Wed Sep 24 16:10:37 1997  Tom Tromey  <address@hidden>
-
-       * Various: Put "-" before each `rm' line.  This avoids a bug in
-       some losing makes (Ultrix, 4.3 BSD).
-
-       * automake.in (handle_dist_worker): Correctly handle subdirs that
-       have their own configure.in.  From Peter Mattis.
-
-       * automake.in (handle_yacc_lex_cxx): Handle de-ansi-fied sources
-       in srcdir as well as build dir.
-
-       * automake.in (scan_one_configure_file): Detect AC_OUTPUT().
-       (handle_single_transform_list): Don't apply length() to a list.
-
-       * automake.in (handle_programs): Define _DEPENDENCIES variable if
-       not defined by user.
-
-Thu Sep 18 19:43:38 1997  Tom Tromey  <address@hidden>
-
-       * m4/sanity.m4: Quote "$@" for m4.  From Gord Matzigkeit.
-
-Mon Sep  1 23:50:38 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Set need_texi_file only when
-       TEXINFO_TEX not defined.
-
-Thu Aug 28 09:37:29 1997  Tom Tromey  <address@hidden>
-
-       From Juergen Erhard:
-       * automake.in (SUFFIX_RULE_PATTERN): New global.
-       (handle_single_transform_list): If suffix matches a source suffix,
-       rewrite.
-       (read_am_file): Add suffix rules to %suffix_rules.
-       (initialize_per_input): Initialize %suffix_rules.
-
-Wed Aug 27 12:56:50 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Also remove .kys and .ps files.
-
-       * automake.in (handle_yacc_lex_cxx): Quoting fixlet.  From Kaveh
-       Ghazi.
-
-       * aclocal.in (write_aclocal): Print copyright and copying
-       permissions.  From RMS.
-       * automake.in (initialize_global_constants): More copyright stuff
-       from RMS.
-
-       * automake.in (handle_texinfo): Only require texinfo.tex in
-       appropriate situations.  Report from Paul D. Smith.
-
-Mon Aug 25 15:45:52 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_dependency_file): Fix so that
-       OMIT_DEPENDENCIES will work.  From Alexander Lukyanov.
-
-       * automake.in (handle_texinfo): texi2dvi can generate `.cn'
-       files.  From Akim Demaille.
-
-Wed Aug  6 10:51:37 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): Reversed sense of test.
-
-Tue Aug  5 17:49:54 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Always mark OMIT_DEPENDENCIES
-       as seen.
-
-       * automake.in (handle_yacc_lex_cxx): Make each _.c file depend on
-       ansi2knr.
-
-       * automake.in (handle_yacc_lex_cxx): Fix for makes which don't
-       allow $< in non-suffix rules.  From Akim Demaille.
-
-       * automake.in (value_to_list): If variable name contains configure
-       substitution, then just ignore it.
-
-       * automake.in (variable_defined): Mark variable is seen, even if
-       only conditionally seen.
-
-       * Makefile.am: Check for bad splits.
-       * automake.in (various): Use split(' ',...), not split(/ /,...).
-
-Tue Aug  5 14:08:51 1997  Ian Lance Taylor  <address@hidden>
-
-       * ylwrap: If the program is a relative path, force it to be
-       absolute.
-
-Tue Aug  5 16:59:41 1997  Tom Tromey  <address@hidden>
-
-       * missing: Examine A[CM]_CONFIG_HEADER for name of files to
-       touch.  From Markus F.X.J. Oberhumer.
-
-       * automake.in (require_file_internal): Better error message when
-       installing.
-
-       * automake.in (handle_texinfo): Smarter test when deleting output
-       of makeinfo.
-
-Sat Aug  2 13:32:45 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (do_check_merge_target): In --cygnus mode, check
-       doesn't depend on all.
-
-       * automake.in (output_yacc_build_rule): Use YACCFLAGS, not
-       YFLAGS.  Per GNU Standards.
-
-       * dejagnu.am (RUNTESTDEFAULTFLAGS): New macro.
-       (check-DEJAGNU): Use it.
-
-       * subdirs.am (maintainer-clean-recursive): Actually reverse subdir
-       list.  From Alexander Lukyanov.
-
-       * automake.in (initialize_global_constants): Changed generated
-       copyright.  From RMS.
-
-       * automake.in (handle_configure): Pass correct value for
-       CONFIG_FILES.  From Ian Taylor.
-
-Thu Jul 31 17:36:10 1997  Ian Lance Taylor  <address@hidden>
-
-       * ylwrap (pairlist): Shift out trailing "--"; don't pass it to
-       $prog.
-
-Thu Jul 24 00:52:02 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Changed index names
-       in dist hash so that alternate dist targets will be generated.
-       Report from Glenn Amerine.
-
-       Suggestion from Karl Berry:
-       * automake.in (usage): Added short info line.
-
-       * aclocal.in (usage): Updated bug-reporting address.  Added short
-       info line.
-
-       * automake.in (handle_emacs_lisp): Put contents of lisp-clean.am
-       into output.  Report from Karl Berry.
-
-Mon Aug 25 16:14:32 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Only generate ":" syntax for
-       CONFIG_FILES when really needed.
-
-Wed Aug  6 14:47:12 1997  Ian Lance Taylor  <address@hidden>
-
-       * remake-hdr.am (@CONFIG_HEADER@): Use a dummy command to force
-       GNU make to recheck the file modification time.
-
-Tue Aug  5 14:44:10 1997  Ian Lance Taylor  <address@hidden>
-
-       * ylwrap: If the program is a relative path, force it to be
-       absolute.
-
-Mon Aug  4 14:52:08 1997  Ian Lance Taylor  <address@hidden>
-
-       * automake.in ($RULE_PATTERN): Accept $ in body of rule name.
-       (handle_programs): Don't append $(EXEEXT) if the
-       program name contains '.'.
-       (am_install_var): When rewriting _PROGRAMS, don't append $(EXEEXT)
-       if the program names contains '.'.  Also, handle conditionals.
-
-Sat Aug  2 14:43:41 1997  Tom Tromey  <address@hidden>
-
-       * m4/exeext.m4: Fixed quoting.
-
-       * m4/exeext.m4 (am_cv_exeext): Use echo, not ls.
-
-       * automake.in (handle_programs): Transform @EXEEXT@ when including
-       program.am.
-
-Fri Aug  1 17:09:09 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_programs): Don't transform CYGWIN or
-       NOTCYGWIN.
-       (am_install_var): Likewise.
-
-       * progs-clean.am (address@hidden@PROGRAMS): Never include EXEEXT.
-
-       * progs.am: Removed @EXEEXT@; it is now implicit.
-       * program.am: Add @EXEEXT@ in appropriate places; removed
-       cygwin-dependent code.
-       * automake.in (seen_exeext): Renamed from seen_cygwin32.
-       (handle_programs): Use seen_exeext.
-       (scan_one_configure_file): Look for AM_EXEEXT, not AM_CYGWIN32.
-       (check_cygnus): Use seen_exeext.
-       (am_install_var): Likewise.
-       (am_install_var): When handling PROGRAMS primary, append EXELIST
-       to program names as necessary.
-       * m4/exeext.m4: Require AM_CYGWIN32.
-
-Thu Jul 31 17:36:10 1997  Ian Lance Taylor  <address@hidden>
-
-       * ylwrap (pairlist): Shift out trailing "--"; don't pass it to
-       $prog.
-
-       * texinfos.am: Add -I $(srcdir) when invoking $(MAKEINFO) for
-       CYGNUS .texinfo.info case and .texinfo case.
-
-       * automake.in (handle_configure): Correct handling of inputs for
-       for AC_OUTPUT files when invoking config.status.
-
-Mon Jul 28 15:29:25 1997  Rob Savoye  <address@hidden>
-
-       * m4/cygwin.m4: Set a variable CYGWIN32, rather than EXEEXT.
-       * m4/exeext.m4: New autoconf test for an executable suffix.
-       * m4/Makefile.in: Install the new exeext.m4 test.
-
-Sun Jun 22 14:01:59 1997  Tom Tromey  <address@hidden>
-
-       * Released version 1.2.
-
-       * automake.in (handle_texinfo): Look for texinfo.tex in aux dir.
-
-       * automake.in (require_file_internal): Only print "installing"
-       when actually installing.  From Gord Matzigkeit.
-
-       * automake.in (handle_tests): Exit status `77' means `ignore
-       test'.  From François Pinard.
-       (handle_tests) Also, make banner same size as text.
-
-       * automake.in (handle_configure): Don't handle PRE_BUILT_SOURCES.
-       (handle_built_sources): Likewise; don't have `all' depend on
-       BUILT_SOURCES.
-
-       * depend.am (DEPS_MAGIC): New variable.
-       (.deps/.P): Depend on BUILT_SOURCES again.
-
-       * texinfos.am: Use ||, not ;.
-
-Tue Jun 10 11:04:16 1997  Tom Tromey  <address@hidden>
-
-       * m4/cygwin.m4: Examine output of compiler to see if .exe needed.
-
-Sun Jun  1 13:16:05 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_built_sources): Handle PRE_BUILT_SOURCES.
-       (handle_configure): Likewise.
-
-       * depend2.am (.deps/%.P): Don't generate file if MKDEP fails.
-       From Alexandre Oliva.
-
-       * depend.am (.deps/.P): Depend on PRE_BUILT_SOURCES, not
-       BUILT_SOURCES.
-
-       * automake.in (initialize_global_constants): Added 1997 to
-       copyright info.
-
-       * automake.in (output_yacc_build_rule): Never move y.tab.c over
-       the .h file.  From Jim Meyering.
-
-Thu May 29 23:16:02 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): Avoid defining ACLOCAL,
-       AUTOCONF, AUTOMAKE, AUTOHEADER.  From David Zaroski.
-
-Sat Feb 22 16:05:24 1997  Gordon Matzigkeit  <address@hidden>
-
-       * Makefile.am (pkgdata_DATA): Under this new scheme, we no longer
-       need compile-kr.am.  Delete it.
-
-       * automake.in (handle_yacc_lex_cxx, get_object_extension): Use
-       _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification.
-
-       * ansi2knr.c (main): Parse our arguments a little differently so
-       that we don't create null output files when we can't read the
-       input file.
-
-Wed May 28 23:40:33 1997  Tom Tromey  <address@hidden>
-
-       * depend.am (.deps/.P): Depend on $(BUILT_SOURCES) again.  From
-       Gord Matzigkeit.
-
-Mon May 26 22:50:49 1997  Tom Tromey  <address@hidden>
-
-       * remake-hdr.am ($(srcdir)/@address@hidden): Make echo silent.  Report
-       from Alexandre Oliva.
-
-       * automake.in (generate_makefile): If --no-force, check
-       Makefile.in against configure.in and aclocal.m4.  Report from
-       Alexandre Oliva.
-
-       * automake.in (handle_dist_worker): Put --include-deps on command
-       line if specified originally.
-       (handle_configure): Likewise.
-
-       * configure.in: Error if Perl 5.001 is used.
-
-       * ylwrap: Don't quote $prog when executing it.  From Jim
-       Meyering.
-
-Thu May 15 12:05:20 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_merge_targets): Set INSTALL_SCRIPT in
-       install-strip target.
-
-Tue May 13 08:20:02 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dependencies): Don't generate dependencies
-       if DEP_FILES would be empty.
-
-Sun May 11 13:59:14 1997  Tom Tromey  <address@hidden>
-
-       * config.guess: New version from FSF.
-
-       * automake.in (get_object_extension): If ansi2knr in another
-       directory, always define ANSI2KNR to full path.  From Akim
-       Demaille.
-
-       * kr-extra.am (clean-krextra): Remove ansi2knr here, not in
-       distclean-krextra.
-
-       * missing: Regularized grammar.  From François Pinard.
-
-Sat May 10 16:48:47 1997  Tom Tromey  <address@hidden>
-
-       * Released 1.1p.
-
-       * m4/init.m4: Error if source directory already configured.
-
-       * automake.in (scan_dependency_file): Always use srcdir name as
-       passed in on command line.
-
-Thu May  1 12:53:46 1997  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (value_to_list): Don't fail when a variable
-       substitution is not a complete word.
-
-Tue May  6 15:22:41 1997  Ian Lance Taylor  <address@hidden>
-
-       * subdirs.am: Fix check for make -k to use $(MAKEFLAGS) and to not
-       get fooled by command line arguments.
-
-Sat May 10 15:48:46 1997  Tom Tromey  <address@hidden>
-
-       * m4/ccstdc.m4: Print "none needed" if compiler accepts ANSI C by
-       default.
-
-Mon May  5 23:24:09 1997  Tom Tromey  <address@hidden>
-
-       * mkinstalldirs, config.guess, config.sub, COPYING, texinfo.tex:
-       New versions from FSF.
-
-Sun May  4 15:21:22 1997  Tom Tromey  <address@hidden>
-
-       * texinfos.am (install-info): Avoid the Debian install-info.
-       (uninstall-info): Likewise.
-
-       * automake.in (handle_single_transform_list): Strip any directory
-       name before processing name.
-
-Thu May  1 19:24:08 1997  Tom Tromey  <address@hidden>
-
-       * depend2.am (.deps/%.P): Don't put $(srcdir)/ into dependency.
-
-Wed Apr 30 19:15:47 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Change how top_distdir is
-       computed.  Based on patch from Ian Taylor.
-       (handle_dist): Define top_distdir.
-
-       * automake.in (handle_yacc_lex_cxx): Include CXXFLAGS in CXXLINK.
-       (handle_yacc_lex_cxx): Include CFLAGS in LINK.
-
-Wed Apr 30 14:46:37 1997  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (handle_dist_worker): When building a distribution,
-       if SUBDIRS is defined conditionaly, recur into each possible
-       subdirectory.
-
-       * clean.am (distclean-generic): Remove stamp-h[0-9]*.
-
-Tue Apr 29 19:11:45 1997  Tom Tromey  <address@hidden>
-
-       * INSTALL, mkinstalldirs, install-sh: Update from François
-       Pinard.
-
-       * aclocal.in (add_macro): If AC_ macro was defined, then mark it
-       as seen.  Report from Janos Farkas.
-
-       * subdirs.am: Clean targets now run in reverse order.  From Kevin
-       Dalley.
-
-       * automake.in (handle_texinfo): Put `aminfo', not `info' on
-       @clean.
-
-       * mdate-sh: New version from Ulrich Drepper.
-
-Mon Apr 28 01:18:05 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Makefile only depends on
-       BUILT_SOURCES when generating dependencies.
-
-       * Released 1.1o.
-
-Sun Apr 27 23:58:20 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist): Use variable_value, not
-       variable_contents.
-
-Wed Apr 23 14:04:28 1997  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (IF_PATTERN): Define.
-       (ELSE_PATTERN, ENDIF_PATTERN): Define.
-       (AM_CONDITIONAL_PATTERN): Define.
-       (%configure_cond): New global hash table.
-       (handle_source_transform): If xx_SOURCES is defined conditionally,
-       define xx_OBJECTS using the same conditions.
-       (handle_lib_objects): If variable is defined conditionally, define
-       xx_DEPENDENCIES conditionally.  Most code moved into subroutine.
-       (handle_lib_objects_cond): New function, broken out of
-       handle_lib_objects.
-       (scan_one_configure_file): Look for $AM_CONDITIONAL_PATTERN.
-       (conditional_true_when): New function.
-       (variable_defined): Add new parameter: cond.  Change some
-       callers.
-       (variable_conditions): New function.
-       (variable_conditionally_defined): New function.
-       (variable_value): New function.  Change most uses of $contents to
-       call variable_value instead.
-       (value_to_list): New function, from variable_value_as_list.
-       (variable_value_as_list): Add new parameter: cond.  Change all
-       callers.  Move some code into subroutine value_to_list.
-       (define_pretty_variable): Add new parameter: cond.  Change call
-       callers.
-       (read_am_file): Handle conditionals.
-       (initialize_per_input): Initialize %conditional and
-       @conditional_stack.
-       * m4/cond.m4: New file.
-       * m4/Makefile.am (m4data_DATA): Add cond.m4.
-
-Sun Apr 27 11:03:36 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Run automake once per
-       directory, instead of once at the top.
-       (handle_dist_worker): Changed interface.
-       (handle_dist): Likewise.
-       (generate_makefile): Better error message if can't write the
-       file.
-       (handle_dist_worker): Pass top_distdir to subdir makes.
-
-       * automake.in (handle_dist_worker): Use mode 777 on directories in
-       distribution.  GNU Standards compliance.
-
-       * automake.in (handle_yacc_lex_cxx): Don't use interlock.
-       (output_yacc_build_rule): Don't use interlock; just use new ylwrap
-       instead.  The new ylwrap builds in a subdir; idea from Mark
-       Eichin.
-       (output_lex_build_rule): Likewise.
-       (initialize_global_constants): [common_files] Don't include
-       interlock.
-
-       * Makefile.am (pkgdata_SCRIPTS): Removed interlock.
-       * interlock: Removed.
-       * ylwrap: Changed interface.  Now runs command in subdir.
-
-       * remake.am (config.status): Look in srcdir for config header.
-       ($(srcdir)/configure): Likewise.
-       * remake-hdr.am (@STAMP@): Look in srcdir for config header.  From
-       Phil Nelson.
-       ($(srcdir)/@CONFIG_HEADER_IN@): Likewise.
-
-       * automake.in (handle_aclocal_m4): Make target $(ACLOCAL_M4), not
-       value spelled out.  From Phil Nelson
-
-       * automake.in (handle_configure): Don't skip Makefiles; instead
-       skip automake inputs.
-       (handle_merge_targets): Changed interface; put $makefile at
-       beginning of @all (rather than Makefile at end).
-
-       * automake.in (handle_yacc_lex_cxx): Correctly compute
-       de_ansi_sources.
-
-       * clean-kr.am (distclean-kr): Do nothing; ansi2knr is removed in
-       kr-extra.am.
-
-       * Makefile.am: Check to make sure there are no accidental
-       configure substitutions.
-
-       * automake.in (handle_texinfo): Don't allow configure substitution
-       on @MAKEINFO@ here.
-
-       * automake.in (handle_yacc_lex_cxx): ._c and ._o files both depend
-       on $(ANSI2KNR).
-
-       * kr-extra.am (ansi2knr): Removed.
-       (ansi2knr.o): Likewise.
-
-       * automake.in (get_object_extension): Allow ansi2knr to be built
-       from any directory.
-
-Fri Apr 25 12:33:23 1997  Tom Tromey  <address@hidden>
-
-       * missing: Changed bison text.  From Ian Taylor.
-
-       * m4/missing.m4: Redirect stdin of testee.  From Bill Fenner.
-
-       * automake.in (output_yacc_build_rule): Generate rule to create .h
-       file.
-       (handle_footer): Generate unique, sorted list of suffixes.
-
-       * automake.in (scan_one_configure_file): Recognize AC_PROG_AWK,
-       _CPP, _CXCPP, _LN_S.  From Ralph Schleicher.
-
-Mon Apr 21 12:35:57 1997  Ian Lance Taylor  <address@hidden>
-
-       * automake.in (@config_fullnames): New array.
-       (@config_names): New array, replacing $config_name.
-       (@config_headers): New array, replacing $config_header.
-       (get_object_extension): Handle multiple header files.
-       (handle_tags, handle_merge_targets): Likewise.
-       (scan_one_configure_file): Likewise.
-       (handle_configure): Likewise.  Don't check for the configuration
-       header file in AC_OUTPUT; it won't be there.
-       * remake-hdr.am: Handle multiple header files.
-       * clean-hdr.am: New file, broken out of remake-hdr.am.
-       * m4/header.m4: Handle multiple header files.
-       * Makefile.am (pkgdata_DATA): Add clean-hdr.am.
-
-Wed Apr 16 00:05:47 1997  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texi.info, .texi, .texinfo.info, .info): Remove
-
-       * automake.in (define_program_variable): Added `override' argument.
-       (handle_texinfo): Pass override arg when defining MAKEINFO.
-       (AC_MISSING_PROG): New constant.
-       (scan_one_configure_file): Use it.
-
-Tue Apr 15 12:12:28 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_texinfo): In --cygnus mode, reserve
-       clean-info for the user.
-
-       * automake.in (handle_subdirs): Typo fix.  From Akim Demaille.
-
-       * automake.in (handle_tags): Only use SUBDIRS if it is actually
-       defined.  Report from Ian Taylor.
-
-       * tags.am: Added prefix to SUBDIRS rules.
-
-Wed Apr  9 17:09:40 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_ltlibraries): Use correct rpath
-       substitution.  Bug from Jim Blandy.
-
-Mon Apr  7 17:40:18 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (AM_INIT_AUTOMAKE_PATTERN): Fixed for new 3rd arg.
-       Test version2.test.
-
-Thu Apr  3 19:07:59 1997  Tom Tromey  <address@hidden>
-
-       * Released 1.1n.
-
-       * tags.am (TAGS): Run "cd && etags" in subshell for proper
-       associativity.
-
-       * texinfos.am (install-info-am): If --cygnus, then info file can
-       be in build dir.  From David Zaroski.
-
-       * ltlibrary.am (@LTLIBRARY@): use @RPATH@, not explicit -rpath.
-
-       * automake.in (handle_ltlibraries): Treat EXTRA_ libraries
-       specially.
-
-Wed Apr  2 00:03:50 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_source_transform): Don't generate dependency
-       on config.h.
-       (scan_dependency_file): Strip the .P file from the target.
-
-       * automake.in (handle_tags): Use single, not double, quotes when
-       setting list variable.
-
-       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs-clean.am,
-       progs.am, scripts.am, tags.am: Use single quotes to fill list
-       variable; otherwise `$' in filename will not work.  From Per
-       Bothner.
-
-       * mdate-sh: Use "ls -d" so mdate-sh can be run on a directory.
-       From Bruno Haible.
-
-       * automake.in (handle_programs): Error if LIBADD used where LDADD
-       meant.
-       (handle_libraries): Error if LDADD used where LIBADD meant.
-       (handle_ltlibraries): Likewise.
-
-Tue Apr  1 22:46:33 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (check_canonical_spelling): New sub.
-       (handle_programs): Use it.
-       (handle_libraries): Likewise.
-       (handle_ltlibraries): Likewise.
-
-Mon Mar 31 12:13:08 1997  Tom Tromey  <address@hidden>
-
-       * depend2.am (.deps/%.P): Make .P file depend on everything the .c
-       file includes.
-
-Fri Mar 28 23:34:49 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_configure): Error if stamp-h appears in
-       AC_OUTPUT line.
-
-Thu Mar 27 17:28:47 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_dist_worker): Avoid automake rules in
-       generated Makefile when no-dependencies specified.  From Greg
-       Woods.
-
-       * m4/lispdir.m4: Don't AC_SUBST ELCFILES.  From Greg Woods.
-
-       * texi-vers.am (address@hidden@): Make commands silent.
-
-       * Makefile.am (maintainer-check): "true" is ok now.
-
-       * m4/init.m4: Added optional 3rd argument, which avoids
-       AC_DEFINE.
-
-       * automake.in (scan_one_configure_file): Explicitly avoid
-       INSTALL_SCRIPT to avoid defining it twice.
-
-       * header-vars.am: Change _INSTALL variable definitions to `true'.
-       Updated all users to put `@' before invocation.
-
-Tue Mar 25 22:09:45 1997  Tom Tromey  <address@hidden>
-
-       Update to follow GNU Standards:
-       * automake.in (handle_man_pages): Use NORMAL_UNINSTALL before
-       uninstall-man.
-       * texinfos.am (uninstall-info): Use two loops, and have
-       PRE_UNINSTALL before running install-info.
-       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs.am,
-       scripts.am, texinfos.am: Use NORMAL_UNINSTALL.
-       * header-vars.am (PRE_UNINSTALL, POST_UNINSTALL,
-       NORMAL_UNINSTALL): Define.
-
-       * automake.in (scan_one_configure_file): Don't define ANSI2KNR as
-       a configure varriable.
-
-       * m4/missing.m4: Run test in a subshell.  From Gord Matzigkeit.
-
-Mon Mar 24 23:28:59 1997  Tom Tromey  <address@hidden>
-
-       * m4/sanity.m4: Sleep before creating temp file.
-
-       * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL):
-       Define.
-
-Sat Mar 22 00:06:00 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Make sure to delete
-       CYGWIN/NOTCYGWIN tokens as appropriate.
-       (handle_programs): Remove NOTCYGWIN tokens as well.
-       (file_contents_with_transform): A single newline makes an empty
-       line.
-
-       * program.am: Remove executable before linking.
-
-       * texinfos.am (.texi.dvi): Look in @TEXINFODIR@ for texinfo.tex.
-       (.texinfo.dvi): Likewise.
-
-       * automake.in (handle_texinfo): TEXINFO_TEX variable can set
-       location of texinfo.tex.
-
-Fri Mar 21 10:22:51 1997  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texinfo.dvi): Mirror .texi.dvi.
-
-       * ansi2knr.c, ansi2knr.1: New versions from L. Peter Deutsch.
-
-       * scripts.am: Add @EXEEXT@ to installed scripts.
-
-Wed Jan 22 20:12:31 1997  Jim Meyering  <address@hidden>
-
-       * m4/mktime.m4 (AM_FUNC_MKTIME): Run tests for each of a few values
-       for the TZ environment variable.  Andre Novaes Cunha provided the
-       hairy TZ setting that exercized the Solaris tzset bug.
-
-1997-01-22  Paul Eggert  <address@hidden>
-
-       * m4/mktime.m4: (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
-       test now, test a couple of thousand times.
-
-Thu Mar 20 00:16:54 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_programs): Remove CYGWIN lines unless
-       AM_CYGWIN32 seen.
-       (am_install_var): Remove CYGWIN lines from -clean file as well.
-
-       * progs.am: Put @EXEEXT@ where appropriate.
-
-       * program.am (@PROGRAM@): If using Cygwin32, then create actual
-       name in addition to ".exe" name.
-
-       * progs-clean.am (address@hidden@PROGRAMS): Conditionalize on CYGWIN.
-
-       * automake.in (check_cygnus): Require AM_CYGWIN32 in --cygnus mode.
-       (am_install_var): If AM_CYGWIN32 not seen, then remove @EXEEXT@
-       from .am files.
-
-       * automake.in (seen_cygwin32): New global.
-       (scan_one_configure_file): Check for AM_CYGWIN32.
-
-       * m4/cygwin.m4: New file.
-
-       * automake.in (scan_one_configure_file): Explicitly handle
-       AC_CONFIG_HEADER so we can avoid spurious warnings.
-       (obsolete_macros): Removed AC_CONFIG_HEADER.
-
-       * automake.in (handle_yacc_lex_cxx): Perl 4 fixes.  From Greg
-       A. Woods.
-
-Wed Mar 19 00:35:13 1997  Tom Tromey  <address@hidden>
-
-       * Released 1.1m.
-
-       * m4/missing.m4: Print message saying what is happening.
-
-       * m4/sanity.m4: sleep before testing.
-
-Tue Mar 18 17:20:03 1997  Tom Tromey  <address@hidden>
-
-       * config.guess, config.sub: New from the FSF.
-
-       * automake.in (initialize_global_constants): [common_files]
-       Include `missing'.
-       (scan_configure): Require `missing'.
-
-       * header-vars.am (MAKEINFO): Don't define.
-
-       * m4/init.m4 (missing_dir): Use AM_MISSING_PROG.
-       * m4/missing.m4: New file.
-
-       `missing' changes from François Pinard:
-       * Everywhere: Use ACLOCAL_M4 to name aclocal.m4 file; ACLOCAL now
-       names aclocal program.
-       * m4/init.m4: Replace programs with `missing' if not found.
-       * automake.in (handle_texinfo): Define MAKEINFO as @address@hidden
-       (AC_CHECK_PATTERN): Check for alphanumeric names only.
-       (handle_aclocal_m4): Use ACLOCAL, not aclocal.
-       * Makefile.am (pkgdata_SCRIPTS): Include missing.
-       * missing: New file.
-
-       * automake.in (target_defined): New sub.
-       (handle_footer): Error if target .SUFFIXES used.
-
-Sun Mar 16 14:33:41 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_lib_objects): Set seen_c_source to line
-       number.
-       (handle_yacc_lex_cxx): Use seen_c_source as line number.
-       (am_line_error): Line of -1 means skip line-number check.
-
-       * automake.in (read_am_file): Change to keep perl -w quiet.
-       (check_typos): Removed extra check of EXTRA_ containing config
-       subs.
-
-Mon Mar 10 23:17:19 1997  Tom Tromey  <address@hidden>
-
-       * remake-hdr.am (stamp-h): Set CONFIG_HEADERS to
-       $(CONFIG_HEADER_FULL).
-       * automake.in (handle_configure): Define CONFIG_HEADER_FULL.
-
-       * automake.in (handle_lib_objects): Set seen_c_source as
-       appropriate.  From Alexander V. Lukyanov.  Test cxxlibobj.test.
-
-Sat Mar  8 22:54:35 1997  Tom Tromey  <address@hidden>
-
-       * texinfo.tex: New version.
-
-       * automake.in (handle_emacs_lisp): If EMACS is `no', then we
-       couldn't find an Emacs.  So don't bother running elisp-comp.  From
-       Ulrich Drepper.
-
-       * automake.in (handle_texinfo): Added .tr and .cv to list of
-       texinfo clean extensions.  From Karl Berry.
-
-Fri Feb 28 22:14:53 1997  Tom Tromey  <address@hidden>
-
-       * Makefile.am: Make sure we never use "undef".
-
-       * automake.in (usage): Changed bug-reporting address.
-       (handle_dist): Use undef, not delete.
-
-Wed Feb 26 08:41:11 1997  Gordon Matzigkeit  <address@hidden>
-
-       * automake.in (%obsolete_macros): Reintroduce, with hints for what
-       to do to upgrade the support.
-
-       * automake.in, ltlib-clean.am, ltlib.am, ltlibrary.am: Revamped
-       libtool support to use the _LTLIBRARIES primary.
-
-Wed Feb 26 00:20:39 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tags): In default case, add @tags_deps to
-       dependencies of tags target.
-
-Tue Feb 25 23:46:29 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_tests): If a test failed, then make should
-       fail.  From Jim Meyering.
-
-Mon Feb 24 19:02:21 1997  Tom Tromey  <address@hidden>
-
-       * texi-vers.am (@VTEXI@): Copy stamp file into output.
-
-Sun Feb 23 00:10:36 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (handle_programs): Give correct error line for lex
-       error.
-       (am_line_error): Avoid uninitialized value errors from perl -w.
-
-       * aclocal.in (scan_m4_files): Fixed perl -w warning.
-
-       * texinfos.am (.texi, .texinfo): New targets.
-
-       * automake.in (scan_texinfo_file): Renamed.
-       (handle_texinfo): Handle files without ".info" extension.
-
-       * automake.in (handle_subdirs): Error if directory contains "/".
-       (handle_yacc_lex_cxx): Quoting fix.
-       (handle_single_transform_list): Use transformed (non-ansi) version
-       of $obj instead of explicit ".o".  From Gord Matzigkeit.
-
-       * m4/sanity.m4: Pass -L to ls if possible.
-
-Sat Feb 22 15:22:31 1997  Tom Tromey  <address@hidden>
-
-       * dist-vars.am (DISTFILES): Don't distribute MANS.
-
-       * automake.in (handle_dist): Use define_variable to define TAR,
-       GZIP.
-       (handle_dist): Pass GZIP in environment to tar.
-       (initialize_global_constants): Likewise.
-
-       From Kaveh Ghazi:
-       * m4/protos.m4: Don't put any dependencies on AC_C_INLINE or
-       AC_C_CONST.
-       * m4/ccstdc.m4: Force AM_PROG_CC_STDC to come before AC_C_INLINE
-       or AC_C_CONST.
-
-Fri Feb 21 00:39:17 1997  Tom Tromey  <address@hidden>
-
-       From The Crimson Binome:
-       * automake.in (handle_yacc_lex_cxx): Handle C++ yacc/lex source.
-       (output_yacc_build_rule): New sub for C++ yacc/lex.
-
-       * automake.in (my_glob): New sub.
-       (handle_dependencies): Use my_glob.
-       (handle_aclocal_m4): Scan ACLOCAL_AMFLAGS for dependencies.
-
-       * ltlibs.am, lisp.am, libs.am, header.am, data.am, progs.am,
-       scripts.am, texinfos.am: Add leading space to echo.
-
-       * automake.in (handle_texinfo): Added .tps and .vrs to list of TeX
-       endings.  From Jim Blandy.
-       (install_man_format): Make rule silent; instead print actual
-       command.
-
-Tue Feb  4 18:29:42 1997  Tom Tromey  <address@hidden>
-
-       * dist-vars.am (TAR): Removed.
-       * automake.in (TAR): New variable.
-       (handle_dist): Explicitly define TAR.
-       * configure.in: Compute TAR.
-
-       * automake.in (handle_lib_objects): Put @ALLOCA@ on @dep_list, not
-       @dep_files.
-       (AC_SUBST_PATTERN): Typo fix.
-       (handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
-       (handle_clean): Put -recursive target before -am target.
-       (handle_merge_targets): Put basename of $config_name on @all.
-       Test confsub.test.  From Ramón García Fernández.
-
-Tue Jan 28 22:19:04 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (initialize_global_constants): Put libtoolize files
-       into @common_files, not @common_sometimes.  From Gord Matzigkeit.
-
-Sun Jan 26 17:46:08 1997  Tom Tromey  <address@hidden>
-
-       * texinfos.am (.texi.info): If --cygnus, set -I $(srcdir).  From
-       Per Bothner.
-
-Sun Jan 12 18:28:16 1997  Fred Fish  (address@hidden)
-
-       * automake.in: Use 'interlock' and 'ylwrap' from source
-       directory or aux config directory, not build directory.
-
-Tue Jan  7 18:35:10 1997  Tom Tromey  <address@hidden>
-
-       * aclocal.in (parse_arguments): Handle -I.
-       (usage): Ditto.
-       (scan_m4_files): Ditto.
-
-       * automake.in (handle_single_transform_list): Don't give error
-       message if extension unrecognized.
-
-Tue Dec 17 11:18:20 1996  Andreas Schwab  <address@hidden>
-
-       * m4/header.m4 (AM_CONFIG_HEADER): Check for $CONFIG_HEADERS, not
-       $CONFIG_HEADER.
-
-Tue Jan  7 17:59:26 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (scan_one_configure_file): AM_INIT_GUILE_MODULE runs
-       AM_PROG_INSTALL, not AC_PROG_INSTALL.  From Jim Blandy.
-       (handle_texinfo): Handle no-texinfo.tex option.
-       (handle_options): Ditto.
-
-Thu Jan  2 14:16:17 1997  Tom Tromey  <address@hidden>
-
-       * automake.in (am_install_var): Ignore EXTRA libtool libraries.
-       From Marius Vollmer.
-
------
-
-Copyright 1997, 1998 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification, are
-permitted provided the copyright notice and this notice are preserved.
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..9d83dba
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,28 @@
+# Maintainer makefile for Automake.  Requires GNU make.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If the user runs GNU make but has not yet run ./configure,
+# give them an helpful diagnostic instead of a cryptic error.
+am--Makefile := $(wildcard Makefile)
+ifeq ($(am--Makefile),)
+  $(warning There seems to be no Makefile in this directory.)
+  $(warning You must run ./configure before running 'make'.)
+  $(error Fatal Error)
+else
+  include ./Makefile
+  include $(srcdir)/syntax-checks.mk
+endif
diff --git a/HACKING b/HACKING
index 8b5cdb9..70e6f96 100644
--- a/HACKING
+++ b/HACKING
@@ -42,31 +42,31 @@
 = Naming
 
 * We've adopted the convention that internal AC_SUBSTs should be
-  named with a leading `am__', and internally generated targets
-  should be named with a leading `am--'.  This convention, although
+  named with a leading 'am__', and internally generated targets
+  should be named with a leading 'am--'.  This convention, although
   in place from at least February 2001, isn't yet universally used.
   But all new code should use it.
 
-  We used to use `_am_' as the prefix for an internal AC_SUBST.
+  We used to use '_am_' as the prefix for an internal AC_SUBST.
   However, it turns out that NEWS-OS 4.2R complains if a Makefile
-  variable begins with `_'.  Yay for them.  I changed the target
-  naming convention just to be safe.
+  variable begins with the underscore character.  Yay for them.
+  I changed the target naming convention just to be safe.
 
 ================================================================
-= Editing `.am' files
+= Editing '.am' files
 
 * Always use $(...) and not ${...}
 
-* Use `:', not `true'.  Use `exit 1', not `false'.
+* Use ':', not 'true'.  Use 'exit 1', not 'false'.
 
-* Use `##' comments liberally.  Comment anything even remotely
+* Use '##' comments liberally.  Comment anything even remotely
   unusual.
 
 * Never use basename or dirname.  Instead use sed.
 
-* Do not use `cd' within back-quotes, use `$(am__cd)' instead.
+* Do not use 'cd' within back-quotes, use '$(am__cd)' instead.
   Otherwise the directory name may be printed, depending on CDPATH.
-  More generally, do not ever use plain `cd' together with a relative
+  More generally, do not ever use plain 'cd' together with a relative
   directory that does not start with a dot, or you might end up in one
   computed with CDPATH.
 
@@ -96,52 +96,29 @@
 = Working with git
 
 * To regenerate dependent files created by aclocal and automake,
-  use the `bootstrap' script.  It uses the code from the source
+  use the 'bootstrap' script.  It uses the code from the source
   tree, so the resulting files (aclocal.m4 and Makefile.in) should
   be the same as you would get if you install this version of
   automake and use it to generate those files.  Be sure to have the
-  latest stable version of Autoconf installed.  If such version is
-  not installed as "autoconf", pass it explicitly (along with the
-  accompanying "autom4te") when calling `bootstrap' and `configure'.
-  For example:
-    $ AUTOCONF=autoconf2.68 AUTOM4TE=autom4te2.68 ./bootstrap
-    $ ./configure AUTOCONF=autoconf2.68 AUTOM4TE=autom4te2.68
-
-* Dependent files aclocal.m4, configure and Makefile.in in all
-  directories should be up to date in the git repository, so that
-  the changes in them can be easily noticed and analyzed.
-
-* The git tree currently carries a number of branches: master for the
-  current development, and release branches named branch-X.Y.  The maint
-  branch serves as common ground for both master and the active release
-  branches.  Changes intended for both should be applied to maint, which
-  should then be merged to release branches and master, of course after
-  suitable testing.  It is advisable to merge only after a set of related
-  commits have been applied.
-
-* Example work flow for patches to maint:
-
-  # 1. Checkout the "maint" branch:
-  git checkout maint
-
-  # 2. Apply the patch(es) with "git am" (or create them with $EDITOR):
-  git am -3 0*.patch
-  # 2a. Run required tests, if any ...
-
-  # 3. Merge maint into branch-1.11:
-  git checkout branch-1.11
-  git merge maint
-  # 3a. Run required tests, if any ...
-
-  # 4. Redo steps 3 and 3a for master:
-  git checkout master
-  git merge maint
-  # testing ...
-
-  # 5. Push the maint and master branches:
-  git push --dry-run origin maint branch-1.11 master
-  # if all seems ok, then actually push:
-  git push origin maint branch-1.11 master
+  latest stable version of Autoconf installed and available early
+  in your PATH.
+
+* The Automake git tree currently carries two basic branches: 'master' for
+  the current development, and 'maint' for maintenance and bug fixes.  The
+  maint branch should be kept regularly merged into the master branch.
+  It is advisable to merge only after a set of related commits have been
+  applied, to avoid introducing too much noise in the history.
+
+* There may be a number of longer-lived feature branches for new
+  developments.  They should be based off of a common ancestor of all
+  active branches to which the feature should or might be merged later.
+  in the future, we might introduce a special branch named 'next' that
+  may serve as common ground for feature merging and testing, should
+  they not yet be ready for master.
+
+* After a major release is done, the master branch is to be merged into
+  the maint branch, and then a "new" master branch created stemming
+  from the resulting commit.
 
 * When fixing a bug (especially a long-standing one), it may be useful
   to commit the fix to a new temporary branch based off the commit that
@@ -149,14 +126,6 @@
   the active branches descending from the buggy commit.  This offers a
   simple way to fix the bug consistently and effectively.
 
-* When referring to older commits, use 'git describe' output as pointer.
-
-* There may be a number of longer-lived feature branches for new developments.
-  They should be based off of a common ancestor of all active branches to
-  which the feature should or might be merged later.  The next branch may
-  serve as common ground for feature merging and testing, should they not
-  be ready for master yet.
-
 * For merges from branches other than maint, prefer 'git merge --log' over
   plain 'git merge', so that a later 'git log' gives an indication of which
   actual patches were merged even when they don't appear early in the list.
@@ -168,19 +137,80 @@
   branch should document rewinding policy.
 
 ================================================================
+= Writing a good commit message
+
+* Here is the general format that Automake's commit messages are expected
+  to follow.  See the further points below for clarifications and minor
+  corrections.
+
+      topic: brief description (this is the "summary line")
+
+      <reference to relevant bugs, if any>
+
+      Here goes a more detailed explanation of why the commit is needed,
+      and a general overview of what it does, and how.  This section is
+      optional, but you are expected to provide it more often than not.
+
+      And if the detailed explanation is quite long or detailed, you can
+      want to break it in more paragraphs.
+
+      Then you can add references to relevant mailing list discussions
+      (if any), with proper links.  But don't take this as an excuse for
+      writing incomplete commit messages!  The "distilled" conclusions
+      reached in such discussions should have been placed in the
+      paragraphs above.
+
+      Finally, here you can thank people that motivated or helped the
+      change.  So, thanks to John Doe for bringing up the issue, and to
+      J. Random Hacker for providing suggestions and testing the patch.
+
+      <detailed list of touched files>
+
+* The <detailed list of touched files> is mandatory but for the most
+  trivial changes, and should follows the GNU guidelines for ChangeLog
+  entries (described explicitly in the GNU Coding Standards); it might
+  be something of this sort:
+
+    * some/file (func1): Improved frobnication.
+    (func2): Adjusted accordingly.
+    * another/file (foo, bar): Likewise.
+    * tests/foo.tap: New test.
+    * tests/Makefile.am (TESTS): Add it.
+
+* If your commit fixes an automake bug registered in the tracker (say
+  numbered 1234), you should put the following line after the summary
+  line:
+
+      This change fixes automake bug#1234.
+
+* If your commit is just related to the given bug report, but does not
+  fix it, you might want to add a line like this instead:
+
+      This change is related to automake bug#1234.
+
+* When referring to older commits, use 'git describe' output as pointer.
+  But also try to identify the given commit by date and/or summary line
+  if possible.  Examples:
+
+      Since yesterday's commit, v1.11-2019-g4d2bf42, ...
+
+      ... removed in commit 'v1.11-1674-g02e9072' of 01-01-2012,
+      "dist: ditch support for lzma"...
+
+================================================================
 = Test suite
 
 * Use "make check" and "make maintainer-check" liberally.
 
 * Make sure each test file is executable.
 
-* Use `keep_testdirs=yes' to keep test directories for successful
-  tests also.
+* Export the 'keep_testdirs' environment variable to "yes" to keep
+  test directories for successful tests also.
 
 * Use perl coverage information to ensure your new code is thoroughly
   tested by your new tests.
 
-* See file `tests/README' for more information.
+* See file 't/README' for more information.
 
 ================================================================
 = Release procedure
@@ -189,9 +219,9 @@
   releases as well.  Where differences are expected, they will be
   explicitly described.
 
-* Fetch new versions of the files that are maintained by the FSF.
-  Commit.  Unfortunately you need an FSF account to do this.
-  (You can also use `make fetch', but that is still woefully incomplete.)
+* Fetch new versions of the files that are maintained by the FSF by
+  running "make fetch".  In case any file in the automake repository
+  has been updated, commit and re-run the testsuite.
 
 * Update NEWS.
 
@@ -203,20 +233,24 @@
 * Run this:
   ./bootstrap && ./configure && make && make check && make distcheck
 
-* Run `make release-stats' if release statistics in doc/automake.texi
-  have not been updated yet.
+* Run "make git-tag-release".
+  This will run the maintainer checks, check that the NEWS file is
+  up-to-date, check that the local git repository and working tree
+  are clean and up-to-date, and create a proper signed git tag for
+  the release (based on the contents of $(VERSION)).
 
-* Run `make git-release'.
-  This will run "make dist" to create the tarballs, commit the last
-  changes to NEWS, configure.ac and m4/amversion.m4, tag the repository,
-  sign the tarballs, and upload them.
-  Use `make GNUPLOADFLAGS="--user key" git-release' to sign with
-  a non-default key.
+* Run "make git-upload-release".
+  This will first verify that you are releasing from a tagged version
+  and that the local git repository and working tree are clean and
+  up-to-date, and will then run "make dist" to create the tarballs,
+  and invoke the 'gnupload' script sign and upload them to the correct
+  locations.  In case you need to sign with a non-default key, you can
+  use "make GNUPLOADFLAGS='--user KEY' git-upload-release".
 
 * Update version number in configure.ac to next alpha number.
   Re-run ./bootstrap and commit.
 
-* Don't forget to `git push' your changes so they appear in the public
+* Don't forget to "git push" your changes so they appear in the public
   git tree.
 
 * For stable releases, update the manuals at www.gnu.org:
@@ -240,8 +274,7 @@
 
 -----
 
-Copyright (C) 2003, 2007, 2008, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 81fd332..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff --git a/Makefile.am b/Makefile.am
index d02731f..dc8932d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,7 @@
 
 ## Makefile for Automake.
 
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,32 +17,60 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## lib goes first, because it builds Config.pm, used by aclocal and
-## automake (run in doc, tests, and in the rebuild rules.)
-## `.' goes before doc and tests, because the latter two directories
-## run aclocal and automake.
-SUBDIRS = lib . contrib doc m4 tests
+## Might be updated later.
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+
+## ------------ ##
+##  Top level.  ##
+## ------------ ##
+
+# We want a handful of substitutions to be fully-expanded by make;
+# then use config.status to substitute the remainder where a single
+# expansion is sufficient.  We use a funny notation here to avoid
+# configure substitutions in our text.
+do_subst = ( sed \
+  -e "s,address@hidden@],Generated from $$in; do not edit by hand.,g" \
+  -e 's,address@hidden@],$(datadir),g' \
+  -e 's,address@hidden@],$(amdir),g' \
+  -e 's,address@hidden@],$(bindir),g' \
+  -e 's,address@hidden@],$(docdir),g' \
+  -e 's,address@hidden@],$(pkgvdatadir),g' \
+  -e 's,address@hidden@],$(scriptdir),g' \
+  -e 's,address@hidden@],$(automake_acdir),g' \
+  -e 's,address@hidden@],$(system_acdir),g' \
+## Hack to avoid a spurious substitution in the Automake script (part 1).
+  -e 's,address@hidden@],address@hidden@!!,g' \
+  | $(SHELL) ./config.status --file=- \
+## Hack to avoid a spurious substitution in the Automake script (part 2).
+  | sed -e 's,address@hidden@!!,@''am__isrc@,g' \
+  )
+
+# Generated  files shouldn't contain unexpanded '@substitutions@', and
+# should be made read-only, to prevent them from being edited by mistake
+# instead of the file the are generated from.
+generated_file_finalize = $(AM_V_at) \
+  if LC_ALL=C grep '@[a-zA-Z0-9_][a-zA-Z0-9_]*@' address@hidden; then \
+    echo "$@ contains unexpanded substitution (see lines above)"; \
+    exit 1; \
+  fi; \
+  chmod a-w address@hidden && mv -f address@hidden $@
 
 bin_SCRIPTS = automake aclocal
 
-CLEANFILES = $(bin_SCRIPTS)
+CLEANFILES += $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
 
 TAGS_FILES = $(AUTOMAKESOURCES)
 
-EXTRA_DIST = \
-  HACKING \
-  ChangeLog.96 \
-  ChangeLog.98 \
-  ChangeLog.00 \
-  ChangeLog.01 \
-  ChangeLog.02 \
-  ChangeLog.03 \
-  ChangeLog.04 \
-  ChangeLog.09 \
-  ChangeLog.11 \
+EXTRA_DIST += \
+  $(AUTOMAKESOURCES) \
   bootstrap \
-  $(AUTOMAKESOURCES)
+  GNUmakefile \
+  syntax-checks.mk \
+  HACKING
 
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
@@ -54,65 +80,505 @@ install-exec-hook:
        @for p in $(bin_SCRIPTS); do \
          f="`echo $$p|sed '$(transform)'`"; \
          fv="$$f-$(APIVERSION)"; \
-         rm -f $(DESTDIR)$(bindir)/$$fv; \
-         echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
-         $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
+         rm -f "$(DESTDIR)$(bindir)/$$fv"; \
+         echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
+         $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \
        done
 
 uninstall-hook:
        @for p in $(bin_SCRIPTS); do \
          f="`echo $$p|sed '$(transform)'`"; \
          fv="$$f-$(APIVERSION)"; \
-         rm -f $(DESTDIR)$(bindir)/$$fv; \
+         rm -f "$(DESTDIR)$(bindir)/$$fv"; \
        done
 
-
-## We can't use configure to do the substitution here; we must do it
-## by hand.  We use a funny notation here to avoid configure
-## substitutions in our text.
-do_subst = sed \
-  -e 's,address@hidden@],$(APIVERSION),g' \
-  -e 's,address@hidden@],$(PACKAGE),g' \
-  -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-  -e 's,address@hidden@],$(PACKAGE_URL),g' \
-  -e 's,address@hidden@],$(PATH_SEPARATOR),g' \
-  -e 's,address@hidden@],$(PERL),g' \
-  -e 's,address@hidden@],$(PERL_THREADS),g' \
-  -e 's,address@hidden@],$(SHELL),g' \
-  -e 's,address@hidden@],$(am_AUTOCONF),g' \
-  -e 's,address@hidden@],$(am_AUTOM4TE),g' \
-  -e 's,address@hidden@],$(VERSION),g' \
-  -e 's,address@hidden@],Generated from address@hidden; do not edit by 
hand.,g' \
-  -e 's,address@hidden@],$(datadir),g'
-
 ## These files depend on Makefile so they are rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
-## Use chmod a-w to prevent people from editing the wrong file by accident.
 automake: automake.in
 aclocal: aclocal.in
 automake aclocal: Makefile
        $(AM_V_at)rm -f $@ address@hidden
-       $(AM_V_GEN)$(do_subst) $(srcdir)/address@hidden >address@hidden
+       $(AM_V_GEN)address@hidden; $(do_subst) <$(srcdir)/address@hidden 
>address@hidden
+## We can't use '$(generated_file_finalize)' here, because currently
+## Automake contains occurrences of unexpanded @substitutions@ in
+## comments, and that is perfectly legit.
        $(AM_V_at)chmod a+x,a-w address@hidden && mv -f address@hidden $@
 
 ## The master location for INSTALL is lib/INSTALL.
-## This is where `make fetch' will install new versions.
+## This is where "make fetch" will install new versions.
 ## Make sure we also update this copy.
 INSTALL: lib/INSTALL
        $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@
 
-################################################################
-##
+# We don't use the default name for the autom4te cache directory,
+# so we need this.
+maintainer-clean-local:
+       rm -rf .autom4te.cache
+
+
+## -------------------------------------------------------------------- ##
+##  Auxiliary scripts and files for use with "automake --add-missing".  ##
+## -------------------------------------------------------------------- ##
+
+dist_pkgvdata_DATA = \
+  lib/COPYING \
+  lib/INSTALL \
+  lib/texinfo.tex
+
+## These must all be executable when installed.  However, if we use
+## _SCRIPTS, then the program transform will be applied, which is not
+## what we want.  So we make them executable by hand.
+dist_script_DATA = \
+  lib/config.guess \
+  lib/config.sub \
+  lib/install-sh \
+  lib/mdate-sh \
+  lib/missing \
+  lib/mkinstalldirs \
+  lib/elisp-comp \
+  lib/ylwrap \
+  lib/depcomp \
+  lib/compile \
+  lib/py-compile \
+  lib/ar-lib \
+  lib/test-driver \
+  lib/tap-driver.sh \
+  lib/tap-driver.pl
+
+install-data-hook:
+       @$(POST_INSTALL)
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | ( st=0; \
+             while read f; do \
+               echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
+               chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
+             done; \
+             exit $$st )
+
+installcheck-local: installcheck-executable-scripts
+installcheck-executable-scripts:
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | while read f; do \
+             path="$(pkgvdatadir)/$$f"; \
+             test -x "$$path" || echo $$path; \
+           done \
+         | sed 's/$$/: not executable/' \
+         | grep . 1>&2 && exit 1; exit 0
+
+
+## ---------------------------------------------------- ##
+##  Private perl modules used by automake and aclocal.  ##
+## ---------------------------------------------------- ##
+
+perllibdir = $(pkgvdatadir)/Automake
+dist_perllib_DATA = \
+  lib/Automake/ChannelDefs.pm \
+  lib/Automake/Channels.pm \
+  lib/Automake/Condition.pm \
+  lib/Automake/Configure_ac.pm \
+  lib/Automake/DisjConditions.pm \
+  lib/Automake/FileUtils.pm \
+  lib/Automake/General.pm \
+  lib/Automake/Getopt.pm \
+  lib/Automake/Item.pm \
+  lib/Automake/ItemDef.pm \
+  lib/Automake/Location.pm \
+  lib/Automake/Options.pm \
+  lib/Automake/Rule.pm \
+  lib/Automake/RuleDef.pm \
+  lib/Automake/Variable.pm \
+  lib/Automake/VarDef.pm \
+  lib/Automake/Version.pm \
+  lib/Automake/XFile.pm \
+  lib/Automake/Wrap.pm
+
+nodist_perllib_DATA = lib/Automake/Config.pm
+CLEANFILES += $(nodist_perllib_DATA)
+
+lib/Automake/Config.pm: lib/Automake/Config.in Makefile
+       $(AM_V_at)rm -f $@ address@hidden
+       $(AM_V_at)test -d lib/Automake || $(MKDIR_P) lib/Automake
+       $(AM_V_GEN)in=Config.in \
+         && $(do_subst) <$(srcdir)/lib/Automake/Config.in >address@hidden
+       $(generated_file_finalize)
+EXTRA_DIST += lib/Automake/Config.in
+
+
+## --------------------- ##
+##  Makefile fragments.  ##
+## --------------------- ##
+
+dist_am_DATA = \
+  lib/am/check.am \
+  lib/am/check2.am \
+  lib/am/clean-hdr.am \
+  lib/am/clean.am \
+  lib/am/compile.am \
+  lib/am/configure.am \
+  lib/am/data.am \
+  lib/am/dejagnu.am \
+  lib/am/depend.am \
+  lib/am/depend2.am \
+  lib/am/distdir.am \
+  lib/am/footer.am \
+  lib/am/header-vars.am \
+  lib/am/header.am \
+  lib/am/install.am \
+  lib/am/inst-vars.am \
+  lib/am/java.am \
+  lib/am/lang-compile.am \
+  lib/am/lex.am \
+  lib/am/library.am \
+  lib/am/libs.am \
+  lib/am/libtool.am \
+  lib/am/lisp.am \
+  lib/am/ltlib.am \
+  lib/am/ltlibrary.am \
+  lib/am/mans-vars.am \
+  lib/am/mans.am \
+  lib/am/program.am \
+  lib/am/progs.am \
+  lib/am/python.am \
+  lib/am/remake-hdr.am \
+  lib/am/scripts.am \
+  lib/am/subdirs.am \
+  lib/am/tags.am \
+  lib/am/texi-vers.am \
+  lib/am/texibuild.am \
+  lib/am/texinfos.am \
+  lib/am/vala.am \
+  lib/am/yacc.am
+
+
+## ------------------------------ ##
+##  Automake-provided m4 macros.  ##
+## ------------------------------ ##
+
+dist_automake_ac_DATA = \
+  m4/amversion.m4 \
+  m4/ar-lib.m4 \
+  m4/as.m4 \
+  m4/auxdir.m4 \
+  m4/ccstdc.m4 \
+  m4/cond.m4 \
+  m4/cond-if.m4 \
+  m4/depend.m4 \
+  m4/depout.m4 \
+  m4/dmalloc.m4 \
+  m4/gcj.m4 \
+  m4/header.m4 \
+  m4/init.m4 \
+  m4/install-sh.m4 \
+  m4/lead-dot.m4 \
+  m4/lex.m4 \
+  m4/lispdir.m4 \
+  m4/maintainer.m4 \
+  m4/make.m4 \
+  m4/minuso.m4 \
+  m4/missing.m4 \
+  m4/mkdirp.m4 \
+  m4/obsol-gt.m4 \
+  m4/obsol-lt.m4 \
+  m4/obsolete.m4 \
+  m4/options.m4 \
+  m4/protos.m4 \
+  m4/python.m4 \
+  m4/runlog.m4 \
+  m4/sanity.m4 \
+  m4/silent.m4 \
+  m4/strip.m4 \
+  m4/substnot.m4 \
+  m4/tar.m4 \
+  m4/upc.m4 \
+  m4/vala.m4
+
+dist_system_ac_DATA = m4/acdir/README
+
+# We build amversion.m4 here, instead of from config.status,
+# because config.status is rerun each time one of configure's
+# dependencies change and amversion.m4 happens to be a configure
+# dependency.  configure and amversion.m4 would be rebuilt in
+# loop otherwise.
+# Use '$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
+# how amversion.m4 appears in our dependencies.
+$(top_srcdir)/m4/amversion.m4: $(srcdir)/configure.ac $(srcdir)/m4/amversion.in
+       $(AM_V_at)rm -f address@hidden $@
+       $(AM_V_GEN)in=amversion.in \
+         && $(do_subst) <$(srcdir)/m4/amversion.in >address@hidden
+       $(generated_file_finalize)
+EXTRA_DIST += m4/amversion.in
+
+
+## ------------ ##
+##  Testsuite.  ##
+## ------------ ##
+
+# Run the tests with the shell detected at configure time.
+LOG_COMPILER = $(SHELL)
+
+TEST_EXTENSIONS = .pl .sh .tap
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+PL_LOG_COMPILER = $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -I $(builddir)/lib -I $(srcdir)/lib -w
+
+TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
+
+AM_TAP_LOG_DRIVER_FLAGS = --merge
+
+EXTRA_DIST += t/ax/is
+
+TESTS = ## Will be updated later.
+
+# Some testsuite-influential variables should be overridable from the
+# test scripts, but not from the environment.
+AM_TESTS_ENVIRONMENT = \
+  for v in \
+    me \
+    required \
+    am_using_tap \
+    am_parallel_tests \
+    am_test_prefer_config_shell \
+    am_original_AUTOMAKE \
+    am_original_ACLOCAL \
+  ; do \
+    eval test x"\$${$$v}" = x || unset $$v; \
+  done;
+# The 'AM_TESTS_REEXEC=no' setting tells the tests not to needlessly
+# re-execute themselves with the shell detected at configure time, since
+# we are already running them under it explicitly in our setup (see e.g.
+# the definition of TEST_LOG_COMPILER above).
+AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC;
+# We want warning messages and explanations for skipped tests to go to
+# the console if possible, so set up 'stderr_fileno_' properly.
+AM_TESTS_FD_REDIRECT = 9>&2
+AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
+
+# Hand-written tests.
+
+include $(srcdir)/t/list-of-tests.mk
+
+TESTS += $(handwritten_TESTS)
+EXTRA_DIST += $(handwritten_TESTS)
+
+# Automatically-generated tests wrapping hand-written ones.
+# Also, automatically-computed dependencies for tests.
+
+include $(srcdir)/t/testsuite-part.am
+
+TESTS += $(generated_TESTS)
+EXTRA_DIST += $(generated_TESTS)
+
+$(srcdir)/t/testsuite-part.am:
+       $(AM_V_at)rm -f t/testsuite-part.tmp $@
+       $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
+         --srcdir $(srcdir) > t/testsuite-part.tmp
+       $(AM_V_at)chmod a-w t/testsuite-part.tmp
+       $(AM_V_at)mv -f t/testsuite-part.tmp $@
+EXTRA_DIST += gen-testsuite-part
+
+$(generated_TESTS) $(srcdir)/t/testsuite-part.am: \
+  $(srcdir)/gen-testsuite-part \
+  t/list-of-tests.mk \
+  Makefile.am \
+  $(handwritten_TESTS)
+
+# Static dependencies valid for each test case.
+check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
+dist_check_DATA = t/ax/plain-functions.sh t/ax/tap-functions.sh
+check_DATA = defs defs-static
+
+# Few more static dependencies.
+t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am
+t/distcheck-outdated-m4.log: t/ax/distcheck-hook-m4.am
+EXTRA_DIST += t/ax/distcheck-hook-m4.am
+
+defs-static: defs-static.in Makefile
+       $(AM_V_at)rm -f $@ address@hidden
+       $(AM_V_GEN)in=defs-static.in\
+         && $(do_subst) <$(srcdir)/defs-static.in >address@hidden
+       $(generated_file_finalize)
+EXTRA_DIST += defs-static.in
+CLEANFILES += defs-static
+
+# If two test scripts have the same basename, they will end up sharing
+# the same log file, leading to all sort of undefined and undesired
+# behaviours.
+check-no-repeated-test-name:
+       @LC_ALL=C; export LC_ALL; \
+        lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
+          | sort | uniq -c | awk '($$1 > 1) { print }' \
+          | sed 's/\.log$$//' | grep . >&2 \
+          && { \
+            echo $@: test names listed above are duplicated >&2; \
+            exit 1; \
+          }; :
+check-local: check-no-repeated-test-name
+.PHONY: check-no-repeated-test-name
+
+## Checking the list of tests.
+test_subdirs = t t/pm
+include $(srcdir)/t/CheckListOfTests.am
+
+# Run the testsuite with the installed aclocal and automake.
+installcheck-local: installcheck-testsuite
+installcheck-testsuite:
+       am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+       -set x t/*.dir; shift; \
+        if test "$$#,$$1" = "1,*.dir"; then \
+          : there is no test directory to clean; \
+        else \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
+          rm -rf "$$@"; \
+        fi;
+
+
+## ---------------- ##
+##  Documentation.  ##
+## ---------------- ##
+
+info_TEXINFOS = doc/automake.texi doc/automake-history.texi
+doc_automake_TEXINFOS = doc/fdl.texi
+doc_automake_history_TEXINFOS = doc/fdl.texi
+
+man1_MANS = \
+  doc/aclocal.1 \
+  doc/automake.1 \
+  doc/aclocal-$(APIVERSION).1 \
+  doc/automake-$(APIVERSION).1
+
+$(man1_MANS): $(srcdir)/configure.ac
+
+CLEANFILES += $(man1_MANS)
+EXTRA_DIST += doc/help2man
+
+update_mans = \
+  $(AM_V_GEN): \
+    && $(MKDIR_P) doc \
+    && PATH="$(abs_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
+    && export PATH \
+    && $(PERL) $(srcdir)/doc/help2man --output=$@
+
+doc/aclocal.1 doc/automake.1:
+       $(AM_V_GEN): \
+         && $(MKDIR_P) doc \
+         && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+         && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+doc/aclocal-$(APIVERSION).1: aclocal.in aclocal lib/Automake/Config.pm
+       $(update_mans) aclocal-$(APIVERSION)
+doc/automake-$(APIVERSION).1: automake.in automake lib/Automake/Config.pm
+       $(update_mans) automake-$(APIVERSION)
+
+
+## ---------------------------- ##
+##  Example package "amhello".  ##
+## ---------------------------- ##
+
+amhello_sources = \
+  doc/amhello/configure.ac \
+  doc/amhello/Makefile.am \
+  doc/amhello/README \
+  doc/amhello/src/main.c \
+  doc/amhello/src/Makefile.am
+
+amhello_configury = \
+  aclocal.m4 \
+  autom4te.cache \
+  Makefile.in \
+  config.h.in \
+  configure \
+  depcomp \
+  install-sh \
+  missing \
+  src/Makefile.in
+
+dist_noinst_DATA = $(amhello_sources)
+dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
+
+# We depend on configure.ac so that we regenerate the tarball
+# whenever the Automake version changes.
+# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
+# configure in 't/wrap'.
+$(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
+       $(AM_V_GEN): \
+         && PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
+         && export PATH \
+         && $(am__cd) $(srcdir)/doc/amhello \
+         && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
+         && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
+         && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
+         && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
+         && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
+         && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
+         && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
+         && $(am_AUTORECONF) -vfi \
+         && ./configure \
+         && $(MAKE) $(AM_MAKEFLAGS) distcheck \
+         && $(MAKE) $(AM_MAKEFLAGS) distclean \
+         && rm -rf $(amhello_configury) \
+         && mv -f amhello-1.0.tar.gz ..
+
+
+## ------------------------------------------------- ##
+##  Third-party, obsolescent or experimental stuff.  ##
+## ------------------------------------------------- ##
+
+EXTRA_DIST += \
+  contrib/check-html.am \
+  contrib/multilib/README \
+  contrib/multilib/config-ml.in \
+  contrib/multilib/symlink-tree \
+  contrib/multilib/multilib.am \
+  contrib/multilib/multi.m4 \
+  contrib/README
+
+
+## --------------------------------------------------- ##
+##  Older files, kept mostly for historical interest.  ##
+## --------------------------------------------------- ##
+
+EXTRA_DIST += \
+  old/ChangeLog-tests \
+  old/ChangeLog.96 \
+  old/ChangeLog.98 \
+  old/ChangeLog.00 \
+  old/ChangeLog.01 \
+  old/ChangeLog.02 \
+  old/ChangeLog.03 \
+  old/ChangeLog.04 \
+  old/ChangeLog.09 \
+  old/ChangeLog.11 \
+  old/TODO
+
+
+##########################################################################
+
 ## Everything past here is useful to the maintainer, but probably not
-## to anybody else
-##
+## to anybody else.
+
+##########################################################################
+
+
+## --------------------------------------------------------- ##
+##  Automatic generation of the ChangeLog from git history.  ##
+## --------------------------------------------------------- ##
 
 gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_options = --since='2011-12-28 00:00:00' \
+gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
+gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
+                              --since='2011-12-28 00:00:00' \
                               --no-cluster --format '%s%n%n%b'
 
-# Automatic generation of the ChangeLog from git history.
-#
+EXTRA_DIST += lib/gitlog-to-changelog
+EXTRA_DIST += $(gitlog_to_changelog_fixes)
+
 # When executed from a git checkout, generate the ChangeLog from the git
 # history.  When executed from an extracted distribution tarball, just
 # copy the distributed ChangeLog in the build directory (and if this
@@ -120,9 +586,9 @@ gitlog_to_changelog_options = --since='2011-12-28 00:00:00' 
\
 # give an error).
 #
 # We need the apparently useless dependency from another .PHONY target
-# `am--changelog-regen-hook' to work around a bug of Solaris make, which
+# 'am--changelog-regen-hook' to work around a bug of Solaris make, which
 # doesn't execute the recipe of a target named as an existing file, even
-# if such target is declared `.PHONY' (yikes!)
+# if such target is declared '.PHONY' (yikes!)
 #
 .PHONY: am--changelog-regen-hook
 am--changelog-regen-hook:
@@ -145,472 +611,58 @@ ChangeLog: am--changelog-regen-hook
          exit 1; \
        fi
 
-# Ensure tests are world-executable
+# Ensure tests are world-executable.
+# FIXME: this should be turned into a maintainer check...
 dist-hook:
-       cd $(distdir)/tests && chmod a+rx *.test
-
-# Some simple checks, and then ordinary check.  These are only really
-# guaranteed to work on my machine.
-syntax_check_rules = \
-sc_test_names \
-sc_diff_automake_in_automake \
-sc_diff_aclocal_in_automake \
-sc_perl_syntax \
-sc_no_brace_variable_expansions \
-sc_rm_minus_f \
-sc_no_for_variable_in_macro \
-sc_mkinstalldirs \
-sc_pre_normal_post_install_uninstall \
-sc_perl_no_undef \
-sc_perl_no_split_regex_space \
-sc_cd_in_backquotes \
-sc_cd_relative_dir \
-sc_perl_at_uscore_in_scalar_context \
-sc_perl_local_no_parens \
-sc_perl_local \
-sc_AMDEP_TRUE_in_automake_in \
-sc_tests_make_without_am_makeflags \
-sc_tests_plain_make \
-sc_tests_plain_autoconf \
-sc_tests_plain_autoupdate \
-sc_tests_plain_automake \
-sc_tests_plain_autom4te \
-sc_tests_plain_autoheader \
-sc_tests_plain_autoreconf \
-sc_tests_here_document_format \
-sc_tests_Exit_not_exit \
-sc_tests_automake_fails \
-sc_tests_plain_aclocal \
-sc_tests_plain_perl \
-sc_tests_required_after_defs \
-sc_tests_overriding_macros_on_cmdline \
-sc_tests_plain_sleep \
-sc_tests_plain_egrep_fgrep \
-sc_tests_PATH_SEPARATOR \
-sc_mkdir_p \
-sc_perl_at_substs \
-sc_unquoted_DESTDIR \
-sc_tabs_in_texi \
-sc_at_in_texi
-
-$(syntax_check_rules): automake aclocal
-maintainer-check: $(syntax_check_rules)
-.PHONY: maintainer-check $(syntax_check_rules)
-
-## Check that the list of tests given in the Makefile is equal to the
-## list of all test scripts in the Automake testsuite.
-.PHONY: maintainer-check-list-of-tests
-maintainer-check-list-of-tests:
-       $(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
-maintainer-check: maintainer-check-list-of-tests
-
-## Look for test whose names can cause spurious failures when used as
-## first argument to AC_INIT (chiefly because they might contain an
-## m4/m4sugar builtin or macro name).
-m4_builtins = \
-  __gnu__ \
-  __unix__ \
-  bpatsubst \
-  bregexp \
-  builtin \
-  changecom \
-  changequote \
-  changeword \
-  debugfile \
-  debugmode \
-  decr \
-  define \
-  defn \
-  divert \
-  divnum \
-  dnl \
-  dumpdef \
-  errprint \
-  esyscmd \
-  eval \
-  format \
-  ifdef \
-  ifelse \
-  include \
-  incr \
-  index \
-  indir \
-  len \
-  m4exit \
-  m4wrap \
-  maketemp \
-  mkstemp \
-  patsubst \
-  popdef \
-  pushdef \
-  regexp \
-  shift \
-  sinclude \
-  substr \
-  symbols \
-  syscmd \
-  sysval \
-  traceoff \
-  traceon \
-  translit \
-  undefine \
-  undivert
-sc_test_names:
-       @m4_builtin_rx=`echo $(m4_builtins) | sed 's/ /|/g'`; \
-        m4_macro_rx="\\<($$m4_builtin_rx)\\>|\\<_?(A[CUMHS]|m4)_"; \
-        if ls tests/*.test | LC_ALL=C grep -E "$$m4_macro_rx"; then \
-          echo "the names of the tests above can be problematic" 1>&2; \
-          echo "Avoid test names that contain names of m4 macros" 1>&2; \
-          exit 1; \
-        fi
-
-## These check avoids accidental configure substitutions in the source.
-## There are exactly 9 lines that should be modified from automake.in to
-## automake, and 10 lines that should be modified from aclocal.in to
-## aclocal; these wors out to 32 and 34 lines of diffs, respectively.
-sc_diff_automake_in_automake:
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 32; then \
-         echo "found too many diffs between automake.in and automake" 1>&2; \
-         diff -c $(srcdir)/automake.in automake; \
-         exit 1; \
-       fi
-sc_diff_aclocal_in_aclocal:
-       @if test `diff $(srcdir)/aclocal.in aclocal | wc -l` -ne 34; then \
-         echo "found too many diffs between aclocal.in and aclocal" 1>&2; \
-         diff -c $(srcdir)/aclocal.in aclocal; \
-         exit 1; \
-       fi
-
-## Syntax check with default Perl (on my machine, Perl 5).
-sc_perl_syntax:
-       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
-       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
-
-## expect no instances of '${...}'.  However, $${...} is ok, since that
-## is a shell construct, not a Makefile construct.
-sc_no_brace_variable_expansions:
-       @if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
-              grep -F -v '$$$$'; then \
-         echo "Found too many uses of '\$${' in the lines above." 1>&2; \
-         exit 1;                               \
-       else :; fi
-
-## Make sure `rm' is called with `-f'.
-sc_rm_minus_f:
-       @if grep -v '^#' $(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
-           grep -E '\<rm ([^-]|\-[^f ]*\>)'; then \
-         echo "Suspicious 'rm' invocation." 1>&2; \
-         exit 1;                               \
-       else :; fi
-
-## Never use something like `for file in $(FILES)', this doesn't work
-## if FILES is empty or if it contains shell meta characters (e.g. $ is
-## commonly used in Java filenames).
-sc_no_for_variable_in_macro:
-       @if grep 'for .* in \$$(' $(srcdir)/lib/am/[a-z]*.am; then \
-         echo 'Use "list=$$(mumble); for var in $$$$list".' 1>&2 ; \
-         exit 1; \
-       else :; fi
-
-## Make sure all invocations of mkinstalldirs are correct.
-sc_mkinstalldirs:
-       @if grep -n 'mkinstalldirs' $(srcdir)/lib/am/[a-z]*.am | \
-             grep -F -v '$$(mkinstalldirs)'; then \
-         echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
-         exit 1; \
-       else :; fi
-
-## Make sure all calls to PRE/NORMAL/POST_INSTALL/UNINSTALL
-sc_pre_normal_post_install_uninstall:
-       @if grep -E -n '\((PRE|NORMAL|POST)_(|UN)INSTALL\)' \
-                 $(srcdir)/lib/am/[a-z]*.am | \
-             grep -v ':##' | grep -v ':        @\$$('; then \
-         echo "Found incorrect use of PRE/NORMAL/POST_INSTALL/UNINSTALL in the 
lines above" 1>&2; \
-         exit 1; \
-       else :; fi
-
-## We never want to use "undef", only "delete", but for $/.
-sc_perl_no_undef:
-       @if grep -n -w 'undef ' $(srcdir)/automake.in | \
-             grep -F -v 'undef $$/'; then \
-         echo "Found undef in automake.in; use delete instead" 1>&2; \
-         exit 1; \
-       fi
-
-## We never want split (/ /,...), only split (' ', ...).
-sc_perl_no_split_regex_space:
-       @if grep -n 'split (/ /' $(srcdir)/automake.in; then \
-         echo "Found bad split in the lines above." 1>&2; \
-         exit 1; \
-       fi
-
-## Look for cd within backquotes
-sc_cd_in_backquotes:
-       @if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in \
-             $(srcdir)/lib/am/*.am; then \
-         echo "Consider using \$$(am__cd) in the lines above." 1>&2; \
-         exit 1; \
-       fi
-
-## Look for cd to a relative directory (may be influenced by CDPATH).
-## Skip some known directories that are OK.
-sc_cd_relative_dir:
-       @if grep -n '^[^#]*cd ' $(srcdir)/automake.in \
-             $(srcdir)/lib/am/*.am | \
-             grep -v 'echo.*cd ' | \
-             grep -v 'am__cd =' | \
-             grep -v '^[^#]*cd [./]' | \
-             grep -v '^[^#]*cd \$$(top_builddir)' | \
-             grep -v '^[^#]*cd "\$$\$$am__cwd' | \
-             grep -v '^[^#]*cd \$$(abs' | \
-             grep -v '^[^#]*cd "\$$(DESTDIR)'; then \
-         echo "Consider using \$$(am__cd) in the lines above." 1>&2; \
-         exit 1; \
-       fi
-
-## Using @_ in a scalar context is most probably a programming error.
-sc_perl_at_uscore_in_scalar_context:
-       @if grep -Hn 'address@hidden) ] *= address@hidden' 
$(srcdir)/automake.in; then \
-         echo "Using @_ in a scalar context in the lines above." 1>&2; \
-         exit 1; \
-       fi
-
-## Forbid using parens with `local' to ease counting.
-sc_perl_local_no_parens:
-       @if grep '^[ \t]*local *(' $(srcdir)/automake.in; then \
-         echo "Don't use \`local' with parens: use several \`local' above." 
>&2; \
-         exit 1; \
-       fi
-
-## Allow only few variables to be localized in Automake.
-sc_perl_local:
-       @if egrep -v '^[ \t]*local \$$[_~]( *=|;)' $(srcdir)/automake.in | \
-               grep '^[ \t]*local [^*]'; then \
-         echo "Please avoid \`local'." 1>&2; \
-         exit 1; \
-       fi
-
-## Don't let AMDEP_TRUE substitution appear in automake.in.
-sc_AMDEP_TRUE_in_automake_in:
-       @if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
-         echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
-         exit 1; \
-       fi
-
-## Recursive make invocations should always pass $(AM_MAKEFLAGS)
-## to $(MAKE), for portability to non-GNU make.
-sc_tests_make_without_am_makeflags:
-       @if grep '^[^#].*(MAKE) ' $(srcdir)/lib/am/*.am $(srcdir)/automake.in |\
-               grep -v 'AM_MAKEFLAGS'; then \
-         echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \
-         exit 1; \
-       fi
-
-## Tests should never call make directly.
-sc_tests_plain_make:
-       @if grep -v '^#' $(srcdir)/tests/*.test | $(EGREP) ':[  ]*make( |$$)'; 
then \
-         echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 
1>&2; \
-         exit 1; \
-       fi
-
-## Tests should never call autoconf directly.
-sc_tests_plain_autoconf:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoconf\>'; 
then \
-         echo 'Do not run "autoconf" in the above tests.  Use "$$AUTOCONF" 
instead.' 1>&2; \
-         exit 1; \
-       fi
-
-## Tests should never call autoupdate directly.
-sc_tests_plain_autoupdate:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      
]*autoupdate\>'; then \
-         echo 'Do not run "autoupdate" in the above tests.  Use "$$AUTOUPDATE" 
instead.' 1>&2; \
-         exit 1; \
-       fi
-
-## Tests should never call automake directly.
-sc_tests_plain_automake:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   
]*automake\>([^:]|$$)'; then \
-         echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" 
instead.' 1>&2;  \
-         exit 1; \
-       fi
-
-## Tests should never call autoheader directly.
-sc_tests_plain_autoheader:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      
]*autoheader\>'; then \
-         echo 'Do not run "automake" in the above tests.  Use "$$AUTOHEADER" 
instead.' 1>&2;  \
-         exit 1; \
-       fi
-
-## Tests should never call autoreconf directly.
-sc_tests_plain_autoreconf:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      
]*autoreconf\>'; then \
-         echo 'Do not run "automake" in the above tests.  Use "$$AUTORECONF" 
instead.' 1>&2;  \
-         exit 1; \
-       fi
-
-## Tests should never call autom4te directly.
-sc_tests_plain_autom4te:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autom4te\>'; 
then \
-         echo 'Do not run "automake" in the above tests.  Use "$$AUTOM4TE" 
instead.' 1>&2;  \
-         exit 1; \
-       fi
-
-## Tests should only use END and EOF for here documents
-## (so that the next test is effective).
-sc_tests_here_document_format:
-       @if grep '<<' $(srcdir)/tests/*.test | grep -v 'END' | grep -v 'EOF'; 
then \
-         echo 'Use here documents with "END" and "EOF" only, for 
greppability.' 1>&2; \
-         exit 1; \
-       fi
-
-## Tests should never call exit directly, but use Exit.
-## This is so that the exit status is transported correctly across the 0 trap.
-## Ignore comments, testsuite self tests, and one perl line in ext2.test.
-sc_tests_Exit_not_exit:
-       @found=false; for file in $(srcdir)/tests/*.test; do \
-         case $$file in */self-check-*.test) continue;; esac; \
-         res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
-                     -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
-         if test -n "$$res"; then \
-           echo "$$file:$$res"; \
-           found=true; \
-         fi; \
-       done; \
-       if $$found; then \
-         echo 'Do not call plain "exit", use "Exit" instead, in above tests.' 
1>&2; \
-         exit 1; \
-       fi
-
-## Use AUTOMAKE_fails when appropriate
-sc_tests_automake_fails:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep 
'\$$AUTOMAKE.*&&.*[eE]xit'; then \
-         echo 'Use AUTOMAKE_fails + grep to catch automake failures in the 
above tests.' 1>&2;  \
-         exit 1; \
-       fi
+       $(am__cd) $(distdir)/t && chmod a+rx *.sh *.tap
 
-## Tests should never call aclocal directly.
-sc_tests_plain_aclocal:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*aclocal\>'; 
then \
-         echo 'Do not run "aclocal" in the above tests.  Use "$$ACLOCAL" 
instead.' 1>&2;  \
-         exit 1; \
-       fi
 
-## Tests should never call perl directly.
-sc_tests_plain_perl:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*perl\>'; then 
\
-         echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 
1>&2; \
-         exit 1; \
-       fi
-
-## Setting `required' after sourcing `./defs' is a bug.
-sc_tests_required_after_defs:
-       @for file in $(srcdir)/tests/*.test; do \
-         if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; 
then \
-           echo 'Do not set "required" after sourcing "defs" in '"$$file: 
$$out" 1>&2; \
-           exit 1; \
-         fi; \
-       done
-
-## Overriding a Makefile macro on the command line is not portable when
-## recursive targets are used.  Better use an envvar.  SHELL is an
-## exception, POSIX says it can't come from the environment.  V, DESTDIR,
-## DISTCHECK_CONFIGURE_FLAGS and DISABLE_HARD_ERRORS are exceptions, too,
-## as package authors are urged not to initialize them anywhere.
-sc_tests_overriding_macros_on_cmdline:
-       @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test; 
then \
-         echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e 
SHELL=$$SHELL"' 1>&2; \
-         echo ' in the above lines, it is more portable.' 1>&2; \
-         exit 1; \
-       fi
-## Also try to account for usages like "$MAKE || st=$?".
-       @if sed -e 's/ || .*//' -e 's/ && .*//' \
-               -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
-               -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
-## DISTCHECK_CONFIGURE_FLAGS is allowed to contain whitespace in its
-## definition, so the more complex substitutions below.
-               -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
-               -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
-               -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
-             $(srcdir)/tests/*.test | grep '\$$MAKE .*='; then \
-         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above 
lines,' 1>&2; \
-         echo 'it is more portable.' 1>&2; \
-         exit 1; \
-       fi
-       @if grep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
-         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=$$SHELL" in' 
1>&2; \
-         echo 'the above lines.' 1>&2; \
-         exit 1; \
-       fi
+## --------------------------- ##
+##  Perl coverage statistics.  ##
+## --------------------------- ##
 
-## Never use `sleep 1' to create files with different timestamps.
-## Use `$sleep' instead.  Some filesystems (e.g., Windows') have only
-## a 2sec resolution.
-sc_tests_plain_sleep:
-       @if grep -E '\bsleep +[12345]\b' $(srcdir)/tests/*.test; then \
-         echo 'Do not use "sleep x" in the above tests.  Use "$$sleep" 
instead.' 1>&2; \
-         exit 1; \
-       fi
+PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
+PERL_COVERAGE_FLAGS = 
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
+PERL_COVER = cover
 
-## fgrep and egrep are not required by POSIX.
-sc_tests_plain_egrep_fgrep:
-       @if grep -E '\b[ef]grep\b' $(srcdir)/tests/*.test ; then \
-         echo 'Do not use egrep or fgrep in test cases.  Use $$FGREP or 
$$EGREP.' 1>&2; \
-         exit 1; \
-       fi
-       @if grep -E '\b[ef]grep\b' $(srcdir)/lib/am/*.am $(srcdir)/m4/*.m4; 
then \
-         echo 'Do not use egrep or fgrep in the above files, they are not 
portable.' 1>&2; \
-         exit 1; \
-       fi
+check-coverage-run recheck-coverage-run: all
+       $(mkinstalldirs) $(PERL_COVERAGE_DB)
+       PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
+       WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
+       $(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed 's/-coverage-run//'`
 
-## Using `:' as a PATH separator is not portable.
-sc_tests_PATH_SEPARATOR:
-       @if grep -E '\bPATH=.*:.*' $(srcdir)/tests/*.test ; then \
-         echo "Use \`\$$PATH_SEPARATOR', not \`:', in PATH definitions above." 
1>&2; \
+check-coverage-report:
+       @if test ! -d "$(PERL_COVERAGE_DB)"; then \
+         echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \
+         echo "Please run \"make check-coverage\" first" >&2; \
          exit 1; \
        fi
+       $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)"
 
-sc_mkdir_p:
-       @if grep 'mkdir_p' $(srcdir)/automake.in \
-             $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
-         echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
-         exit 1; \
-       fi
+# We don't use direct dependencies here because we'd like to be able
+# to invoke the report even after interrupted check-coverage.
+check-coverage: check-coverage-run
+       $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
 
-## Try to make sure all @...@ substitutions are covered by our
-## substitution rule.
-sc_perl_at_substs:
-       @if test `grep -E 'address@hidden@' aclocal | wc -l` -ne 0; then \
-         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
-         exit 1; \
-       fi
-       @if test `grep -E 'address@hidden@' automake | wc -l` -ne 0; then \
-         echo "Unresolved @...@ substitution in automake" 1>&2; \
-         exit 1; \
-       fi
+recheck-coverage: recheck-coverage-run
+       $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
 
-sc_unquoted_DESTDIR:
-       @if grep -E "[^\'\"]\\\$$\(DESTDIR" $(srcdir)/lib/am/*.am; then \
-         echo 'Suspicious unquoted DESTDIR uses.' 1>&2 ; \
-         exit 1; \
-       fi
+clean-coverage:
+       rm -rf "$(PERL_COVERAGE_DB)"
+clean-local: clean-coverage
 
-sc_tabs_in_texi:
-       @if grep '      ' $(srcdir)/doc/automake.texi; then \
-         echo 'Do not use tabs in the manual.' 1>&2; \
-         exit 1; \
-       fi
+.PHONY: check-coverage recheck-coverage check-coverage-run \
+       recheck-coverage-run check-coverage-report clean-coverage
 
-sc_at_in_texi:
-       @if grep -E '(address@hidden|^)@([       address@hidden|$$)' 
$(srcdir)/doc/automake.texi; \
-       then \
-         echo 'Unescaped @.' 1>&2; \
-         exit 1; \
-       fi
 
-## Tagging and/or uploading stable and beta releases.
+## ---------------------------------------------------- ##
+##  Tagging and/or uploading stable and beta releases.  ##
+## ---------------------------------------------------- ##
 
 GIT = git
 
+EXTRA_DIST += lib/gnupload
+
 version_rx = ^[1-9][0-9]*\.[0-9][0-9]*(\.[0-9][0-9]*)?
 stable_version_rx = $(version_rx)$$
 beta_version_rx = $(version_rx)[bdfhjlnprtvxz]$$
@@ -668,6 +720,11 @@ git-upload-release:
 
 .PHONY: git-upload-release git-tag-release
 
+
+## ------------------------------------------------------------------ ##
+##  Explore differences of autogenerated files in different commits.  ##
+## ------------------------------------------------------------------ ##
+
 ## Visually comparing differences between the Makefile.in files in
 ## automake's own build system as generated in two different branches
 ## might help to catch bugs and blunders.  This has already happened a
@@ -681,29 +738,30 @@ autodiffs:
         { \
             rev=$$1 dir=$$2 \
               && echo "$@: will get files from revision $$rev" \
-              && git clone -q --depth 1 "$$am_gitdir" tmp \
-              && cd tmp \
-              && git checkout -q "$$rev" \
+              && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
+              && $(am__cd) tmp \
+              && $(GIT) checkout -q "$$rev" \
               && echo "$@: bootstrapping $$rev" \
               && $(SHELL) ./bootstrap \
               && echo "$@: copying files from $$rev" \
               && makefile_ins=`find . -name Makefile.in` \
               && (tar cf - configure aclocal.m4 $$makefile_ins) | \
-                 (cd .. && cd "$$dir" && tar xf -) \
+                 (cd .. && $(am__cd) "$$dir" && tar xf -) \
               && cd .. \
               && rm -rf tmp; \
         }; \
         address@hidden \
 ## Before proceeding, ensure the specified revisions truly exist.
-          && git --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
-          && git --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
+          && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
+          && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
           && rm -rf $$outdir \
           && mkdir $$outdir \
-          && cd $$outdir \
+          && $(am__cd) $$outdir \
           && mkdir new old \
           && get_autofiles_from_rev $$OLD_COMMIT old \
           && get_autofiles_from_rev $$NEW_COMMIT new \
           && exit 0
+
 ## With lots of eye candy; we like our developers pampered and spoiled :-)
 compare-autodiffs: autodiffs
        @set -u; \
@@ -737,6 +795,11 @@ compare-autodiffs: autodiffs
        exit $$st
 .PHONY: autodiffs compare-autodiffs
 
+
+## --------------------------------------------------------------------- ##
+##  Synchronize third-party files that are committed in our repository.  ##
+## --------------------------------------------------------------------- ##
+
 ## Program to use to fetch files.
 WGET = wget
 WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
@@ -760,7 +823,7 @@ fetch:
        rm -rf Fetchdir > /dev/null 2>&1
        mkdir Fetchdir
 ## If a get fails then that is a problem.
-       (cd Fetchdir && \
+       ($(am__cd) Fetchdir && \
        $(WGET_SV_GIT_CF)config.guess -O config.guess && \
        $(WGET_SV_GIT_CF)config.sub -O config.sub && \
        $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
@@ -775,7 +838,7 @@ fetch:
                  >>Fetchdir/update.patch 2>/dev/null; then :; \
          else \
            stat=1; \
-           echo "Updating $(srcdir)/lib/$$file..."; \
+           echo "Updating $(srcdir)/lib/$$file ..."; \
            cp Fetchdir/$$file $(srcdir)/lib/$$file; \
          fi; \
        done; \
@@ -784,36 +847,12 @@ fetch:
        exit $$stat
 .PHONY: fetch
 
-## Generate release statistics, for the table in automake.texi.
-## This has to be run in an up to date build tree, but there must
-## be no temp files nor unused other files lying around!
-release-stats: ps
-       $(AM_V_GEN): && \
-       am=`wc -l < automake` && \
-       acl=`wc -l < aclocal` && \
-       pmfiles="lib/Automake/*.pm" && \
-       if test . != '$(srcdir)'; then pmfiles="$$pmfiles 
$(srcdir)/lib/Automake/*.pm"; \
-       else :; fi && \
-       pm=`cat $$pmfiles | wc -l` && \
-       dot_am_files=`ls -1 $(srcdir)/lib/am/*.am | grep -v Makefile.am` && \
-       amf=`echo "$$dot_am_files" | wc -l` && \
-       aml=`cat $$dot_am_files | wc -l` && \
-       m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
-       m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
-       doc_text=`cd doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
-       echo "$$doc_text" && \
-       rm -f doc/unused.ps && \
-       doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\) 
pages.*/\1/p'` && \
-       tests="tests/*.test"; \
-       if test . != '$(srcdir)'; then tests="$$tests $(srcdir)/tests/*.test"; \
-       else :; fi && \
-       t=`ls -1 $$tests | wc -l` && \
-       tgen=`ls -1 $$tests | grep '.-p\.test' | wc -l` && \
-       today=`date +%Y-%m-%d` && \
-       echo "add this to the table in doc/automake.texi after verification:" 
&& \
-       printf '@item %s @tab %-6s @tab %4d @tab %4d @tab %4d @tab %4d %-4s 
@tab %4d %-4s @tab %3d @tab %d %-4s\n' \
-                     $$today $(VERSION) $$am    $$acl    $$pm   $$aml 
"($$amf)" $$m4l "($$m4f)" $$doc $$t "($$tgen)"
-.PHONY: release-stats
+
+## ------------------------------------------------ ##
+##  Update copyright years of all committed files.  ##
+## ------------------------------------------------ ##
+
+EXTRA_DIST += lib/update-copyright
 
 update_copyright_env = \
   UPDATE_COPYRIGHT_FORCE=1 \
@@ -824,6 +863,6 @@ update-copyright:
        $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
          | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
        $(GIT) ls-files \
-         | grep -Ev '/(COPYING|INSTALL)' \
+         | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
          | grep -Ev "^($$excluded_re)$$" \
          | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/NEWS b/NEWS
index 11ce4c9..4e49512 100644
--- a/NEWS
+++ b/NEWS
@@ -1,45 +1,302 @@
-New in 1.11.0a:
+New in 1.12:
 
 * WARNING: Future backward-incompatibilities!
 
-  - The support for the "obscure" multilib feature has been deprecated,
-    and will be moved out of the automake core in the next major Automake
-    release (1.12).
+  - Starting from the next major Automake version (1.13), the rules to
+    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+    option by default.  Since such an option was introduced in Texinfo
+    4.9, this means that Makefiles generated by future Automake versions
+    will require at least that version of Texinfo.
+
+  - Starting from the next major Automake version (1.13), the parallel
+    testsuite harness (previously only enabled by the 'parallel-tests'
+    option) will become the default one; the older serial testsuite
+    harness will still be available through the use of the 'serial-tests'
+    option.
+
+  - The following long-obsolete m4 macros will be removed in the
+    next major Automake version (1.13):
+
+      AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
+      fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
+      fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
+      AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
+      ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
+      jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
+      ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
+      gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
+      fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
+                          of the now-removed automatic de-ANSI-fication
+                          support of Automake)
+
+  - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
+    the next major Automake version (1.13).
+
+  - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
+    will be deprecated in the next minor version of Automake (1.12.1) and
+    removed in the next major version (1.13).
+
+  - Support for the two- and three-arguments invocation forms of the
+    AM_INIT_AUTOMAKE macro will be deprecated in the next minor version
+    of Automake (1.12.1) and removed in the next major version (1.13).
+
+  - The long-obsolete (since 1.10) automake-provided $(mkdir_p) make
+    variable, @mkdir_p@ substitution and AM_PROG_MKDIR m4 macro will
+    all be deprecated in the next minor version of Automake (1.12.1)
+    and removed in the next major version (1.13).
+
+  - The '--acdir' option of aclocal is deprecated, and will probably
+    be removed in the next major Automake release (1.13).  You should
+    use the options '--automake-acdir' and '--system-acdir' instead
+    (which have been introduced in Automake 1.11.2).
 
-  - The support for ".log -> .html" conversion and the check-html and
-    recheck-html targets will be removed in the next major Automake
-    release (1.12).
+  - The exact order in which the directories in the aclocal macro
+    search path are looked up is probably going to be changed in the
+    next Automake release (1.13).
+
+* Obsolete features removed:
+
+  - The never documented nor truly used script 'acinstall' has been
+    removed.
+
+  - Support for automatic de-ANSI-fication has been removed.
+
+  - The support for the "obscure" multilib feature has been removed
+    from Automake core (but remains available in the 'contrib/'
+    directory of the Automake distribution).
+
+  - Support for ".log -> .html" conversion and the check-html and
+    recheck-html targets has been removed from Automake core (but
+    remains available in the 'contrib/' directory of the Automake
+    distribution).
+
+  - The deprecated 'lzma' compression format for distribution archives
+    has been removed, in favor of 'xz' and 'lzip'.
+
+  - The obsolete AM_WITH_REGEX macro has been removed.
+
+  - The long-deprecated options '--output-dir', '--Werror' and
+    '--Wno-error' have been removed.
+
+  - The chapter on the history of Automake has been moved out of the
+    reference manual, into a new dedicated Texinfo file.
+
+* New targets:
+
+  - New 'cscope' target to build a cscope database for the source tree.
+
+* Changes to Automake-generated testsuite harnesses:
+
+  - The new automake option 'serial-tests' has been introduced.  It can
+    be used to explicitly instruct automake to use the older serial
+    testsuite harness.  This is still the default at the moment, but it
+    might change in future versions.
+
+  - The 'recheck' target (provided by the parallel testsuite harness) now
+    depends on the 'all' target.  This allows for a better user-experience
+    in test-driven development.  See automake bug#11252.
+
+  - Test scripts that exit with status 99 to signal an "hard error" (e.g.,
+    and unexpected or internal error, or a failure to set up the test case
+    scenario) have their outcome reported as an 'ERROR' now.  Previous
+    versions of automake reported such an outcome as a 'FAIL' (the only
+    difference with normal failures being that hard errors were counted
+    as failures even when the test originating them was listed in
+    XFAIL_TESTS).
+
+  - The testsuite summary displayed by the parallel-test harness has a
+    completely new format, that always list the numbers of passed, failed,
+    xfailed, xpassed, skipped and errored tests, even when these numbers
+    are zero (but using smart coloring when the color-tests option is in
+    effect).
+
+  - The default testsuite driver offered by the 'parallel-tests' option is
+    now implemented (partly at least) with the help of automake-provided
+    auxiliary scripts (e.g., 'test-driver'), instead of relying entirely
+    on code in the generated Makefile.in.
+    This has two noteworthy implications.  The first one is that projects
+    using the 'parallel-tests' option should now either run automake with
+    the '--add-missing' option, or manually copy the 'test-driver' script
+    into their tree.  The second, and more important, implication is that
+    now, when the 'parallel-tests' option is in use, TESTS_ENVIRONMENT can
+    not be used anymore to define a test runner, and the command specified
+    in LOG_COMPILER (and <ext>_LOG_COMPILER) must be a *real* executable
+    program or script.  For example, this is still a valid usage (albeit
+    a little contorted):
+
+      TESTS_ENVIRONMENT = \
+        if test -n '$(STRICT_TESTS)'; then \
+          maybe_errexit='-e'; \
+        else \
+          maybe_errexit=''; \
+        fi;
+      LOG_COMPILER = $(SHELL) $$maybe_errexit
+
+    while this is not anymore:
+
+      TESTS_ENVIRONMENT = \
+        $(SHELL) `test -n '$(STRICT_TESTS_CHECKING)' && echo ' -e'`
+
+    neither is this:
+
+      TESTS_ENVIRONMENT = \
+        run_with_perl_or_shell () \
+        { \
+          if grep -q '^#!.*perl' $$1; then
+            $(PERL) $$1; \
+          else \
+            $(SHELL) $$1; \
+          fi; \
+        }
+      LOG_COMPILER = run_with_perl_or_shell
+
+  - The package authors can now use customary testsuite drivers within
+    the framework provided by the 'parallel-tests' testsuite harness.
+    Consistently with the existing syntax, this can be done by defining
+    special makefile variables 'LOG_DRIVER' and '<ext>_LOG_DRIVER'.
+
+  - A new developer-reserved variable 'AM_TESTS_FD_REDIRECT' can be used
+    to redirect/define file descriptors used by the test scripts.
+
+  - The parallel-tests harness generates now, in addition the '.log' files
+    holding the output produced by the test scripts, a new set of '.trs'
+    files, holding "metadata" derived by the execution of the test scripts;
+    among such metadata are the outcomes of the test cases run by a script.
+
+  - Initial and still experimental support for the TAP test protocol is
+    now provided.
+
+* Changes to Yacc and Lex support:
+
+  - C source and header files derived from non-distributed Yacc and/or
+    Lex sources are now removed by a simple "make clean" (while they were
+    previously removed only by "make maintainer-clean").
+
+  - Slightly backward-incompatible change, relevant only for use of Yacc
+    with C++: the extensions of the header files produced by the Yacc
+    rules are now modelled after the extension of the corresponding
+    sources.  For example, yacc files named "foo.y++" and "bar.yy" will
+    produce header files named "foo.h++" and "bar.hh" respectively, where
+    they would have previously produced header files named simply "foo.h"
+    and "bar.h".  This change offers better compatibility with 'bison -o'.
 
-  - The `lzma' compression format for distribution archives has been
-    deprecated in favor of `xz' and `lzip', and will be removed in the
-    next major Automake release (1.12).
+* Miscellaneous changes:
 
-  - The Automake support for automatic de-ANSI-fication will be removed in
-    the next major Automake release (1.12).
+  - The AM_PROG_VALAC macro now causes configure to exit with status 77,
+    rather than 1, if the vala compiler found is too old.
 
-  - The `--acdir' option of aclocal is deprecated, and will probably be
-    removed in the next major Automake release (1.12).
+  - The build system of Automake itself now avoids the use of make
+    recursion as much as possible.
 
-  - The exact order in which the directories in the aclocal macro
-    search path are looked up is probably going to be changed in the
-    next Automake release (1.12).
+  - Automake now prefers to quote 'like this' or "like this", rather
+    than `like this', in diagnostic message and generated Makefiles,
+    to accommodate the new GNU Coding Standards recommendations.
 
-  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
-    GNU rx library has been decommissioned), and will be removed in the
-    next major Automake release (1.12).
+  - Automake has a new option '--print-libdir' that prints the path of the
+    directory containing the Automake-provided scripts and data files.
 
-* Changes to aclocal:
+  - The 'dist' and 'dist-all' targets now can run compressors in parallel.
 
-  - The `--acdir' option is deprecated.  Now you should use the new options
-    `--automake-acdir' and `--system-acdir' instead.
+  - The rules to create pdf, dvi and ps output from Texinfo files now
+    works better with modern 'texi2dvi' script, by explicitly passing
+    it the '--clean' option to ensure stray auxiliary files are not
+    left to clutter the build directory.
 
-  - The `ACLOCAL_PATH' environment variable is now interpreted as a
-    colon-separated list of additional directories to search after the
-    automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
-    and before the system acdir (by default ${prefix}/share/aclocal).
+  - Automake can now generate silenced rules for texinfo outputs.
+
+  - Some auxiliary files that are automatically distributed by Automake
+    (e.g., 'install-sh', or the 'depcomp' script for packages compiling
+    C sources) might now be listed in the DIST_COMMON variable in many
+    Makefile.in files, rather than in the top-level one.
+
+  - Messages of types warning or error from 'automake' and 'aclocal'
+    are now prefixed with the respective type, and presence of -Werror
+    is noted.
+
+  - Automake's early configure-time sanity check now tries to avoid
+    sleeping for a second, which slowed down cached configure runs
+    noticeably.  In that case, it will check back at the end of the
+    configure script to ensure that at least one second has passed, to
+    avoid time stamp issues with makefile rules rerunning autotools
+    programs.
+
+  - The warnings in the category 'extra-portability' are now enabled by
+    '-Wall'.  In previous versions, one has to use '-Wextra-portability'
+    to enable them.
+
+Bugs fixed in 1.12:
+
+  - Various minor bugfixes for recent or long-standing bugs.
+
+* Bugs introduced by 1.11:
+
+  - The AM_COND_IF macro also works if the shell expression for the
+    conditional is no longer valid for the condition.
+
+  - The automake-provided parallel testsuite harness does not fail anymore
+    with BSD make used in parallel mode when there are test scripts in a
+    subdirectory, like in:
+
+      TESTS = sub/foo.test sub/bar.test
+
+* Long-standing bugs:
+
+  - Automake's own build system finally have a real "installcheck" target.
+
+  - Vala-related cleanup rules are now more complete, and work better in
+    a VPATH setup.
+
+  - Files listed with the AC_REQUIRE_AUX_FILE macro in configure.ac are
+    now automatically distributed also if the directory of the auxiliary
+    files coincides with the top-level directory.
+
+  - Automake now detects the presence of the '-d' flag in the various
+    '*YFLAGS' variables even when their definitions involve indirections
+    through other variables, such as in:
+      foo_opts = -d
+      AM_YFLAGS = $(foo_opts)
+
+  - Automake now complains if a '*YFLAGS' variable has any conditional
+    content, not only a conditional definition.
+
+  - Explicit enabling and/or disabling of Automake warning categories
+    through the '-W...' options now always takes precedence over the
+    implicit warning level implied by Automake strictness (foreign, gnu
+    or gnits), regardless of the order in which such strictness and
+    warning flags appear.  For example, a setting like:
+      AUTOMAKE_OPTIONS = -Wall --foreign
+    will cause the warnings in category 'portability' to be enabled, even
+    if those warnings are by default disabled in 'foreign' strictness.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Bugs fixed in 1.11.5:
+
+* Bugs introduced by 1.11.3:
+
+  - Vala files with '.vapi' extension are now recognized and handled
+    correctly again.  See automake bug#11222.
+
+  - Vala support work again for projects that contain some program
+    built from '.vala' (and possibly '.c') sources and some other
+    program built from '.c' sources *only*.  See automake bug#11229.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.11.4:
 
 * Miscellaneous changes:
 
+  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
+    symbol index) modifiers as well as the "s" action, as the symbol index
+    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
+    action is now a synonym for "r" (replace).  Also, the script has been
+    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
+
+  - When the 'compile' script is used to wrap MSVC, it now accepts an
+    optional space between the -I, -L and -l options and their respective
+    arguments, for better POSIX compliance.
+
   - There is an initial, experimental support for automatic dependency
     tracking with tcc (the Tiny C Compiler).  Its associated depmode is
     currently recognized as "icc" (but this and other details are likely
@@ -48,6 +305,46 @@ New in 1.11.0a:
   - Automatic dependency tracking now works also with the IBM XL C/C++
     compilers, thanks to the new new depmode 'xlc'.
 
+Bugs fixed in 1.11.4:
+
+* Bugs introduced by 1.11.2:
+
+  - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar)
+    don't cause spurious failures upon "make install" anymore.
+
+  - The user can now instruct the 'uninstall-info' rule not to update
+    the '${infodir}/dir' file by exporting the environment variable
+    'AM_UPDATE_INFO_DIR' to the value "no".  This is done for consistency
+    with how the 'install-info' rule operates since automake 1.11.2.
+
+* Long-standing bugs:
+
+  - It is now possible for a foo_SOURCES variable to hold Vala sources
+    together with C header files, as well as with sources and headers for
+    other supported languages (e.g., C++).  Previously, only mixing C and
+    Vala sources was supported.
+
+  - If "aclocal --install" is used, and the first directory specified with
+    '-I' is non-existent, aclocal will now create it before trying to copy
+    files in it.
+
+  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
+    generated install rules to create an empty $(foodir) directory;
+    for example, if Makefile.am contains something like:
+
+      pkglibexec_SCRIPTS =
+      if FALSE
+      pkglibexec_SCRIPTS += bar.sh
+      endif
+
+    the $(pkglibexec) directory will not be created upon "make install".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.11.3:
+
+* Miscellaneous changes:
+
   - Automake's own build system is more silent by default, making use of
     the 'silent-rules' option.
 
@@ -75,6 +372,57 @@ New in 1.11.0a:
   - The last relics of Python 1.5 support have been removed from the
     AM_PATH_PYTHON macro.
 
+  - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
+    and adds them to the normal list of dependencies, but without
+    overwriting the foo_DEPENDENCIES variable, which is normally computed
+    by automake.
+
+Bugs fixed in 1.11.3:
+
+* Bugs introduced by 1.11.2:
+
+  - Automake now correctly recognizes the prefix/primary combination
+   `pkglibexec_SCRIPTS' as valid.
+
+  - The parallel-tests harness doesn't trip anymore on sed implementations
+    with stricter limits on the length of input lines (problem seen at
+    least on Solaris 8).
+
+* Long-standing bugs:
+
+  - The "deleted header file problem" for *.am files is avoided by stub
+    rules.  This allows `make' to trigger a rerun of `automake' also if
+    some previously needed `.am' file has been removed.
+
+  - The `silent-rules' option now generates working makefiles even
+    for the uncommon `make' implementations that do not support the
+    nested-variables extension to POSIX 2008.  For such `make'
+    implementations, whether a build is silent is determined at
+    configure time, and cannot be overridden at make time with
+    `make V=0' or `make V=1'.
+
+  - Vala support now works better in VPATH setups.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.11.2:
+
+* Changes to aclocal:
+
+  - The `--acdir' option is deprecated.  Now you should use the new options
+    `--automake-acdir' and `--system-acdir' instead.
+
+  - The `ACLOCAL_PATH' environment variable is now interpreted as a
+    colon-separated list of additional directories to search after the
+    automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
+    and before the system acdir (by default ${prefix}/share/aclocal).
+
+* Miscellaneous changes:
+
+  - The Automake support for automatic de-ANSI-fication has been
+    deprecated.  It will probably be removed in the next major Automake
+    release (1.12).
+
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
 
@@ -102,55 +450,25 @@ New in 1.11.0a:
   - New macro AM_PROG_AR that looks for an archiver and wraps it in the new
     'ar-lib' auxiliary script if the selected archiver is Microsoft lib.
     This new macro is required for LIBRARIES and LTLIBRARIES when automake
-    is run with -Wextra-portability (or -Wall) and -Werror.
+    is run with -Wextra-portability and -Werror.
 
   - When using DejaGnu-based testsuites, the user can extend the `site.exp'
     file generated by automake-provided rules by defining the special make
     variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
 
-  - The `install-info' and `uninstall-info' rules can now be instructed
-    not to create/update the `${infodir}/dir' file, by exporting the new
-    environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+  - The `install-info' rule can now be instructed not to create/update
+    the `${infodir}/dir' file, by exporting the new environment variable
+    `AM_UPDATE_INFO_DIR' to the value "no".
 
-  - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
-    and adds them to the normal list of dependencies, but without
-    overwriting the foo_DEPENDENCIES variable, which is normally computed
-    by automake.
-
-  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
-    symbol index) modifiers as well as the "s" action, as the symbol index
-    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
-    action is now a synonym for "r" (replace).  Also, the script has been
-    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
-
-  - When the 'compile' script is used to wrap MSVC, it now accepts an
-    optional space between the -I, -L and -l options and their respective
-    arguments, for better POSIX compliance.
-
-  - If "aclocal --install" is used, and the first directory specified with
-    '-I' is non-existent, aclocal will now create it before trying to copy
-    files in it.
-
-Bugs fixed in 1.11.0a:
-
-* Bugs introduced by 1.11.2:
-
-  - Automake now correctly recognizes the prefix/primary combination
-   `pkglibexec_SCRIPTS' as valid.
-
-  - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar)
-    don't cause spurious failures upon "make install" anymore.
+Bugs fixed in 1.11.2:
 
 * Bugs introduced by 1.11:
 
-  - The parallel-tests harness doesn't trip anymore on sed implementations
-    with stricter limits on the length of input lines (problem seen at
-    least on Solaris 8).
+  - The parallel-tests driver no longer produces erroneous results with
+    Tru64/OSF 5.1 sh upon unreadable log files.
 
-  - The `parallel-tests' test driver works around a GNU make 3.80 bug with
-    trailing white space in the test list (`TESTS = foo $(EMPTY)'), and
-    does not report spurious successes when used with concurrent FreeBSD
-    make (e.g., "make check -j3").
+  - The `parallel-tests' test driver does not report spurious successes
+    when used with concurrent FreeBSD make (e.g., "make check -j3").
 
   - When the parallel-tests driver is in use, automake now explicitly
     rejects invalid entries and conditional contents in TEST_EXTENSIONS,
@@ -164,39 +482,14 @@ Bugs fixed in 1.11.0a:
     not used, `make' output no longer contains spurious backslash-only
     lines, thus once again matching what Automake did before 1.11.
 
-  - The `silent-rules' option now generates working makefiles even for
-    the uncommon `make' implementations that do not support the
-    nested-variables extension to POSIX 2008.  For such `make'
-    implementations, whether a build is silent is determined at
-    configure time, and cannot be overridden at make time with
-    `make V=0' or `make V=1'.
-
-  - The AM_COND_IF macro also works if the shell expression for the conditional
-    is no longer valid for the condition.
+  - The AM_COND_IF macro also works if the shell expression for the
+    conditional is no longer valid for the condition.
 
 * Long-standing bugs:
 
-  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
-    generated install rules to create an empty $(foodir) directory;
-    for example, if Makefile.am contains something like:
-
-      pkglibexec_SCRIPTS =
-      if FALSE
-      pkglibexec_SCRIPTS += bar.sh
-      endif
-
-    the $(pkglibexec) directory will not be created upon "make install".
-
-  - It is now possible for a foo_SOURCES variable to hold Vala sources
-    together with C header files, as well as with sources and headers for
-    other supported languages (e.g., C++).  Previously, only mixing C and
-    Vala sources was supported.
-
-  - Vala support now works better in VPATH setups.
-
-  - The "deleted header file problem" for *.am files is avoided by stub
-    rules.  This allows `make' to trigger a rerun of `automake' also if
-    some previously needed `.am' file has been removed.
+  - The order of Yacc and Lex flags is fixed to be consistent with other
+    languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
+    $(LFLAGS), so that the user variables override the developer variables.
 
   - "make distcheck" now correctly complains also when "make uninstall"
     leaves one and only one file installed in $(prefix).
@@ -208,17 +501,9 @@ Bugs fixed in 1.11.0a:
   - Automake now warns about more primary/directory invalid combinations,
     such as "doc_LIBRARIES" or "pkglib_PROGRAMS".
 
-  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
-    even if the `--prefix' argument pointed outside of a system directory.
-    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
-    `get_python_lib' function if it points outside the configured prefix,
-    unless the `--prefix' argument was either `/usr' or below `/System'.
-
-  - The testsuite does not try to change the mode of `ltmain.sh' files from
-    a Libtool installation (symlinked to test directories) any more.
-
-  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
-    tools are preferred in a cross-compile setup.
+  - Rules generated by Automake now try harder to not change any files when
+    `make -n' is invoked.  Fixes include compilation of Emacs Lisp, Vala, or
+    Yacc source files and the rule to update config.h.
 
   - Several scripts and the parallel-tests testsuite driver now exit with
     the right exit status upon receiving a signal.
@@ -226,21 +511,10 @@ Bugs fixed in 1.11.0a:
   - A per-Makefile.am setting of -Werror does not erroneously carry over
     to the handling of other Makefile.am files.
 
-  - The order of Yacc and Lex flags is now consistent with that of other
-    languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
-    $(LFLAGS), so that the user variables override the developer variables.
-
-  - Rules generated by Automake now try harder not to change any files when
-    `make -n' is invoked.  Fixes include compilation of Emacs Lisp, Vala, or
-    Yacc source files and the rule to update config.h.
-
   - The code for automatic dependency tracking works around a Solaris
     make bug triggered by sources containing repeated slashes when the
     `subdir-objects' option was used.
 
-  - The parallel-tests driver no longer produces erroneous results with
-    Tru64/OSF 5.1 sh upon unreadable log files.
-
   - The makedepend and hp depmodes now work better with VPATH builds.
 
   - Java sources specified with check_JAVA are no longer compiled for
@@ -257,7 +531,39 @@ Bugs fixed in 1.11.0a:
     `install-info' program is from Debian or from GNU, and adaptively
     change its behaviour; this has proven to be frail and easy to
     regress.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Bugs fixed in 1.11.1:
+
+  - Lots of minor bugfixes.
+
+* Bugs introduced by 1.11:
+
+  - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+    trailing white space in the test list (`TESTS = foo $(EMPTY)').
+
+* Long standing bugs:
+
+  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
+    even if the `--prefix' argument pointed outside of a system directory.
+    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
+    `get_python_lib' function if it points outside the configured prefix,
+    unless the `--prefix' argument was either `/usr' or below `/System'.
+
+  - The testsuite does not try to change the mode of `ltmain.sh' files from
+    a Libtool installation (symlinked to test directories) any more.
+
+  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
+    tools are preferred in a cross-compile setup.
+
+  - The distribution is tarred up with mode 755 now by the `dist*' targets.
+    This fixes a race condition where untrusted users could modify files
+    in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
+    build directory was world-searchable.  This is CVE-2009-4029.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.11:
 
 * Version requirements:
@@ -494,7 +800,9 @@ Bugs fixed in 1.11:
 
   - Fix order of standard includes to again be `-I. -I$(srcdir)',
     followed by directories containing config headers.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.10:
 
 * Version requirements:
@@ -662,7 +970,9 @@ New in 1.10:
   - Automake installs a "Hello World!" example package in $(docdir).
     This example is used throughout the new "Autotools Introduction"
     chapter of the manual.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.9:
 
 * Makefile.in bloat reduction:
@@ -758,7 +1068,9 @@ New in 1.9:
 
   - The manual tells more about SUBDIRS vs. DIST_SUBDIRS.
     It also gives an example of nested packages using AC_CONFIG_SUBDIRS.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bugs fixed in 1.8.5:
 
 * Long-standing bugs:
@@ -771,7 +1083,9 @@ Bugs fixed in 1.8.5:
   - Fix many rules to please FreeBSD make, which runs commands with `sh -e'.
 
   - Polish diagnostic when no input file is found.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bugs fixed in 1.8.4:
 
 * Long-standing bugs:
@@ -798,7 +1112,9 @@ Bugs fixed in 1.8.4:
     not defined in the same conditions as the _LDADD that uses it.
 
   - Do not warn when JAVAROOT is overridden, this is legitimate.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bugs fixed in 1.8.3:
 
 * Long-standing bugs:
@@ -866,7 +1182,9 @@ Bugs fixed in 1.8.3:
   - Third-Party Makefiles: how to interface third party Makefiles.
   - Upgrading: upgrading packages to newer Automake versions.
   - Multiple Outputs: handling tools that produce many outputs.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bug fixed in 1.8.2:
 
 * A (well known) portability bug slipped in the changes made to
@@ -875,7 +1193,9 @@ Bug fixed in 1.8.2:
 
 * Fix install rules for conditionally built python files.  (This never
   really worked.)
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bug fixed in 1.8.1:
 
 * Bugs introduced by 1.8:
@@ -984,7 +1304,9 @@ Bug fixed in 1.8.1:
   - tests/aclocal6.test: fix failure if autom4te.cache is disabled.
   - tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
     fix failures with old Texinfo versions.
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.8:
 
 * Meta-News
@@ -1268,19 +1590,21 @@ New in 1.8:
   - CONFIGURE_DEPENDENCIES and CONFIG_STATUS_DEPENDENCIES are now
     documented.  (The is not a new feature, these variables have
     been there since at least Automake 1.4.)
-
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Bugs fixed in 1.7.9:
 * Fix install-strip to work with nobase_ binaries.
 * Fix renaming of #line directives in ylwrap.
 * Rebuild with Autoconf 2.59.  (1.7.8 was not installable with pdksh.)
-
+
 Bugs fixed in 1.7.8:
 * Remove spurious blank lines in cleaning rules introduced in 1.7.7.
 * Fix detection of Debian's install-info, broken since version 1.5.
   (Debian bug #213524).
 * Honor -module if it appears in AM_LDFLAGS (i.e., relax name checking)
   This was only done for libfoo_LDFLAGS and LDFLAGS in previous versions.
-
+
 Bugs fixed in 1.7.7:
 * The implementation of automake's --no-force option is unreliable,
   so this option is ignored in this version.  A real fix will appear in
@@ -1297,7 +1621,7 @@ Bugs fixed in 1.7.7:
   - Extending aclocal: how to write m4 macros that won't trigger warnings
     with Automake 1.8.
   - A Shared Library: Rewrite and split into subsections.
-
+
 Bugs fixed in 1.7.6:
 * Fix depcomp's icc mode for ICC 7.1.
 * Diagnose calls to AC_CONFIG_FILES and friends with not enough arguments.
@@ -1306,7 +1630,7 @@ Bugs fixed in 1.7.6:
 * Fix the location reported in some diagnostics related to AUTOMAKE_OPTIONS.
 * Remove Latin-1 characters from elisp-comp.
 * Update the manual's @dircategory to match the Free Software Directory.
-
+
 Bugs fixed in 1.7.5:
 * Update install-sh's license to remove an advertising clause.
   (Debian bug #191717)
@@ -1314,7 +1638,7 @@ Bugs fixed in 1.7.5:
   that caused invalid Makefile.ins to be generated.
 * Make sure AM_MAKE_INCLUDE doesn't fail when a `doit' file exists.
 * New FAQ entry: renamed objects.
-
+
 Bugs fixed in 1.7.4:
 * Tweak the TAGS rule to support Exuberant Ctags (in addition to
   the Emacs implementation)
@@ -1330,7 +1654,7 @@ Bugs fixed in 1.7.4:
   Makefiles. (PR/389)
 * `make install' will build `BUILT_SOURCES' first.
 * Minor documentation fixes.
-
+
 Bugs fixed in 1.7.3:
 * Fix stamp files numbering (when using multiple AC_CONFIG_HEADERS).
 * Query distutils for `pythondir' and `pythonexecdir', instead of
@@ -1362,7 +1686,7 @@ Bugs fixed in 1.7.3:
   - Document how AC_CONFIG_AUX_DIR interacts with missing files.
     (Debian Bug #39542)
   - Document `AM_YFLAGS = -d'.  (PR/382)
-
+
 Bugs fixed in 1.7.2:
 * Fix installation and uninstallation of Info files built in subdirectories.
 * Do not run `./configure --with-included-gettext' during `make distcheck'
@@ -1372,7 +1696,7 @@ Bugs fixed in 1.7.2:
   and augmented in another condition.
 * Fix ansi2knr rules for LIBOBJS sources.
 * Clean all known Texinfo index files, not only those which appear to
-  be used, because we cannot know wich indexes are used in included files.
+  be used, because we cannot know which indexes are used in included files.
   (PR/375, Debian Bug #168671)
 * Honor only the first @setfilename seen in a Texinfo file.
 * Treat "required file X not found" diagnostics as errors (exit status 1).
@@ -1392,7 +1716,7 @@ Bugs fixed in 1.7.2:
 * Noteworthy manual updates:
   - Augment the section about BUILT_SOURCES.
   - Mention that AM_PROG_CC_STDC is a relic that is better avoided today.
-
+
 Bugs fixed in 1.7.1:
 * Honor `ansi2knr' for files built in subdirectories, or using per-targets
   flags.
@@ -1418,7 +1742,7 @@ Bugs fixed in 1.7.1:
 * Fix distribution of included Makefile fragment, so we don't create
   spurious directories in the distribution. (PR/366)
 * Don't complain that a target lacks `.$(EXEEXT)' when it has it.
-
+
 New in 1.7:
 * Autoconf 2.54 is required.
 * `aclocal' and `automake' will no longer warn about obsolete
@@ -1454,7 +1778,7 @@ New in 1.7:
   removes all installed files has been moved in a separate target,
   distuninstallcheck, so it can be overridden easily.
 * Many bug fixes.
-
+
 New in 1.6.3:
 * Support for AM_INIT_GETTEXT([external])
 * Bug fixes, including:
@@ -1462,7 +1786,7 @@ New in 1.6.3:
   - nobase_ programs and scripts honor --program-transform correctly.
   - Erase configure.lineno during `make distclean'.
   - Erase YACC and LEX outputs during `make maintainer-clean'.
-
+
 New in 1.6.2:
 * Many bug fixes, including:
   - Requiring the current version works.
@@ -1472,7 +1796,7 @@ New in 1.6.2:
   - Don't compute dependencies in background to avoid races with libtool.
   - Fix handling of _OBJECTS variables for targets sharing source variables.
   - Check dependency mode for Java when AM_PROG_GCJ is used.
-
+
 New in 1.6.1:
 * automake --output-dir is deprecated
 * Many bug fixes, including:
@@ -1481,7 +1805,7 @@ New in 1.6.1:
   - Allow configure variables with reserved suffix and unknown prefix
     (e.g. AC_SUBST(mumble_LDFLAGS) when 'mumble' is not a target).
   - Fix the definition of AUTOMAKE and ACLOCAL in configure.
-
+
 New in 1.6:
 * Autoconf 2.52 is required.
 * automake no longer run libtoolize.
@@ -1519,7 +1843,7 @@ New in 1.6:
   appended, and some of the install directory names have changed.
   This lets you have multiple versions installed simultaneously.
 * Support for parsers and lexers in subdirectories.
-
+
 New in 1.5:
 * Support for `configure.ac'.
 * Support for `else COND', `endif COND' and negated conditions `!COND'.
@@ -1537,7 +1861,7 @@ New in 1.5:
 * Compiled Java support
 * Support for per-executable and per-library compilation flags
 * Many bug fixes
-
+
 New in 1.4:
 * Added support for the Fortran 77 programming language.
 * Re-indexed the Automake Texinfo manual.
@@ -1549,7 +1873,7 @@ New in 1.4:
 * Dependency tracking no long susceptible to deleted header file problem
 * Maintainer mode now a conditional.  @MAINT@ is now an anachronism.
 * Bug fixes
-
+
 New in 1.3:
 * Bug fixes
 * Better Cygwin32 support
@@ -1565,7 +1889,7 @@ New in 1.3:
 * Preliminary support for Java
 * DESTDIR support at "make install" time
 * Improved ansi2knr support; you must use the latest ansi2knr.c (included)
-
+
 New in 1.2:
 * Bug fixes
 * Better DejaGnu support
@@ -1600,12 +1924,12 @@ New in 1.2:
 * Added `missing' support
 * Cygwin32 support
 * Conditionals in Makefile.am, from Ian Taylor
-
+
 New in 1.0:
 * Bug fixes
 * distcheck target runs install and installcheck targets
 * Added preliminary support for DejaGnu.
-
+
 New in 0.33:
 * More bug fixes
 * More checking
@@ -1614,7 +1938,7 @@ New in 0.33:
 * Added support for jm_MAINTAINER_MODE
 * dist-zip support
 * New "distcheck" target
-
+
 New in 0.32:
 * Many bug fixes
 * mkinstalldirs and mdate-sh now appear in directory specified by
@@ -1626,7 +1950,7 @@ New in 0.32:
 * Preliminary (unfinished) support for libtool
 * Added short option names.
 * Better "dist" support when gluing together multiple packages
-
+
 New in 0.31:
 * Bug fixes
 * Documentation updates (many from François Pinard)
@@ -1640,7 +1964,7 @@ New in 0.31:
 * Better error messages in many cases
 * Program names are canonicalized
 * Added "check" prefix; from Gord Matzigkeit
-
+
 New in 0.30:
 * Bug fixes
 * configure.in scanner knows about AC_PATH_XTRA, AC_OUTPUT ":" syntax
@@ -1656,7 +1980,7 @@ New in 0.30:
 * Required macros now distributed in aclocal.m4
 * New documentation
 * --strictness=gnu is default
-
+
 New in 0.29:
 * Many bug fixes
 * More sophisticated configure.in scanning; now understands ALLOCA and
@@ -1669,7 +1993,7 @@ New in 0.29:
   foo_SOURCES variable.
 * Automake automatically rebuilds files listed in AC_OUTPUT.  The
   corresponding ".in" files are included in the distribution.
-
+
 New in 0.28:
 * Added --gnu and --gnits options
 * More standards checking
@@ -1677,10 +2001,10 @@ New in 0.28:
 * Cleaned up 'dist' targets
 * Added AUTOMAKE_OPTIONS variable and several options
 * Now scans configure.in to get some information (preliminary)
-
+
 New in 0.27:
 * Works with Perl 4 again
-
+
 New in 0.26:
 * Added --install-missing option.
 * Pretty-prints generated macros and rules
@@ -1688,11 +2012,11 @@ New in 0.26:
 * Generates .PHONY target
 * Rule or macro in Makefile.am now overrides contents of Automake file
 * Substantial cleanups from François Pinard
-
+
 New in 0.25:
 * Bug fixes.
 * Works with Perl 4 again.
-
+
 New in 0.24:
 * New uniform naming scheme.
 * --strictness option
@@ -1700,23 +2024,23 @@ New in 0.24:
 * '.c' files corresponding to '.y' or '.l' files are automatically
   distributed.
 * Many bug fixes and cleanups
-
+
 New in 0.23:
 * Allow objects to be conditionally included in libraries via lib_LIBADD.
-
+
 New in 0.22:
 * Bug fixes in 'clean' code.
 * Now generates 'installdirs' target.
 * man page installation reworked.
 * 'make dist' no longer re-creates all Makefile.in's.
-
+
 New in 0.21:
 * Reimplemented in Perl
 * Added --amdir option (for debugging)
 * Texinfo support cleaned up.
 * Automatic de-ANSI-fication cleaned up.
 * Cleaned up 'clean' targets.
-
+
 New in 0.20:
 * Automatic dependency tracking
 * More documentation
@@ -1728,9 +2052,7 @@ New in 0.20:
 
 -----
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software
-Foundation, Inc.
+Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/README b/README
index 3f2414f..d69fbd4 100644
--- a/README
+++ b/README
@@ -1,29 +1,27 @@
-This is Automake, a Makefile generator.  It was inspired by the 4.4BSD
-make and include files, but aims to be portable and to conform to the
-GNU Coding Standards for Makefile variables and targets.
+This is Automake, a Makefile generator.  It aims to be portable and
+to conform to the GNU Coding Standards for Makefile variables and
+targets.
+
+See the INSTALL file for detailed information about how to configure
+and install Automake.
 
 Automake is a Perl script.  The input files are called Makefile.am.
 The output files are called Makefile.in; they are intended for use
 with Autoconf.  Automake requires certain things to be done in your
 configure.ac.
 
-Variable assignment lines in Makefile.am pull in defaults from various
-little *.am files.
-
-To use Automake, replace your Makefile.in files with Makefile.am
-files.  Read the documentation to see what to do.
-
-This package also includes the "aclocal" program.  aclocal is a
-program to generate an `aclocal.m4' based on the contents of
-`configure.ac'.  It is useful as an extensible, maintainable mechanism
-for augmenting autoconf.  It is intended that other package authors
-will write m4 macros which can be automatically used by aclocal.
-
-Automake has a test suite.  Use
+Automake comes with extensive documentation; please refer to it for
+more details about its purpose, features, and usage patterns.
 
-       make check
+This package also includes the "aclocal" program, whose purpose is
+to generate an 'aclocal.m4' based on the contents of 'configure.ac'.
+It is useful as an extensible, maintainable mechanism for augmenting
+autoconf.  It is intended that other package authors will write m4
+macros which can be automatically used by aclocal.  The documentation
+for aclocal is currently found in the Automake manual.
 
-to run it.  For more information, see the file tests/README.
+Automake has a test suite.  Use "make check" to run it.  For more
+information, see the file t/README.
 
 Automake has a page on the web.  See:
 
@@ -51,8 +49,7 @@ be informed, subscribe to that list by following the 
instructions at
 
 -----
 
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003, 2008, 2009, 2011
-  Free Software Foundation, Inc.
+Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/THANKS b/THANKS
index e584fa7..16367e1 100644
--- a/THANKS
+++ b/THANKS
@@ -47,7 +47,7 @@ Bob Proulx            address@hidden
 Bob Rossi              address@hidden
 Bobby Jack             address@hidden
 Braden N. McDaniel     address@hidden
-Brendan O'Dea          address@hidden
+Brendan O'Dea          address@hidden
 Brian Cameron          address@hidden
 Brian Ford             address@hidden
 Brian Gough            address@hidden
@@ -70,12 +70,16 @@ danbp                       address@hidden
 Daniel Jacobowitz      address@hidden
 Daniel Kahn Gillmor    address@hidden
 Daniel Richard G.      address@hidden
+Debarshi Ray           address@hidden
 Dave Brolley           address@hidden
+Dave Goodell           address@hidden
+Dave Hart              address@hidden
 Dave Korn              address@hidden
 Dave Morrison          address@hidden
 David A. Swierczek     address@hidden
 David A. Wheeler       address@hidden
 David Byron            address@hidden
+David Fang             address@hidden
 Davyd Madeley          address@hidden
 David Pashley          address@hidden
 David Zaroski          address@hidden
@@ -109,6 +113,7 @@ Erik Lindahl                address@hidden
 Esben Haabendal Soerensen address@hidden
 Ezra Peisach           address@hidden
 Fabian Alenius         address@hidden
+Federico Simoncelli    address@hidden
 Flavien Astraud                address@hidden
 Florian Briegel                address@hidden
 Francesco Salvestrini  address@hidden
@@ -154,6 +159,7 @@ Jason Duell         address@hidden
 Jason Molenda          address@hidden
 Javier Jardón         address@hidden
 Jeff Bailey            address@hidden
+Jeff A. Daily          address@hidden
 Jeff Garzik            address@hidden
 Jeff Squyres           address@hidden
 Jens Elkner            address@hidden
@@ -271,7 +277,6 @@ Olivier Louchart-Fletcher address@hidden
 Olly Betts             address@hidden
 Oren Ben-Kiki          address@hidden
 Owen Taylor            address@hidden
-Quentin Glidic         address@hidden
 Panther Martin         address@hidden
 Patrick Welche         address@hidden
 Patrik Weiskircher     address@hidden
@@ -303,6 +308,7 @@ Phil Nelson         address@hidden
 Philip Fong            address@hidden
 Philip S Tellis                address@hidden
 Пухальский Юрий Андреевич address@hidden
+Quentin Glidic         address@hidden
 Rainer Orth            address@hidden
 Rafael Laboissiere     address@hidden
 Rainer Tammer          address@hidden
@@ -325,6 +331,7 @@ Roberto Bagnara             address@hidden
 Roman Fietze           address@hidden
 Ronald Landheer                address@hidden
 Roumen Petrov          address@hidden
+Russ Allbery           address@hidden
 Rusty Ballinger                address@hidden
 Ryan Lortie            address@hidden
 Ryan T. Sammartino     address@hidden
@@ -364,7 +371,9 @@ Thomas Schwinge             address@hidden
 Thomas Tanner          address@hidden
 Toralf Förster                address@hidden
 Tim Goodwin            address@hidden
+Tim Landscheidt                address@hidden
 Tim Mooney             address@hidden
+Tim Retout             address@hidden
 Tim Rice               address@hidden
 Tim Van Holder         address@hidden
 Toshio Kuratomi                address@hidden
@@ -374,6 +383,7 @@ Ulrich Eckhardt             address@hidden
 Václav Haisman                address@hidden
 Vadim Zeitlin          address@hidden
 Vincent Lefevre                address@hidden
+Vladimir Serbinenko    address@hidden
 Volker Boerchers       address@hidden
 Werner John            address@hidden
 Werner Koch            address@hidden
diff --git a/TODO b/TODO
deleted file mode 100644
index 79f298f..0000000
--- a/TODO
+++ /dev/null
@@ -1,582 +0,0 @@
-We should arrange so that install-%DIR%%PRIMARY% is run conditionally
-when %DIR%_%PRIMARY% is defined conditionally.  Currently it is always
-run, and that will therefore always create %DIR% (unless %DIR%dir is
-also defined conditionally).  Likewise, installdirs should not
-create %DIR% in conditions were no %DIR%_%PRIMARY% is enabled.
-
-check should depend on all
-  from ben elliston
-
-the new YFLAGS code doesn't correctly handle srcdir
-
-allow foo_NAME to rename an object (library or program)
-at build/install time
-
-remove _LTLIBRARIES and just use _LIBRARIES
-then use this for zip/jar as well
-
-for 1.5
-investigate problems with conditionally defined libraries
-
-add an error if the user makefile.am violates our
-   namespace rules
-
-we need a document describing automake from the end user's point of view
-eg describe INSTALL_HEADER there, among other things
-
-* maintainer-clean
-
-Akim:
-> @@ -31,5 +31,9 @@
->  DISTCLEAN   -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
->
->  maintainer-clean-generic:
-> +## FIXME: shouldn't we really print these messages before running
-> +## the dependencies?
-> +    @echo "This command is intended for maintainers to use"
-> +    @echo "it deletes files that may require special tools to rebuild."
->        -rm -f Makefile.in
-
-Tom:
-> I'd like to eventually fix the FIXME comment by having
-> maintainer-clean look like:
->
->     maintainer-clean:
->        @echo ...
->        $(MAKE) whatever
->
-> We're left with the question of whether we should repeat them in every
-> subdir.
-
-*
-Alexandre Oliva:
-> Hmm...  Interesting.  It must have been a side effect of the enabling
-> of forced `relink' on GNU/Linux/x86.  Anyway, on platforms that
-> actually require relinking, this problem remains, and I see no way to
-> overcome it other than arranging for automake to install libraries
-> before executables, as you suggest.  This shouldn't be a big problem,
-> anyway.
->
-> A bigger problem could show up if two libraries in the same directory,
-> one dependent on the other, are installed concurrently.  If relinking
-> is needed for the dependent library, we have a problem.  It appears to
-> me that user will have to live without `make -j install', in this
-> case.
-
-Alex Hornby
-> Here's an Automake patch and changelog entry allow make -j install on
-> such degenerate systems (and Linux with buggy libtool <g>)
->
-> If you install to locations other that bin_ and lib_ then a larger fix
-> is necessary, but this should fix the 90% case.
-
-* think about how per-object flags should work.  in particular:
-  * how should they be specified?
-    using the object name is confusing when .lo/.obj in use
-    however, the object name provides a nice interaction with
-    per-exe flags
-  * how should they interact with per-executable flags?
-  [ this is probably a feature in search of a problem ]
-
-* cross-compilation support:
-  programs built and used by the build process need to be
-  built for CC_FOR_BUILD
-  introduce a new prefxi for this, e.g. `build_PROGRAMS'
-  [ we can do this in an automatic way I think.
-    unfortunately it isn't that useful until autoconf has support
-    for this sort of thing as well ]
-
-* distcheck should make sure that each file that uses _() is
-  listed in POTFILES.in
-  From Jim Meyering:
-    # Verify that all source files using _() are listed in po/POTFILES.in.
-    po-check:
-           grep -E -v '^(#|$$)' po/POTFILES.in | sort > address@hidden
-           grep -E -l '\b_\(' lib/*.c src/*.c | sort > address@hidden
-           diff -u address@hidden address@hidden
-           rm -f address@hidden address@hidden
-
-* one performance enhancement would be to have autoconf write
-  a single file containing all the macro assignments.
-  then read this file via `include'
-  unfortunately this can't be done because of conditionals
-  -- but it could be made to work if we also changed:
-    * automake to rewrite @FOO@ to $(FOO), and
-    * the implementation of conditionals to rely on some new
-      config.status magic
-
-* support prog_LIBS as override for LIBS
-
-* Test subdir-objects option with yacc, lex, ansi2knr
-  Our locking scheme won't prevent a parallel make from losing
-  if there are two `bar.o' files and the timing is just right
-  This only happens with parallel make and no-`-c -o' compiler,
-  so it probably isn't very important
-  `-c -o' when doing libtool
-  try to find a losing compiler and see if it really works.
-  (actually: hack config.cache and do it)
-
-* per-exe flags
-** LIBOBJS shouldn't be used when there are per-exe flags (?)
-
-* Allow creation of Java .zip/.jar files in natural way
-  If you are building a compiled Java library, then the .zip/.jar
-  ought to be made automatically.
-
-* Run automake before libtool.  It will report an error but
-  still won't put the file into the disty.  This is wrong.
-  From Mark H Wilkinson <address@hidden>
-
-* examine possibility of using any character in a macro name
-  and rewriting names automatically.  this means we must rewrite
-  all references as well.
-  [ this is a 2.0-style feature ]
-
-* `distcheck' and `dist' should depend on `all'
-
-* Add code to generate foo-config script like gnome, gtk
-
-* document user namespace for macro/target names
-  adopt some conventions and use uniformly
-    [ this is a good thing for the rewrite ]
-
-* distclean must remove config.status
-  can't this cause problems for maintainer-clean?
-  shouldn't maintainer-clean print the message before running
-  any part of the make?  (just to slow things down long enough
-  for the user to stop it)
-  (maybe doesn't matter since people who even know about
-  maintainer-clean already have a clue)
-
-* reintroduce AM_FUNC_FNMATCH which sets LIBOBJS
-  Then have automake know about fnmatch.h.
-    [ probably should wait for autoconf to get right functionality ]
-
-* "make diff" capability
-  look at gcc's Makefile.in to see what to do
-  or look at maint program
-
-* in --cygnus, clean-info not generated at top level
-
-* what if an element of a scanned variable looks like
-       $(FOO).$(BAR)  ?
-  or some other arbitrary thing?
-  right now we try to cope, but not very well
-    [ this is only of theoretical interest for now ]
-    [ We now have an 'inner_expand' option to traverse_recursively,
-      but it is not yet used. ]
-
-* make sure every variable that is used is also defined
-    [ we don't really look at variable uses in detail.
-      2.0 thing ]
-
-* make sure `missing' defines are generated
-
-* missing should handle install -d and rmdir -p (for uninstall)
-
-* NORMAL_INSTALL / NORMAL_UNINSTALL -vs- recursive rules
-  [ requires changes to the standard ]
-
-* should not put texiname_TEXINFOS into distribution
-  should rename this macro anyway, to foo_texi_DEPENDENCIES
-
-* For now I guess I'll just have automake give an error if it encounters
-non-C source in a libtool library specification.
-
-* must split $obj into two parts: one for libtool and one for
-  deansification.  Otherwise .S files will be deansified!
-
-* ansi2knr must currently appear in a directory that has some source
-
-* if program has the same name as a target, do something sensible:
-  - if the target is internal, rename it
-  - if the target is mandated (eg, "info"), tell the user
-    consider auto-modifying the program name to work around this
-
-* should separate actual options from strictness levels
-  strictness should only cover requirements
-  You should be able to pick and choose options
-
-* rewrite in guile (RMS request)
-at the same time, consider adding a GUI
-could use the same parsing code for the GUI and the standalone version
-that means figuring out a better representation of internal state
-[ that's easy -- anything is better than what we have now ]
-
-having just one Makefile for a project would give a big speed increase
-for a project with many directories, eg glibc.  ideally (?) you'd
-still be able to have a Makefile.am in each directory somehow; this
-might make editing conceptually easier.
-
-* finish up TAGS work
-
-* only remove libtool at top level?
-
-* clean up source directory by moving stuff into subdirs
-
-* consider adding other variables similar to pkglibexecdir?
-  requests for pkg-dirs with version included
-
-Avoid loops when installing; instead unroll them in automake
-[ Impossible when @AC_SUBST@ values are used. ]
-
-Some long-term projects:
-* if $(FOO) is used somewhere, ensure FOO is defined, either by
-  user or by automake if possible
-
-[ include, += support ]
-* even better would be allowing targets in different included
-  fragments to be merged.  e.g., `install-local'.
-
-consider putting all check-* targets onto @check?
-
-take diff-n-query code from libit
-
-Per Bothner says:
-Per> 1) Being able to build a set of non-source programs
-Per> from source programs, without necessarily linking them together.
-Per> I.e. one should be able to say something like:
-Per>   dummy_SOURCES=foo.c bar.c
-Per> and automake should realize that it needs to build foo.o and bar.o.
-Per> 2) Being intelligent about new kinds of suffixes.
-Per> If it sees:
-Per>   SUFFIXES = .class .java
-Per> and a suffix rule of the form:
-Per>   .java.class:
-Per> then it should be able to realize it can build .class files from
-Per> .java files, and thus be able to generate a list of
-Per> .class files from a list of .java source files.
-[What Per wanted here was a way to have automate automatically follow
-suffix rules.  So for instance if you had a `.x.y:' rule, and automake
-saw a `.x' file, it would automatically build and install the
-corresponding `.y' file.]
-
-Jim's idea: should look for @setfilename and warn if filenames too long
-* guess split size
-
-from joerg-martin schwarz:
- -- If Makefile.am contains $(CC), $(COMPILE), $(YLWRAP), ....
-    in an explicitly written rule,  you should emit the corresponding
-    Makefile variables automatically.
-
-Configuring in the large:
-* allow hierarchy of dirs to share one aclocal.m4
-  How?
-
-consider printing full file name of Makefile.am or configure.in when
-giving error.  This would help for very large trees with many
-configure.in scripts
-
-From the GNU Standards.  These things could be checked, and probably
-should be if --gnu.
-*    Make sure that the directory into which the distribution unpacks (as
-well as any subdirectories) are all world-writable (octal mode 777).
-*   Make sure that no file name in the distribution is more than 14
-characters long.
-*    Don't include any symbolic links in the distribution itself.
-     (ditto hard links)
-*    Make sure that all the files in the distribution are world-readable.
-* standards no longer prohibit ANSI C.  What does this imply
-  for the de-ansi-fication feature? [ must keep it -- some users rely on it ]
-
-should be able to determine what is built by looking at rules (and
-configure.in).  Then built man pages (eg) could automatically be
-omitted from the distribution.
-
-Consider: "cvs" option adds some cvs-specific rules?
-
-Right now, targets generated internally (eg "install") are not
-overridable by user code.  This should probably be possible, even
-though it isn't very important.  This could be done by generating all
-internal rules via a function call instead of just appending to
-$output_rules.
- [ this will be harder to implement when scanning a rule like all-recursive
-   from subdirs.am ]
-
-Other priorities:
-* Must rewrite am_install_var.  Should break into multiple functions.
-  This will allow the callers to be a little smarter.
-* Rewrite clean targets.
-* Fix up require_file junk.
-
-djm wants ``LINKS'' variable; list of things to link together after
-install.  In BSD environment, use:
-       LINKS = from1 to1 from2 to2 ...
-
-Need way to say there are no suffixes in a Makefile (Franc,ois'
-"override" idea suffices here)
-
-Check to make sure various scripts are executable (IE when looking for
-them in a directory)
-
-Handle dist-zoo.  Generally add more DOS support.  Maybe run "doschk"
-(why isn't this merged with "pathchk"?) when doing a dist.  Do
-whatever else François says here...
-
-Add support for html via an option.  Use texi2html.  Use
-"html_TEXINFOS", and htmldir = .../html.  Include html files in
-distribution.  Also allow "html_DATA", for raw .html files.
-  [ when will texinfo directly support html? ]
-
-uninstall and pkg-dirs should rm -rf the dir.
-
-In general most .am files should be merged into automake.  For
-instance all the "clean" targets could be merged by keeping lists of
-things to be removed.  This would be a lot nicer looking.  Note that
-the install targets probably should not be merged; it is sometimes
-useful to only install a small part.
-
-* Clean up the output:
-** Order rules sensibly
-** Ensure every line has a purpose.  Omit unused stuff
-** Eliminate extraneous rules when possible (eg 'install-am' stuff)
-** Make sure vertical spacing is correct
-Omit program transform vars from header if no program installed.  This
-is currently pretty hard to do.  (But with beautification code it
-would probably be easy)
-
-* Lex, yacc support:
-** It would be nice to automatically support using bison's better features
-  to rename the output files.  This requires autoconf support
-** Consider supporting syntax from autoconf "derived:source", eg:
-       y.tab.c:perly.y
-  for yacc and lex source
-** what if you use flex and the option to avoid -lfl?
-  should support this?
-
-* Multi-language support:
-** should have mapping of file extensions to languages
-** should automatically handle the linking issue (special-case C++)
-** must get compile rules for various languages; FORTRAN probably
-  most important unimplemented language
-This should be integrated in some way with Per's idea.
-Eg .f.o rules should be recognized & auto-handled in _SOURCES
-That way any random language can be treated with C/C++ on a first-class
-basis (maybe)
-
-It might be cool to generate .texi dependencies by grepping for
address@hidden  (If done, it should be done the same way C dependencies are
-done)
-[ Ask Karl Berry for a -M option to makeinfo and texi2dvi? ]
-
-It would be good to check some parts of GNU standards.  Already check
-for install-sh and mkinstalldirs.  What else is required to be in
-package by GNU standards or by automake?
-Some things for --strictness=gnits:
-* "cd $(foo); something" is an error in a rule.  Should be:
-  "cd $(foo) && something"
-* Look for 'ln -s' and warn about using $(LN_S) and AC_PROG_LN_S
-* Look for $(LN_S) and require AC_PROG_LN_S
-
-Auto-distribute "ChangeLog.[0-9]+"?  "ChangeLog.[a-z]+"?
-
-Internationalize. [ gettext doesn't have the necessary machinery yet ]
-am_error should use printf-style arguments (for eventual gettext scheme)
-
-François says the ordering of files in a distribution should be as follows:
-* README
-* source files
-* derived files
-I agree, but I don't see how to implement this yet.
-It might be easier if "derived files" is limited to those that
-Automake itself knows about, eg output of yacc.
-
-Check all source files to make sure that FSF address is up-to-date.
---gnits or --gnu only.
-
-Merge each -vars.am file with corresponding ".am" file.  Can do this
-because of changes to &file_contents.
-
-Should libexec programs have the name transform done on them?
-
-Order the output rules sensibly, so FOO_SOURCES and FOO_OBJECTS are
-together and rules are in the usual order.
-
-Make the output minimal: only output definitions for variables that
-are used.
-
-djm says:
-David> To avoid comments like the one about subdirs getting buried in
-David> the middle of a Makefile.in, how about pushing comments that
-David> start with ### to the top of the Makefile.in (in order)?  Sort
-David> of like how Autoconf uses diversions to force initialization
-David> code to the top of configure.
-
-Karl Berry says:
-Karl> 2) Your Makefile variable names are generally uppercase, but GNU
-Karl> generally uses lowercase. Not that it matters :-).
-
-================================================================
-
-Stuff for aclocal:
-
-probably should put each group of m4 files into a subdir owned by the
-containing application.
-
-================================================================
-
-Document:
-
-AM_MISSING_PROG
-
-how to use the generated makefiles
- - standard targets
- - required targets
- - NORMAL_INSTALL junk
-
-rationale for avoiding
-       make CFLAGS="$CFLAGS" ...
-in subdirs make rule
-
-write example of using automake with dejagnu
-follow calc example in dejagnu docs
-
-document which variables are actually scanned and which are not.
-
-Document customary ordering of Makefile.am.  From François.
-
-Should include extended version of diagram from Autoconf (suggested by
-Greg Woods)
-
-Make a definition of the term "source"
-
-document how to use Automake with CVS.  Idea from Mark Galassi.  Also
-include Greg Woods' more sophisticated "cvs-dist" target.
-
--- must document all variables that are supposed
-   to be public knowledge
-
-must document the targets required for integration with
-non-automake-using subdirs
-
-document the "make SHELL='/bin/sh -x'" trick for debugging
-
-section on relationship to GNU make.  include notes on parallel makes
-
-add a concept index
-
-move discussion of cygwin32, etags, mkid under other gnu tools
-
-CCLD, CXXLD, FLD
-
-================================================================
-
-Libraries:
-
-* Should support standalone library along with subdir library in same
-  Makefile.am.  Maybe: turn off "standalone" mode if library's Makefile.am
-  is not only one specd? [ add an option for this ]
-
-================================================================
-
-Longer term:
-
-Would it be useful to integrate in some way with the Debian package
-building utility?  Must check.  maybe it would be possible to deal
-with all the different package utilities somehow.  Lately I've been
-hearing good things about the RedHat packaging utilities.  Why are
-there so many of these?  Are they fun to write or something?
-The RedHat package utility is called RPM; see
-       ftp://ftp.redhat.com/pub/code/rpm
-It actually has problems, like no configure script and no documentation.
-
-For Cygnus it would probably be good to be able to handle the native
-package utility on each platform.  There are probably 3 or 4 of these
-(sysv, solaris?, aix?)
-
-tcl/unix/Makefile.in has some code to generate a Solaris package.
-
-Automake probably can't do all of this on its own.  A new tool might
-be a better idea
-
-I have some notes from a Debian developer on how the integration
-should work
-
-================================================================
-
-A tool to guess what the local Makefile.am should look like:
-(see Gord's Maint program!)
-
-* Probably integrate with autoscan
-* Use various simple rules to determine what to do:
-  * get name of top directory, sans version info
-  * search for .c files with 'main' in them
-    * if in main.c, use directory name for program
-    * if in more than one, generate multiple programs
-    * if not found, generate a library named after directory
-  * order subdir searches correctly: lib first, src last
-  * assume 'testsuite' dir means we are using dejagnu
-* maybe be smart about reading existing Makefile.am, so tool
-  can be run for incremental changes?  You could imagine:
-
-       Makefile.am:
-               autoproject --incremental
-
-================================================================
-
-Stuff NOT to do, and why:
-
-consider auto-including any file that matches "*.in".
-  [ no: po/Makefile.in shouldn't be included ]
-
-must look at mkid to see how it works (for subdir usage)
-  [ right now, it doesn't.  i don't see a simple fix right now ]
-
-if configure.in not found, move up a directory and try again?  This
-could eliminate a common source of problems.
-  [ this is just a bad idea ]
-
-* scripts are installed in $exec_prefix/bin, not $prefix/bin
-  Bug or feature?
-  [ the consensus on Gnits is that this isn't required.
-    doubters can work around it anyway ]
-
-Scan source directories and warn about missing files, eg .c/.h files
-that aren't mentioned?
-  [ distcheck makes this less useful ]
-
-* quoting bugs
-  - how to install file with a space in its name?
-  [ don't bother with this -- make is just too losing ]
-
-* notice when a .c file is a target somewhere, and auto-add it to
-    BUILT_SOURCES
-  [ BUILT_SOURCES are for files that need to be built before anything
-    else because of hidden dependencies (something .c files are
-    unlikely to be) ]
-
-* Scan multiple input files when Makefile is generated?
-  This would provide flexibility for large projects; subsumes
-  the "Makefile.tmpl" idea
- [ can't do this.  must explain why in manual.
-   basically, solving all the problems is too hard
-   like: how to remove redundancies between generated .in files
-   instead should implement `include' directive for Makefile.am ]
-
-* Should be a way to have "nobuild_PROGRAMS" which aren't even built,
-  but which could be by running the magic make command.
-  [ We already have EXTRA_PROGRAMS for this. ]
-
-
-* copyright notice
-
-Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2007  Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Local Variables:
-mode: outline
-End:
diff --git a/aclocal.in b/aclocal.in
index 4764379..85528af 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -53,9 +53,9 @@ $perl_threads = 0;
 # automake macros, and finally the system-wide directories for
 # third-party macros.
 # @user_includes can be augmented with -I.
-# @automake_includes can be reset with the `--automake-acdir' option.
-# @system_includes can be augmented with the `dirlist' file or the
-# ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
+# @automake_includes can be reset with the '--automake-acdir' option.
+# @system_includes can be augmented with the 'dirlist' file or the
+# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
 # option.
 my @user_includes = ();
 my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
@@ -127,9 +127,9 @@ my %serial = ();
 #   AC_DEFUN([macroname], ...)
 # or
 #   AC_DEFUN(macroname, ...)
-# When macroname is `['-quoted , we accept any character in the name,
-# except `]'.  Otherwise macroname stops on the first `]', `,', `)',
-# or `\n' encountered.
+# When macroname is '['-quoted , we accept any character in the name,
+# except ']'.  Otherwise macroname stops on the first ']', ',', ')',
+# or '\n' encountered.
 my $ac_defun_rx =
   "(?:AU_ALIAS|A[CU]_DEFUN|AC_DEFUN_ONCE)\\((?:\\[([^]]+)\\]|([^],)\n]+))";
 
@@ -149,7 +149,7 @@ my $ac_version;
 
 # If set, names a temporary file that must be erased on abnormal exit.
 my $erase_me;
-
+
 ################################################################
 
 # Erase temporary file ERASE_ME.  Handle signals.
@@ -163,7 +163,7 @@ sub unlink_tmp
     }
   if (defined $erase_me && -e $erase_me && !unlink ($erase_me))
     {
-      fatal "could not remove `$erase_me': $!";
+      fatal "could not remove '$erase_me': $!";
     }
   undef $erase_me;
 
@@ -195,8 +195,7 @@ sub check_acinclude ()
   foreach my $key (keys %map)
     {
       # FIXME: should print line number of acinclude.m4.
-      msg ('syntax', "warning: macro `$key' defined in "
-          . "acinclude.m4 but never used")
+      msg ('syntax', "macro '$key' defined in acinclude.m4 but never used")
        if $map{$key} eq 'acinclude.m4' && ! exists $macro_seen{$key};
     }
 }
@@ -233,12 +232,12 @@ sub install_file ($$)
     {
       if (-e $dest)
        {
-         msg 'note', "overwriting `$dest' with `$src'";
+         msg 'note', "overwriting '$dest' with '$src'";
          $diff_dest = $dest;
        }
       else
        {
-         msg 'note', "installing `$dest' from `$src'";
+         msg 'note', "installing '$dest' from '$src'";
        }
 
       if (@diff_command)
@@ -441,7 +440,7 @@ sub scan_configure_dep ($)
       while (/$m4_include_rx/go)
        {
          my $ifile = $2 || $3;
-         # Skip missing `sinclude'd files.
+         # Skip missing 'sinclude'd files.
          next if $1 ne 'm4_' && ! -f $ifile;
          push @ilist, $ifile;
        }
@@ -461,7 +460,7 @@ sub scan_configure_dep ($)
          # Make this just a warning, because we do not know whether
          # the macro is actually used (it could be called conditionally).
          msg ('unsupported', "$file:$line",
-              "warning: macro `$2' not found in library");
+              "macro '$2' not found in library");
        }
     }
 
@@ -508,7 +507,7 @@ sub scan_file ($$$)
 
   $file_type{$file} = $type;
 
-  fatal "$where: file `$file' does not exist" if ! -e $file;
+  fatal "$where: file '$file' does not exist" if ! -e $file;
 
   my $fh = new Automake::XFile $file;
   my $contents = '';
@@ -521,7 +520,7 @@ sub scan_file ($$$)
 
   while ($_ = $fh->getline)
     {
-      # Ignore `##' lines.
+      # Ignore '##' lines.
       next if /^##/;
 
       $contents .= $_;
@@ -533,7 +532,7 @@ sub scan_file ($$$)
          if ($number !~ /$serial_number_rx/go)
            {
              msg ('syntax', "$file:$.",
-                  "warning: ill-formed serial number `$number', "
+                  "ill-formed serial number '$number', "
                   . "expecting a version string with only digits and dots");
            }
          elsif ($defun_seen)
@@ -585,8 +584,8 @@ sub scan_file ($$$)
          $defun_seen = 1;
          if (! defined $1)
            {
-             msg ('syntax', "$file:$.", "warning: underquoted definition of $2"
-                  . "\n  run info '(automake)Extending aclocal'\n"
+             msg ('syntax', "$file:$.", "underquoted definition of $2"
+                  . "\n  run info Automake 'Extending aclocal'\n"
                   . "  or see http://www.gnu.org/software/automake/manual/";
                   . "automake.html#Extending-aclocal")
                unless $underquoted_manual_once;
@@ -621,7 +620,7 @@ sub scan_file ($$$)
       while ($line =~ /$m4_include_rx/go)
        {
          my $ifile = $2 || $3;
-         # Skip missing `sinclude'd files.
+         # Skip missing 'sinclude'd files.
          next if $1 ne 'm4_' && ! -f $ifile;
          push (@inc_files, $ifile);
          $inc_lines{$ifile} = $.;
@@ -637,7 +636,7 @@ sub scan_file ($$$)
   $file_contents{$file} = $contents;
 
   # For some reason I don't understand, it does not work
-  # to do `map { scan_file ($_, ...) } @inc_files' below.
+  # to do "map { scan_file ($_, ...) } @inc_files" below.
   # With Perl 5.8.2 it undefines @inc_files.
   my @copy = @inc_files;
   my @all_inc_files = (@inc_files,
@@ -780,7 +779,7 @@ sub write_aclocal ($@)
 
       # If the file to add looks like outside the project, copy it
       # to the output.  The regex catches filenames starting with
-      # things like `/', `\', or `c:\'.
+      # things like '/', '\', or 'c:\'.
       if ($file_type{$file} != FT_USER
          || $file =~ m,^(?:\w:)?[\\/],)
        {
@@ -828,12 +827,12 @@ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [$ac_version],,
 [m4_warning([this file was generated for autoconf $ac_version.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 
`autoreconf'.])])
+To do so, use the procedure documented by the package, typically 
'autoreconf'.])])
 
 $output";
     }
 
-  # We used to print `# $output_file generated automatically etc.'  But
+  # We used to print "# $output_file generated automatically etc."  But
   # this creates spurious differences when using autoreconf.  Autoreconf
   # creates aclocal.m4t and then rename it to aclocal.m4, but the
   # rebuild rules generated by Automake create aclocal.m4 directly --
@@ -880,7 +879,7 @@ $output";
     {
       if (-e $output_file && !unlink $output_file)
         {
-         fatal "could not remove `$output_file': $!";
+         fatal "could not remove '$output_file': $!";
        }
       my $out = new Automake::XFile "> $output_file";
       print $out $output;
@@ -895,15 +894,16 @@ sub usage ($)
 {
   my ($status) = @_;
 
-  print "Usage: aclocal [OPTIONS] ...
+  print <<'EOF';
+Usage: aclocal [OPTION]...
 
-Generate `aclocal.m4' by scanning `configure.ac' or `configure.in'
+Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in'
 
 Options:
       --automake-acdir=DIR  directory holding automake-provided m4 files
       --system-acdir=DIR    directory holding third-party system-wide files
       --diff[=COMMAND]      run COMMAND [diff -u] on M4 files that would be
-                              changed (implies --install and --dry-run)
+                            changed (implies --install and --dry-run)
       --dry-run             pretend to, but do not actually update any file
       --force               always update output file
       --help                print this help, then exit
@@ -917,18 +917,17 @@ Options:
   -W, --warnings=CATEGORY   report the warnings falling in CATEGORY
 
 Warning categories include:
-  `syntax'        dubious syntactic constructs (default)
-  `unsupported'   unknown macros (default)
-  `all'           all the warnings (default)
-  `no-CATEGORY'   turn off warnings in CATEGORY
-  `none'          turn off all the warnings
-  `error'         treat warnings as errors
-
-" . 'Report bugs to <@PACKAGE_BUGREPORT@>.
+  syntax        dubious syntactic constructs (default)
+  unsupported   unknown macros (default)
+  all           all the warnings (default)
+  no-CATEGORY   turn off warnings in CATEGORY
+  none          turn off all the warnings
+  error         treat warnings as errors
+
+Report bugs to <@PACKAGE_BUGREPORT@>.
 GNU Automake home page: <@PACKAGE_URL@>.
 General help using GNU software: <http://www.gnu.org/gethelp/>.
-';
-
+EOF
   exit $status;
 }
 
@@ -952,7 +951,7 @@ EOF
 # the public (unversioned) system directory.  This usage is obsolete.
 sub handle_acdir_option ($$)
 {
-  msg 'obsolete', '', "`--acdir' is deprecated\n";
+  msg 'obsolete', '', "'--acdir' is deprecated\n";
   @system_includes = ($_[1]);
   @automake_includes = ();
 }
@@ -1001,10 +1000,10 @@ sub parse_arguments ()
   if ($install && address@hidden)
     {
       fatal ("--install should copy macros in the directory indicated by the"
-            . "\nfirst -I option, but no -I was supplied.");
+            . "\nfirst -I option, but no -I was supplied");
     }
 
-  # Finally, adds any directory listed in the `dirlist' file.
+  # Finally, adds any directory listed in the 'dirlist' file.
   if (open (DIRLIST, "$system_includes[0]/dirlist"))
     {
       while (<DIRLIST>)
@@ -1023,7 +1022,7 @@ sub parse_arguments ()
     }
 }
 
-# Add any directory listed in the `ACLOCAL_PATH' environment variable
+# Add any directory listed in the 'ACLOCAL_PATH' environment variable
 # to the list of system include directories.
 sub parse_ACLOCAL_PATH ()
 {
@@ -1056,7 +1055,7 @@ my $loop = 0;
 while (1)
   {
     ++$loop;
-    prog_error "Too many loops." if $loop > 2;
+    prog_error "too many loops" if $loop > 2;
 
     reset_maps;
     scan_m4_files;
diff --git a/automake.in b/automake.in
index 921a6ae..43a7ba6 100644
--- a/automake.in
+++ b/automake.in
@@ -6,9 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
     if 0;
 
 # automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,15 +35,16 @@ BEGIN
   # Override SHELL.  This is required on DJGPP so that system() uses
   # bash, not COMMAND.COM which doesn't quote arguments properly.
   # Other systems aren't expected to use $SHELL when Automake
-  # runs, but it should be safe to drop the `if DJGPP' guard if
+  # runs, but it should be safe to drop the "if DJGPP" guard if
   # it turns up other systems need the same thing.  After all,
   # if SHELL is used, ./configure's SHELL is always better than
   # the user's SHELL (which may be something like tcsh).
   $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
 }
 
-use Automake::Struct;
-struct (# Short name of the language (c, f77...).
+use Class::Struct ();
+Class::Struct::struct (
+       # Short name of the language (c, f77...).
        'name' => "\$",
        # Nice name of the language (C, Fortran 77...).
        'Name' => "\$",
@@ -53,8 +52,7 @@ struct (# Short name of the language (c, f77...).
        # List of configure variables which must be defined.
        'config_vars' => '@',
 
-       'ansi'    => "\$",
-       # `pure' is `1' or `'.  A `pure' language is one where, if
+       # 'pure' is '1' or ''.  A 'pure' language is one where, if
        # all the files in a directory are of that language, then we
        # do not require the C compiler or any code to call it.
        'pure'   => "\$",
@@ -152,7 +150,6 @@ use Automake::Location;
 use Automake::Condition qw/TRUE FALSE/;
 use Automake::DisjConditions;
 use Automake::Options;
-use Automake::Version;
 use Automake::Variable;
 use Automake::VarDef;
 use Automake::Rule;
@@ -189,7 +186,7 @@ my $RULE_PATTERN =
 
 # Only recognize leading spaces, not leading tabs.  If we recognize
 # leading tabs here then we need to make the reader smarter, because
-# otherwise it will think rules like `foo=bar; \' are errors.
+# otherwise it will think rules like 'foo=bar; \' are errors.
 my $ASSIGNMENT_PATTERN = '^ *([^ \t=:+]*)\s*([:+]?)=\s*(.*)' . "\$";
 # This pattern recognizes a Gnits version id and sets $1 if the
 # release is an alpha release.  We also allow a suffix which can be
@@ -208,8 +205,6 @@ my $INCLUDE_PATTERN = ('^include\s+'
                       . '|(\$\(srcdir\)/' . $PATH_PATTERN . ')'
                       . '|([^/\$]' . $PATH_PATTERN . '))\s*(#.*)?' . "\$");
 
-# Match `-d' as a command-line argument in a string.
-my $DASH_D_PATTERN = "(^|\\s)-d(\\s|\$)";
 # Directories installed during 'install-exec' phase.
 my $EXEC_DIR_PATTERN =
   '^(?:bin|sbin|libexec|sysconf|localstate|lib|pkglib|.*exec.*)' . "\$";
@@ -235,7 +230,7 @@ my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh 
ltcf-gcj.sh);
 my @common_files =
     (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
        COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
-       ansi2knr.1 ansi2knr.c ar-lib compile config.guess config.rpath
+       ar-lib compile config.guess config.rpath
        config.sub depcomp elisp-comp install-sh libversion.in mdate-sh
        missing mkinstalldirs py-compile texinfo.tex ylwrap),
      @libtool_files, @libtool_sometimes);
@@ -273,7 +268,7 @@ my $gen_copyright = "\
 # These constants are returned by the lang_*_rewrite functions.
 # LANG_SUBDIR means that the resulting object file should be in a
 # subdir if the source file is.  In this case the file name cannot
-# have `..' components.
+# have '..' components.
 use constant LANG_IGNORE  => 0;
 use constant LANG_PROCESS => 1;
 use constant LANG_SUBDIR  => 2;
@@ -292,7 +287,6 @@ use constant QUEUE_MESSAGE   => "msg";
 use constant QUEUE_CONF_FILE => "conf file";
 use constant QUEUE_LOCATION  => "location";
 use constant QUEUE_STRING    => "string";
-
 
 ## ---------------------------------- ##
 ## Variables related to the options.  ##
@@ -330,10 +324,6 @@ my @config_headers = ();
 # Names used in AC_CONFIG_LINKS call.
 my @config_links = ();
 
-# Directory where output files go.  Actually, output files are
-# relative to this directory.
-my $output_directory;
-
 # List of Makefile.am's to process, and their corresponding outputs.
 my @input_files = ();
 my %output_files = ();
@@ -353,7 +343,7 @@ my %ac_config_files_condition = ();
 # Directory to search for configure-required files.  This
 # will be computed by &locate_aux_dir and can be set using
 # AC_CONFIG_AUX_DIR in configure.ac.
-# $CONFIG_AUX_DIR is the `raw' directory, valid only in the source-tree.
+# $CONFIG_AUX_DIR is the 'raw' directory, valid only in the source-tree.
 my $config_aux_dir = '';
 my $config_aux_dir_set_in_configure_ac = 0;
 # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
@@ -393,9 +383,6 @@ my $package_version = '';
 # Where version is defined.
 my $package_version_location;
 
-# TRUE if we've seen AM_ENABLE_MULTILIB.
-my $seen_multilib = 0;
-
 # TRUE if we've seen AM_PROG_AR
 my $seen_ar = 0;
 
@@ -412,7 +399,7 @@ my $seen_init_automake = 0;
 my $seen_automake_version = 0;
 
 # Hash table of discovered configure substitutions.  Keys are names,
-# values are `FILE:LINE' strings which are used by error message
+# values are 'FILE:LINE' strings which are used by error message
 # generation.
 my %configure_vars = ();
 
@@ -433,7 +420,7 @@ my %configure_cond = ();
 my %extension_map = ();
 
 # List of the DIST_COMMON files we discovered while reading
-# configure.in
+# configure.ac.
 my $configure_dist_common = '';
 
 # This maps languages names onto objects.
@@ -480,13 +467,11 @@ my %required_targets =
    'install-man' => 1,
   );
 
-# Set to 1 if this run will create the Makefile.in that distributes
-# the files in config_aux_dir.
-my $automake_will_process_aux_dir = 0;
+# Queue to push require_conf_file requirements to.
+my $required_conf_file_queue;
 
 # The name of the Makefile currently being processed.
 my $am_file = 'BUG';
-
 
 ################################################################
 
@@ -544,7 +529,7 @@ my %compile_clean_files;
 # to delete.
 my %libtool_clean_directories;
 
-# Value of `$(SOURCES)', used by tags.am.
+# Value of $(SOURCES), used by tags.am.
 my @sources;
 # Sources which go in the distribution.
 my @dist_sources;
@@ -563,7 +548,7 @@ my %object_compilation_map;
 # This keeps track of the directories for which we've already
 # created dirstamp code.  Keys are directories, values are stamp files.
 # Several keys can share the same stamp files if they are equivalent
-# (as are `.//foo' and `foo').
+# (as are './/foo' and 'foo').
 my %directory_map;
 
 # All .P files.
@@ -577,12 +562,6 @@ my @dist_targets;
 my %known_programs;
 my %known_libraries;
 
-# Keys in this hash are the basenames of files which must depend on
-# ansi2knr.  Values are either the empty string, or the directory in
-# which the ANSI source file appears; the directory must have a
-# trailing `/'.
-my %de_ansi_files;
-
 # This keeps track of which extensions we've seen (that we care
 # about).
 my %extension_seen;
@@ -595,7 +574,7 @@ my %language_scratch;
 # handling on a per-language basis.
 my %lang_specific_files;
 
-# This is set when `handle_dist' has finished.  Once this happens,
+# This is set when 'handle_dist' has finished.  Once this happens,
 # we should no longer push on dist_common.
 my $handle_dist_run;
 
@@ -603,16 +582,15 @@ my $handle_dist_run;
 # under consideration.
 my %linkers_used;
 
-# True if we need `LINK' defined.  This is a hack.
+# True if we need 'LINK' defined.  This is a hack.
 my $need_link;
 
-# Was get_object_extension run?
-# FIXME: This is a hack. a better switch should be found.
-my $get_object_extension_was_run;
+# Does the generated Makefile have to build some compiled object
+# (for binary programs, or plain or libtool libraries)?
+my $must_handle_compiled_objects;
 
 # Record each file processed by make_paragraphs.
 my %transformed_files;
-
 
 ################################################################
 
@@ -690,7 +668,7 @@ sub initialize_per_input ()
     %clean_files = ();
     %compile_clean_files = ();
 
-    # We always include `.'.  This isn't strictly correct.
+    # We always include '.'.  This isn't strictly correct.
     %libtool_clean_directories = ('.' => 1);
 
     @sources = ();
@@ -708,8 +686,6 @@ sub initialize_per_input ()
     %known_programs = ();
     %known_libraries= ();
 
-    %de_ansi_files = ();
-
     %extension_seen = ();
 
     %language_scratch = ();
@@ -720,7 +696,7 @@ sub initialize_per_input ()
 
     $need_link = 0;
 
-    $get_object_extension_was_run = 0;
+    $must_handle_compiled_objects = 0;
 
     %transformed_files = ();
 }
@@ -734,7 +710,6 @@ sub initialize_per_input ()
 register_language ('name' => 'c',
                   'Name' => 'C',
                   'config_vars' => ['CC'],
-                  'ansi' => 1,
                   'autodep' => '',
                   'flags' => ['CFLAGS', 'CPPFLAGS'],
                   'ccer' => 'CC',
@@ -746,8 +721,7 @@ register_language ('name' => 'c',
                   'link' => '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) 
$(LDFLAGS) -o $@',
                   'compile_flag' => '-c',
                   'libtool_tag' => 'CC',
-                  'extensions' => ['.c'],
-                  '_finish' => \&lang_c_finish);
+                  'extensions' => ['.c']);
 
 # C++.
 register_language ('name' => 'cxx',
@@ -904,10 +878,7 @@ register_language ('name' => 'asm',
                   'compiler' => 'CCASCOMPILE',
                   'compile_flag' => '-c',
                   'output_flag' => '-o',
-                  'extensions' => ['.s'],
-
-                  # With assembly we still use the C linker.
-                  '_finish' => \&lang_c_finish);
+                  'extensions' => ['.s']);
 
 # Preprocessed Assembler.
 register_language ('name' => 'cppasm',
@@ -921,10 +892,7 @@ register_language ('name' => 'cppasm',
                   'compiler' => 'CPPASCOMPILE',
                   'compile_flag' => '-c',
                   'output_flag' => '-o',
-                  'extensions' => ['.S', '.sx'],
-
-                  # With assembly we still use the C linker.
-                  '_finish' => \&lang_c_finish);
+                  'extensions' => ['.S', '.sx']);
 
 # Fortran 77
 register_language ('name' => 'f77',
@@ -983,11 +951,11 @@ register_language ('name' => 'ppfc',
 # Preprocessed Fortran 77
 #
 # The current support for preprocessing Fortran 77 just involves
-# passing `$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
-# $(CPPFLAGS)' as additional flags to the Fortran 77 compiler, since
-# this is how GNU Make does it; see the `GNU Make Manual, Edition 0.51
-# for `make' Version 3.76 Beta' (specifically, from info file
-# `(make)Catalogue of Rules').
+# passing "$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
+# $(CPPFLAGS)" as additional flags to the Fortran 77 compiler, since
+# this is how GNU Make does it; see the "GNU Make Manual, Edition 0.51
+# for 'make' Version 3.76 Beta" (specifically, from info file
+# '(make)Catalogue of Rules').
 #
 # A better approach would be to write an Autoconf test
 # (i.e. AC_PROG_FPP) for a Fortran 77 preprocessor, because not all
@@ -1106,11 +1074,11 @@ sub subst ($)
 
 
 # $BACKPATH
-# &backname ($REL-DIR)
+# &backname ($RELDIR)
 # --------------------
-# If I `cd $REL-DIR', then to come back, I should `cd $BACKPATH'.
-# For instance `src/foo' => `../..'.
-# Works with non strictly increasing paths, i.e., `src/../lib' => `..'.
+# If I "cd $RELDIR", then to come back, I should "cd $BACKPATH".
+# For instance 'src/foo' => '../..'.
+# Works with non strictly increasing paths, i.e., 'src/../lib' => '..'.
 sub backname ($)
 {
     my ($file) = @_;
@@ -1121,7 +1089,7 @@ sub backname ($)
        if ($_ eq '..')
        {
            pop @res
-             or prog_error ("trying to reverse path `$file' pointing outside 
tree");
+             or prog_error ("trying to reverse path '$file' pointing outside 
tree");
        }
        else
        {
@@ -1133,11 +1101,11 @@ sub backname ($)
 
 ################################################################
 
-# `silent-rules' mode handling functions.
+# 'silent-rules' mode handling functions.
 
 # verbose_var (NAME)
 # ------------------
-# The public variable stem used to implement `silent-rules'.
+# The public variable stem used to implement 'silent-rules'.
 sub verbose_var ($)
 {
     my ($name) = @_;
@@ -1146,7 +1114,7 @@ sub verbose_var ($)
 
 # verbose_private_var (NAME)
 # --------------------------
-# The naming policy for the private variables for `silent-rules'.
+# The naming policy for the private variables for 'silent-rules'.
 sub verbose_private_var ($)
 {
     my ($name) = @_;
@@ -1155,7 +1123,7 @@ sub verbose_private_var ($)
 
 # define_verbose_var (NAME, VAL)
 # ------------------------------
-# For `silent-rules' mode, setup VAR and dispatcher, to expand to VAL if 
silent.
+# For 'silent-rules' mode, setup VAR and dispatcher, to expand to VAL if 
silent.
 sub define_verbose_var ($$)
 {
     my ($name, $val) = @_;
@@ -1164,9 +1132,9 @@ sub define_verbose_var ($$)
     my $silent_var = $pvar . '_0';
     if (option 'silent-rules')
       {
-       # For typical `make's, `configure' replaces AM_V (inside @@) with $(V)
+       # For typical 'make's, 'configure' replaces AM_V (inside @@) with $(V)
        # and AM_DEFAULT_V (inside @@) with $(AM_DEFAULT_VERBOSITY).
-       # For strict POSIX 2008 `make's, it replaces them with 0 or 1 instead.
+       # For strict POSIX 2008 'make's, it replaces them with 0 or 1 instead.
        # See AM_SILENT_RULES in m4/silent.m4.
        define_variable ($var, '$(' . $pvar . '_@'.'AM_V'.'@)', INTERNAL);
        define_variable ($pvar . '_', '$(' . $pvar . '_@'.'AM_DEFAULT_V'.'@)', 
INTERNAL);
@@ -1199,7 +1167,7 @@ sub verbose_nodep_flag ($)
 
 # silent_flag
 # -----------
-# Contents of %SILENT%: variable to expand to `@' when silent.
+# Contents of %SILENT%: variable to expand to '@' when silent.
 sub silent_flag ()
 {
     return verbose_flag ('at');
@@ -1207,20 +1175,34 @@ sub silent_flag ()
 
 # define_verbose_tagvar (NAME)
 # ----------------------------
-# Engage the needed `silent-rules' machinery for tag NAME.
+# Engage the needed 'silent-rules' machinery for tag NAME.
 sub define_verbose_tagvar ($)
 {
     my ($name) = @_;
     if (option 'silent-rules')
       {
-       define_verbose_var ($name, '@echo "  '. $name . ' ' x (6 - length 
($name)) . '" $@;');
+       define_verbose_var ($name, '@echo "  '. $name . ' ' x (8 - length 
($name)) . '" $@;');
        define_verbose_var ('at', '@');
       }
 }
 
+# define_verbose_texinfo
+# ----------------------
+# Engage the needed 'silent-rules' machinery for assorted texinfo commands.
+sub define_verbose_texinfo ()
+{
+  my @tagvars = ('DVIPS', 'MAKEINFO', 'INFOHTML', 'TEXI2DVI', 'TEXI2PDF');
+  foreach my $tag (@tagvars)
+    {
+      define_verbose_tagvar($tag);
+    }
+  define_verbose_var('texinfo', '-q');
+  define_verbose_var('texidevnull', '> /dev/null');
+}
+
 # define_verbose_libtool
 # ----------------------
-# Engage the needed `silent-rules' machinery for `libtool --silent'.
+# Engage the needed 'silent-rules' machinery for 'libtool --silent'.
 sub define_verbose_libtool ()
 {
     define_verbose_var ('lt', '--silent');
@@ -1240,14 +1222,12 @@ sub handle_options
       if ($var->has_conditional_contents)
        {
          msg_var ('unsupported', $var,
-                  "`AUTOMAKE_OPTIONS' cannot have conditional contents");
-       }
-      foreach my $locvals ($var->value_as_list_recursive (cond_filter => TRUE,
-                                                         location => 1))
-       {
-         my ($loc, $value) = @$locvals;
-         return 1 if (process_option_list ($loc, $value))
+                  "'AUTOMAKE_OPTIONS' cannot have conditional contents");
        }
+      my @options = map { { option => $_->[1], where => $_->[0] } }
+                       $var->value_as_list_recursive (cond_filter => TRUE,
+                                                      location => 1);
+      return 1 if process_option_list (@options);
     }
 
   # Override portability-recursive warning.
@@ -1284,22 +1264,6 @@ sub shadow_unconditionally ($$)
   return "\$($varname)"
 }
 
-# get_object_extension ($EXTENSION)
-# ---------------------------------
-# Prefix $EXTENSION with $U if ansi2knr is in use.
-sub get_object_extension ($)
-{
-    my ($extension) = @_;
-
-    # Check for automatic de-ANSI-fication.
-    $extension = '$U' . $extension
-      if option 'ansi2knr';
-
-    $get_object_extension_was_run = 1;
-
-    return $extension;
-}
-
 # check_user_variables (@LIST)
 # ----------------------------
 # Make sure each variable VAR in @LIST does not exist, suggest using AM_VAR
@@ -1317,9 +1281,9 @@ sub check_user_variables (@)
              if ($var->rdef ($cond)->owner == VAR_MAKEFILE)
                {
                  msg_cond_var ('gnu', $cond, $flag,
-                               "`$flag' is a user variable, "
+                               "'$flag' is a user variable, "
                                . "you should not override it;\n"
-                               . "use `AM_$flag' instead.");
+                               . "use 'AM_$flag' instead");
                }
            }
        }
@@ -1344,7 +1308,7 @@ sub handle_languages
            require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
 
            my @deplist = sort keys %dep_files;
-           # Generate each `include' individually.  Irix 6 make will
+           # Generate each 'include' individually.  Irix 6 make will
            # not properly include several files resulting from a
            # variable expansion; generating many separate includes
            # seems safest.
@@ -1430,24 +1394,24 @@ sub handle_languages
            # This is not used by depend2.am.
            my $der_ext = (&{$lang->output_extensions} ($ext))[0];
 
-           # When we output an inference rule like `.c.o:' we
+           # When we output an inference rule like '.c.o:' we
            # have two cases to consider: either subdir-objects
            # is used, or it is not.
            #
            # In the latter case the rule is used to build objects
            # in the current directory, and dependencies always
-           # go into `./$(DEPDIR)/'.  We can hard-code this value.
+           # go into './$(DEPDIR)/'.  We can hard-code this value.
            #
            # In the former case the rule can be used to build
            # objects in sub-directories too.  Dependencies should
            # go into the appropriate sub-directories, e.g.,
-           # `sub/$(DEPDIR)/'.  The value of this directory
+           # 'sub/$(DEPDIR)/'.  The value of this directory
            # needs to be computed on-the-fly.
            #
            # DEPBASE holds the name of this directory, plus the
            # basename part of the object file (extensions Po, TPo,
            # Plo, TPlo will be added later as appropriate).  It is
-           # either hardcoded, or a shell variable (`$depbase') that
+           # either hardcoded, or a shell variable ('$depbase') that
            # will be computed by the rule.
            my $depbase =
              option ('subdir-objects') ? '$$depbase' : '$(DEPDIR)/$*';
@@ -1491,8 +1455,8 @@ sub handle_languages
 
            my $obj_compile = $lang->compile;
 
-           # Rewrite each occurrence of `AM_$flag' in the compile
-           # rule into `${derived}_$flag' if it exists.
+           # Rewrite each occurrence of 'AM_$flag' in the compile
+           # rule into '${derived}_$flag' if it exists.
            for my $flag (@{$lang->flags})
              {
                my $val = "${derived}_$flag";
@@ -1514,7 +1478,7 @@ sub handle_languages
              "\$(LIBTOOL) $ltverbose $libtool_tag\$($ptltflags) 
\$(LIBTOOLFLAGS) "
              . "--mode=compile $obj_compile";
 
-           # We _need_ `-o' for per object rules.
+           # We _need_ '-o' for per object rules.
            my $output_flag = $lang->output_flag || '-o';
 
            my $depbase = dirname ($obj);
@@ -1524,97 +1488,6 @@ sub handle_languages
                unless $depbase eq '';
            $depbase .= '$(DEPDIR)/' . basename ($obj);
 
-           # Support for deansified files in subdirectories is ugly
-           # enough to deserve an explanation.
-           #
-           # A Note about normal ansi2knr processing first.  On
-           #
-           #   AUTOMAKE_OPTIONS = ansi2knr
-           #   bin_PROGRAMS = foo
-           #   foo_SOURCES = foo.c
-           #
-           # we generate rules similar to:
-           #
-           #   foo: foo$U.o; link ...
-           #   foo$U.o: foo$U.c; compile ...
-           #   foo_.c: foo.c; ansi2knr ...
-           #
-           # this is fairly compact, and will call ansi2knr depending
-           # on the value of $U (`' or `_').
-           #
-           # It's harder with subdir sources. On
-           #
-           #   AUTOMAKE_OPTIONS = ansi2knr
-           #   bin_PROGRAMS = foo
-           #   foo_SOURCES = sub/foo.c
-           #
-           # we have to create foo_.c in the current directory.
-           # (Unless the user asks 'subdir-objects'.)  This is important
-           # in case the same file (`foo.c') is compiled from other
-           # directories with different cpp options: foo_.c would
-           # be preprocessed for only one set of options if it were
-           # put in the subdirectory.
-           #
-           # Because foo$U.o must be built from either foo_.c or
-           # sub/foo.c we can't be as concise as in the first example.
-           # Instead we output
-           #
-           #   foo: foo$U.o; link ...
-           #   foo_.o: foo_.c; compile ...
-           #   foo.o: sub/foo.c; compile ...
-           #   foo_.c: foo.c; ansi2knr ...
-           #
-           # This is why we'll now transform $rule_file twice
-           # if we detect this case.
-           # A first time we output the compile rule with `$U'
-           # replaced by `_' and the source directory removed,
-           # and another time we simply remove `$U'.
-           #
-           # Note that at this point $source (as computed by
-           # &handle_single_transform) is `sub/foo$U.c'.
-           # This can be confusing: it can be used as-is when
-           # subdir-objects is set, otherwise you have to know
-           # it really means `foo_.c' or `sub/foo.c'.
-           my $objdir = dirname ($obj);
-           my $srcdir = dirname ($source);
-           if ($lang->ansi && $obj =~ /\$U/)
-             {
-               prog_error "`$obj' contains \$U, but `$source' doesn't."
-                 if $source !~ /\$U/;
-
-               (my $source_ = $source) =~ s/\$U/_/g;
-               # Output an additional rule if _.c and .c are not in
-               # the same directory.  (_.c is always in $objdir.)
-               if ($objdir ne $srcdir)
-                 {
-                   (my $obj_ = $obj) =~ s/\$U/_/g;
-                   (my $depbase_ = $depbase) =~ s/\$U/_/g;
-                   $source_ = basename ($source_);
-
-                   $output_rules .=
-                     file_contents ($rule_file,
-                                    new Automake::Location,
-                                    %transform,
-                                    GENERIC   => 0,
-
-                                    DEPBASE   => $depbase_,
-                                    BASE      => $obj_,
-                                    SOURCE    => $source_,
-                                    SOURCEFLAG => $sourceflags{$srcext} || '',
-                                    OBJ       => "$obj_$myext",
-                                    OBJOBJ    => "$obj_.obj",
-                                    LTOBJ     => "$obj_.lo",
-
-                                    COMPILE   => $obj_compile,
-                                    LTCOMPILE => $obj_ltcompile,
-                                    -o        => $output_flag,
-                                    %file_transform);
-                   $obj =~ s/\$U//g;
-                   $depbase =~ s/\$U//g;
-                   $source =~ s/\$U//g;
-                 }
-             }
-
            $output_rules .=
              file_contents ($rule_file,
                             new Automake::Location,
@@ -1625,7 +1498,7 @@ sub handle_languages
                             BASE      => $obj,
                             SOURCE    => $source,
                             SOURCEFLAG => $sourceflags{$srcext} || '',
-                            # Use $myext and not `.o' here, in case
+                            # Use $myext and not '.o' here, in case
                             # we are actually building a new source
                             # file -- e.g. via yacc.
                             OBJ       => "$obj$myext",
@@ -1653,7 +1526,7 @@ sub handle_languages
                                        %transform, %lang);
 
        # If the source to a program consists entirely of code from a
-       # `pure' language, for instance C++ or Fortran 77, then we
+       # 'pure' language, for instance C++ or Fortran 77, then we
        # don't need the C compiler code.  However if we run into
        # something unusual then we do generate the C code.  There are
        # probably corner cases here that do not work properly.
@@ -1672,7 +1545,7 @@ sub handle_languages
        # Call the finisher.
        $lang->finish;
 
-       # Flags listed in `->flags' are user variables (per GNU Standards),
+       # Flags listed in '->flags' are user variables (per GNU Standards),
        # they should not be overridden in the Makefile...
        my @dont_override = @{$lang->flags};
        # ... and so is LDFLAGS.
@@ -1694,7 +1567,7 @@ sub handle_languages
        define_linker_variable ($languages{'c'});
       }
 
-    # Always provide the user with `AM_V_GEN' for `silent-rules' mode.
+    # Always provide the user with 'AM_V_GEN' for 'silent-rules' mode.
     define_verbose_tagvar ('GEN');
 }
 
@@ -1754,7 +1627,7 @@ sub check_libobjs_sources
       foreach my $file (@files)
        {
          err_var ($prefix . $one_file . '_SOURCES',
-                  "automatically discovered file `$file' should not" .
+                  "automatically discovered file '$file' should not" .
                   " be explicitly mentioned")
            if defined $libsources{$file};
        }
@@ -1770,7 +1643,7 @@ sub check_libobjs_sources
 #   $VAR is the name of the variable that the source filenames come from
 #   $TOPPARENT is the name of the _SOURCES variable which is being processed
 #   $DERIVED is the name of resulting executable or library
-#   $OBJ is the object extension (e.g., `$U.lo')
+#   $OBJ is the object extension (e.g., '.lo')
 #   $FILE the source file to transform
 #   %TRANSFORM contains extras arguments to pass to file_contents
 #     when producing explicit rules
@@ -1781,8 +1654,6 @@ sub handle_single_transform ($$$$$%)
     my ($var, $topparent, $derived, $obj, $_file, %transform) = @_;
     my @files = ($_file);
     my @result = ();
-    my $nonansi_obj = $obj;
-    $nonansi_obj =~ s/\$U//g;
 
     # Turn sources into objects.  We use a while loop like this
     # because we might add to @files in the loop.
@@ -1794,16 +1665,16 @@ sub handle_single_transform ($$$$$%)
        if (/address@hidden@$/)
        {
          my $parent_msg = '';
-         $parent_msg = "\nand is referred to from `$topparent'"
+         $parent_msg = "\nand is referred to from '$topparent'"
            if $topparent ne $var->name;
          err_var ($var,
-                  "`" . $var->name . "' includes configure substitution `$_'"
+                  "'" . $var->name . "' includes configure substitution '$_'"
                   . $parent_msg . ";\nconfigure " .
                   "substitutions are not allowed in _SOURCES variables");
          next;
        }
 
-       # If the source file is in a subdirectory then the `.o' is put
+       # If the source file is in a subdirectory then the '.o' is put
        # into the current directory, unless the subdir-objects option
        # is in effect.
 
@@ -1822,14 +1693,14 @@ sub handle_single_transform ($$$$$%)
        # yacc output).
        my $derived_source = 0;
 
-       # This holds the `aggregate context' of the file we are
+       # This holds the 'aggregate context' of the file we are
        # currently examining.  If the file is compiled with
        # per-object flags, then it will be the name of the object.
-       # Otherwise it will be `AM'.  This is used by the target hook
+       # Otherwise it will be 'AM'.  This is used by the target hook
        # language function.
        my $aggregate = 'AM';
 
-       $extension = &derive_suffix ($extension, $nonansi_obj);
+       $extension = &derive_suffix ($extension, $obj);
        my $lang;
        if ($extension_map{$extension} &&
            ($lang = $languages{$extension_map{$extension}}))
@@ -1840,7 +1711,7 @@ sub handle_single_transform ($$$$$%)
            # Do we have per-executable flags for this executable?
            my $have_per_exec_flags = 0;
            my @peflags = @{$lang->flags};
-           push @peflags, 'LIBTOOLFLAGS' if $nonansi_obj eq '.lo';
+           push @peflags, 'LIBTOOLFLAGS' if $obj eq '.lo';
            foreach my $flag (@peflags)
              {
                if (set_seen ("${derived}_$flag"))
@@ -1860,7 +1731,7 @@ sub handle_single_transform ($$$$$%)
            my $subr = \&{'lang_' . $lang->name . '_rewrite'};
            my ($r, $source_extension)
                = &$subr ($directory, $base, $extension,
-                         $nonansi_obj, $have_per_exec_flags, $var);
+                         $obj, $have_per_exec_flags, $var);
            # Skip this entry if we were asked not to process it.
            next if $r == LANG_IGNORE;
 
@@ -1873,13 +1744,9 @@ sub handle_single_transform ($$$$$%)
                $this_obj_ext = $source_extension;
                $derived_source = 1;
            }
-           elsif ($lang->ansi)
-           {
-               $this_obj_ext = $obj;
-           }
            else
            {
-               $this_obj_ext = $nonansi_obj;
+               $this_obj_ext = $obj;
            }
            $object = $base . $this_obj_ext;
 
@@ -1889,7 +1756,7 @@ sub handle_single_transform ($$$$$%)
                # object.  In this case we rewrite the object's
                # name to ensure it is unique.
 
-               # We choose the name `DERIVED_OBJECT' to ensure
+               # We choose the name 'DERIVED_OBJECT' to ensure
                # (1) uniqueness, and (2) continuity between
                # invocations.  However, this will result in a
                # name that is too long for losing systems, in
@@ -1968,12 +1835,6 @@ sub handle_single_transform ($$$$$%)
                        $full_ansi = $base . $extension;
                  }
 
-               if ($lang->ansi && option 'ansi2knr')
-                 {
-                   $full_ansi =~ s/$KNOWN_EXTENSIONS_PATTERN$/\$U$&/;
-                   $obj_sans_ext .= '$U';
-                 }
-
                my @specifics = ($full_ansi, $obj_sans_ext,
                                 # Only use $this_obj_ext in the derived
                                 # source case because in the other case we
@@ -1998,14 +1859,14 @@ sub handle_single_transform ($$$$$%)
                # Each item on this list is a reference to a list consisting
                # of four values followed by additional transform flags for
                # file_contents.  The four values are the derived flag prefix
-               # (e.g. for `foo_CFLAGS', it is `foo'), the name of the
+               # (e.g. for 'foo_CFLAGS', it is 'foo'), the name of the
                # source file, the base name of the output file, and
                # the extension for the object file.
                push (@{$lang_specific_files{$lang->name}},
                      address@hidden, %transform]);
            }
        }
-       elsif ($extension eq $nonansi_obj)
+       elsif ($extension eq $obj)
        {
            # This is probably the result of a direct suffix rule.
            # In this case we just accept the rewrite.
@@ -2024,7 +1885,7 @@ sub handle_single_transform ($$$$$%)
            next;
        }
 
-       err_am "object `$object' created by `$full' and `$object_map{$object}'"
+       err_am "object '$object' created by '$full' and '$object_map{$object}'"
          if (defined $object_map{$object}
              && $object_map{$object} ne $full);
 
@@ -2038,7 +1899,7 @@ sub handle_single_transform ($$$$$%)
                != (COMPILE_LIBTOOL | COMPILE_ORDINARY))
            && $object_compilation_map{$comp_obj} != $comp_val)
          {
-           err_am "object `$comp_obj' created both with libtool and without";
+           err_am "object '$comp_obj' created both with libtool and without";
          }
        $object_compilation_map{$comp_obj} |= $comp_val;
 
@@ -2079,13 +1940,13 @@ sub handle_single_transform ($$$$$%)
                # project
 
                # For Java, the way we're handling it right now, a
-               # `..' component doesn't make sense.
+               # '..' component doesn't make sense.
                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
                  {
-                   err_am "`$full' should not contain a `..' component";
+                   err_am "'$full' should not contain a '..' component";
                  }
 
-               # Make sure object is removed by `make mostlyclean'.
+               # Make sure object is removed by 'make mostlyclean'.
                $compile_clean_files{$object} = MOSTLY_CLEAN;
                # If we have a libtool object then we also must remove
                # the ordinary .o.
@@ -2151,7 +2012,7 @@ sub handle_single_transform ($$$$$%)
 #   $NODEFINE is a boolean: if true, $OBJVAR will not be defined (but
 #     work done to determine the linker will be).
 #   $ONE_FILE is the canonical (transformed) name of object to build
-#   $OBJ is the object extension (i.e. either `.o' or `.lo').
+#   $OBJ is the object extension (i.e. either '.o' or '.lo').
 #   $TOPPARENT is the _SOURCES variable being processed.
 #   $WHERE context into which this definition is done
 #   %TRANSFORM extra arguments to pass to file_contents when producing
@@ -2188,11 +2049,11 @@ sub define_objects_from_sources ($$$$$$$%)
 # Arguments are:
 #   canonical (transformed) name of target to build
 #   actual target of object to build
-#   object extension (i.e., either `.o' or `$o')
+#   object extension (i.e., either '.o' or '$o')
 #   location of the source variable
 #   extra arguments to pass to file_contents when producing rules
 # Return the name of the linker variable that must be used.
-# Empty return means just use `LINK'.
+# Empty return means just use 'LINK'.
 sub handle_source_transform ($$$$%)
 {
     # one_file is canonical name.  unxformed is given name.  obj is
@@ -2263,8 +2124,8 @@ sub handle_source_transform ($$$$%)
            my $loc = $where->clone;
            $loc->pop_context;
            msg ('obsolete', $loc,
-                "the default source for `$unxformed' has been changed "
-                . "to `$default_source'.\n(Using `$old_default_source' for "
+                "the default source for '$unxformed' has been changed "
+                . "to '$default_source'.\n(Using '$old_default_source' for "
                 . "backward compatibility.)");
            $default_source = $old_default_source;
          }
@@ -2296,7 +2157,7 @@ sub handle_source_transform ($$$$%)
        define_pretty_variable ($one_file . '_OBJECTS', TRUE, $where, @keys);
     }
 
-    # If we want to use `LINK' we must make sure it is defined.
+    # If we want to use 'LINK' we must make sure it is defined.
     if ($linker eq '')
     {
        $need_link = 1;
@@ -2319,9 +2180,9 @@ sub handle_lib_objects
   my ($xname, $varname) = @_;
 
   my $var = var ($varname);
-  prog_error "handle_lib_objects: `$varname' undefined"
+  prog_error "'$varname' undefined"
     unless $var;
-  prog_error "handle_lib_objects: unexpected variable name `$varname'"
+  prog_error "unexpected variable name '$varname'"
     unless $varname =~ /^(.*)(?:LIB|LD)ADD$/;
   my $prefix = $1 || 'AM_';
 
@@ -2353,8 +2214,8 @@ sub handle_lib_objects
               $flagvar = 1;
               # FIXME: should display a stack of nested variables
               # as context when $var != $subvar.
-              err_var ($var, "linker flags such as `$val' belong in "
-                       . "`${prefix}LDFLAGS");
+              err_var ($var, "linker flags such as '$val' belong in "
+                       . "'${prefix}LDFLAGS'");
             }
           return ();
         }
@@ -2401,7 +2262,7 @@ sub handle_LIBOBJS_or_ALLOCA ($)
   # If LIBOBJS files must be built in another directory we have
   # to define LIBOBJDIR and ensure the files get cleaned.
   # Otherwise LIBOBJDIR can be left undefined, and the cleaning
-  # is achieved by `rm -f *.$(OBJEXT)' in compile.am.
+  # is achieved by 'rm -f *.$(OBJEXT)' in compile.am.
   if ($config_libobj_dir
       && $relative_dir ne $config_libobj_dir)
     {
@@ -2421,8 +2282,8 @@ sub handle_LIBOBJS_or_ALLOCA ($)
        }
       else
        {
-         error ("`\$($var)' cannot be used outside `$config_libobj_dir' if"
-                . " `subdir-objects' is not set");
+         error ("'\$($var)' cannot be used outside '$config_libobj_dir' if"
+                . " 'subdir-objects' is not set");
        }
     }
 
@@ -2501,7 +2362,7 @@ sub check_canonical_spelling
     {
       foreach my $xt (@suffixes)
        {
-         reject_var ("$name$xt", "use `$xname$xt', not `$name$xt'");
+         reject_var ("$name$xt", "use '$xname$xt', not '$name$xt'");
        }
     }
 
@@ -2514,8 +2375,7 @@ sub check_canonical_spelling
 # Set up the compile suite.
 sub handle_compile ()
 {
-    return
-      unless $get_object_extension_was_run;
+   return if ! $must_handle_compiled_objects;
 
     # Boilerplate.
     my $default_includes = '';
@@ -2531,11 +2391,11 @@ sub handle_compile ()
                push @incs, '-I' . dirname ($hdr);
              }
          }
-       # We want `-I. -I$(srcdir)', but the latter -I is redundant
+       # We want '-I. -I$(srcdir)', but the latter -I is redundant
        # and unaesthetic in non-VPATH builds.  We use address@hidden@`
        # instead.  It will be replaced by '-I.' or '-I. -I$(srcdir)'.
        # Items in CONFIG_HEADER are never in $(srcdir) so it is safe
-       # to just put @am__isrc@ right after `-I.', without a space.
+       # to just put @am__isrc@ right after '-I.', without a space.
        ($default_includes = ' ' . uniq (@incs)) =~ s/ @/@/;
       }
 
@@ -2564,38 +2424,6 @@ sub handle_compile ()
                                'DISTRMS' => join ("\n", @dist_rms)));
     $output_vars .= $vars;
     $output_rules .= "$coms$rules";
-
-    # Check for automatic de-ANSI-fication.
-    if (option 'ansi2knr')
-      {
-       my ($ansi2knr_filename, $ansi2knr_where) = @{option 'ansi2knr'};
-       my $ansi2knr_dir = '';
-
-       require_variables ($ansi2knr_where, "option `ansi2knr' is used",
-                          TRUE, "ANSI2KNR", "U");
-
-       # topdir is where ansi2knr should be.
-       if ($ansi2knr_filename eq 'ansi2knr')
-         {
-           # Only require ansi2knr files if they should appear in
-           # this directory.
-           require_file ($ansi2knr_where, FOREIGN,
-                         'ansi2knr.c', 'ansi2knr.1');
-
-           # ansi2knr needs to be built before subdirs, so unshift it
-           # rather then pushing it.
-           unshift (@all, '$(ANSI2KNR)');
-         }
-       else
-         {
-           $ansi2knr_dir = dirname ($ansi2knr_filename);
-         }
-
-       $output_rules .= &file_contents ('ansi2knr',
-                                        new Automake::Location,
-                                        'ANSI2KNR-DIR' => $ansi2knr_dir);
-
-    }
 }
 
 # handle_libtool ()
@@ -2636,6 +2464,7 @@ sub handle_programs
                                  'bin', 'sbin', 'libexec', 'pkglibexec',
                                  'noinst', 'check');
   return if ! @proglist;
+  $must_handle_compiled_objects = 1;
 
   my $seen_global_libobjs =
     var ('LDADD') && &handle_lib_objects ('', 'LDADD');
@@ -2645,7 +2474,7 @@ sub handle_programs
       my ($where, $one_file) = @$pair;
 
       my $seen_libobjs = 0;
-      my $obj = get_object_extension '.$(OBJEXT)';
+      my $obj = '.$(OBJEXT)';
 
       $known_programs{$one_file} = $where;
 
@@ -2654,7 +2483,7 @@ sub handle_programs
                                             '_SOURCES', '_OBJECTS',
                                             '_DEPENDENCIES');
 
-      $where->push_context ("while processing program `$one_file'");
+      $where->push_context ("while processing program '$one_file'");
       $where->set (INTERNAL->get);
 
       my $linker = &handle_source_transform ($xname, $one_file, $obj, $where,
@@ -2678,7 +2507,7 @@ sub handle_programs
        }
 
       reject_var ($xname . '_LIBADD',
-                 "use `${xname}_LDADD', not `${xname}_LIBADD'");
+                 "use '${xname}_LDADD', not '${xname}_LIBADD'");
 
       set_seen ($xname . '_DEPENDENCIES');
       set_seen ('EXTRA_' . $xname . '_DEPENDENCIES');
@@ -2726,6 +2555,7 @@ sub handle_libraries
   my @liblist = &am_install_var ('libs', 'LIBRARIES',
                                 'lib', 'pkglib', 'noinst', 'check');
   return if ! @liblist;
+  $must_handle_compiled_objects = 1;
 
   my @prefix = am_primary_prefixes ('LIBRARIES', 0, 'lib', 'pkglib',
                                    'noinst', 'check');
@@ -2753,16 +2583,16 @@ sub handle_libraries
          my $suggestion = dirname ($onelib) . "/$bn";
          $suggestion =~ s|^\./||g;
          msg ('error-gnu/warn', $where,
-              "`$onelib' is not a standard library name\n"
-              . "did you mean `$suggestion'?")
+              "'$onelib' is not a standard library name\n"
+              . "did you mean '$suggestion'?")
        }
 
       ($known_libraries{$onelib} = $bn) =~ s/\.a$//;
 
-      $where->push_context ("while processing library `$onelib'");
+      $where->push_context ("while processing library '$onelib'");
       $where->set (INTERNAL->get);
 
-      my $obj = get_object_extension '.$(OBJEXT)';
+      my $obj = '.$(OBJEXT)';
 
       # Canonicalize names and check for misspellings.
       my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_SOURCES',
@@ -2789,7 +2619,7 @@ sub handle_libraries
        }
 
       reject_var ($xlib . '_LDADD',
-                 "use `${xlib}_LIBADD', not `${xlib}_LDADD'");
+                 "use '${xlib}_LIBADD', not '${xlib}_LDADD'");
 
       # Make sure we at look at this.
       set_seen ($xlib . '_DEPENDENCIES');
@@ -2823,8 +2653,8 @@ sub handle_libraries
       if (! $seen_ar)
        {
          msg ('extra-portability', $where,
-              "`$onelib': linking libraries using a non-POSIX\n"
-              . "archiver requires `AM_PROG_AR' in `$configure_ac'")
+              "'$onelib': linking libraries using a non-POSIX\n"
+              . "archiver requires 'AM_PROG_AR' in '$configure_ac'")
        }
     }
 }
@@ -2838,6 +2668,7 @@ sub handle_ltlibraries
   my @liblist = &am_install_var ('ltlib', 'LTLIBRARIES',
                                 'noinst', 'lib', 'pkglib', 'check');
   return if ! @liblist;
+  $must_handle_compiled_objects = 1;
 
   my @prefix = am_primary_prefixes ('LTLIBRARIES', 0, 'lib', 'pkglib',
                                    'noinst', 'check');
@@ -2867,7 +2698,7 @@ sub handle_ltlibraries
 
       # We reject libraries which are installed in several places
       # in the same condition, because we can only specify one
-      # `-rpath' option.
+      # '-rpath' option.
       $var->traverse_recursively
        (sub
         {
@@ -2887,26 +2718,26 @@ sub handle_ltlibraries
               if ($msg)
                 {
                   error ($where, $msg, partial => 1);
-                  my $dirtxt = "installed " . ($strip_subdir ? "in" : "below") 
. " `$dir'";
-                  $dirtxt = "built for `$dir'"
+                  my $dirtxt = "installed " . ($strip_subdir ? "in" : "below") 
. " '$dir'";
+                  $dirtxt = "built for '$dir'"
                     if $dir eq 'EXTRA' || $dir eq 'noinst' || $dir eq 'check';
                   my $dircond =
                     $full_cond->true ? "" : " in condition $hcond";
 
-                  error ($where, "`$val' should be $dirtxt$dircond ...",
+                  error ($where, "'$val' should be $dirtxt$dircond ...",
                          partial => 1);
 
                   my $hacond = $acond->human;
                   my $adir = $instdirs{$val}{$acond};
-                  my $adirtxt = "installed in `$adir'";
-                  $adirtxt = "built for `$adir'"
+                  my $adirtxt = "installed in '$adir'";
+                  $adirtxt = "built for '$adir'"
                     if ($adir eq 'EXTRA' || $adir eq 'noinst'
                         || $adir eq 'check');
                   my $adircond = $acond->true ? "" : " in condition $hacond";
 
                   my $onlyone = ($dir ne $adir) ?
                     ("\nLibtool libraries can be built for only one "
-                     . "destination.") : "";
+                     . "destination") : "";
 
                   error ($liblocations{$val}{$acond},
                          "... and should also be $adirtxt$adircond.$onlyone");
@@ -2934,7 +2765,7 @@ sub handle_ltlibraries
       my ($where, $onelib) = @$pair;
 
       my $seen_libobjs = 0;
-      my $obj = get_object_extension '.lo';
+      my $obj = '.lo';
 
       # Canonicalize names and check for misspellings.
       my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_LDFLAGS',
@@ -2968,13 +2799,13 @@ sub handle_ltlibraries
          my $suggestion = dirname ($onelib) . "/$bn";
          $suggestion =~ s|^\./||g;
          msg ('error-gnu/warn', $where,
-              "`$onelib' is not a standard libtool $type name\n"
-              . "did you mean `$suggestion'?")
+              "'$onelib' is not a standard libtool $type name\n"
+              . "did you mean '$suggestion'?")
        }
 
       ($known_libraries{$onelib} = $bn) =~ s/\.la$//;
 
-      $where->push_context ("while processing Libtool library `$onelib'");
+      $where->push_context ("while processing Libtool library '$onelib'");
       $where->set (INTERNAL->get);
 
       # Make sure we look at these.
@@ -2997,7 +2828,7 @@ sub handle_ltlibraries
        }
 
       reject_var ("${xlib}_LDADD",
-                 "use `${xlib}_LIBADD', not `${xlib}_LDADD'");
+                 "use '${xlib}_LIBADD', not '${xlib}_LDADD'");
 
 
       my $linker = &handle_source_transform ($xlib, $onelib, $obj, $where,
@@ -3068,8 +2899,8 @@ sub handle_ltlibraries
       if (! $seen_ar)
        {
          msg ('extra-portability', $where,
-              "`$onelib': linking libtool libraries using a non-POSIX\n"
-              . "archiver requires `AM_PROG_AR' in `$configure_ac'")
+              "'$onelib': linking libtool libraries using a non-POSIX\n"
+              . "archiver requires 'AM_PROG_AR' in '$configure_ac'")
        }
     }
 }
@@ -3090,9 +2921,9 @@ sub check_typos ()
 
          for my $cond ($var->conditions->conds)
            {
-             $varname =~ /^(?:nobase_)?(?:dist_|nodist_)?(.*)_[[:alnum:]]+$/;
-             msg_var ('syntax', $var, "variable `$varname' is defined but no"
-                      . " program or\nlibrary has `$1' as canonical name"
+             $varname =~ 
/^(?:EXTRA_)?(?:nobase_)?(?:dist_|nodist_)?(.*)_[[:alnum:]]+$/;
+             msg_var ('syntax', $var, "variable '$varname' is defined but no"
+                      . " program or\nlibrary has '$1' as canonical name"
                       . " (possible typo)")
                unless $var->rdef ($cond)->seen;
            }
@@ -3165,7 +2996,7 @@ sub scan_texinfo_file ($)
          if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info')
            {
              error ("$filename:$.",
-                    "output `$outfile' has unrecognized extension");
+                    "output '$outfile' has unrecognized extension");
              return;
            }
        }
@@ -3196,7 +3027,7 @@ sub scan_texinfo_file ($)
 
   if (! $outfile)
     {
-      err_am "`$filename' missing address@hidden";
+      err_am "'$filename' missing address@hidden";
       return;
     }
 
@@ -3218,7 +3049,7 @@ sub output_texinfo_build_rules ($$$@)
 {
   my ($source, $dest, $insrc, @deps) = @_;
 
-  # Split `a.texi' into `a' and `.texi'.
+  # Split 'a.texi' into 'a' and '.texi'.
   my ($spfx, $ssfx) = ($source =~ /^(.*?)(\.[^.]*)?$/);
   my ($dpfx, $dsfx) = ($dest =~ /^(.*?)(\.[^.]*)?$/);
 
@@ -3279,6 +3110,9 @@ sub output_texinfo_build_rules ($$$@)
 
   $output_rules .= file_contents ('texibuild',
                                  new Automake::Location,
+                                  AM_V_MAKEINFO    => verbose_flag('MAKEINFO'),
+                                  AM_V_TEXI2DVI    => verbose_flag('TEXI2DVI'),
+                                  AM_V_TEXI2PDF    => verbose_flag('TEXI2PDF'),
                                  DEPS             => "@deps",
                                  DEST_PREFIX      => $dpfx,
                                  DEST_INFO_PREFIX => $dipfx,
@@ -3288,12 +3122,15 @@ sub output_texinfo_build_rules ($$$@)
                                  GENERIC_INFO     => $generic_info,
                                  INSRC            => $insrc,
                                  MAKEINFOFLAGS    => $makeinfoflags,
+                                  SILENT           => silent_flag(),
                                  SOURCE           => ($generic
                                                       ? '$<' : $source),
                                  SOURCE_INFO      => ($generic_info
                                                       ? '$<' : $source),
                                  SOURCE_REAL      => $source,
                                  SOURCE_SUFFIX    => $ssfx,
+                                  TEXIQUIET        => verbose_flag('texinfo'),
+                                  TEXIDEVNULL      => 
verbose_flag('texidevnull'),
                                  );
   return ($dirstamp, "$dpfx.dvi", "$dpfx.pdf", "$dpfx.ps", "$dpfx.html");
 }
@@ -3329,7 +3166,7 @@ sub handle_texinfo_helper ($)
       if ($infobase eq $texi)
        {
          # FIXME: report line number.
-         err_am "texinfo file `$texi' has unrecognized extension";
+         err_am "texinfo file '$texi' has unrecognized extension";
          next;
        }
 
@@ -3412,7 +3249,7 @@ sub handle_texinfo_helper ($)
       #       make would not rebuild it in the build tree.
       #   (2) having two copies of .info files, one in the source tree
       #       and one (newer) in the build tree is not a problem
-      #       because `make dist' always pick files in the build tree
+      #       because 'make dist' always pick files in the build tree
       #       first.
       # However it turned out the be a bad idea for several reasons:
       #   * Tru64, OpenBSD, and FreeBSD (not NetBSD) Make do not behave
@@ -3432,7 +3269,7 @@ sub handle_texinfo_helper ($)
       #     build tree can be annoying during development because
       #     - if the files is kept under CVS, you really want it
       #       to be updated in the source tree
-      #     - it is confusing that `make distclean' does not erase
+      #     - it is confusing that 'make distclean' does not erase
       #       all files in the build tree.
       #
       # Consequently, starting with Automake 1.8, .info files are
@@ -3475,8 +3312,8 @@ sub handle_texinfo_helper ($)
       # If a vers*.texi file is needed, emit the rule.
       if ($vtexi)
        {
-         err_am ("`$vtexi', included in `$texi', "
-                 . "also included in `$versions{$vtexi}'")
+         err_am ("'$vtexi', included in '$texi', "
+                 . "also included in '$versions{$vtexi}'")
            if defined $versions{$vtexi};
          $versions{$vtexi} = $texi;
 
@@ -3594,7 +3431,7 @@ sub handle_texinfo_helper ($)
 # Handle all Texinfo source.
 sub handle_texinfo ()
 {
-  reject_var 'TEXINFOS', "`TEXINFOS' is an anachronism; use `info_TEXINFOS'";
+  reject_var 'TEXINFOS', "'TEXINFOS' is an anachronism; use 'info_TEXINFOS'";
   # FIXME: I think this is an obsolete future feature name.
   reject_var 'html_TEXINFOS', "HTML generation not yet supported";
 
@@ -3602,6 +3439,7 @@ sub handle_texinfo ()
   my ($mostlyclean, $clean, $maintclean) = ('', '', '');
   if ($info_texinfos)
     {
+      define_verbose_texinfo;
       ($mostlyclean, $clean, $maintclean) = handle_texinfo_helper 
($info_texinfos);
       chomp $mostlyclean;
       chomp $clean;
@@ -3610,17 +3448,19 @@ sub handle_texinfo ()
 
   $output_rules .=  file_contents ('texinfos',
                                   new Automake::Location,
+                                   AM_V_DVIPS    => verbose_flag('DVIPS'),
                                   MOSTLYCLEAN   => $mostlyclean,
                                   TEXICLEAN     => $clean,
                                   MAINTCLEAN    => $maintclean,
-                                  'LOCAL-TEXIS' => !!$info_texinfos);
+                                  'LOCAL-TEXIS' => !!$info_texinfos,
+                                   TEXIQUIET     => verbose_flag('texinfo'));
 }
 
 
 # Handle any man pages.
 sub handle_man_pages
 {
-  reject_var 'MANS', "`MANS' is an anachronism; use `man_MANS'";
+  reject_var 'MANS', "'MANS' is an anachronism; use 'man_MANS'";
 
   # Find all the sections in use.  We do this by first looking for
   # "standard" sections, and then looking for any additional
@@ -3663,7 +3503,7 @@ sub handle_man_pages
            {
              foreach ($var->value_as_list_recursive)
                {
-                 # A page like `foo.1c' goes into man1dir.
+                 # A page like 'foo.1c' goes into man1dir.
                  if (/\.([0-9a-z])([a-z]*)$/)
                    {
                      $sections{$1} = 1;
@@ -3770,10 +3610,11 @@ sub handle_tags
 {
     my @tag_deps = ();
     my @ctag_deps = ();
+    my @cscope_deps = ();
     if (var ('SUBDIRS'))
     {
        $output_rules .= ("tags-recursive:\n"
-                         . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do 
\\\n"
+                         . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do 
\\\n"
                          # Never fail here if a subdir fails; it
                          # isn't important.
                          . "\t  test \"\$\$subdir\" = . || (\$(am__cd) 
\$\$subdir"
@@ -3784,7 +3625,7 @@ sub handle_tags
        &depend ('.MAKE', 'tags-recursive');
 
        $output_rules .= ("ctags-recursive:\n"
-                         . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do 
\\\n"
+                         . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do 
\\\n"
                          # Never fail here if a subdir fails; it
                          # isn't important.
                          . "\t  test \"\$\$subdir\" = . || (\$(am__cd) 
\$\$subdir"
@@ -3793,6 +3634,17 @@ sub handle_tags
        push (@ctag_deps, 'ctags-recursive');
        &depend ('.PHONY', 'ctags-recursive');
        &depend ('.MAKE', 'ctags-recursive');
+
+       $output_rules .= ("cscopelist-recursive:\n"
+                         . "\tlist='\$(SUBDIRS)'; for subdir in \$\$list; do 
\\\n"
+                         # Never fail here if a subdir fails; it
+                         # isn't important.
+                         . "\t  test \"\$\$subdir\" = . || (\$(am__cd) 
\$\$subdir"
+                         . " && \$(MAKE) \$(AM_MAKEFLAGS) cscopelist); \\\n"
+                         . "\tdone\n");
+       push (@cscope_deps, 'cscopelist-recursive');
+       &depend ('.PHONY', 'cscopelist-recursive');
+       &depend ('.MAKE', 'cscopelist-recursive');
     }
 
     if (&saw_sources_p (1)
@@ -3815,13 +3667,14 @@ sub handle_tags
                                         new Automake::Location,
                                         CONFIG    => "@config",
                                         TAGSDIRS  => "@tag_deps",
-                                        CTAGSDIRS => "@ctag_deps");
+                                        CTAGSDIRS => "@ctag_deps",
+                                        CSCOPEDIRS => "@cscope_deps");
 
        set_seen 'TAGS_DEPENDENCIES';
     }
     elsif (reject_var ('TAGS_DEPENDENCIES',
-                      "doesn't make sense to define `TAGS_DEPENDENCIES'"
-                      . "without\nsources or `ETAGS_ARGS'"))
+                      "it doesn't make sense to define 'TAGS_DEPENDENCIES'"
+                      . " without\nsources or 'ETAGS_ARGS'"))
     {
     }
     else
@@ -3830,18 +3683,9 @@ sub handle_tags
        # Otherwise, it would be possible for a top-level "make TAGS"
        # to fail because some subdirectory failed.
        $output_rules .= "tags: TAGS\nTAGS:\n\n";
-       # Ditto ctags.
+       # Ditto ctags and cscope.
        $output_rules .= "ctags: CTAGS\nCTAGS:\n\n";
-    }
-}
-
-# Handle multilib support.
-sub handle_multilib
-{
-  if ($seen_multilib && $relative_dir eq '.')
-    {
-      $output_rules .= &file_contents ('multilib', new Automake::Location);
-      push (@all, 'all-multi');
+       $output_rules .= "cscope cscopelist:\n\n";
     }
 }
 
@@ -3900,7 +3744,7 @@ sub handle_dist ()
   my %transform;
 
   # Define DIST_SUBDIRS.  This must always be done, regardless of the
-  # no-dist setting: target like `distclean' or `maintainer-clean' use it.
+  # no-dist setting: target like 'distclean' or 'maintainer-clean' use it.
   my $subdirs = var ('SUBDIRS');
   if ($subdirs)
     {
@@ -3926,7 +3770,7 @@ sub handle_dist ()
        }
       else
        {
-         # We always define this because that is what `distclean'
+         # We always define this because that is what 'distclean'
          # wants.
          define_pretty_variable ('DIST_SUBDIRS', TRUE, INTERNAL,
                                  '$(SUBDIRS)');
@@ -3943,7 +3787,7 @@ sub handle_dist ()
       $archive_defined ||=
        grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz);
       error (option 'no-dist-gzip',
-            "no-dist-gzip specified but no dist-* specified, "
+            "no-dist-gzip specified but no dist-* specified,\n"
             . "at least one archive format must be enabled")
        unless $archive_defined;
     }
@@ -3969,7 +3813,7 @@ sub handle_dist ()
          &push_dist_common ($cfile);
        }
 
-      # Don't use `elsif' here because a file might meaningfully
+      # Don't use 'elsif' here because a file might meaningfully
       # appear in both directories.
       if ($check_aux && dir_has_case_matching_file ($config_aux_dir, $cfile))
        {
@@ -3981,18 +3825,25 @@ sub handle_dist ()
   # %dist_common if we think we need to.  If the file appears in our
   # directory, we would have discovered it already, so we don't
   # check that.  But if the file is in a subdir without a Makefile,
-  # we want to distribute it here if we are doing `.'.  Ugly!
+  # we want to distribute it here if we are doing '.'.  Ugly!
+  # Also, in some corner cases, it's possible that the following code
+  # will cause the same file to appear in the $(DIST_COMMON) variables
+  # of two distinct Makefiles; but this is not a problem, since the
+  # 'distdir' target in 'lib/am/distdir.am' can deal with the same
+  # file being distributed multiple times.
+  # See also automake bug#9651.
   if ($relative_dir eq '.')
     {
       foreach my $file (split (' ' , $configure_dist_common))
        {
+         my $dir = dirname ($file);
          push_dist_common ($file)
-           unless is_make_dir (dirname ($file));
+           if ($dir eq '.' || ! is_make_dir ($dir));
        }
     }
 
   # Files to distributed.  Don't use ->value_as_list_recursive
-  # as it recursively expands `$(dist_pkgdata_DATA)' etc.
+  # as it recursively expands '$(dist_pkgdata_DATA)' etc.
   my @dist_common = split (' ', rvar ('DIST_COMMON')->variable_value);
   @dist_common = uniq (sort for_dist_common (@dist_common));
   variable_delete 'DIST_COMMON';
@@ -4011,7 +3862,7 @@ sub handle_dist ()
   $transform{'DISTCHECK-HOOK'} = !! rule 'distcheck-hook';
   $transform{'GETTEXT'} = $seen_gettext && !$seen_gettext_external;
 
-  # If the target `dist-hook' exists, make sure it is run.  This
+  # If the target 'dist-hook' exists, make sure it is run.  This
   # allows users to do random weird things to the distribution
   # before it is packaged up.
   push (@dist_targets, 'dist-hook')
@@ -4028,19 +3879,20 @@ sub handle_dist ()
 }
 
 
-# check_directory ($NAME, $WHERE)
-# -------------------------------
-# Ensure $NAME is a directory, and that it uses a sane name.
-# Use $WHERE as a location in the diagnostic, if any.
-sub check_directory ($$)
+# check_directory ($NAME, $WHERE [, $RELATIVE_DIR = "."])
+# -------------------------------------------------------
+# Ensure $NAME is a directory (in $RELATIVE_DIR), and that it uses a sane
+# name.  Use $WHERE as a location in the diagnostic, if any.
+sub check_directory ($$;$)
 {
-  my ($dir, $where) = @_;
+  my ($dir, $where, $reldir) = @_;
+  $reldir = '.' unless defined $reldir;
 
-  error $where, "required directory $relative_dir/$dir does not exist"
-    unless -d "$relative_dir/$dir";
+  error $where, "required directory $reldir/$dir does not exist"
+    unless -d "$reldir/$dir";
 
-  # If an `obj/' directory exists, BSD make will enter it before
-  # reading `Makefile'.  Hence the `Makefile' in the current directory
+  # If an 'obj/' directory exists, BSD make will enter it before
+  # reading 'Makefile'.  Hence the 'Makefile' in the current directory
   # will not be read.
   #
   #  % cat Makefile
@@ -4056,13 +3908,13 @@ sub check_directory ($$)
   #  echo World
   #  World
   msg ('portability', $where,
-       "naming a subdirectory `obj' causes troubles with BSD make")
+       "naming a subdirectory 'obj' causes troubles with BSD make")
     if $dir eq 'obj';
 
-  # `aux' is probably the most important of the following forbidden name,
+  # 'aux' is probably the most important of the following forbidden name,
   # since it's tempting to use it as an AC_CONFIG_AUX_DIR.
   msg ('portability', $where,
-       "name `$dir' is reserved on W32 and DOS platforms")
+       "name '$dir' is reserved on W32 and DOS platforms")
     if grep (/^\Q$dir\E$/i, qw/aux lpt1 lpt2 lpt3 com1 com2 com3 com4 con 
prn/);
 }
 
@@ -4076,7 +3928,7 @@ sub check_directories_in_var ($)
     (sub
      {
        my ($var, $val, $cond, $full_cond) = @_;
-       check_directory ($val, $var->rdef ($cond)->location);
+       check_directory ($val, $var->rdef ($cond)->location, $relative_dir);
        return ();
      },
      undef,
@@ -4129,8 +3981,8 @@ sub scan_aclocal_m4 ()
     {
       push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
       msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
-              "`ACLOCAL_M4_SOURCES' is obsolete.\n"
-              . "It should be safe to simply remove it.");
+              "'ACLOCAL_M4_SOURCES' is obsolete.\n"
+              . "It should be safe to simply remove it");
     }
 
   # Note that it might be possible that aclocal.m4 doesn't exist but
@@ -4223,7 +4075,7 @@ sub rewrite_inputs_into_dependencies ($@)
       else
        {
          msg ('error', $ac_config_files_location{$file},
-              "required file `$i' not found")
+              "required file '$i' not found")
            unless $i =~ /\$/ || exists $output_files{$i} || -f $i;
          ($i) = prepend_srcdir ($i);
          push_dist_common ($i);
@@ -4388,8 +4240,8 @@ sub handle_configure ($$$@)
     }
 
   reject_var ('CONFIG_HEADER',
-             "`CONFIG_HEADER' is an anachronism; now determined "
-             . "automatically\nfrom `$configure_ac'");
+             "'CONFIG_HEADER' is an anachronism; now determined "
+             . "automatically\nfrom '$configure_ac'");
 
   my @config_h;
   foreach my $spec (@config_headers)
@@ -4439,7 +4291,7 @@ sub handle_configure ($$$@)
 
       # We skip files that aren't in this directory.  However, if
       # the file's directory does not have a Makefile, and we are
-      # currently doing `.', then we create a rule to rebuild the
+      # currently doing '.', then we create a rule to rebuild the
       # file in the subdir.
       my $fd = dirname ($file);
       if ($fd ne $relative_dir)
@@ -4493,8 +4345,8 @@ sub handle_configure ($$$@)
        {
          # We skip links that aren't in this directory.  However, if
          # the link's directory does not have a Makefile, and we are
-         # currently doing `.', then we add the link to CONFIG_CLEAN_FILES
-         # in `.'s Makefile.in.
+         # currently doing '.', then we add the link to CONFIG_CLEAN_FILES
+         # in '.'s Makefile.in.
          my $local = basename ($link);
          my $fd = dirname ($link);
          if ($fd ne $relative_dir)
@@ -4524,7 +4376,7 @@ sub handle_configure ($$$@)
          my $fd = dirname ($file);
 
          # We distribute files that are in this directory.
-         # At the top-level (`.') we also distribute files whose
+         # At the top-level ('.') we also distribute files whose
          # directory does not have a Makefile.
          if (($fd eq $relative_dir)
              || ($relative_dir eq '.' && ! &is_make_dir ($fd)))
@@ -4591,20 +4443,20 @@ sub handle_gettext
       my @subdirs = $subdirs->value_as_list_recursive;
 
       msg_var ('syntax', $subdirs,
-              "AM_GNU_GETTEXT used but `po' not in SUBDIRS")
+              "AM_GNU_GETTEXT used but 'po' not in SUBDIRS")
        if ! grep ($_ eq 'po', @subdirs);
 
       # intl/ is not required when AM_GNU_GETTEXT is called with the
-      # `external' option and AM_GNU_GETTEXT_INTL_SUBDIR is not called.
+      # 'external' option and AM_GNU_GETTEXT_INTL_SUBDIR is not called.
       msg_var ('syntax', $subdirs,
-              "AM_GNU_GETTEXT used but `intl' not in SUBDIRS")
+              "AM_GNU_GETTEXT used but 'intl' not in SUBDIRS")
        if (! ($seen_gettext_external && ! $seen_gettext_intl)
            && ! grep ($_ eq 'intl', @subdirs));
 
       # intl/ should not be used with AM_GNU_GETTEXT([external]), except
       # if AM_GNU_GETTEXT_INTL_SUBDIR is called.
       msg_var ('syntax', $subdirs,
-              "`intl' should not be in SUBDIRS when "
+              "'intl' should not be in SUBDIRS when "
               . "AM_GNU_GETTEXT([external]) is used")
        if ($seen_gettext_external && ! $seen_gettext_intl
            && grep ($_ eq 'intl', @subdirs));
@@ -4617,7 +4469,7 @@ sub handle_gettext
 sub handle_footer
 {
     reject_rule ('.SUFFIXES',
-                "use variable `SUFFIXES', not target `.SUFFIXES'");
+                "use variable 'SUFFIXES', not target '.SUFFIXES'");
 
     # Note: AIX 4.1 /bin/make will fail if any suffix rule appears
     # before .SUFFIXES.  So we make sure that .SUFFIXES appears before
@@ -4649,7 +4501,7 @@ sub handle_footer
 }
 
 
-# Generate `make install' rules.
+# Generate 'make install' rules.
 sub handle_install ()
 {
   $output_rules .= &file_contents
@@ -4670,7 +4522,7 @@ sub handle_all ($)
 {
     my ($makefile) = @_;
 
-    # Output `all-am'.
+    # Output 'all-am'.
 
     # Put this at the beginning for the sake of non-GNU makes.  This
     # is still wrong if these makes can run parallel jobs.  But it is
@@ -4684,7 +4536,7 @@ sub handle_all ($)
          if dirname ($out) eq $relative_dir;
       }
 
-    # Install `all' hooks.
+    # Install 'all' hooks.
     push (@all, "all-local")
       if user_phony_rule "all-local";
 
@@ -4692,7 +4544,7 @@ sub handle_all ($)
     &depend ('.PHONY', 'all-am', 'all');
 
 
-    # Output `all'.
+    # Output 'all'.
 
     my @local_headers = ();
     push @local_headers, '$(BUILT_SOURCES)'
@@ -4708,7 +4560,7 @@ sub handle_all ($)
       {
        # We need to make sure config.h is built before we recurse.
        # We also want to make sure that built sources are built
-       # before any ordinary `all' targets are run.  We can't do this
+       # before any ordinary 'all' targets are run.  We can't do this
        # by changing the order of dependencies to the "all" because
        # that breaks when using parallel makes.  Instead we handle
        # things explicitly.
@@ -4745,7 +4597,7 @@ sub do_check_merge_target ()
   else
     {
       # The check target must depend on the local equivalent of
-      # `all', to ensure all the primary targets are built.  Then it
+      # 'all', to ensure all the primary targets are built.  Then it
       # must build the local check rules.
       $output_rules .= "check-am: all-am\n";
       if (@check)
@@ -4763,7 +4615,7 @@ sub do_check_merge_target ()
     }
 
   depend '.PHONY', 'check', 'check-am';
-  # Handle recursion.  We have to honor BUILT_SOURCES like for `all:'.
+  # Handle recursion.  We have to honor BUILT_SOURCES like for 'all:'.
   $output_rules .= ("check: "
                    . (var ('BUILT_SOURCES')
                       ? "\$(BUILT_SOURCES)\n\t\$(MAKE) \$(AM_MAKEFLAGS) "
@@ -4808,7 +4660,7 @@ sub handle_clean ($)
        unless exists $rms{$when};
 
       my $rm = "rm -f $file";
-      # If file is a variable, make sure when don't call `rm -f' without args.
+      # If file is a variable, make sure when don't call 'rm -f' without args.
       $rm ="test -z \"$file\" || $rm"
        if ($file =~ /^\s*\$(\(.*\)|\{.*\})\s*$/);
 
@@ -4829,8 +4681,8 @@ sub handle_clean ($)
 
 # &target_cmp ($A, $B)
 # --------------------
-# Subroutine for &handle_factored_dependencies to let `.PHONY' and
-# other `.TARGETS' be last.
+# Subroutine for &handle_factored_dependencies to let '.PHONY' and
+# other '.TARGETS' be last.
 sub target_cmp
 {
   return 0 if $a eq $b;
@@ -4862,16 +4714,16 @@ sub handle_factored_dependencies
     {
       my $x = $utarg;
       $x =~ s/-.*-/-/;
-      reject_rule ($utarg, "use `$x', not `$utarg'");
+      reject_rule ($utarg, "use '$x', not '$utarg'");
     }
 
   reject_rule ('install-local',
-              "use `install-data-local' or `install-exec-local', "
-              . "not `install-local'");
+              "use 'install-data-local' or 'install-exec-local', "
+              . "not 'install-local'");
 
   reject_rule ('install-hook',
-              "use `install-data-hook' or `install-exec-hook', "
-              . "not `install-hook'");
+              "use 'install-data-hook' or 'install-exec-hook', "
+              . "not 'install-hook'");
 
   # Install the -local hooks.
   foreach (keys %dependencies)
@@ -4914,7 +4766,7 @@ sub handle_factored_dependencies
       # to append dependencies.  This would not work if Automake
       # refrained from defining its own .PHONY target as it does
       # with other overridden targets.
-      # Likewise for `.MAKE'.
+      # Likewise for '.MAKE'.
       my @undefined_conds = (TRUE,);
       if ($_ ne '.PHONY' && $_ ne '.MAKE')
        {
@@ -4942,6 +4794,58 @@ sub handle_tests_dejagnu
     $output_rules .= file_contents ('dejagnu', new Automake::Location);
 }
 
+sub handle_per_suffix_test
+{
+  my ($test_suffix, %transform) = @_;
+  my ($pfx, $generic, $parallel_tests_option, $am_exeext);
+  prog_error ("called with 'parallel-tests' option not set")
+    unless $parallel_tests_option = option 'parallel-tests';
+  if ($test_suffix eq '')
+    {
+      $pfx = '';
+      $generic = 0;
+      $am_exeext = 'FALSE';
+    }
+  else
+    {
+      prog_error ("test suffix '$test_suffix' lacks leading dot")
+        unless $test_suffix =~ m/^\.(.*)/;
+      $pfx = uc ($1) . '_';
+      $generic = 1;
+      $am_exeext = exists $configure_vars{'EXEEXT'} ? 'am__EXEEXT'
+                                                    : 'FALSE';
+    }
+  # The "test driver" program, deputed to handle tests protocol used by
+  # test scripts.  By default, it's assumed that no protocol is used,
+  # so we fall back to the old "parallel-tests" behaviour, implemented
+  # by the 'test-driver' auxiliary script.
+  if (! var "${pfx}LOG_DRIVER")
+    {
+      require_conf_file ($parallel_tests_option->{position}, FOREIGN,
+                        'test-driver');
+      define_variable ("${pfx}LOG_DRIVER",
+                       "\$(SHELL) $am_config_aux_dir/test-driver",
+                       INTERNAL);
+    }
+  my $driver = '$(' . $pfx . 'LOG_DRIVER)';
+  my $driver_flags = '$(AM_' . $pfx . 'LOG_DRIVER_FLAGS)'
+                       . ' $(' . $pfx . 'LOG_DRIVER_FLAGS)';
+  my $compile = "${pfx}LOG_COMPILE";
+  define_variable ($compile,
+                   '$(' . $pfx . 'LOG_COMPILER)'
+                      . ' $(AM_' .  $pfx . 'LOG_FLAGS)'
+                      . ' $(' . $pfx . 'LOG_FLAGS)',
+                     INTERNAL);
+  $output_rules .= file_contents ('check2', new Automake::Location,
+                                   GENERIC => $generic,
+                                   DRIVER => $driver,
+                                   DRIVER_FLAGS => $driver_flags,
+                                   COMPILE => '$(' . $compile . ')',
+                                   EXT => $test_suffix,
+                                   am__EXEEXT => $am_exeext,
+                                   %transform);
+}
+
 # is_valid_test_extension ($EXT)
 # ------------------------------
 # Return true if $EXT can appear in $(TEST_EXTENSIONS), return false
@@ -4967,8 +4871,8 @@ sub handle_tests
     {
       foreach my $c ('DEJATOOL', 'RUNTEST', 'RUNTESTFLAGS')
        {
-         reject_var ($c, "`$c' defined but `dejagnu' not in "
-                     . "`AUTOMAKE_OPTIONS'");
+         reject_var ($c, "'$c' defined but 'dejagnu' not in "
+                     . "'AUTOMAKE_OPTIONS'");
        }
     }
 
@@ -4987,7 +4891,7 @@ sub handle_tests
       append_exeext { exists $known_programs{$_[0]} } 'XFAIL_TESTS'
        if (var ('XFAIL_TESTS'));
 
-      if (option 'parallel-tests')
+      if (my $parallel_tests = option 'parallel-tests')
         {
          define_variable ('TEST_SUITE_LOG', 'test-suite.log', INTERNAL);
          my $suff = '.test';
@@ -5008,7 +4912,7 @@ sub handle_tests
           if ($var->has_conditional_contents)
            {
             msg_var 'unsupported', $var,
-                     "`TEST_EXTENSIONS' cannot have conditional contents";
+                     "'TEST_EXTENSIONS' cannot have conditional contents";
            }
          my @test_suffixes = $var->value_as_list_recursive;
           if ((my @invalid_test_suffixes =
@@ -5037,7 +4941,7 @@ sub handle_tests
                if ($val =~ /(\$\((top_)?srcdir\))\//o)
                  {
                    msg ('error', $subvar->rdef ($cond)->location,
-                        "parallel-tests: using `$1' in TESTS is currently 
broken: `$val'");
+                        "parallel-tests: using '$1' in TESTS is currently 
broken: '$val'");
                  }
 
                foreach my $test_suffix (@test_suffixes)
@@ -5047,17 +4951,12 @@ sub handle_tests
                    return substr ($obj, 0, length ($obj) - length 
($test_suffix)) . '.log'
                      if substr ($obj, - length ($test_suffix)) eq $test_suffix;
                  }
+               my $base = $obj;
                $obj .= '.log';
-               my $compile = 'LOG_COMPILE';
-               define_variable ($compile,
-                                '$(LOG_COMPILER) $(AM_LOG_FLAGS) 
$(LOG_FLAGS)', INTERNAL);
-               $output_rules .= file_contents ('check2', new 
Automake::Location,
-                                               GENERIC => 0,
-                                               OBJ => $obj,
-                                               SOURCE => $val,
-                                               COMPILE =>'$(' . $compile . ')',
-                                               EXT => '',
-                                               am__EXEEXT => 'FALSE');
+                handle_per_suffix_test ('',
+                                        OBJ => $obj,
+                                        BASE => $base,
+                                        SOURCE => $val);
                return $obj;
              });
 
@@ -5083,27 +4982,14 @@ sub handle_tests
              $nhelper++;
              if ($test_suffix ne $at_exeext && $test_suffix ne '')
                {
-                 (my $ext = $test_suffix) =~ s/^\.//;
-                 $ext = uc $ext;
-                 my $compile = $ext . '_LOG_COMPILE';
-                 define_variable ($compile,
-                                  '$(' . $ext . '_LOG_COMPILER) $(AM_' .  $ext 
. '_LOG_FLAGS)'
-                                  . ' $(' . $ext . '_LOG_FLAGS)', INTERNAL);
-                 my $am_exeext = $handle_exeext ? 'am__EXEEXT' : 'FALSE';
-                 $output_rules .= file_contents ('check2', new 
Automake::Location,
-                                                 GENERIC => 1,
-                                                 OBJ => '',
-                                                 SOURCE => '$<',
-                                                 COMPILE => '$(' . $compile . 
')',
-                                                 EXT => $test_suffix,
-                                                 am__EXEEXT => $am_exeext);
+                  handle_per_suffix_test ($test_suffix,
+                                          OBJ => '',
+                                          BASE => '$*',
+                                          SOURCE => '$<');
                }
            }
-
-         define_variable ('TEST_LOGS_TMP', '$(TEST_LOGS:.log=.log-t)', 
INTERNAL);
-
-         $clean_files{'$(TEST_LOGS_TMP)'} = MOSTLY_CLEAN;
          $clean_files{'$(TEST_LOGS)'} = MOSTLY_CLEAN;
+         $clean_files{'$(TEST_LOGS:.log=.trs)'} = MOSTLY_CLEAN;
          $clean_files{'$(TEST_SUITE_LOG)'} = MOSTLY_CLEAN;
        }
     }
@@ -5199,7 +5085,7 @@ sub handle_minor_options
          if ($package_version !~ /^$GNITS_VERSION_PATTERN$/)
            {
              msg ('error-gnits', $package_version_location,
-                  "version `$package_version' doesn't follow " .
+                  "version '$package_version' doesn't follow " .
                   "Gnits standards");
            }
          if (defined $1 && -f 'README-alpha')
@@ -5321,7 +5207,6 @@ sub scan_autoconf_traces ($)
                AC_SUBST_TRACE => 1,
                AM_AUTOMAKE_VERSION => 1,
                AM_CONDITIONAL => 2,
-               AM_ENABLE_MULTILIB => 0,
                AM_GNU_GETTEXT => 0,
                AM_GNU_GETTEXT_INTL_SUBDIR => 0,
                AM_INIT_AUTOMAKE => 0,
@@ -5342,7 +5227,7 @@ sub scan_autoconf_traces ($)
 
   my $traces = ($ENV{AUTOCONF} || '@am_AUTOCONF@') . " ";
 
-  # Use a separator unlikely to be used, not `:', the default, which
+  # Use a separator unlikely to be used, not ':', the default, which
   # has a precise meaning for AC_CONFIG_FILES and so on.
   $traces .= join (' ',
                   map { "--trace=$_" . ':\$f:\$l::\$d::\$n::\${::}%' }
@@ -5361,7 +5246,7 @@ sub scan_autoconf_traces ($)
       $where = new Automake::Location $here;
       my $macro = $args[0];
 
-      prog_error ("unrequested trace `$macro'")
+      prog_error ("unrequested trace '$macro'")
        unless exists $traced{$macro};
 
       # Skip and diagnose malformed calls.
@@ -5398,12 +5283,11 @@ sub scan_autoconf_traces ($)
          if ($seen_init_automake)
            {
              error ($where, "AC_CONFIG_AUX_DIR must be called before "
-                    . "AM_INIT_AUTOMAKE...", partial => 1);
+                    . "AM_INIT_AUTOMAKE ...", partial => 1);
              error ($seen_init_automake, "... AM_INIT_AUTOMAKE called here");
            }
          $config_aux_dir = $args[1];
          $config_aux_dir_set_in_configure_ac = 1;
-         $relative_dir = '.';
          check_directory ($config_aux_dir, $where);
        }
       elsif ($macro eq 'AC_CONFIG_FILES')
@@ -5423,7 +5307,6 @@ sub scan_autoconf_traces ($)
       elsif ($macro eq 'AC_CONFIG_LIBOBJ_DIR')
        {
          $config_libobj_dir = $args[1];
-         $relative_dir = '.';
          check_directory ($config_libobj_dir, $where);
        }
       elsif ($macro eq 'AC_CONFIG_LINKS')
@@ -5485,10 +5368,6 @@ sub scan_autoconf_traces ($)
        {
          $configure_cond{$args[1]} = $where;
        }
-      elsif ($macro eq 'AM_ENABLE_MULTILIB')
-       {
-         $seen_multilib = $where;
-       }
       elsif ($macro eq 'AM_GNU_GETTEXT')
        {
          $seen_gettext = $where;
@@ -5509,9 +5388,9 @@ sub scan_autoconf_traces ($)
            }
          elsif (defined $args[1])
            {
-             exit $exit_code
-               if (process_global_option_list ($where,
-                                               split (' ', $args[1])));
+             my @opts = split (' ', $args[1]);
+             @opts = map { { option => $_, where => $where } } @opts;
+             exit $exit_code if process_global_option_list (@opts);
            }
        }
       elsif ($macro eq 'AM_MAINTAINER_MODE')
@@ -5556,7 +5435,7 @@ sub scan_autoconf_traces ($)
             || $macro eq 'm4_sinclude'
             || $macro eq 'sinclude')
        {
-         # Skip missing `sinclude'd files.
+         # Skip missing 'sinclude'd files.
          next if $macro ne 'm4_include' && ! -f $args[1];
 
          # Some modified versions of Autoconf don't use
@@ -5602,8 +5481,8 @@ sub scan_autoconf_traces ($)
 
 # &scan_autoconf_files ()
 # -----------------------
-# Check whether we use `configure.ac' or `configure.in'.
-# Scan it (and possibly `aclocal.m4') for interesting things.
+# Check whether we use 'configure.ac' or 'configure.in'.
+# Scan it (and possibly 'aclocal.m4') for interesting things.
 # We must scan aclocal.m4 because there might be AC_SUBSTs and such there.
 sub scan_autoconf_files ()
 {
@@ -5638,7 +5517,7 @@ sub scan_autoconf_files ()
              . "should verify that $configure_ac invokes AM_INIT_AUTOMAKE,"
              . "\nthat aclocal.m4 is present in the top-level directory,\n"
              . "and that aclocal.m4 was recently regenerated "
-             . "(using aclocal).");
+             . "(using aclocal)");
     }
   else
     {
@@ -5649,7 +5528,7 @@ sub scan_autoconf_files ()
              error ($seen_init_automake,
                     "your implementation of AM_INIT_AUTOMAKE comes from " .
                     "an\nold Automake version.  You should recreate " .
-                    "aclocal.m4\nwith aclocal and run automake again.\n",
+                    "aclocal.m4\nwith aclocal and run automake again",
                     # $? = 63 is used to indicate version mismatch to missing.
                     exit_code => 63);
            }
@@ -5657,57 +5536,26 @@ sub scan_autoconf_files ()
            {
              error ($seen_init_automake,
                     "no proper implementation of AM_INIT_AUTOMAKE was " .
-                    "found,\nprobably because aclocal.m4 is missing...\n" .
+                    "found,\nprobably because aclocal.m4 is missing.\n" .
                     "You should run aclocal to create this file, then\n" .
-                    "run automake again.\n");
+                    "run automake again");
            }
        }
     }
 
   locate_aux_dir ();
 
-  # Reorder @input_files so that the Makefile that distributes aux
-  # files is processed last.  This is important because each directory
-  # can require auxiliary scripts and we should wait until they have
-  # been installed before distributing them.
-
-  # The Makefile.in that distribute the aux files is the one in
-  # $config_aux_dir or the top-level Makefile.
-  my $auxdirdist = is_make_dir ($config_aux_dir) ? $config_aux_dir : '.';
-  my @new_input_files = ();
-  while (@input_files)
-    {
-      my $in = pop @input_files;
-      my @ins = split (/:/, $output_files{$in});
-      if (dirname ($ins[0]) eq $auxdirdist)
-       {
-         push @new_input_files, $in;
-         $automake_will_process_aux_dir = 1;
-       }
-      else
-       {
-         unshift @new_input_files, $in;
-       }
-    }
-  @input_files = @new_input_files;
-
-  # If neither the auxdir/Makefile nor the ./Makefile are generated
-  # by Automake, we won't distribute the aux files anyway.  Assume
-  # the user know what (s)he does, and pretend we will distribute
-  # them to disable the error in require_file_internal.
-  $automake_will_process_aux_dir = 1 if ! is_make_dir ($auxdirdist);
-
   # Look for some files we need.  Always check for these.  This
   # check must be done for every run, even those where we are only
   # looking at a subdir Makefile.  We must set relative_dir for
-  # maybe_push_required_file to work.
+  # push_required_file to work.
   # Sort the files for stable verbose output.
   $relative_dir = '.';
   foreach my $file (sort keys %required_aux_file)
     {
       require_conf_file ($required_aux_file{$file}->get, FOREIGN, $file)
     }
-  err_am "`install.sh' is an anachronism; use `install-sh' instead"
+  err_am "'install.sh' is an anachronism; use 'install-sh' instead"
     if -f $config_aux_dir . '/install.sh';
 
   # Preserve dist_common for later.
@@ -5728,7 +5576,7 @@ sub check_cygnus
   set_option ('no-dependencies', $cygnus);
   set_option ('no-dist', $cygnus);
 
-  err_ac "`AM_MAINTAINER_MODE' required when --cygnus specified"
+  err_ac "'AM_MAINTAINER_MODE' required when --cygnus specified"
     if !$seen_maint_mode;
 }
 
@@ -5759,7 +5607,7 @@ sub check_gnu_standards
   for my $opt ('no-installman', 'no-installinfo')
     {
       msg ('error-gnu', option $opt,
-          "option `$opt' disallowed by GNU standards")
+          "option '$opt' disallowed by GNU standards")
        if option $opt;
     }
 }
@@ -5778,7 +5626,7 @@ sub check_gnits_standards
 #
 # Functions to handle files of each language.
 
-# Each `lang_X_rewrite($DIRECTORY, $BASE, $EXT)' function follows a
+# Each 'lang_X_rewrite($DIRECTORY, $BASE, $EXT)' function follows a
 # simple formula: Return value is LANG_SUBDIR if the resulting object
 # file should be in a subdir if the source file is, LANG_PROCESS if
 # file is to be dealt with, LANG_IGNORE otherwise.
@@ -5799,13 +5647,7 @@ sub lang_sub_obj
 # Rewrite a single C source file.
 sub lang_c_rewrite
 {
-  my ($directory, $base, $ext, $nonansi_obj, $have_per_exec_flags, $var) = @_;
-
-  if (option 'ansi2knr' && $base =~ /_$/)
-    {
-      # FIXME: include line number in error.
-      err_am "C source file `$base.c' would be deleted by ansi2knr rules";
-    }
+  my ($directory, $base, $ext, $obj, $have_per_exec_flags, $var) = @_;
 
   my $r = LANG_PROCESS;
   if (option 'subdir-objects')
@@ -5818,32 +5660,22 @@ sub lang_c_rewrite
          # libtool is always able to put the object at the proper place,
          # so we do not have to require AM_PROG_CC_C_O when building .lo files.
          msg_var ('portability', $var,
-                  "compiling `$base.c' in subdir requires "
-                  . "`AM_PROG_CC_C_O' in `$configure_ac'",
+                  "compiling '$base.c' in subdir requires "
+                  . "'AM_PROG_CC_C_O' in '$configure_ac'",
                   uniq_scope => US_GLOBAL,
                   uniq_part => 'AM_PROG_CC_C_O subdir')
-           unless $seen_cc_c_o || $nonansi_obj eq '.lo';
+           unless $seen_cc_c_o || $obj eq '.lo';
        }
-
-      # In this case we already have the directory information, so
-      # don't add it again.
-      $de_ansi_files{$base} = '';
-    }
-  else
-    {
-      $de_ansi_files{$base} = (($directory eq '.' || $directory eq '')
-                              ? ''
-                              : "$directory/");
     }
 
   if (! $seen_cc_c_o
       && $have_per_exec_flags
       && ! option 'subdir-objects'
-      && $nonansi_obj ne '.lo')
+      && $obj ne '.lo')
     {
       msg_var ('portability',
-              $var, "compiling `$base.c' with per-target flags requires "
-              . "`AM_PROG_CC_C_O' in `$configure_ac'",
+              $var, "compiling '$base.c' with per-target flags requires "
+              . "'AM_PROG_CC_C_O' in '$configure_ac'",
               uniq_scope => US_GLOBAL,
               uniq_part => 'AM_PROG_CC_C_O per-target')
     }
@@ -5978,59 +5810,6 @@ sub lang_java_rewrite
 # language, etc.  A finish function is only called if a source file of
 # the appropriate type has been seen.
 
-sub lang_c_finish
-{
-    # Push all libobjs files onto de_ansi_files.  We actually only
-    # push files which exist in the current directory, and which are
-    # genuine source files.
-    foreach my $file (keys %libsources)
-    {
-       if ($file =~ /^(.*)\.[cly]$/ && -f "$relative_dir/$file")
-       {
-           $de_ansi_files{$1} = ''
-       }
-    }
-
-    if (option 'ansi2knr' && keys %de_ansi_files)
-    {
-       # Make all _.c files depend on their corresponding .c files.
-       my @objects;
-       foreach my $base (sort keys %de_ansi_files)
-       {
-           # Each _.c file must depend on ansi2knr; otherwise it
-           # might be used in a parallel build before it is built.
-           # We need to support files in the srcdir and in the build
-           # dir (because these files might be auto-generated.  But
-           # we can't use $< -- some makes only define $< during a
-           # suffix rule.
-           my $ansfile = $de_ansi_files{$base} . $base . '.c';
-           $output_rules .= ($base . "_.c: $ansfile \$(ANSI2KNR)\n\t"
-                             . '$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) '
-                             . '`if test -f $(srcdir)/' . $ansfile
-                             . '; then echo $(srcdir)/' . $ansfile
-                             . '; else echo ' . $ansfile . '; fi` '
-                             . "| sed 's/^# \\([0-9]\\)/#line \\1/' "
-                             . '| $(ANSI2KNR) > $@'
-                             # If ansi2knr fails then we shouldn't
-                             # create the _.c file
-                             . " || rm -f address@hidden");
-           push (@objects, $base . '_.$(OBJEXT)');
-           push (@objects, $base . '_.lo')
-             if var ('LIBTOOL');
-
-           # Explicitly clean the _.c files if they are in a
-           # subdirectory. (In the current directory they get erased
-           # by a `rm -f *_.c' rule.)
-           $clean_files{$base . '_.c'} = MOSTLY_CLEAN
-             if dirname ($base) ne '.';
-       }
-
-       # Make all _.o (and _.lo) files depend on ansi2knr.
-       # Use a sneaky little hack to make it print nicely.
-       &pretty_print_rule ('', '', @objects, ':', '$(ANSI2KNR)');
-    }
-}
-
 sub lang_vala_finish_target ($$)
 {
   my ($self, $name) = @_;
@@ -6047,12 +5826,16 @@ sub lang_vala_finish_target ($$)
   foreach my $vala_file (@vala_sources)
     {
       my $c_file = $vala_file;
-      $output_rules .= "\$(srcdir)/$c_file: \$(srcdir)/${derived}_vala.stamp\n"
-        . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
-        . "address@hidden test -f \$@; then :; else \\\n"
-        . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; 
\\\n"
-        . "\tfi\n"
-        if $c_file =~ s/(.*)\.vala$/$1.c/;
+      if ($c_file =~ s/(.*)\.vala$/$1.c/)
+        {
+          $c_file = "\$(srcdir)/$c_file";
+          $output_rules .= "$c_file: \$(srcdir)/${derived}_vala.stamp\n"
+            . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
+            . "address@hidden test -f \$@; then :; else \\\n"
+            . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; 
\\\n"
+            . "\tfi\n";
+         $clean_files{$c_file} = MAINTAINER_CLEAN;
+        }
     }
 
   # Add rebuild rules for generated header and vapi files
@@ -6065,8 +5848,8 @@ sub lang_vala_finish_target ($$)
          if (grep (/$lastflag/, ('-H', '-h', '--header', '--internal-header',
                                  '--vapi', '--internal-vapi', '--gir')))
            {
-             my $headerfile = $flag;
-             $output_rules .= "\$(srcdir)/$headerfile: 
\$(srcdir)/${derived}_vala.stamp\n"
+             my $headerfile = "\$(srcdir)/$flag";
+             $output_rules .= "$headerfile: \$(srcdir)/${derived}_vala.stamp\n"
                . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
                . "address@hidden test -f \$@; then :; else \\\n"
                . "\t  \$(MAKE) \$(AM_MAKEFLAGS) 
\$(srcdir)/${derived}_vala.stamp; \\\n"
@@ -6083,15 +5866,15 @@ sub lang_vala_finish_target ($$)
 
   my $compile = $self->compile;
 
-  # Rewrite each occurrence of `AM_VALAFLAGS' in the compile
-  # rule into `${derived}_VALAFLAGS' if it exists.
+  # Rewrite each occurrence of 'AM_VALAFLAGS' in the compile
+  # rule into '${derived}_VALAFLAGS' if it exists.
   my $val = "${derived}_VALAFLAGS";
   $compile =~ s/\(AM_VALAFLAGS\)/\($val\)/
     if set_seen ($val);
 
   # VALAFLAGS is a user variable (per GNU Standards),
   # it should not be overridden in the Makefile...
-  check_user_variables ['VALAFLAGS'];
+  check_user_variables 'VALAFLAGS';
 
   my $dirname = dirname ($name);
 
@@ -6100,6 +5883,7 @@ sub lang_vala_finish_target ($$)
 
   my $verbose = verbose_flag ('VALAC');
   my $silent = silent_flag ();
+  my $stampfile = "\$(srcdir)/${derived}_vala.stamp";
 
   $output_rules .=
     "\$(srcdir)/${derived}_vala.stamp: @vala_sources\n".
@@ -6113,9 +5897,9 @@ sub lang_vala_finish_target ($$)
     "\t${verbose}\$(am__cd) \$(srcdir) && $compile @vala_sources\n".
     "\t${silent}mv -f address@hidden address@hidden";
 
-  push_dist_common ("${derived}_vala.stamp");
+  push_dist_common ($stampfile);
 
-  $clean_files{"${derived}_vala.stamp"} = MAINTAINER_CLEAN;
+  $clean_files{$stampfile} = MAINTAINER_CLEAN;
 }
 
 # Add output rules to invoke valac and create stamp file as a witness
@@ -6152,18 +5936,49 @@ sub lang_yacc_target_hook
 {
     my ($self, $aggregate, $output, $input, %transform) = @_;
 
-    my $flag = $aggregate . "_YFLAGS";
-    my $flagvar = var $flag;
-    my $YFLAGSvar = var 'YFLAGS';
-    if (($flagvar && $flagvar->variable_value =~ /$DASH_D_PATTERN/o)
-       || ($YFLAGSvar && $YFLAGSvar->variable_value =~ /$DASH_D_PATTERN/o))
-    {
-       (my $output_base = $output) =~ s/$KNOWN_EXTENSIONS_PATTERN$//;
-       my $header = $output_base . '.h';
+    # If some relevant *YFLAGS variable contains the '-d' flag, we'll
+    # have to to generate special code.
+    my $yflags_contains_minus_d = 0;
 
-       # Found a `-d' that applies to the compilation of this file.
+    foreach my $pfx ("", "${aggregate}_")
+      {
+       my $yflagsvar = var ("${pfx}YFLAGS");
+       next unless $yflagsvar;
+       # We cannot work reliably with conditionally-defined YFLAGS.
+       if ($yflagsvar->has_conditional_contents)
+         {
+           msg_var ('unsupported', $yflagsvar,
+                    "'${pfx}YFLAGS' cannot have conditional contents");
+         }
+       else
+         {
+           $yflags_contains_minus_d = 1
+             if grep (/^-d$/, $yflagsvar->value_as_list_recursive);
+         }
+      }
+
+    if ($yflags_contains_minus_d)
+      {
+       # Found a '-d' that applies to the compilation of this file.
        # Add a dependency for the generated header file, and arrange
        # for that file to be included in the distribution.
+
+       # The extension of the output file (e.g., '.c' or '.cxx').
+       # We'll need it to compute the name of the generated header file.
+       (my $output_ext = basename ($output)) =~ s/.*(\.[^.]+)$/$1/;
+
+       # We know that a yacc input should be turned into either a C or
+       # C++ output file.  We depend on this fact (here and in yacc.am),
+       # so check that it really holds.
+       my $lang = $languages{$extension_map{$output_ext}};
+       prog_error "invalid output name '$output' for yacc file '$input'"
+         if (!$lang || ($lang->name ne 'c' && $lang->name ne 'cxx'));
+
+       (my $header_ext = $output_ext) =~ s/c/h/g;
+        # Quote $output_ext in the regexp, so that dots in it are taken
+        # as literal dots, not as metacharacters.
+       (my $header = $output) =~ s/\Q$output_ext\E$/$header_ext/;
+
        foreach my $cond (Automake::Rule::define (${header}, 'internal',
                                                  RULE_AUTOMAKE, TRUE,
                                                  INTERNAL))
@@ -6181,30 +5996,26 @@ sub lang_yacc_target_hook
        &push_dist_common ($header)
          if $transform{'DIST_SOURCE'};
 
-       # If the files are built in the build directory, then we want
-       # to remove them with `make clean'.  If they are in srcdir
-       # they shouldn't be touched.  However, we can't determine this
-       # statically, and the GNU rules say that yacc/lex output files
-       # should be removed by maintainer-clean.  So that's what we
-       # do.
-       $clean_files{$header} = MAINTAINER_CLEAN;
-    }
-    # Erase $OUTPUT on `make maintainer-clean' (by GNU standards).
+       # The GNU rules say that yacc/lex output files should be removed
+       # by maintainer-clean.  However, if the files are not distributed,
+       # then we want to remove them with "make clean"; otherwise,
+       # "make distcheck" will fail.
+       $clean_files{$header} = $transform{'DIST_SOURCE'} ? MAINTAINER_CLEAN : 
CLEAN;
+      }
     # See the comment above for $HEADER.
-    $clean_files{$output} = MAINTAINER_CLEAN;
+    $clean_files{$output} = $transform{'DIST_SOURCE'} ? MAINTAINER_CLEAN : 
CLEAN;
 }
 
 # This is a lex helper which is called whenever we have decided to
 # compile a lex file.
 sub lang_lex_target_hook
 {
-    my ($self, $aggregate, $output, $input) = @_;
-    # If the files are built in the build directory, then we want to
-    # remove them with `make clean'.  If they are in srcdir they
-    # shouldn't be touched.  However, we can't determine this
-    # statically, and the GNU rules say that yacc/lex output files
-    # should be removed by maintainer-clean.  So that's what we do.
-    $clean_files{$output} = MAINTAINER_CLEAN;
+    my ($self, $aggregate, $output, $input, %transform) = @_;
+    # The GNU rules say that yacc/lex output files should be removed
+    # by maintainer-clean.  However, if the files are not distributed,
+    # then we want to remove them with "make clean"; otherwise,
+    # "make distcheck" will fail.
+    $clean_files{$output} = $transform{'DIST_SOURCE'} ? MAINTAINER_CLEAN : 
CLEAN;
 }
 
 # This is a helper for both lex and yacc.
@@ -6223,7 +6034,7 @@ sub lang_yacc_finish
   return if defined $language_scratch{'yacc-done'};
   $language_scratch{'yacc-done'} = 1;
 
-  reject_var 'YACCFLAGS', "`YACCFLAGS' obsolete; use `YFLAGS' instead";
+  reject_var 'YACCFLAGS', "'YACCFLAGS' obsolete; use 'YFLAGS' instead";
 
   yacc_lex_finish_helper;
 }
@@ -6336,8 +6147,6 @@ sub register_language (%)
   my (%option) = @_;
 
   # Set the defaults.
-  $option{'ansi'} = 0
-    unless defined $option{'ansi'};
   $option{'autodep'} = 'no'
     unless defined $option{'autodep'};
   $option{'linker'} = ''
@@ -6359,7 +6168,7 @@ sub register_language (%)
     {
       if (exists $link_languages{$link})
        {
-         prog_error ("`$link' has different definitions in "
+         prog_error ("'$link' has different definitions in "
                      . $lang->name . " and " . $link_languages{$link}->name)
            if $lang->link ne $link_languages{$link}->link;
        }
@@ -6385,7 +6194,7 @@ sub register_language (%)
 # derive_suffix ($EXT, $OBJ)
 # --------------------------
 # This function is used to find a path from a user-specified suffix $EXT
-# to $OBJ or to some other suffix we recognize internally, e.g. `cc'.
+# to $OBJ or to some other suffix we recognize internally, e.g. 'cc'.
 sub derive_suffix ($$)
 {
   my ($source_ext, $obj) = @_;
@@ -6460,9 +6269,9 @@ sub cond_stack_if ($$$)
       if (exists $_am_macro_for_cond{$cond})
        {
          my $mac = $_am_macro_for_cond{$cond};
-         $text .= "\n  The usual way to define `$cond' is to add ";
-         $text .= ($mac =~ / /) ? $mac : "`$mac'";
-         $text .= "\n  to `$configure_ac' and run `aclocal' and `autoconf' 
again.";
+         $text .= "\n  The usual way to define '$cond' is to add ";
+         $text .= ($mac =~ / /) ? $mac : "'$mac'";
+         $text .= "\n  to '$configure_ac' and run 'aclocal' and 'autoconf' 
again";
          # These warnings appear in Automake files (depend2.am),
          # so there is no need to display them more than once:
          $scope = US_GLOBAL;
@@ -6594,29 +6403,18 @@ sub define_files_variable (address@hidden)
 sub define_configure_variable ($)
 {
   my ($var) = @_;
-
-  my $pretty = VAR_ASIS;
-  my $owner = VAR_CONFIGURE;
-
   # Some variables we do not want to output.  For instance it
   # would be a bad idea to output `U = @address@hidden when address@hidden@` 
can be
   # substituted as `\`.
-  $pretty = VAR_SILENT if exists $ignored_configure_vars{$var};
-
-  # ANSI2KNR is a variable that Automake wants to redefine, so
-  # it must be owned by Automake.  (It is also used as a proof
-  # that AM_C_PROTOTYPES has been run, that's why we do not simply
-  # omit the AC_SUBST.)
-  $owner = VAR_AUTOMAKE if $var eq 'ANSI2KNR';
-
-  Automake::Variable::define ($var, $owner, '', TRUE, subst $var,
+  my $pretty = exists $ignored_configure_vars{$var} ? VAR_SILENT : VAR_ASIS;
+  Automake::Variable::define ($var, VAR_CONFIGURE, '', TRUE, subst $var,
                              '', $configure_vars{$var}, $pretty);
 }
 
 
 # define_compiler_variable ($LANG)
 # --------------------------------
-# Define a compiler variable.  We also handle defining the `LT'
+# Define a compiler variable.  We also handle defining the 'LT'
 # version of the command when using libtool.
 sub define_compiler_variable ($)
 {
@@ -6675,7 +6473,7 @@ sub define_per_target_linker_variable ($$)
   my $xlink = $linker ? $linker : 'LINK';
 
   my $lang = $link_languages{$xlink};
-  prog_error "Unknown language for linker variable `$xlink'"
+  prog_error "Unknown language for linker variable '$xlink'"
     unless $lang;
 
   my $link_command = $lang->link;
@@ -6691,8 +6489,8 @@ sub define_per_target_linker_variable ($$)
        . "--mode=link " . $link_command;
     }
 
-  # Rewrite each occurrence of `AM_$flag' in the link
-  # command into `${derived}_$flag' if it exists.
+  # Rewrite each occurrence of 'AM_$flag' in the link
+  # command into '${derived}_$flag' if it exists.
   my $orig_command = $link_command;
   my @flags = (@{$lang->flags}, 'LDFLAGS');
   push @flags, 'LIBTOOLFLAGS' if var 'LIBTOOL';
@@ -6722,7 +6520,7 @@ sub check_trailing_slash ($\$)
 {
   my ($where, $line) = @_;
 
-  # Ignore `##' lines.
+  # Ignore '##' lines.
   return 0 if $$line =~ /$IGNORE_PATTERN/o;
 
   # Catch and fix a common error.
@@ -6860,7 +6658,7 @@ sub read_am_file ($$)
            }
            elsif ($prev_state == IN_COMMENT)
            {
-               # If the line doesn't start with a `#', add it.
+               # If the line doesn't start with a '#', add it.
                # We do this because a continued comment like
                #   # A = foo \
                #         bar \
@@ -6929,9 +6727,9 @@ sub read_am_file ($$)
            $last_where = $where->clone;
            if ($3 ne '' && substr ($3, -1) eq "\\")
              {
-               # We preserve the `\' because otherwise the long lines
+               # We preserve the '\' because otherwise the long lines
                # that are generated will be truncated by broken
-               # `sed's.
+               # 'sed's.
                $last_var_value = $3 . "\n";
              }
            # Normally we try to output variable definitions in the
@@ -6970,7 +6768,7 @@ sub read_am_file ($$)
 
                # Always use the $(top_srcdir) prefix in DIST_COMMON,
                # otherwise OSF make will implicitly copy the included
-               # file in the build tree during `make distdir' to satisfy
+               # file in the build tree during "make distdir" to satisfy
                # the dependency.
                # (subdircond2.test and subdircond3.test will fail.)
                push_dist_common ("\$\(top_srcdir\)/$path");
@@ -6981,13 +6779,13 @@ sub read_am_file ($$)
                push (@include_stack, "\$\(srcdir\)/$path");
                # Always use the $(srcdir) prefix in DIST_COMMON,
                # otherwise OSF make will implicitly copy the included
-               # file in the build tree during `make distdir' to satisfy
+               # file in the build tree during "make distdir" to satisfy
                # the dependency.
                # (subdircond2.test and subdircond3.test will fail.)
                push_dist_common ("\$\(srcdir\)/$path");
                $path = $relative_dir . "/" . $path if $relative_dir ne '.';
              }
-           $where->push_context ("`$path' included from here");
+           $where->push_context ("'$path' included from here");
            &read_am_file ($path, $where);
            $where->pop_context;
        }
@@ -7002,7 +6800,7 @@ sub read_am_file ($$)
            $output_trailer .= $cond->subst_string;
            $output_trailer .= $_;
            $comment = $spacing = '';
-           error $where, "`#' comment at start of rule is unportable"
+           error $where, "'#' comment at start of rule is unportable"
              if $_ =~ /^\t\s*\#/;
        }
 
@@ -7057,7 +6855,7 @@ sub read_main_am_file
     $output_vars .= $gen_copyright;
 
     # We want to predefine as many variables as possible.  This lets
-    # the user set them with `+=' in Makefile.am.
+    # the user set them with '+=' in Makefile.am.
     &define_standard_variables;
 
     # Read user file, which might override some of our values.
@@ -7093,7 +6891,7 @@ sub transform_token ($$$)
 {
   my ($token, $transform, $key) = @_;
   my $res = $transform->{$key};
-  prog_error "Unknown key `$key' in `$token'" unless defined $res;
+  prog_error "Unknown key '$key' in '$token'" unless defined $res;
   return $res;
 }
 
@@ -7140,13 +6938,13 @@ sub transform ($$)
     }
 }
 
-
-# @PARAGRAPHS
-# &make_paragraphs ($MAKEFILE, [%TRANSFORM])
-# ------------------------------------------
-# Load a $MAKEFILE, apply the %TRANSFORM, and return it as a list of
-# paragraphs.
-sub make_paragraphs ($%)
+# $TEXT
+# preprocess_file ($MAKEFILE, [%TRANSFORM])
+# -----------------------------------------
+# Load a $MAKEFILE, apply the %TRANSFORM, and return the result.
+# No extra parsing of post-processing is done (i.e., recognition of
+# rules declaration or of make variables definitions).
+sub preprocess_file ($%)
 {
   my ($file, %transform) = @_;
 
@@ -7179,13 +6977,9 @@ sub make_paragraphs ($%)
 
                 'LIBTOOL'      => !! var ('LIBTOOL'),
                 'NONLIBTOOL'   => 1,
-                'FIRST'        => ! $transformed_files{$file},
                %transform);
 
-  $transformed_files{$file} = 1;
-  $_ = $am_file_cache{$file};
-
-  if (! defined $_)
+  if (! defined ($_ = $am_file_cache{$file}))
     {
       verb "reading $file";
       # Swallow the whole file.
@@ -7195,11 +6989,10 @@ sub make_paragraphs ($%)
       $_ = $fc_file->getline;
       $/ = $saved_dollar_slash;
       $fc_file->close;
-
       # Remove ##-comments.
       # Besides we don't need more than two consecutive new-lines.
       s/(?:$IGNORE_PATTERN|(?<=\n\n)\n+)//gom;
-
+      # Remember the contents of the just-read file.
       $am_file_cache{$file} = $_;
     }
 
@@ -7209,12 +7002,26 @@ sub make_paragraphs ($%)
       | \? !? [\w\-]+ \?
     )/transform($&, \%transform)/gex;
   # transform() may have added some ##%-comments to strip.
-  # (we use `##%' instead of `##' so we can distinguish ##%##%##% from
+  # (we use '##%' instead of '##' so we can distinguish ##%##%##% from
   # ####### and do not remove the latter.)
   s/^[ \t]*(?:##%)+.*\n//gm;
 
-  # Split at unescaped new lines.
-  my @lines = split (/(?<!\\)\n/, $_);
+  return $_;
+}
+
+
+# @PARAGRAPHS
+# &make_paragraphs ($MAKEFILE, [%TRANSFORM])
+# ------------------------------------------
+# Load a $MAKEFILE, apply the %TRANSFORM, and return it as a list of
+# paragraphs.
+sub make_paragraphs ($%)
+{
+  my ($file, %transform) = @_;
+  $transform{FIRST} = !$transformed_files{$file};
+  $transformed_files{$file} = 1;
+
+  my @lines = split /(?<!\\)\n/, preprocess_file ($file, %transform);
   my @res;
 
   while (defined ($_ = shift @lines))
@@ -7307,8 +7114,8 @@ sub file_contents_internal ($$$%)
            if ($cond != FALSE)
              {
                my $file = ($is_am ? "$libdir/am/" : '') . $1;
-               $where->push_context ("`$file' included from here");
-               # N-ary `.=' fails.
+               $where->push_context ("'$file' included from here");
+               # N-ary '.=' fails.
                my ($com, $vars, $rules)
                  = file_contents_internal ($is_am, $file, $where, %transform);
                $where->pop_context;
@@ -7368,7 +7175,7 @@ sub file_contents_internal ($$$%)
 
              # FIXME: 3. We are not robust to people defining a subset
              # of a previously defined "multiple-target" rule.  E.g.
-             # `foo:' after `foo bar:'.
+             # 'foo:' after 'foo bar:'.
 
              # Output only if not in FALSE.
              if (defined $dependencies{$_} && $cond != FALSE)
@@ -7406,7 +7213,7 @@ sub file_contents_internal ($$$%)
        elsif (/$ASSIGNMENT_PATTERN/mso)
        {
            my ($var, $type, $val) = ($1, $2, $3);
-           error $where, "variable `$var' with trailing backslash"
+           error $where, "variable '$var' with trailing backslash"
              if /\\$/;
 
            $is_rule = 0;
@@ -7422,7 +7229,7 @@ sub file_contents_internal ($$$%)
        else
        {
            # This isn't an error; it is probably some tokens which
-           # configure is supposed to replace, such as address@hidden@',
+           # configure is supposed to replace, such as '@SET-MAKE@',
            # or some part of a rule cut by an if/endif.
            if (! $cond->false && ! ($is_rule && $discard_rule))
              {
@@ -7461,10 +7268,10 @@ sub file_contents ($$%)
 # &am_primary_prefixes ($PRIMARY, $CAN_DIST, @PREFIXES)
 # -----------------------------------------------------
 # Find all variable prefixes that are used for install directories.  A
-# prefix `zar' qualifies iff:
+# prefix 'zar' qualifies iff:
 #
-# * `zardir' is a variable.
-# * `zar_PRIMARY' is a variable.
+# * 'zardir' is a variable.
+# * 'zar_PRIMARY' is a variable.
 #
 # As a side effect, it looks for misspellings.  It is an error to have
 # a variable ending in a "reserved" suffix whose prefix is unknown, e.g.
@@ -7500,18 +7307,18 @@ sub am_primary_prefixes ($$@)
          if ($dist ne '' && ! $can_dist)
            {
              err_var ($var,
-                      "invalid variable `$varname': `dist' is forbidden");
+                      "invalid variable '$varname': 'dist' is forbidden");
            }
          # Standard directories must be explicitly allowed.
          elsif (! defined $valid{$X} && exists $standard_prefix{$X})
            {
              err_var ($var,
-                      "`${X}dir' is not a legitimate directory " .
-                      "for `$primary'");
+                      "'${X}dir' is not a legitimate directory " .
+                      "for '$primary'");
            }
          # A not explicitly valid directory is allowed if Xdir is defined.
          elsif (! defined $valid{$X} &&
-                $var->requires_variables ("`$varname' is used", "${X}dir"))
+                $var->requires_variables ("'$varname' is used", "${X}dir"))
            {
              # Nothing to do.  Any error message has been output
              # by $var->requires_variables.
@@ -7533,7 +7340,7 @@ sub am_primary_prefixes ($$@)
 }
 
 
-# Handle `where_HOW' variable magic.  Does all lookups, generates
+# Handle 'where_HOW' variable magic.  Does all lookups, generates
 # install code, and possibly generates code to define the primary
 # variable.  The first argument is the name of the .am file to munge,
 # the second argument is the primary variable (e.g. HEADERS), and all
@@ -7581,10 +7388,10 @@ sub am_install_var
 
   # Now that configure substitutions are allowed in where_HOW
   # variables, it is an error to actually define the primary.  We
-  # allow `JAVA', as it is customarily used to mean the Java
+  # allow 'JAVA', as it is customarily used to mean the Java
   # interpreter.  This is but one of several Java hacks.  Similarly,
-  # `PYTHON' is customarily used to mean the Python interpreter.
-  reject_var $primary, "`$primary' is an anachronism"
+  # 'PYTHON' is customarily used to mean the Python interpreter.
+  reject_var $primary, "'$primary' is an anachronism"
     unless $primary eq 'JAVA' || $primary eq 'PYTHON';
 
   # Get the prefixes which are valid and actually used.
@@ -7638,7 +7445,7 @@ sub am_install_var
              if ($nodir_name eq 'EXTRA')
                {
                  error ($where,
-                        "`$one_name' contains configure substitution, "
+                        "'$one_name' contains configure substitution, "
                         . "but shouldn't");
                }
              # Check here to make sure variables defined in
@@ -7691,7 +7498,7 @@ sub am_install_var
       my $check_options_p = $install_p && !! option 'std-options';
 
       # Use the location of the currently processed variable as context.
-      $where->push_context ("while processing `$one_name'");
+      $where->push_context ("while processing '$one_name'");
 
       # The variable containing all files to distribute.
       my $distvar = "\$($one_name)";
@@ -7724,8 +7531,8 @@ sub am_install_var
     }
 
   err_var ($require_extra,
-          "`$require_extra' contains configure substitution,\n"
-          . "but `EXTRA_$primary' not defined")
+          "'$require_extra' contains configure substitution,\n"
+          . "but 'EXTRA_$primary' not defined")
     if ($require_extra && ! var ('EXTRA_' . $primary));
 
   # Push here because PRIMARY might be configure time determined.
@@ -7750,7 +7557,7 @@ sub am_install_var
 ################################################################
 
 # Each key in this hash is the name of a directory holding a
-# Makefile.in.  These variables are local to `is_make_dir'.
+# Makefile.in.  These variables are local to 'is_make_dir'.
 my %make_dirs = ();
 my $make_dirs_set = 0;
 
@@ -7805,18 +7612,42 @@ sub locate_aux_dir ()
 }
 
 
-# &maybe_push_required_file ($DIR, $FILE, $FULLFILE)
+# &push_required_file ($DIR, $FILE, $FULLFILE)
 # --------------------------------------------------
-# See if we want to push this file onto dist_common.  This function
-# encodes the rules for deciding when to do so.
-sub maybe_push_required_file
+# Push the given file onto DIST_COMMON.
+sub push_required_file
 {
   my ($dir, $file, $fullfile) = @_;
 
+  # If the file to be distributed is in the same directory of the
+  # currently processed Makefile.am, then we want to distribute it
+  # from this same Makefile.am.
   if ($dir eq $relative_dir)
     {
       push_dist_common ($file);
-      return 1;
+    }
+  # This is needed to allow a construct in a non-top-level Makefile.am
+  # to require a file in the build-aux directory (see at least the test
+  # script 'test-driver-is-distributed.test').  This is related to the
+  # automake bug#9546.  Note that the use of $config_aux_dir instead
+  # of $am_config_aux_dir here is deliberate and necessary.
+  elsif ($dir eq $config_aux_dir)
+    {
+      push_dist_common ("$am_config_aux_dir/$file");
+    }
+  # FIXME: another spacial case, for AC_LIBOBJ/AC_LIBSOURCE support.
+  # We probably need some refactoring of this function and its callers,
+  # to have a more explicit and systematic handling of all the special
+  # cases; but, since there are only two of them, this is low-priority
+  # ATM.
+  elsif ($config_libobj_dir && $dir eq $config_libobj_dir)
+    {
+      # Avoid unsightly '/.'s.
+      my $am_config_libobj_dir =
+        '$(top_srcdir)' .
+        ($config_libobj_dir eq '.' ? "" : "/$config_libobj_dir");
+      $am_config_libobj_dir =~ s|/*$||;
+      push_dist_common ("$am_config_libobj_dir/$file");
     }
   elsif ($relative_dir eq '.' && ! &is_make_dir ($dir))
     {
@@ -7825,7 +7656,7 @@ sub maybe_push_required_file
       # here.
 
       # If a required file is above the source tree, it is important
-      # to prefix it with `$(srcdir)' so that no VPATH search is
+      # to prefix it with '$(srcdir)' so that no VPATH search is
       # performed.  Otherwise problems occur with Make implementations
       # that rewrite and simplify rules whose dependencies are found in a
       # VPATH location.  Here is an example with OSF1/Tru64 Make.
@@ -7840,8 +7671,8 @@ sub maybe_push_required_file
       #   echo a
       #   a
       #
-      # Dependency `../a' was found in `sub/../a', but this make
-      # implementation simplified it as `a'.  (Note that the sub/
+      # Dependency '../a' was found in 'sub/../a', but this make
+      # implementation simplified it as 'a'.  (Note that the sub/
       # directory does not even exist.)
       #
       # This kind of VPATH rewriting seems hard to cancel.  The
@@ -7854,9 +7685,12 @@ sub maybe_push_required_file
        if $dir =~ m,^\.\.(?:$|/),;
 
       push_dist_common ($fullfile);
-      return 1;
     }
-  return 0;
+  else
+    {
+      prog_error "a Makefile in relative directory $relative_dir " .
+                 "can't add files in directory $dir to DIST_COMMON";
+    }
 }
 
 
@@ -7865,140 +7699,141 @@ sub maybe_push_required_file
 # than once.
 my %required_file_not_found = ();
 
-# &require_file_internal ($WHERE, $MYSTRICT, $DIRECTORY, @FILES)
-# --------------------------------------------------------------
+# &required_file_check_or_copy ($WHERE, $DIRECTORY, $FILE)
+# --------------------------------------------------------
 # Verify that the file must exist in $DIRECTORY, or install it.
-# $MYSTRICT is the strictness level at which this file becomes required.
-sub require_file_internal ($$$@)
+sub required_file_check_or_copy ($$$)
 {
-  my ($where, $mystrict, $dir, @files) = @_;
+  my ($where, $dir, $file) = @_;
 
-  foreach my $file (@files)
+  my $fullfile = "$dir/$file";
+  my $found_it = 0;
+  my $dangling_sym = 0;
+
+  if (-l $fullfile && ! -f $fullfile)
+    {
+      $dangling_sym = 1;
+    }
+  elsif (dir_has_case_matching_file ($dir, $file))
     {
-      my $fullfile = "$dir/$file";
-      my $found_it = 0;
-      my $dangling_sym = 0;
+      $found_it = 1;
+    }
 
-      if (-l $fullfile && ! -f $fullfile)
-       {
-         $dangling_sym = 1;
-       }
-      elsif (dir_has_case_matching_file ($dir, $file))
-       {
-         $found_it = 1;
-         maybe_push_required_file ($dir, $file, $fullfile);
-       }
+  # '--force-missing' only has an effect if '--add-missing' is
+  # specified.
+  return
+    if $found_it && (! $add_missing || ! $force_missing);
 
-      # `--force-missing' only has an effect if `--add-missing' is
-      # specified.
-      if ($found_it && (! $add_missing || ! $force_missing))
-       {
-         next;
-       }
-      else
-       {
-         # If we've already looked for it, we're done.  You might
-         # wonder why we don't do this before searching for the
-         # file.  If we do that, then something like
-         # AC_OUTPUT(subdir/foo foo) will fail to put foo.in into
-         # DIST_COMMON.
-         if (! $found_it)
-           {
-             next if defined $required_file_not_found{$fullfile};
-             $required_file_not_found{$fullfile} = 1;
-           }
+  # If we've already looked for it, we're done.  You might
+  # wonder why we don't do this before searching for the
+  # file.  If we do that, then something like
+  # AC_OUTPUT(subdir/foo foo) will fail to put foo.in into
+  # DIST_COMMON.
+  if (! $found_it)
+    {
+      return if defined $required_file_not_found{$fullfile};
+      $required_file_not_found{$fullfile} = 1;
+    }
+  if ($dangling_sym && $add_missing)
+    {
+      unlink ($fullfile);
+    }
 
-         if ($strictness >= $mystrict)
-           {
-             if ($dangling_sym && $add_missing)
-               {
-                 unlink ($fullfile);
-               }
+  my $trailer = '';
+  my $trailer2 = '';
+  my $suppress = 0;
 
-             my $trailer = '';
-             my $trailer2 = '';
-             my $suppress = 0;
+  # Only install missing files according to our desired
+  # strictness level.
+  my $message = "required file '$fullfile' not found";
+  if ($add_missing)
+    {
+      if (-f "$libdir/$file")
+        {
+          $suppress = 1;
 
-             # Only install missing files according to our desired
-             # strictness level.
-             my $message = "required file `$fullfile' not found";
-             if ($add_missing)
-               {
-                 if (-f "$libdir/$file")
-                   {
-                     $suppress = 1;
-
-                     # Install the missing file.  Symlink if we
-                     # can, copy if we must.  Note: delete the file
-                     # first, in case it is a dangling symlink.
-                     $message = "installing `$fullfile'";
-
-                     # The license file should not be volatile.
-                     if ($file eq "COPYING")
-                       {
-                         $message .= " using GNU General Public License v3 
file";
-                         $trailer2 = "\n    Consider adding the COPYING file"
-                                   . " to the version control system"
-                                   . "\n    for your code, to avoid questions"
-                                   . " about which license your project uses.";
-                       }
+          # Install the missing file.  Symlink if we
+          # can, copy if we must.  Note: delete the file
+          # first, in case it is a dangling symlink.
+          $message = "installing '$fullfile'";
 
-                     # Windows Perl will hang if we try to delete a
-                     # file that doesn't exist.
-                     unlink ($fullfile) if -f $fullfile;
-                     if ($symlink_exists && ! $copy_missing)
-                       {
-                         if (! symlink ("$libdir/$file", $fullfile)
-                             || ! -e $fullfile)
-                           {
-                             $suppress = 0;
-                             $trailer = "; error while making link: $!";
-                           }
-                       }
-                     elsif (system ('cp', "$libdir/$file", $fullfile))
-                       {
-                         $suppress = 0;
-                         $trailer = "\n    error while copying";
-                       }
-                     set_dir_cache_file ($dir, $file);
-                   }
+          # The license file should not be volatile.
+          if ($file eq "COPYING")
+            {
+              $message .= " using GNU General Public License v3 file";
+              $trailer2 = "\n    Consider adding the COPYING file"
+                        . " to the version control system"
+                        . "\n    for your code, to avoid questions"
+                        . " about which license your project uses";
+            }
 
-                 if (! maybe_push_required_file (dirname ($fullfile),
-                                                 $file, $fullfile))
-                   {
-                     if (! $found_it && ! $automake_will_process_aux_dir)
-                       {
-                         # We have added the file but could not push it
-                         # into DIST_COMMON, probably because this is
-                         # an auxiliary file and we are not processing
-                         # the top level Makefile.  Furthermore Automake
-                         # hasn't been asked to create the Makefile.in
-                         # that distributes the aux dir files.
-                         error ($where, 'Please make a full run of automake'
-                                . " so $fullfile gets distributed.");
-                       }
-                   }
-               }
-             else
-               {
-                 $trailer = "\n  `automake --add-missing' can install `$file'"
-                   if -f "$libdir/$file";
-               }
+          # Windows Perl will hang if we try to delete a
+          # file that doesn't exist.
+          unlink ($fullfile) if -f $fullfile;
+          if ($symlink_exists && ! $copy_missing)
+            {
+              if (! symlink ("$libdir/$file", $fullfile)
+                  || ! -e $fullfile)
+                {
+                  $suppress = 0;
+                  $trailer = "; error while making link: $!";
+                }
+            }
+          elsif (system ('cp', "$libdir/$file", $fullfile))
+            {
+              $suppress = 0;
+              $trailer = "\n    error while copying";
+            }
+          set_dir_cache_file ($dir, $file);
+        }
+    }
+  else
+    {
+      $trailer = "\n  'automake --add-missing' can install '$file'"
+        if -f "$libdir/$file";
+    }
 
-             # If --force-missing was specified, and we have
-             # actually found the file, then do nothing.
-             next
-               if $found_it && $force_missing;
+  # If --force-missing was specified, and we have
+  # actually found the file, then do nothing.
+  return
+    if $found_it && $force_missing;
 
-             # If we couldn't install the file, but it is a target in
-             # the Makefile, don't print anything.  This allows files
-             # like README, AUTHORS, or THANKS to be generated.
-             next
-               if !$suppress && rule $file;
+  # If we couldn't install the file, but it is a target in
+  # the Makefile, don't print anything.  This allows files
+  # like README, AUTHORS, or THANKS to be generated.
+  return
+    if !$suppress && rule $file;
 
-             msg ($suppress ? 'note' : 'error', $where, 
"$message$trailer$trailer2");
-           }
-       }
+  msg ($suppress ? 'note' : 'error', $where, "$message$trailer$trailer2");
+}
+
+
+# &require_file_internal ($WHERE, $MYSTRICT, $DIRECTORY, $QUEUE, @FILES)
+# ----------------------------------------------------------------------
+# Verify that the file must exist in $DIRECTORY, or install it.
+# $MYSTRICT is the strictness level at which this file becomes required.
+# Worker threads may queue up the action to be serialized by the master,
+# if $QUEUE is true
+sub require_file_internal ($$$@)
+{
+  my ($where, $mystrict, $dir, $queue, @files) = @_;
+
+  return
+    unless $strictness >= $mystrict;
+
+  foreach my $file (@files)
+    {
+      push_required_file ($dir, $file, "$dir/$file");
+      if ($queue)
+        {
+          queue_required_file_check_or_copy ($required_conf_file_queue,
+                                             QUEUE_CONF_FILE, $relative_dir,
+                                             $where, $mystrict, @files);
+        }
+      else
+        {
+          required_file_check_or_copy ($where, $dir, $file);
+        }
     }
 }
 
@@ -8007,7 +7842,7 @@ sub require_file_internal ($$$@)
 sub require_file ($$@)
 {
     my ($where, $mystrict, @files) = @_;
-    require_file_internal ($where, $mystrict, $relative_dir, @files);
+    require_file_internal ($where, $mystrict, $relative_dir, 0, @files);
 }
 
 # &require_file_with_macro ($COND, $MACRO, $MYSTRICT, @FILES)
@@ -8030,7 +7865,7 @@ sub require_libsource_with_macro ($$$@)
     if ($config_libobj_dir)
       {
        require_file_internal ($macro->rdef ($cond)->location, $mystrict,
-                              $config_libobj_dir, @files);
+                              $config_libobj_dir, 0, @files);
       }
     else
       {
@@ -8038,12 +7873,10 @@ sub require_libsource_with_macro ($$$@)
       }
 }
 
-# Queue to push require_conf_file requirements to.
-my $required_conf_file_queue;
-
-# &queue_required_conf_file ($QUEUE, $KEY, $DIR, $WHERE, $MYSTRICT, @FILES)
-# -------------------------------------------------------------------------
-sub queue_required_conf_file ($$$$@)
+# &queue_required_file_check_or_copy ($QUEUE, $KEY, $DIR, $WHERE,
+#                                     $MYSTRICT, @FILES)
+# ---------------------------------------------------------------
+sub queue_required_file_check_or_copy ($$$$@)
 {
     my ($queue, $key, $dir, $where, $mystrict, @files) = @_;
     my @serial_loc;
@@ -8058,9 +7891,9 @@ sub queue_required_conf_file ($$$$@)
     $queue->enqueue ($key, $dir, @serial_loc, $mystrict, 0 + @files, @files);
 }
 
-# &require_queued_conf_file ($QUEUE)
-# ----------------------------------
-sub require_queued_conf_file ($)
+# &require_queued_file_check_or_copy ($QUEUE)
+# -------------------------------------------
+sub require_queued_file_check_or_copy ($)
 {
     my ($queue) = @_;
     my $where;
@@ -8083,35 +7916,23 @@ sub require_queued_conf_file ($)
     my @files;
     push @files, $queue->dequeue ()
       foreach (1 .. $nfiles);
-
-    # Dequeuing happens outside of per-makefile context, so we have to
-    # set the variables used by require_file_internal and the functions
-    # it calls.  Gross!
-    $relative_dir = $dir;
-    require_file_internal ($where, $mystrict, $config_aux_dir, @files);
+    return
+      unless $strictness >= $mystrict;
+    foreach my $file (@files)
+      {
+        required_file_check_or_copy ($where, $config_aux_dir, $file);
+      }
 }
 
 # &require_conf_file ($WHERE, $MYSTRICT, @FILES)
 # ----------------------------------------------
-# Looks in configuration path, as specified by AC_CONFIG_AUX_DIR;
-# worker threads may queue up the action to be serialized by the master.
-#
-# FIXME: this seriously relies on the semantics of require_file_internal
-# and maybe_push_required_file, in that we exploit the fact that only the
-# contents of the last handled output file may be impacted (which in turn
-# is dealt with by the master thread).
+# Looks in configuration path, as specified by AC_CONFIG_AUX_DIR.
 sub require_conf_file ($$@)
 {
     my ($where, $mystrict, @files) = @_;
-    if (defined $required_conf_file_queue)
-      {
-       queue_required_conf_file ($required_conf_file_queue, QUEUE_CONF_FILE,
-                                 $relative_dir, $where, $mystrict, @files);
-      }
-    else
-      {
-       require_file_internal ($where, $mystrict, $config_aux_dir, @files);
-      }
+    my $queue = defined $required_conf_file_queue ? 1 : 0;
+    require_file_internal ($where, $mystrict, $config_aux_dir,
+                           $queue, @files);
 }
 
 
@@ -8132,7 +7953,7 @@ sub require_conf_file_with_macro ($$$@)
 # the file that any target requiring this directory should be made
 # dependent upon.
 # We don't want to emit the rule twice, and want to reuse it
-# for directories with equivalent names (e.g., `foo/bar' and `./foo//bar').
+# for directories with equivalent names (e.g., 'foo/bar' and './foo//bar').
 sub require_build_directory ($)
 {
   my $directory = shift;
@@ -8157,7 +7978,7 @@ sub require_build_directory ($)
   define_pretty_variable ('am__dirstamp', TRUE, INTERNAL,
                          '$(am__leading_dot)dirstamp');
 
-  # Directory must be removed by `make distclean'.
+  # Directory must be removed by 'make distclean'.
   $clean_files{$dirstamp} = DIST_CLEAN;
 
   $output_rules .= ("$dirstamp:\n"
@@ -8253,14 +8074,14 @@ sub generate_makefile ($$)
          my $def = $v->def (TRUE);
          prog_error "$var not defined in condition TRUE"
            unless $def;
-         reject_var $var, "`$var' should not be defined"
+         reject_var $var, "'$var' should not be defined"
            if $def->owner != VAR_AUTOMAKE;
        }
     }
 
   # Catch some obsolete variables.
   msg_var ('obsolete', 'INCLUDES',
-          "`INCLUDES' is the old name for `AM_CPPFLAGS' (or `*_CPPFLAGS')")
+          "'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')")
     if var ('INCLUDES');
 
   # Must do this after reading .am file.
@@ -8297,7 +8118,6 @@ sub generate_makefile ($$)
       define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
     }
 
-  handle_multilib;
   handle_texinfo;
   handle_emacs_lisp;
   handle_python;
@@ -8338,20 +8158,15 @@ sub generate_makefile ($$)
 
   check_typos;
 
-  my ($out_file) = $output_directory . '/' . $makefile_in;
-
   if ($exit_code != 0)
     {
-      verb "not writing $out_file because of earlier errors";
+      verb "not writing $makefile_in because of earlier errors";
       return;
     }
 
-  if (! -d ($output_directory . '/' . $am_relative_dir))
-    {
-      mkdir ($output_directory . '/' . $am_relative_dir, 0755);
-    }
+  mkdir ($am_relative_dir, 0755) if ! -d $am_relative_dir;
 
-  # We make sure that `all:' is the first target.
+  # We make sure that 'all:' is the first target.
   my $output =
     "$output_vars$output_all$output_header$output_rules$output_trailer";
 
@@ -8368,25 +8183,25 @@ sub generate_makefile ($$)
   #  * other dependencies, specific to the Makefile.am being processed
   #    (such as the Makefile.am itself, or any Makefile fragment
   #    it includes).
-  my $timestamp = mtime $out_file;
+  my $timestamp = mtime $makefile_in;
   if (! $force_generation
       && $configure_deps_greatest_timestamp < $timestamp
       && $output_deps_greatest_timestamp < $timestamp
-      && $output eq contents ($out_file))
+      && $output eq contents ($makefile_in))
     {
-      verb "$out_file unchanged";
+      verb "$makefile_in unchanged";
       # No need to update.
       return;
     }
 
-  if (-e $out_file)
+  if (-e $makefile_in)
     {
-      unlink ($out_file)
-       or fatal "cannot remove $out_file: $!\n";
+      unlink ($makefile_in)
+       or fatal "cannot remove $makefile_in: $!";
     }
 
-  my $gm_file = new Automake::XFile "> $out_file";
-  verb "creating $out_file";
+  my $gm_file = new Automake::XFile "> $makefile_in";
+  verb "creating $makefile_in";
   print $gm_file $output;
 }
 
@@ -8444,7 +8259,7 @@ sub print_autodist_files (@)
 # Print usage information.
 sub usage ()
 {
-    print "Usage: $0 [OPTION] ... [Makefile]...
+    print "Usage: $0 [OPTION]... [Makefile]...
 
 Generate Makefile.in for configure from Makefile.am.
 
@@ -8467,7 +8282,8 @@ Flavors:
 
 Library files:
   -a, --add-missing      add missing standard files to package
-      --libdir=DIR       directory storing library files
+      --libdir=DIR       set directory storing library files
+      --print-libdir     print directory storing library files
   -c, --copy             with -a, copy missing files (default is symlink)
   -f, --force-missing    force update of standard files
 
@@ -8516,46 +8332,41 @@ EOF
 # Parse command line.
 sub parse_arguments ()
 {
-  # Start off as gnu.
-  set_strictness ('gnu');
+  my $strict = 'gnu';
+  my $cygnus = 0;
+  my $ignore_deps = 0;
+  my @warnings = ();
 
-  my $cli_where = new Automake::Location;
   my %cli_options =
     (
      'version' => \&version,
      'help'    => \&usage,
      'libdir=s'        => \$libdir,
-     'gnu'             => sub { set_strictness ('gnu'); },
-     'gnits'           => sub { set_strictness ('gnits'); },
-     'cygnus'          => sub { set_global_option ('cygnus', $cli_where); },
-     'foreign'          => sub { set_strictness ('foreign'); },
-     'include-deps'    => sub { unset_global_option ('no-dependencies'); },
-     'i|ignore-deps'   => sub { set_global_option ('no-dependencies',
-                                                   $cli_where); },
+     'print-libdir'     => sub { print "$libdir\n"; exit 0; },
+     'gnu'             => sub { $strict = 'gnu'; },
+     'gnits'           => sub { $strict = 'gnits'; },
+     'foreign'         => sub { $strict = 'foreign'; },
+     'cygnus'          => \$cygnus,
+     'include-deps'    => sub { $ignore_deps = 0; },
+     'i|ignore-deps'   => sub { $ignore_deps = 1; },
      'no-force'        => sub { $force_generation = 0; },
      'f|force-missing'  => \$force_missing,
-     'o|output-dir=s'  => \$output_directory,
      'a|add-missing'   => \$add_missing,
      'c|copy'          => \$copy_missing,
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
-     'W|warnings=s'     => \&parse_warnings,
-     # These long options (--Werror and --Wno-error) for backward
-     # compatibility.  Use -Werror and -Wno-error today.
-     'Werror'           => sub { parse_warnings 'W', 'error'; },
-     'Wno-error'        => sub { parse_warnings 'W', 'no-error'; },
+     'W|warnings=s'     => address@hidden,
      );
 
   use Automake::Getopt ();
   Automake::Getopt::parse_options %cli_options;
 
-  if (defined $output_directory)
-    {
-      msg 'obsolete', "`--output-dir' is deprecated\n";
-    }
-  else
+  set_strictness ($strict);
+  my $cli_where = new Automake::Location;
+  set_global_option ('cygnus', $cli_where) if $cygnus;
+  set_global_option ('no-dependencies', $cli_where) if $ignore_deps;
+  for my $warning (@warnings)
     {
-      # In the next release we'll remove this entirely.
-      $output_directory = '.';
+      &parse_warnings ('-W', $warning);
     }
 
   return unless @ARGV;
@@ -8563,7 +8374,7 @@ sub parse_arguments ()
   my $errspec = 0;
   foreach my $arg (@ARGV)
     {
-      fatal ("empty argument\nTry `$0 --help' for more information.")
+      fatal ("empty argument\nTry '$0 --help' for more information")
        if ($arg eq '');
 
       # Handle $local:$input syntax.
@@ -8577,7 +8388,7 @@ sub parse_arguments ()
        }
       else
        {
-         error "no Automake input file found for `$arg'";
+         error "no Automake input file found for '$arg'";
          $errspec = 1;
        }
     }
@@ -8595,7 +8406,7 @@ sub handle_makefile ($)
   ($am_file = $file) =~ s/\.in$//;
   if (! -f ($am_file . '.am'))
     {
-      error "`$am_file.am' does not exist";
+      error "'$am_file.am' does not exist";
     }
   else
     {
@@ -8633,11 +8444,6 @@ sub get_number_of_threads
   # It doesn't make sense to use more threads than makefiles,
   my $max_threads = @input_files;
 
-  # but a single worker thread is helpful for exposing bugs.
-  if ($automake_will_process_aux_dir && $max_threads > 1)
-    {
-      $max_threads--;
-    }
   if ($nthreads > $max_threads)
     {
       $nthreads = $max_threads;
@@ -8661,18 +8467,11 @@ sub handle_makefiles_threaded ($)
 {
   my ($nthreads) = @_;
 
-  my @queued_input_files = @input_files;
-  my $last_input_file = undef;
-  if ($automake_will_process_aux_dir)
-    {
-      $last_input_file = pop @queued_input_files;
-    }
-
   # The file queue distributes all makefiles, the message queues
   # collect all serializations needed for respective files.
   my $file_queue = Thread::Queue->new;
   my %msg_queues;
-  foreach my $file (@queued_input_files)
+  foreach my $file (@input_files)
     {
       $msg_queues{$file} = Thread::Queue->new;
     }
@@ -8698,12 +8497,12 @@ sub handle_makefiles_threaded ($)
        });
     }
 
-  # Queue all normal makefiles.
-  verb "queuing " . @queued_input_files . " input files";
-  $file_queue->enqueue (@queued_input_files, (undef) x @threads);
+  # Queue all makefiles.
+  verb "queuing " . @input_files . " input files";
+  $file_queue->enqueue (@input_files, (undef) x @threads);
 
   # Collect and process serializations.
-  foreach my $file (@queued_input_files)
+  foreach my $file (@input_files)
     {
       verb "dequeuing messages for " . $file;
       reset_local_duplicates ();
@@ -8716,7 +8515,7 @@ sub handle_makefiles_threaded ($)
            }
          elsif ($key eq QUEUE_CONF_FILE)
            {
-             require_queued_conf_file ($queue);
+             require_queued_file_check_or_copy ($queue);
            }
          else
            {
@@ -8731,13 +8530,6 @@ sub handle_makefiles_threaded ($)
       $exit_code = $exit_thread[0]
        if ($exit_thread[0] > $exit_code);
     }
-
-  # The master processes the last file.
-  if ($automake_will_process_aux_dir)
-    {
-      verb "processing last input file";
-      handle_makefile ($last_input_file);
-    }
 }
 
 ################################################################
@@ -8758,7 +8550,7 @@ if (! @input_files)
     my $msg = '';
     $msg = "\nDid you forget AC_CONFIG_FILES([Makefile]) in $configure_ac?"
       if -f 'Makefile.am';
-    fatal ("no `Makefile.am' found for any configure output$msg");
+    fatal ("no 'Makefile.am' found for any configure output$msg");
   }
 
 my $nthreads = get_number_of_threads ();
diff --git a/bootstrap b/bootstrap
index c0043a3..814aedb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,7 @@
 
 # This script helps bootstrap automake, when checked out from git.
 #
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 # Originally written by Pavel Roskin <address@hidden> September 2002.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -69,7 +68,7 @@ if test -d automake-$APIVERSION; then
   find automake-$APIVERSION -exec chmod u+wx '{}' ';'
 fi
 rm -rf automake-$APIVERSION
-# Can't use `ln -s lib automake-$APIVERSION', that would create a
+# Can't use "ln -s lib automake-$APIVERSION", that would create a
 # lib.exe stub under DJGPP 2.03.
 mkdir automake-$APIVERSION
 cp -rf lib/* automake-$APIVERSION
@@ -103,13 +102,13 @@ dosubst m4/amversion.in m4/amversion.m4
 # Create temporary replacement for automake.
 dosubst automake.in automake.tmp
 
-# Create tests/parallel-tests.am.
-cd tests
-$BOOTSTRAP_SHELL ./gen-parallel-tests > parallel-tests.am
-cd ..
+# Create required makefile snippets.
+$PERL ./gen-testsuite-part > t/testsuite-part.tmp
+chmod a-w t/testsuite-part.tmp
+mv -f t/testsuite-part.tmp t/testsuite-part.am
 
 # Run the autotools.
-# Use `-I' here so that our own *.m4 files in m4/ gets included,
+# Use '-I' here so that our own *.m4 files in m4/ gets included,
 # not copied, in aclocal.m4.
 $PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir
 $AUTOCONF
diff --git a/configure.ac b/configure.ac
index 4b0be1b..2c78288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,18 +16,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.68])
-AC_INIT([GNU Automake], [1.11.0a], address@hidden)
+AC_INIT([GNU Automake], [1.12.0a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
 
 AM_SILENT_RULES([yes])
 
+AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
 # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
 # way we can run Autoconf tests from configure (or from the test
-# suite) without being bothered by `missing'.  Likewise for autom4te,
+# suite) without being bothered by 'missing'.  Likewise for autom4te,
 # autoreconf, autoheader, and autoupdate.
 AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"])
 AC_SUBST([am_AUTOM4TE], ["${AUTOM4TE-autom4te}"])
@@ -37,7 +36,11 @@ AC_SUBST([am_AUTORECONF], ["${AUTORECONF-autoreconf}"])
 AC_SUBST([am_AUTOHEADER], ["${AUTOHEADER-autoheader}"])
 AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"])
 
-AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests 
parallel-tests])
+dnl We call AC_PROG_CC in an unusual way, and only for use in our
+dnl testsuite, so also use 'no-dependencies' and 'no-define' among
+dnl the automake options to avoid bloating and potential problems.
+AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests
+                 parallel-tests silent-rules no-define no-dependencies])
 
 # The API version is the base version.  We must guarantee
 # compatibility for all releases with the same API version.
@@ -49,11 +52,14 @@ AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 
color-tests parallel-test
 APIVERSION=`echo "$VERSION" | sed -e 
's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
 AC_SUBST([APIVERSION])
 
-# A versioned directory, defined here for convenience.
 AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
+AC_SUBST([scriptdir], ["\${pkgvdatadir}"])
+AC_SUBST([amdir], ["\${pkgvdatadir}/am"])
+AC_SUBST([automake_acdir], ["\${datadir}/aclocal-$APIVERSION"])
+AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
 
-# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
-# hence `.' is really what we want for perllibdir, libdir, and acdir.
+# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
+# hence '.' is really what we want for perllibdir, libdir, and acdir.
 ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" 
--acdir=m4 -I m4"
 AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" 
--libdir=lib"
 
@@ -104,8 +110,19 @@ AC_CHECK_PROG([TEX], [tex], [tex])
 # for input from the terminal.
 AM_RUN_LOG([$TEX --version </dev/null])
 
-# Generate man pages.
-AM_MISSING_PROG([HELP2MAN], [help2man])
+# The test suite will skip some tests if no lex or yacc program is
+# available.
+# We don't use AC_PROG_LEX nor AC_PROG_YACC here because:
+#  1. we don't want flex (resp. bison) to be preferred to system lex
+#     (resp. system yacc);
+#  2. we don't want $LEX (resp. $YACC) to be defined to ':' (resp. 'yacc')
+#     by default;
+#  3. we prefer not to have the variables YFLAGS, LEX_OUTPUT_ROOT and
+#     LEXLIB to be calculated and/or AC_SUBST'd;
+#  4. we prefer that the YACC and LEX variables are not reported in the
+#     configure help screen.
+AC_CHECK_PROGS([YACC], [yacc byacc 'bison -y'], [false])
+AC_CHECK_PROGS([LEX], [lex flex], [false])
 
 # Test for Autoconf.  We run Autoconf in a subdirectory to ease
 # deletion of any files created (such as those added to
@@ -187,9 +204,9 @@ AC_SUBST([MODIFICATION_DELAY])
 AC_PROG_EGREP
 AC_PROG_FGREP
 
-AC_CACHE_CHECK([whether /bin/sh has working 'set -e' with exit trap],
+AC_CACHE_CHECK([whether $SHELL has working 'set -e' with exit trap],
 [am_cv_sh_errexit_works],
-[if /bin/sh -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
+[if $SHELL -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
 then
   am_cv_sh_errexit_works=yes
 else
@@ -197,27 +214,195 @@ else
 fi
 ])
 if test $am_cv_sh_errexit_works = no; then
-  AC_MSG_WARN([`${MAKE-make} check' will leave leftover directories 
tests/*.dir])
-  AC_MSG_WARN([you can clean them up manually using `${MAKE-make} clean' or])
-  AC_MSG_WARN([`cd tests && ${MAKE-make} clean-local-check'])
-  dnl restore font-lock: `
+  AC_MSG_WARN(["${MAKE-make} check" will leave leftover directories t/*.dir])
+  AC_MSG_WARN([you can clean them up manually using "${MAKE-make} clean" or])
+  AC_MSG_WARN(["cd t && ${MAKE-make} clean-local-check'])
 fi
 AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
 
-AC_CONFIG_FILES([
-  Makefile
-  contrib/Makefile
-  doc/Makefile
-  lib/Makefile
-  m4/Makefile
-  tests/Makefile
-  tests/defs
+
+###########################################################################
+
+# Look for C, C++ and fortran compilers to be used in the testsuite.
+
+dnl We don't want to abort our configuration script if no C compiler is
+dnl available, as such a compiler is only required to run part of the
+dnl testsuite, not to build or install Automake.  Ditto for C++, Fortran
+dnl and Fortran 77 compilers.  Unfortunately, autoconf does not offer an
+dnl easy way to obtain this behaviour, so we'll need a few hacks.
+
+dnl We want the body of this macro to expand as a single shell statement,
+dnl thus we wrap it into { ... } brackets.
+AC_DEFUN([_AM_WRAP_MSG_ERROR], [ {
+  AC_MSG_WARN([$1])
+  am__failed=yes
+  break
+} ])
+
+AC_DEFUN([_AM_COMPILER_CAN_FAIL], [
+  m4_pushdef([AC_MSG_FAILURE], m4_defn([_AM_WRAP_MSG_ERROR]))
+  m4_pushdef([AC_MSG_ERROR],   m4_defn([_AM_WRAP_MSG_ERROR]))
+  am__failed=no
+  while :; do
+     $1
+     break
+  done
+  AS_IF([test $am__failed = yes], [$2])
+  # We have to clear these cache variables, so that future checks on
+  # compilers for different languages won't be confused.
+  unset ac_cv_objext ac_cv_exeext
+  # We also need to meddle with the autoconf internals to ensure that
+  # checks to find object and executable extensions will be run anew.
+  # FIXME: In the long run, the better thing to do would be to fix
+  # FIXME: autoconf instead ...
+  m4_undefine([m4_provide(_AC_COMPILER_OBJEXT)])
+  m4_undefine([m4_provide(_AC_COMPILER_EXEEXT)])
+  m4_popdef([AC_MSG_FAILURE])
+  m4_popdef([AC_MSG_ERROR])
 ])
-AC_CONFIG_FILES([tests/aclocal-${APIVERSION}:tests/aclocal.in],
-                [chmod +x tests/aclocal-${APIVERSION}],
+
+AC_DEFUN([_AM_SKIP_COMP_TESTS],
+  [AC_MSG_NOTICE([tests requiring the $1 compiler will be skipped])])
+
+# Prefer generic compilers to GNU ones when possible.  This will ensure
+# more testsuite coverage "in the wild".
+# Note that we don't look for the MSVC C/C++ compiler here.  This is
+# deliberate; for more discussion and rationale, see:
+# <http://lists.gnu.org/archive/html/automake-patches/2012-01/msg00130.html>
+
+AC_MSG_NOTICE([will now look for generic compilers])
+
+# C compiler.
+_AM_COMPILER_CAN_FAIL(dnl
+  [AC_PROG_CC([cc gcc])],
+  [CC=false; _AM_SKIP_COMP_TESTS([C])])
+
+AS_IF([test x"$GCC" = x"yes"], [am_CC_is_GNU=yes], [am_CC_is_GNU=no])
+
+# The list of C++ compilers here has been copied, pasted and edited
+# from 'lib/autoconf/c.m4:AC_PROG_CXX' in the Autoconf distribution.
+# Keep it in sync, or better again, find out a way to avoid this code
+# duplication.
+_AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl
+  [aCC CC FCC KCC RCC xlC_r xlC c++ cxx cc++ gpp g++])],
+  [CXX=false; _AM_SKIP_COMP_TESTS([C++])])
+
+AS_IF([test x"$GXX" = x"yes"], [am_CXX_is_GNU=yes], [am_CXX_is_GNU=no])
+
+# The lists of Fortran compilers here has been copied, pasted and edited
+# from file 'lib/autoconf/fortran.m4' in the Autoconf distribution.
+# Keep it in sync, or better again, find out a way to avoid this code
+# duplication.
+
+_AM_COMPILER_CAN_FAIL([AC_PROG_FC(dnl
+  [xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor] dnl
+  [xlf90 f90 pgf90 pghpf epcf90 g95 gfortran])],
+  [FC=false; _AM_SKIP_COMP_TESTS([Fortran])])
+
+# FIXME this won't work as expected until we can assume autoconf 2.69 :-(
+AS_IF([test x"$GFC" = x"yes"], [am_FC_is_GNU=yes], [am_FC_is_GNU=no])
+
+_AM_COMPILER_CAN_FAIL([AC_PROG_F77(dnl
+  [xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 gfortran])],
+  [F77=false; _AM_SKIP_COMP_TESTS([Fortran 77])])
+
+AS_IF([test x"$G77" = x"yes"], [am_F77_is_GNU=yes], [am_F77_is_GNU=no])
+
+# Some tests will need the GNU compilers.  Searching for them here would
+# be overkill, since our testsuite already handles their search and setup
+# pretty well.  But in case the compilers already found are the GNU ones,
+# we want to use them in the testsuite where GNU compilers are required.
+# Also, in case the compilers detected above (at configure time) are not
+# the GNU ones, we cannot use the values of CFLAGS, CXXFLAGS, FCFLAGS and
+# FFLAGS detected for them with the GNU compilers too, since it's likely
+# they won't be compatible.  So we allow the user to define variants of
+# these variables for the GNU compilers separately.
+
+AC_MSG_NOTICE([will now look for GNU compilers])
+
+# GNU C compiler.
+AC_ARG_VAR([GNU_CC],     [GNU C compiler])
+AC_ARG_VAR([GNU_CFLAGS], [GNU C compiler flags])
+if test $am_CC_is_GNU = yes; then
+  AC_MSG_NOTICE([$CC is already a GNU C compiler])
+  GNU_CC=$CC GNU_CFLAGS=${GNU_CFLAGS-$CFLAGS}
+else
+  AC_CHECK_TOOLS([GNU_CC], [gcc], [false])
+fi
+AS_IF([AM_RUN_LOG([$GNU_CC --version && $GNU_CC -v])], [],
+      [AC_MSG_WARN([botched installation for GNU C compiler])
+       _AM_SKIP_COMP_TESTS([GNU C])])
+
+# GNU C++ compiler.
+AC_ARG_VAR([GNU_CXX],      [GNU C++ compiler])
+AC_ARG_VAR([GNU_CXXFLAGS], [GNU C++ compiler flags])
+if test $am_CXX_is_GNU = yes; then
+  AC_MSG_NOTICE([$CXX is already a GNU C++ compiler])
+  GNU_CXX=$CXX
+  GNU_CXXFLAGS=${GNU_CXXFLAGS-$CXXFLAGS}
+else
+  AC_CHECK_TOOLS([GNU_CXX], [g++ gpp], [false])
+fi
+AS_IF([AM_RUN_LOG([$GNU_CXX --version && $GNU_CXX -v])], [],
+      [AC_MSG_WARN([botched installation for GNU C++ compiler])
+       _AM_SKIP_COMP_TESTS([GNU C++])])
+
+# GNU Fortran compiler.
+AC_ARG_VAR([GNU_FC],      [GNU Fortran compiler])
+AC_ARG_VAR([GNU_FCFLAGS], [GNU Fortran compiler flags])
+if test $am_FC_is_GNU = yes; then
+  AC_MSG_NOTICE([$FC is already a GNU Fortran compiler])
+  GNU_FC=$FC
+  GNU_FCFLAGS=${GNU_FCFLAGS-$FCFLAGS}
+else
+  AC_CHECK_TOOLS([GNU_FC], [gfortran], [false])
+fi
+AS_IF([AM_RUN_LOG([$GNU_FC --version && $GNU_FC -v])], [],
+      [AC_MSG_WARN([botched installation for GNU Fortran compiler])
+       _AM_SKIP_COMP_TESTS([GNU Fortran])])
+
+# GNU Fortran 77 compiler.
+AC_ARG_VAR([GNU_F77],    [GNU Fortran 77 compiler])
+AC_ARG_VAR([GNU_FFLAGS], [GNU Fortran 77 compiler flags])
+if test $am_F77_is_GNU = yes; then
+  AC_MSG_NOTICE([$F77 is already a GNU Fortran 77 compiler])
+  GNU_F77=$F77
+  GNU_FFLAGS=${GNU_FFLAGS-$FFLAGS}
+else
+  AC_CHECK_TOOLS([GNU_F77], [g77 gfortran], [false])
+fi
+AS_IF([AM_RUN_LOG([$GNU_F77 --version && $GNU_F77 -v])], [],
+      [AC_MSG_WARN([botched installation for GNU Fortran 77 compiler])
+      _AM_SKIP_COMP_TESTS([GNU Fortran 77])])
+
+# GNU Java compiler.
+AC_ARG_VAR([GNU_GCJ], [GNU Java compiler])
+AC_ARG_VAR([GNU_GCJFLAGS], [GNU Java compiler flags])
+AC_CHECK_TOOLS([GNU_GCJ], [gcj], [false])
+AS_IF([AM_RUN_LOG([$GNU_GCJ --version && $GNU_GCJ -v])], [],
+      [AC_MSG_WARN([botched installation for GNU Java compiler])
+      _AM_SKIP_COMP_TESTS([GNU Java])])
+
+# If we have been able to find at least a working compiler above, we
+# know what the object and executable extensions for this platform are.
+OBJEXT=${ac_cv_objext-UNKNOWN}
+EXEEXT=${ac_cv_exeext-UNKNOWN}
+AC_SUBST([OBJEXT])
+AC_SUBST([EXEEXT])
+
+###########################################################################
+
+AC_CONFIG_FILES([Makefile])
+
+AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
+AC_CONFIG_LINKS([defs:defs])
+
+AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in],
+                [chmod +x t/wrap/aclocal-${APIVERSION}],
+               [APIVERSION=$APIVERSION])
+AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in],
+                [chmod +x t/wrap/automake-${APIVERSION}],
                [APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in],
-                [chmod +x tests/automake-${APIVERSION}])
 
 AC_OUTPUT
 
@@ -241,7 +426,7 @@ WARNING: You are about to use a $am_release_type of 
automake.
 WARNING: It might easily suffer from new bugs or regressions.
 WARNING: You are strongly advised not to use it in production code.
 
-Please report bugs, problems and feedback to <address@hidden>.
+Please report bugs, problems and feedback to <AC_PACKAGE_BUGREPORT>.
 EOF
 
 AS_EXIT([0])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 820b547..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake contrib.
-
-# Copyright (C) 2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST = \
-  multilib/multi.m4 \
-  README
diff --git a/contrib/README b/contrib/README
index bbef72f..a4d7eeb 100644
--- a/contrib/README
+++ b/contrib/README
@@ -14,7 +14,7 @@ There are several reasons for which a feature can be kept in 
contrib:
      core (as doing so too early would later force us to continue the
      support for backward-compatibility, even if the features proves
      flawed or fails to attract widespread use).
-  
+
   2. The APIs or overall design of the feature are still unstable, and
      need on-field testing to iron warts and usability bugs, or uncover
      potential flaws.
@@ -24,4 +24,3 @@ There are several reasons for which a feature can be kept in 
contrib:
      remove it from the Automake core, but cannot remove it altogether,
      for the sake of those still-existing usage.  So it gets moved in
      contrib.
-
diff --git a/contrib/check-html.am b/contrib/check-html.am
new file mode 100644
index 0000000..4495ac0
--- /dev/null
+++ b/contrib/check-html.am
@@ -0,0 +1,58 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+## Makefile.am fragment to produce HTML output from RST-formatted
+## log files produced by the parallel-tests output.
+## This fragment was part of the automake core in the 1.11.x release
+## series, but has been then moved to contrib.
+
+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
+
+mostlyclean-local: mostlyclean-check-html
+.PHONY: mostlyclean-check-html
+mostlyclean-check-html:
+## Expand $(TEST_LOGS) only once, to avoid exceeding line length limits.
+       list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
+       rm -f $(TEST_SUITE_HTML)
+
+.log.html:
+       @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \
+       for r2h in $$list; do                                           \
+         if ($$r2h --version) >/dev/null 2>&1; then                    \
+           R2H=$$r2h;                                                  \
+         fi;                                                           \
+       done;                                                           \
+       if test -z "$$R2H"; then                                        \
+         echo >&2 "cannot find rst2html, cannot create $@";            \
+         exit 2;                                                       \
+       fi;                                                             \
+       $$R2H $< >address@hidden
+       @mv address@hidden $@
+
+# Be sure to run check first, and then to convert the result.
+# Beware of concurrent executions.  Run "check" not "check-TESTS", as
+# check-SCRIPTS and other dependencies are rebuilt by the former only.
+# And expect check to fail.
+check-html recheck-html:
+       @target=`echo $@ | sed 's/-html$$//'`; \
+       rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
+## The nullification of $(TEST_LOGS) is required to ensure that
+## "make recheck-html" do not try to uselessly re-run tests.
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
+       exit $$rv
+
+.PHONY: check-html recheck-html
+.MAKE: check-html recheck-html
diff --git a/contrib/multilib/README b/contrib/multilib/README
new file mode 100644
index 0000000..35c726f
--- /dev/null
+++ b/contrib/multilib/README
@@ -0,0 +1,9 @@
+Minimal support for multilib builds.
+
+For a little more information, see:
+<http://airs.com/ian/configure/configure_8.html>
+
+The master (and probably more up-to-date) copies of the 'config-ml.in'
+and 'symlink-tree' files are maintained in the GCC development tree
+at <http://gcc.gnu.org/svn.html>.  The same is probably true also for
+the 'multi.m4' file.
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in
new file mode 100644
index 0000000..0734a95
--- /dev/null
+++ b/contrib/multilib/config-ml.in
@@ -0,0 +1,876 @@
+# Configure fragment invoked in the post-target section for subdirs
+# wanting multilib support.
+#
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Please report bugs to <address@hidden>
+# and send patches to <address@hidden>.
+
+# It is advisable to support a few --enable/--disable options to let the
+# user select which libraries s/he really wants.
+#
+# Subdirectories wishing to use multilib should put the following lines
+# in the "post-target" section of configure.in.
+#
+# if [ "${srcdir}" = "." ] ; then
+#   if [ "${with_target_subdir}" != "." ] ; then
+#     . ${with_multisrctop}../../config-ml.in
+#   else
+#     . ${with_multisrctop}../config-ml.in
+#   fi
+# else
+#   . ${srcdir}/../config-ml.in
+# fi
+#
+#
+# Things are complicated because 6 separate cases must be handled:
+# 2 (native, cross) x 3 (absolute-path, relative-not-dot, dot) = 6.
+#
+# srcdir=. is special.  It must handle make programs that don't handle VPATH.
+# To implement this, a symlink tree is built for each library and for each
+# multilib subdir.
+#
+# The build tree is laid out as
+#
+# ./
+#   newlib
+#   m68020/
+#          newlib
+#          m68881/
+#                 newlib
+#
+# The nice feature about this arrangement is that inter-library references
+# in the build tree work without having to care where you are.  Note that
+# inter-library references also work in the source tree because symlink trees
+# are built when srcdir=.
+#
+# Unfortunately, trying to access the libraries in the build tree requires
+# the user to manually choose which library to use as GCC won't be able to
+# find the right one.  This is viewed as the lesser of two evils.
+#
+# Configure variables:
+# ${with_target_subdir} = "." for native, or ${target_alias} for cross.
+# Set by top level Makefile.
+# ${with_multisrctop} = how many levels of multilibs there are in the source
+# tree.  It exists to handle the case of configuring in the source tree:
+# ${srcdir} is not constant.
+# ${with_multisubdir} = name of multilib subdirectory (eg: m68020/m68881).
+#
+# Makefile variables:
+# MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
+# (FIXME: note that this is different than ${with_multisrctop}.  Check out.).
+# MULTIBUILDTOP = number of multilib levels in build tree
+# MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
+# (only defined in each library's main Makefile).
+# MULTISUBDIR = installed subdirectory name with leading '/' (eg: /m68000)
+# (only defined in each multilib subdir).
+
+# FIXME: Multilib is currently disabled by default for everything other than
+# newlib.  It is up to each target to turn on multilib support for the other
+# libraries as desired.
+
+# Autoconf incoming variables:
+# srcdir, host, ac_configure_args
+#
+# We *could* figure srcdir and host out, but we'd have to do work that
+# our caller has already done to figure them out and requiring these two
+# seems reasonable.
+# Note that `host' in this case is GCC's `target'.  Target libraries are
+# configured for a particular host.
+
+Makefile=${ac_file-Makefile}
+ml_config_shell=${CONFIG_SHELL-/bin/sh}
+ml_realsrcdir=${srcdir}
+
+# Scan all the arguments and set all the ones we need.
+
+ml_verbose=--verbose
+for option in ${ac_configure_args}
+do
+  # strip single quotes surrounding individual options
+  case $option in
+  \'*\') eval option=$option ;;
+  esac
+
+  case $option in
+  --*) ;;
+  -*) option=-$option ;;
+  esac
+
+  case $option in
+  --*=*)
+       optarg=`echo $option | sed -e 's/^[^=]*=//'`
+       ;;
+  esac
+
+  case $option in
+  --disable-*)
+       enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
+       eval $enableopt=no
+       ;;
+  --enable-*)
+       case "$option" in
+       *=*)    ;;
+       *)      optarg=yes ;;
+       esac
+       enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+       # enable_shared and enable_static are handled by configure.
+       # Don't undo its work.
+       case $enableopt in
+       enable_shared | enable_static) ;;
+       *) eval $enableopt="$optarg" ;;
+       esac
+       ;;
+  --norecursion | --no-recursion)
+       ml_norecursion=yes
+       ;;
+  --silent | --sil* | --quiet | --q*)
+       ml_verbose=--silent
+       ;;
+  --verbose | --v | --verb*)
+       ml_verbose=--verbose
+       ;;
+  --with-*)
+       case "$option" in
+       *=*)    ;;
+       *)      optarg=yes ;;
+       esac
+       withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+       eval $withopt="$optarg"
+       ;;
+  --without-*)
+       withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
+       eval $withopt=no
+       ;;
+  esac
+done
+
+# Only do this if --enable-multilib.
+if [ "${enable_multilib}" = yes ]; then
+
+# Compute whether this is the library's top level directory
+# (ie: not a multilib subdirectory, and not a subdirectory like newlib/src).
+# ${with_multisubdir} tells us we're in the right branch, but we could be
+# in a subdir of that.
+# ??? The previous version could void this test by separating the process into
+# two files: one that only the library's toplevel configure.in ran (to
+# configure the multilib subdirs), and another that all configure.in's ran to
+# update the Makefile.  It seemed reasonable to collapse all multilib support
+# into one file, but it does leave us with having to perform this test.
+ml_toplevel_p=no
+if [ -z "${with_multisubdir}" ]; then
+  if [ "${srcdir}" = "." ]; then
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    # ${with_target_subdir} = "." for native, otherwise target alias.
+    if [ "${with_target_subdir}" = "." ]; then
+      if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+       ml_toplevel_p=yes
+      fi
+    else
+      if [ -f ${ml_realsrcdir}/../../config-ml.in ]; then
+       ml_toplevel_p=yes
+      fi
+    fi
+  else
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+      ml_toplevel_p=yes
+    fi
+  fi
+fi
+
+# If this is the library's top level directory, set multidirs to the
+# multilib subdirs to support.  This lives at the top because we need
+# `multidirs' set right away.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+multidirs=
+for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+  dir=`echo $i | sed -e 's/;.*$//'`
+  if [ "${dir}" = "." ]; then
+    true
+  else
+    if [ -z "${multidirs}" ]; then
+      multidirs="${dir}"
+    else
+      multidirs="${multidirs} ${dir}"
+    fi
+  fi
+done
+
+# Target libraries are configured for the host they run on, so we check
+# $host here, not $target.
+
+case "${host}" in
+arm-*-*)
+       if [ x"$enable_fpu" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *fpu*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_26bit" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *26bit*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_underscore" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *under*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_interwork" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *interwork*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_biendian = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *le* ) : ;;
+             *be* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_nofmult" = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *nofmult* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       ;;
+m68*-*-*)
+       if [ x$enable_softfloat = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *soft-float* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_m68881 = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *m68881* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_m68000 = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *m68000* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_m68020 = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *m68020* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       ;;
+mips*-*-*)
+       if [ x$enable_single_float = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *single* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_biendian = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *el* ) : ;;
+             *eb* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_softfloat = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *soft-float* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       ;;
+powerpc*-*-* | rs6000*-*-*)
+       if [ x$enable_aix64 = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *ppc64* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_pthread = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *pthread* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_softfloat = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *soft-float* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_powercpu = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             power | */power | */power/* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_powerpccpu = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *powerpc* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_powerpcos = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *mcall-linux* | *mcall-solaris* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_biendian = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *mlittle* | *mbig* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_sysv = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *mcall-sysv* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       ;;
+esac
+
+# Remove extraneous blanks from multidirs.
+# Tests like `if [ -n "$multidirs" ]' require it.
+multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ 
][ ]*/ /g'`
+
+# Add code to library's top level makefile to handle building the multilib
+# subdirs.
+
+cat > Multi.tem <<\EOF
+
+PWD_COMMAND=$${PWDCMD-pwd}
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-do:
+       if [ -z "$(MULTIDIRS)" ]; then \
+         true; \
+       else \
+         rootpre=`${PWD_COMMAND}`/; export rootpre; \
+         srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
+         lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+         compiler="$(CC)"; \
+         for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
+           dir=`echo $$i | sed -e 's/;.*$$//'`; \
+           if [ "$${dir}" = "." ]; then \
+             true; \
+           else \
+             if [ -d ../$${dir}/$${lib} ]; then \
+               flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
+               if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
+                               CFLAGS="$(CFLAGS) $${flags}" \
+                               CCASFLAGS="$(CCASFLAGS) $${flags}" \
+                               FCFLAGS="$(FCFLAGS) $${flags}" \
+                               FFLAGS="$(FFLAGS) $${flags}" \
+                               ADAFLAGS="$(ADAFLAGS) $${flags}" \
+                               prefix="$(prefix)" \
+                               exec_prefix="$(exec_prefix)" \
+                               GCJFLAGS="$(GCJFLAGS) $${flags}" \
+                               GOCFLAGS="$(GOCFLAGS) $${flags}" \
+                               CXXFLAGS="$(CXXFLAGS) $${flags}" \
+                               LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
+                               LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
+                               LDFLAGS="$(LDFLAGS) $${flags}" \
+                               MULTIFLAGS="$${flags}" \
+                               DESTDIR="$(DESTDIR)" \
+                               INSTALL="$(INSTALL)" \
+                               INSTALL_DATA="$(INSTALL_DATA)" \
+                               INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+                               INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
+                               $(DO)); then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else true; \
+             fi; \
+           fi; \
+         done; \
+       fi
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-clean:
+       if [ -z "$(MULTIDIRS)" ]; then \
+         true; \
+       else \
+         lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+         for dir in : $(MULTIDIRS); do \
+           test $$dir != : || continue; \
+EOF
+cat >>Multi.tem <<EOF
+           if [ -f ../\$\${dir}/\$\${lib}/${Makefile} ]; then \\
+EOF
+cat >>Multi.tem <<\EOF
+             if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
+             then true; \
+             else exit 1; \
+             fi; \
+           else true; \
+           fi; \
+         done; \
+       fi
+EOF
+
+cat ${Makefile} Multi.tem > Makefile.tem
+rm -f ${Makefile} Multi.tem
+mv Makefile.tem ${Makefile}
+
+fi # ${ml_toplevel_p} = yes
+
+if [ "${ml_verbose}" = --verbose ]; then
+  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
+  if [ "${ml_toplevel_p}" = yes ]; then
+    echo "multidirs=${multidirs}"
+  fi
+  echo "with_multisubdir=${with_multisubdir}"
+fi
+
+if [ "${srcdir}" = "." ]; then
+  if [ "${with_target_subdir}" != "." ]; then
+    ml_srcdotdot="../"
+  else
+    ml_srcdotdot=""
+  fi
+else
+  ml_srcdotdot=""
+fi
+
+if [ -z "${with_multisubdir}" ]; then
+  ml_subdir=
+  ml_builddotdot=
+  : # ml_srcdotdot= # already set
+else
+  ml_subdir="/${with_multisubdir}"
+  # The '[^/][^/]*' appears that way to work around a SunOS sed bug.
+  ml_builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`/
+  if [ "$srcdir" = "." ]; then
+    ml_srcdotdot=${ml_srcdotdot}${ml_builddotdot}
+  else
+    : # ml_srcdotdot= # already set
+  fi
+fi
+
+if [ "${ml_toplevel_p}" = yes ]; then
+  ml_do='$(MAKE)'
+  ml_clean='$(MAKE)'
+else
+  ml_do=true
+  ml_clean=true
+fi
+
+# TOP is used by newlib and should not be used elsewhere for this purpose.
+# MULTI{SRC,BUILD}TOP are the proper ones to use.  MULTISRCTOP is empty
+# when srcdir != builddir.  MULTIBUILDTOP is always some number of ../'s.
+# FIXME: newlib needs to be updated to use MULTI{SRC,BUILD}TOP so we can
+# delete TOP.  Newlib may wish to continue to use TOP for its own purposes
+# of course.
+# MULTIDIRS is non-empty for the cpu top level Makefile (eg: newlib/Makefile)
+# and lists the subdirectories to recurse into.
+# MULTISUBDIR is non-empty in each cpu subdirectory's Makefile
+# (eg: newlib/h8300h/Makefile) and is the installed subdirectory name with
+# a leading '/'.
+# MULTIDO is used for targets like all, install, and check where
+# $(FLAGS_TO_PASS) augmented with the subdir's compiler option is needed.
+# MULTICLEAN is used for the *clean targets.
+#
+# ??? It is possible to merge MULTIDO and MULTICLEAN into one.  They are
+# currently kept separate because we don't want the *clean targets to require
+# the existence of the compiler (which MULTIDO currently requires) and
+# therefore we'd have to record the directory options as well as names
+# (currently we just record the names and use --print-multi-lib to get the
+# options).
+
+sed -e "s:^TOP[        ]*=[    ]*\([./]*\)[    ]*$:TOP = ${ml_builddotdot}\1:" 
\
+    -e "s:^MULTISRCTOP[        ]*=.*$:MULTISRCTOP = ${ml_srcdotdot}:" \
+    -e "s:^MULTIBUILDTOP[      ]*=.*$:MULTIBUILDTOP = ${ml_builddotdot}:" \
+    -e "s:^MULTIDIRS[  ]*=.*$:MULTIDIRS = ${multidirs}:" \
+    -e "s:^MULTISUBDIR[        ]*=.*$:MULTISUBDIR = ${ml_subdir}:" \
+    -e "s:^MULTIDO[    ]*=.*$:MULTIDO = $ml_do:" \
+    -e "s:^MULTICLEAN[         ]*=.*$:MULTICLEAN = $ml_clean:" \
+       ${Makefile} > Makefile.tem
+rm -f ${Makefile}
+mv Makefile.tem ${Makefile}
+
+# If this is the library's top level, configure each multilib subdir.
+# This is done at the end because this is the loop that runs configure
+# in each multilib subdir and it seemed reasonable to finish updating the
+# Makefile before going on to configure the subdirs.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+# We must freshly configure each subdirectory.  This bit of code is
+# actually partially stolen from the main configure script.  FIXME.
+
+if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
+
+  if [ "${ml_verbose}" = --verbose ]; then
+    echo "Running configure in multilib subdirs ${multidirs}"
+    echo "pwd: `${PWDCMD-pwd}`"
+  fi
+
+  ml_origdir=`${PWDCMD-pwd}`
+  ml_libdir=`echo "$ml_origdir" | sed -e 's,^.*/,,'`
+  # cd to top-level-build-dir/${with_target_subdir}
+  cd ..
+
+  for ml_dir in ${multidirs}; do
+
+    if [ "${ml_verbose}" = --verbose ]; then
+      echo "Running configure in multilib subdir ${ml_dir}"
+      echo "pwd: `${PWDCMD-pwd}`"
+    fi
+
+    if [ -d ${ml_dir} ]; then true; else
+      # ``mkdir -p ${ml_dir}'' See also mkinstalldirs.
+      pathcomp=""
+      for d in `echo ":${ml_dir}" | sed -ne 's/^:\//#/;s/^://;s/\// 
/g;s/^#/\//;p'`; do
+        pathcomp="$pathcomp$d"
+        case "$pathcomp" in
+          -* ) pathcomp=./$pathcomp ;;
+        esac
+        if test ! -d "$pathcomp"; then
+           echo "mkdir $pathcomp" 1>&2
+           mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
+        fi
+        if test ! -d "$pathcomp"; then
+          exit $lasterr
+        fi
+        pathcomp="$pathcomp/"
+      done
+    fi
+    if [ -d ${ml_dir}/${ml_libdir} ]; then true; else mkdir 
${ml_dir}/${ml_libdir}; fi
+
+    # Eg: if ${ml_dir} = m68000/m68881, dotdot = ../../
+    dotdot=../`echo ${ml_dir} | sed -e 's|[^/]||g' -e 's|/|../|g'`
+
+    case ${srcdir} in
+    ".")
+      echo "Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}"
+      if [ "${with_target_subdir}" != "." ]; then
+       ml_unsubdir="../"
+      else
+       ml_unsubdir=""
+      fi
+      (cd ${ml_dir}/${ml_libdir};
+       ../${dotdot}${ml_unsubdir}symlink-tree 
../${dotdot}${ml_unsubdir}${ml_libdir} "")
+      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
+       if [ x"${MAKE}" = x ]; then
+         (cd ${ml_dir}/${ml_libdir}; make distclean)
+       else
+         (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
+       fi
+      fi
+      ml_newsrcdir="."
+      ml_srcdiroption=
+      multisrctop=${dotdot}
+      ;;
+    *)
+      case "${srcdir}" in
+      /* | [A-Za-z]:[\\/]* ) # absolute path
+        ml_newsrcdir=${srcdir}
+        ;;
+      *) # otherwise relative
+        ml_newsrcdir=${dotdot}${srcdir}
+        ;;
+      esac
+      ml_srcdiroption="-srcdir=${ml_newsrcdir}"
+      multisrctop=
+      ;;
+    esac
+
+    case "${progname}" in
+    /* | [A-Za-z]:[\\/]* )     ml_recprog=${progname} ;;
+    *)      ml_recprog=${dotdot}${progname} ;;
+    esac
+
+    # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
+    ML_POPDIR=`${PWDCMD-pwd}`
+    cd ${ml_dir}/${ml_libdir}
+
+    if [ -f ${ml_newsrcdir}/configure ]; then
+      ml_recprog="${ml_newsrcdir}/configure"
+    fi
+
+    # find compiler flag corresponding to ${ml_dir}
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+      dir=`echo $i | sed -e 's/;.*$//'`
+      if [ "${dir}" = "${ml_dir}" ]; then
+        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
+        break
+      fi
+    done
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" 
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
+
+    if [ "${with_target_subdir}" = "." ]; then
+       CC_=$CC' '
+       CXX_=$CXX' '
+       F77_=$F77' '
+       GCJ_=$GCJ' '
+       GFORTRAN_=$GFORTRAN' '
+       GOC_=$GOC' '
+    else
+       # Create a regular expression that matches any string as long
+       # as ML_POPDIR.
+       popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'`
+       CC_=
+       for arg in ${CC}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           CC_="${CC_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           CC_="${CC_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           CC_="${CC_}${arg} " ;;
+         esac
+       done
+
+       CXX_=
+       for arg in ${CXX}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           CXX_="${CXX_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           CXX_="${CXX_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           CXX_="${CXX_}${arg} " ;;
+         esac
+       done
+
+       F77_=
+       for arg in ${F77}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           F77_="${F77_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           F77_="${F77_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           F77_="${F77_}${arg} " ;;
+         esac
+       done
+
+       GCJ_=
+       for arg in ${GCJ}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GCJ_="${GCJ_}${arg} " ;;
+         esac
+       done
+
+       GFORTRAN_=
+       for arg in ${GFORTRAN}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GFORTRAN_="${GFORTRAN_}${arg} " ;;
+         esac
+       done
+
+       GOC_=
+       for arg in ${GOC}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GOC_="${GOC_}${arg} " ;;
+         esac
+       done
+
+       if test "x${LD_LIBRARY_PATH+set}" = xset; then
+         LD_LIBRARY_PATH_=
+         for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
+           case "$arg" in
+           "${ML_POPDIR}"/*)
+             arg=`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`
+             ;;
+           esac
+           if test "x$LD_LIBRARY_PATH_" != x; then
+             LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
+           else
+             LD_LIBRARY_PATH_=$arg
+           fi
+          done
+         ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
+       fi
+
+       if test "x${SHLIB_PATH+set}" = xset; then
+         SHLIB_PATH_=
+         for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
+           case "$arg" in
+           "${ML_POPDIR}"/*)
+             arg=`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`
+             ;;
+           esac
+           if test "x$SHLIB_PATH_" != x; then
+             SHLIB_PATH_=$SHLIB_PATH_:$arg
+           else
+             SHLIB_PATH_=$arg
+           fi
+          done
+         ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
+       fi
+    fi
+
+    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+       --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+       ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
+      true
+    else
+      exit 1
+    fi
+
+    cd "${ML_POPDIR}"
+
+  done
+
+  cd "${ml_origdir}"
+fi
+
+fi # ${ml_toplevel_p} = yes
+fi # ${enable_multilib} = yes
diff --git a/contrib/multilib/multi.m4 b/contrib/multilib/multi.m4
index 9841767..d1320d6 100644
--- a/contrib/multilib/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,6 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/contrib/multilib/multilib.am b/contrib/multilib/multilib.am
new file mode 100644
index 0000000..bca9069
--- /dev/null
+++ b/contrib/multilib/multilib.am
@@ -0,0 +1,45 @@
+## automake - create Makefile.in from Makefile.am
+
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
+## This Makefile.in is free software; the Free Software Foundation
+## gives unlimited permission to copy and/or distribute it,
+## with or without modifications, as long as this notice is preserved.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+MULTISRCTOP =
+MULTIBUILDTOP =
+MULTIDIRS =
+MULTISUBDIR =
+MULTIDO = true
+MULTICLEAN = true
+
+# GNU Make needs to see an explicit $(MAKE) variable in the command it
+# runs to enable its job server during parallel builds.  Hence the
+# comments below.
+all-multi:
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
+install-multi:
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
+mostlyclean-multi:
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
+clean-multi:
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
+distclean-multi:
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
+maintainer-clean-multi:
+       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
+
+.MAKE .PHONY: all-multi clean-multi distclean-multi install-am \
+             install-multi maintainer-clean-multi mostlyclean-multi
+
+install-exec-local: install-multi
+
+all-local: all-multi
+mostlyclean-local: mostlyclean-multi
+clean-local: clean-multi
+distclean-local: distclean-multi
+maintainer-clean-local: maintainer-clean-multi
diff --git a/contrib/multilib/symlink-tree b/contrib/multilib/symlink-tree
new file mode 100755
index 0000000..f1877f9
--- /dev/null
+++ b/contrib/multilib/symlink-tree
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Create a symlink tree.
+#
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Please report bugs to <address@hidden>
+# and send patches to <address@hidden>.
+
+# Syntax: symlink-tree srcdir "ignore1 ignore2 ..."
+#
+# where srcdir is the directory to create a symlink tree to,
+# and "ignoreN" is a list of files/directories to ignore.
+
+prog=$0
+srcdir=$1
+ignore="$2"
+
+if test $# -lt 1; then
+  echo "symlink-tree error:  Usage: symlink-tree srcdir \"ignore1 ignore2 
...\""
+  exit 1
+fi
+
+ignore_additional=". .. CVS"
+
+# If we were invoked with a relative path name, adjust ${prog} to work
+# in subdirs.
+case ${prog} in
+/* | [A-Za-z]:[\\/]*) ;;
+*) prog=../${prog} ;;
+esac
+
+# Set newsrcdir to something subdirectories can use.
+case ${srcdir} in
+/* | [A-Za-z]:[\\/]*) newsrcdir=${srcdir} ;;
+*) newsrcdir=../${srcdir} ;;
+esac
+
+for f in `ls -a ${srcdir}`; do
+  if [ -d ${srcdir}/$f ]; then
+    found=
+    for i in ${ignore} ${ignore_additional}; do
+      if [ "$f" = "$i" ]; then
+       found=yes
+      fi
+    done
+    if [ -z "${found}" ]; then
+      echo "$f         ..working in"
+      if [ -d $f ]; then true; else mkdir $f; fi
+      (cd $f; ${prog} ${newsrcdir}/$f "${ignore}")
+    fi
+  else
+    echo "$f           ..linked"
+    rm -f $f
+    ln -s ${srcdir}/$f .
+  fi
+done
+
+exit 0
diff --git a/defs b/defs
new file mode 100644
index 0000000..7e9a554
--- /dev/null
+++ b/defs
@@ -0,0 +1,1108 @@
+# -*- shell-script -*-
+#
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+########################################################
+###  IMPORTANT NOTE: keep this file 'set -e' clean.  ###
+########################################################
+
+# NOTE: This file should execute correctly with any system's /bin/sh
+# shell, and not only with configure-time detected $CONFIG_SHELL,
+# *until differently and explicitly specified*.
+
+## -------------------------------------------------------- ##
+##  Source static setup and definitions for the testsuite.  ##
+## -------------------------------------------------------- ##
+
+# Ensure we are running from the right directory.
+test -f ./defs-static || {
+   echo "$0: ./defs-static: not found in current directory" >&2
+   exit 99
+}
+
+# Source the shell sanitization and variables' definitions.
+. ./defs-static || exit 99
+
+# Enable the errexit shell flag early.
+set -e
+
+# The name of the current test (without the '.sh' or '.tap' suffix).
+# Test scripts can override it if they need to (but this should
+# be done carefully, and *before* including ./defs).
+if test -z "$me"; then
+  # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
+  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.sh$//;s/\.tap$//'` \
+    && test -n "$me" \
+    || { echo "$argv0: failed to define \$me" >&2; exit 99; }
+fi
+
+## ---------------------- ##
+##  Early sanity checks.  ##
+## ---------------------- ##
+
+# A single whitespace character.
+sp=' '
+# A tabulation character.
+tab='  '
+# A newline character.
+nl='
+'
+
+# As autoconf-generated configure scripts do, ensure that IFS
+# is defined initially, so that saving and restoring $IFS works.
+IFS=$sp$tab$nl
+
+# Ensure $am_top_srcdir is set correctly.
+test -f "$am_top_srcdir/defs-static.in" || {
+   echo "$me: $am_top_srcdir/defs-static.in not found," \
+        "check \$am_top_srcdir" >&2
+   exit 99
+}
+
+# Ensure $am_top_builddir is set correctly.
+test -f "$am_top_builddir/defs-static" || {
+   echo "$me: $am_top_builddir/defs-static not found," \
+        "check \$am_top_builddir" >&2
+   exit 99
+}
+
+
+## ------------------------------------ ##
+##  Ensure we run with a proper shell.  ##
+## ------------------------------------ ##
+
+# Make sure we run with the shell detected at configure time (unless
+# the user forbids it).
+case ${AM_TESTS_REEXEC-yes} in
+  n|no|false|0)
+    ;;
+  *)
+    # Ensure we can find ourselves.
+    if test ! -f "$0"; then
+      echo "$me: unable to find myself: $0" >&2
+      exit 99
+    fi
+    AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+    # Cannot simply do "opts=$-", since the content of $- is not
+    # portable among different shells.  So try to propagate only
+    # the portable and interesting options.
+    case $- in
+      *x*v*|*v*x) opts=-vx;;
+      *v*) opts=-v;;
+      *x*) opts=-x;;
+      *) opts=;;
+    esac
+    echo $me: exec $SHELL $opts "$0" "$*"
+    exec $SHELL $opts "$0" ${1+"$@"} || {
+      echo "$me: failed to re-execute with $SHELL" >&2
+      exit 99
+    }
+    ;;
+esac
+
+# NOTE: From this point on, we can assume this file is being executed
+# by the configure-time detected $CONFIG_SHELL.
+
+
+## ----------------------- ##
+##  Early debugging info.  ##
+## ----------------------- ##
+
+echo "Running from installcheck: $am_running_installcheck"
+echo "Using TAP: $am_using_tap"
+echo "PATH = $PATH"
+
+
+## ---------------------- ##
+##  Environment cleanup.  ##
+## ---------------------- ##
+
+# Temporarily disable this, since some shells (e.g., older version
+# of Bash) can return a non-zero exit status upon the when a non-set
+# variable is unset.
+set +e
+
+# Unset some make-related variables that may cause $MAKE to act like
+# a recursively invoked sub-make.  Any $MAKE invocation in a test is
+# conceptually an independent invocation, not part of the main
+# 'automake' build.
+unset MFLAGS MAKEFLAGS AM_MAKEFLAGS MAKELEVEL
+unset __MKLVL__ MAKE_JOBS_FIFO                     # For BSD make.
+unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake.
+# Unset verbosity flag.
+unset V
+# Also unset variables that will let "make -e install" divert
+# files into unwanted directories.
+unset DESTDIR
+unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
+unset htmldir includedir infodir libdir libexecdir localedir mandir
+unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
+# Unset variables that might change the "make distcheck" behaviour.
+unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS
+# Used by install rules for info files.
+unset AM_UPDATE_INFO_DIR
+# The tests call "make -e" but we do not want $srcdir from the environment
+# to override the definition from the Makefile.
+unset srcdir
+# Also unset variables that control our test driver.  While not
+# conceptually independent, they cause some changed semantics we
+# need to control (and test for) in some of the tests to ensure
+# backward-compatible behavior.
+unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
+unset DISABLE_HARD_ERRORS
+unset AM_COLOR_TESTS
+unset TESTS
+unset XFAIL_TESTS
+unset TEST_LOGS
+unset TEST_SUITE_LOG
+unset RECHECK_LOGS
+unset VERBOSE
+for pfx in TEST_ SH_ TAP_ ''; do
+  unset ${pfx}LOG_COMPILER
+  unset ${pfx}LOG_COMPILE # Not a typo!
+  unset ${pfx}LOG_FLAGS
+  unset AM_${pfx}LOG_FLAGS
+  unset ${pfx}LOG_DRIVER
+  unset ${pfx}LOG_DRIVER_FLAGS
+  unset AM_${pfx}LOG_DRIVER_FLAGS
+done
+unset pfx
+
+# Re-enable, it had been temporarily disabled above.
+set -e
+
+## ---------------------------- ##
+##  Auxiliary shell functions.  ##
+## ---------------------------- ##
+
+# Tell whether we should keep the test directories around, even in
+# case of success.  By default, we don't.
+am_keeping_testdirs ()
+{
+  case $keep_testdirs in
+     ""|n|no|NO) return 1;;
+              *) return 0;;
+  esac
+}
+
+# This is used in 'Exit' and in the exit trap.  See comments in the latter
+# for more information,
+am__test_skipped=no
+
+# We use a trap below for cleanup.  This requires us to go through
+# hoops to get the right exit status transported through the signal.
+# So use "Exit STATUS" instead of "exit STATUS" inside of the tests.
+# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
+# sh inside this function.
+Exit ()
+{
+  set +e
+  # See comments in the exit trap for the reason we do this.
+  test 77 = $1 && am__test_skipped=yes
+  (exit $1); exit $1
+}
+
+if test $am_using_tap = yes; then
+  am_funcs_file=tap-functions.sh
+else
+  am_funcs_file=plain-functions.sh
+fi
+
+if test -f "$am_testauxdir/$am_funcs_file"; then
+  . "$am_testauxdir/$am_funcs_file" || {
+    echo "$me: error sourcing $am_testauxdir/$am_funcs_file" >&2
+    Exit 99
+  }
+else
+  echo "$me: $am_testauxdir/$am_funcs_file not found" >&2
+  Exit 99
+fi
+unset am_funcs_file
+
+# cross_compiling
+# ---------------
+# Tell whether we are cross-compiling.  This is especially useful to skip
+# tests (or portions of them) that requires a native compiler.
+cross_compiling ()
+{
+  # Quoting from the autoconf manual:
+  #   ... [$host_alias and $build both] default to the result of running
+  #   config.guess, unless you specify either --build or --host.  In
+  #   this case, the default becomes the system type you specified.
+  #   If you specify both, *and they're different*, configure enters
+  #   cross compilation mode (so it doesn't run any tests that require
+  #   execution).
+  test x"$host_alias" != x && test x"$build_alias" != x"$host_alias"
+}
+
+# is_newest FILE FILES
+# --------------------
+# Return false if any file in FILES is newer than FILE.
+# Resolve ties in favor of FILE.
+is_newest ()
+{
+  is_newest_files=`find "$@" -prune -newer "$1"`
+  test -z "$is_newest_files"
+}
+
+# is_blocked_signal SIGNAL-NUMBER
+# --------------------------------
+# Return success if the given signal number is blocked in the shell,
+# return a non-zero exit status and print a proper diagnostic otherwise.
+is_blocked_signal ()
+{
+  # Use perl, since trying to do this portably in the shell can be
+  # very tricky, if not downright impossible.  For reference, see:
+  # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+  if $PERL -w -e '
+    use strict;
+    use warnings FATAL => "all";
+    use POSIX;
+    my %oldsigaction = ();
+    sigaction('"$1"', 0, \%oldsigaction);
+    exit ($oldsigaction{"HANDLER"} eq "IGNORE" ? 0 : 77);
+  '; then
+    return 0
+  elif test $? -eq 77; then
+    return 1
+  else
+    fatal_ "couldn't determine whether signal $1 is blocked"
+  fi
+}
+
+# AUTOMAKE_run [-e STATUS] [-d DESCRIPTION] [--] [AUTOMAKE-ARGS...]
+# -----------------------------------------------------------------
+# Run automake with AUTOMAKE-ARGS, and fail if it doesn't exit with
+# STATUS.  Should be polymorphic for TAP and "plain" tests.  The
+# DESCRIPTION, when provided, is used for console reporting, only if
+# the TAP protocol is in use in the current test script.
+AUTOMAKE_run ()
+{
+  am__desc=
+  am__exp_rc=0
+  while test $# -gt 0; do
+    case $1 in
+      -d) am__desc=$2; shift;;
+      -e) am__exp_rc=$2; shift;;
+      --) shift; break;;
+       # Don't fail on unknown option: assume they (and the rest of the
+       # command line) are to be passed verbatim to automake (so stop our
+       # own option parsing).
+       *) break;;
+    esac
+    shift
+  done
+  am__got_rc=0
+  $AUTOMAKE ${1+"$@"} >stdout 2>stderr || am__got_rc=$?
+  cat stderr >&2
+  cat stdout
+  if test $am_using_tap != yes; then
+    test $am__got_rc -eq $am__exp_rc || Exit 1
+    return
+  fi
+  if test -z "$am__desc"; then
+    if test $am__got_rc -eq $am__exp_rc; then
+      am__desc="automake exited $am__got_rc"
+    else
+      am__desc="automake exited $am__got_rc, expecting $am__exp_rc"
+    fi
+  fi
+  command_ok_ "$am__desc" test $am__got_rc -eq $am__exp_rc
+}
+
+# AUTOMAKE_fails [-d DESCRIPTION] [OPTIONS...]
+# --------------------------------------------
+# Run automake with OPTIONS, and fail if doesn't exit with status 1.
+# Should be polymorphic for TAP and "plain" tests.  The DESCRIPTION,
+# when provided, is used for console reporting, only if the TAP
+# protocol is in use in the current test script.
+AUTOMAKE_fails ()
+{
+  AUTOMAKE_run -e 1 ${1+"$@"}
+}
+
+# extract_configure_help { --OPTION | VARIABLE-NAME } [FILES]
+# -----------------------------------------------------------
+# Use this to extract from the output of "./configure --help" (or similar)
+# the description or help message associated to the given --OPTION or
+# VARIABLE-NAME.
+extract_configure_help ()
+{
+  am__opt_re='' am__var_re=''
+  case $1 in
+    --*'=')   am__opt_re="^  $1";;
+    --*'[=]') am__opt_re='^  '`printf '%s\n' "$1" | sed 's/...$//'`'\[=';;
+    --*)      am__opt_re="^  $1( .*|$)";;
+      *)      am__var_re="^  $1( .*|$)";;
+  esac
+  shift
+  if test x"$am__opt_re" != x; then
+    LC_ALL=C awk '
+      /'"$am__opt_re"'/        { print; do_print = 1; next; }
+      /^$/                     { do_print = 0; next }
+      /^  --/                  { do_print = 0; next }
+      (do_print == 1)          { print }
+    ' ${1+"$@"}
+  else
+    LC_ALL=C awk '
+      /'"$am__var_re"'/        { print; do_print = 1; next; }
+      /^$/                     { do_print = 0; next }
+      /^  [A-Z][A-Z0-9_]* /    { do_print = 0; next }
+      /^  [A-Z][A-Z0-9_]*$/    { do_print = 0; next }
+      (do_print == 1)          { print }
+    ' ${1+"$@"}
+  fi
+}
+
+# grep_configure_help { --OPTION | VARIABLE-NAME } REGEXP
+# -------------------------------------------------------
+# Grep the section of "./configure --help" output associated with either
+# --OPTION or VARIABLE-NAME for the given *extended* regular expression.
+grep_configure_help ()
+{
+  ./configure --help > am--all-help \
+    || { cat am--all-help; Exit 1; }
+  cat am--all-help
+  extract_configure_help "$1" am--all-help > am--our-help \
+    || { cat am--our-help; Exit 1; }
+  cat am--our-help
+  $EGREP "$2" am--our-help || Exit 1
+}
+
+# using_gmake
+# -----------
+# Return success if $MAKE is GNU make, return failure otherwise.
+# Caches the result for speed reasons.
+using_gmake ()
+{
+  case $am__using_gmake in
+    yes)
+      return 0;;
+    no)
+      return 1;;
+    '')
+      # Use --version AND -v, because SGI Make doesn't fail on --version.
+      # Also grep for GNU because newer versions of FreeBSD make do
+      # not complain about --version (they seem to silently ignore it).
+      if $MAKE --version -v | grep GNU; then
+        am__using_gmake=yes
+        return 0
+      else
+        am__using_gmake=no
+        return 1
+      fi;;
+    *)
+      fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
+  esac
+}
+am__using_gmake="" # Avoid interferences from the environment.
+
+# make_can_chain_suffix_rules
+# ---------------------------
+# Return 0 if $MAKE is a make implementation that can chain suffix rules
+# automatically, return 1 otherwise.  Caches the result for speed reasons.
+make_can_chain_suffix_rules ()
+{
+  if test -z "$am__can_chain_suffix_rules"; then
+    if using_gmake; then
+      am__can_chain_suffix_rules=yes
+      return 0
+    else
+      mkdir am__chain.dir$$
+      cd am__chain.dir$$
+      unindent > Makefile << 'END'
+        .SUFFIXES: .u .v .w
+        .u.v: ; cp $< $@
+        .v.w: ; cp $< $@
+END
+      echo make can chain suffix rules > foo.u
+      if $MAKE foo.w && diff foo.u foo.w; then
+        am__can_chain_suffix_rules=yes
+      else
+        am__can_chain_suffix_rules=no
+      fi
+      cd ..
+      rm -rf am__chain.dir$$
+    fi
+  fi
+  case $am__can_chain_suffix_rules in
+    yes) return 0;;
+     no) return 1;;
+      *) fatal_ "make_can_chain_suffix_rules: internal error";;
+  esac
+}
+am__can_chain_suffix_rules="" # Avoid interferences from the environment.
+
+# useless_vpath_rebuild
+# ---------------------
+# Tell whether $MAKE suffers of the bug triggering automake bug#7884.
+# For example, this happens with FreeBSD make, since in a VPATH build
+# it tends to rebuilt files for which there is an explicit or even just
+# a suffix rule, even if said files are already available in the VPATH
+# directory.
+useless_vpath_rebuild ()
+{
+  if test -z "$am__useless_vpath_rebuild"; then
+    if using_gmake; then
+      am__useless_vpath_rebuild=no
+      return 1
+    fi
+    mkdir am__vpath.dir$$
+    cd am__vpath.dir$$
+    touch foo.a foo.b bar baz
+    mkdir build
+    cd build
+    unindent > Makefile << 'END'
+        .SUFFIXES: .a .b
+        VPATH = ..
+        all: foo.b baz
+        .PHONY: all
+        .a.b: ; cp $< $@
+        baz: bar ; cp ../baz bar
+END
+    if $MAKE all && test ! -f foo.b && test ! -f bar; then
+      am__useless_vpath_rebuild=no
+    else
+      am__useless_vpath_rebuild=yes
+    fi
+    cd ../..
+    rm -rf am__vpath.dir$$
+  fi
+  case $am__useless_vpath_rebuild in
+    yes) return 0;;
+     no) return 1;;
+     "") ;;
+      *) fatal_ "no_useless_builddir_remake: internal error";;
+  esac
+}
+am__useless_vpath_rebuild=""
+
+yl_distcheck () { useless_vpath_rebuild || $MAKE distcheck ${1+"$@"}; }
+
+# seq_ - print a sequence of numbers
+# ----------------------------------
+# This function simulates GNU seq(1) portably.  Valid usages:
+#  - seq LAST
+#  - seq FIRST LAST
+#  - seq FIRST INCREMENT LAST
+seq_ ()
+{
+  case $# in
+    0) fatal_ "seq_: missing argument";;
+    1) seq_first=1  seq_incr=1  seq_last=$1;;
+    2) seq_first=$1 seq_incr=1  seq_last=$2;;
+    3) seq_first=$1 seq_incr=$2 seq_last=$3;;
+    *) fatal_ "seq_: too many arguments";;
+  esac
+  # Try to avoid forks if possible.
+  case "$BASH_VERSION" in
+    ""|[12].*)
+      : Not bash, or a too old bash version. ;;
+    *)
+      # Use eval to protect dumber shells from parsing errors.
+      eval 'for ((i = seq_first; i <= seq_last; i += seq_incr)); do
+              echo $i
+            done'
+      return 0;;
+  esac
+  # Else, use GNU seq if available.
+  seq "$@" && return 0
+  # Otherwise revert to a slower loop using expr(1).
+  i=$seq_first
+  while test $i -le $seq_last; do
+    echo $i
+    i=`expr $i + $seq_incr`
+  done
+}
+
+# rm_rf_ [FILES OR DIRECTORIES ...]
+# ---------------------------------
+# Recursively remove the given files or directory, also handling the case
+# of non-writable subdirectories.
+rm_rf_ ()
+{
+  test $# -gt 0 || return 0
+  # Ignore failures in find, we are only interested in failures of the
+  # final rm.
+  find "$@" -type d ! -perm -700 -exec chmod u+rwx {} \; || :
+  rm -rf "$@"
+}
+
+# count_test_results total=N pass=N fail=N xpass=N xfail=N skip=N error=N
+# -----------------------------------------------------------------------
+# Check that a testsuite run driven by the parallel-tests harness has
+# had the specified numbers of test results (specified by kind).
+# This function assumes that the output of "make check" or "make recheck"
+# has been saved in the 'stdout' file in the current directory, and its
+# log in the 'test-suite.log' file.
+count_test_results ()
+{
+  # Use a subshell so that we won't pollute the script namespace.
+  (
+    # TODO: Do proper checks on the arguments?
+    total=ERR pass=ERR fail=ERR xpass=ERR xfail=ERR skip=ERR error=ERR
+    eval "$@"
+    # For debugging.
+    $EGREP -i '(total|x?pass|x?fail|skip|error)' stdout || :
+    rc=0
+    # Avoid spurious failures with shells with "overly sensible"
+    # errexit shell flag, such as e.g., Solaris /bin/sh.
+    set +e
+    test `grep -c '^PASS:'  stdout` -eq $pass  || rc=1
+    test `grep -c '^XFAIL:' stdout` -eq $xfail || rc=1
+    test `grep -c '^SKIP:'  stdout` -eq $skip  || rc=1
+    test `grep -c '^FAIL:'  stdout` -eq $fail  || rc=1
+    test `grep -c '^XPASS:' stdout` -eq $xpass || rc=1
+    test `grep -c '^ERROR:' stdout` -eq $error || rc=1
+    grep "^# TOTAL:  *$total$" stdout || rc=1
+    grep "^# PASS:  *$pass$"   stdout || rc=1
+    grep "^# XFAIL:  *$xfail$" stdout || rc=1
+    grep "^# SKIP:  *$skip$"   stdout || rc=1
+    grep "^# FAIL:  *$fail$"   stdout || rc=1
+    grep "^# XPASS:  *$xpass$" stdout || rc=1
+    grep "^# ERROR:  *$error$" stdout || rc=1
+    test $rc -eq 0
+  )
+}
+
+commented_sed_unindent_prog='
+  /^$/b                    # Nothing to do for empty lines.
+  x                        # Get x<indent> into pattern space.
+  /^$/{                    # No prior x<indent>, go prepare it.
+    g                      # Copy this 1st non-blank line into pattern space.
+    s/^\(['"$tab"' ]*\).*/x\1/   # Prepare x<indent> in pattern space.
+  }                        # Now: x<indent> in pattern and <line> in hold.
+  G                        # Build x<indent>\n<line> in pattern space, and
+  h                        # duplicate it into hold space.
+  s/\n.*$//                # Restore x<indent> in pattern space, and
+  x                        # exchange with the above duplicate in hold space.
+  s/^x\(.*\)\n\1//         # Remove leading <indent> from <line>.
+  s/^x.*\n//               # Restore <line> when there is no leading <indent>.
+'
+
+# unindent [input files...]
+# -------------------------
+# Remove the "proper" amount of leading whitespace from the given files,
+# and output the result on stdout.  That amount is determined by looking
+# at the leading whitespace of the first non-blank line in the input
+# files.  If no input file is specified, standard input is implied.
+unindent ()
+{
+  if test x"$sed_unindent_prog" = x; then
+    sed_unindent_prog=`printf '%s\n' "$commented_sed_unindent_prog" | sed -e 
"s/  *# .*//"`
+  fi
+  sed "$sed_unindent_prog" ${1+"$@"}
+}
+sed_unindent_prog="" # Avoid interferences from the environment.
+
+# get_shell_script SCRIPT-NAME
+# -----------------------------
+# Fetch an Automake-provided shell script from the 'lib/' directory into
+# the current directory, and, if the '$am_test_prefer_config_shell'
+# variable is set to "yes", modify its shebang line to use $SHELL instead
+# of /bin/sh.
+get_shell_script ()
+{
+  test ! -f "$1" || rm -f "$1" || return 99
+  if test x"$am_test_prefer_config_shell" = x"yes"; then
+    sed "1s|#!.*|#! $SHELL|" "$am_scriptdir/$1" > "$1" \
+     && chmod a+x "$1" \
+     || return 99
+  else
+    cp -f "$am_scriptdir/$1" . || return 99
+  fi
+  sed 10q "$1" # For debugging.
+}
+
+# require_xsi SHELL
+# -----------------
+# Skip the test if the given shell fails to support common XSI constructs.
+require_xsi ()
+{
+  test $# -eq 1 || fatal_ "require_xsi needs exactly one argument"
+  echo "$me: trying some XSI constructs with $1"
+  $1 -c "$xsi_shell_code" || skip_all_ "$1 lacks XSI features"
+}
+# Shell code supposed to work only with XSI shells.  Keep this in sync
+# with libtool.m4:_LT_CHECK_SHELL_FEATURES.
+xsi_shell_code='
+  _lt_dummy="a/b/c"
+  test 
"${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval '\''test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5'\'
+
+# fetch_tap_driver
+# ----------------
+# Fetch the Automake-provided TAP driver from the 'lib/' directory into
+# the current directory, and edit its shebang line so that it will be
+# run with the perl interpreter determined at configure time.
+fetch_tap_driver ()
+{
+  # TODO: we should devise a way to make the shell TAP driver tested also
+  # TODO: with /bin/sh, for better coverage.
+  case $am_tap_implementation in
+    perl)
+      $PERL -MTAP::Parser -e 1 \
+        || skip_all_ "cannot import TAP::Parser perl module"
+      sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver
+      ;;
+    shell)
+      AM_TAP_AWK=$AWK; export AM_TAP_AWK
+      sed "1s|#!.*|#! $SHELL|" "$am_scriptdir"/tap-driver.sh >tap-driver
+      ;;
+    *)
+      fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'" ;;
+  esac \
+    && chmod a+x tap-driver \
+    || framework_failure_ "couldn't fetch $am_tap_implementation TAP driver"
+  sed 10q tap-driver # For debugging.
+}
+# The shell/awk implementation of the TAP driver is still mostly dummy, so
+# use the perl implementation by default for the moment.
+am_tap_implementation=${am_tap_implementation-shell}
+
+# Usage: require_compiler_ {cc|c++|fortran|fortran77}
+require_compiler_ ()
+{
+  case $# in
+    0) fatal_ "require_compiler_: missing argument";;
+    1) ;;
+    *) fatal_ "require_compiler_: too many arguments";;
+  esac
+  case $1 in
+    cc)
+      am__comp_lang="C"
+      am__comp_var=CC
+      am__comp_flag_vars='CFLAGS CPPFLAGS'
+      ;;
+    c++)
+      am__comp_lang="C++"
+      am__comp_var=CXX
+      am__comp_flag_vars='CXXFLAGS CPPFLAGS'
+      ;;
+    fortran)
+      am__comp_lang="Fortran"
+      am__comp_var=FC
+      am__comp_flag_vars='FCFLAGS'
+      ;;
+    fortran77)
+      am__comp_lang="Fortran 77"
+      am__comp_var=F77
+      am__comp_flag_vars='FFLAGS'
+      ;;
+  esac
+  shift
+  eval "am__comp_prog=\${$am__comp_var}" \
+    || fatal_ "expanding \${$am__comp_var} in require_compiler_"
+  case $am__comp_prog in
+    "")
+      fatal_ "botched configuration: \$$am__comp_var is empty";;
+    false)
+      skip_all_ "no $am__comp_lang compiler available";;
+    autodetect|autodetected)
+      # Let the ./configure commands in the test script try to determine
+      # these automatically.
+      unset $am__comp_var $am__comp_flag_vars;;
+    *)
+      # Pre-set these for the ./configure commands in the test script.
+      export $am__comp_var $am__comp_flag_vars;;
+  esac
+  # Delete private variables.
+  unset am__comp_lang am__comp_prog am__comp_var am__comp_flag_vars
+}
+
+## ----------------------------------------------------------- ##
+##  Checks for required tools, and additional setups (if any)  ##
+##  required by them.                                          ##
+## ----------------------------------------------------------- ##
+
+# Look for (and maybe set up) required tools and/or system features; skip
+# the current test if they are not found.
+for tool in : $required
+do
+  # Check that each required tool is present.
+  case $tool in
+    :) ;;
+    cc|c++|fortran|fortran77)
+      require_compiler_ $tool;;
+    xsi-lib-shell)
+      if test x"$am_test_prefer_config_shell" = x"yes"; then
+        require_xsi "$SHELL"
+      else
+        require_xsi "/bin/sh"
+      fi
+      ;;
+    bzip2)
+      # Do not use --version, older versions bzip2 still tries to compress
+      # stdin.
+      echo "$me: running bzip2 --help"
+      bzip2 --help \
+        || skip_all_ "required program 'bzip2' not available"
+      ;;
+    cl)
+      CC=cl
+      # Don't export CFLAGS, as that could have been initialized to only
+      # work with the C compiler detected at configure time.  If the user
+      # wants CFLAGS to also influence 'cl', he can still export CFLAGS
+      # in the environment "by hand" before calling the testsuite.
+      export CC CPPFLAGS
+      echo "$me: running $CC -?"
+      $CC -? || skip_all_ "Microsoft C compiler '$CC' not available"
+      ;;
+    etags)
+      # Exuberant Ctags will create a TAGS file even
+      # when asked for --help or --version.  (Emacs's etags
+      # does not have such problem.)  Use -o /dev/null
+      # to make sure we do not pollute the build directory.
+      echo "$me: running etags --version -o /dev/null"
+      etags --version -o /dev/null \
+        || skip_all_ "required program 'etags' not available"
+      ;;
+    GNUmake)
+      for make_ in "$MAKE" gmake gnumake :; do
+        MAKE=$make_ am__using_gmake=''
+        test "$MAKE" =  : && break
+        echo "$me: determine whether $MAKE is GNU make"
+        # Don't use "&&" here, or a bug of 'set -e' present in some
+        # versions of the BSD shell will be triggered.  We add the
+        # dummy "else" branch for extra safety.
+        if using_gmake; then break; else :; fi
+      done
+      test "$MAKE" = : && skip_all_ "this test requires GNU make"
+      export MAKE
+      unset make_
+      ;;
+    gcj)
+      GCJ=$GNU_GCJ GCJFLAGS=$GNU_GCJFLAGS; export GCJ GCJFLAGS
+      test "$GCJ" = false && skip_all_ "GNU Java compiler unavailable"
+      : For shells with busted 'set -e'.
+      ;;
+    gcc)
+      CC=$GNU_CC CFLAGS=$GNU_CFLAGS; export CC CFLAGS CPPFLAGS
+      test "$CC" = false && skip_all_ "GNU C compiler unavailable"
+      : For shells with busted 'set -e'.
+      ;;
+    g++)
+      CXX=$GNU_CXX CXXFLAGS=$GNU_CXXFLAGS; export CXX CXXFLAGS CPPFLAGS
+      test "$CXX" = false && skip_all_ "GNU C++ compiler unavailable"
+      : For shells with busted 'set -e'.
+      ;;
+    gfortran)
+      FC=$GNU_FC FCFLAGS=$GNU_FCFLAGS; export FC FCFLAGS
+      test "$FC" = false && skip_all_ "GNU Fortran compiler unavailable"
+      case " $required " in
+        *\ g77\ *) ;;
+        *) F77=$FC FFLAGS=$FCFLAGS; export F77 FFLAGS;;
+      esac
+      ;;
+    g77)
+      F77=$GNU_F77 FFLAGS=$GNU_FFLAGS; export F77 FFLAGS
+      test "$F77" = false && skip_all_ "GNU Fortran 77 compiler unavailable"
+      case " $required " in
+        *\ gfortran\ *) ;;
+        *) FC=$F77 FCFLAGS=$FFLAGS; export FC FCFLAGS;;
+      esac
+      ;;
+    javac)
+      # The Java compiler from JDK 1.5 (and presumably earlier versions)
+      # cannot handle the '-version' option by itself: it bails out
+      # telling that source files are missing.  Adding also the '-help'
+      # option seems to solve the problem.
+      echo "$me: running javac -version -help"
+      javac -version -help || skip_all_ "Sun Java compiler not available"
+      ;;
+    java)
+      # See the comments above about 'javac' for why we use also '-help'.
+      echo "$me: running java -version -help"
+      java -version -help || skip_all_ "Sun Java interpreter not found"
+      ;;
+    lib)
+      AR=lib
+      export AR
+      # Attempting to create an empty archive will actually not
+      # create the archive, but lib will output its version.
+      echo "$me: running $AR -out:defstest.lib"
+      $AR -out:defstest.lib \
+        || skip_all_ "Microsoft 'lib' utility not available"
+      ;;
+    makedepend)
+      echo "$me: running makedepend -f-"
+      makedepend -f- \
+        || skip_all_ "required program 'makedepend' not available"
+      ;;
+    makeinfo-html)
+      # Make sure we have makeinfo, and it understands '--html'.
+      echo "$me: running makeinfo --html --version"
+      makeinfo --html --version \
+        || skip_all_ "cannot find a makeinfo program that groks" \
+                     "the '--html' option"
+      ;;
+    mingw)
+      uname_s=`uname -s || echo UNKNOWN`
+      echo "$me: system name: $uname_s"
+      case $uname_s in
+        MINGW*) ;;
+        *) skip_all_ "this test requires MSYS in MinGW mode" ;;
+      esac
+      ;;
+    non-root)
+      # Skip this test case if the user is root.
+      # We try to append to a read-only file to detect this.
+      priv_check_temp=priv-check.$$
+      touch $priv_check_temp && chmod a-w $priv_check_temp \
+        || framework_failure_ "creating unwritable file $priv_check_temp"
+      # Not a useless use of subshell: lesser shells like Solaris /bin/sh
+      # can exit if a builtin fails.
+      overwrite_status=0
+      (echo foo >> $priv_check_temp) || overwrite_status=$?
+      rm -f $priv_check_temp
+      if test $overwrite_status -eq 0; then
+        skip_all_ "cannot drop file write permissions"
+      fi
+      unset priv_check_temp overwrite_status
+      ;;
+    perl-threads)
+      if test "$WANT_NO_THREADS" = "yes"; then
+        skip_all_ "Devel::Cover cannot cope with threads"
+      fi
+      ;;
+    native)
+      # Don't use "&&" here, to avoid a bug of 'set -e' present in
+      # some (even relatively recent) versions of the BSD shell.
+      # We add the dummy "else" branch for extra safety.
+      if cross_compiling; then
+        skip_all_ "doesn't work in cross-compile mode"
+      else :; fi
+      ;;
+    python)
+      # Python doesn't support --version, it has -V
+      echo "$me: running python -V"
+      python -V || skip_all_ "python interpreter not available"
+      ;;
+    ro-dir)
+      # Skip this test case if read-only directories aren't supported
+      # (e.g., under DOS.)
+      ro_dir_temp=ro_dir.$$
+      mkdir $ro_dir_temp && chmod a-w $ro_dir_temp \
+        || framework_failure_ "creating unwritable directory $ro_dir_temp"
+      # Not a useless use of subshell: lesser shells like Solaris /bin/sh
+      # can exit if a builtin fails.
+      create_status=0
+      (: > $ro_dir_temp/probe) || create_status=$?
+      rm -rf $ro_dir_temp
+      if test $create_status -eq 0; then
+        skip_all_ "cannot drop directory write permissions"
+      fi
+      unset ro_dir_temp create_status
+      ;;
+    runtest)
+      # DejaGnu's runtest program. We rely on being able to specify
+      # the program on the runtest command-line. This requires
+      # DejaGnu 1.4.3 or later.
+      echo "$me: running runtest SOMEPROGRAM=someprogram --version"
+      runtest SOMEPROGRAM=someprogram --version \
+        || skip_all_ "DejaGnu is not available"
+      ;;
+    tex)
+      # No all versions of Tex support '--version', so we use
+      # a configure check.
+      if test -z "$TEX"; then
+        skip_all_ "TeX is required, but it wasn't found by configure"
+      fi
+      ;;
+    texi2dvi-o)
+      # Texi2dvi supports '-o' since Texinfo 4.1.
+      echo "$me: running texi2dvi -o /dev/null --version"
+      texi2dvi -o /dev/null --version \
+        || skip_all_ "required program 'texi2dvi' not available"
+      ;;
+    lex)
+      test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
+      export LEX
+      ;;
+    yacc)
+      test x"$YACC" = x"false" && skip_all_ "yacc not found or disabled"
+      export YACC
+      ;;
+    flex)
+      LEX=flex; export LEX
+      echo "$me: running flex --version"
+      flex --version || skip_all_ "required program 'flex' not available"
+      ;;
+    bison)
+      YACC='bison -y'; export YACC
+      echo "$me: running bison --version"
+      bison --version || skip_all_ "required program 'bison' not available"
+      ;;
+    *)
+      # Generic case: the tool must support --version.
+      echo "$me: running $tool --version"
+      # It is not likely but possible that $tool is a special builtin,
+      # in which case the shell is allowed to exit after an error.  So
+      # we need the subshell here.  Also, some tools, like Sun cscope,
+      # can be interactive without redirection.
+      ($tool --version) </dev/null \
+        || skip_all_ "required program '$tool' not available"
+      ;;
+  esac
+done
+
+# Using just $am_top_builddir for the check here is ok, since the
+# further temporary subdirectory where the test will be run is
+# ensured not to contain any whitespace character.
+case $am_top_builddir in
+  *\ *|*\      *)
+    case " $required " in
+      *' libtool '* | *' libtoolize '* )
+        skip_all_ "libtool has problems with spaces in builddir name";;
+    esac
+    ;;
+esac
+
+# This test is necessary, although Automake's configure script bails out
+# when $srcdir contains spaces.  This is because $am_top_srcdir is in not
+# configure-time $srcdir, but is instead configure-time $abs_srcdir, and
+# that is allowed to contain spaces.
+case $am_top_srcdir in
+  *\ * |*\     *)
+    case " $required " in
+      *' libtool '* | *' libtoolize '* | *' gettext '* )
+        skip_all_ "spaces in srcdir name: libtool/gettext tests won't work";;
+   esac
+   ;;
+esac
+
+# We might need extra macros, e.g., from Libtool or Gettext.
+case " $required " in *\ libtool*) . ./t/libtool-macros.dir/get.sh;; esac
+case " $required " in *\ gettext*) . ./t/gettext-macros.dir/get.sh;; esac
+
+
+## ---------------------------------------------------------------- ##
+##  Create and set up of the temporary directory used by the test.  ##
+##  Set up of the exit trap for cleanup of said directory.          ##
+## ---------------------------------------------------------------- ##
+
+# This might be used in testcases checking distribution-related features.
+# Test scripts are free to override this if they need to.
+distdir=$me-1.0
+
+# Set up the exit trap.
+if test "$sh_errexit_works" = yes; then
+  trap 'exit_status=$?
+    set +e
+    cd "$am_top_builddir"
+    if test $am_using_tap = yes; then
+      if test "$planned_" = later && test $exit_status -eq 0; then
+        plan_ "now"
+      fi
+      test $exit_status -eq 0 && test $tap_pass_count_ -eq $tap_count_ \
+        || keep_testdirs=yes
+    else
+      # This is to ensure that a test script does give a SKIP outcome just
+      # because a command in it happens to exit with status 77.  This
+      # behaviour, while from time to time useful to developers, is not
+      # meant to be enabled by default, as it could cause spurious failures
+      # in the wild.  Thus it will be enabled only when the variable
+      # "am_explicit_skips" is set to a "true" value.
+      case $am_explicit_skips in
+        [yY]|[yY]es|1)
+          if test $exit_status -eq 77 && test $am__test_skipped != yes; then
+            echo "$me: implicit skip turned into failure"
+            exit_status=78
+          fi;;
+      esac
+      test $exit_status -eq 0 || keep_testdirs=yes
+    fi
+    am_keeping_testdirs || rm_rf_ $testSubDir
+    set +x
+    echo "$me: exit $exit_status"
+    exit $exit_status
+  ' 0
+  trap "fatal_ 'caught signal SIGHUP'" 1
+  trap "fatal_ 'caught signal SIGINT'" 2
+  trap "fatal_ 'caught signal SIGTERM'" 15
+  # Various shells seems to just ignore SIGQUIT under some circumstances,
+  # even if the signal is not blocked; however, if the signal it trapped,
+  # the trap gets correctly executed.  So we also trap SIGQUIT.
+  # Here is a list of some shells that have been verified to exhibit the
+  # problematic behavior with SIGQUIT:
+  #  - zsh 4.3.12 on Debian GNU/Linux
+  #  - /bin/ksh and /usr/xpg4/bin/sh on Solaris 10
+  #  - Bash 3.2.51 on Solaris 10 and bash 4.1.5 on Debian GNU/Linux
+  #  - AT&T ksh on Debian Gnu/Linux (deb package ksh, version 93u-1)
+  # OTOH, at least these shells that do *not* exhibit that behaviour:
+  #  - modern version of the Almquist Shell (at least 0.5.5.1), on
+  #    both Solaris and GNU/Linux
+  #  - Solaris 10 /bin/sh
+  #  - public domain Korn Shell, version 5.2.14, on Debian GNU/Linux
+  trap "fatal_ 'caught signal SIGQUIT'" 3
+  # Ignore further SIGPIPE in the trap code.  This is required to avoid
+  # a very weird issue with some shells, at least when the execution of
+  # the automake testsuite is driven by the 'prove' utility: if prove
+  # (or the make process that has spawned it) gets interrupted with
+  # Ctrl-C, the shell might go in a loop, continually getting a SIGPIPE,
+  # sometimes finally dumping core, other times hanging indefinitely.
+  # See also Test::Harness bug [rt.cpan.org #70855], archived at
+  # <https://rt.cpan.org/Ticket/Display.html?id=70855>
+  trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13
+fi
+
+# Create and populate the temporary directory, if and as required.
+if test x"$am_create_testdir" = x"no"; then
+  testSubDir=
+else
+  # The subdirectory where the current test script will run and write its
+  # temporary/data files.  This will be created shortly, and will be removed
+  # by the cleanup trap below if the test passes.  If the test doesn't pass,
+  # this directory will be kept, to facilitate debugging.
+  testSubDir=t/$me.dir
+  test ! -d $testSubDir || rm_rf_ $testSubDir \
+    || framework_failure_ "removing old test subdirectory"
+  test -d t || mkdir t
+  mkdir $testSubDir \
+    || framework_failure_ "creating test subdirectory"
+  # The trailing './'ris to avoid CDPATH issues.
+  cd ./$testSubDir \
+    || framework_failure_ "cannot chdir into test subdirectory"
+  if test x"$am_create_testdir" != x"empty"; then
+    cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \
+       "$am_scriptdir"/depcomp . \
+      || framework_failure_ "fetching common files from $am_scriptdir"
+    # Build appropriate environment in test directory.  E.g., create
+    # configure.ac, touch all necessary files, etc.  Don't use AC_OUTPUT,
+    # but AC_CONFIG_FILES so that appending still produces a valid
+    # configure.ac.  But then, tests running config.status really need
+    # to append AC_OUTPUT.
+    {
+      echo "AC_INIT([$me], [1.0])"
+      if test x"$am_parallel_tests" = x"yes"; then
+        echo "AM_INIT_AUTOMAKE([parallel-tests])"
+      else
+        echo "AM_INIT_AUTOMAKE"
+      fi
+      echo "AC_CONFIG_FILES([Makefile])"
+    } >configure.ac || framework_failure_ "creating configure.ac skeleton"
+  fi
+fi
+
+
+## ---------------- ##
+##  Ready to go...  ##
+## ---------------- ##
+
+set -x
+pwd
diff --git a/defs-static.in b/defs-static.in
new file mode 100644
index 0000000..a8a17f0
--- /dev/null
+++ b/defs-static.in
@@ -0,0 +1,244 @@
+# -*- shell-script -*-
+# @configure_input@
+#
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Defines and minimal setup for Automake testing environment.
+
+# IMPORTANT NOTES AND REQUIREMENTS
+#   - Multiple inclusions of this file should be idempotent.
+#   - This code has to be 'set -e' clean.
+#   - This file should execute correctly with any system's /bin/sh
+#     shell, not only with configure-time detected $CONFIG_SHELL.
+
+# Be more Bourne compatible.
+# (Snippet inspired to configure's initialization in Autoconf 2.64)
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+  # If Zsh is not started directly in Bourne-compatibility mode, it has
+  # some incompatibilities in the handling of $0 that conflict with
+  # our usage: i.e., $0 inside a file sourced with the '.' builtin is
+  # temporarily set to the name of the sourced file.
+  # Work around this when possible, otherwise abort the script.
+  # Note that a bug in some versions of Zsh prevents us from resetting $0
+  # in a sourced script, so the use of $argv0.  For more info see:
+  #  <http://www.zsh.org/mla/workers/2009/msg01140.html>
+  # Note: the apparently useless 'eval' below are needed by at least
+  # dash 0.5.2, to prevent it from bailing out with an error like
+  # "Syntax error: Bad substitution"
+  if eval '[[ "$0" = *."test" ]]'; then
+    # Good, FUNCTION_ARGZERO option was already off when this file was
+    # sourced.  Thus we've nothing to do.
+    argv0=$0
+  elif eval 'test -n "${functrace[-1]}"'; then
+    # FUNCTION_ARGZERO option was on, but we have a easy workaround.
+    eval 'argv0=${functrace[-1]%:*}'
+  else
+    # Give up.
+    echo "$0: cannot determine the path of running test script" >&2
+    echo "$0: test was running with Zsh version $ZSH_VERSION" >&2
+    echo "$0: did you enable the NO_FUNCTION_ARGZERO option?" >&2
+    exit 99
+  fi
+else
+  argv0=$0
+  # Avoid command substitution failure, for Tru64 sh -e and instspc*.test.
+  case `(set -o) 2>/dev/null || :` in *posix*) set -o posix;; esac
+fi
+
+# Check that the environment is properly sanitized.
+# Having variables exported to the empty string is OK, since our code
+# treats such variables as if they were unset.
+for var in \
+  me \
+  required \
+  am_using_tap \
+  am_parallel_tests \
+  am_create_testdir \
+  am_tap_implementation \
+  am_test_prefer_config_shell \
+  am_original_AUTOMAKE \
+  am_original_ACLOCAL \
+; do
+  if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then
+    echo "$argv0: variable '$var' is set in the environment:" \
+         "this is unsafe" >&2
+    exit 99
+  fi
+done
+unset var
+
+# See whether the current test script is expected to use TAP or not.
+# Use a sensible default, while allowing the scripts to override this
+# check.
+if test -z "$am_using_tap"; then
+  case $argv0 in *.tap) am_using_tap=yes;; *) am_using_tap=no;; esac
+fi
+
+am_top_srcdir='@abs_srcdir@'
+am_top_builddir='@abs_builddir@'
+testprefix='@prefix@'
+
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed.
+am_testauxdir=$am_top_srcdir/t/ax
+
+# Support for the "installcheck" target.
+case ${am_running_installcheck:=no} in
+  yes)
+    am_amdir='@amdir@'
+    am_automake_acdir='@automake_acdir@'
+    am_bindir='@bindir@'
+    am_datadir='@datadir@'
+    am_docdir='@docdir@'
+    am_pkgvdatadir='@pkgvdatadir@'
+    am_scriptdir='@scriptdir@'
+    am_system_acdir='@system_acdir@'
+    ;;
+  no)
+    am_amdir=$am_top_srcdir/lib/am
+    am_automake_acdir=$am_top_srcdir/m4
+    am_bindir=$am_top_builddir/t/wrap
+    am_datadir=$am_top_srcdir
+    am_docdir=$am_top_srcdir/doc
+    am_pkgvdatadir=$am_top_srcdir/lib
+    am_scriptdir=$am_top_srcdir/lib
+    am_system_acdir=$am_top_srcdir/m4/acdir
+    ;;
+  *)
+    echo "$argv0: variable 'am_running_installcheck' has invalid"
+         "value '$am_running_installcheck'" >&2
+    exit 99
+    ;;
+esac
+
+APIVERSION='@APIVERSION@'
+PATH_SEPARATOR='@PATH_SEPARATOR@'
+
+host_alias=${host_alias-'@host_alias@'}; export host_alias
+build_alias=${build_alias-'@build_alias@'}; export build_alias
+
+# Make sure we override the user shell.  And do not read the value of
+# $SHELL from the environment (think to the non-uncommon situation where
+# e.g., $SHELL=/bin/tcsh).
+SHELL=${AM_TESTSUITE_SHELL-'@SHELL@'}; export SHELL
+
+# User can override various tools used.  Prefer overriding specific for
+# that automake testsuite, if they are available.
+AWK=${AM_TESTSUITE_AWK-${AWK-'@AWK@'}}
+PERL=${AM_TESTSUITE_PERL-${PERL-'@PERL@'}}
+MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
+YACC=${AM_TESTSUITE_YACC-${YACC-'@YACC@'}}
+LEX=${AM_TESTSUITE_LEX-${LEX-'@LEX@'}}
+AUTOCONF=${AM_TESTSUITE_AUTOCONF-${AUTOCONF-'@am_AUTOCONF@'}}
+AUTOM4TE=${AM_TESTSUITE_AUTOM4TE-${AUTOM4TE-'@am_AUTOM4TE@'}}
+AUTORECONF=${AM_TESTSUITE_AUTORECONF-${AUTORECONF-'@am_AUTORECONF@'}}
+AUTOHEADER=${AM_TESTSUITE_AUTOHEADER-${AUTOHEADER-'@am_AUTOHEADER@'}}
+AUTOUPDATE=${AM_TESTSUITE_AUTOUPDATE-${AUTOUPDATE-'@am_AUTOUPDATE@'}}
+
+# Tests who want complete control over aclocal or automake command-line
+# options should use $am_original_ACLOCAL or $am_original_AUTOMAKE.  The
+# "test -z" tests take care not to re-initialize them if defs-static
+# is re-sourced, as we want defs-static to remain really idempotent.
+if test -z "$am_original_AUTOMAKE"; then
+  
am_original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-$APIVERSION"}}
+fi
+if test -z "$am_original_ACLOCAL"; then
+  am_original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-$APIVERSION"}}
+fi
+
+# Use -Werror because this also turns some Perl warnings into error.
+# Tests for which this is inappropriate should use -Wno-error.
+# Tests who want complete control over aclocal command-line options
+# should use $am_original_ACLOCAL instead.
+ACLOCAL="$am_original_ACLOCAL -Werror"
+
+# See how Automake should be run.  We put --foreign as the default
+# strictness to avoid having to create lots and lots of files.  A test
+# can override this by specifying a different strictness.  Use -Wall
+# -Werror by default.  Tests for which this is inappropriate (e.g. when
+# testing that a warning is enabled by a specific switch) should use
+# -Wnone or/and -Wno-error.
+# Tests who want complete control over automake command-line options
+# should use $am_original_AUTOMAKE instead.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror -Wall"
+
+# POSIX no longer requires 'egrep' and 'fgrep',
+# but some hosts lack 'grep -E' and 'grep -F'.
+EGREP=${AM_TESTSUITE_EGREP-'@EGREP@'}
+FGREP=${AM_TESTSUITE_FGREP-'@FGREP@'}
+
+# Compilers and their flags.  These can point to non-GNU compilers (and
+# on non-Linux and non-BSD systems, they probably will).
+CC=${AM_TESTSUITE_CC-${CC-'@CC@'}}
+CXX=${AM_TESTSUITE_CXX-${CXX-'@CXX@'}}
+F77=${AM_TESTSUITE_F77-${F77-'@F77@'}}
+FC=${AM_TESTSUITE_FC-${FC-'@FC@'}}
+CFLAGS=${AM_TESTSUITE_CFLAGS-${CFLAGS-'@CFLAGS@'}}
+CXXFLAGS=${AM_TESTSUITE_CXXFLAGS-${CXXFLAGS-'@CXXFLAGS@'}}
+FCFLAGS=${AM_TESTSUITE_FCFLAGS-${FCFLAGS-'@FCFLAGS@'}}
+FFLAGS=${AM_TESTSUITE_FFLAGS-${FFLAGS-'@FFLAGS@'}}
+CPPFLAGS=${AM_TESTSUITE_CPPFLAGS-${CPPFLAGS-'@CPPFLAGS@'}}
+
+# GNU compilers and their flags.
+GNU_CC=${AM_TESTSUITE_GNU_CC-${GNU_CC-'@GNU_CC@'}}
+GNU_CXX=${AM_TESTSUITE_GNU_CXX-${GNU_CXX-'@GNU_CXX@'}}
+GNU_F77=${AM_TESTSUITE_GNU_F77-${GNU_F77-'@GNU_F77@'}}
+GNU_FC=${AM_TESTSUITE_GNU_FC-${GNU_FC-'@GNU_FC@'}}
+GNU_FFLAGS=${AM_TESTSUITE_GNU_FFLAGS-${GNU_FFLAGS-'@GNU_FFLAGS@'}}
+GNU_FCFLAGS=${AM_TESTSUITE_GNU_FCFLAGS-${GNU_FCFLAGS-'@GNU_FCFLAGS@'}}
+GNU_CXXFLAGS=${AM_TESTSUITE_GNU_CXXFLAGS-${GNU_CXXFLAGS-'@GNU_CXXFLAGS@'}}
+GNU_CFLAGS=${AM_TESTSUITE_GNU_CFLAGS-${GNU_CFLAGS-'@GNU_CFLAGS@'}}
+GNU_GCJ=${AM_TESTSUITE_GNU_GCJ-${GNU_GCJ-'@GNU_GCJ@'}}
+GNU_GCJFLAGS=${AM_TESTSUITE_GNU_GCJFLAGS-${GNU_GCJFLAGS-'@GNU_GCJFLAGS@'}}
+
+# No all versions of Tex support '--version', so we use a configure
+# check to decide if tex is available.  This decision is embodied in
+# this variable.
+TEX=${AM_TESTSUITE_TEX-'@TEX@'}
+
+# Whether $SHELL has working 'set -e' with exit trap.
+sh_errexit_works='@sh_errexit_works@'
+
+# The amount we should wait after modifying files depends on the platform.
+# For instance, Windows '95, '98 and ME have 2-second granularity
+# and can be up to 3 seconds in the future w.r.t. the system clock.
+sleep='sleep @MODIFICATION_DELAY@'
+
+# An old timestamp that can be given to a file, in "touch -t" format.
+# The time stamp should be portable to all file systems of interest.
+# Just for fun, choose the exact time of the announcement of the GNU project
+# in UTC; see <http://www.gnu.org/gnu/initial-announcement.html>.
+old_timestamp=198309271735.59
+
+# Make our wrapper script (or installed scripts, if running under
+# "installcheck") accessible by default.  And avoid to uselessly
+# extend $PATH multiple times if this file is sourced multiple times.
+case $PATH in
+  $am_bindir$PATH_SEPARATOR*) ;;
+  *) PATH=$am_bindir$PATH_SEPARATOR$PATH;;
+esac
+
+# Make our helper script accessible by default.
+PATH=$am_testauxdir$PATH_SEPARATOR$PATH
+
+export PATH
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 655673b..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake.
-
-# Copyright (C) 2003, 2006, 2008, 2009, 2012 Free Software Foundation,
-# Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-info_TEXINFOS = automake.texi
-automake_TEXINFOS = fdl.texi
-
-dist_man1_MANS = \
-  $(srcdir)/aclocal.1 \
-  $(srcdir)/automake.1 \
-  $(srcdir)/aclocal-$(APIVERSION).1 \
-  $(srcdir)/automake-$(APIVERSION).1
-MAINTAINERCLEANFILES = $(dist_man1_MANS)
-update_mans = \
-  PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
-  export PATH && \
-  $(HELP2MAN) --output=$@
-$(dist_man1_MANS): $(top_srcdir)/configure.ac
-$(srcdir)/aclocal.1 $(srcdir)/automake.1:
-       f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
-       echo ".so man1/$$f-$(APIVERSION).1" > $@
-$(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in
-       $(update_mans) aclocal-$(APIVERSION)
-$(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in
-       $(update_mans) automake-$(APIVERSION)
-
-# The following requires a fixed version of the Emacs 19.30 etags.
-ETAGS_ARGS = --lang=none \
- --regex='/address@hidden \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
-
-amhello_sources = \
-  amhello/configure.ac \
-  amhello/Makefile.am \
-  amhello/README \
-  amhello/src/main.c \
-  amhello/src/Makefile.am
-
-amhello_configury = \
-  aclocal.m4 \
-  autom4te.cache \
-  Makefile.in \
-  config.h.in \
-  configure \
-  depcomp \
-  install-sh \
-  missing \
-  src/Makefile.in
-
-dist_noinst_DATA = $(amhello_sources)
-dist_doc_DATA = $(srcdir)/amhello-1.0.tar.gz
-
-# We depend on configure.ac so that we regenerate the tarball
-# whenever the Automake version changes.
-# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
-# configure in tests/.
-$(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac
-       $(AM_V_GEN)abs_top_builddir=`cd '$(top_builddir)' && pwd` && \
-       PATH="$$abs_top_builddir/tests$(PATH_SEPARATOR)$$PATH" && \
-       export PATH && \
-       cd $(srcdir)/amhello && \
-       ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \
-       AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE && \
-       AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF && \
-       AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE && \
-       AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF && \
-       AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER && \
-       AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \
-       $(am_AUTORECONF) -vfi && \
-       ./configure && \
-       $(MAKE) $(AM_MAKEFLAGS) distcheck && \
-       $(MAKE) $(AM_MAKEFLAGS) distclean && \
-       rm -rf $(amhello_configury) && \
-       mv amhello-1.0.tar.gz ..
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index 469aeb9..8d230a8 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 # This Makefile.am is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
diff --git a/doc/amhello/configure.ac b/doc/amhello/configure.ac
index cd378cb..6d966a2 100644
--- a/doc/amhello/configure.ac
+++ b/doc/amhello/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 # This configure.ac script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 9642aa0..9e17883 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 # This Makefile.am is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
diff --git a/doc/amhello/src/main.c b/doc/amhello/src/main.c
index 8b1ccf2..c782738 100644
--- a/doc/amhello/src/main.c
+++ b/doc/amhello/src/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
    This program is free software; the Free Software Foundation
    gives unlimited permission to copy, distribute and modify it.  */
 
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
new file mode 100644
index 0000000..5cb3685
--- /dev/null
+++ b/doc/automake-history.texi
@@ -0,0 +1,1214 @@
+\input texinfo   @c -*-texinfo-*-
address@hidden %**start of header
address@hidden automake-history.info
address@hidden automake-history
address@hidden on
address@hidden %**end of header
+
address@hidden
+
+This manual describes (part of) the history of GNU Automake, a program
+that creates GNU standards-compliant Makefiles from template files.
+
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
+
address@hidden
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with no Front-Cover texts,
+and with no Back-Cover Texts.  A copy of the license is included in the
+section entitled ``GNU Free Documentation License.''
+
address@hidden quotation
address@hidden copying
+
address@hidden
address@hidden Brief History of Automake
address@hidden David MacKenzie
address@hidden Tom Tromey
address@hidden Alexandre Duret-Lutz
address@hidden
address@hidden 0pt plus 1filll
address@hidden
address@hidden titlepage
+
address@hidden
+
address@hidden
address@hidden Top
address@hidden  node-name,  next,  previous,  up
address@hidden Brief History of Automake
+
address@hidden
+
address@hidden
+* Timeline::                      The Automake story.
+* Dependency Tracking Evolution:: Evolution of Automatic Dependency Tracking
+* Releases::                      Release statistics
+* Copying This Manual::           How to make copies of this manual
+
address@hidden
+ --- The Detailed Node Listing ---
+
+Evolution of Automatic Dependency Tracking
+
+* First Take on Dependencies::    Precomputed dependency tracking
+* Dependencies As Side Effects::  Update at developer compile time
+* Dependencies for the User::     Update at user compile time
+* Techniques for Dependencies::   Alternative approaches
+
+Techniques for Computing Dependencies
+
+* Recommendations for Tool Writers::
+* Future Directions for Dependencies::
+
+Copying This Manual
+
+* GNU Free Documentation License::  License for copying this manual
+
address@hidden detailmenu
address@hidden menu
+
address@hidden ifnottex
+
address@hidden Timeline
address@hidden Timeline
+
address@hidden @asis
address@hidden 1994-09-19 First CVS commit.
+
+If we can trust the CVS repository, David address@hidden (djm) started
+working on Automake (or AutoMake, as it was spelt then) this Monday.
+
+The first version of the @command{automake} script looks as follows.
+
address@hidden
+#!/bin/sh
+
+status=0
+
+for makefile
+do
+  if test ! -f address@hidden@}.am; then
+    echo "automake: address@hidden@}.am: No such honkin' file"
+    status=1
+    continue
+  fi
+
+  exec 4> address@hidden@}.in
+
+done
address@hidden example
+
+From this you can already see that Automake will be about reading
address@hidden file and producing @file{*.in} files.  You cannot see
+anything else, but if you also know that David is the one who created
+Autoconf two years before you can guess the rest.
+
+Several commits follow, and by the end of the day Automake is
+reported to work for GNU fileutils and GNU m4.
+
+The modus operandi is the one that is still used today: variable
+assignments in @file{Makefile.am} files trigger injections of
+precanned @file{Makefile} fragments into the generated
address@hidden  The use of @file{Makefile} fragments was inspired
+by the 4.4BSD @command{make} and include files, however Automake aims
+to be portable and to conform to the GNU standards for @file{Makefile}
+variables and targets.
+
+At this point, the most recent release of Autoconf is version 1.11,
+and David is preparing to release Autoconf 2.0 in late October.  As a
+matter of fact, he will barely touch Automake after September.
+
address@hidden 1994-11-05 David MacKenzie's last commit.
+
+At this point Automake is a 200 line portable shell script, plus 332
+lines of @file{Makefile} fragments.  In the @file{README}, David
+states his ambivalence between ``portable shell'' and ``more
+appropriate language'':
+
address@hidden
+I wrote it keeping in mind the possibility of it becoming an Autoconf
+macro, so it would run at configure-time.  That would slow
+configuration down a bit, but allow users to modify the Makefile.am
+without needing to fetch the AutoMake package.  And, the Makefile.in
+files wouldn't need to be distributed.  But all of AutoMake would.  So
+I might reimplement AutoMake in Perl, m4, or some other more
+appropriate language.
address@hidden quotation
+
+Automake is described as ``an experimental Makefile generator''.
+There is no documentation.  Adventurous users are referred to the
+examples and patches needed to use Automake with GNU m4 1.3, fileutils
+3.9, time 1.6, and development versions of find and indent.
+
+These examples seem to have been lost.  However at the time of writing
+(10 years later in September, 2004) the FSF still distributes a
+package that uses this version of Automake: check out GNU termutils
+2.0.
+
address@hidden 1995-11-12 Tom Tromey's first commit.
+
+After one year of inactivity, Tom Tromey takes over the package.
+Tom was working on GNU cpio back then, and doing this just for fun,
+having trouble finding a project to contribute to.  So while hacking
+he wanted to bring the @file{Makefile.in} up to GNU standards.  This
+was hard, and one day he saw Automake on @url{ftp://alpha.gnu.org/},
+grabbed it and tried it out.
+
+Tom didn't talk to djm about it until later, just to make sure he
+didn't mind if he made a release.  He did a bunch of early releases to
+the Gnits folks.
+
+Gnits was (and still is) totally informal, just a few GNU friends who
+Fran@,cois Pinard knew, who were all interested in making a common
+infrastructure for GNU projects, and shared a similar outlook on how
+to do it.  So they were able to make some progress.  It came along
+with Autoconf and extensions thereof, and then Automake from David and
+Tom (who were both gnitsians).  One of their ideas was to write a
+document paralleling the GNU standards, that was more strict in some
+ways and more detailed.  They never finished the GNITS standards, but
+the ideas mostly made their way into Automake.
+
address@hidden 1995-11-23 Automake 0.20
+
+Besides introducing automatic dependency tracking (@pxref{Dependency
+Tracking Evolution}), this version also supplies a 9-page manual.
+
+At this time @command{aclocal} and @code{AM_INIT_AUTOMAKE} did not
+exist, so many things had to be done by hand.  For instance, here is
+what a configure.in (this is the former name of the
address@hidden we use today) must contain in order to use
+Automake 0.20:
+
address@hidden
+PACKAGE=cpio
+VERSION=2.3.911
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
address@hidden example
+
+(Today all of the above is achieved by @code{AC_INIT} and
address@hidden)
+
+Here is how programs are specified in @file{Makefile.am}:
+
address@hidden
+PROGRAMS = hello
+hello_SOURCES = hello.c
address@hidden example
+
+This looks pretty much like what we do today, except the
address@hidden variable has no directory prefix specifying where
address@hidden should be installed: all programs are installed in
address@hidden(bindir)}.  @code{LIBPROGRAMS} can be used to specify programs
+that must be built but not installed (it is called
address@hidden nowadays).
+
+Programs can be built conditionally using @code{AC_SUBST}itutions:
+
address@hidden
+PROGRAMS = @@progs@@
+AM_PROGRAMS = foo bar baz
address@hidden example
+
+(@code{AM_PROGRAMS} has since then been renamed to
address@hidden)
+
+Similarly scripts, static libraries, and data can be built and installed
+using the @code{LIBRARIES}, @code{SCRIPTS}, and @code{DATA} variables.
+However @code{LIBRARIES} were treated a bit specially in that Automake
+did automatically supply the @file{lib} and @file{.a} prefixes.
+Therefore to build @file{libcpio.a}, one had to write
+
address@hidden
+LIBRARIES = cpio
+cpio_SOURCES = ...
address@hidden example
+
+Extra files to distribute must be listed in @code{DIST_OTHER} (the
+ancestor of @code{EXTRA_DIST}).  Also extra directories that are to be
+distributed should appear in @code{DIST_SUBDIRS}, but the manual
+describes this as a temporary ugly hack (today extra directories should
+also be listed in @code{EXTRA_DIST}, and @code{DIST_SUBDIRS} is used
+for another purpose, @pxref{Conditional Subdirectories, , Conditional
+Subdirectories, automake, GNU Automake}).
+
address@hidden 1995-11-26 Automake 0.21
+
+In less time than it takes to cook a frozen pizza, Tom rewrites
+Automake using Perl.  At this time Perl 5 is only one year old, and
+Perl 4.036 is in use at many sites.  Supporting several Perl versions
+has been a source of problems through the whole history of Automake.
+
+If you never used Perl 4, imagine Perl 5 without objects, without
address@hidden variables (only dynamically scoped @samp{local} variables),
+without function prototypes, with function calls that needs to be
+prefixed with @samp{&}, etc.  Traces of this old style can still be
+found in today's @command{automake}.
+
address@hidden 1995-11-28 Automake 0.22
address@hidden 1995-11-29 Automake 0.23
+
+Bug fixes.
+
address@hidden 1995-12-08 Automake 0.24
address@hidden 1995-12-10 Automake 0.25
+
+Releases are raining.  0.24 introduces the uniform naming scheme we
+use today, i.e., @code{bin_PROGRAMS} instead of @code{PROGRAMS},
address@hidden instead of @code{LIBLIBRARIES}, etc.  (However
address@hidden does not exist yet, @code{AM_PROGRAMS} is still
+in use; and @code{TEXINFOS} and @code{MANS} still have no directory
+prefixes.)  Adding support for prefixes like that was one of the major
+ideas in @command{automake}; it has lasted pretty well.
+
+AutoMake is renamed to Automake (Tom seems to recall it was Fran@,cois
+Pinard's doing).
+
+0.25 fixes a Perl 4 portability bug.
+
address@hidden 1995-12-18 Jim Meyering starts using Automake in GNU Textutils.
address@hidden 1995-12-31 Fran@,cois Pinard starts using Automake in GNU tar.
+
address@hidden 1996-01-03 Automake 0.26
address@hidden 1996-01-03 Automake 0.27
+
+Of the many changes and suggestions sent by Fran@,cois Pinard and
+included in 0.26, perhaps the most important is the advice that to
+ease customization a user rule or variable definition should always
+override an Automake rule or definition.
+
+Gordon Matzigkeit and Jim Meyering are two other early contributors
+that have been sending fixes.
+
+0.27 fixes yet another Perl 4 portability bug.
+
address@hidden 1996-01-13 Automake 0.28
+
+Automake starts scanning @file{configure.in} for @code{LIBOBJS}
+support.  This is an important step because until this version
+Automake only knew about the @file{Makefile.am}s it processed.
address@hidden was Autoconf's world and the link between Autoconf
+and Automake had to be done by the @file{Makefile.am} author.  For
+instance, if @file{config.h} was generated by @file{configure}, it was the
+package maintainer's responsibility to define the @code{CONFIG_HEADER}
+variable in each @file{Makefile.am}.
+
+Succeeding releases will rely more and more on scanning
address@hidden to better automate the Autoconf integration.
+
+0.28 also introduces the @code{AUTOMAKE_OPTIONS} variable and the
address@hidden and @option{--gnits} options, the latter being stricter.
+
address@hidden 1996-02-07 Automake 0.29
+
+Thanks to @file{configure.in} scanning, @code{CONFIG_HEADER} is gone,
+and rebuild rules for @file{configure}-generated file are
+automatically output.
+
address@hidden and @code{MANS} converted to the uniform naming
+scheme.
+
address@hidden 1996-02-24 Automake 0.30
+
+The test suite is born.  It contains 9 tests.  From now on test cases
+will be added pretty regularly (@pxref{Releases}), and this proved to
+be really helpful later on.
+
address@hidden finally replaces @code{AM_PROGRAMS}.
+
+All the third-party Autoconf macros, written mostly by Fran@,cois
+Pinard (and later Jim Meyering), are distributed in Automake's
+hand-written @file{aclocal.m4} file.  Package maintainers are expected
+to extract the necessary macros from this file.  (In previous versions
+you had to copy and paste them from the manual...)
+
address@hidden 1996-03-11 Automake 0.31
+
+The test suite in 0.30 was run via a long @code{check-local} rule.  Upon
+Ulrich Drepper's suggestion, 0.31 makes it an Automake rule output
+whenever the @code{TESTS} variable is defined.
+
address@hidden is renamed to @code{EXTRA_DIST}, and the @code{check_}
+prefix is introduced.  The syntax is now the same as today.
+
address@hidden 1996-03-15 Gordon Matzigkeit starts writing libtool.
+
address@hidden 1996-04-27 Automake 0.32
+
address@hidden targets are introduced; an idea from Dieter Baron.
+
address@hidden files, which were output in the build directory are
+now built in the source directory, because they are distributed.  It
+seems these files like to move back and forth as that will happen
+again in future versions.
+
address@hidden 1996-05-18 Automake 0.33
+
+Gord Matzigkeit's main two contributions:
+
address@hidden
address@hidden very preliminary libtool support
address@hidden the distcheck rule
address@hidden itemize
+
+Although they were very basic at this point, these are probably
+among the top features for Automake today.
+
+Jim Meyering also provides the infamous @code{jm_MAINTAINER_MODE}, since
+then renamed to @code{AM_MAINTAINER_MODE} and abandoned by its author
+(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
+
address@hidden 1996-05-28 Automake 1.0
+
+After only six months of heavy development, the @command{automake} script is
+3134 lines long, plus 973 lines of @file{Makefile} fragments.  The
+package has 30 pages of documentation, and 38 test cases.
address@hidden contains 4 macros.
+
+From now on and until version 1.4, new releases will occur at a rate
+of about one a year.  1.1 did not exist, actually 1.1b to 1.1p have
+been the name of beta releases for 1.2.  This is the first time
+Automake uses suffix letters to designate beta releases, a habit that
+lasts.
+
address@hidden 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian 
GNU/Linux.
+
address@hidden 1996-11-26 David address@hidden releases Autoconf 2.12.
+
+Between June and October, the Autoconf development is almost stalled.
+Roland McGrath has been working at the beginning of the year.  David
+comes back in November to release 2.12, but he won't touch Autoconf
+anymore after this year, and Autoconf then really stagnates.  The
+desolate Autoconf @file{ChangeLog} for 1997 lists only 7 commits.
+
address@hidden 1997-02-28 @email{automake@@gnu.ai.mit.edu} list alive
+
+The mailing list is announced as follows:
address@hidden
+I've created the "automake" mailing list.  It is
+"automake@@gnu.ai.mit.edu".  Administrivia, as always, to
+automake-request@@gnu.ai.mit.edu.
+
+The charter of this list is discussion of automake, autoconf, and
+other configuration/portability tools (e.g., libtool).  It is expected
+that discussion will range from pleas for help all the way up to
+patches.
+
+This list is archived on the FSF machines.  Offhand I don't know if
+you can get the archive without an account there.
+
+This list is open to anybody who wants to join.  Tell all your
+friends!
+-- Tom Tromey
address@hidden smallexample
+
+Before that people were discussing Automake privately, on the Gnits
+mailing list (which is not public either), and less frequently on
address@hidden
+
address@hidden is now @code{gnu.org}, in case you never
+noticed.  The archives of the early years of the
address@hidden@@gnu.org} list have been lost, so today it is almost
+impossible to find traces of discussions that occurred before 1999.
+This has been annoying more than once, as such discussions can be
+useful to understand the rationale behind a piece of uncommented code
+that was introduced back then.
+
address@hidden 1997-06-22 Automake 1.2
+
+Automake developments continues, and more and more new Autoconf macros
+are required.  Distributing them in @file{aclocal.m4} and requiring
+people to browse this file to extract the relevant macros becomes
+uncomfortable.  Ideally, some of them should be contributed to
+Autoconf so that they can be used directly, however Autoconf is
+currently inactive.  Automake 1.2 consequently introduces
address@hidden (@command{aclocal} was actually started on
+1996-07-28), a tool that automatically constructs an @file{aclocal.m4}
+file from a repository of third-party macros.  Because Autoconf has
+stalled, Automake also becomes a kind of repository for such
+third-party macros, even macros completely unrelated to Automake (for
+instance macros that fix broken Autoconf macros).
+
+The 1.2 release contains 20 macros, including the
address@hidden macro that simplifies the creation of
address@hidden
+
+Libtool is fully supported using @code{*_LTLIBRARIES}.
+
+The missing script is introduced by Fran@,cois Pinard; it is meant
+to be a better solution than @code{AM_MAINTAINER_MODE}
+(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
+
+Conditionals support was implemented by Ian Lance Taylor.  At the
+time, Tom and Ian were working on an internal project at Cygnus.  They
+were using ILU, which is pretty similar to address@hidden  They wanted to
+integrate ILU into their build, which was all @file{configure}-based,
+and Ian thought that adding conditionals to @command{automake} was
+simpler than doing all the work in @file{configure} (which was the
+standard at the time).  So this was actually funded by Cygnus.
+
+This very useful but tricky feature will take a lot of time to
+stabilize.  (At the time this text is written, there are still
+primaries that have not been updated to support conditional
+definitions in Automake 1.9.)
+
+The @command{automake} script has almost doubled: 6089 lines of Perl,
+plus 1294 lines of @file{Makefile} fragments.
+
address@hidden 1997-07-08 Gordon Matzigkeit releases Libtool 1.0.
+
address@hidden 1998-04-05 Automake 1.3
+
+This is a small advance compared to 1.2.
+It adds support for assembly, and preliminary support for Java.
+
+Perl 5.004_04 is out, but fixes to support Perl 4 are still
+regularly submitted whenever Automake breaks it.
+
address@hidden 1998-09-06 @code{sourceware.cygnus.com} is on-line.
+
+Sourceware was setup by Jason Molenda to host open source projects.
+
address@hidden 1998-09-19  Automake CVS repository moved to 
@code{sourceware.cygnus.com}
address@hidden 1998-10-26  @code{sourceware.cygnus.com} announces it hosts 
Automake:
+Automake is now hosted on @code{sourceware.cygnus.com}.  It has a
+publicly accessible CVS repository.  This CVS repository is a copy of
+the one Tom was using on his machine, which in turn is based on
+a copy of the CVS repository of David MacKenzie.  This is why we still
+have to full source history.  (Automake was on Sourceware until 2007-10-29,
+when it moved to a git repository on @code{savannah.gnu.org},
+but the Sourceware host had been renamed to @code{sources.redhat.com}.)
+
+The oldest file in the administrative directory of the CVS repository
+that was created on Sourceware is dated 1998-09-19, while the
+announcement that @command{automake} and @command{autoconf} had joined
address@hidden was made on 1998-10-26.  They were among the
+first projects to be hosted there.
+
+The heedful reader will have noticed Automake was exactly 4 years old
+on 1998-09-19.
+
address@hidden 1999-01-05 Ben Elliston releases Autoconf 2.13.
+
address@hidden 1999-01-14 Automake 1.4
+
+This release adds support for Fortran 77 and for the @code{include}
+statement.  Also, @samp{+=} assignments are introduced, but it is
+still quite easy to fool Automake when mixing this with conditionals.
+
+These two releases, Automake 1.4 and Autoconf 2.13 make a duo that
+will be used together for years.
+
address@hidden is 7228 lines, plus 1591 lines of Makefile
+fragment, 20 macros (some 1.3 macros were finally contributed back to
+Autoconf), 197 test cases, and 51 pages of documentation.
+
address@hidden 1999-03-27 The @code{user-dep-branch} is created on the CVS 
repository.
+
+This implements a new dependency tracking schemed that should be
+able to handle automatic dependency tracking using any compiler (not
+just gcc) and any make (not just GNU @command{make}).  In addition,
+the new scheme should be more reliable than the old one, as
+dependencies are generated on the end user's machine.  Alexandre Oliva
+creates depcomp for this purpose.
+
address@hidden Tracking Evolution}, for more details about the
+evolution of automatic dependency tracking in Automake.
+
address@hidden 1999-11-21 The @code{user-dep-branch} is merged into the main 
trunk.
+
+This was a huge problem since we also had patches going in on the
+trunk.  The merge took a long time and was very painful.
+
address@hidden 2000-05-10
+
+Since September 1999 and until 2003, Akim Demaille will be zealously
+revamping Autoconf.
+
address@hidden
+I think the next release should be called "3.0"address@hidden
+Let's face it: you've basically rewritten address@hidden
+Every weekend there are 30 new address@hidden
+I don't see how we could call this "2.15" with a straight address@hidden
+-- Tom Tromey on @email{autoconf@@gnu.org}
address@hidden quotation
+
+Actually Akim works like a submarine: he will pile up patches while he
+works off-line during the weekend, and flush them in batch when he
+resurfaces on Monday.
+
address@hidden 2001-01-24
+
+On this Wednesday, Autoconf 2.49c, the last beta before Autoconf 2.50
+is out, and Akim has to find something to do during his week-end :)
+
address@hidden 2001-01-28
+
+Akim sends a batch of 14 patches to @email{automake@@gnu.org}.
+
address@hidden
+Aiieeee!  I was dreading the day that the Demaillator turned his
+sights on address@hidden and now it has arrived! -- Tom Tromey
address@hidden quotation
+
+It's only the beginning: in two months he will send 192 patches.  Then
+he would slow down so Tom can catch up and review all this.  Initially
+Tom actually read all these patches, then he probably trustingly
+answered OK to most of them, and finally gave up and let Akim apply
+whatever he wanted.  There was no way to keep up with that patch rate.
+
address@hidden
+Anyway the patch below won't apply since it predates Akim's
+sourcequake; I have yet to figure where the relevant passage has
+been moved :) -- Alexandre Duret-Lutz
address@hidden quotation
+
+All these patches were sent to and discussed on
address@hidden@@gnu.org}, so subscribed users were literally drowning in
+technical mails.  Eventually, the @email{automake-patches@@gnu.org}
+mailing list was created in May.
+
+Year after year, Automake had drifted away from its initial design:
+construct @file{Makefile.in} by assembling various @file{Makefile}
+fragments.  In 1.4, lots of @file{Makefile} rules are being emitted at
+various places in the @command{automake} script itself; this does not
+help ensuring a consistent treatment of these rules (for instance
+making sure that user-defined rules override Automake's own rules).
+One of Akim's goal was moving all these hard-coded rules to separate
address@hidden fragments, so the logic could be centralized in a
address@hidden fragment processor.
+
+Another significant contribution of Akim is the interface with the
+``trace'' feature of Autoconf.  The way to scan @file{configure.in} at
+this time was to read the file and grep the various macro of interest
+to Automake.  Doing so could break in many unexpected ways; @command{automake}
+could miss some definition (for instance @samp{AC_SUBST([$1], [$2])}
+where the arguments are known only when M4 is run), or conversely it
+could detect some macro that was not expanded (because it is called
+conditionally).  In the CVS version of Autoconf, Akim had implemented
+the @option{--trace} option, which provides accurate information about
+where macros are actually called and with what arguments.  Akim will
+equip Automake with a second @file{configure.in} scanner that uses
+this @option{--trace} interface.  Since it was not sensible to drop the
+Autoconf 2.13 compatibility yet, this experimental scanner was only
+used when an environment variable was set, the traditional
+grep-scanner being still the default.
+
address@hidden 2001-04-25 Gary address@hidden releases Libtool 1.4
+
+It has been more than two years since Automake 1.4, CVS Automake has
+suffered lot's of heavy changes and still is not ready for release.
+Libtool 1.4 had to be distributed with a patch against Automake 1.4.
+
address@hidden 2001-05-08 Automake 1.4-p1
address@hidden 2001-05-24 Automake 1.4-p2
+
+Gary address@hidden, the principal Libtool maintainer, makes a ``patch
+release'' of Automake:
+
address@hidden
+The main purpose of this release is to have a stable automake
+which is compatible with the latest stable libtool.
address@hidden quotation
+
+The release also contains obvious fixes for bugs in Automake 1.4,
+some of which were reported almost monthly.
+
address@hidden 2001-05-21 Akim Demaille releases Autoconf 2.50
+
address@hidden 2001-06-07 Automake 1.4-p3
address@hidden 2001-06-10 Automake 1.4-p4
address@hidden 2001-07-15 Automake 1.4-p5
+
+Gary continues his patch-release series.  These also add support for
+some new Autoconf 2.50 idioms.  Essentially, Autoconf now advocates
address@hidden over @file{configure.in}, and it introduces a new
+syntax for @code{AC_OUTPUT}ing files.
+
address@hidden 2001-08-23 Automake 1.5
+
+A major and long-awaited release, that comes more than two years after
+1.4.  It brings many changes, among which:
address@hidden
address@hidden The new dependency tracking scheme that uses @command{depcomp}.
+Aside from the improvement on the dependency tracking itself
+(@pxref{Dependency Tracking Evolution}), this also streamlines the use
+of @command{automake}-generated @file{Makefile.in}s as the @file{Makefile.in}s
+used during development are now the same as those used in
+distributions.  Before that the @file{Makefile.in}s generated for
+maintainers required GNU @command{make} and GCC, they were different
+from the portable @file{Makefile} generated for distribution; this was
+causing some confusion.
+
address@hidden Support for per-target compilation flags.
+
address@hidden Support for reference to files in subdirectories in most
address@hidden variables.
+
address@hidden Introduction of the @code{dist_}, @code{nodist_}, and 
@code{nobase_}
+prefixes.
address@hidden Perl 4 support is finally dropped.
address@hidden itemize
+
+1.5 did break several packages that worked with 1.4.  Enough so that
+Linux distributions could not easily install the new Automake version
+without breaking many of the packages for which they had to run
address@hidden
+
+Some of these breakages were effectively bugs that would eventually be
+fixed in the next release.  However, a lot of damage was caused by
+some changes made deliberately to render Automake stricter on some
+setup we did consider bogus.  For instance, @samp{make distcheck} was
+improved to check that @samp{make uninstall} did remove all the files
address@hidden install} installed, that @samp{make distclean} did not omit
+some file, and that a VPATH build would work even if the source
+directory was read-only.  Similarly, Automake now rejects multiple
+definitions of the same variable (because that would mix very badly
+with conditionals), and @samp{+=} assignments with no previous
+definition.  Because these changes all occurred suddenly after 1.4 had
+been established for more than two years, it hurt users.
+
+To make matter worse, meanwhile Autoconf (now at version 2.52) was
+facing similar troubles, for similar reasons.
+
address@hidden 2002-03-05 Automake 1.6
+
+This release introduced versioned installation (@pxref{API Versioning, ,
+API Versioning, automake, GNU Automake}). This was mainly pushed by
+Havoc Pennington, taking the GNOME source tree as motive: due to
+incompatibilities between the autotools it's impossible for the GNOME
+packages to switch to Autoconf 2.53 and Automake 1.5 all at once, so
+they are currently stuck with Autoconf 2.13 and Automake 1.4.
+
+The idea was to call this version @file{automake-1.6}, call all its
+bug-fix versions identically, and switch to @file{automake-1.7} for
+the next release that adds new features or changes some rules.  This
+scheme implies maintaining a bug-fix branch in addition to the
+development trunk, which means more work from the maintainer, but
+providing regular bug-fix releases proved to be really worthwhile.
+
+Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
+not.  Perhaps the more annoying was the dependence on the newly
+released Autoconf 2.53.  Autoconf seemed to have stabilized enough
+since its explosive 2.50 release and included changes required to fix
+some bugs in Automake.  In order to upgrade to Automake 1.6, people
+now had to upgrade Autoconf too; for some packages it was no picnic.
+
+While versioned installation helped people to upgrade, it also
+unfortunately allowed people not to upgrade.  At the time of writing,
+some Linux distributions are shipping packages for Automake 1.4, 1.5,
+1.6, 1.7, 1.8, and 1.9.  Most of these still install 1.4 by default.
+Some distribution also call 1.4 the ``stable'' version, and present
+``1.9'' as the development version; this does not really makes sense
+since 1.9 is way more solid than 1.4.  All this does not help the
+newcomer.
+
address@hidden 2002-04-11 Automake 1.6.1
+
+1.6, and the upcoming 1.4-p6 release were the last release by Tom.
+This one and those following will be handled by Alexandre
+Duret-Lutz.  Tom is still around, and will be there until about 1.7,
+but his interest into Automake is drifting away towards projects like
address@hidden
+
+Alexandre has been using Automake since 2000, and started to
+contribute mostly on Akim's incitement (Akim and Alexandre have been
+working in the same room from 1999 to 2002).  In 2001 and 2002 he had
+a lot of free time to enjoy hacking Automake.
+
address@hidden 2002-06-14 Automake 1.6.2
+
address@hidden 2002-07-28 Automake 1.6.3
address@hidden 2002-07-28 Automake 1.4-p6
+
+Two releases on the same day.  1.6.3 is a bug-fix release.
+
+Tom Tromey backported the versioned installation mechanism on the 1.4
+branch, so that Automake 1.6.x and Automake 1.4-p6 could be installed
+side by side.  Another request from the GNOME folks.
+
address@hidden 2002-09-25 Automake 1.7
+
+This release switches to the new @file{configure.ac} scanner Akim
+was experimenting in 1.5.
+
address@hidden 2002-10-16 Automake 1.7.1
address@hidden 2002-12-06 Automake 1.7.2
address@hidden 2003-02-20 Automake 1.7.3
address@hidden 2003-04-23 Automake 1.7.4
address@hidden 2003-05-18 Automake 1.7.5
address@hidden 2003-07-10 Automake 1.7.6
address@hidden 2003-09-07 Automake 1.7.7
address@hidden 2003-10-07 Automake 1.7.8
+
+Many bug-fix releases.  1.7 lasted because the development version
+(upcoming 1.8) was suffering some major internal revamping.
+
address@hidden 2003-10-26 Automake on screen
+
+Episode 49, `Repercussions', in the third season of the `Alias' TV
+show is first aired.
+
+Marshall, one of the characters, is working on a computer virus that he
+has to modify before it gets into the wrong hands or something like
+that.  The screenshots you see do not show any program code, they show
+a @file{Makefile.in} generated by automake...
+
address@hidden 2003-11-09 Automake 1.7.9
+
address@hidden 2003-12-10 Automake 1.8
+
+The most striking update is probably that of @command{aclocal}.
+
address@hidden now uses @code{m4_include} in the produced
address@hidden when the included macros are already distributed
+with the package (an idiom used in many packages), which reduces code
+duplication.  Many people liked that, but in fact this change was
+really introduced to fix a bug in rebuild rules: @file{Makefile.in}
+must be rebuilt whenever a dependency of @file{configure} changes, but
+all the @file{m4} files included in @file{aclocal.m4} where unknown
+from @command{automake}.  Now @command{automake} can just trace the
address@hidden to discover the dependencies.
+
address@hidden also starts using the @option{--trace} Autoconf option
+in order to discover used macros more accurately.  This will turn out
+to be very tricky (later releases will improve this) as people had
+devised many ways to cope with the limitation of previous
address@hidden versions, notably using handwritten
address@hidden: @command{aclocal} must make sure not to redefine a
+rule that is already included by such statement.
+
+Automake also has seen its guts rewritten.  Although this rewriting
+took a lot of efforts, it is only apparent to the users in that some
+constructions previously disallowed by the implementation now work
+nicely.  Conditionals, Locations, Variable and Rule definitions,
+Options: these items on which Automake works have been rewritten as
+separate Perl modules, and documented.
+
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-12 Automake 1.8.2
address@hidden 2004-03-07 Automake 1.8.3
address@hidden 2004-04-25 Automake 1.8.4
address@hidden 2004-05-16 Automake 1.8.5
+
address@hidden 2004-07-28 Automake 1.9
+
+This release tries to simplify the compilation rules it outputs to
+reduce the size of the Makefile.  The complaint initially come from
+the libgcj developers.  Their @file{Makefile.in} generated with
+Automake 1.4 and custom build rules (1.4 did not support compiled
+Java) is address@hidden  The one generated by 1.8 was over address@hidden  1.9 
gets it
+down to address@hidden
+
+Aside from this it contains mainly minor changes and bug-fixes.
+
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-09-19 Automake 1.9.2
+
+Automake has ten years.  This chapter of the manual was initially
+written for this occasion.
+
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
+and uses git as primary repository.
+
address@hidden table
+
address@hidden Dependency Tracking Evolution
address@hidden Evolution of Automatic Dependency Tracking
+
+Over the years Automake has deployed three different dependency
+tracking methods.  Each method, including the current one, has had
+flaws of various sorts.  Here we lay out the different dependency
+tracking methods, their flaws, and their fixes.  We conclude with
+recommendations for tool writers, and by indicating future directions
+for dependency tracking work in Automake.
+
address@hidden
+* First Take on Dependencies::    Precomputed dependency tracking
+* Dependencies As Side Effects::  Update at developer compile time
+* Dependencies for the User::     Update at user compile time
+* Techniques for Dependencies::   Alternative approaches
address@hidden menu
+
address@hidden First Take on Dependencies
address@hidden First Take on Dependency Tracking
address@hidden Description
+
+Our first attempt at automatic dependency tracking was based on the
+method recommended by GNU @command{make}.  (@pxref{Automatic
+Prerequisites, , Generating Prerequisites Automatically, make, The GNU
+make Manual})
+
+This version worked by precomputing dependencies ahead of time.  For
+each source file, it had a special @file{.P} file that held the
+dependencies.  There was a rule to generate a @file{.P} file by
+invoking the compiler appropriately.  All such @file{.P} files were
+included by the @file{Makefile}, thus implicitly becoming dependencies
+of @file{Makefile}.
+
address@hidden Bugs
+
+This approach had several critical bugs.
+
address@hidden
address@hidden
+The code to generate the @file{.P} file relied on @command{gcc}.
+(A limitation, not technically a bug.)
address@hidden
+The dependency tracking mechanism itself relied on GNU @command{make}.
+(A limitation, not technically a bug.)
address@hidden
+Because each @file{.P} file was a dependency of @file{Makefile}, this
+meant that dependency tracking was done eagerly by @command{make}.
+For instance, @samp{make clean} would cause all the dependency files
+to be updated, and then immediately removed.  This eagerness also
+caused problems with some configurations; if a certain source file
+could not be compiled on a given architecture for some reason,
+dependency tracking would fail, aborting the entire build.
address@hidden
+As dependency tracking was done as a pre-pass, compile times were
+doubled--the compiler had to be run twice per source file.
address@hidden
address@hidden dist} re-ran @command{automake} to generate a
address@hidden that did not have automatic dependency tracking (and
+that was thus portable to any version of @command{make}).  In order to
+do this portably, Automake had to scan the dependency files and remove
+any reference that was to a source file not in the distribution.
+This process was error-prone.  Also, if @samp{make dist} was run in an
+environment where some object file had a dependency on a source file
+that was only conditionally created, Automake would generate a
address@hidden that referred to a file that might not appear in the
+end user's build.  A special, hacky mechanism was required to work
+around this.
address@hidden itemize
+
address@hidden Historical Note
+
+The code generated by Automake is often inspired by the
address@hidden style of a particular author.  In the case of the first
+implementation of dependency tracking, I believe the impetus and
+inspiration was Jim Meyering.  (I could be mistaken.  If you know
+otherwise feel free to correct me.)
+
address@hidden Dependencies As Side Effects
address@hidden Dependencies As Side Effects
address@hidden Description
+
+The next refinement of Automake's automatic dependency tracking scheme
+was to implement dependencies as side effects of the compilation.
+This was aimed at solving the most commonly reported problems with the
+first approach.  In particular we were most concerned with eliminating
+the weird rebuilding effect associated with make clean.
+
+In this approach, the @file{.P} files were included using the
address@hidden command, which let us create these files lazily.  This
+avoided the @samp{make clean} problem.
+
+We only computed dependencies when a file was actually compiled.  This
+avoided the performance penalty associated with scanning each file
+twice.  It also let us avoid the other problems associated with the
+first, eager, implementation.  For instance, dependencies would never
+be generated for a source file that was not compilable on a given
+architecture (because it in fact would never be compiled).
+
address@hidden Bugs
+
address@hidden
address@hidden
+This approach also relied on the existence of @command{gcc} and GNU
address@hidden  (A limitation, not technically a bug.)
address@hidden
+Dependency tracking was still done by the developer, so the problems
+from the first implementation relating to massaging of dependencies by
address@hidden dist} were still in effect.
address@hidden
+This implementation suffered from the ``deleted header file'' problem.
+Suppose a lazily-created @file{.P} file includes a dependency on a
+given header file, like this:
+
address@hidden
+maude.o: maude.c something.h
address@hidden example
+
+Now suppose that you remove @file{something.h} and update @file{maude.c}
+so that this include is no longer needed.  If you run @command{make},
+you will get an error because there is no way to create
address@hidden
+
+We fixed this problem in a later release by further massaging the
+output of @command{gcc} to include a dummy dependency for each header
+file.
address@hidden itemize
+
address@hidden Dependencies for the User
address@hidden Dependencies for the User
address@hidden Description
+
+The bugs associated with @samp{make dist}, over time, became a real
+problem.  Packages using Automake were being built on a large number
+of platforms, and were becoming increasingly complex.  Broken
+dependencies were distributed in ``portable'' @file{Makefile.in}s,
+leading to user complaints.  Also, the requirement for @command{gcc}
+and GNU @command{make} was a constant source of bug reports.  The next
+implementation of dependency tracking aimed to remove these problems.
+
+We realized that the only truly reliable way to automatically track
+dependencies was to do it when the package itself was built.  This
+meant discovering a method portable to any version of make and any
+compiler.  Also, we wanted to preserve what we saw as the best point
+of the second implementation: dependency computation as a side effect
+of compilation.
+
+In the end we found that most modern make implementations support some
+form of include directive.  Also, we wrote a wrapper script that let
+us abstract away differences between dependency tracking methods for
+compilers.  For instance, some compilers cannot generate dependencies
+as a side effect of compilation.  In this case we simply have the
+script run the compiler twice.  Currently our wrapper script
+(@command{depcomp}) knows about twelve different compilers (including
+a "compiler" that simply invokes @command{makedepend} and then the
+real compiler, which is assumed to be a standard Unix-like C compiler
+with no way to do dependency tracking).
+
address@hidden Bugs
+
address@hidden
address@hidden
+Running a wrapper script for each compilation slows down the build.
address@hidden
+Many users don't really care about precise dependencies.
address@hidden
+This implementation, like every other automatic dependency tracking
+scheme in common use today (indeed, every one we've ever heard of),
+suffers from the ``duplicated new header'' bug.
+
+This bug occurs because dependency tracking tools, such as the
+compiler, only generate dependencies on the successful opening of a
+file, and not on every probe.
+
+Suppose for instance that the compiler searches three directories for
+a given header, and that the header is found in the third directory.
+If the programmer erroneously adds a header file with the same name to
+the first directory, then a clean rebuild from scratch could fail
+(suppose the new header file is buggy), whereas an incremental rebuild
+will succeed.
+
+What has happened here is that people have a misunderstanding of what
+a dependency is.  Tool writers think a dependency encodes information
+about which files were read by the compiler.  However, a dependency
+must actually encode information about what the compiler tried to do.
+
+This problem is not serious in practice.  Programmers typically do not
+use the same name for a header file twice in a given project.  (At
+least, not in C or C++.  This problem may be more troublesome in
+Java.)  This problem is easy to fix, by modifying dependency
+generators to record every probe, instead of every successful open.
+
address@hidden
+Since Automake generates dependencies as a side effect of compilation,
+there is a bootstrapping problem when header files are generated by
+running a program.  The problem is that, the first time the build is
+done, there is no way by default to know that the headers are
+required, so make might try to run a compilation for which the headers
+have not yet been built.
+
+This was also a problem in the previous dependency tracking implementation.
+
+The current fix is to use @code{BUILT_SOURCES} to list built headers
+(@pxref{Sources, , Sources, automake, GNU Automake}).  This causes them
+to be built before any other build rules are run.  This is unsatisfactory
+as a general solution, however in practice it seems sufficient for most
+actual programs.
address@hidden itemize
+
+This code is used since Automake 1.5.
+
+In GCC 3.0, we managed to convince the maintainers to add special
+command-line options to help Automake more efficiently do its job.  We
+hoped this would let us avoid the use of a wrapper script when
+Automake's automatic dependency tracking was used with @command{gcc}.
+
+Unfortunately, this code doesn't quite do what we want.  In
+particular, it removes the dependency file if the compilation fails;
+we'd prefer that it instead only touch the file in any way if the
+compilation succeeds.
+
+Nevertheless, since Automake 1.7, when a recent @command{gcc} is
+detected at @command{configure} time, we inline the
+dependency-generation code and do not use the @command{depcomp}
+wrapper script.  This makes compilations faster for those using this
+compiler (probably our primary user base).  The counterpart is that
+because we have to encode two compilation rules in @file{Makefile}
+(with or without @command{depcomp}), the produced @file{Makefile}s are
+larger.
+
address@hidden Techniques for Dependencies
address@hidden Techniques for Computing Dependencies
+
+There are actually several ways for a build tool like Automake to
+cause tools to generate dependencies.
+
address@hidden @asis
address@hidden @command{makedepend}
+This was a commonly-used method in the past.  The idea is to run a
+special program over the source and have it generate dependency
+information.  Traditional implementations of @command{makedepend} are
+not completely precise; ordinarily they were conservative and
+discovered too many dependencies.
address@hidden The tool
+An obvious way to generate dependencies is to simply write the tool so
+that it can generate the information needed by the build tool.  This is
+also the most portable method.  Many compilers have an option to
+generate dependencies.  Unfortunately, not all tools provide such an
+option.
address@hidden The file system
+It is possible to write a special file system that tracks opens,
+reads, writes, etc, and then feed this information back to the build
+tool.  @command{clearmake} does this.  This is a very powerful
+technique, as it doesn't require cooperation from the
+tool.  Unfortunately it is also very difficult to implement and also
+not practical in the general case.
address@hidden @code{LD_PRELOAD}
+Rather than use the file system, one could write a special library to
+intercept @code{open} and other syscalls.  This technique is also quite
+powerful, but unfortunately it is not portable enough for use in
address@hidden
address@hidden table
+
address@hidden
+* Recommendations for Tool Writers::
+* Future Directions for Dependencies::
address@hidden menu
+
address@hidden Recommendations for Tool Writers
address@hidden Recommendations for Tool Writers
+
+We think that every compilation tool ought to be able to generate
+dependencies as a side effect of compilation.  Furthermore, at least
+while @command{make}-based tools are nearly universally in use (at
+least in the free software community), the tool itself should generate
+dummy dependencies for header files, to avoid the deleted header file
+bug.  Finally, the tool should generate a dependency for each probe,
+instead of each successful file open, in order to avoid the duplicated
+new header bug.
+
address@hidden Future Directions for Dependencies
address@hidden Future Directions for Dependencies
+
+Currently, only languages and compilers understood by Automake can
+have dependency tracking enabled.  We would like to see if it is
+practical (and worthwhile) to let this support be extended by the user
+to languages unknown to Automake.
+
address@hidden Releases
address@hidden Release Statistics
+
+The following table (inspired by @samp{perlhist(1)}) quantifies the
+evolution of Automake using these metrics:
+
address@hidden @asis
address@hidden Date, Rel
+The date and version of the release.
address@hidden am
+The number of lines of the @command{automake} script.
address@hidden acl
+The number of lines of the @command{aclocal} script.
address@hidden pm
+The number of lines of the @command{Perl} supporting modules.
address@hidden @file{*.am}
+The number of lines of the @file{Makefile} fragments.  The number in
+parentheses is the number of files.
address@hidden m4
+The number of lines (and files) of Autoconf macros.
address@hidden doc
+The number of pages of the documentation (the Postscript version).
address@hidden t
+The number of test cases in the test suite.  Of those, the number in
+parentheses is the number of generated test cases.
address@hidden table
+
address@hidden {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888 
(88)} {888} {888 (88)}
address@hidden Date   @tab Rel    @tab   am @tab acl @tab   pm @tab @file{*.am} 
@tab m4 @tab doc @tab t
address@hidden 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 
(24) @tab           @tab     @tab
address@hidden 1994-11-05 @tab CVS    @tab  208 @tab     @tab      @tab  332 
(28) @tab           @tab     @tab
address@hidden 1995-11-23 @tab 0.20   @tab  533 @tab     @tab      @tab  458 
(35) @tab           @tab   9 @tab
address@hidden 1995-11-26 @tab 0.21   @tab  613 @tab     @tab      @tab  480 
(36) @tab           @tab  11 @tab
address@hidden 1995-11-28 @tab 0.22   @tab 1116 @tab     @tab      @tab  539 
(38) @tab           @tab  12 @tab
address@hidden 1995-11-29 @tab 0.23   @tab 1240 @tab     @tab      @tab  541 
(38) @tab           @tab  12 @tab
address@hidden 1995-12-08 @tab 0.24   @tab 1462 @tab     @tab      @tab  504 
(33) @tab           @tab  14 @tab
address@hidden 1995-12-10 @tab 0.25   @tab 1513 @tab     @tab      @tab  511 
(37) @tab           @tab  15 @tab
address@hidden 1996-01-03 @tab 0.26   @tab 1706 @tab     @tab      @tab  438 
(36) @tab           @tab  16 @tab
address@hidden 1996-01-03 @tab 0.27   @tab 1706 @tab     @tab      @tab  438 
(36) @tab           @tab  16 @tab
address@hidden 1996-01-13 @tab 0.28   @tab 1964 @tab     @tab      @tab  934 
(33) @tab           @tab  16 @tab
address@hidden 1996-02-07 @tab 0.29   @tab 2299 @tab     @tab      @tab  936 
(33) @tab           @tab  17 @tab
address@hidden 1996-02-24 @tab 0.30   @tab 2544 @tab     @tab      @tab  919 
(32) @tab   85 (1)  @tab  20 @tab 9
address@hidden 1996-03-11 @tab 0.31   @tab 2877 @tab     @tab      @tab  919 
(32) @tab   85 (1)  @tab  29 @tab 17
address@hidden 1996-04-27 @tab 0.32   @tab 3058 @tab     @tab      @tab  921 
(31) @tab   85 (1)  @tab  30 @tab 26
address@hidden 1996-05-18 @tab 0.33   @tab 3110 @tab     @tab      @tab  926 
(31) @tab  105 (1)  @tab  30 @tab 35
address@hidden 1996-05-28 @tab 1.0    @tab 3134 @tab     @tab      @tab  973 
(32) @tab  105 (1)  @tab  30 @tab 38
address@hidden 1997-06-22 @tab 1.2    @tab 6089 @tab 385 @tab      @tab 1294 
(36) @tab  592 (20) @tab  37 @tab 126
address@hidden 1998-04-05 @tab 1.3    @tab 6415 @tab 422 @tab      @tab 1470 
(39) @tab  741 (23) @tab  39 @tab 156
address@hidden 1999-01-14 @tab 1.4    @tab 7240 @tab 426 @tab      @tab 1591 
(40) @tab  734 (20) @tab  51 @tab 197
address@hidden 2001-05-08 @tab 1.4-p1 @tab 7251 @tab 426 @tab      @tab 1591 
(40) @tab  734 (20) @tab  51 @tab 197
address@hidden 2001-05-24 @tab 1.4-p2 @tab 7268 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 197
address@hidden 2001-06-07 @tab 1.4-p3 @tab 7312 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 197
address@hidden 2001-06-10 @tab 1.4-p4 @tab 7321 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 198
address@hidden 2001-07-15 @tab 1.4-p5 @tab 7228 @tab 426 @tab      @tab 1596 
(40) @tab  734 (20) @tab  51 @tab 198
address@hidden 2001-08-23 @tab 1.5    @tab 8016 @tab 475 @tab  600 @tab 2654 
(39) @tab 1166 (29) @tab  63 @tab 327
address@hidden 2002-03-05 @tab 1.6    @tab 8465 @tab 475 @tab 1136 @tab 2732 
(39) @tab 1603 (27) @tab  66 @tab 365
address@hidden 2002-04-11 @tab 1.6.1  @tab 8544 @tab 475 @tab 1136 @tab 2741 
(39) @tab 1603 (27) @tab  66 @tab 372
address@hidden 2002-06-14 @tab 1.6.2  @tab 8575 @tab 475 @tab 1136 @tab 2800 
(39) @tab 1609 (27) @tab  67 @tab 386
address@hidden 2002-07-28 @tab 1.6.3  @tab 8600 @tab 475 @tab 1153 @tab 2809 
(39) @tab 1609 (27) @tab  67 @tab 391
address@hidden 2002-07-28 @tab 1.4-p6 @tab 7332 @tab 455 @tab      @tab 1596 
(40) @tab  735 (20) @tab  49 @tab 197
address@hidden 2002-09-25 @tab 1.7    @tab 9189 @tab 471 @tab 1790 @tab 2965 
(39) @tab 1606 (28) @tab  73 @tab 430
address@hidden 2002-10-16 @tab 1.7.1  @tab 9229 @tab 475 @tab 1790 @tab 2977 
(39) @tab 1606 (28) @tab  73 @tab 437
address@hidden 2002-12-06 @tab 1.7.2  @tab 9334 @tab 475 @tab 1790 @tab 2988 
(39) @tab 1606 (28) @tab  77 @tab 445
address@hidden 2003-02-20 @tab 1.7.3  @tab 9389 @tab 475 @tab 1790 @tab 3023 
(39) @tab 1651 (29) @tab  84 @tab 448
address@hidden 2003-04-23 @tab 1.7.4  @tab 9429 @tab 475 @tab 1790 @tab 3031 
(39) @tab 1644 (29) @tab  85 @tab 458
address@hidden 2003-05-18 @tab 1.7.5  @tab 9429 @tab 475 @tab 1790 @tab 3033 
(39) @tab 1645 (29) @tab  85 @tab 459
address@hidden 2003-07-10 @tab 1.7.6  @tab 9442 @tab 475 @tab 1790 @tab 3033 
(39) @tab 1660 (29) @tab  85 @tab 461
address@hidden 2003-09-07 @tab 1.7.7  @tab 9443 @tab 475 @tab 1790 @tab 3041 
(39) @tab 1660 (29) @tab  90 @tab 467
address@hidden 2003-10-07 @tab 1.7.8  @tab 9444 @tab 475 @tab 1790 @tab 3041 
(39) @tab 1660 (29) @tab  90 @tab 468
address@hidden 2003-11-09 @tab 1.7.9  @tab 9444 @tab 475 @tab 1790 @tab 3048 
(39) @tab 1660 (29) @tab  90 @tab 468
address@hidden 2003-12-10 @tab 1.8    @tab 7171 @tab 585 @tab 7730 @tab 3236 
(39) @tab 1666 (31) @tab 104 @tab 521
address@hidden 2004-01-11 @tab 1.8.1  @tab 7217 @tab 663 @tab 7726 @tab 3287 
(39) @tab 1686 (31) @tab 104 @tab 525
address@hidden 2004-01-12 @tab 1.8.2  @tab 7217 @tab 663 @tab 7726 @tab 3288 
(39) @tab 1686 (31) @tab 104 @tab 526
address@hidden 2004-03-07 @tab 1.8.3  @tab 7214 @tab 686 @tab 7735 @tab 3303 
(39) @tab 1695 (31) @tab 111 @tab 530
address@hidden 2004-04-25 @tab 1.8.4  @tab 7214 @tab 686 @tab 7736 @tab 3310 
(39) @tab 1701 (31) @tab 112 @tab 531
address@hidden 2004-05-16 @tab 1.8.5  @tab 7240 @tab 686 @tab 7736 @tab 3299 
(39) @tab 1701 (31) @tab 112 @tab 533
address@hidden 2004-07-28 @tab 1.9    @tab 7508 @tab 715 @tab 7794 @tab 3352 
(40) @tab 1812 (32) @tab 115 @tab 551
address@hidden 2004-08-11 @tab 1.9.1  @tab 7512 @tab 715 @tab 7794 @tab 3354 
(40) @tab 1812 (32) @tab 115 @tab 552
address@hidden 2004-09-19 @tab 1.9.2  @tab 7512 @tab 715 @tab 7794 @tab 3354 
(40) @tab 1812 (32) @tab 132 @tab 554
address@hidden 2004-11-01 @tab 1.9.3  @tab 7507 @tab 718 @tab 7804 @tab 3354 
(40) @tab 1812 (32) @tab 134 @tab 556
address@hidden 2004-12-18 @tab 1.9.4  @tab 7508 @tab 718 @tab 7856 @tab 3361 
(40) @tab 1811 (32) @tab 140 @tab 560
address@hidden 2005-02-13 @tab 1.9.5  @tab 7523 @tab 719 @tab 7859 @tab 3373 
(40) @tab 1453 (32) @tab 142 @tab 562
address@hidden 2005-07-10 @tab 1.9.6  @tab 7539 @tab 699 @tab 7867 @tab 3400 
(40) @tab 1453 (32) @tab 144 @tab 570
address@hidden 2006-10-15 @tab 1.10   @tab 7859 @tab 1072 @tab 8024 @tab 3512 
(40) @tab 1496 (34) @tab 172 @tab 604
address@hidden 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520 
(40) @tab 1499 (34) @tab 173 @tab 617
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540 
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11   @tab 8721 @tab 1092 @tab 8289 @tab 4164 
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
address@hidden multitable
+
+
address@hidden ========================================================== 
Appendices
+
address@hidden
address@hidden Copying This Manual
address@hidden Copying This Manual
+
address@hidden
+* GNU Free Documentation License::  License for copying this manual
address@hidden menu
+
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
+
address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 3389f8a..c21a5b7 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -23,9 +23,7 @@ This manual is for GNU Automake (version @value{VERSION},
 @value{UPDATED}), a program that creates GNU standards-compliant
 Makefiles from template files.
 
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-Foundation, Inc.
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -123,7 +121,6 @@ section entitled ``GNU Free Documentation License.''
 * API Versioning::              About compatibility between Automake versions
 * Upgrading::                   Upgrading to a Newer Automake Version
 * FAQ::                         Frequently Asked Questions
-* History::                     Notes about the history of Automake
 * Copying This Manual::         How to make copies of this manual
 * Indices::                     Indices of variables, macros, and concepts
 
@@ -193,7 +190,7 @@ Auto-generating aclocal.m4
 Autoconf macros supplied with Automake
 
 * Public Macros::               Macros that you can use.
-* Obsolete Macros::             Macros that you should stop using.
+* Obsolete Macros::             Macros that will soon be removed.
 * Private Macros::              Macros that you should not use.
 
 Directories
@@ -230,7 +227,6 @@ Building Programs and Libraries
 * Java Support with gcj::       Compiling Java sources using gcj
 * Vala Support::                Compiling Vala sources
 * Support for Other Languages::  Compiling other languages
-* ANSI::                        Automatic de-ANSI-fication (deprecated, soon 
to be removed)
 * Dependencies::                Automatic dependency tracking
 * EXEEXT::                      Support for executable extensions
 
@@ -314,16 +310,47 @@ What Goes in a Distribution
 
 Support for test suites
 
-* Simple Tests::                Listing programs and scripts in @code{TESTS}
-* Simple Tests using parallel-tests::  More powerful test driver
-* DejaGnu Tests::               Interfacing with the external testing framework
+* Generalities about Testing::  Generic concepts and terminology about testing
+* Simple Tests::                Listing test scripts in @code{TESTS}
+* Custom Test Drivers::         Writing and using custom test drivers
+* Using the TAP test protocol:: Integrating test scripts that use the TAP 
protocol
+* DejaGnu Tests::               Interfacing with the @command{dejagnu} testing 
framework
 * Install Tests::               Running tests on installed packages
 
+Simple Tests
+
+* Scripts-based Testsuites::    Automake-specific concepts and terminology
+* Serial Test Harness::         Older (and obsolescent) serial test harness
+* Parallel Test Harness::       Generic concurrent test harness
+
+Using the TAP test protocol
+
+* Introduction to TAP::
+* Use TAP with the Automake test harness::
+* Incompatibilities with other TAP parsers and drivers::
+* Links and external resources on TAP::
+
+Custom Test Drivers
+
+* Overview of Custom Test Drivers Support::
+* Declaring Custom Test Drivers::
+* API for Custom Test Drivers::
+
+API for Custom Test Drivers
+
+* Command-line arguments for test drivers::
+* Log files generation and test results recording::
+* Testsuite progress output::
+
+Changing Automake's Behavior
+
+* Options generalities::        Semantics of Automake option
+* List of Automake options::    A comprehensive list of Automake options
+
 Miscellaneous Rules
 
-* Tags::                        Interfacing to etags and mkid
+* Tags::                        Interfacing to cscope, etags and mkid
 * Suffixes::                    Handling new file extensions
-* Multilibs::                   Support for multilibs (deprecated, soon to be 
removed).
 
 Conditionals
 
@@ -347,7 +374,7 @@ Frequently Asked Questions about Automake
 * maintainer-mode::             missing and AM_MAINTAINER_MODE
 * Wildcards::                   Why doesn't Automake support wildcards?
 * Limitations on File Names::   Limitations on source and installed file names
-* distcleancheck::              Files left in build directory after distclean
+* Errors with distclean::       Files left in build directory after distclean
 * Flag Variables Ordering::     CFLAGS vs.@: AM_CFLAGS vs.@: mumble_CFLAGS
 * Renamed Objects::             Why are object files sometimes renamed?
 * Per-Object Flags::            How to simulate per-object flags?
@@ -356,21 +383,6 @@ Frequently Asked Questions about Automake
 * Debugging Make Rules::        Strategies when things don't work as expected
 * Reporting Bugs::              Feedback on bugs and feature requests
 
-History of Automake
-
-* Timeline::                    The Automake story.
-* Dependency Tracking Evolution::  Evolution of Automatic Dependency Tracking
-* Releases::                    Statistics about Automake Releases
-
-Dependency Tracking in Automake
-
-* First Take on Dependencies::  Precomputed dependency tracking
-* Dependencies As Side Effects::  Update at developer compile time
-* Dependencies for the User::   Update at user compile time
-* Techniques for Dependencies::  Alternative approaches
-* Recommendations for Tool Writers::  What tool writers can do to help
-* Future Directions for Dependencies::  Languages Automake does not know
-
 Copying This Manual
 
 * GNU Free Documentation License::  License for copying this manual
@@ -418,11 +430,7 @@ should generally be one @file{Makefile.am} per directory 
of a project.
 Automake does constrain a project in certain ways; for instance, it
 assumes that the project uses Autoconf (@pxref{Top, , Introduction,
 autoconf, The Autoconf Manual}), and enforces certain restrictions on
-the @file{configure.ac} address@hidden Autoconf versions used
address@hidden  Autoconf 2.50 and greater promotes
address@hidden over @file{configure.in}.  The rest of this
-documentation will refer to @file{configure.ac}, but Automake also
-supports @file{configure.in} for backward compatibility.}.
+the @file{configure.ac} contents.
 
 @cindex Automake requirements
 @cindex Requirements, Automake
@@ -901,7 +909,7 @@ GNU Make Manual}).
 VPATH builds have other interesting uses.  One is to build the same
 sources with multiple configurations.  For instance:
 
address@hidden Keep in sync with amhello-cflags.test.
address@hidden Keep in sync with amhello-cflags.sh
 @example
 ~ % @kbd{tar zxf ~/amhello-1.0.tar.gz}
 ~ % @kbd{cd amhello-1.0}
@@ -1053,7 +1061,7 @@ instance my cross-compiler for MinGW32 has its binaries 
called
 Here is how we could build @code{amhello-1.0} for
 @code{i586-mingw32msvc} on a GNU/Linux PC.
 
address@hidden Keep in sync with amhello-cross-compile.test.
address@hidden Keep in sync with amhello-cross-compile.sh
 @smallexample
 ~/amhello-1.0 % @kbd{./configure --build i686-pc-linux-gnu --host 
i586-mingw32msvc}
 checking for a BSD-compatible install... /usr/bin/install -c
@@ -1168,7 +1176,7 @@ by some means.
 For instance here is how we could create a binary package containing a
 snapshot of all the files to be installed.
 
address@hidden Keep in sync with amhello-binpkg.test.
address@hidden Keep in sync with amhello-binpkg.sh
 @example
 ~/amhello-1.0 % @kbd{./configure --prefix /usr}
 @dots{}
@@ -1302,8 +1310,9 @@ must be passed to @command{configure} to activate them.
 Do not reject slow dependency extractors.
 @end table
 
address@hidden Tracking Evolution}, for some discussion about the
-different dependency tracking schemes used by Automake over the years.
address@hidden Tracking Evolution, , Dependency Tracking Evolution,
+automake-history, Brief History of Automake}, for some discussion about
+the different dependency tracking schemes used by Automake over the years.
 
 @node Nested Packages
 @subsection Nested Packages
@@ -1819,11 +1828,11 @@ variable definitions.
 Generally, Automake is not particularly smart in the parsing of unusual
 Makefile constructs, so you're advised to avoid fancy constructs or
 ``creative'' use of whitespaces.
address@hidden Keep this in sync with doc-parsing-buglets-tabs.test.
address@hidden Keep this in sync with doc-parsing-buglets-tabs.sh
 For example, @key{TAB} characters cannot be used between a target name
 and the following address@hidden:}'' character, and variable assignments
 shouldn't be indented with @key{TAB} characters.
address@hidden Keep this in sync with doc-parsing-buglets-colneq-subst.test.
address@hidden Keep this in sync with doc-parsing-buglets-colneq-subst.sh
 Also, using more complex macro in target names can cause trouble:
 
 @example
@@ -1864,7 +1873,7 @@ When examining a variable definition, Automake will 
recursively examine
 variables referenced in the definition.  For example, if Automake is
 looking at the content of @code{foo_SOURCES} in this snippet
 
address@hidden Keep in sync with interp.test.
address@hidden Keep in sync with interp.sh
 @example
 xs = a.c b.c
 foo_SOURCES = c.c $(xs)
@@ -1924,7 +1933,9 @@ The valid strictness levels are:
 Automake will check for only those things that are absolutely
 required for proper operations.  For instance, whereas GNU standards
 dictate the existence of a @file{NEWS} file, it will not be required in
-this mode.  The name comes from the fact that Automake is intended to be
+this mode.  This strictness will also turn off some warnings by default
+(among them, portability warnings).
+The name comes from the fact that Automake is intended to be
 used for GNU programs; these relaxed rules are not the standard mode of
 operation.
 
@@ -2046,7 +2057,7 @@ defined (e.g., @samp{zardir}).
 For instance, the following snippet will install @file{file.xml} into
 @samp{$(datadir)/xml}.
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 xmldir = $(datadir)/xml
 xml_DATA = file.xml
@@ -2057,7 +2068,7 @@ performs to diagnose suspicious directory/primary couples 
(in the
 unlikely case these checks are undesirable, and you really know what
 you're doing).  For example, Automake would error out on this input:
 
address@hidden Should be tested in primary-prefix-invalid-couples.test.
address@hidden Should be tested in primary-prefix-invalid-couples.sh
 @example
 # Forbidden directory combinations, automake will error out on this.
 pkglib_PROGRAMS = foo
@@ -2067,7 +2078,7 @@ doc_LIBRARIES = libquux.a
 @noindent
 but it will succeed with this:
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 # Work around forbidden directory combinations.  Do not use this
 # without a very good reason!
@@ -2148,7 +2159,7 @@ data_DATA = file1 @dots{} address@hidden address@hidden 
@dots{} address@hidden
 @noindent
 may also be written as
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 data_DATA = file1 @dots{} address@hidden
 data2dir = $(datadir)
@@ -2253,12 +2264,6 @@ source in case you need more recent versions.
 This is a wrapper primarily for the Microsoft lib archiver, to make
 it more POSIX-like.
 
address@hidden ansi2knr.c
address@hidden ansi2knr.1
-These two files are used for de-ANSI-fication support (they are
-deprecated now, and @emph{will be removed} in the next major Automake
-release; @pxref{ANSI}).
-
 @item compile
 This is a wrapper for compilers that do not accept options @option{-c}
 and @option{-o} at the same time.  It is only used when absolutely
@@ -2279,14 +2284,6 @@ you are encouraged to fetch the latest versions of these 
files from
 @url{http://savannah.gnu.org/git/?group=config} before making a
 release.
 
address@hidden config-ml.in
-This file is not a program, it is a @file{configure} fragment used for
-multilib support (@pxref{Multilibs}).  Since the Automake multilib
-support has been @emph{deprecated} and targeted for removal, this
-file is going to be @emph{removed from the Automake core} in the next
-major release.  The master copy of this file is maintained in the GCC
-tree at @url{http://gcc.gnu.org/svn.html}.
-
 @item depcomp
 This program understands how to run a compiler so that it will
 generate not only the desired output but also dependency information
@@ -2323,14 +2320,9 @@ longer installed automatically, and it should be safe to 
remove it.
 @item py-compile
 This is used to byte-compile Python scripts.
 
address@hidden symlink-tree
-This program duplicates a tree of directories, using symbolic links
-instead of copying files.  Such an operation is performed when building
-multilibs (@pxref{Multilibs}).  Since the Automake multilib support has
-been @emph{deprecated} and targeted for removal, this file is going to
-be @emph{removed from the Automake core} in the next major release.
-The master copy of this file is maintained in the GCC tree at
address@hidden://gcc.gnu.org/svn.html}.
address@hidden test-driver
+This implements the default test driver offered by the parallel
+testsuite harness.
 
 @item texinfo.tex
 Not a program, this file is required for @samp{make dvi}, @samp{make
@@ -2493,7 +2485,7 @@ example in the manual.  However if you were to build 
@code{true} and
 @code{false} in real life, you would probably use per-program
 compilation flags, like so:
 
address@hidden Keep in sync with specflg7.test and specflg8.test.
address@hidden Keep in sync with specflg7.sh and specflg8.sh
 @example
 bin_PROGRAMS = false true
 
@@ -2594,6 +2586,12 @@ for more information.
 Look for Automake data files in directory @var{dir} instead of in the
 installation directory.  This is typically used for debugging.
 
address@hidden --print-libdir
address@hidden --print-libdir
+Print the path of the installation directory containing Automake-provided
+scripts and data files (like e.g., @file{texinfo.texi} and
address@hidden).
+
 @item -c
 @opindex -c
 @itemx --copy
@@ -2717,7 +2715,7 @@ are enabled in @option{--gnu} and @option{--gnits} 
strictness.
 On the other hand, the @option{silent-rules} options (@pxref{Options})
 turns off portability warnings about recursive variable expansions.
 
address@hidden Checked by extra-portability.test
address@hidden Checked by extra-portability.sh
 Turning off @samp{portability} will also turn off @samp{extra-portability},
 and similarly turning on @samp{extra-portability} will also turn on
 @samp{portability}.  However, turning on @samp{portability} or turning
@@ -2832,7 +2830,7 @@ literals.  If part of the specification uses shell 
variables,
 @command{automake} will not be able to fulfill this setup, and you will
 have to complete the missing bits by hand.  For instance, on
 
address@hidden Keep in sync with output11.test.
address@hidden Keep in sync with output11.sh
 @example
 file=input
 @dots{}
@@ -2848,7 +2846,7 @@ source file.)
 
 Similarly
 
address@hidden Keep in sync with output11.test.
address@hidden Keep in sync with output11.sh
 @example
 file=output
 file2=out:in
@@ -2943,12 +2941,24 @@ The Autoconf Manual}.
 @item AC_CONFIG_AUX_DIR
 Automake will look for various helper scripts, such as
 @file{install-sh}, in the directory named in this macro invocation.
address@hidden This list is accurate relative to version 1.8
-(The full list of scripts is: @file{ar-lib}, @file{config.guess},
address@hidden, @file{depcomp}, @file{elisp-comp}, @file{compile},
address@hidden, @file{ltmain.sh}, @file{mdate-sh}, @file{missing},
address@hidden, @file{py-compile}, @file{texinfo.tex}, and
address@hidden)  Not all scripts are always searched for; some scripts
address@hidden This list is accurate relative to version 1.11
+(The full list of scripts is:
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden,
address@hidden)
+Not all scripts are always searched for; some scripts
 will only be sought if the generated @file{Makefile.in} requires them.
 
 If @code{AC_CONFIG_AUX_DIR} is not given, the scripts are looked for in
@@ -3018,8 +3028,7 @@ This is required if any Objective C source is included.  
@xref{Particular
 Programs, , Particular Program Checks, autoconf, The Autoconf Manual}.
 
 @item AC_PROG_F77
-This is required if any Fortran 77 source is included.  This macro is
-distributed with Autoconf version 2.13 and later.  @xref{Particular
+This is required if any Fortran 77 source is included.  @xref{Particular
 Programs, , Particular Program Checks, autoconf, The Autoconf Manual}.
 
 @item AC_F77_LIBRARY_LDFLAGS
@@ -3077,11 +3086,6 @@ this way, e.g., @code{AC_PATH_XTRA} defines 
@code{X_CFLAGS} and
 @code{$(X_CFLAGS)} and @code{$(X_LIBS)} in any @file{Makefile.am}
 if @code{AC_PATH_XTRA} is called.
 
address@hidden AM_C_PROTOTYPES
-This is required when using the deprecated de-ANSI-fication feature;
address@hidden  @emph{It will be removed} in the next major Automake
-release.
-
 @item AM_CONDITIONAL
 This introduces an Automake conditional (@pxref{Conditionals}).
 
@@ -3229,11 +3233,6 @@ Look for the system-wide third-party macro files (and 
the special
 @file{dirlist} file) in @var{dir} instead of in the installation
 directory.  This is typically used for debugging.
 
address@hidden address@hidden
address@hidden --acdir
address@hidden shorthand for address@hidden@var{dir}
address@hidden''.  Will be removed in future aclocal versions.
-
 @item address@hidden
 @opindex --diff
 Run @var{command} on M4 file that would be installed or overwritten
@@ -3259,7 +3258,7 @@ Add the directory @var{dir} to the list of directories 
searched for
 Install system-wide third-party macros into the first directory
 specified with @samp{-I @var{dir}} instead of copying them in the
 output file.
address@hidden The following semantics is checked by 
`aclocal-install-absdir.test'.
address@hidden Keep in sync with aclocal-install-absdir.sh
 Note that this will happen also if @var{dir} is an absolute path.
 
 @cindex serial number and @option{--install}
@@ -3475,18 +3474,18 @@ macros installed at other places on the system.
 The fourth and last mechanism to customize the macro search path is
 also the simplest.  Any directory included in the colon-separated
 environment variable @env{ACLOCAL_PATH} is added to the search path
address@hidden Keep in sync with aclocal-path-precedence.test.
address@hidden Keep in sync with aclocal-path-precedence.sh
 and takes precedence over system directories (including those found via
 @file{dirlist}), with the exception of the versioned directory
 @var{acdir-APIVERSION} (@pxref{Macro Search Path}).  However, directories
 passed via @option{-I} will take precedence over directories in
 @env{ACLOCAL_PATH}.
 
address@hidden Keep in sync with aclocal-path-installed.test.
address@hidden Keep in sync with aclocal-path-installed.sh
 Also note that, if the @option{--install} option is used, any @file{.m4}
 file containing a required macro that is found in a directory listed in
 @env{ACLOCAL_PATH} will be installed locally.
address@hidden Keep in sync with aclocal-path-installed-serial.test.
address@hidden Keep in sync with aclocal-path-installed-serial.sh
 In this case, serial numbers in @file{.m4} are honoured too,
 @pxref{Serials}.
 
@@ -3522,7 +3521,7 @@ installs this macro so that @command{aclocal} will find 
it.
 A macro file's name should end in @file{.m4}.  Such files should be
 installed in @file{$(datadir)/aclocal}.  This is as simple as writing:
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = mymacro.m4 myothermacro.m4
@@ -3565,7 +3564,7 @@ For instance,
 
 @example
 # bad style
-AC_PREREQ(2.57)
+AC_PREREQ(2.68)
 AC_DEFUN(AX_FOOBAR,
 [AC_REQUIRE([AX_SOMETHING])dnl
 AX_FOO
@@ -3578,7 +3577,7 @@ should be rewritten as
 
 @example
 AC_DEFUN([AX_FOOBAR],
-[AC_PREREQ([2.57])dnl
+[AC_PREREQ([2.68])dnl
 AC_REQUIRE([AX_SOMETHING])dnl
 AX_FOO
 AX_BAR
@@ -3586,11 +3585,11 @@ AX_BAR
 @end example
 
 Wrapping the @code{AC_PREREQ} call inside the macro ensures that
-Autoconf 2.57 will not be required if @code{AX_FOOBAR} is not actually
+Autoconf 2.68 will not be required if @code{AX_FOOBAR} is not actually
 used.  Most importantly, quoting the first argument of @code{AC_DEFUN}
 allows the macro to be redefined or included twice (otherwise this
 first argument would be expanded during the second definition).  For
-consistency we like to quote even arguments such as @code{2.57} that
+consistency we like to quote even arguments such as @code{2.68} that
 do not require it.
 
 If you have been directed here by the @command{aclocal} diagnostic but
@@ -3919,7 +3918,7 @@ Automake ships with several Autoconf macros that you can 
use from your
 
 @menu
 * Public Macros::               Macros that you can use.
-* Obsolete Macros::             Macros that you should stop using.
+* Obsolete Macros::             Macros that will soon be removed.
 * Private Macros::              Macros that you should not use.
 @end menu
 
@@ -3930,39 +3929,24 @@ Automake ships with several Autoconf macros that you 
can use from your
 
 @table @code
 
address@hidden AM_ENABLE_MULTILIB
address@hidden AM_ENABLE_MULTILIB
-
-This is used when a ``multilib'' library is being built.  Please be
-aware that multilib support @emph{will be removed} from the Automake
-core in the next major release, and then @emph{this macro will go away
-as well} (even if a ``frozen'' version of will remain available in the
address@hidden/} directory of the Automake distribution).
-
-The first optional argument is the name of the @file{Makefile} being
-generated; it defaults to @samp{Makefile}.  The second optional argument
-is used to find the top source directory; it defaults to the empty
-string (generally this should not be used unless you are familiar with
-the internals).  @xref{Multilibs}.
-
 @item AM_INIT_AUTOMAKE([OPTIONS])
address@hidden AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 @acindex AM_INIT_AUTOMAKE
 Runs many macros required for proper operation of the generated Makefiles.
 
 @vindex AUTOMAKE_OPTIONS
-This macro has two forms, the first of which is preferred.
-In this form, @code{AM_INIT_AUTOMAKE} is called with a
-single argument: a space-separated list of Automake options that should
+Today, @code{AM_INIT_AUTOMAKE} is called with a single argument: a
+space-separated list of Automake options that should
 be applied to every @file{Makefile.am} in the tree.  The effect is as if
 each option were listed in @code{AUTOMAKE_OPTIONS} (@pxref{Options}).
 
 @acindex AC_INIT
-The second, deprecated, form of @code{AM_INIT_AUTOMAKE} has two required
-arguments: the package and the version number.  This form is
-obsolete because the @var{package} and @var{version} can be obtained
-from Autoconf's @code{AC_INIT} macro (which itself has an old and a new
-form).
+This macro can also be called in @emph{another, deprecated form} (support
+for which will be @emph{removed in the next major Automake release}):
address@hidden(PACKAGE, VERSION, [NO-DEFINE])}.  In this form,
+there are two required arguments: the package and the version number.
+This form is obsolete because the @var{package} and @var{version} can
+be obtained from Autoconf's @code{AC_INIT} macro (which itself has an
+old and a new form).
 
 If your @file{configure.ac} has:
 
@@ -3972,7 +3956,7 @@ AM_INIT_AUTOMAKE([mumble], [1.5])
 @end example
 
 @noindent
-you can modernize it as follows:
+you should modernize it as follows:
 
 @example
 AC_INIT([mumble], [1.5])
@@ -3997,11 +3981,10 @@ explicitly).
 @opindex no-define
 By default this macro @code{AC_DEFINE}'s @code{PACKAGE} and
 @code{VERSION}.  This can be avoided by passing the @option{no-define}
-option, as in:
+option:
 @example
 AM_INIT_AUTOMAKE([gnits 1.5 no-define dist-bzip2])
 @end example
-or by passing a third non-empty argument to the obsolete form.
 
 @item AM_PATH_LISPDIR
 @acindex AM_PATH_LISPDIR
@@ -4095,24 +4078,15 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} 
to @code{LIBS}.
 @cindex autoupdate
 
 Although using some of the following macros was required in past
-releases, you should not use any of them in new code.  Running
address@hidden should adjust your @file{configure.ac}
-automatically (@pxref{autoupdate Invocation, , Using
address@hidden to Modernize @file{configure.ac}, autoconf, The
-Autoconf Manual}).
+releases, you should not use any of them in new code.  @emph{All
+these macros will be removed in the next major Automake version};
+if you are still using them, running @command{autoupdate} should
+adjust your @file{configure.ac} automatically (@pxref{autoupdate
+Invocation, , Using @command{autoupdate} to Modernize
address@hidden, autoconf, The Autoconf Manual}).
address@hidden it NOW!}
 
 @table @code
address@hidden AM_C_PROTOTYPES
address@hidden AM_C_PROTOTYPES
address@hidden ANSI2KNR
address@hidden U
-Check to see if function prototypes are understood by the compiler.  If
-so, define @samp{PROTOTYPES} and set the output variables @code{U} and
address@hidden to the empty string.  Otherwise, set @code{U} to
address@hidden and @code{ANSI2KNR} to @samp{./ansi2knr}.  Automake used these
-values to implement the deprecated de-ANSI-fication feature; however,
-support for @emph{that feature will be removed} in the next major Automake
-release, and then @emph{these macros and variables will go away as well}.
 
 @item AM_CONFIG_HEADER
 @acindex AM_CONFIG_HEADER
@@ -4140,19 +4114,12 @@ variable @code{mkdir_p} to one of @code{mkdir -p}, 
@code{install-sh
 Nowadays Autoconf provides a similar functionality with
 @code{AC_PROG_MKDIR_P} (@pxref{Particular Programs, , Particular
 Program Checks, autoconf, The Autoconf Manual}), however this defines
-the output variable @code{MKDIR_P} instead.  Therefore
address@hidden has been rewritten as a thin wrapper around
address@hidden to define @code{mkdir_p} to the same value as
address@hidden for backward compatibility.
-
-If you are using Automake, there is normally no reason to call this
-macro, because @code{AM_INIT_AUTOMAKE} already does so.  However, make
-sure that the custom rules in your @file{Makefile}s use
address@hidden(MKDIR_P)} and not @code{$(mkdir_p)}.  Even if both variables
-still work, the latter should be considered obsolete.
-
-If you are not using Automake, please call @code{AC_PROG_MKDIR_P}
-instead of @code{AM_PROG_MKDIR_P}.
+the output variable @code{MKDIR_P} instead.  In case you are still
+using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
+or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
+you are advised to switch ASAP to the more modern Autoconf-provided
+interface instead; both the macro and the variable @emph{will be
+removed} in the next major Automake release.
 
 @item AM_SYS_POSIX_TERMIOS
 @acindex AM_SYS_POSIX_TERMIOS
@@ -4163,21 +4130,6 @@ system.  If so, set the shell variable 
@code{am_cv_sys_posix_termios} to
 @samp{yes}.  If not, set the variable to @samp{no}.  This macro is obsolete,
 you should use Autoconf's @code{AC_SYS_POSIX_TERMIOS} instead.
 
address@hidden AM_WITH_REGEX
address@hidden AM_WITH_REGEX
address@hidden WITH_REGEX
address@hidden --with-regex
address@hidden regex package
address@hidden rx package
-Adds @option{--with-regex} to the @command{configure} command line.  If
-specified (the default), then the @samp{regex} regular expression
-library is used, @file{regex.o} is put into @code{LIBOBJS}, and
address@hidden is defined.  If @option{--without-regex} is given, then
-the @samp{rx} regular expression library is used, and @file{rx.o} is put
-into @code{LIBOBJS}.  This macro is obsolete now (since @samp{rx} doesn't
-seem to be maintained), and @emph{will be removed the next major version
-of Automake}.  Consider using gnulib if you need regex functionality.
-
 @end table
 
 
@@ -4382,7 +4334,7 @@ does not know the possible values of these variables.  In 
this case
 @cindex @code{SUBDIRS} and @code{AM_CONDITIONAL}
 @cindex @code{AM_CONDITIONAL} and @code{SUBDIRS}
 
address@hidden Keep in sync with subcond2.test.
address@hidden Keep in sync with subcond2.sh
 
 @file{configure} should output the @file{Makefile} for each directory
 and define a condition into which @file{opt/} should be built.
@@ -4422,7 +4374,7 @@ automatically because it knows that @code{MAYBE_OPT} can 
contain
 @cindex @code{SUBDIRS} and @code{AC_SUBST}
 @cindex @code{AC_SUBST} and @code{SUBDIRS}
 
address@hidden Keep in sync with subcond3.test.
address@hidden Keep in sync with subcond3.sh
 
 Another possibility is to define @code{MAYBE_OPT} from
 @file{./configure} using @code{AC_SUBST}:
@@ -4580,7 +4532,7 @@ often be replaced by several variables, one for each 
destination
 directory (@pxref{Uniform}).  For instance, the last example could be
 rewritten as follows:
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 imagesdir = $(pkgdatadir)/images
 soundsdir = $(pkgdatadir)/sounds
@@ -4725,7 +4677,6 @@ to build programs and libraries.
 * Java Support with gcj::       Compiling Java sources using gcj
 * Vala Support::                Compiling Vala sources
 * Support for Other Languages::  Compiling other languages
-* ANSI::                        Automatic de-ANSI-fication (deprecated, soon 
to be removed)
 * Dependencies::                Automatic dependency tracking
 * EXEEXT::                      Support for executable extensions
 @end menu
@@ -5037,7 +4988,7 @@ You can also use Automake conditionals 
(@pxref{Conditionals}) to
 select programs to be built.  In this case you don't have to worry
 about @samp{$(EXEEXT)} or @code{EXTRA_PROGRAMS}.
 
address@hidden Keep in sync with exeext.test.
address@hidden Keep in sync with exeext.sh
 @example
 bin_PROGRAMS = cpio pax
 if WANT_MT
@@ -5088,7 +5039,7 @@ Extra objects can be added to a library using the
 @address@hidden variable.  This should be used for objects
 determined by @command{configure}.  Again from @code{cpio}:
 
address@hidden Keep in sync with pr401c.test.
address@hidden Keep in sync with pr401c.sh
 @example
 libcpio_a_LIBADD = $(LIBOBJS) $(ALLOCA)
 @end example
@@ -5294,7 +5245,7 @@ relates to @file{libfoo.la} or @file{libbar.la} at the 
time it creates
 the link rule for these two libraries.  Therefore the @option{-rpath}
 argument must be explicitly supplied.
 
address@hidden Keep in sync with ltcond.test.
address@hidden Keep in sync with ltcond.sh
 @example
 EXTRA_LTLIBRARIES = libfoo.la libbar.la
 lib_LTLIBRARIES = $(WANTEDLIBS)
@@ -5310,7 +5261,7 @@ Automake is able to compute the @option{-rpath} setting 
itself, because
 it's clear that both libraries will end up in @samp{$(libdir)} if they
 are installed.
 
address@hidden Keep in sync with ltcond.test.
address@hidden Keep in sync with ltcond.sh
 @example
 lib_LTLIBRARIES =
 if WANT_LIBFOO
@@ -5337,7 +5288,7 @@ we could build a @file{libhello.la} library using either
 @file{hello-linux.c} or @file{hello-generic.c} with the following
 @file{Makefile.am}.
 
address@hidden Keep in sync with ltcond2.test.
address@hidden Keep in sync with ltcond2.sh
 @example
 lib_LTLIBRARIES = libhello.la
 libhello_la_SOURCES = hello-common.c
@@ -5352,7 +5303,7 @@ either @file{hello-linux.lo} or @address@hidden
 
 Or we could simply use an Automake conditional as follows.
 
address@hidden Keep in sync with ltcond2.test.
address@hidden Keep in sync with ltcond2.sh
 @example
 lib_LTLIBRARIES = libhello.la
 libhello_la_SOURCES = hello-common.c
@@ -5392,7 +5343,7 @@ dependency anywhere it won't be built (this is why
 Here is a sample setup merging libtool convenience libraries from
 subdirectories into one main @file{libtop.la} library.
 
address@hidden Keep in sync with ltconv.test.
address@hidden Keep in sync with ltconv.sh
 @example
 # -- Top-level Makefile.am --
 SUBDIRS = sub1 sub2 @dots{}
@@ -6220,12 +6171,16 @@ cause the intermediate file to be named @file{foo.c} 
(as opposed to
 @file{y.tab.c}, which is more traditional).
 
 The extension of a yacc source file is used to determine the extension
-of the resulting C or C++ file.  Files with the extension @file{.y}
-will be turned into @file{.c} files; likewise, @file{.yy} will become
address@hidden; @file{.y++}, @file{c++}; @file{.yxx}, @file{.cxx}; and
address@hidden, @file{.cpp}.
-
-Likewise, lex source files can be used to generate C or C++; the
+of the resulting C or C++ source and header files.  Note that header
+files are generated only when the @option{-d} Yacc option is used; see
+below for more information about this flag, and how to specify it.
+Files with the extension @file{.y} will thus be turned into @file{.c}
+sources and @file{.h} headers; likewise, @file{.yy} will become
address@hidden and @file{.hh}, @file{.y++} will become @file{c++} and
address@hidden, @file{.yxx} will become @file{.cxx} and @file{.hxx},
+and @file{.ypp} will become @file{.cpp} and @file{.hpp}.
+
+Similarly, lex source files can be used to generate C or C++; the
 extensions @file{.l}, @file{.ll}, @file{.l++}, @file{.lxx}, and
 @file{.lpp} are recognized.
 
@@ -6254,7 +6209,7 @@ adjust its rules to update and distribute the header file 
built by
 @option{-d} in @code{AM_YFLAGS} only if it is not clustered with other
 options; for example, it won't be recognized if @code{AM_YFLAGS} is
 @option{-dt}, but it will be if @code{AM_YFLAGS} is @option{-d -t} or
address@hidden -t}}.
address@hidden -d}.}.
 What Automake cannot guess, though, is where this
 header will be used: it is up to you to ensure the header gets built
 before it is first used.  Typically this is necessary in order for
@@ -6634,10 +6589,9 @@ in the appropriate Fortran 77 intrinsic and run-time 
libraries.
 @cindex @code{FLIBS}, defined
 @vindex FLIBS
 These extra Fortran 77 linker flags are supplied in the output variable
address@hidden by the @code{AC_F77_LIBRARY_LDFLAGS} Autoconf macro
-supplied with newer versions of Autoconf (Autoconf version 2.13 and
-later).  @xref{Fortran Compiler, , Fortran Compiler Characteristics,
-autoconf, The Autoconf Manual}.
address@hidden by the @code{AC_F77_LIBRARY_LDFLAGS} Autoconf macro.
address@hidden Compiler, , Fortran Compiler Characteristics, autoconf,
+The Autoconf Manual}.
 @end enumerate
 
 If Automake detects that a program or shared library (as mentioned in
@@ -6909,85 +6863,6 @@ on user demand.
 Some limited support for adding your own languages is available via the
 suffix rule handling (@pxref{Suffixes}).
 
-
address@hidden ANSI
address@hidden Automatic de-ANSI-fication (deprecated, soon to be removed)
-
address@hidden de-ANSI-fication, defined
-
address@hidden features described in this section are deprecated; you must
-not use any of them in new code, and remove their use from older but
-still maintained code: they will be withdrawn in the next major
-Automake release.}
-
-When the C language was standardized in 1989, there was a long
-transition period where package developers needed to worry about
-porting to older systems that did not support ANSI C by default.
-These older systems are no longer in practical use and are no longer
-supported by their original suppliers, so developers need not worry
-about this problem any more.
-
-Automake allows you to write packages that are portable to K&R C by
address@hidden each source file before the actual compilation takes
-place.
-
address@hidden AUTOMAKE_OPTIONS
address@hidden ansi2knr
-
-If the @file{Makefile.am} variable @code{AUTOMAKE_OPTIONS}
-(@pxref{Options}) contains the option @option{ansi2knr} then code to
-handle de-ANSI-fication is inserted into the generated
address@hidden
-
-This causes each C source file in the directory to be treated as ANSI 
address@hidden
-If an ANSI C compiler is available, it is used.  If no ANSI C compiler
-is available, the @command{ansi2knr} program is used to convert the source
-files into K&R C, which is then compiled.
-
-The @command{ansi2knr} program is simple-minded.  It assumes the source
-code will be formatted in a particular way; see the @command{ansi2knr} man
-page for details.
-
address@hidden AM_C_PROTOTYPES
-Support for the obsolete de-ANSI-fication feature
-requires the source files @file{ansi2knr.c}
-and @file{ansi2knr.1} to be in the same package as the ANSI C source;
-these files are distributed with Automake.  Also, the package
address@hidden must call the macro @code{AM_C_PROTOTYPES}
-(@pxref{Macros}).
-
-Automake also handles finding the @command{ansi2knr} support files in some
-other directory in the current package.  This is done by prepending the
-relative path to the appropriate directory to the @command{ansi2knr}
-option.  For instance, suppose the package has ANSI C code in the
address@hidden and @file{lib} subdirectories.  The files @file{ansi2knr.c} and
address@hidden appear in @file{lib}.  Then this could appear in
address@hidden/Makefile.am}:
-
address@hidden
-AUTOMAKE_OPTIONS = ../lib/ansi2knr
address@hidden example
-
-If no directory prefix is given, the files are assumed to be in the
-current directory.
-
-Note that automatic de-ANSI-fication will not work when the package is
-being built for a different host architecture.  That is because
address@hidden currently has no way to build @command{ansi2knr}
-for the build machine.
-
address@hidden FIXME: this paragraph might be better moved to an `upgrading' 
section.
address@hidden @code{LTLIBOBJS} and @code{ansi2knr}
address@hidden @code{LIBOBJS} and @code{ansi2knr}
address@hidden @code{ansi2knr} and @code{LTLIBOBJS}
address@hidden @code{ansi2knr} and @code{LIBOBJS}
-Using @code{LIBOBJS} with source de-ANSI-fication used to require
-hand-crafted code in @file{configure} to append @samp{$U} to basenames
-in @code{LIBOBJS}.  This is no longer true today.  Starting with version
-2.54, Autoconf takes care of rewriting @code{LIBOBJS} and
address@hidden  (@pxref{AC_LIBOBJ vs LIBOBJS, , @code{AC_LIBOBJ}
-vs.@: @code{LIBOBJS}, autoconf, The Autoconf Manual})
-
 @node Dependencies
 @section Automatic dependency tracking
 
@@ -7013,11 +6888,11 @@ your build.
 
 @cindex @command{depcomp}
 
-Experience with earlier versions of Automake (@pxref{Dependency
-Tracking Evolution}) taught us that it is not reliable to generate
-dependencies only on the maintainer's system, as configurations vary
-too much.  So instead Automake implements dependency tracking at build
-time.
+Experience with earlier versions of Automake (@pxref{Dependency Tracking
+Evolution, , Dependency Tracking Evolution, automake-history, Brief History
+of Automake}) taught us that it is not reliable to generate dependencies
+only on the maintainer's system, as configurations vary too much.  So
+instead Automake implements dependency tracking at build time.
 
 Automatic dependency tracking can be suppressed by putting
 @option{no-dependencies} in the variable @code{AUTOMAKE_OPTIONS}, or
@@ -7078,20 +6953,14 @@ substitutions.  This means that if you are 
conditionally building a
 program using such a substitution, then your @file{configure.ac} must
 take care to add @samp{$(EXEEXT)} when constructing the output variable.
 
-With Autoconf 2.13 and earlier, you must explicitly use @code{AC_EXEEXT}
-to get this support.  With Autoconf 2.50, @code{AC_EXEEXT} is run
-automatically if you configure a compiler (say, through
address@hidden).
-
 Sometimes maintainers like to write an explicit link rule for their
 program.  Without executable extension support, this is easy---you
 simply write a rule whose target is the name of the program.  However,
 when executable extension support is enabled, you must instead add the
 @samp{$(EXEEXT)} suffix.
 
-Unfortunately, due to the change in Autoconf 2.50, this means you must
-always add this extension.  However, this is a problem for maintainers
-who know their package will never run on a platform that has
+This might be a nuisance for maintainers who know their package will
+never run on a platform that has
 executable extensions.  For those maintainers, the @option{no-exeext}
 option (@pxref{Options}) will disable this feature.  This works in a
 fairly ugly way; if @option{no-exeext} is seen, then the presence of a
@@ -7635,7 +7504,7 @@ variable explicitly prevents byte-compilation.
 
 Since Automake 1.8, we now recommend using @code{lisp_DATA} instead:
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 lisp_DATA = file1.el file2.el
 @end example
@@ -7697,7 +7566,7 @@ files are not included in the distribution, you should 
use the
 Here is a typical setup for distributing @file{.java} files and
 installing the @file{.class} files resulting from their compilation.
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 javadir = $(datadir)/java
 dist_java_JAVA = a.java b.java @dots{}
@@ -7771,7 +7640,7 @@ Automake ships with an Autoconf macro called 
@code{AM_PATH_PYTHON}
 that will determine some Python-related directory variables (see
 below).  If you have called @code{AM_PATH_PYTHON} from
 @file{configure.ac}, then you may use the variables
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @code{python_PYTHON} or @code{pkgpython_PYTHON} to list Python source
 files in your @file{Makefile.am}, depending on where you want your files
 installed (see the definitions of @code{pythondir} and
@@ -7860,7 +7729,7 @@ This is the directory where Python extension modules 
(shared libraries)
 should be installed.  An extension module written in C could be declared
 as follows to Automake:
 
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @example
 pyexec_LTLIBRARIES = quaternion.la
 quaternion_la_SOURCES = quaternion.c support.c support.h
@@ -8064,7 +7933,7 @@ passed to @code{makeinfo} when building @file{.info} 
files; and
 @samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html}
 files.
 
address@hidden Keep in sync with txinfo21.test.
address@hidden Keep in sync with txinfo21.sh
 For instance, the following setting can be used to obtain one single
 @file{.html} file per manual, without node separators.
 @example
@@ -8292,7 +8161,7 @@ while @code{bin_PROGRAMS} files are installed by 
@code{install-exec}.
 
 Any variable using a user-defined directory prefix with
 @samp{exec} in the name (e.g.,
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 @code{myexecbin_PROGRAMS}) is installed by @code{install-exec}.  All
 other user-defined prefixes are installed by @code{install-data}.
 
@@ -8479,7 +8348,7 @@ included if they are found in the current directory 
(either physically,
 or as the target of a @file{Makefile.am} rule); this list is printed by
 @samp{automake --help}.  Note that some files in this list are actually
 distributed only if other certain conditions hold (for example,
address@hidden Keep in sync with autodist-config-headers.test.
address@hidden Keep in sync with autodist-config-headers.sh
 the @file{config.h.top} and @file{config.h.bot} files are automatically
 distributed only if, e.g., @samp{AC_CONFIG_HEADERS([config.h])} is used
 in @file{configure.ac}).  Also, files that are read by @command{configure}
@@ -8544,24 +8413,35 @@ nodist_foo_SOURCES = do-not-distribute.c
 
 Occasionally it is useful to be able to change the distribution before
 it is packaged up.  If the @code{dist-hook} rule exists, it is run
-after the distribution directory is filled, but before the actual tar
-(or shar) file is created.  One way to use this is for distributing
-files in subdirectories for which a new @file{Makefile.am} is overkill:
+after the distribution directory is filled, but before the actual
+distribution archives are created.  One way to use this is for
+removing unnecessary files that get recursively included by specifying
+a directory in @code{EXTRA_DIST}:
 
 @example
+EXTRA_DIST = doc
 dist-hook:
-        mkdir $(distdir)/random
-        cp -p $(srcdir)/random/a1 $(srcdir)/random/a2 $(distdir)/random
+        rm -rf `find $(distdir)/doc -type d -name .svn`
 @end example
 
-Another way to use this is for removing unnecessary files that get
-recursively included by specifying a directory in EXTRA_DIST:
-
address@hidden
-EXTRA_DIST = doc
-
address@hidden The caveates described here should be documented in 
'disthook.test'.
address@hidden
+Note that the @code{dist-hook} recipe shouldn't assume that the regular
+files in the distribution directory are writable; this might not be the
+case if one is packaging from a read-only source tree, or when a
address@hidden distcheck} is being done.  For similar reasons, the recipe
+shouldn't assume that the subdirectories put into the distribution
+directory as effect of having them listed in @code{EXTRA_DIST} are
+writable.  So, if the @code{dist-hook} recipe wants to modify the
+content of an existing file (or @code{EXTRA_DIST} subdirectory) in the
+distribution directory, it should explicitly to make it writable first:
+
address@hidden
+EXTRA_DIST = README doc
 dist-hook:
-        rm -rf `find $(distdir)/doc -type d -name .svn`
+        chmod u+w $(distdir)/README $(distdir)/doc
+        echo "Distribution date: `date`" >> README
+        rm -f $(distdir)/doc/HACKING
 @end example
 
 @vindex distdir
@@ -8592,20 +8472,32 @@ dist} was run, not to any sub-packages involved.
 @section Checking the Distribution
 
 @cindex @samp{make distcheck}
address@hidden @samp{make distcleancheck}
address@hidden distcleancheck_listfiles
address@hidden @samp{make distuninstallcheck}
address@hidden distuninstallcheck_listfiles
-
 @trindex distcheck
-Automake also generates a @code{distcheck} rule that can be of help to
-ensure that a given distribution will actually work.  @code{distcheck}
-makes a distribution, then tries to do a @code{VPATH} build
-(@pxref{VPATH Builds}), run the test suite, and finally make another
-tarball to ensure the distribution is self-contained.
+Automake also generates a @code{distcheck} rule that can be of help
+to ensure that a given distribution will actually work.  Simplifying
+a bit, we can say this rule first makes a distribution, and then,
address@hidden from it}, takes the following steps:
address@hidden
address@hidden
+tries to do a @code{VPATH} build (@pxref{VPATH Builds}), with the
address@hidden and all its content made @emph{read-only};
address@hidden
+runs the test suite (with @command{make check}) on this fresh build;
address@hidden
+installs the package in a temporary directory (with @command{make
+install}), and tries runs the test suite on the resulting installation
+(with @command{make installcheck});
address@hidden
+checks that the package can be correctly uninstalled (by @command{make
+uninstall}) and cleaned (by @code{make distclean});
address@hidden
+finally, makes another tarball to ensure the distribution is
+self-contained.
address@hidden itemize
 
 @vindex AM_DISTCHECK_CONFIGURE_FLAGS
 @vindex DISTCHECK_CONFIGURE_FLAGS
address@hidden DISTCHECK_CONFIGURE_FLAGS
 Building the package involves running @samp{./configure}.  If you need
 to supply additional flags to @command{configure}, define them in the
 @code{AM_DISTCHECK_CONFIGURE_FLAGS} variable in your top-level
@@ -8629,6 +8521,7 @@ installcheck} was wrongly assuming it could blindly test 
"@command{m4}",
 rather than the just-installed "@command{gm4}".
 
 @trindex distcheck-hook
address@hidden distcheck-hook
 If the @code{distcheck-hook} rule is defined in your top-level
 @file{Makefile.am}, then it will be invoked by @code{distcheck} after
 the new distribution has been unpacked, but before the unpacked copy
@@ -8641,9 +8534,12 @@ are not honored in a subpackage @file{Makefile.am}, but 
the flags from
 @code{AM_DISTCHECK_CONFIGURE_FLAGS} and @code{DISTCHECK_CONFIGURE_FLAGS}
 are passed down to the @command{configure} script of the subpackage.
 
address@hidden @samp{make distcleancheck}
 @trindex distcleancheck
 @vindex DISTCLEANFILES
 @vindex distcleancheck_listfiles
+
address@hidden distcleancheck
 Speaking of potential distribution errors, @code{distcheck} also
 ensures that the @code{distclean} rule actually removes all built
 files.  This is done by running @samp{make distcleancheck} at the end of
@@ -8669,7 +8565,7 @@ If you want @code{distcleancheck} to ignore built files 
that have not
 been cleaned because they are also part of the distribution, add the
 following definition instead:
 
address@hidden Keep in sync with distcleancheck.test.
address@hidden Keep in sync with distcleancheck.sh
 @example
 distcleancheck_listfiles = \
   find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
@@ -8681,9 +8577,14 @@ your Makefiles cause some distributed files to be 
rebuilt when the user
 build the package.  (Think about the user missing the tool required to
 build the file; or if the required tool is built by your package,
 consider the cross-compilation case where it can't be run.)  There is
-an entry in the FAQ about this (@pxref{distcleancheck}), make sure you
-read it before playing with @code{distcleancheck_listfiles}.
+an entry in the FAQ about this (@pxref{Errors with distclean}), make
+sure you read it before playing with @code{distcleancheck_listfiles}.
+
address@hidden @samp{make distuninstallcheck}
address@hidden distuninstallcheck
address@hidden distuninstallcheck_listfiles
 
address@hidden distuninstallcheck
 @code{distcheck} also checks that the @code{uninstall} rule works
 properly, both for ordinary and @code{DESTDIR} builds.  It does this
 by invoking @samp{make uninstall}, and then it checks the install tree
@@ -8715,9 +8616,9 @@ distributions in various formats.  Their targets are:
 @item @code{dist-bzip2}
 Generate a bzip2 tar archive of the distribution.  bzip2 archives are
 frequently smaller than gzipped archives.
-By default, this rule makes @samp{bzip2} use a compression option of
address@hidden  To make it use a different one, set the @env{BZIP2}
-environment variable.  For example, @samp{make dist-bzip2 BZIP2=-7}.
+By default, this rule makes @samp{bzip2} use a compression option of 
@option{-9}.
+To make it use a different one, set the @env{BZIP2} environment variable.
+For example, @samp{make dist-bzip2 BZIP2=-7}.
 @trindex dist-bzip2
 
 @item @code{dist-gzip}
@@ -8725,17 +8626,10 @@ Generate a gzip tar archive of the distribution.
 @trindex dist-gzip
 
 @item @code{dist-lzip}
-Generate a @samp{lzip} tar archive of the distribution.  @command{lzip}
+Generate an @samp{lzip} tar archive of the distribution.  @command{lzip}
 archives are frequently smaller than @command{bzip2}-compressed archives.
 @trindex dist-lzip
 
address@hidden @code{dist-lzma}
-Generate an @samp{lzma} tar archive of the distribution.
-The @samp{lzma} format is obsolete, you should use the @samp{xz} format
-instead. @emph{Support for @samp{lzma}-compressed archives will be
-removed in the next major Automake release.}
address@hidden dist-lzma
-
 @item @code{dist-shar}
 Generate a shar archive of the distribution.
 @trindex dist-shar
@@ -8744,7 +8638,6 @@ Generate a shar archive of the distribution.
 @item @code{dist-xz}
 Generate an @samp{xz} tar archive of the distribution.  @command{xz}
 archives are frequently smaller than @command{bzip2}-compressed archives.
-The @samp{xz} format displaces the obsolete @samp{lzma} format.
 By default, this rule makes @samp{xz} use a compression option of
 @option{-e}.  To make it use a different one, set the @env{XZ_OPT}
 environment variable.  For example, run this command to use the
@@ -8774,92 +8667,265 @@ default, only the @code{dist-gzip} target is hooked to 
@code{dist}.
 @cindex @code{make check}
 @trindex check
 
-Automake supports three forms of test suites, the first two of which
-are very similar.
+Automake can generate code to handle two kinds of test suites.  One is
+based on integration with the @command{dejagnu} framework.  The other
+(and most used) form is based on the use of generic test scripts, and
+its activation is triggered by the definition of the special @code{TESTS}
+variable.  This second form allows for various degrees of sophistication
+and customization; in particular, it allows for concurrent execution
+of test scripts, use of established test protocols such as TAP, and
+definition of custom test drivers and test runners.
+
address@hidden
+In either case, the testsuite is invoked via @samp{make check}.
 
 @menu
-* Simple Tests::                Listing programs and scripts in @code{TESTS}
-* Simple Tests using parallel-tests::  More powerful test driver
-* DejaGnu Tests::               Interfacing with the external testing framework
+* Generalities about Testing::  Concepts and terminology about testing
+* Simple Tests::                Listing test scripts in @code{TESTS}
+* Custom Test Drivers::         Writing and using custom test drivers
+* Using the TAP test protocol:: Integrating test scripts that use the TAP 
protocol
+* DejaGnu Tests::               Interfacing with the @command{dejagnu} testing 
framework
 * Install Tests::               Running tests on installed packages
 @end menu
 
address@hidden Generalities about Testing
address@hidden Generalities about Testing
+
+The purpose of testing is to determine whether a program or system behaves
+as expected (e.g., known inputs produce the expected outputs, error
+conditions are correctly handled or reported, and older bugs do not
+resurface).
+
address@hidden test case
+The minimal unit of testing is usually called @emph{test case}, or simply
address@hidden  How a test case is defined or delimited, and even what
+exactly @emph{constitutes} a test case, depends heavily on the testing
+paradigm and/or framework in use, so we won't attempt any more precise
+definition.  The set of the test cases for a given program or system
+constitutes its @emph{testsuite}.
+
address@hidden test harness
address@hidden testsuite harness
+A @emph{test harness} (also @emph{testsuite harness}) is a program or
+software component that executes all (or part of) the defined test cases,
+analyzes their outcomes, and report or register these outcomes
+appropriately.  Again, the details of how this is accomplished (and how
+the developer and user can influence it or interface with it) varies
+wildly, and we'll attempt no precise definition.
+
address@hidden test pass
address@hidden test failure
+A test is said to @emph{pass} when it can determine that the condition or
+behaviour it means to verify holds, and is said to @emph{fail} when it can
+determine that such condition of behaviour does @emph{not} hold.
+
address@hidden test skip
+Sometimes, tests can rely on non-portable tools or prerequisites, or
+simply make no sense on a given system (for example, a test checking a
+Windows-specific feature makes no sense on a GNU/Linux system).  In this
+case, accordingly to the definition above, the tests can neither be
+considered passed nor failed; instead, they are @emph{skipped} -- i.e.,
+they are not run, or their result is anyway ignored for what concerns
+the count of failures an successes.  Skips are usually explicitly
+reported though, so that the user will be aware that not all of the
+testsuite has really run.
+
address@hidden xfail
address@hidden expected failure
address@hidden expected test failure
address@hidden xpass
address@hidden unexpected pass
address@hidden unexpected test pass
+It's not uncommon, especially during early development stages, that some
+tests fail for known reasons, and that the developer doesn't want to
+tackle these failures immediately (this is especially true when the
+failing tests deal with corner cases).  In this situation, the better
+policy is to declare that each of those failures is an @emph{expected
+failure} (or @emph{xfail}).  In case a test that is expected to fail ends
+up passing instead, many testing environments will flag the result as a
+special kind of failure called @emph{unexpected pass} (or @emph{xpass}).
+
address@hidden hard error
address@hidden Distinction between errors and failures in testsuites
+Many testing environments and frameworks distinguish between test failures
+and hard errors.  As we've seen, a test failure happens when some invariant
+or expected behaviour of the software under test is not met.  An @emph{hard
+error} happens when e.g., the set-up of a test case scenario fails, or when
+some other unexpected or highly undesirable condition is encountered (for
+example, the program under test experiences a segmentation fault).
+
address@hidden: Links to other test harnesses (esp. those sharing our
+terminology)?
+
 @node Simple Tests
 @section Simple Tests
 
-If the variable @code{TESTS} is defined, its value is taken to be a
-list of programs or scripts to run in order to do the testing.
-Programs needing data files should look for them in @code{srcdir}
-(which is both an environment variable and a make variable) so they
-work when building in a separate directory (@pxref{Build Directories,
-, Build Directories , autoconf, The Autoconf Manual}), and in
-particular for the @code{distcheck} rule (@pxref{Checking the
-Distribution}).
-
-For each of the @code{TESTS}, the result of execution is printed along
-with the test name, where @code{PASS} denotes a successful test,
address@hidden denotes a failed test, @code{XFAIL} an expected failure,
address@hidden an unexpected pass for a test that is supposed to fail,
-and @code{SKIP} denotes a skipped test.
address@hidden
+* Scripts-based Testsuites::    Automake-specific concepts and terminology
+* Serial Test Harness::         Older (and obsolescent) serial test harness
+* Parallel Test Harness::       Generic concurrent test harness
address@hidden menu
+
address@hidden Scripts-based Testsuites
address@hidden Scripts-based Testsuites
+
+If the special variable @code{TESTS} is defined, its value is taken to be
+a list of programs or scripts to run in order to do the testing.  Under
+the appropriate circumstances, it's possible for @code{TESTS} to list
+also data files to be passed to one or more test scripts defined by
+different means (the so-called ``log compilers'', @pxref{Parallel Test
+Harness}).
+
+Test scripts can be executed serially or concurrently.  Automake
+supports both these kinds of test execution, with the serial test harness
+being the default (for backward-compatibility reasons only, as its use
+is nowadays discouraged).  The concurrent test harness relies on the
+concurrence capabilities (if any) offered by the underlying @command{make}
+implementation, and can thus only be as good as those are.
+
+By default, only the exit statuses of the test scripts are considered when
+determining the testsuite outcome.  But Automake allows also the use of
+more complex test protocols, either standard (@pxref{Using the TAP test
+protocol}) or custom (@pxref{Custom Test Drivers}).  Note that you can
+enable such protocols only when the parallel harness is used: they won't
+work with the serial test harness.  In the rest of this section we are
+going to concentrate mostly on protocol-less tests, since  we'll have later
+a whole section devoted to the use of test protocols (again, @pxref{Custom
+Test Drivers}).
 
 @cindex Exit status 77, special interpretation
address@hidden Exit status 99, special interpretation
+When no test protocol is in use, an exit status of 0 from a test script will
+denote a success, an exit status of 77 a skipped test, an exit status of 99
+an hard error, and any other exit status will denote a failure.
+
address@hidden Tests, expected failure
address@hidden Expected test failure
address@hidden XFAIL_TESTS
address@hidden DISABLE_HARD_ERRORS
address@hidden Disabling hard errors
+You may define the variable @code{XFAIL_TESTS} to a list of tests
+(usually a subset of @code{TESTS}) that are expected to fail; this will
+effectively reverse the result of those tests (with the provision that
+skips and hard errors remain untouched).  You may also instruct the
+testsuite harness to treat hard errors like simple failures, by defining
+the @code{DISABLE_HARD_ERRORS} make variable to a nonempty value.
+
+Note however that, for tests based on more complex test protocols,
+the exact effects of @code{XFAIL_TESTS} and @code{DISABLE_HARD_ERRORS}
+might change, or they might even have no effect at all (for example,
address@hidden Keep this in sync with tap-no-disable-hard-errors.sh
+in tests using TAP, there is not way to disable hard errors, and the
address@hidden variable has no effect on them).
+
address@hidden progress on console}
address@hidden Testsuite progress on console
+The result of each test case run by the scripts in @code{TESTS} will be
+printed on standard output, along with the test name.  For test protocols
+that allow more test cases per test script (such as TAP), a number,
+identifier and/or brief description specific for the single test case is
+expected to be printed in addition to the name of the test script.  The
+possible results (whose meanings should be clear from the previous
address@hidden about Testing}) are @code{PASS}, @code{FAIL},
address@hidden, @code{XFAIL}, @code{XPASS} and @code{ERROR}.  Here is an
+example of output from an hypothetical testsuite that uses both plain
+and TAP tests:
address@hidden Keep in sync with tap-doc.sh
address@hidden
+PASS: foo.sh
+PASS: zardoz.tap 1 - Daemon started
+PASS: zardoz.tap 2 - Daemon responding
+SKIP: zardoz.tap 3 - Daemon uses /proc # SKIP /proc is not mounted
+PASS: zardoz.tap 4 - Daemon stopped
+SKIP: bar.sh
+PASS: mu.tap 1
+XFAIL: mu.tap 2 # TODO frobnication not yet implemented
address@hidden example
 
-The number of failures will be printed at the end of the run.  If a
-given test program exits with a status of 77, then its result is ignored
-in the final count.  This feature allows non-portable tests to be
-ignored in environments where they don't make sense.
address@hidden
+A testsuite summary (expected to report at least the number of run,
+skipped and failed tests) will be printed at the end of the testsuite
+run.
 
address@hidden tests and color-tests}
 @vindex AM_COLOR_TESTS
address@hidden Colorized testsuite output
 If the Automake option @code{color-tests} is used (@pxref{Options})
 and standard output is connected to a capable terminal, then the test
 results and the summary are colored appropriately.  The user can disable
 colored output by setting the @command{make} variable
 @samp{AM_COLOR_TESTS=no}, or force colored output even without a connecting
-terminal with @samp{AM_COLOR_TESTS=always}.
-
-Note that the semantics of some @command{make} implementations when used
-in parallel mode (@pxref{Parallel make,,, autoconf, The Autoconf Manual})
-can cause the automatic detection of a connection to a capable terminal
-to fail.  In that case, you can still resort to the use of
address@hidden
+terminal with @samp{AM_COLOR_TESTS=always}.  It's also worth noting that
+some @command{make} implementations, when used in parallel mode, have
+slightly different semantics (@pxref{Parallel make,,, autoconf,
+The Autoconf Manual}), which can break the automatic detection of a
+connection to a capable terminal.  If this is the case, you'll have to
+resort to the use of @samp{AM_COLOR_TESTS=always} in order to have the
+testsuite output colorized.
+
+Test programs that need data files should look for them in @code{srcdir}
+(which is both a make variable and an environment variable made available
+to the tests), so that they work when building in a separate directory
+(@pxref{Build Directories, , Build Directories , autoconf,
+The Autoconf Manual}), and in particular for the @code{distcheck} rule
+(@pxref{Checking the Distribution}).
 
 @vindex TESTS
 @vindex TESTS_ENVIRONMENT
-The variable @code{TESTS_ENVIRONMENT} can be used to set environment
-variables for the test run; the environment variable @env{srcdir} is
-set in the rule.  If all your test programs are scripts, you can also
-set @code{TESTS_ENVIRONMENT} to an invocation of the shell (e.g.
address@hidden(SHELL) -x} can be useful for debugging the tests), or any other
-interpreter.  For instance, the following setup may be used to run tests
-with Perl:
-
address@hidden Keep in sync with tests-environment-backcompat.test.
address@hidden
-TESTS_ENVIRONMENT = $(PERL) -Mstrict -w
-TESTS = foo.pl bar.pl baz.pl
address@hidden AM_TESTS_ENVIRONMENT
+The @code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables can
+be used to run initialization code and set environment variables for the
+test scripts.  The former variable is developer-reserved, and can be
+defined in the @file{Makefile.am}, while the latter is reserved for the
+user, which can employ it to extend or override the settings in the
+former; for this to work portably, however, the contents of a non-empty
address@hidden @emph{must} be terminated by a semicolon.
+
address@hidden AM_TESTS_FD_REDIRECT
+The @code{AM_TESTS_FD_REDIRECT} variable can be used to define file
+descriptor redirections for the test scripts.  One might think that
address@hidden could be used for this purpose, but experience
+has shown that doing so portably is practically impossible.  The main
+hurdle is constituted by Korn shells, which usually set the close-on-exec
+flag on file descriptors opened with the @command{exec} builtin, thus
+rendering an idiom like @code{AM_TESTS_ENVIRONMENT = exec 9>&2;}
+ineffectual.  This issue also affects some Bourne shells, such as the
+HP-UX's @command{/bin/sh},
address@hidden FIXME: should we offer a link to the relevant discussions on the
address@hidden bug-autoconf list?
+
address@hidden Keep in sync with tests-environment-backcompat.sh
address@hidden
+AM_TESTS_ENVIRONMENT = \
+## Some environment initializations are kept in a separate shell
+## file `tests-env.sh', which can make it easier to also run tests
+## from the command line.
+  . $(srcdir)/tests-env.sh; \
+## On Solaris, prefer more POSIX-compliant versions of the standard
+## tools by default.
+  if test -d /usr/xpg4/bin; then \
+    PATH=/usr/xpg4/bin:$$PATH; export PATH; \
+  fi;
address@hidden $$ restore font-lock
+## With this, the test scripts will be able to print diagnostic
+## messages to the original standard error stream, even if the test
+## driver redirects the stderr of the test scripts to a log file
+## before executing them.
+AM_TESTS_FD_REDIRECT = 9>&2
 @end example
 
-Note that the @option{parallel-tests} driver provides a more elegant
-way to achieve the same effect, freeing the @code{TESTS_ENVIRONMENT}
-variable for the user to override (@pxref{Simple Tests using
-parallel-tests}).
-
-
address@hidden Tests, expected failure
address@hidden Expected test failure
-
address@hidden XFAIL_TESTS
-You may define the variable @code{XFAIL_TESTS} to a list of tests
-(usually a subset of @code{TESTS}) that are expected to fail.  This will
-reverse the result of those tests.
address@hidden
+Note however that @code{AM_TESTS_ENVIRONMENT} is, for historical and
+implementation reasons, @emph{not} supported by the serial harness
+(@pxref{Serial Test Harness}).
 
 Automake ensures that each file listed in @code{TESTS} is built before
-any tests are run; you can list both source and derived programs (or
-scripts) in @code{TESTS}; the generated rule will look both in
address@hidden and @file{.}.  For instance, you might want to run a C
-program as a test.  To do this you would list its name in @code{TESTS}
-and also in @code{check_PROGRAMS}, and then specify it as you would
-any other program.
+it is run; you can list both source and derived programs (or scripts)
+in @code{TESTS}; the generated rule will look both in @code{srcdir} and
address@hidden  For instance, you might want to run a C program as a test.
+To do this you would list its name in @code{TESTS} and also in
address@hidden, and then specify it as you would any other
+program.
 
 Programs listed in @code{check_PROGRAMS} (and @code{check_LIBRARIES},
 @code{check_LTLIBRARIES}...) are only built during @code{make check},
@@ -8870,48 +8936,110 @@ that @code{check_PROGRAMS} are @emph{not} 
automatically added to
 by the tests, not the tests themselves.  Of course you can set
 @code{TESTS = $(check_PROGRAMS)} if all your programs are test cases.
 
address@hidden Serial Test Harness
address@hidden Serial Test Harness
address@hidden @option{serial-tests}, Using
+
address@hidden:} This harness, while still being the default one, is
+obsolescent, and kept mostly for backward-compatibility reasons.  The user
+is advised to use the parallel test harness instead (@pxref{Parallel Test
+Harness}).  Be warned that future Automake versions might switch to use
+that more modern and feature-rich harness by default.
+
+The serial test harness is enabled by the Automake option
address@hidden It operates by simply running the tests serially,
+one at the time, without any I/O redirection.  It's up to the user to
+implement logging of tests' output, if that's requited or desired.
address@hidden TODO: give an example of how this can be done.
+
+For historical and implementation reasons, the @code{AM_TESTS_ENVIRONMENT}
+variable is @emph{not} supported by this harness (it will be silently
+ignored if defined); only @code{TESTS_ENVIRONMENT} is, and it is to be
+considered a developer-reserved variable.  This is done so that, when
+using the serial harness, @code{TESTS_ENVIRONMENT} can be defined to an
+invocation of an interpreter through which the tests are to be run.
+For instance, the following setup may be used to run tests with Perl:
+
address@hidden
+TESTS_ENVIRONMENT = $(PERL) -Mstrict -w
+TESTS = foo.pl bar.pl baz.pl
address@hidden example
+
address@hidden
+It's important to note that the use of @code{TESTS_ENVIRONMENT} endorsed
+here would be @emph{invalid} with the parallel harness.  That harness
+provides a more elegant way to achieve the same effect, with the further
+benefit of freeing the @code{TESTS_ENVIRONMENT} variable for the user
+(@pxref{Parallel Test Harness}).
+
+Another, less serious limit of the serial harness is that it doesn't
+really distinguish between simple failures and hard errors; this is
+due to historical reasons only, and might be fixed in future Automake
+versions.
 
address@hidden Simple Tests using parallel-tests
address@hidden Simple Tests using @samp{parallel-tests}
address@hidden Parallel Test Harness
address@hidden Parallel Test Harness
 @cindex @option{parallel-tests}, Using
 
-The option @option{parallel-tests} (@pxref{Options}) enables a test suite
-driver that is mostly compatible to the simple test driver described in
-the previous section, but provides a few more features and slightly
-different semantics.  It features concurrent execution of tests with
address@hidden -j} and automatic collection of the test scripts output and
-summary thereof in @file{.log} files, and allows to specify inter-test
-dependencies, lazy reruns of tests that have not completed in a prior
-run, and hard errors for exceptional failures.  Similar to the simple
-test driver, @code{TESTS_ENVIRONMENT}, @code{AM_COLOR_TESTS},
address@hidden, and the @code{check_*} variables are honored,
-and the environment variable @env{srcdir} is set during test execution.
-
-This test driver is still experimental and may undergo changes in order
-to satisfy additional portability requirements.
+The parallel (or concurrent) test harness is enabled by the Automake option
address@hidden  It features automatic collection of the test
+scripts output in @file{.log} files, concurrent execution of tests with
address@hidden -j}, specification of inter-test dependencies, lazy reruns of
+tests that have not completed in a prior run, and hard errors for exceptional
+failures.
+
+This harness is still somewhat experimental and may undergo changes in
+order to satisfy additional portability requirements.
 
address@hidden of test metadata}
 @vindex TEST_SUITE_LOG
 @vindex TESTS
-The driver operates by defining a set of @command{make} rules to create
-a summary log file, @code{TEST_SUITE_LOG}, which defaults to
address@hidden and requires a @file{.log} suffix.  This file
-depends upon log files created for each single test program listed in
address@hidden, which in turn contain all output produced by the
-corresponding tests.
address@hidden @file{.log} files
address@hidden @file{.trs} files
address@hidden test metadata
+The parallel test harness operates by defining a set of @command{make}
+rules that run the test scripts listed in @code{TESTS}, and, for each
+such script, save its output in a corresponding @file{.log} file and
+its results (and other ``metadata'', @pxref{API for Custom Test Drivers})
+in a corresponding @file{.trs} (as in @b{T}est @address@hidden) file.
address@hidden We choose the `.trs' extension also because, at the time of 
writing,
address@hidden it isn't already used for other significant purposes; see e.g.:
address@hidden   - http://filext.com/file-extension/trs
address@hidden   - http://www.file-extensions.org/search/?searchstring=trs
+The @file{.log} file will contain all the output emitted by the test on
+its standard output and its standard error.  The @file{.trs} file will
+contain, among the other things, the results of the test cases run by
+the script.
+
+The parallel test harness will also create a summary log file,
address@hidden, which defaults to @file{test-suite.log} and requires
+a @file{.log} suffix.  This file depends upon all the @file{.log} and
address@hidden files created for the test scripts listed in @code{TESTS}.
+
address@hidden VERBOSE
+As with the serial harness above, by default one status line is printed
+per completed test, and a short summary after the suite has completed.
+However, standard output and standard error of the test are redirected
+to a per-test log file, so that parallel execution does not produce
+intermingled output.  The output from failed tests is collected in the
address@hidden file.  If the variable @samp{VERBOSE} is set, this
+file is output after the summary.
address@hidden FIXME: we should be clearer about what we mean exactly here ...
+For best results, the tests should be verbose by default now.
 
 @vindex TEST_EXTENSIONS
 @vindex TEST_LOGS
-Each log file is created when the corresponding test has completed.
-The set of log files is listed in the read-only variable
address@hidden, and defaults to @code{TESTS}, with the executable
-extension if any (@pxref{EXEEXT}), as well as any suffix listed in
address@hidden removed, and @file{.log} appended.  Results
-are undefined if a test file name ends in several concatenated suffixes.
address@hidden defaults to @file{.test}; it can be overridden by
-the user, in which case any extension listed in it must be constituted
-by a dot, followed by a non-digit alphabetic character, followed by any
-number of alphabetic characters.
address@hidden Keep in sync with test-extensions.test.
+Each couple of @file{.log} and @file{.trs} files is created when the
+corresponding test has completed.  The set of log files is listed in
+the read-only variable @code{TEST_LOGS}, and defaults to @code{TESTS},
+with the executable extension if any (@pxref{EXEEXT}), as well as any
+suffix listed in @code{TEST_EXTENSIONS} removed, and @file{.log} appended.
+Results are undefined if a test file name ends in several concatenated
+suffixes.  @code{TEST_EXTENSIONS} defaults to @file{.test}; it can be
+overridden by the user, in which case any extension listed in it must be
+constituted by a dot, followed by a non-digit alphabetic character,
+followed by any number of alphabetic characters.
address@hidden Keep in sync with test-extensions.sh
 For example, @samp{.sh}, @samp{.T} and @samp{.t1} are valid extensions,
 while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not.
 
@@ -8927,15 +9055,15 @@ while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not.
 @vindex address@hidden
 @vindex AM_LOG_FLAGS
 For tests that match an extension @address@hidden listed in
address@hidden, you can provide a test driver using the variable
address@hidden@var{ext}_LOG_COMPILER} (note the upper-case extension) and pass
-options in @address@hidden and allow the user to pass
-options in @address@hidden  It will cause all tests with
-this extension to be called with this driver.  For all tests without a
-registered extension, the variables @code{LOG_COMPILER},
address@hidden, you can provide a custom ``test runner'' using
+the variable @address@hidden (note the upper-case
+extension) and pass options in @address@hidden and allow
+the user to pass options in @address@hidden  It will cause
+all tests with this extension to be called with this runner.  For all
+tests without a registered extension, the variables @code{LOG_COMPILER},
 @code{AM_LOG_FLAGS}, and @code{LOG_FLAGS} may be used.  For example,
 
address@hidden Keep in sync with parallel-tests-log-compiler-example.test.
address@hidden Keep in sync with parallel-tests-log-compiler-example.sh
 @example
 TESTS = foo.pl bar.py baz
 TEST_EXTENSIONS = .pl .py
@@ -8950,50 +9078,36 @@ AM_LOG_FLAGS = -d
 @noindent
 will invoke @samp{$(PERL) -w foo.pl}, @samp{$(PYTHON) -v bar.py},
 and @samp{./wrapper-script -d baz} to produce @file{foo.log},
address@hidden, and @file{baz.log}, respectively.  The
address@hidden variable is still expanded before the driver,
-but should be reserved for the user.
address@hidden, and @file{baz.log}, respectively.  The @file{foo.trs},
address@hidden and @file{baz.trs} files will be automatically produced
+as a side-effect.
 
address@hidden VERBOSE
-As with the simple driver above, by default one status line is printed
-per completed test, and a short summary after the suite has completed.
-However, standard output and standard error of the test are redirected
-to a per-test log file, so that parallel execution does not produce
-intermingled output.  The output from failed tests is collected in the
address@hidden file.  If the variable @samp{VERBOSE} is set, this
-file is output after the summary.  For best results, the tests should be
-verbose by default now.
+It's important to note that, differently from what we've seen for the
+serial test harness (@pxref{Parallel Test Harness}), the
address@hidden and @code{TESTS_ENVIRONMENT} variables
address@hidden be use to define a custom test runner; the
address@hidden and @code{LOG_FLAGS} (or their extension-specific
+counterparts) should be used instead:
 
address@hidden check-html
address@hidden RST2HTML
address@hidden TEST_SUITE_HTML
-Previous versions of automake used to provide a @code{check-html} target
-to convert the log files to HTML.  This feature is now deprecated, and
address@hidden be removed} in the next major Automake release, so don't rely
-on it anymore.
address@hidden
+## This is WRONG!
+AM_TESTS_ENVIRONMENT = PERL5LIB='$(srcdir)/lib' $(PERL) -Mstrict -w
address@hidden example
 
address@hidden DISABLE_HARD_ERRORS
address@hidden Exit status 99, special interpretation
address@hidden hard error
-Even in the presence of expected failures (see @code{XFAIL_TESTS}), there
-may be conditions under which a test outcome needs attention.  For
-example, with test-driven development, you may write tests for features
-that you have not implemented yet, and thus mark these tests as expected
-to fail.  However, you may still be interested in exceptional conditions,
-for example, tests that fail due to a segmentation violation or another
-error that is independent of the feature awaiting implementation.
-Tests can exit with an exit status of 99 to signal such a @emph{hard
-error}.  Unless the variable @code{DISABLE_HARD_ERRORS} is set to a
-nonempty value, such tests will be counted as failed.
-
-By default, the test suite driver will run all tests, but there are
address@hidden
+## Do this instead.
+AM_TESTS_ENVIRONMENT = PERL5LIB='$(srcdir)/lib'; export PERL5LIB;
+LOG_COMPILER = $(PERL)
+AM_LOG_FLAGS = -Mstrict -w
address@hidden example
+
+By default, the test suite harness will run all tests, but there are
 several ways to limit the set of tests that are run:
 
 @itemize @bullet
 @item
-You can set the @code{TESTS} variable, similarly to how you can with
-the simple test driver from the previous section.  For example, you can
-use a command like this to run only a subset of the tests:
+You can set the @code{TESTS} variable.  For example, you can use a
+command like this to run only a subset of the tests:
 
 @example
 env TESTS="foo.test bar.test" make -e check
@@ -9006,7 +9120,7 @@ whose testsuite takes long time to execute.  Luckily, 
this problem can
 easily be avoided by overriding also @code{TEST_SUITE_LOG} at runtime;
 for example,
 
address@hidden Keep in sync with parallel-tests-log-override-2.test.
address@hidden Keep in sync with parallel-tests-log-override-2.sh
 @example
 env TEST_SUITE_LOG=partial.log TESTS="..." make -e check
 @end example
@@ -9030,14 +9144,15 @@ here too.
 @item
 @vindex RECHECK_LOGS
 @cindex lazy test execution
-By default, the test driver removes all old per-test log files before it
-starts running tests to regenerate them.  The variable
address@hidden contains the set of log files which are removed.
address@hidden defaults to @code{TEST_LOGS}, which means all tests
-need to be rechecked.  By overriding this variable, you can choose which
-tests need to be reconsidered.  For example, you can lazily rerun only
-those tests which are outdated, i.e., older than their prerequisite test
-files, by setting this variable to the empty value:
+By default, the test harness removes all old per-test @file{.log} and
address@hidden files before it starts running tests to regenerate them.  The
+variable @code{RECHECK_LOGS} contains the set of @file{.log} (and, by
+implication, @file{.trs}) files which are removed.  @code{RECHECK_LOGS}
+defaults to @code{TEST_LOGS}, which means all tests need to be rechecked.
+By overriding this variable, you can choose which tests need to be
+reconsidered.  For example, you can lazily rerun only those tests which
+are outdated, i.e., older than their prerequisite test files, by setting
+this variable to the empty value:
 
 @example
 env RECHECK_LOGS= make -e check
@@ -9048,13 +9163,14 @@ env RECHECK_LOGS= make -e check
 You can ensure that all tests are rerun which have failed or passed
 unexpectedly, by running @code{make recheck} in the test directory.
 This convenience target will set @code{RECHECK_LOGS} appropriately
-before invoking the main test driver.
+before invoking the main test harness.
 @end itemize
 
address@hidden
 In order to guarantee an ordering between tests even with @code{make
address@hidden, dependencies between the corresponding log files may be
-specified through usual @command{make} dependencies.  For example, the
-following snippet lets the test named @file{foo-execute.test} depend
address@hidden, dependencies between the corresponding @file{.log} files
+may be specified through usual @command{make} dependencies.  For example,
+the following snippet lets the test named @file{foo-execute.test} depend
 upon completion of the test @file{foo-compile.test}:
 
 @example
@@ -9074,6 +9190,7 @@ parallel @command{make address@hidden, so be sure they 
are prepared for
 concurrent execution.
 
 @cindex Unit tests
address@hidden Keep in sync with 'parallel-tests-extra-programs.test'.
 The combination of lazy test execution and correct dependencies between
 tests and their sources may be exploited for efficient unit testing
 during development.  To further speed up the edit-compile-test cycle, it
@@ -9101,6 +9218,561 @@ semantics of FreeBSD and OpenBSD @command{make} 
conflict with this).
 In case of doubt you may want to require to use GNU @command{make},
 or work around the issue with inference rules to generate the tests.
 
address@hidden Custom Test Drivers
address@hidden Custom Test Drivers
+
address@hidden
+* Overview of Custom Test Drivers Support::
+* Declaring Custom Test Drivers::
+* API for Custom Test Drivers::
address@hidden menu
+
address@hidden Overview of Custom Test Drivers Support
address@hidden Overview of Custom Test Drivers Support
+
+Starting from Automake version 1.12, the parallel test harness allows
+the package authors to use third-party custom test drivers, in case the
+default ones are inadequate for their purposes, or do not support their
+testing protocol of choice.
+
+A custom test driver is expected to properly run the test programs passed
+to it (including the command-line arguments passed to those programs, if
+any), to analyze their execution and outcome, to create the @file{.log}
+and @file{.trs} files associated to these test runs, and to display the test
+results on the console. It is responsibility of the author of the test
+driver to ensure that it implements all the above steps meaningfully and
+correctly; Automake isn't and can't be of any help here.  On the other
+hand, the Automake-provided code for testsuite summary generation offers
+support for test drivers allowing several test results per test script,
+if they take care to register such results properly (@pxref{Log files
+generation and test results recording}).
+
+The exact details of how test scripts' results are to be determined and
+analyzed is left to the individual drivers.  Some drivers might only
+consider the test script exit status (this is done for example by the
+default test driver used by the parallel test harness, described
+in the previous section).  Other drivers might implement more complex and
+advanced test protocols, which might require them to parse and interpreter
+the output emitted by the test script they're running (examples of such
+protocols are TAP and SubUnit).
+
+It's very important to note that, even when using custom test drivers,
+most of the infrastructure described in the previous section about the
+parallel harness remains in place; this includes:
+
address@hidden
address@hidden
+list of test scripts defined in @code{TESTS}, and overridable at
+runtime through the redefinition of @code{TESTS} or @code{TEST_LOGS};
address@hidden
+concurrency through the use of @command{make}'s option @option{-j};
address@hidden
+per-test @file{.log} and @file{.trs} files, and generation of a summary
address@hidden file from them;
address@hidden
address@hidden target, @code{RECHECK_LOGS} variable, and lazy reruns
+of tests;
address@hidden
+inter-test dependencies;
address@hidden
+support for @code{check_*} variables (@code{check_PROGRAMS},
address@hidden, ...);
address@hidden
+use of @code{VERBOSE} environment variable to get verbose output on
+testsuite failures;
address@hidden
+definition and honoring of @code{TESTS_ENVIRONMENT},
address@hidden and @code{AM_TESTS_FD_REDIRECT}
+variables;
address@hidden
+definition of generic and extension-specific @code{LOG_COMPILER} and
address@hidden variables.
address@hidden itemize
+
address@hidden
+On the other hand, the exact semantics of how (and if)
address@hidden, @code{XFAIL_TESTS}, and hard errors are supported
+and handled is left to the individual test drivers.
+
address@hidden TODO: We should really add a working example in the doc/ 
directory,
address@hidden TODO: and reference if from here.
+
address@hidden Declaring Custom Test Drivers
address@hidden Declaring Custom Test Drivers
+
address@hidden _LOG_DRIVER
address@hidden _LOG_DRIVER_FLAGS
address@hidden LOG_DRIVER
address@hidden LOG_DRIVER_FLAGS
address@hidden @var{ext}_LOG_DRIVER
address@hidden @var{ext}_LOG_DRIVER_FLAGS
address@hidden address@hidden
address@hidden AM_LOG_DRIVER_FLAGS
+Custom testsuite drivers are declared by defining the make variables
address@hidden or @address@hidden (where @var{ext} must
+be declared in @code{TEST_EXTENSIONS}).  They must be defined to
+programs or scripts that will be used to drive the execution, logging,
+and outcome report of the tests with corresponding extensions (or of
+those with no registered extension in the case of @code{LOG_DRIVER}).
+Clearly, multiple distinct test drivers can be declared in the same
address@hidden  Note moreover that the @code{LOG_DRIVER} variables
+are @emph{not} a substitute for the @code{LOG_COMPILER} variables: the
+two sets of variables can, and often do, usefully and legitimately
+coexist.
+
address@hidden TODO: We should really be able to point to a clarifying example 
here!
+
+The developer-reserved variable @code{AM_LOG_DRIVER_FLAGS} and the
+user-reserved variable @code{LOG_DRIVER_FLAGS} can be used to define
+flags that will be passed to each invocation of @code{LOG_DRIVER},
+with the user-defined flags obviously taking precedence over the
+developer-reserved ones.  Similarly, for each extension @var{ext}
+declared in @code{TEST_EXTENSIONS}, flags listed in
address@hidden@var{ext}_LOG_DRIVER_FLAGS} and
address@hidden@var{ext}_LOG_DRIVER_FLAGS} will be passed to
+invocations of @address@hidden
+
address@hidden API for Custom Test Drivers
address@hidden API for Custom Test Drivers
+
+Note that @emph{the APIs described here are still highly experimental},
+and will very likely undergo tightenings and likely also extensive changes
+in the future, to accommodate for new features or to satisfy additional
+portability requirements.
+
+The main characteristic of these APIs is that they are designed to share
+as much infrastructure, semantics, and implementation details as possible
+with the parallel test harness and its default driver.
+
address@hidden
+* Command-line arguments for test drivers::
+* Log files generation and test results recording::
+* Testsuite progress output::
address@hidden menu
+
address@hidden Command-line arguments for test drivers
address@hidden Command-line arguments for test drivers
+
+A custom driver can rely on various command-line options and arguments
+being passed to it automatically by the Automake's @option{parallel-tests}
+harness.  It is @emph{mandatory} that it understands all of them (even
+if the exact interpretation of the associated semantics can legitimately
+change between a test driver and another, and even be a no-op in some
+drivers).
+
address@hidden
+Here is the list of options:
+
address@hidden @option
address@hidden address@hidden
+The name of the test, with VPATH prefix (if any) removed.  This can have a
+suffix and a directory component (as in e.g., @file{sub/foo.test}), and is
+mostly meant to be used in console reports about testsuite advancements and
+results (@pxref{Testsuite progress output}).
address@hidden address@hidden@var{PATH}.log}
+The @file{.log} file the test driver must create (@pxref{Basics of
+test metadata}).  If it has a directory component (as in e.g.,
address@hidden/foo.log}), the test harness will ensure that such directory
+exists @emph{before} the test driver is called.
address@hidden address@hidden@var{PATH}.trs}
+The @file{.trs} file the test driver must create (@pxref{Basics of
+test metadata}).  If it has a directory component (as in e.g.,
address@hidden/foo.trs}), the test harness will ensure that such directory
+exists @emph{before} the test driver is called.
address@hidden address@hidden|address@hidden
+Whether the console output should be colorized or not (@pxref{Simple
+tests and color-tests}, to learn when this option gets activated and
+when it doesn't).
address@hidden address@hidden|address@hidden
+Whether the tested program is expected to fail.
address@hidden address@hidden|address@hidden
+Whether ``hard errors'' in the tested program should be treated differently
+from normal failures or not (the default should be @code{yes}).  The exact
+meaning of ``hard error'' is highly dependent from the test protocols or
+conventions in use.
address@hidden --
+Explicitly terminate the list of options.
address@hidden table
+
address@hidden
+The first non-option argument passed to the test driver is the program to
+be run, and all the following ones are command-line options and arguments
+for this program.
+
+Note that the exact semantics attached to the @option{--color-tests},
address@hidden and @option{--enable-hard-errors} options are
+left up to the individual test drivers.  Still, having a behaviour
+compatible or at least similar to that provided by the default
address@hidden driver is advised, as that would offer a better
+consistency and a more pleasant user experience.
+
address@hidden Log files generation and test results recording
address@hidden Log files generation and test results recording
+
+The test driver must correctly generate the files specified by the
address@hidden and @option{--trs-file} option (even when the tested
+program fails or crashes).
+
+The @file{.log} file should ideally contain all the output produced by the
+tested program, plus optionally other information that might facilitate
+debugging or analysis of bug reports.  Apart from that, its format is
+basically free.
+
+The @file{.trs} file is used to register some metadata through the use
+of custom reStructuredText fields.  This metadata is expected to be
+employed in various ways by the parallel test harness; for example, to
+count the test results when printing the testsuite summary, or to decide
+which tests to re-run upon @command{make reheck}.  Unrecognized metadata
+in a @file{.trs} file is currently ignored by the harness, but this might
+change in the future. The list of currently recognized metadata follows.
+
address@hidden @code
+
address@hidden :test-result:
address@hidden Register test result
address@hidden Register test case result
address@hidden Test result, registering
address@hidden Test case result, registering
address@hidden @code{:test-result:}
address@hidden reStructuredText field, @code{:test-result:}
+The test driver must use this field to register the results of @emph{each}
+test case run by a test script file.  Several @code{:test-result:} fields
+can be present in the same @file{.trs} file; this is done in order to
+support test protocols that allow a single test script to run more test
+cases.
+
address@hidden Keep this in sync with lib/am/check-am:$(TEST_SUITE_LOG).
+The only recognized test results are currently @code{PASS}, @code{XFAIL},
address@hidden, @code{FAIL}, @code{XPASS} and @code{ERROR}.  These results,
+when declared with @code{:test-result:}, can be optionally followed by
+text holding the name and/or a brief description of the corresponding
+test; the @option{parallel-tests} harness will ignore such extra text when
+generating @file{test-suite.log} and preparing the testsuite summary.
+
address@hidden Keep in sync with 'test-metadata-recheck.test'.
address@hidden @code{:recheck:}
address@hidden :recheck:
address@hidden reStructuredText field, @code{:recheck:}
+If this field is present and defined to @code{no}, then the corresponding
+test script will @emph{not} be run upon a @command{make recheck}.  What
+happens when two or more @code{:recheck:} fields are present in the same
address@hidden file is undefined behaviour.
+
address@hidden Keep in sync with 'test-metadata-global-log.test'.
address@hidden @code{:copy-in-global-log:}
address@hidden :copy-in-global-log:
address@hidden reStructuredText field, @code{:copy-in-global-log:}
+If this field is present and defined to @code{no}, then the content
+of the @file{.log} file will @emph{not} be copied into the global
address@hidden  We allow to forsake such copying because, while
+it can be useful in debugging and analysis of bug report, it can also be
+just a waste of space in normal situations, e.g., when a test script is
+successful.  What happens when two or more @code{:copy-in-global-log:}
+fields are present in the same @file{.trs} file is undefined behaviour.
+
address@hidden Keep in sync with 'test-metadata-global-result.test'.
address@hidden @code{:test-global-result:}
address@hidden :test-global-result:
address@hidden reStructuredText field, @code{:test-global-result:}
+This is used to declare the "global result" of the script.  Currently,
+the value of this field is needed only to be reported (more or less
+verbatim) in the generated global log file @code{$(TEST_SUITE_LOG)},
+so it's quite free-form.  For example, a test script which run 10 test
+cases, 6 of which pass and 4 of which are skipped, could reasonably have
+a @code{PASS/SKIP} value for this field, while a test script which run
+19 successful tests and one failed test could have an @code{ALMOST
+PASSED} value.  What happens when two or more @code{:test-global-result:}
+fields are present in the same @file{.trs} file is undefined behaviour.
address@hidden table
+
address@hidden
+Let's see a small example.  Assume a @file{.trs} file contains the
+following lines:
+
address@hidden
+:test-result: PASS server starts
+:global-log-copy: no
+:test-result: PASS HTTP/1.1 request
+:test-result: FAIL HTTP/1.0 request
+:recheck: yes
+:test-result: SKIP HTTPS request (TLS library wasn't available)
+:test-result: PASS server stops
address@hidden example
+
address@hidden
+Then the corresponding test script will be re-run by @command{make check},
+will contribute with @emph{five} test results to the testsuite summary
+(three of these tests being successful, one failed, and one skipped), and
+the content of the corresponding @file{.log} file will @emph{not} be
+copied in the global log file @file{test-suite.log}.
+
address@hidden Testsuite progress output
address@hidden Testsuite progress output
+
+A custom test driver also has the task of displaying, on the standard
+output, the test results as soon as they become available.  Depending on
+the protocol in use, it can also display the reasons for failures and
+skips, and, more generally, any useful diagnostic output (but remember
+that each line on the screen is precious, so that cluttering the screen
+with overly verbose information is bad idea).  The exact format of this
+progress output is left up to the test driver; in fact, a custom test
+driver might @emph{theoretically} even decide not to do any such report,
+leaving it all to the testsuite summary (that would be a very lousy idea,
+of course, and serves only to illustrate the flexibility that is
+granted here).
+
+Remember that consistency is good; so, if possible, try to be consistent
+with the output of the built-in Automake test drivers, providing a similar
+``look & feel''.  In particular, the testsuite progress output should be
+colorized when the @option{--color-tests} is passed to the driver.  On the
+other end, if you are using a known and widespread test protocol with
+well-established implementations, being consistent with those
+implementations' output might be a good idea too.
+
address@hidden TODO: Give an example, maybe inspired to py.test-style output.
address@hidden TODO: That is a good idea because it shows a test driver that 
allows
address@hidden TODO: for different levels of verbosity in the progress output 
(could
address@hidden TODO: be implemented either using a driver cmdline flag, or an
address@hidden TODO: environment variable, or both).
+
address@hidden Using the TAP test protocol
address@hidden Using the TAP test protocol
+
address@hidden
+* Introduction to TAP::
+* Use TAP with the Automake test harness::
+* Incompatibilities with other TAP parsers and drivers::
+* Links and external resources on TAP::
address@hidden menu
+
address@hidden Introduction to TAP
address@hidden Introduction to TAP
+
+TAP, the Test Anything Protocol, is a simple text-based interface between
+testing modules or programs and a test harness.  The tests (also called
+``TAP producers'' in this context) write test results in a simple format
+on standard output; a test harness (also called ``TAP consumer'') will
+parse and interpret these results, and properly present them to the user,
+and/or register them for later analysis.  The exact details of how this
+is accomplished can vary among different test harnesses.  The Automake
+parallel harness will present the results on the console in the usual
+fashion (@pxref{Testsuite progress on console}), and will use the
address@hidden files (@pxref{Basics of test metadata}) to store the test
+results and related metadata.  Apart from that, it will try to remain
+as much compatible as possible with pre-existing and widespread utilities,
+such as the @uref{http://search.cpan.org/~andya/Test-Harness/bin/prove,
address@hidden utility}, at least for the simpler usages.
+
+TAP started its life as part of the test harness for Perl, but today
+it has been (mostly) standardized, and has various independent
+implementations in different languages; among them, C, C++, Perl,
+Python, PHP, and Java.  For a semi-official specification of the
+TAP protocol, please refer to the documentation of
address@hidden://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod,
+      @samp{Test::Harness::TAP}}.
+
+The most relevant real-world usages of TAP are obviously in the testsuites
+of @command{perl} and of many perl modules.  Still, also other important
+third-party packages, such as @uref{http://git-scm.com/, @command{git}},
+use TAP in their testsuite.
+
address@hidden Use TAP with the Automake test harness
address@hidden Use TAP with the Automake test harness
+
+Currently, the TAP driver that comes with Automake requires some by-hand
+steps on the developer's part (this situation should hopefully be improved
+in future Automake versions).  You'll have to grab the @file{tap-driver.sh}
+script from the Automake distribution by hand, copy it in your source tree,
+add a call to @code{AC_PROG_AWK} in @file{configure.ac} to search for a
+proper awk program, and use the Automake support for third-party test
+drivers to instruct the harness to use the @file{tap-driver.sh} script
+and that awk program to run your TAP-producing tests.  See the example
+below for clarification.
+
+Apart from the options common to all the Automake test drivers
+(@pxref{Command-line arguments for test drivers}), the @file{tap-driver.sh}
+supports the following options, whose names are chosen for enhanced
+compatibility with the @command{prove} utility.
+
address@hidden @option
address@hidden Keep in sync with 'tap-exit.test' and 'tap-signal.tap'.
address@hidden --ignore-exit
+Causes the test driver to ignore the exit status of the test scripts;
+by default, the driver will report an error if the script exits with a
+non-zero status.  This option has effect also on non-zero exit statuses
+due to termination by a signal.
address@hidden --comments
+Instruct the test driver to display TAP diagnostic (i.e., lines beginning
+with the @samp{#} character) in the testsuite progress output too; by
+default, TAP diagnostic is only copied to the @file{.log} file.
address@hidden --no-comments
+Revert the effects of @option{--comments}.
address@hidden --merge
+Instruct the test driver to merge the test scripts' standard error into
+their standard output.  This is necessary if you want to ensure that
+diagnostics from the test scripts are displayed in the correct order
+relative to test results; this can be of great help in debugging
+(especially if your test scripts are shell scripts run with shell
+tracing active).  As a downside, this option might cause the test
+harness to get confused if anything that appears on standard error
+looks like a test result.
address@hidden --no-merge
+Revert the effects of @option{--merge}.
address@hidden address@hidden
+Change the string that introduces TAP diagnostic from the default value
+of address@hidden'' to @address@hidden  This can be useful if your
+TAP-based test scripts produce verbose output on which they have limited
+control (because, say, the output comes from other tools invoked in the
+scripts), and it might contain text that gets spuriously interpreted as
+TAP diagnostic: such an issue can be solved by redefining the string that
+activates TAP diagnostic to a value you know won't appear by chance in
+the tests' output.  Note however that this feature is non-standard, as
+the ``official'' TAP protocol does not allow for such a customization; so
+don't use it if you can avoid it.
address@hidden table
+
address@hidden
+Here is an example of how the TAP driver can be set up and used.
+
address@hidden Keep in sync with tap-doc2.sh
address@hidden
+% @kbd{cat configure.ac}
+AC_INIT([GNU Try Tap], [1.0], [bug-automake@@gnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([foreign parallel-tests -Wall -Werror])
+AC_CONFIG_FILES([Makefile])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
+AC_OUTPUT
+
+% @kbd{cat Makefile.am}
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/build-aux/tap-driver.sh
+TESTS = foo.test bar.test baz.test
+EXTRA_DIST = $(TESTS)
+
+% @kbd{cat foo.test}
+#!/bin/sh
+echo 1..4 # Number of tests to be executed.
+echo 'ok 1 - Swallows fly'
+echo 'not ok 2 - Caterpillars fly # TODO metamorphosis in progress'
+echo 'ok 3 - Pigs fly # SKIP not enough acid'
+echo '# I just love word plays ...'
+echo 'ok 4 - Flies fly too :-)'
+
+% @kbd{cat bar.test}
+#!/bin/sh
+echo 1..3
+echo 'not ok 1 - Bummer, this test has failed.'
+echo 'ok 2 - This passed though.'
+echo 'Bail out! Ennui kicking in, sorry...'
+echo 'ok 3 - This will not be seen.'
+
+% @kbd{cat baz.test}
+#!/bin/sh
+echo 1..1
+echo ok 1
+# Exit with error, even if all the tests have been successful.
+exit 7
+
+% @kbd{cp @var{PREFIX}/share/address@hidden/tap-driver.pl .}
+% @kbd{autoreconf -vi && ./configure && make check}
+...
+PASS: foo.test 1 - Swallows fly
+XFAIL: foo.test 2 - Caterpillars fly # TODO metamorphosis in progress
+SKIP: foo.test 3 - Pigs fly # SKIP not enough acid
+PASS: foo.test 4 - Flies fly too :-)
+FAIL: bar.test 1 - Bummer, this test has failed.
+PASS: bar.test 2 - This passed though.
+ERROR: bar.test - Bail out! Ennui kicking in, sorry...
+PASS: baz.test 1
+ERROR: baz.test - exited with status 7
+...
+Please report to bug-automake@@gnu.org
+...
+% @kbd{echo exit status: $?}
+exit status: 1
+
address@hidden Keep the "skewed" indentation below, it produces pretty PDF 
output.
+% @kbd{env TEST_LOG_DRIVER_FLAGS='--comments --ignore-exit' \
+      TESTS='foo.test baz.test' make -e check}
+...
+PASS: foo.test 1 - Swallows fly
+XFAIL: foo.test 2 - Caterpillars fly # TODO metamorphosis in progress
+SKIP: foo.test 3 - Pigs fly # SKIP not enough acid
+# foo.test: I just love word plays...
+PASS: foo.test 4 - Flies fly too :-)
+PASS: baz.test 1
+...
+% @kbd{echo exit status: $?}
+exit status: 0
address@hidden example
+
address@hidden Incompatibilities with other TAP parsers and drivers
address@hidden Incompatibilities with other TAP parsers and drivers
+
+For implementation or historical reasons, the TAP driver and harness as
+implemented by Automake have some minors incompatibilities with the
+mainstream versions, which you should be aware of.
+
address@hidden @bullet
address@hidden
+A @code{Bail out!} directive doesn't stop the whole testsuite, but only
+the test script it occurs in.  This doesn't follow TAP specifications,
+but on the other hand it maximizes compatibility (and code sharing) with
+the ``hard error'' concept of the default @option{parallel-tests} driver.
address@hidden
+The @code{version} and @code{pragma} directives are not supported.
address@hidden
+The @option{--diagnostic-string} option of our driver allows to modify
+the string that introduces TAP diagnostic from the default value
+of address@hidden''.  The standard TAP protocol has currently no way to
+allow this, so if you use it your diagnostic will be lost to more
+compliant tools like @command{prove} and @code{Test::Harness}
address@hidden
+And there are probably some other small and yet undiscovered
+incompatibilities, especially in corner cases or with rare usages.
address@hidden itemize
+
address@hidden Links and external resources on TAP
address@hidden Links and external resources on TAP
+
address@hidden
+Here are some links to more extensive official or third-party
+documentation and resources about the TAP protocol and related
+tools and libraries.
address@hidden @bullet
address@hidden
address@hidden://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod,
+      @samp{Test::Harness::TAP}},
+the (mostly) official documentation about the TAP format and protocol.
address@hidden
address@hidden://search.cpan.org/~andya/Test-Harness/bin/prove,
+      @command{prove}},
+the most famous command-line TAP test driver, included in the distribution
+of @command{perl} and
address@hidden://search.cpan.org/~andya/Test-Harness/lib/Test/Harness.pm,
+      @samp{Test::Harness}}.
address@hidden
+The @uref{http://testanything.org/wiki/index.php/Main_Page,TAP wiki}.
address@hidden
+A ``gentle introduction'' to testing for perl coders:
address@hidden://search.cpan.org/dist/Test-Simple/lib/Test/Tutorial.pod,
+      @samp{Test::Tutorial}}.
address@hidden
address@hidden://search.cpan.org/~mschwern/Test-Simple/lib/Test/Simple.pm,
+      @samp{Test::Simple}}
+and
address@hidden://search.cpan.org/~mschwern/Test-Simple/lib/Test/More.pm,
+      @samp{Test::More}},
+the standard perl testing libraries, which are based on TAP.
address@hidden
address@hidden://www.eyrie.org/~eagle/software/c-tap-harness/,C TAP Harness},
+a C-based project implementing both a TAP producer and a TAP consumer.
address@hidden
address@hidden://www.tap4j.org/,tap4j},
+a Java-based project implementing both a TAP producer and a TAP consumer.
address@hidden itemize
 
 @node DejaGnu Tests
 @section DejaGnu Tests
@@ -9153,8 +9825,6 @@ appear in @code{EXTRA_DEJAGNU_SITE_CONFIG}).  Note that 
files are
 For more information regarding DejaGnu test suites, see @ref{Top, , ,
 dejagnu, The DejaGnu Manual}.
 
-In either case, the testing is done via @samp{make check}.
-
 @node Install Tests
 @section Install Tests
 
@@ -9267,8 +9937,16 @@ will now be rerun each time the version number is 
bumped, when only
 @node Options
 @chapter Changing Automake's Behavior
 
address@hidden
+* Options generalities::        Semantics of Automake option
+* List of Automake options::    A comprehensive list of Automake options
address@hidden menu
+
address@hidden Options generalities
address@hidden Options generalities
+
 Various features of Automake can be controlled by options.  Except where
-noted otherwise, options can be specified in one of several ways: Most
+noted otherwise, options can be specified in one of several ways.  Most
 options can be applied on a address@hidden basis when listed in a
 special @file{Makefile} variable named @code{AUTOMAKE_OPTIONS}.  Some
 of these options only make sense when specified in the toplevel
@@ -9278,7 +9956,43 @@ of these options only make sense when specified in the 
toplevel
 require changes to the @command{configure} script can only be specified
 there.  These are annotated below.
 
-Currently understood options are:
+As a general rule, options specified in @code{AUTOMAKE_OPTIONS} take
+precedence over those specified in @code{AM_INIT_AUTOMAKE}, which in
+turn take precedence over those specified on the command line.
+
+Also, some care must be taken about the interactions among strictness
+level and warning categories.  As a general rule, strictness-implied
+warnings are overridden by those specified by explicit options.  For
+example, even if @samp{portability} warnings are disabled by default
+in @option{foreign} strictness, an usage like this will end up enabling
+them:
+
address@hidden
+AUTOMAKE_OPTIONS = -Wportability foreign
address@hidden example
+
+However, a strictness level specified in a higher-priority context
+will override all the explicit warnings specified in a lower-priority
+context.  For example, if @file{configure.ac} contains:
+
address@hidden
+AM_INIT_AUTOMAKE([-Wportability])
address@hidden example
+
address@hidden
+and @file{Makefile.am} contains:
+
address@hidden
+AUTOMAKE_OPTIONS = foreign
address@hidden example
+
address@hidden
+then @samp{portability} warnings will be @emph{disabled} in
address@hidden
+
address@hidden List of Automake options
address@hidden List of Automake options
+
 @vindex AUTOMAKE_OPTIONS
 
 @table @asis
@@ -9298,20 +10012,6 @@ Currently understood options are:
 Set the strictness as appropriate.  The @option{gnits} option also
 implies options @option{readme-alpha} and @option{check-news}.
 
address@hidden @option{ansi2knr}
address@hidden @address@hidden/ansi2knr}
address@hidden Option, @option{ansi2knr}
address@hidden ansi2knr
-Turn on the deprecated de-ANSI-fication feature (@pxref{ANSI}).  Note
-that that feature and this option @emph{will be removed} in the next
-major Automake release.
-
-If preceded by a
-path, the generated @file{Makefile.in} will look in the specified
-directory to find the @file{ansi2knr} program.  The path should be a
-relative path to another directory in the same distribution (Automake
-does not check this).
-
 @item @option{check-news}
 @cindex Option, @option{check-news}
 @opindex check-news
@@ -9321,8 +10021,9 @@ in the first few lines of the @file{NEWS} file.
 @item @option{color-tests}
 @cindex Option, @option{color-tests}
 @opindex color-tests
-Cause output of the simple test suite (@pxref{Simple Tests}) to be
-colorized on capable terminals.
+Cause output of the serial and parallel test harnesses (see @ref{Simple
+Tests}) and of properly-written custom test drivers (@pxref{Custom Test
+Drivers}) to be colorized on capable terminals.
 
 @item @option{dejagnu}
 @cindex Option, @option{dejagnu}
@@ -9341,12 +10042,6 @@ Hook @code{dist-bzip2} to @code{dist}.
 Hook @code{dist-lzip} to @code{dist}.
 @trindex dist-lzip
 
address@hidden @option{dist-lzma}
address@hidden Option, @option{dist-lzma}
address@hidden dist-lzma
-Hook @code{dist-lzma} to @code{dist}.  Obsoleted by @code{dist-xz}.
address@hidden dist-lzma
-
 @item @option{dist-shar}
 @cindex Option, @option{dist-shar}
 @opindex dist-shar
@@ -9450,8 +10145,15 @@ this directory.
 @item @option{parallel-tests}
 @cindex Option, @option{parallel-tests}
 @opindex parallel-tests
-Enable test suite driver for @code{TESTS} that can run tests in parallel
-(@pxref{Simple Tests using parallel-tests}, for more information).
+Enable test suite harness for @code{TESTS} that can run tests in parallel
+(@pxref{Parallel Test Harness}, for more information).
+
address@hidden @option{serial-tests}
address@hidden Option, @option{serial-tests}
address@hidden serial-tests
+Enable the older serial test suite harness for @code{TESTS} (@pxref{Serial
+Test Harness}, for more information).  This is still the default for the
+moment.
 
 @item @option{readme-alpha}
 @cindex Option, @option{readme-alpha}
@@ -9500,7 +10202,7 @@ test.  For instance, @command{false} (from GNU 
coreutils) is never
 successful, even for @option{--help} or @option{--version}.  You can list
 such programs in the variable @code{AM_INSTALLCHECK_STD_OPTIONS_EXEMPT}.
 Programs (not scripts) listed in this variable should be suffixed by
address@hidden(EXEEXT)} for the sake of Win32 or OS/2.  For instance, suppose we
address@hidden(EXEEXT)} for the sake of Windows or OS/2.  For instance, suppose 
we
 build @file{false} as a program but @file{true.sh} as a script, and that
 neither of them support @option{--help} or @option{--version}:
 
@@ -9614,9 +10316,8 @@ the @code{AM_INIT_AUTOMAKE} macro in @file{configure.ac}.
 There are a few rules and variables that didn't fit anywhere else.
 
 @menu
-* Tags::        Interfacing to etags and mkid
-* Suffixes::    Handling new file extensions
-* Multilibs::   Support for multilibs (deprecated, soon to be removed).
+* Tags::                        Interfacing to cscope, etags and mkid
+* Suffixes::                    Handling new file extensions
 @end menu
 
 
@@ -9671,10 +10372,22 @@ is the name of the program to invoke (by default 
@command{ctags});
 @code{CTAGSFLAGS} can be used by the user to pass additional flags,
 and @code{AM_CTAGSFLAGS} can be used by the @file{Makefile.am}.
 
address@hidden id
 Automake will also generate an @code{ID} rule that will run
 @command{mkid} on the source.  This is only supported on a
 directory-by-directory basis.
address@hidden id
+
+Similarly, the @code{cscope} rule will create a list of all the source
+files in the tree and run @command{cscope} to build an inverted index
+database.  The variable @code{CSCOPE} is the name of the program to invoke
+(by default @command{cscope}); @code{CSCOPEFLAGS} and
address@hidden can be used by the user to pass additional flags and
+file names respectively, while @code{AM_CSCOPEFLAGS} can be used by the
address@hidden  Note that, currently, the Automake-provided
address@hidden support, when used in a VPATH build, might not work well
+with non-GNU make implementations (especially with make implementations
+performing @ref{Automatic Rule Rewriting, , VPATH rewrites, autoconf,
+The Autoconf Manual}).
 
 Finally, Automake also emits rules to support the
 @uref{http://www.gnu.org/software/global/, GNU Global Tags program}.
@@ -9722,7 +10435,7 @@ For instance, the following definition prevents Automake 
from misinterpreting
 the @samp{.idlC.cpp:} rule as an attempt to transform @file{.idlC} files into
 @file{.cpp} files.
 
address@hidden Keep in sync with suffix7.test.
address@hidden Keep in sync with suffix7.sh
 @example
 SUFFIXES = .idl C.cpp
 .idlC.cpp:
@@ -9736,22 +10449,6 @@ Automake generate the suffix list for @code{.SUFFIXES}. 
 Any given
 @code{SUFFIXES} go at the start of the generated suffixes list, followed
 by Automake generated suffixes not already in the list.
 
address@hidden Multilibs
address@hidden Support for Multilibs (deprecated, soon to be removed).
-
-Automake used to support an obscure feature called multilibs.  @emph{This
-feature is now deprecated, and will be removed in the next major Automake
-version}.  Still, its implementation will remain available in the
address@hidden/} directory of the Automake distribution, so it should be
-very easy for motivated users to continue to use it in their projects,
-if they really need to.
-
-A @dfn{multilib} is a library that is built for multiple different ABIs
-at a single time; each time the library is built with a different target
-flag combination.  This is only useful when the library is intended to
-be cross-compiled, and it is almost exclusively used for compiler
-support libraries.
-
 @node Include
 @chapter Include
 
@@ -10193,7 +10890,7 @@ make silent rules enabled by default in his own package 
can do so by
 adding a @samp{yes} argument to the @code{AM_SILENT_RULES} call in
 @file{configure.ac}.  We advise against this approach, though.
 
address@hidden Keep in sync with silent-configsite.test
address@hidden Keep in sync with silent-configsite.sh
 Users who prefer to have silent rules enabled by default can edit their
 @file{config.site} file to make the variable @code{enable_silent_rules}
 default to @samp{yes}.  This should still allow disabling silent rules
@@ -10559,7 +11256,7 @@ Checks, autoconf, The Autoconf Manual}) and use 
@samp{$(LN_S)} in
 For instance, here is how you could install a versioned copy of a
 program using @samp{$(LN_S)}:
 
address@hidden Keep in sync with insthook.test
address@hidden Keep in sync with insthook.sh
 @example
 install-exec-hook:
         cd $(DESTDIR)$(bindir) && \
@@ -10575,7 +11272,7 @@ When writing @code{install-exec-hook} or 
@code{install-data-hook},
 please bear in mind that the exec/data distinction is based on the
 installation directory, not on the primary used (@pxref{The Two Parts of
 Install}).
address@hidden Keep in sync with primary-prefix-couples-documented-valid.test.
address@hidden Keep in sync with primary-prefix-couples-documented-valid.sh
 So a @code{foo_SCRIPTS} will be installed by
 @code{install-data}, and a @code{barexec_SCRIPTS} will be installed by
 @code{install-exec}.  You should define your hooks consequently.
@@ -10915,7 +11612,7 @@ lists.
 * maintainer-mode::             missing and AM_MAINTAINER_MODE
 * Wildcards::                   Why doesn't Automake support wildcards?
 * Limitations on File Names::   Limitations on source and installed file names
-* distcleancheck::              Files left in build directory after distclean
+* Errors with distclean::       Files left in build directory after distclean
 * Flag Variables Ordering::     CFLAGS vs.@: AM_CFLAGS vs.@: mumble_CFLAGS
 * Renamed Objects::             Why are object files sometimes renamed?
 * Per-Object Flags::            How to simulate per-object flags?
@@ -11310,13 +12007,14 @@ differ only in case (e.g., @file{makefile} and 
@file{Makefile}).
 Nowadays it is no longer worth worrying about the 8.3 limits of
 DOS file systems.
 
address@hidden distcleancheck
address@hidden Files left in build directory after distclean
address@hidden FIXME This should probably be moved in the "Checking the 
Distribution"
address@hidden FIXME section...
address@hidden Errors with distclean
address@hidden Errors with distclean
 @cindex @code{distclean}, diagnostic
 @cindex @samp{make distclean}, diagnostic
 @cindex dependencies and distributed files
 @trindex distclean
address@hidden distcleancheck
 
 This is a diagnostic you might encounter while running @samp{make
 distcheck}.
@@ -11688,7 +12386,7 @@ user counterpart.
 has neither @code{AM_} nor per-target cousin.
 
 Finally you should not think that the existence of a per-target
-variable implies the existance of an @code{AM_} variable or of a user
+variable implies the existence of an @code{AM_} variable or of a user
 variable.  For instance, the @code{mumble_LDADD} per-target variable
 overrides the makefile-wide @code{LDADD} variable (which is not a user
 variable), and @code{mumble_LIBADD} exists only as a per-target
@@ -12355,1141 +13053,6 @@ Ideally, post a minimal @file{Makefile.am} and 
@file{configure.ac} that
 reproduces the problem you encounter.  If you have encountered test
 suite failures, please attach the @file{tests/test-suite.log} file.
 
-
address@hidden History
address@hidden History of Automake
-
-This chapter presents various aspects of the history of Automake.  The
-exhausted reader can safely skip it; this will be more of interest to
-nostalgic people, or to those curious to learn about the evolution of
-Automake.
-
address@hidden
-* Timeline::                    The Automake story.
-* Dependency Tracking Evolution::  Evolution of Automatic Dependency Tracking
-* Releases::                    Statistics about Automake Releases
address@hidden menu
-
address@hidden Timeline
address@hidden Timeline
-
address@hidden @asis
address@hidden 1994-09-19 First CVS commit.
-
-If we can trust the CVS repository, David address@hidden (djm) started
-working on Automake (or AutoMake, as it was spelt then) this Monday.
-
-The first version of the @command{automake} script looks as follows.
-
address@hidden
-#!/bin/sh
-
-status=0
-
-for makefile
-do
-  if test ! -f address@hidden@}.am; then
-    echo "automake: address@hidden@}.am: No such honkin' file"
-    status=1
-    continue
-  fi
-
-  exec 4> address@hidden@}.in
-
-done
address@hidden example
-
-From this you can already see that Automake will be about reading
address@hidden file and producing @file{*.in} files.  You cannot see
-anything else, but if you also know that David is the one who created
-Autoconf two years before you can guess the rest.
-
-Several commits follow, and by the end of the day Automake is
-reported to work for GNU fileutils and GNU m4.
-
-The modus operandi is the one that is still used today: variable
-assignments in @file{Makefile.am} files trigger injections of
-precanned @file{Makefile} fragments into the generated
address@hidden  The use of @file{Makefile} fragments was inspired
-by the 4.4BSD @command{make} and include files, however Automake aims
-to be portable and to conform to the GNU standards for @file{Makefile}
-variables and targets.
-
-At this point, the most recent release of Autoconf is version 1.11,
-and David is preparing to release Autoconf 2.0 in late October.  As a
-matter of fact, he will barely touch Automake after September.
-
address@hidden 1994-11-05 David MacKenzie's last commit.
-
-At this point Automake is a 200 line portable shell script, plus 332
-lines of @file{Makefile} fragments.  In the @file{README}, David
-states his ambivalence between ``portable shell'' and ``more
-appropriate language'':
-
address@hidden
-I wrote it keeping in mind the possibility of it becoming an Autoconf
-macro, so it would run at configure-time.  That would slow
-configuration down a bit, but allow users to modify the Makefile.am
-without needing to fetch the AutoMake package.  And, the Makefile.in
-files wouldn't need to be distributed.  But all of AutoMake would.  So
-I might reimplement AutoMake in Perl, m4, or some other more
-appropriate language.
address@hidden quotation
-
-Automake is described as ``an experimental Makefile generator''.
-There is no documentation.  Adventurous users are referred to the
-examples and patches needed to use Automake with GNU m4 1.3, fileutils
-3.9, time 1.6, and development versions of find and indent.
-
-These examples seem to have been lost.  However at the time of writing
-(10 years later in September, 2004) the FSF still distributes a
-package that uses this version of Automake: check out GNU termutils
-2.0.
-
address@hidden 1995-11-12 Tom Tromey's first commit.
-
-After one year of inactivity, Tom Tromey takes over the package.
-Tom was working on GNU cpio back then, and doing this just for fun,
-having trouble finding a project to contribute to.  So while hacking
-he wanted to bring the @file{Makefile.in} up to GNU standards.  This
-was hard, and one day he saw Automake on @url{ftp://alpha.gnu.org/},
-grabbed it and tried it out.
-
-Tom didn't talk to djm about it until later, just to make sure he
-didn't mind if he made a release.  He did a bunch of early releases to
-the Gnits folks.
-
-Gnits was (and still is) totally informal, just a few GNU friends who
-Fran@,cois Pinard knew, who were all interested in making a common
-infrastructure for GNU projects, and shared a similar outlook on how
-to do it.  So they were able to make some progress.  It came along
-with Autoconf and extensions thereof, and then Automake from David and
-Tom (who were both gnitsians).  One of their ideas was to write a
-document paralleling the GNU standards, that was more strict in some
-ways and more detailed.  They never finished the GNITS standards, but
-the ideas mostly made their way into Automake.
-
address@hidden 1995-11-23 Automake 0.20
-
-Besides introducing automatic dependency tracking (@pxref{Dependency
-Tracking Evolution}), this version also supplies a 9-page manual.
-
-At this time @command{aclocal} and @code{AM_INIT_AUTOMAKE} did not
-exist, so many things had to be done by hand.  For instance, here is
-what a configure.in (this is the former name of the
address@hidden we use today) must contain in order to use
-Automake 0.20:
-
address@hidden
-PACKAGE=cpio
-VERSION=2.3.911
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
address@hidden example
-
-(Today all of the above is achieved by @code{AC_INIT} and
address@hidden)
-
-Here is how programs are specified in @file{Makefile.am}:
-
address@hidden
-PROGRAMS = hello
-hello_SOURCES = hello.c
address@hidden example
-
-This looks pretty much like what we do today, except the
address@hidden variable has no directory prefix specifying where
address@hidden should be installed: all programs are installed in
address@hidden(bindir)}.  @code{LIBPROGRAMS} can be used to specify programs
-that must be built but not installed (it is called
address@hidden nowadays).
-
-Programs can be built conditionally using @code{AC_SUBST}itutions:
-
address@hidden
-PROGRAMS = @@progs@@
-AM_PROGRAMS = foo bar baz
address@hidden example
-
-(@code{AM_PROGRAMS} has since then been renamed to
address@hidden)
-
-Similarly scripts, static libraries, and data can be built and installed
-using the @code{LIBRARIES}, @code{SCRIPTS}, and @code{DATA} variables.
-However @code{LIBRARIES} were treated a bit specially in that Automake
-did automatically supply the @file{lib} and @file{.a} prefixes.
-Therefore to build @file{libcpio.a}, one had to write
-
address@hidden
-LIBRARIES = cpio
-cpio_SOURCES = ...
address@hidden example
-
-Extra files to distribute must be listed in @code{DIST_OTHER} (the
-ancestor of @code{EXTRA_DIST}).  Also extra directories that are to be
-distributed should appear in @code{DIST_SUBDIRS}, but the manual
-describes this as a temporary ugly hack (today extra directories should
-also be listed in @code{EXTRA_DIST}, and @code{DIST_SUBDIRS} is used
-for another purpose, @pxref{Conditional Subdirectories}).
-
address@hidden 1995-11-26 Automake 0.21
-
-In less time than it takes to cook a frozen pizza, Tom rewrites
-Automake using Perl.  At this time Perl 5 is only one year old, and
-Perl 4.036 is in use at many sites.  Supporting several Perl versions
-has been a source of problems through the whole history of Automake.
-
-If you never used Perl 4, imagine Perl 5 without objects, without
address@hidden variables (only dynamically scoped @samp{local} variables),
-without function prototypes, with function calls that needs to be
-prefixed with @samp{&}, etc.  Traces of this old style can still be
-found in today's @command{automake}.
-
address@hidden 1995-11-28 Automake 0.22
address@hidden 1995-11-29 Automake 0.23
-
-Bug fixes.
-
address@hidden 1995-12-08 Automake 0.24
address@hidden 1995-12-10 Automake 0.25
-
-Releases are raining.  0.24 introduces the uniform naming scheme we
-use today, i.e., @code{bin_PROGRAMS} instead of @code{PROGRAMS},
address@hidden instead of @code{LIBLIBRARIES}, etc.  (However
address@hidden does not exist yet, @code{AM_PROGRAMS} is still
-in use; and @code{TEXINFOS} and @code{MANS} still have no directory
-prefixes.)  Adding support for prefixes like that was one of the major
-ideas in @command{automake}; it has lasted pretty well.
-
-AutoMake is renamed to Automake (Tom seems to recall it was Fran@,cois
-Pinard's doing).
-
-0.25 fixes a Perl 4 portability bug.
-
address@hidden 1995-12-18 Jim Meyering starts using Automake in GNU Textutils.
address@hidden 1995-12-31 Fran@,cois Pinard starts using Automake in GNU tar.
-
address@hidden 1996-01-03 Automake 0.26
address@hidden 1996-01-03 Automake 0.27
-
-Of the many changes and suggestions sent by Fran@,cois Pinard and
-included in 0.26, perhaps the most important is the advice that to
-ease customization a user rule or variable definition should always
-override an Automake rule or definition.
-
-Gordon Matzigkeit and Jim Meyering are two other early contributors
-that have been sending fixes.
-
-0.27 fixes yet another Perl 4 portability bug.
-
address@hidden 1996-01-13 Automake 0.28
-
-Automake starts scanning @file{configure.in} for @code{LIBOBJS}
-support.  This is an important step because until this version
-Automake only knew about the @file{Makefile.am}s it processed.
address@hidden was Autoconf's world and the link between Autoconf
-and Automake had to be done by the @file{Makefile.am} author.  For
-instance, if @file{config.h} was generated by @file{configure}, it was the
-package maintainer's responsibility to define the @code{CONFIG_HEADER}
-variable in each @file{Makefile.am}.
-
-Succeeding releases will rely more and more on scanning
address@hidden to better automate the Autoconf integration.
-
-0.28 also introduces the @code{AUTOMAKE_OPTIONS} variable and the
address@hidden and @option{--gnits} options, the latter being stricter.
-
address@hidden 1996-02-07 Automake 0.29
-
-Thanks to @file{configure.in} scanning, @code{CONFIG_HEADER} is gone,
-and rebuild rules for @file{configure}-generated file are
-automatically output.
-
address@hidden and @code{MANS} converted to the uniform naming
-scheme.
-
address@hidden 1996-02-24 Automake 0.30
-
-The test suite is born.  It contains 9 tests.  From now on test cases
-will be added pretty regularly (@pxref{Releases}), and this proved to
-be really helpful later on.
-
address@hidden finally replaces @code{AM_PROGRAMS}.
-
-All the third-party Autoconf macros, written mostly by Fran@,cois
-Pinard (and later Jim Meyering), are distributed in Automake's
-hand-written @file{aclocal.m4} file.  Package maintainers are expected
-to extract the necessary macros from this file.  (In previous versions
-you had to copy and paste them from the manual...)
-
address@hidden 1996-03-11 Automake 0.31
-
-The test suite in 0.30 was run via a long @code{check-local} rule.  Upon
-Ulrich Drepper's suggestion, 0.31 makes it an Automake rule output
-whenever the @code{TESTS} variable is defined.
-
address@hidden is renamed to @code{EXTRA_DIST}, and the @code{check_}
-prefix is introduced.  The syntax is now the same as today.
-
address@hidden 1996-03-15 Gordon Matzigkeit starts writing libtool.
-
address@hidden 1996-04-27 Automake 0.32
-
address@hidden targets are introduced; an idea from Dieter Baron.
-
address@hidden files, which were output in the build directory are
-now built in the source directory, because they are distributed.  It
-seems these files like to move back and forth as that will happen
-again in future versions.
-
address@hidden 1996-05-18 Automake 0.33
-
-Gord Matzigkeit's main two contributions:
-
address@hidden
address@hidden very preliminary libtool support
address@hidden the distcheck rule
address@hidden itemize
-
-Although they were very basic at this point, these are probably
-among the top features for Automake today.
-
-Jim Meyering also provides the infamous @code{jm_MAINTAINER_MODE},
-since then renamed to @code{AM_MAINTAINER_MODE} and abandoned by its
-author (@pxref{maintainer-mode}).
-
address@hidden 1996-05-28 Automake 1.0
-
-After only six months of heavy development, the @command{automake} script is
-3134 lines long, plus 973 lines of @file{Makefile} fragments.  The
-package has 30 pages of documentation, and 38 test cases.
address@hidden contains 4 macros.
-
-From now on and until version 1.4, new releases will occur at a rate
-of about one a year.  1.1 did not exist, actually 1.1b to 1.1p have
-been the name of beta releases for 1.2.  This is the first time
-Automake uses suffix letters to designate beta releases, a habit that
-lasts.
-
address@hidden 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian 
GNU/Linux.
-
address@hidden 1996-11-26 David address@hidden releases Autoconf 2.12.
-
-Between June and October, the Autoconf development is almost stalled.
-Roland McGrath has been working at the beginning of the year.  David
-comes back in November to release 2.12, but he won't touch Autoconf
-anymore after this year, and Autoconf then really stagnates.  The
-desolate Autoconf @file{ChangeLog} for 1997 lists only 7 commits.
-
address@hidden 1997-02-28 @email{automake@@gnu.ai.mit.edu} list alive
-
-The mailing list is announced as follows:
address@hidden
-I've created the "automake" mailing list.  It is
-"automake@@gnu.ai.mit.edu".  Administrivia, as always, to
-automake-request@@gnu.ai.mit.edu.
-
-The charter of this list is discussion of automake, autoconf, and
-other configuration/portability tools (e.g., libtool).  It is expected
-that discussion will range from pleas for help all the way up to
-patches.
-
-This list is archived on the FSF machines.  Offhand I don't know if
-you can get the archive without an account there.
-
-This list is open to anybody who wants to join.  Tell all your
-friends!
--- Tom Tromey
address@hidden smallexample
-
-Before that people were discussing Automake privately, on the Gnits
-mailing list (which is not public either), and less frequently on
address@hidden
-
address@hidden is now @code{gnu.org}, in case you never
-noticed.  The archives of the early years of the
address@hidden@@gnu.org} list have been lost, so today it is almost
-impossible to find traces of discussions that occurred before 1999.
-This has been annoying more than once, as such discussions can be
-useful to understand the rationale behind a piece of uncommented code
-that was introduced back then.
-
address@hidden 1997-06-22 Automake 1.2
-
-Automake developments continues, and more and more new Autoconf macros
-are required.  Distributing them in @file{aclocal.m4} and requiring
-people to browse this file to extract the relevant macros becomes
-uncomfortable.  Ideally, some of them should be contributed to
-Autoconf so that they can be used directly, however Autoconf is
-currently inactive.  Automake 1.2 consequently introduces
address@hidden (@command{aclocal} was actually started on
-1996-07-28), a tool that automatically constructs an @file{aclocal.m4}
-file from a repository of third-party macros.  Because Autoconf has
-stalled, Automake also becomes a kind of repository for such
-third-party macros, even macros completely unrelated to Automake (for
-instance macros that fix broken Autoconf macros).
-
-The 1.2 release contains 20 macros, including the
address@hidden macro that simplifies the creation of
address@hidden
-
-Libtool is fully supported using @code{*_LTLIBRARIES}.
-
-The missing script is introduced by Fran@,cois Pinard; it is meant to be
-a better solution than @code{AM_MAINTAINER_MODE}
-(@pxref{maintainer-mode}).
-
-Conditionals support was implemented by Ian Lance Taylor.  At the
-time, Tom and Ian were working on an internal project at Cygnus.  They
-were using ILU, which is pretty similar to address@hidden  They wanted to
-integrate ILU into their build, which was all @file{configure}-based,
-and Ian thought that adding conditionals to @command{automake} was
-simpler than doing all the work in @file{configure} (which was the
-standard at the time).  So this was actually funded by Cygnus.
-
-This very useful but tricky feature will take a lot of time to
-stabilize.  (At the time this text is written, there are still
-primaries that have not been updated to support conditional
-definitions in Automake 1.9.)
-
-The @command{automake} script has almost doubled: 6089 lines of Perl,
-plus 1294 lines of @file{Makefile} fragments.
-
address@hidden 1997-07-08 Gordon Matzigkeit releases Libtool 1.0.
-
address@hidden 1998-04-05 Automake 1.3
-
-This is a small advance compared to 1.2.
-It adds support for assembly, and preliminary support for Java.
-
-Perl 5.004_04 is out, but fixes to support Perl 4 are still
-regularly submitted whenever Automake breaks it.
-
address@hidden 1998-09-06 @code{sourceware.cygnus.com} is on-line.
-
-Sourceware was setup by Jason Molenda to host open source projects.
-
address@hidden 1998-09-19  Automake CVS repository moved to 
@code{sourceware.cygnus.com}
address@hidden 1998-10-26  @code{sourceware.cygnus.com} announces it hosts 
Automake:
-Automake is now hosted on @code{sourceware.cygnus.com}.  It has a
-publicly accessible CVS repository.  This CVS repository is a copy of
-the one Tom was using on his machine, which in turn is based on
-a copy of the CVS repository of David MacKenzie.  This is why we still
-have to full source history.  (Automake was on Sourceware until 2007-10-29,
-when it moved to a git repository on @code{savannah.gnu.org},
-but the Sourceware host had been renamed to @code{sources.redhat.com}.)
-
-The oldest file in the administrative directory of the CVS repository
-that was created on Sourceware is dated 1998-09-19, while the
-announcement that @command{automake} and @command{autoconf} had joined
address@hidden was made on 1998-10-26.  They were among the
-first projects to be hosted there.
-
-The heedful reader will have noticed Automake was exactly 4 years old
-on 1998-09-19.
-
address@hidden 1999-01-05 Ben Elliston releases Autoconf 2.13.
-
address@hidden 1999-01-14 Automake 1.4
-
-This release adds support for Fortran 77 and for the @code{include}
-statement.  Also, @samp{+=} assignments are introduced, but it is
-still quite easy to fool Automake when mixing this with conditionals.
-
-These two releases, Automake 1.4 and Autoconf 2.13 make a duo that
-will be used together for years.
-
address@hidden is 7228 lines, plus 1591 lines of Makefile
-fragment, 20 macros (some 1.3 macros were finally contributed back to
-Autoconf), 197 test cases, and 51 pages of documentation.
-
address@hidden 1999-03-27 The @code{user-dep-branch} is created on the CVS 
repository.
-
-This implements a new dependency tracking schemed that should be
-able to handle automatic dependency tracking using any compiler (not
-just gcc) and any make (not just GNU @command{make}).  In addition,
-the new scheme should be more reliable than the old one, as
-dependencies are generated on the end user's machine.  Alexandre Oliva
-creates depcomp for this purpose.
-
address@hidden Tracking Evolution}, for more details about the
-evolution of automatic dependency tracking in Automake.
-
address@hidden 1999-11-21 The @code{user-dep-branch} is merged into the main 
trunk.
-
-This was a huge problem since we also had patches going in on the
-trunk.  The merge took a long time and was very painful.
-
address@hidden 2000-05-10
-
-Since September 1999 and until 2003, Akim Demaille will be zealously
-revamping Autoconf.
-
address@hidden
-I think the next release should be called "3.0"address@hidden
-Let's face it: you've basically rewritten address@hidden
-Every weekend there are 30 new address@hidden
-I don't see how we could call this "2.15" with a straight address@hidden
--- Tom Tromey on @email{autoconf@@gnu.org}
address@hidden quotation
-
-Actually Akim works like a submarine: he will pile up patches while he
-works off-line during the weekend, and flush them in batch when he
-resurfaces on Monday.
-
address@hidden 2001-01-24
-
-On this Wednesday, Autoconf 2.49c, the last beta before Autoconf 2.50
-is out, and Akim has to find something to do during his week-end :)
-
address@hidden 2001-01-28
-
-Akim sends a batch of 14 patches to @email{automake@@gnu.org}.
-
address@hidden
-Aiieeee!  I was dreading the day that the Demaillator turned his
-sights on address@hidden and now it has arrived! -- Tom Tromey
address@hidden quotation
-
-It's only the beginning: in two months he will send 192 patches.  Then
-he would slow down so Tom can catch up and review all this.  Initially
-Tom actually read all these patches, then he probably trustingly
-answered OK to most of them, and finally gave up and let Akim apply
-whatever he wanted.  There was no way to keep up with that patch rate.
-
address@hidden
-Anyway the patch below won't apply since it predates Akim's
-sourcequake; I have yet to figure where the relevant passage has
-been moved :) -- Alexandre Duret-Lutz
address@hidden quotation
-
-All these patches were sent to and discussed on
address@hidden@@gnu.org}, so subscribed users were literally drowning in
-technical mails.  Eventually, the @email{automake-patches@@gnu.org}
-mailing list was created in May.
-
-Year after year, Automake had drifted away from its initial design:
-construct @file{Makefile.in} by assembling various @file{Makefile}
-fragments.  In 1.4, lots of @file{Makefile} rules are being emitted at
-various places in the @command{automake} script itself; this does not
-help ensuring a consistent treatment of these rules (for instance
-making sure that user-defined rules override Automake's own rules).
-One of Akim's goal was moving all these hard-coded rules to separate
address@hidden fragments, so the logic could be centralized in a
address@hidden fragment processor.
-
-Another significant contribution of Akim is the interface with the
-``trace'' feature of Autoconf.  The way to scan @file{configure.in} at
-this time was to read the file and grep the various macro of interest
-to Automake.  Doing so could break in many unexpected ways; @command{automake}
-could miss some definition (for instance @samp{AC_SUBST([$1], [$2])}
-where the arguments are known only when M4 is run), or conversely it
-could detect some macro that was not expanded (because it is called
-conditionally).  In the CVS version of Autoconf, Akim had implemented
-the @option{--trace} option, which provides accurate information about
-where macros are actually called and with what arguments.  Akim will
-equip Automake with a second @file{configure.in} scanner that uses
-this @option{--trace} interface.  Since it was not sensible to drop the
-Autoconf 2.13 compatibility yet, this experimental scanner was only
-used when an environment variable was set, the traditional
-grep-scanner being still the default.
-
address@hidden 2001-04-25 Gary address@hidden releases Libtool 1.4
-
-It has been more than two years since Automake 1.4, CVS Automake has
-suffered lot's of heavy changes and still is not ready for release.
-Libtool 1.4 had to be distributed with a patch against Automake 1.4.
-
address@hidden 2001-05-08 Automake 1.4-p1
address@hidden 2001-05-24 Automake 1.4-p2
-
-Gary address@hidden, the principal Libtool maintainer, makes a ``patch
-release'' of Automake:
-
address@hidden
-The main purpose of this release is to have a stable automake
-which is compatible with the latest stable libtool.
address@hidden quotation
-
-The release also contains obvious fixes for bugs in Automake 1.4,
-some of which were reported almost monthly.
-
address@hidden 2001-05-21 Akim Demaille releases Autoconf 2.50
-
address@hidden 2001-06-07 Automake 1.4-p3
address@hidden 2001-06-10 Automake 1.4-p4
address@hidden 2001-07-15 Automake 1.4-p5
-
-Gary continues his patch-release series.  These also add support for
-some new Autoconf 2.50 idioms.  Essentially, Autoconf now advocates
address@hidden over @file{configure.in}, and it introduces a new
-syntax for @code{AC_OUTPUT}ing files.
-
address@hidden 2001-08-23 Automake 1.5
-
-A major and long-awaited release, that comes more than two years after
-1.4.  It brings many changes, among which:
address@hidden
address@hidden The new dependency tracking scheme that uses @command{depcomp}.
-Aside from the improvement on the dependency tracking itself
-(@pxref{Dependency Tracking Evolution}), this also streamlines the use
-of @command{automake}-generated @file{Makefile.in}s as the @file{Makefile.in}s
-used during development are now the same as those used in
-distributions.  Before that the @file{Makefile.in}s generated for
-maintainers required GNU @command{make} and GCC, they were different
-from the portable @file{Makefile} generated for distribution; this was
-causing some confusion.
-
address@hidden Support for per-target compilation flags.
-
address@hidden Support for reference to files in subdirectories in most
address@hidden variables.
-
address@hidden Introduction of the @code{dist_}, @code{nodist_}, and 
@code{nobase_}
-prefixes.
address@hidden Perl 4 support is finally dropped.
address@hidden itemize
-
-1.5 did break several packages that worked with 1.4.  Enough so that
-Linux distributions could not easily install the new Automake version
-without breaking many of the packages for which they had to run
address@hidden
-
-Some of these breakages were effectively bugs that would eventually be
-fixed in the next release.  However, a lot of damage was caused by
-some changes made deliberately to render Automake stricter on some
-setup we did consider bogus.  For instance, @samp{make distcheck} was
-improved to check that @samp{make uninstall} did remove all the files
address@hidden install} installed, that @samp{make distclean} did not omit
-some file, and that a VPATH build would work even if the source
-directory was read-only.  Similarly, Automake now rejects multiple
-definitions of the same variable (because that would mix very badly
-with conditionals), and @samp{+=} assignments with no previous
-definition.  Because these changes all occurred suddenly after 1.4 had
-been established for more than two years, it hurt users.
-
-To make matter worse, meanwhile Autoconf (now at version 2.52) was
-facing similar troubles, for similar reasons.
-
address@hidden 2002-03-05 Automake 1.6
-
-This release introduced versioned installation (@pxref{API
-Versioning}).  This was mainly pushed by Havoc Pennington, taking the
-GNOME source tree as motive: due to incompatibilities between the
-autotools it's impossible for the GNOME packages to switch to Autoconf
-2.53 and Automake 1.5 all at once, so they are currently stuck with
-Autoconf 2.13 and Automake 1.4.
-
-The idea was to call this version @file{automake-1.6}, call all its
-bug-fix versions identically, and switch to @file{automake-1.7} for
-the next release that adds new features or changes some rules.  This
-scheme implies maintaining a bug-fix branch in addition to the
-development trunk, which means more work from the maintainer, but
-providing regular bug-fix releases proved to be really worthwhile.
-
-Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
-not.  Perhaps the more annoying was the dependence on the newly
-released Autoconf 2.53.  Autoconf seemed to have stabilized enough
-since its explosive 2.50 release and included changes required to fix
-some bugs in Automake.  In order to upgrade to Automake 1.6, people
-now had to upgrade Autoconf too; for some packages it was no picnic.
-
-While versioned installation helped people to upgrade, it also
-unfortunately allowed people not to upgrade.  At the time of writing,
-some Linux distributions are shipping packages for Automake 1.4, 1.5,
-1.6, 1.7, 1.8, and 1.9.  Most of these still install 1.4 by default.
-Some distribution also call 1.4 the ``stable'' version, and present
-``1.9'' as the development version; this does not really makes sense
-since 1.9 is way more solid than 1.4.  All this does not help the
-newcomer.
-
address@hidden 2002-04-11 Automake 1.6.1
-
-1.6, and the upcoming 1.4-p6 release were the last release by Tom.
-This one and those following will be handled by Alexandre
-Duret-Lutz.  Tom is still around, and will be there until about 1.7,
-but his interest into Automake is drifting away towards projects like
address@hidden
-
-Alexandre has been using Automake since 2000, and started to
-contribute mostly on Akim's incitement (Akim and Alexandre have been
-working in the same room from 1999 to 2002).  In 2001 and 2002 he had
-a lot of free time to enjoy hacking Automake.
-
address@hidden 2002-06-14 Automake 1.6.2
-
address@hidden 2002-07-28 Automake 1.6.3
address@hidden 2002-07-28 Automake 1.4-p6
-
-Two releases on the same day.  1.6.3 is a bug-fix release.
-
-Tom Tromey backported the versioned installation mechanism on the 1.4
-branch, so that Automake 1.6.x and Automake 1.4-p6 could be installed
-side by side.  Another request from the GNOME folks.
-
address@hidden 2002-09-25 Automake 1.7
-
-This release switches to the new @file{configure.ac} scanner Akim
-was experimenting in 1.5.
-
address@hidden 2002-10-16 Automake 1.7.1
address@hidden 2002-12-06 Automake 1.7.2
address@hidden 2003-02-20 Automake 1.7.3
address@hidden 2003-04-23 Automake 1.7.4
address@hidden 2003-05-18 Automake 1.7.5
address@hidden 2003-07-10 Automake 1.7.6
address@hidden 2003-09-07 Automake 1.7.7
address@hidden 2003-10-07 Automake 1.7.8
-
-Many bug-fix releases.  1.7 lasted because the development version
-(upcoming 1.8) was suffering some major internal revamping.
-
address@hidden 2003-10-26 Automake on screen
-
-Episode 49, `Repercussions', in the third season of the `Alias' TV
-show is first aired.
-
-Marshall, one of the characters, is working on a computer virus that he
-has to modify before it gets into the wrong hands or something like
-that.  The screenshots you see do not show any program code, they show
-a @file{Makefile.in} @code{generated by automake}...
-
address@hidden 2003-11-09 Automake 1.7.9
-
address@hidden 2003-12-10 Automake 1.8
-
-The most striking update is probably that of @command{aclocal}.
-
address@hidden now uses @code{m4_include} in the produced
address@hidden when the included macros are already distributed
-with the package (an idiom used in many packages), which reduces code
-duplication.  Many people liked that, but in fact this change was
-really introduced to fix a bug in rebuild rules: @file{Makefile.in}
-must be rebuilt whenever a dependency of @file{configure} changes, but
-all the @file{m4} files included in @file{aclocal.m4} where unknown
-from @command{automake}.  Now @command{automake} can just trace the
address@hidden to discover the dependencies.
-
address@hidden also starts using the @option{--trace} Autoconf option
-in order to discover used macros more accurately.  This will turn out
-to be very tricky (later releases will improve this) as people had
-devised many ways to cope with the limitation of previous
address@hidden versions, notably using handwritten
address@hidden: @command{aclocal} must make sure not to redefine a
-rule that is already included by such statement.
-
-Automake also has seen its guts rewritten.  Although this rewriting
-took a lot of efforts, it is only apparent to the users in that some
-constructions previously disallowed by the implementation now work
-nicely.  Conditionals, Locations, Variable and Rule definitions,
-Options: these items on which Automake works have been rewritten as
-separate Perl modules, and documented.
-
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-12 Automake 1.8.2
address@hidden 2004-03-07 Automake 1.8.3
address@hidden 2004-04-25 Automake 1.8.4
address@hidden 2004-05-16 Automake 1.8.5
-
address@hidden 2004-07-28 Automake 1.9
-
-This release tries to simplify the compilation rules it outputs to
-reduce the size of the Makefile.  The complaint initially come from
-the libgcj developers.  Their @file{Makefile.in} generated with
-Automake 1.4 and custom build rules (1.4 did not support compiled
-Java) is address@hidden  The one generated by 1.8 was over address@hidden  1.9 
gets it
-down to address@hidden
-
-Aside from this it contains mainly minor changes and bug-fixes.
-
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-09-19 Automake 1.9.2
-
-Automake has ten years.  This chapter of the manual was initially
-written for this occasion.
-
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org} 
and uses
-git as primary repository.
-
address@hidden table
-
address@hidden Dependency Tracking Evolution
address@hidden Dependency Tracking in Automake
-
-Over the years Automake has deployed three different dependency
-tracking methods.  Each method, including the current one, has had
-flaws of various sorts.  Here we lay out the different dependency
-tracking methods, their flaws, and their fixes.  We conclude with
-recommendations for tool writers, and by indicating future directions
-for dependency tracking work in Automake.
-
address@hidden
-* First Take on Dependencies::  Precomputed dependency tracking
-* Dependencies As Side Effects::  Update at developer compile time
-* Dependencies for the User::   Update at user compile time
-* Techniques for Dependencies::  Alternative approaches
-* Recommendations for Tool Writers::  What tool writers can do to help
-* Future Directions for Dependencies::  Languages Automake does not know
address@hidden menu
-
address@hidden First Take on Dependencies
address@hidden First Take on Dependency Tracking
address@hidden Description
-
-Our first attempt at automatic dependency tracking was based on the
-method recommended by GNU @command{make}.  (@pxref{Automatic
-Prerequisites, , Generating Prerequisites Automatically, make, The GNU
-make Manual})
-
-This version worked by precomputing dependencies ahead of time.  For
-each source file, it had a special @file{.P} file that held the
-dependencies.  There was a rule to generate a @file{.P} file by
-invoking the compiler appropriately.  All such @file{.P} files were
-included by the @file{Makefile}, thus implicitly becoming dependencies
-of @file{Makefile}.
-
address@hidden Bugs
-
-This approach had several critical bugs.
-
address@hidden
address@hidden
-The code to generate the @file{.P} file relied on @command{gcc}.
-(A limitation, not technically a bug.)
address@hidden
-The dependency tracking mechanism itself relied on GNU @command{make}.
-(A limitation, not technically a bug.)
address@hidden
-Because each @file{.P} file was a dependency of @file{Makefile}, this
-meant that dependency tracking was done eagerly by @command{make}.
-For instance, @samp{make clean} would cause all the dependency files
-to be updated, and then immediately removed.  This eagerness also
-caused problems with some configurations; if a certain source file
-could not be compiled on a given architecture for some reason,
-dependency tracking would fail, aborting the entire build.
address@hidden
-As dependency tracking was done as a pre-pass, compile times were
-doubled--the compiler had to be run twice per source file.
address@hidden
address@hidden dist} re-ran @command{automake} to generate a
address@hidden that did not have automatic dependency tracking (and
-that was thus portable to any version of @command{make}).  In order to
-do this portably, Automake had to scan the dependency files and remove
-any reference that was to a source file not in the distribution.
-This process was error-prone.  Also, if @samp{make dist} was run in an
-environment where some object file had a dependency on a source file
-that was only conditionally created, Automake would generate a
address@hidden that referred to a file that might not appear in the
-end user's build.  A special, hacky mechanism was required to work
-around this.
address@hidden itemize
-
address@hidden Historical Note
-
-The code generated by Automake is often inspired by the
address@hidden style of a particular author.  In the case of the first
-implementation of dependency tracking, I believe the impetus and
-inspiration was Jim Meyering.  (I could be mistaken.  If you know
-otherwise feel free to correct me.)
-
address@hidden Dependencies As Side Effects
address@hidden Dependencies As Side Effects
address@hidden Description
-
-The next refinement of Automake's automatic dependency tracking scheme
-was to implement dependencies as side effects of the compilation.
-This was aimed at solving the most commonly reported problems with the
-first approach.  In particular we were most concerned with eliminating
-the weird rebuilding effect associated with make clean.
-
-In this approach, the @file{.P} files were included using the
address@hidden command, which let us create these files lazily.  This
-avoided the @samp{make clean} problem.
-
-We only computed dependencies when a file was actually compiled.  This
-avoided the performance penalty associated with scanning each file
-twice.  It also let us avoid the other problems associated with the
-first, eager, implementation.  For instance, dependencies would never
-be generated for a source file that was not compilable on a given
-architecture (because it in fact would never be compiled).
-
address@hidden Bugs
-
address@hidden
address@hidden
-This approach also relied on the existence of @command{gcc} and GNU
address@hidden  (A limitation, not technically a bug.)
address@hidden
-Dependency tracking was still done by the developer, so the problems
-from the first implementation relating to massaging of dependencies by
address@hidden dist} were still in effect.
address@hidden
-This implementation suffered from the ``deleted header file'' problem.
-Suppose a lazily-created @file{.P} file includes a dependency on a
-given header file, like this:
-
address@hidden
-maude.o: maude.c something.h
address@hidden example
-
-Now suppose that you remove @file{something.h} and update @file{maude.c}
-so that this include is no longer needed.  If you run @command{make},
-you will get an error because there is no way to create
address@hidden
-
-We fixed this problem in a later release by further massaging the
-output of @command{gcc} to include a dummy dependency for each header
-file.
address@hidden itemize
-
address@hidden Dependencies for the User
address@hidden Dependencies for the User
address@hidden Description
-
-The bugs associated with @samp{make dist}, over time, became a real
-problem.  Packages using Automake were being built on a large number
-of platforms, and were becoming increasingly complex.  Broken
-dependencies were distributed in ``portable'' @file{Makefile.in}s,
-leading to user complaints.  Also, the requirement for @command{gcc}
-and GNU @command{make} was a constant source of bug reports.  The next
-implementation of dependency tracking aimed to remove these problems.
-
-We realized that the only truly reliable way to automatically track
-dependencies was to do it when the package itself was built.  This
-meant discovering a method portable to any version of make and any
-compiler.  Also, we wanted to preserve what we saw as the best point
-of the second implementation: dependency computation as a side effect
-of compilation.
-
-In the end we found that most modern make implementations support some
-form of include directive.  Also, we wrote a wrapper script that let
-us abstract away differences between dependency tracking methods for
-compilers.  For instance, some compilers cannot generate dependencies
-as a side effect of compilation.  In this case we simply have the
-script run the compiler twice.  Currently our wrapper script
-(@command{depcomp}) knows about twelve different compilers (including
-a "compiler" that simply invokes @command{makedepend} and then the
-real compiler, which is assumed to be a standard Unix-like C compiler
-with no way to do dependency tracking).
-
address@hidden Bugs
-
address@hidden
address@hidden
-Running a wrapper script for each compilation slows down the build.
address@hidden
-Many users don't really care about precise dependencies.
address@hidden
-This implementation, like every other automatic dependency tracking
-scheme in common use today (indeed, every one we've ever heard of),
-suffers from the ``duplicated new header'' bug.
-
-This bug occurs because dependency tracking tools, such as the
-compiler, only generate dependencies on the successful opening of a
-file, and not on every probe.
-
-Suppose for instance that the compiler searches three directories for
-a given header, and that the header is found in the third directory.
-If the programmer erroneously adds a header file with the same name to
-the first directory, then a clean rebuild from scratch could fail
-(suppose the new header file is buggy), whereas an incremental rebuild
-will succeed.
-
-What has happened here is that people have a misunderstanding of what
-a dependency is.  Tool writers think a dependency encodes information
-about which files were read by the compiler.  However, a dependency
-must actually encode information about what the compiler tried to do.
-
-This problem is not serious in practice.  Programmers typically do not
-use the same name for a header file twice in a given project.  (At
-least, not in C or C++.  This problem may be more troublesome in
-Java.)  This problem is easy to fix, by modifying dependency
-generators to record every probe, instead of every successful open.
-
address@hidden
-Since Automake generates dependencies as a side effect of compilation,
-there is a bootstrapping problem when header files are generated by
-running a program.  The problem is that, the first time the build is
-done, there is no way by default to know that the headers are
-required, so make might try to run a compilation for which the headers
-have not yet been built.
-
-This was also a problem in the previous dependency tracking implementation.
-
-The current fix is to use @code{BUILT_SOURCES} to list built headers
-(@pxref{Sources}).  This causes them to be built before any other
-build rules are run.  This is unsatisfactory as a general solution,
-however in practice it seems sufficient for most actual programs.
address@hidden itemize
-
-This code is used since Automake 1.5.
-
-In GCC 3.0, we managed to convince the maintainers to add special
-command-line options to help Automake more efficiently do its job.  We
-hoped this would let us avoid the use of a wrapper script when
-Automake's automatic dependency tracking was used with @command{gcc}.
-
-Unfortunately, this code doesn't quite do what we want.  In
-particular, it removes the dependency file if the compilation fails;
-we'd prefer that it instead only touch the file in any way if the
-compilation succeeds.
-
-Nevertheless, since Automake 1.7, when a recent @command{gcc} is
-detected at @command{configure} time, we inline the
-dependency-generation code and do not use the @command{depcomp}
-wrapper script.  This makes compilations faster for those using this
-compiler (probably our primary user base).  The counterpart is that
-because we have to encode two compilation rules in @file{Makefile}
-(with or without @command{depcomp}), the produced @file{Makefile}s are
-larger.
-
address@hidden Techniques for Dependencies
address@hidden Techniques for Computing Dependencies
-
-There are actually several ways for a build tool like Automake to
-cause tools to generate dependencies.
-
address@hidden @asis
address@hidden @command{makedepend}
-This was a commonly-used method in the past.  The idea is to run a
-special program over the source and have it generate dependency
-information.  Traditional implementations of @command{makedepend} are
-not completely precise; ordinarily they were conservative and
-discovered too many dependencies.
address@hidden The tool
-An obvious way to generate dependencies is to simply write the tool so
-that it can generate the information needed by the build tool.  This is
-also the most portable method.  Many compilers have an option to
-generate dependencies.  Unfortunately, not all tools provide such an
-option.
address@hidden The file system
-It is possible to write a special file system that tracks opens,
-reads, writes, etc, and then feed this information back to the build
-tool.  @command{clearmake} does this.  This is a very powerful
-technique, as it doesn't require cooperation from the
-tool.  Unfortunately it is also very difficult to implement and also
-not practical in the general case.
address@hidden @code{LD_PRELOAD}
-Rather than use the file system, one could write a special library to
-intercept @code{open} and other syscalls.  This technique is also quite
-powerful, but unfortunately it is not portable enough for use in
address@hidden
address@hidden table
-
address@hidden Recommendations for Tool Writers
address@hidden Recommendations for Tool Writers
-
-We think that every compilation tool ought to be able to generate
-dependencies as a side effect of compilation.  Furthermore, at least
-while @command{make}-based tools are nearly universally in use (at
-least in the free software community), the tool itself should generate
-dummy dependencies for header files, to avoid the deleted header file
-bug.  Finally, the tool should generate a dependency for each probe,
-instead of each successful file open, in order to avoid the duplicated
-new header bug.
-
address@hidden Future Directions for Dependencies
address@hidden Future Directions for Dependencies
-
-Currently, only languages and compilers understood by Automake can
-have dependency tracking enabled.  We would like to see if it is
-practical (and worthwhile) to let this support be extended by the user
-to languages unknown to Automake.
-
address@hidden Releases
address@hidden Release Statistics
-
-The following table (inspired by @samp{perlhist(1)}) quantifies the
-evolution of Automake using these metrics:
-
address@hidden @asis
address@hidden Date, Rel
-The date and version of the release.
address@hidden am
-The number of lines of the @command{automake} script.
address@hidden acl
-The number of lines of the @command{aclocal} script.
address@hidden pm
-The number of lines of the @command{Perl} supporting modules.
address@hidden @file{*.am}
-The number of lines of the @file{Makefile} fragments.  The number in
-parentheses is the number of files.
address@hidden m4
-The number of lines (and files) of Autoconf macros.
address@hidden doc
-The number of pages of the documentation (the Postscript version).
address@hidden t
-The number of test cases in the test suite.  Of those, the number in
-parentheses is the number of generated test cases.
address@hidden table
-
address@hidden {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888 
(88)} {888} {888 (88)}
address@hidden Date   @tab Rel    @tab   am @tab acl @tab   pm @tab @file{*.am} 
@tab m4 @tab doc @tab t
address@hidden 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 
(24) @tab           @tab     @tab
address@hidden 1994-11-05 @tab CVS    @tab  208 @tab     @tab      @tab  332 
(28) @tab           @tab     @tab
address@hidden 1995-11-23 @tab 0.20   @tab  533 @tab     @tab      @tab  458 
(35) @tab           @tab   9 @tab
address@hidden 1995-11-26 @tab 0.21   @tab  613 @tab     @tab      @tab  480 
(36) @tab           @tab  11 @tab
address@hidden 1995-11-28 @tab 0.22   @tab 1116 @tab     @tab      @tab  539 
(38) @tab           @tab  12 @tab
address@hidden 1995-11-29 @tab 0.23   @tab 1240 @tab     @tab      @tab  541 
(38) @tab           @tab  12 @tab
address@hidden 1995-12-08 @tab 0.24   @tab 1462 @tab     @tab      @tab  504 
(33) @tab           @tab  14 @tab
address@hidden 1995-12-10 @tab 0.25   @tab 1513 @tab     @tab      @tab  511 
(37) @tab           @tab  15 @tab
address@hidden 1996-01-03 @tab 0.26   @tab 1706 @tab     @tab      @tab  438 
(36) @tab           @tab  16 @tab
address@hidden 1996-01-03 @tab 0.27   @tab 1706 @tab     @tab      @tab  438 
(36) @tab           @tab  16 @tab
address@hidden 1996-01-13 @tab 0.28   @tab 1964 @tab     @tab      @tab  934 
(33) @tab           @tab  16 @tab
address@hidden 1996-02-07 @tab 0.29   @tab 2299 @tab     @tab      @tab  936 
(33) @tab           @tab  17 @tab
address@hidden 1996-02-24 @tab 0.30   @tab 2544 @tab     @tab      @tab  919 
(32) @tab   85 (1)  @tab  20 @tab 9
address@hidden 1996-03-11 @tab 0.31   @tab 2877 @tab     @tab      @tab  919 
(32) @tab   85 (1)  @tab  29 @tab 17
address@hidden 1996-04-27 @tab 0.32   @tab 3058 @tab     @tab      @tab  921 
(31) @tab   85 (1)  @tab  30 @tab 26
address@hidden 1996-05-18 @tab 0.33   @tab 3110 @tab     @tab      @tab  926 
(31) @tab  105 (1)  @tab  30 @tab 35
address@hidden 1996-05-28 @tab 1.0    @tab 3134 @tab     @tab      @tab  973 
(32) @tab  105 (1)  @tab  30 @tab 38
address@hidden 1997-06-22 @tab 1.2    @tab 6089 @tab 385 @tab      @tab 1294 
(36) @tab  592 (20) @tab  37 @tab 126
address@hidden 1998-04-05 @tab 1.3    @tab 6415 @tab 422 @tab      @tab 1470 
(39) @tab  741 (23) @tab  39 @tab 156
address@hidden 1999-01-14 @tab 1.4    @tab 7240 @tab 426 @tab      @tab 1591 
(40) @tab  734 (20) @tab  51 @tab 197
address@hidden 2001-05-08 @tab 1.4-p1 @tab 7251 @tab 426 @tab      @tab 1591 
(40) @tab  734 (20) @tab  51 @tab 197
address@hidden 2001-05-24 @tab 1.4-p2 @tab 7268 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 197
address@hidden 2001-06-07 @tab 1.4-p3 @tab 7312 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 197
address@hidden 2001-06-10 @tab 1.4-p4 @tab 7321 @tab 439 @tab      @tab 1591 
(40) @tab  734 (20) @tab  49 @tab 198
address@hidden 2001-07-15 @tab 1.4-p5 @tab 7228 @tab 426 @tab      @tab 1596 
(40) @tab  734 (20) @tab  51 @tab 198
address@hidden 2001-08-23 @tab 1.5    @tab 8016 @tab 475 @tab  600 @tab 2654 
(39) @tab 1166 (29) @tab  63 @tab 327
address@hidden 2002-03-05 @tab 1.6    @tab 8465 @tab 475 @tab 1136 @tab 2732 
(39) @tab 1603 (27) @tab  66 @tab 365
address@hidden 2002-04-11 @tab 1.6.1  @tab 8544 @tab 475 @tab 1136 @tab 2741 
(39) @tab 1603 (27) @tab  66 @tab 372
address@hidden 2002-06-14 @tab 1.6.2  @tab 8575 @tab 475 @tab 1136 @tab 2800 
(39) @tab 1609 (27) @tab  67 @tab 386
address@hidden 2002-07-28 @tab 1.6.3  @tab 8600 @tab 475 @tab 1153 @tab 2809 
(39) @tab 1609 (27) @tab  67 @tab 391
address@hidden 2002-07-28 @tab 1.4-p6 @tab 7332 @tab 455 @tab      @tab 1596 
(40) @tab  735 (20) @tab  49 @tab 197
address@hidden 2002-09-25 @tab 1.7    @tab 9189 @tab 471 @tab 1790 @tab 2965 
(39) @tab 1606 (28) @tab  73 @tab 430
address@hidden 2002-10-16 @tab 1.7.1  @tab 9229 @tab 475 @tab 1790 @tab 2977 
(39) @tab 1606 (28) @tab  73 @tab 437
address@hidden 2002-12-06 @tab 1.7.2  @tab 9334 @tab 475 @tab 1790 @tab 2988 
(39) @tab 1606 (28) @tab  77 @tab 445
address@hidden 2003-02-20 @tab 1.7.3  @tab 9389 @tab 475 @tab 1790 @tab 3023 
(39) @tab 1651 (29) @tab  84 @tab 448
address@hidden 2003-04-23 @tab 1.7.4  @tab 9429 @tab 475 @tab 1790 @tab 3031 
(39) @tab 1644 (29) @tab  85 @tab 458
address@hidden 2003-05-18 @tab 1.7.5  @tab 9429 @tab 475 @tab 1790 @tab 3033 
(39) @tab 1645 (29) @tab  85 @tab 459
address@hidden 2003-07-10 @tab 1.7.6  @tab 9442 @tab 475 @tab 1790 @tab 3033 
(39) @tab 1660 (29) @tab  85 @tab 461
address@hidden 2003-09-07 @tab 1.7.7  @tab 9443 @tab 475 @tab 1790 @tab 3041 
(39) @tab 1660 (29) @tab  90 @tab 467
address@hidden 2003-10-07 @tab 1.7.8  @tab 9444 @tab 475 @tab 1790 @tab 3041 
(39) @tab 1660 (29) @tab  90 @tab 468
address@hidden 2003-11-09 @tab 1.7.9  @tab 9444 @tab 475 @tab 1790 @tab 3048 
(39) @tab 1660 (29) @tab  90 @tab 468
address@hidden 2003-12-10 @tab 1.8    @tab 7171 @tab 585 @tab 7730 @tab 3236 
(39) @tab 1666 (31) @tab 104 @tab 521
address@hidden 2004-01-11 @tab 1.8.1  @tab 7217 @tab 663 @tab 7726 @tab 3287 
(39) @tab 1686 (31) @tab 104 @tab 525
address@hidden 2004-01-12 @tab 1.8.2  @tab 7217 @tab 663 @tab 7726 @tab 3288 
(39) @tab 1686 (31) @tab 104 @tab 526
address@hidden 2004-03-07 @tab 1.8.3  @tab 7214 @tab 686 @tab 7735 @tab 3303 
(39) @tab 1695 (31) @tab 111 @tab 530
address@hidden 2004-04-25 @tab 1.8.4  @tab 7214 @tab 686 @tab 7736 @tab 3310 
(39) @tab 1701 (31) @tab 112 @tab 531
address@hidden 2004-05-16 @tab 1.8.5  @tab 7240 @tab 686 @tab 7736 @tab 3299 
(39) @tab 1701 (31) @tab 112 @tab 533
address@hidden 2004-07-28 @tab 1.9    @tab 7508 @tab 715 @tab 7794 @tab 3352 
(40) @tab 1812 (32) @tab 115 @tab 551
address@hidden 2004-08-11 @tab 1.9.1  @tab 7512 @tab 715 @tab 7794 @tab 3354 
(40) @tab 1812 (32) @tab 115 @tab 552
address@hidden 2004-09-19 @tab 1.9.2  @tab 7512 @tab 715 @tab 7794 @tab 3354 
(40) @tab 1812 (32) @tab 132 @tab 554
address@hidden 2004-11-01 @tab 1.9.3  @tab 7507 @tab 718 @tab 7804 @tab 3354 
(40) @tab 1812 (32) @tab 134 @tab 556
address@hidden 2004-12-18 @tab 1.9.4  @tab 7508 @tab 718 @tab 7856 @tab 3361 
(40) @tab 1811 (32) @tab 140 @tab 560
address@hidden 2005-02-13 @tab 1.9.5  @tab 7523 @tab 719 @tab 7859 @tab 3373 
(40) @tab 1453 (32) @tab 142 @tab 562
address@hidden 2005-07-10 @tab 1.9.6  @tab 7539 @tab 699 @tab 7867 @tab 3400 
(40) @tab 1453 (32) @tab 144 @tab 570
address@hidden 2006-10-15 @tab 1.10   @tab 7859 @tab 1072 @tab 8024 @tab 3512 
(40) @tab 1496 (34) @tab 172 @tab 604
address@hidden 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520 
(40) @tab 1499 (34) @tab 173 @tab 617
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540 
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11   @tab 8721 @tab 1092 @tab 8289 @tab 4164 
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
address@hidden multitable
-
-
 @c ========================================================== Appendices
 
 @page
@@ -13540,7 +13103,7 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  xs emph FIXME ref vindex pkglibdir pkgincludedir pkgdatadir mt
 @c  LocalWords:  pkg libdir cpio bindir sbindir rmt pax sbin zar zardir acindex
 @c  LocalWords:  HTML htmldir html noinst TEXINFOS nodist nobase strudel CFLAGS
address@hidden  LocalWords:  libmumble CC YFLAGS ansi knr itemx de fication 
config url comp
address@hidden  LocalWords:  libmumble CC YFLAGS itemx de fication config url 
comp
 @c  LocalWords:  depcomp elisp sh mdate mkinstalldirs mkdir py tex dvi ps pdf
 @c  LocalWords:  ylwrap zardoz INIT gettext acinclude mv FUNCS LIBOBJS LDADD fr
 @c  LocalWords:  uref featureful dnl src LINGUAS es ko nl pl sl sv PROG ISC doc
@@ -13550,10 +13113,10 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  AUX var symlink deps Wno Wnone package's aclocal's distclean
 @c  LocalWords:  ltmain xref LIBSOURCE LIBSOURCES LIBOBJ MEMCMP vs RANLIB CXX
 @c  LocalWords:  LDFLAGS LIBTOOL libtool XTRA LIBS gettext's acdir APIVERSION
address@hidden  LocalWords:  dirlist noindent usr MULTILIB multilib Multilibs 
TIOCGWINSZ sc
address@hidden  LocalWords:  dirlist noindent usr TIOCGWINSZ sc
 @c  LocalWords:  GWINSZ termios SRCDIR tarball bzip LISPDIR lispdir XEmacs CCAS
 @c  LocalWords:  emacsen MicroEmacs CCASFLAGS UX GCJ gcj GCJFLAGS posix DMALLOC
address@hidden  LocalWords:  dmalloc ldmalloc REGEX regex rx DEPDIR DEP DEFUN 
aclocaldir fi
address@hidden  LocalWords:  dmalloc ldmalloc REGEX regex DEPDIR DEP DEFUN 
aclocaldir fi
 @c  LocalWords:  mymacro myothermacro AMFLAGS autopoint autogen libtoolize yum
 @c  LocalWords:  autoheader README MAKEFLAGS subdir Inetutils sync COND endif
 @c  LocalWords:  Miller's installable includedir inc pkgdata EXEEXT libexec bsd
@@ -13582,7 +13145,7 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  distdir distcheck distcleancheck listfiles distuninstallcheck
 @c  LocalWords:  VPATH tarfile stdout XFAIL DejaGnu dejagnu DEJATOOL runtest ln
 @c  LocalWords:  RUNTESTDEFAULTFLAGS toolchain RUNTESTFLAGS asis readme DVIPS
address@hidden  LocalWords:  installcheck gzipped tarZ std utils etags mkid 
multilibbing cd
address@hidden  LocalWords:  installcheck gzipped tarZ std utils etags mkid cd
 @c  LocalWords:  ARGS taggable ETAGSFLAGS lang ctags CTAGSFLAGS GTAGS gtags idl
 @c  LocalWords:  foocc doit idlC multilibs ABIs cmindex defmac ARG enableval FC
 @c  LocalWords:  MSG xtrue DBG pathchk CYGWIN afile proglink versioned CVS's TE
@@ -13608,4 +13171,4 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO
 @c  LocalWords:  unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS
 @c  LocalWords:  LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzip lzma xz
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzip xz 
cscope
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 8805f1a..38bfdd2 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,7 +5,7 @@
 @c hence no sectioning command or @node.
 
 @display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, 
Inc.
+Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
 @uref{http://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies
diff --git a/doc/help2man b/doc/help2man
new file mode 100755
index 0000000..45cb182
--- /dev/null
+++ b/doc/help2man
@@ -0,0 +1,670 @@
+#!/usr/bin/perl -w
+
+# Generate a short man page from --help and --version output.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
+# 2010, 2011, 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+# Written by Brendan O'Dea <address@hidden>
+# Available from ftp://ftp.gnu.org/gnu/help2man/
+
+use 5.006;
+use strict;
+use Getopt::Long;
+use Text::Tabs qw(expand);
+use POSIX qw(strftime setlocale LC_ALL);
+
+my $this_program = 'help2man';
+my $this_version = '1.40.8';
+
+sub _ { $_[0] }
+sub configure_locale
+{
+    my $locale = shift;
+    die "$this_program: no locale support (Locale::gettext required)\n"
+       unless $locale eq 'C';
+}
+
+sub dec { $_[0] }
+sub enc { $_[0] }
+sub enc_user { $_[0] }
+sub kark { die +(sprintf shift, @_), "\n" }
+sub N_ { $_[0] }
+
+my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
+GNU %s %s
+
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
+2011, 2012 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Written by Brendan O'Dea <address@hidden>
+EOT
+
+my $help_info = enc_user sprintf _(<<'EOT'), $this_program, $this_program;
+`%s' generates a man page out of `--help' and `--version' output.
+
+Usage: %s [OPTION]... EXECUTABLE
+
+ -n, --name=STRING       description for the NAME paragraph
+ -s, --section=SECTION   section number for manual page (1, 6, 8)
+ -m, --manual=TEXT       name of manual (User Commands, ...)
+ -S, --source=TEXT       source of program (FSF, Debian, ...)
+ -L, --locale=STRING     select locale (default "C")
+ -i, --include=FILE      include material from `FILE'
+ -I, --opt-include=FILE  include material from `FILE' if it exists
+ -o, --output=FILE       send output to `FILE'
+ -p, --info-page=TEXT    name of Texinfo manual
+ -N, --no-info           suppress pointer to Texinfo manual
+ -l, --libtool           exclude the `lt-' from the program name
+     --help              print this help, then exit
+     --version           print version number, then exit
+
+EXECUTABLE should accept `--help' and `--version' options and produce output on
+stdout although alternatives may be specified using:
+
+ -h, --help-option=STRING     help option string
+ -v, --version-option=STRING  version option string
+ --version-string=STRING      version string
+ --no-discard-stderr          include stderr when parsing option output
+
+Report bugs to <address@hidden>.
+EOT
+
+my $section = 1;
+my $manual = '';
+my $source = '';
+my $help_option = '--help';
+my $version_option = '--version';
+my $discard_stderr = 1;
+my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info, 
$opt_libtool,
+    $version_text);
+
+my %opt_def = (
+    'n|name=s'          => \$opt_name,
+    's|section=s'       => \$section,
+    'm|manual=s'        => \$manual,
+    'S|source=s'        => \$source,
+    'L|locale=s'        => sub { configure_locale pop },
+    'i|include=s'       => sub { push @opt_include, [ pop, 1 ] },
+    'I|opt-include=s'   => sub { push @opt_include, [ pop, 0 ] },
+    'o|output=s'        => \$opt_output,
+    'p|info-page=s'     => \$opt_info,
+    'N|no-info'                 => \$opt_no_info,
+    'l|libtool'                 => \$opt_libtool,
+    'help'              => sub { print $help_info; exit },
+    'version'           => sub { print $version_info; exit },
+    'h|help-option=s'   => \$help_option,
+    'v|version-option=s' => \$version_option,
+    'version-string=s'  => \$version_text,
+    'discard-stderr!'   => \$discard_stderr,
+);
+
+# Parse options.
+Getopt::Long::config('bundling');
+die $help_info unless GetOptions %opt_def and @ARGV == 1;
+
+my %include = ();
+my %append = ();
+my @include = (); # retain order given in include file
+
+# Process include file (if given).  Format is:
+#
+#   [section name]
+#   verbatim text
+#
+# or
+#
+#   /pattern/
+#   verbatim text
+#
+
+while (@opt_include)
+{
+    my ($inc, $required) = @{shift @opt_include};
+
+    next unless -f $inc or $required;
+    kark N_("%s: can't open `%s' (%s)"), $this_program, $inc, $!
+       unless open INC, $inc;
+
+    my $key;
+    my $hash = \%include;
+
+    while (<INC>)
+    {
+       # Convert input to internal Perl format, so that multibyte
+       # sequences are treated as single characters.
+       $_ = dec $_;
+
+       # [section]
+       if (/^\[([^]]+)\]\s*$/)
+       {
+           $key = uc $1;
+           $key =~ s/^\s+//;
+           $key =~ s/\s+$//;
+           $hash = \%include;
+           push @include, $key unless $include{$key};
+           next;
+       }
+
+       # /pattern/
+       if (m!^/(.*)/([ims]*)\s*$!)
+       {
+           my $pat = $2 ? "(?$2)$1" : $1;
+
+           # Check pattern.
+           eval { $key = qr($pat) };
+           if ($@)
+           {
+               $@ =~ s/ at .*? line \d.*//;
+               die "$inc:$.:$@";
+           }
+
+           $hash = \%append;
+           next;
+       }
+
+       # Check for options before the first section--anything else is
+       # silently ignored, allowing the first for comments and
+       # revision info.
+       unless ($key)
+       {
+           # handle options
+           if (/^-/)
+           {
+               local @ARGV = split;
+               GetOptions %opt_def;
+           }
+
+           next;
+       }
+
+       $hash->{$key} ||= '';
+       $hash->{$key} .= $_;
+    }
+
+    close INC;
+
+    kark N_("%s: no valid information found in `%s'"), $this_program, $inc
+       unless $key;
+}
+
+# Compress trailing blank lines.
+for my $hash (\(%include, %append))
+{
+    for (keys %$hash) { $hash->{$_} =~ s/\n+$/\n/ }
+}
+
+sub get_option_value;
+
+# Grab help and version info from executable.
+my $help_text   = get_option_value $ARGV[0], $help_option;
+$version_text ||= get_option_value $ARGV[0], $version_option;
+
+# Translators: the following message is a strftime(3) format string, which in
+# the English version expands to the month as a word and the full year.  It
+# is used on the footer of the generated manual pages.  If in doubt, you may
+# just use %x as the value (which should be the full locale-specific date).
+my $date = enc strftime _("%B %Y"), localtime;
+(my $program = $ARGV[0]) =~ s!.*/!!;
+my $package = $program;
+my $version;
+
+if ($opt_output)
+{
+    unlink $opt_output or kark N_("%s: can't unlink %s (%s)"),
+       $this_program, $opt_output, $! if -e $opt_output;
+
+    open STDOUT, ">$opt_output"
+       or kark N_("%s: can't create %s (%s)"), $this_program, $opt_output, $!;
+}
+
+# The first line of the --version information is assumed to be in one
+# of the following formats:
+#
+#   <version>
+#   <program> <version>
+#   {GNU,Free} <program> <version>
+#   <program> ({GNU,Free} <package>) <version>
+#   <program> - {GNU,Free} <package> <version>
+#
+# and separated from any copyright/author details by a blank line.
+
+($_, $version_text) = ((split /\n+/, $version_text, 2), '');
+
+if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or
+    /^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/)
+{
+    $program = $1;
+    $package = $2;
+    $version = $3;
+}
+elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/)
+{
+    $program = $2;
+    $package = $1 ? "$1$2" : $2;
+    $version = $3;
+}
+else
+{
+    $version = $_;
+}
+
+$program =~ s!.*/!!;
+
+# No info for `info' itself.
+$opt_no_info = 1 if $program eq 'info';
+
+# Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+# upper case are manual page section headings.  The man(1) manual page in your
+# language, if available should provide the conventional translations.
+for ($include{_('NAME')})
+{
+    if ($opt_name) # --name overrides --include contents.
+    {
+       $_ = "$program \\- $opt_name\n";
+    }
+    elsif ($_) # Use first name given as $program
+    {
+       $program = $1 if /^([^\s,]+)(?:,?\s*[^\s,\\-]+)*\s+\\?-/;
+    }
+    else # Set a default (useless) NAME paragraph.
+    {
+       $_ = sprintf _("%s \\- manual page for %s %s") . "\n", $program,
+           $program, $version;
+    }
+}
+
+# Man pages traditionally have the page title in caps.
+my $PROGRAM = uc $program;
+
+# Set default page head/footers
+$source ||= "$program $version";
+unless ($manual)
+{
+    for ($section)
+    {
+       if (/^(1[Mm]|8)/) { $manual = enc _('System Administration Utilities') }
+       elsif (/^6/)      { $manual = enc _('Games') }
+       else              { $manual = enc _('User Commands') }
+    }
+}
+
+# Extract usage clause(s) [if any] for SYNOPSIS.
+# Translators: "Usage" and "or" here are patterns (regular expressions) which
+# are used to match the usage synopsis in program output.  An example from cp
+# (GNU coreutils) which contains both strings:
+#  Usage: cp [OPTION]... [-T] SOURCE DEST
+#    or:  cp [OPTION]... SOURCE... DIRECTORY
+#    or:  cp [OPTION]... -t DIRECTORY SOURCE...
+my $PAT_USAGE = _('Usage');
+my $PAT_USAGE_CONT = _('or');
+if ($help_text =~ s/^($PAT_USAGE):( +(\S+))(.*)((?:\n(?: {6}\1| 
*($PAT_USAGE_CONT): +\S).*)*)//om)
+{
+    my @syn = $3 . $4;
+
+    if ($_ = $5)
+    {
+       s/^\n//;
+       for (split /\n/) { s/^ *(($PAT_USAGE_CONT): +)?//o; push @syn, $_ }
+    }
+
+    my $synopsis = '';
+    for (@syn)
+    {
+       $synopsis .= ".br\n" if $synopsis;
+       s!^\S*/!!;
+       s/^lt-// if $opt_libtool;
+       s/^(\S+) *//;
+       $synopsis .= ".B $1\n";
+       s/\s+$//;
+       s/(([][]|\.\.+)+)/\\fR$1\\fI/g;
+       s/^/\\fI/ unless s/^\\fR//;
+       $_ .= '\fR';
+       s/(\\fI)( *)/$2$1/g;
+       s/\\fI\\fR//g;
+       s/^\\fR//;
+       s/\\fI$//;
+       s/^\./\\&./;
+
+       $synopsis .= "$_\n";
+    }
+
+    $include{_('SYNOPSIS')} ||= $synopsis;
+}
+
+# Process text, initial section is DESCRIPTION.
+my $sect = _('DESCRIPTION');
+$_ = "$help_text\n\n$version_text";
+
+# Normalise paragraph breaks.
+s/^\n+//;
+s/\n*$/\n/;
+s/\n\n+/\n\n/g;
+
+# Join hyphenated lines.
+s/([A-Za-z])-\n *([A-Za-z])/$1$2/g;
+
+# Temporarily exchange leading dots, apostrophes and backslashes for
+# tokens.
+s/^\./\x80/mg;
+s/^'/\x81/mg;
+s/\\/\x82/g;
+
+# Translators: patterns are used to match common program output. In the source
+# these strings are all of the form of "my $PAT_something = _('...');" and are
+# regular expressions.  If there is more than one commonly used string, you
+# may separate alternatives with "|".  Spaces in these expressions are written
+# as " +" to indicate that more than one space may be matched.  The string
+# "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+# optional word, so that either "Report bugs" or "Report _program_ bugs" will
+# be matched.
+my $PAT_BUGS           = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports 
+to');
+my $PAT_AUTHOR         = _('Written +by');
+my $PAT_OPTIONS                = _('Options');
+my $PAT_ENVIRONMENT    = _('Environment');
+my $PAT_FILES          = _('Files');
+my $PAT_EXAMPLES       = _('Examples');
+my $PAT_FREE_SOFTWARE  = _('This +is +free +software');
+
+# Start a new paragraph (if required) for these.
+s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og;
+
+# Convert iso-8859-1 copyright symbol or (c) to nroff
+# character.
+s/^Copyright +(?:\xa9|\([Cc]\))/Copyright \\(co/mg;
+
+sub convert_option;
+
+while (length)
+{
+    # Convert some standard paragraph names.
+    if (s/^($PAT_OPTIONS): *\n//o)
+    {
+       $sect = _('OPTIONS');
+       next;
+    }
+    if (s/^($PAT_ENVIRONMENT): *\n//o)
+    {
+       $sect = _('ENVIRONMENT');
+       next;
+    }
+    if (s/^($PAT_FILES): *\n//o)
+    {
+       $sect = _('FILES');
+       next;
+    }
+    elsif (s/^($PAT_EXAMPLES): *\n//o)
+    {
+       $sect = _('EXAMPLES');
+       next;
+    }
+
+    # Copyright section
+    if (/^Copyright /)
+    {
+       $sect = _('COPYRIGHT');
+    }
+
+    # Bug reporting section.
+    elsif (/^($PAT_BUGS) /o)
+    {
+       $sect = _('REPORTING BUGS');
+    }
+
+    # Author section.
+    elsif (/^($PAT_AUTHOR)/o)
+    {
+       $sect = _('AUTHOR');
+    }
+
+    # Examples, indicated by an indented leading $, % or > are
+    # rendered in a constant width font.
+    if (/^( +)([\$\%>] )\S/)
+    {
+       my $indent = $1;
+       my $prefix = $2;
+       my $break = '.IP';
+       $include{$sect} ||= '';
+       while (s/^$indent\Q$prefix\E(\S.*)\n*//)
+       {
+           $include{$sect} .= "$break\n\\f(CW$prefix$1\\fR\n";
+           $break = '.br';
+       }
+
+       next;
+    }
+
+    my $matched = '';
+    $include{$sect} ||= '';
+
+    # Sub-sections have a trailing colon and the second line indented.
+    if (s/^(\S.*:) *\n / /)
+    {
+       $matched .= $& if %append;
+       $include{$sect} .= qq(.SS "$1"\n);
+    }
+
+    my $indent = 0;
+    my $content = '';
+
+    # Option with description.
+    if (s/^( {1,10}([+-]\S.*?))(?:(  +(?!-))|\n( {20,}))(\S.*)\n//)
+    {
+       $matched .= $& if %append;
+       $indent = length ($4 || "$1$3");
+       $content = ".TP\n\x84$2\n\x84$5\n";
+       unless ($4)
+       {
+           # Indent may be different on second line.
+           $indent = length $& if /^ {20,}/;
+       }
+    }
+
+    # Option without description.
+    elsif (s/^ {1,10}([+-]\S.*)\n//)
+    {
+       $matched .= $& if %append;
+       $content = ".HP\n\x84$1\n";
+       $indent = 80; # not continued
+    }
+
+    # Indented paragraph with tag.
+    elsif (s/^( +(\S.*?)  +)(\S.*)\n//)
+    {
+       $matched .= $& if %append;
+       $indent = length $1;
+       $content = ".TP\n\x84$2\n\x84$3\n";
+    }
+
+    # Indented paragraph.
+    elsif (s/^( +)(\S.*)\n//)
+    {
+       $matched .= $& if %append;
+       $indent = length $1;
+       $content = ".IP\n\x84$2\n";
+    }
+
+    # Left justified paragraph.
+    else
+    {
+       s/(.*)\n//;
+       $matched .= $& if %append;
+       $content = ".PP\n" if $include{$sect};
+       $content .= "$1\n";
+    }
+
+    # Append continuations.
+    while ($indent ? s/^ {$indent}(\S.*)\n// : s/^(\S.*)\n//)
+    {
+       $matched .= $& if %append;
+       $content .= "\x84$1\n";
+    }
+
+    # Move to next paragraph.
+    s/^\n+//;
+
+    for ($content)
+    {
+       # Leading dot and apostrophe protection.
+       s/\x84\./\x80/g;
+       s/\x84'/\x81/g;
+       s/\x84//g;
+
+       # Convert options.
+       s/(^| |\()(-[][\w=-]+)/$1 . convert_option $2/mge;
+
+       # Escape remaining hyphens
+       s/-/\x83/g;
+
+       if ($sect eq 'COPYRIGHT')
+       {
+           # Insert line breaks before additional copyright messages
+           # and the disclaimer.
+           s/\n(Copyright |$PAT_FREE_SOFTWARE)/\n.br\n$1/og;
+       }
+       elsif ($sect eq 'REPORTING BUGS')
+       {
+           # Handle multi-line bug reporting sections of the form:
+           #
+           #   Report <program> bugs to <addr>
+           #   GNU <package> home page: <url>
+           #   ...
+           s/\n([[:upper:]])/\n.br\n$1/g;
+       }
+    }
+
+    # Check if matched paragraph contains /pat/.
+    if (%append)
+    {
+       for my $pat (keys %append)
+       {
+           if ($matched =~ $pat)
+           {
+               $content .= ".PP\n" unless $append{$pat} =~ /^\./;
+               $content .= $append{$pat};
+           }
+       }
+    }
+
+    $include{$sect} .= $content;
+}
+
+# Refer to the real documentation.
+unless ($opt_no_info)
+{
+    my $info_page = $opt_info || $program;
+
+    $sect = _('SEE ALSO');
+    $include{$sect} ||= '';
+    $include{$sect} .= ".PP\n" if $include{$sect};
+    $include{$sect} .= sprintf _(<<'EOT'), $program, $program, $info_page;
+The full documentation for
+.B %s
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B %s
+programs are properly installed at your site, the command
+.IP
+.B info %s
+.PP
+should give you access to the complete manual.
+EOT
+}
+
+# Output header.
+print <<EOT;
+.\\" DO NOT MODIFY THIS FILE!  It was generated by $this_program $this_version.
+.TH $PROGRAM "$section" "$date" "$source" "$manual"
+EOT
+
+# Section ordering.
+my @pre = (_('NAME'), _('SYNOPSIS'), _('DESCRIPTION'), _('OPTIONS'),
+    _('ENVIRONMENT'), _('FILES'), _('EXAMPLES'));
+
+my @post = (_('AUTHOR'), _('REPORTING BUGS'), _('COPYRIGHT'), _('SEE ALSO'));
+my $filter = join '|', @pre, @post;
+
+# Output content.
+for my $sect (@pre, (grep ! /^($filter)$/o, @include), @post)
+{
+    if ($include{$sect})
+    {
+       my $quote = $sect =~ /\W/ ? '"' : '';
+       print enc ".SH $quote$sect$quote\n";
+
+       for ($include{$sect})
+       {
+           # Replace leading dot, apostrophe, backslash and hyphen
+           # tokens.
+           s/\x80/\\&./g;
+           s/\x81/\\&'/g;
+           s/\x82/\\e/g;
+           s/\x83/\\-/g;
+
+           # Convert some latin1 chars to troff equivalents
+           s/\xa0/\\ /g; # non-breaking space
+
+           print enc $_;
+       }
+    }
+}
+
+close STDOUT or kark N_("%s: error writing to %s (%s)"), $this_program,
+    $opt_output || 'stdout', $!;
+
+exit;
+
+# Call program with given option and return results.
+sub get_option_value
+{
+    my ($prog, $opt) = @_;
+    my $stderr = $discard_stderr ? '/dev/null' : '&1';
+    my $value = join '',
+       map { s/ +$//; expand $_ }
+       map { dec $_ }
+       `$prog $opt 2>$stderr`;
+
+    unless ($value)
+    {
+       my $err = N_("%s: can't get `%s' info from %s%s");
+       my $extra = $discard_stderr
+           ? "\n" . N_("Try `--no-discard-stderr' if option outputs to stderr")
+           : '';
+
+       kark $err, $this_program, $opt, $prog, $extra;
+    }
+
+    return $value;
+}
+
+# Convert option dashes to \- to stop nroff from hyphenating 'em, and
+# embolden.  Option arguments get italicised.
+sub convert_option
+{
+    local $_ = '\fB' . shift;
+
+    s/-/\x83/g;
+    unless (s/\[=(.*)\]$/\\fR[=\\fI$1\\fR]/)
+    {
+       s/=(.)/\\fR=\\fI$1/;
+       s/ (.)/ \\fI$1/;
+       $_ .= '\fR';
+    }
+
+    $_;
+}
diff --git a/gen-testsuite-part b/gen-testsuite-part
new file mode 100755
index 0000000..a2db2d3
--- /dev/null
+++ b/gen-testsuite-part
@@ -0,0 +1,415 @@
+#! /usr/bin/env perl
+# Automatically compute some dependencies for the hand-written tests
+# of the Automake testsuite.  Also, automatically generate some more
+# tests from them (for particular cases/setups only).
+
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#--------------------------------------------------------------------------
+
+use warnings FATAL => "all";
+use strict;
+use File::Basename ();
+use constant TRUE => 1;
+use constant FALSE => 0;
+
+my $me = File::Basename::basename $0;
+
+# For use in VPATH builds.
+my $srcdir = ".";
+
+#--------------------------------------------------------------------------
+
+sub unindent ($)
+{
+  my $text = shift;
+  $text =~ /^(\s*)/;
+  my $indentation = $1;
+  $text =~ s/^$indentation//gm;
+  return $text;
+}
+
+sub atomic_write ($$;$)
+{
+  my ($outfile, $func) = (shift, shift);
+  my $perms = @_ > 0 ? shift : 0777;
+  my $tmpfile = "$outfile-t";
+  foreach my $f ($outfile, $tmpfile)
+    {
+      unlink $f or die "$me: cannot unlink '$f': $!\n"
+        if -e $f;
+    }
+  open (my $fh, ">$tmpfile")
+    or die "$me: can't write to '$tmpfile': $!\n";
+  $func->($fh);
+  close $fh
+    or die "$me: closing '$tmpfile': $!\n";
+  chmod ($perms & ~umask, $tmpfile)
+    or die "$me: cannot change perms for '$tmpfile': $!\n";
+  rename ($tmpfile, $outfile)
+    or die "$me: renaming '$tmpfile' -> '$outfile: $!\n'";
+}
+
+sub line_match ($$)
+{
+  my ($re, $file) = (shift, shift);
+  # Try both builddir and srcdir, with builddir first, to play nice
+  # with VPATH builds.
+  open (FH, "<$file") or open (FH, "<$srcdir/$file")
+    or die "$me: cannot open file '$file': $!\n";
+  my $ret = 0;
+  while (defined (my $line = <FH>))
+    {
+      if ($line =~ $re)
+        {
+          $ret = 1;
+          last;
+        }
+    }
+  close FH or die "$me: cannot close file '$file': $!\n";
+  return $ret;
+}
+
+sub write_wrapper_script ($$$)
+{
+  my ($file_handle, $wrapped_test, $shell_setup_code, $creator_name) = @_;
+  # FIXME: we use some creative quoting in the generated scripts,
+  # FIXME: to please maintainer-check.
+  print $file_handle unindent <<EOF;
+    #! /bin/sh
+    # This file has been automatically generated.  DO NOT EDIT BY HAND!
+    . ./defs-static || exit '99';
+    $shell_setup_code
+    # In the spirit of VPATH, we prefer a test in the build tree
+    # over one in the source tree.
+    for dir in . "\$am_top_srcdir"; do
+      if test -f "\$dir/$wrapped_test"; then
+        echo "\$0: will source \$dir/$wrapped_test"
+        . "\$dir/$wrapped_test"; exit "\$?"
+      fi
+    done
+    echo "\$0: cannot find wrapped test '$wrapped_test'" >&2
+    exit '99'
+EOF
+}
+
+sub get_list_of_tests ()
+{
+  my $make = defined $ENV{MAKE} ? $ENV{MAKE} : "make";
+  # Unset MAKEFLAGS, for when we are called from make itself.
+  my $cmd = "MAKEFLAGS= && unset MAKEFLAGS && cd '$srcdir' && "
+            . "$make -s -f t/list-of-tests.mk print-list-of-tests";
+  my @tests_list = split /\s+/, `$cmd`;
+  die "$me: cannot get list of tests\n" unless $? == 0 && @tests_list;
+  my $ok = 1;
+  foreach my $test (@tests_list)
+    {
+      # Respect VPATH builds.
+      next if -f $test || -f "$srcdir/$test";
+      warn "$me: test '$test' not found\n";
+      $ok = 0;
+    }
+  die "$me: some test scripts not found\n" if !$ok;
+  return @tests_list;
+}
+
+sub parse_options (@)
+{
+  use Getopt::Long qw/GetOptions/;
+  local @ARGV = @_;
+  GetOptions ('srcdir=s' => \$srcdir) or die "$me: usage error\n";
+  die "$me: too many arguments\n" if @ARGV > 0;
+  die "$me: srcdir '$srcdir': not a directory\n" unless -d $srcdir;
+}
+
+#--------------------------------------------------------------------------
+
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed.  Relative to the 't/' subdirectory.
+my $auxdir = "ax";
+
+my %deps_extractor =
+  (
+    libtool_macros =>
+      {
+        line_matcher => qr/^\s*required=.*\blibtool/,
+        nodist_prereqs => "t/libtool-macros.log",
+      },
+    gettext_macros =>
+      {
+        line_matcher => qr/^\s*required=.*\bgettext/,
+        nodist_prereqs => "t/gettext-macros.log",
+      },
+    use_trivial_test_driver =>
+      {
+        line_matcher => qr/\btrivial-test-driver\b/,
+        dist_prereqs => "t/$auxdir/trivial-test-driver",
+      },
+    check_testsuite_summary =>
+      {
+        line_matcher => qr/\btestsuite-summary-checks\.sh\b/,
+        dist_prereqs => "t/$auxdir/testsuite-summary-checks.sh",
+      },
+    extract_testsuite_summary =>
+      {
+        line_matcher => qr/\bextract-testsuite-summary\.pl\b/,
+        dist_prereqs => "t/$auxdir/extract-testsuite-summary.pl",
+      },
+    check_tap_testsuite_summary =>
+      {
+        line_matcher => qr/\btap-summary-aux\.sh\b/,
+        dist_prereqs => "t/$auxdir/tap-summary-aux.sh",
+      },
+    on_tap_with_common_setup =>
+      {
+        line_matcher => qr/\btap-setup\.sh\b/,
+        dist_prereqs => "t/$auxdir/tap-setup.sh",
+        nodist_prereqs => "t/tap-common-setup.log",
+      },
+    depcomp =>
+      {
+        line_matcher => qr/\bdepcomp\.sh\b/,
+        dist_prereqs => "t/$auxdir/depcomp.sh",
+      },
+  );
+
+#--------------------------------------------------------------------------
+
+my %test_generators =
+  (
+    #
+    # For each test script in the Automake testsuite that itself tests
+    # features of the TESTS automake interface, define a sibling test
+    # that does likewise, but with the option 'parallel-tests' enabled.
+    #
+    # A test is considered a candidate for sibling-generation if any
+    # Makefile.am generated by it define the TESTS variable.
+    #
+    # Individual tests can prevent the creation of such a sibling by
+    # explicitly setting the '$am_parallel_tests' variable to either "yes"
+    # or "no".  The rationale for this is that if the variable is set to
+    # "yes", the test already uses the 'parallel-tests' option, so that
+    # a sibling would be just a duplicate; while if the variable is set
+    # to "no", the test doesn't support, or is not meant to run with, the
+    # 'parallel-tests' option, and forcing it to do so in the sibling
+    # would likely cause a spurious failure.
+    #
+    parallel_testsuite_harness =>
+      {
+        line_matcher =>
+          qr/(?:^|\s)TESTS\s*=/,
+        line_rejecter =>
+          qr/(?:^[^#]*\bparallel-tests\b)|\bam_parallel_tests=/,
+        shell_setup_code =>
+          'am_parallel_tests=yes'
+      },
+    #
+    # For each test script in the Automake testsuite that tests features
+    # of one or more automake-provided shell script from the 'lib/'
+    # subdirectory by running those scripts directly (i.e., not thought
+    # make calls and automake-generated makefiles), define a sibling test
+    # that does likewise, but running the said script with the configure
+    # time $SHELL instead of the default system shell /bin/sh.
+    #
+    # A test is considered a candidate for sibling-generation if it calls
+    # the 'get_shell_script' function anywhere.
+    #
+    # Individual tests can prevent the creation of such a sibling by
+    # explicitly setting the '$am_test_prefer_config_shell' variable
+    # to either "yes" or "no".
+    # The rationale for this is that if the variable is set to "yes",
+    # the test already uses $SHELL, so that a sibling would be just a
+    # duplicate; while if the variable is set to "no", the test doesn't
+    # support, or is not meant to use, $SHELL to run the script under
+    # testing, and forcing it to do so in the sibling would likely
+    # cause a spurious failure.
+    #
+    prefer_config_shell =>
+      {
+        line_matcher =>
+          qr/(^|\s)get_shell_script\s/,
+        line_rejecter =>
+          qr/\bam_test_prefer_config_shell=/,
+        shell_setup_code =>
+          'am_test_prefer_config_shell=yes',
+      },
+    #
+    # Tests on tap support should be run with both the perl and awk
+    # implementations of the TAP driver (they run with the awk one
+    # by default).
+    #
+    perl_tap_driver =>
+      {
+        line_matcher =>
+          qr<(?:\bfetch_tap_driver\b|[\s/]tap-setup\.sh\b)>,
+        line_rejecter =>
+          qr/\bam_tap_implementation=/,
+        shell_setup_code =>
+          'am_tap_implementation=perl',
+      },
+  );
+
+#--------------------------------------------------------------------------
+
+parse_options @ARGV;
+
+my @all_tests = get_list_of_tests;
+my @generated_tests = (); # Will be updated later.
+
+print "## -*- Makefile -*-\n";
+print "## Generated by $me.  DO NOT EDIT BY HAND!\n\n";
+
+print <<EOF;
+
+## --------------------------------------------- ##
+##  Autogenerated tests and their dependencies.  ##
+## --------------------------------------------- ##
+
+EOF
+
+# FIXME: the following is not really right, since cannot compose wrapping
+# of tests matching more than one condition.  Still, there should be no
+# such test at the moment, so the limitation is (temporarily) acceptable.
+while (my ($k, $g) = each %test_generators)
+  {
+    my @wrapped_tests = grep {
+      line_match ($g->{line_matcher}, $_)
+        && !line_match ($g->{line_rejecter}, $_)
+    } @all_tests;
+    foreach my $wrapped_test (@wrapped_tests)
+      {
+        (my $base = $wrapped_test) =~ s/\.([^.]*)$//;
+        my $suf = $1 or die "$me: test '$wrapped_test' lacks a suffix\n";
+        my $wrapper_test =  "$base-w.$suf";
+        # Register wrapper test as "autogenerated".
+        push @generated_tests, $wrapper_test;
+        # Create wrapper test.
+        atomic_write $wrapper_test,
+                     sub { write_wrapper_script $_[0], $wrapped_test,
+                           $g->{shell_setup_code} },
+                     0555;
+        # The generated test works by sourcing the original test, so that
+        # it has to be re-run every time that changes ...
+        print "$base-w.log: $wrapped_test\n";
+        # ... but also every time the prerequisites of the wrapped test
+        # changes.  The simpler (although suboptimal) way to do so is to
+        # ensure that the wrapped tests runs before the wrappee one (in
+        # case it needs to be re-run *at all*.
+        # FIXME: we could maybe refactor the script to find a more
+        # granular way to express such implicit dependencies.
+        print "$base-w.log: $base.log\n";
+      }
+  }
+
+print <<EOF;
+
+## ---------------------------------------------------- ##
+##  Ad-hoc autogenerated tests and their dependencies.  ##
+## ---------------------------------------------------- ##
+
+EOF
+
+print "## Tests on automatic dependency tracking (see 'depcomp.sh').\n";
+
+# Key: depmode, value: list of required programs.
+my %depmodes =
+  (
+    auto         => ["cc"],
+    disabled     => ["cc"],
+    makedepend   => ["cc", "makedepend"],
+    dashmstdout  => ["gcc"],
+    cpp          => ["gcc"],
+# This is for older (pre-3.x) GCC versions.  Newer versions
+# have depmode "gcc3".
+    gcc          => ["gcc"],
+# This is for older (pre-7) msvc versions.  Newer versions
+# have depmodes "msvc7" and "msvc7msys".
+    msvisualcpp  => ["cl", "cygpath"],
+    msvcmsys     => ["cl", "mingw"],
+  );
+
+foreach my $lt (TRUE, FALSE)
+  {
+    foreach my $m (keys %depmodes)
+      {
+        my $planned = ($lt && $m eq "auto") ? 84 : 28;
+        my @required =
+          (
+            @{$depmodes{$m}},
+            $lt ? ("libtoolize",) : (),
+          );
+        my @vars_init =
+          (
+            "am_create_testdir=empty",
+            "depmode=$m",
+            "depcomp_with_libtool=" . ($lt ? "yes" : "no"),
+          );
+        my $test = "t/depcomp" . ($lt ? "-lt-" : "-") . $m . ".tap";
+        # Register wrapper test as "autogenerated" ...
+        push @generated_tests, $test;
+        # ... and create it.
+        atomic_write ($test, sub
+          {
+            my $file_handle = shift;
+            print $file_handle unindent <<EOF;
+              #! /bin/sh
+              # Automatically generated test.  DO NOT EDIT BY HAND!
+              @vars_init
+              required="@required"
+              . ./defs || Exit 1
+              plan_ $planned
+              . "\$am_testauxdir/depcomp.sh"; exit "\$?"
+EOF
+          },
+          0555);
+      }
+   }
+
+# Update generated makefile fragment to account for all the generated tests.
+print "generated_TESTS =\n";
+map { print "generated_TESTS += $_\n" } @generated_tests;
+
+# The test scripts are scanned for automatic dependency generation *after*
+# the generated tests have been created, so they too can be scanned.  To
+# do so correctly, we need to update the list in '@all_tests' to make it
+# comprise also the freshly-generated tests.
+
+push @all_tests, @generated_tests;
+
+print <<EOF;
+
+## ----------------------------- ##
+##  Autogenerated dependencies.  ##
+## ----------------------------- ##
+
+EOF
+
+while (my ($k, $x) = each %deps_extractor)
+  {
+    my $dist_prereqs = $x->{dist_prereqs} || "";
+    my $nodist_prereqs = $x->{nodist_prereqs} || "";
+    my @tests = grep { line_match $x->{line_matcher}, $_ } @all_tests;
+    map { s/\.[^.]*$//; s/$/\.log/; } (my @logs = @tests);
+    print "## Added by deps-extracting key '$k'.\n";
+    ## The list of all tests which have a dependency detected by the
+    ## current key.
+    print join(" \\\n  ", "${k}_TESTS =", @tests) . "\n";
+    print "EXTRA_DIST += $dist_prereqs\n";
+    map { print "$_: $dist_prereqs $nodist_prereqs\n" } @logs;
+    print "\n";
+  }
+
+__END__
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 9b6d3a5..524b8f5 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2003, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,7 +43,7 @@ Automake::ChannelDefs - channel definitions for Automake and 
helper functions
   verb ($MESSAGE, [%OPTIONS]);
   switch_warning ($CATEGORY);
   parse_WARNINGS ();
-  parse_warning ($OPTION, $ARGUMENT);
+  parse_warnings ($OPTION, $ARGUMENT);
   Automake::ChannelDefs::set_strictness ($STRICTNESS_NAME);
 
 =head1 DESCRIPTION
@@ -56,7 +55,7 @@ shorthand function to output on specific channels.
 
 =cut
 
-use 5.005;
+use 5.006;
 use strict;
 use Exporter;
 
@@ -88,7 +87,7 @@ Errors related to GNU Standards.
 
 =item C<error-gnu/warn>
 
-Errors related to GNU Standards that should be warnings in `foreign' mode.
+Errors related to GNU Standards that should be warnings in 'foreign' mode.
 
 =item C<error-gnits>
 
@@ -168,6 +167,10 @@ register_channel 'verb', type => 'debug', silent => 1, 
uniq_part => UP_NONE,
   ordered => 0;
 register_channel 'note', type => 'debug', silent => 0;
 
+setup_channel_type 'warning', header => 'warning: ';
+setup_channel_type 'error', header => 'error: ';
+setup_channel_type 'fatal', header => 'error: ';
+
 =head2 FUNCTIONS
 
 =over 4
@@ -180,19 +183,20 @@ Display warning categories.
 
 sub usage ()
 {
-  print "Warning categories include:
-  `gnu'           GNU coding standards (default in gnu and gnits modes)
-  `obsolete'      obsolete features or constructions
-  `override'      user redefinitions of Automake rules or variables
-  `portability'   portability issues (default in gnu and gnits modes)
-  `extra-portability'  extra portability issues related to obscure tools
-  `syntax'        dubious syntactic constructs (default)
-  `unsupported'   unsupported or incomplete features (default)
-  `all'           all the warnings
-  `no-CATEGORY'   turn off warnings in CATEGORY
-  `none'          turn off all the warnings
-  `error'         treat warnings as errors
-";
+  print <<EOF;
+Warning categories include:
+  gnu                GNU coding standards (default in gnu and gnits modes)
+  obsolete           obsolete features or constructions
+  override           user redefinitions of Automake rules or variables
+  portability        portability issues (default in gnu and gnits modes)
+  extra-portability  extra portability issues related to obscure tools
+  syntax             dubious syntactic constructs (default)
+  unsupported        unsupported or incomplete features (default)
+  all                all the warnings
+  no-CATEGORY        turn off warnings in CATEGORY
+  none'              turn off all the warnings
+  error              treat warnings as errors
+EOF
 }
 
 =item C<prog_error ($MESSAGE, [%OPTIONS])>
@@ -258,10 +262,6 @@ Else handle C<all> and C<none> for completeness.
 
 =cut
 
-# HACK to have `-Wextra-portability' *not* implied by `-Wall'.
-# This will go away in automake 1.12.
-my $have_extra_portability = 0;
-
 sub switch_warning ($)
 {
   my ($cat) = @_;
@@ -276,8 +276,6 @@ sub switch_warning ($)
   if ($cat eq 'all')
     {
       setup_channel_type 'warning', silent => $has_no;
-      setup_channel 'extra-portability', silent => 1
-        unless $have_extra_portability;
     }
   elsif ($cat eq 'none')
     {
@@ -294,18 +292,37 @@ sub switch_warning ($)
   elsif (channel_type ($cat) eq 'warning')
     {
       setup_channel $cat, silent => $has_no;
-      setup_channel 'portability-recursive', silent => $has_no
-        if $cat eq 'portability';
-      if ($cat eq 'portability' && $has_no)
-        {
-          setup_channel 'extra-portability', silent => 1;
-          $have_extra_portability = 0;
-        }
-      if ($cat eq 'extra-portability' && ! $has_no)
+      #
+      # Handling of portability warnings is trickier.  For relevant tests,
+      # see 'dollarvar2', 'extra-portability' and 'extra-portability3'.
+      #
+      # -Wportability-recursive and -Wno-portability-recursive should not
+      # have any effect on other 'portability' or 'extra-portability'
+      # warnings, so there's no need to handle them separately or ad-hoc.
+      #
+      if ($cat eq 'extra-portability' && ! $has_no) # -Wextra-portability
         {
+          # -Wextra-portability must enable 'portability' and
+          # 'portability-recursive' warnings.
           setup_channel 'portability', silent => 0;
           setup_channel 'portability-recursive', silent => 0;
-          $have_extra_portability = 1;
+        }
+      if ($cat eq 'portability') # -Wportability or -Wno-portability
+        {
+          if ($has_no) # -Wno-portability
+            {
+              # -Wno-portability must disable 'extra-portability' and
+              # 'portability-recursive' warnings.
+              setup_channel 'portability-recursive', silent => 1;
+              setup_channel 'extra-portability', silent => 1;
+            }
+          else # -Wportability
+            {
+              # -Wportability must enable 'portability-recursive'
+              # warnings.  But it should have no influence over the
+              # 'extra-portability' warnings.
+              setup_channel 'portability-recursive', silent => 0;
+            }
         }
     }
   else
@@ -331,7 +348,7 @@ sub parse_WARNINGS ()
     }
 }
 
-=item C<parse_warning ($OPTION, $ARGUMENT)>
+=item C<parse_warnings ($OPTION, $ARGUMENT)>
 
 Parse the argument of C<--warning=CATEGORY> or C<-WCATEGORY>.
 
@@ -347,7 +364,7 @@ sub parse_warnings ($$)
 
   foreach my $cat (split (',', $categories))
     {
-      msg 'unsupported', "unknown warning category `$cat'"
+      msg 'unsupported', "unknown warning category '$cat'"
        if switch_warning $cat;
     }
 }
@@ -391,12 +408,10 @@ sub set_strictness ($)
     }
   else
     {
-      prog_error "level `$name' not recognized\n";
+      prog_error "level '$name' not recognized";
     }
 }
 
-1;
-
 =back
 
 =head1 SEE ALSO
@@ -409,6 +424,8 @@ Written by Alexandre Duret-Lutz E<lt>F<address@hidden>E<gt>.
 
 =cut
 
+1;
+
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables:
 ## perl-indent-level: 2
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 9a2732c..724a114 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2004, 2006, 2008, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +35,7 @@ Automake::Channels - support functions for error and warning 
management
   register_channel 'system', type => 'error', exit_code => 4;
 
   # Output a message on channel 'unused'.
-  msg 'unused', "$file:$line", "unused variable `$var'";
+  msg 'unused', "$file:$line", "unused variable '$var'";
 
   # Make the 'unused' channel silent.
   setup_channel 'unused', silent => 1;
@@ -67,7 +66,7 @@ etc.) that can also be overridden on a per-message basis.
 
 =cut
 
-use 5.005;
+use 5.006;
 use strict;
 use Exporter;
 use Carp;
@@ -164,7 +163,7 @@ functions.  The possible keys, with their default value are:
 The type of the channel.  One of C<'debug'>, C<'warning'>, C<'error'>, or
 C<'fatal'>.  Fatal messages abort the program when they are output.
 Error messages update the exit status.  Debug and warning messages are
-harmless, except that warnings can be treated as errors of
+harmless, except that warnings are treated as errors if
 C<$warnings_are_errors> is set.
 
 =item C<exit_code =E<gt> 1>
@@ -204,10 +203,14 @@ C<US_LOCAL>, and C<US_GLOBAL> constants above.
 =item C<header =E<gt> ''>
 
 A string to prepend to each message emitted through this channel.
+With partial messages, only the first part will have C<header>
+prepended.
 
 =item C<footer =E<gt> ''>
 
 A string to append to each message emitted through this channel.
+With partial messages, only the final part will have C<footer>
+appended.
 
 =item C<backtrace =E<gt> 0>
 
@@ -337,7 +340,7 @@ sub _merge_options (\%%)
        }
       else
        {
-         confess "unknown option `$_'";
+         confess "unknown option '$_'";
        }
     }
   if ($hash->{'ordered'})
@@ -399,20 +402,24 @@ sub _format_sub_message ($$)
   return $leader . join ("\n" . $leader, split ("\n", $message)) . "\n";
 }
 
+# Store partial messages here. (See the 'partial' option.)
+use vars qw ($partial);
+$partial = '';
+
 # _format_message ($LOCATION, $MESSAGE, %OPTIONS)
 # -----------------------------------------------
 # Format the message.  Return a string ready to print.
 sub _format_message ($$%)
 {
   my ($location, $message, %opts) = @_;
-  my $msg = '';
+  my $msg = ($partial eq '' ? $opts{'header'} : '') . $message
+           . ($opts{'partial'} ? '' : $opts{'footer'});
   if (ref $location)
     {
       # If $LOCATION is a reference, assume it's an instance of the
       # Automake::Location class and display contexts.
       my $loc = $location->get || $me;
-      $msg = _format_sub_message ("$loc: ", $opts{'header'}
-                                 . $message . $opts{'footer'});
+      $msg = _format_sub_message ("$loc: ", $msg);
       for my $pair ($location->get_contexts)
        {
          $msg .= _format_sub_message ($pair->[0] . ":   ", $pair->[1]);
@@ -421,8 +428,7 @@ sub _format_message ($$%)
   else
     {
       $location ||= $me;
-      $msg = _format_sub_message ("$location: ", $opts{'header'}
-                                 . $message . $opts{'footer'});
+      $msg = _format_sub_message ("$location: ", $msg);
     }
   return $msg;
 }
@@ -484,10 +490,6 @@ sub _dequeue ($)
 }
 
 
-# Store partial messages here. (See the 'partial' option.)
-use vars qw ($partial);
-$partial = '';
-
 # _print_message ($LOCATION, $MESSAGE, %OPTIONS)
 # ----------------------------------------------
 # Format the message, check duplicates, and print it.
@@ -511,6 +513,9 @@ sub _print_message ($$%)
       $partial = '';
     }
 
+  msg ('note', '', 'warnings are treated as errors', uniq_scope => US_GLOBAL)
+    if ($opts{'type'} eq 'warning' && $warnings_are_errors);
+
   # Check for duplicate message if requested.
   my $to_filter;
   if ($opts{'uniq_part'} ne UP_NONE)
@@ -580,12 +585,12 @@ associated to the message.
 For instance to complain about some unused variable C<mumble>
 declared at line 10 in F<foo.c>, one could do:
 
-  msg 'unused', 'foo.c:10', "unused variable `mumble'";
+  msg 'unused', 'foo.c:10', "unused variable 'mumble'";
 
 If channel C<unused> is not silent (and if this message is not a duplicate),
 the following would be output:
 
-  foo.c:10: unused variable `mumble'
+  foo.c:10: unused variable 'mumble'
 
 C<$location> can also be an instance of C<Automake::Location>.  In this
 case, the stack of contexts will be displayed in addition.
@@ -674,7 +679,7 @@ Override the options of C<$channel> with those specified by 
C<%options>.
 sub setup_channel ($%)
 {
   my ($name, %opts) = @_;
-  confess "channel $name doesn't exist" unless exists $channels{$name};
+  confess "unknown channel $name" unless exists $channels{$name};
   _merge_options %{$channels{$name}}, %opts;
 }
 
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 2d649f6..cc753d9 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2006, 2008  Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Condition;
+
+use 5.006;
 use strict;
 use Carp;
 
@@ -164,11 +165,11 @@ both create the C<"FALSE"> condition).
 =cut
 
 # Keys in this hash are conditional strings. Values are the
-# associated object conditions.  This is used by `new' to reuse
+# associated object conditions.  This is used by 'new' to reuse
 # Condition objects with identical conditionals.
 use vars '%_condition_singletons';
 # Do NOT reset this hash here.  It's already empty by default,
-# and any setting would otherwise occur AFTER the `TRUE' and `FALSE'
+# and any setting would otherwise occur AFTER the 'TRUE' and 'FALSE'
 # constants definitions.
 #   %_condition_singletons = ();
 
@@ -180,6 +181,15 @@ sub new ($;@)
   };
   bless $self, $class;
 
+  for my $cond (@conds)
+    {
+      # Catch some common programming errors:
+      # - A Condition passed to new
+      confess "'$cond' is a reference, expected a string" if ref $cond;
+      # - A Condition passed as a string to new
+      confess "'$cond' does not look like a condition" if $cond =~ /::/;
+    }
+
   # Accept strings like "FOO BAR" as shorthand for ("FOO", "BAR").
   @conds = map { split (' ', $_) } @conds;
 
@@ -187,12 +197,6 @@ sub new ($;@)
     {
       next if $cond eq 'TRUE';
 
-      # Catch some common programming errors:
-      # - A Condition passed to new
-      confess "`$cond' is a reference, expected a string" if ref $cond;
-      # - A Condition passed as a string to new
-      confess "`$cond' does not look like a condition" if $cond =~ /::/;
-
       # Detect cases when @conds can be simplified to FALSE.
       if (($cond eq 'FALSE' && $#conds > 0)
          || ($cond =~ /^(.*)_TRUE$/ && exists $self->{'hash'}{"${1}_FALSE"})
@@ -250,7 +254,7 @@ except those of C<$minuscond>.  This is the opposite of 
C<merge>.
 sub strip ($$)
 {
   my ($self, $minus) = @_;
-  my @res = grep { not $minus->has ($_) } $self->conds;
+  my @res = grep { not $minus->_has ($_) } $self->conds;
   return new Automake::Condition @res;
 }
 
@@ -274,7 +278,7 @@ sub conds ($ )
 }
 
 # Undocumented, shouldn't be needed outside of this class.
-sub has ($$)
+sub _has ($$)
 {
   my ($self, $cond) = @_;
   return exists $self->{'hash'}{$cond};
@@ -289,7 +293,7 @@ Return 1 iff this condition is always false.
 sub false ($ )
 {
   my ($self) = @_;
-  return $self->has ('FALSE');
+  return $self->_has ('FALSE');
 }
 
 =item C<$cond-E<gt>true>
@@ -426,7 +430,7 @@ sub true_when ($$)
   # exists in $WHEN.
   foreach my $cond ($self->conds)
     {
-      return 0 unless $when->has ($cond);
+      return 0 unless $when->_has ($cond);
     }
   return 1;
 }
@@ -518,6 +522,8 @@ sub multiply ($@)
   return (values %res);
 }
 
+=back
+
 =head2 Other helper functions
 
 =over 4
@@ -615,6 +621,8 @@ sub conditional_negate ($)
   return $cond;
 }
 
+=back
+
 =head1 SEE ALSO
 
 L<Automake::DisjConditions>.
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index b6674dc..24c979c 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -1,5 +1,5 @@
 #  -*- Perl -*-
-# Copyright (C) 2003, 2004, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 # @configure_input@
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index e2bebef..53e62a5 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2005, 2006, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 
 package Automake::Configure_ac;
 
+use 5.006;
 use strict;
 use Exporter;
 use Automake::Channels;
@@ -49,6 +50,20 @@ Automake::Configure_ac - Locate configure.ac or configure.in.
   my $file_name = find_configure_ac ($dir);
   my $file_name = require_configure_ac ($dir);
 
+=over 4
+
+=back
+
+=head2 Functions
+
+=over 4
+
+=item C<$configure_ac = find_configure_ac ([$directory])>
+
+Find a F<configure.ac> or F<configure.in> file in C<$directory>,
+defaulting to the current directory.  Complain if both files are present.
+Return the name of the file found, or the former if neither is present.
+
 =cut
 
 sub find_configure_ac (;@)
@@ -65,8 +80,8 @@ sub find_configure_ac (;@)
       if (-f $configure_in)
        {
          msg ('unsupported',
-              "`$configure_ac' and `$configure_in' both present.\n"
-              . "proceeding with `$configure_ac'.");
+              "'$configure_ac' and '$configure_in' both present.\n"
+              . "proceeding with '$configure_ac'");
        }
       return $configure_ac
     }
@@ -78,10 +93,16 @@ sub find_configure_ac (;@)
 }
 
 
+=item C<$configure_ac = require_configure_ac ([$directory])>
+
+Like C<find_configure_ac>, but fail if neither is present.
+
+=cut
+
 sub require_configure_ac (;$)
 {
   my $res = find_configure_ac (@_);
-  fatal "`configure.ac' or `configure.in' is required"
+  fatal "'configure.ac' or 'configure.in' is required"
     unless -f $res;
   return $res
 }
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index ae3abb6..e449121 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2004, 2006  Free Software Foundation, 
Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,8 +15,9 @@
 
 package Automake::DisjConditions;
 
-use Carp;
+use 5.006;
 use strict;
+use Carp;
 use Automake::Condition qw/TRUE FALSE/;
 
 =head1 NAME
@@ -136,7 +137,7 @@ ignored.
 =cut
 
 # Keys in this hash are DisjConditions strings. Values are the
-# associated object DisjConditions.  This is used by `new' to reuse
+# associated object DisjConditions.  This is used by 'new' to reuse
 # DisjConditions objects with identical conditions.
 use vars '%_disjcondition_singletons';
 
@@ -146,8 +147,8 @@ sub new ($;@)
   my @filtered_conds = ();
   for my $cond (@conds)
     {
-      confess "`$cond' isn't a reference" unless ref $cond;
-      confess "`$cond' isn't an Automake::Condition"
+      confess "'$cond' isn't a reference" unless ref $cond;
+      confess "'$cond' isn't an Automake::Condition"
        unless $cond->isa ("Automake::Condition");
 
       # This is a disjunction of conditions, so we drop
@@ -462,7 +463,7 @@ sub sub_conditions ($$)
   my ($self, $subcond) = @_;
 
   # Make $subcond blindingly apparent in the DisjConditions.
-  # For instance `$b->multiply($a->conds)' (from the POD example) is:
+  # For instance '$b->multiply($a->conds)' (from the POD example) is:
   #    (new Automake::Condition ("FALSE"),
   #     new Automake::Condition ("A_TRUE", "B_FALSE", "C_FALSE"),
   #     new Automake::Condition ("A_TRUE", "B_FALSE", "C_TRUE"),
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index ba7afc0..fc2347b 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +34,7 @@ This perl module provides various general purpose file 
handling functions.
 
 =cut
 
+use 5.006;
 use strict;
 use Exporter;
 use File::stat;
@@ -45,40 +45,13 @@ use Automake::ChannelDefs;
 use vars qw (@ISA @EXPORT);
 
 @ISA = qw (Exporter);
address@hidden = qw (&open_quote &contents
address@hidden = qw (&contents
              &find_file &mtime
              &update_file &up_to_date_p
              &xsystem &xsystem_hint &xqx
              &dir_has_case_matching_file &reset_dir_cache
              &set_dir_cache_file);
 
-
-=item C<open_quote ($file_name)>
-
-Quote C<$file_name> for open.
-
-=cut
-
-# $FILE_NAME
-# open_quote ($FILE_NAME)
-# -----------------------
-# If the string $S is a well-behaved file name, simply return it.
-# If it starts with white space, prepend `./', if it ends with
-# white space, add `\0'.  Return the new string.
-sub open_quote($)
-{
-  my ($s) = @_;
-  if ($s =~ m/^\s/)
-    {
-      $s = "./$s";
-    }
-  if ($s =~ m/\s$/)
-    {
-      $s = "$s\0";
-    }
-  return $s;
-}
-
 =item C<find_file ($file_name, @include)>
 
 Return the first path for a C<$file_name> in the C<include>s.
@@ -125,7 +98,7 @@ sub find_file ($@)
 =item C<mtime ($file)>
 
 Return the mtime of C<$file>.  Missing files, or C<-> standing for
-C<STDIN> or C<STDOUT> are ``obsolete'', i.e., as old as possible.
+C<STDIN> or C<STDOUT> are "obsolete", i.e., as old as possible.
 
 =cut
 
@@ -168,7 +141,7 @@ sub update_file ($$;$)
 
   if ($to eq '-')
     {
-      my $in = new IO::File ("< " . open_quote ($from));
+      my $in = new IO::File $from, "<";
       my $out = new IO::File (">-");
       while ($_ = $in->getline)
        {
@@ -182,7 +155,7 @@ sub update_file ($$;$)
   if (!$force && -f "$to" && compare ("$from", "$to") == 0)
     {
       # File didn't change, so don't update its mod time.
-      msg 'note', "`$to' is unchanged";
+      msg 'note', "'$to' is unchanged";
       unlink ($from)
         or fatal "cannot remove $from: $!";
       return
@@ -195,13 +168,13 @@ sub update_file ($$;$)
        or fatal "cannot backup $to: $!";
       move ("$from", "$to")
        or fatal "cannot rename $from as $to: $!";
-      msg 'note', "`$to' is updated";
+      msg 'note', "'$to' is updated";
     }
   else
     {
       move ("$from", "$to")
        or fatal "cannot rename $from as $to: $!";
-      msg 'note', "`$to' is created";
+      msg 'note', "'$to' is created";
     }
 }
 
@@ -360,7 +333,7 @@ sub contents ($)
   my ($file) = @_;
   verb "reading $file";
   local $/;                    # Turn on slurp-mode.
-  my $f = new Automake::XFile "< " . open_quote ($file);
+  my $f = new Automake::XFile $file, "<";
   my $contents = $f->getline;
   $f->close;
   return $contents;
@@ -400,7 +373,7 @@ sub dir_has_case_matching_file ($$)
   # again and again.
   if (!exists $_directory_cache{$dirname})
     {
-      error "failed to open directory `$dirname'"
+      error "failed to open directory '$dirname'"
        unless opendir (DIR, $dirname);
       $_directory_cache{$dirname} = { map { $_ => 1 } readdir (DIR) };
       closedir (DIR);
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index a9c0be7..2a4a527 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 
 package Automake::General;
 
-use 5.005;
+use 5.006;
 use strict;
 use Exporter;
 use File::Basename;
@@ -26,7 +26,7 @@ use vars qw (@ISA @EXPORT);
 @EXPORT = qw (&uniq $me);
 
 # Variable we share with the main package.  Be sure to have a single
-# copy of them: using `my' together with multiple inclusion of this
+# copy of them: using 'my' together with multiple inclusion of this
 # package would introduce several copies.
 use vars qw ($me);
 $me = basename ($0);
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index e1a3968..ea1c7ca 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -76,13 +76,13 @@ sub parse_options (%)
        }
       elsif (exists $argopts{$ARGV[0]})
        {
-         fatal ("option `$ARGV[0]' requires an argument\n"
-                . "Try `$0 --help' for more information.");
+         fatal ("option '$ARGV[0]' requires an argument\n"
+                . "Try '$0 --help' for more information.");
        }
       else
        {
-         fatal ("unrecognized option `$ARGV[0]'.\n"
-                . "Try `$0 --help' for more information.");
+         fatal ("unrecognized option '$ARGV[0]'.\n"
+                . "Try '$0 --help' for more information.");
        }
     }
 }
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 687b987..6da070e 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,9 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Item;
+
+use 5.006;
 use strict;
 use Carp;
-
 use Automake::ChannelDefs;
 use Automake::DisjConditions;
 
@@ -71,7 +72,7 @@ sub def ($$)
 {
   # This method is called very often, so keep it small and fast.  We
   # don't mind the extra undefined items introduced by lookup failure;
-  # avoiding this with `exists' means doing two hash lookup on
+  # avoiding this with 'exists' means doing two hash lookup on
   # success, and proved worse on benchmark.
   my $def = $_[0]->{'defs'}{$_[1]};
   return defined $def && $def;
@@ -91,7 +92,7 @@ sub rdef ($$)
 {
   my ($self, $cond) = @_;
   my $d = $self->def ($cond);
-  prog_error ("undefined condition `" . $cond->human . "' for `"
+  prog_error ("undefined condition '" . $cond->human . "' for '"
              . $self->name . "'\n" . $self->dump)
     unless $d;
   return $d;
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 8d94afc..8b64562 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::ItemDef;
+
+use 5.006;
 use strict;
 use Carp;
 
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 613dc80..290db73 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
 
 package Automake::Location;
 
+use 5.006;
+
 =head1 NAME
 
 Automake::Location - a class for location tracking, with a stack of contexts
@@ -50,7 +52,7 @@ Automake::Location - a class for location tracking, with a 
stack of contexts
       ...
     }
 
-  # Pop a context, and reset the location from the previous context.
+  # Pop a context, and reset the location to the previous context.
   $where->pop_context;
 
   # Clone a Location.  Use this when storing the state of a location
@@ -84,6 +86,16 @@ You can pass a C<Location> to C<Automake::Channels::msg>.
 
 =cut
 
+=head2 Methods
+
+=over
+
+=item C<$where = new Automake::Location ([$position])>
+
+Create and return a new Location object.
+
+=cut
+
 sub new ($;$)
 {
   my ($class, $position) = @_;
@@ -95,18 +107,36 @@ sub new ($;$)
   return $self;
 }
 
+=item C<$location-E<gt>set ($position)>
+
+Change the location to be C<$position>.
+
+=cut
+
 sub set ($$)
 {
   my ($self, $position) = @_;
   $self->{'position'} = $position;
 }
 
+=item C<$location-E<gt>get>
+
+Get the location (without context).
+
+=cut
+
 sub get ($)
 {
   my ($self) = @_;
   return $self->{'position'};
 }
 
+=item C<$location-E<gt>push_context ($context)>
+
+Push a context to the location.
+
+=cut
+
 sub push_context ($$)
 {
   my ($self, $context) = @_;
@@ -114,6 +144,12 @@ sub push_context ($$)
   $self->set (undef);
 }
 
+=item C<$where = $location-E<gt>pop_context ($context)>
+
+Pop a context, and reset the location to the previous context.
+
+=cut
+
 sub pop_context ($)
 {
   my ($self) = @_;
@@ -122,12 +158,25 @@ sub pop_context ($)
   return @{$pair};
 }
 
+=item C<@contexts = $location-E<gt>get_contexts>
+
+Return the array of contexts.
+
+=cut
+
 sub get_contexts ($)
 {
   my ($self) = @_;
   return @{$self->{'contexts'}};
 }
 
+=item C<$location = $location-E<gt>clone>
+
+Clone a Location.  Use this when storing the state of a location
+that would otherwise be modified.
+
+=cut
+
 sub clone ($)
 {
   my ($self) = @_;
@@ -140,6 +189,12 @@ sub clone ($)
   return $other;
 }
 
+=item C<$res = $location-E<gt>dump>
+
+Print the location and the stack of context (for debugging).
+
+=cut
+
 sub dump ($)
 {
   my ($self) = @_;
@@ -152,6 +207,13 @@ sub dump ($)
   return $res;
 }
 
+=item C<@array = $location-E<gt>serialize>
+
+Serialize a Location object (for passing through a thread queue,
+for example).
+
+=cut
+
 sub serialize ($)
 {
   my ($self) = @_;
@@ -166,6 +228,12 @@ sub serialize ($)
   return @serial;
 }
 
+=item C<new Automake::Location::deserialize ($queue)>
+
+De-serialize: recreate a Location object from a queue.
+
+=cut
+
 sub deserialize ($)
 {
   my ($queue) = @_;
@@ -179,6 +247,8 @@ sub deserialize ($)
   return $self;
 }
 
+=back
+
 =head1 SEE ALSO
 
 L<Automake::Channels>
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index e3d23ae..2f977bd 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,6 +15,7 @@
 
 package Automake::Options;
 
+use 5.006;
 use strict;
 use Exporter;
 use Automake::Config;
@@ -27,11 +27,11 @@ use vars qw (@ISA @EXPORT);
 
 @ISA = qw (Exporter);
 @EXPORT = qw (option global_option
-             set_option set_global_option
-             unset_option unset_global_option
-             process_option_list process_global_option_list
-             set_strictness $strictness $strictness_name
-             &FOREIGN &GNU &GNITS);
+              set_option set_global_option
+              unset_option unset_global_option
+              process_option_list process_global_option_list
+              set_strictness $strictness $strictness_name
+              &FOREIGN &GNU &GNITS);
 
 =head1 NAME
 
@@ -71,10 +71,15 @@ F<Makefile.am>s.
 
 =cut
 
-# Values are the Automake::Location of the definition, except
-# for 'ansi2knr' whose value is a pair [filename, Location].
-use vars '%_options';          # From AUTOMAKE_OPTIONS
-use vars '%_global_options';   # from AM_INIT_AUTOMAKE or the command line.
+# Values are the Automake::Location of the definition.
+use vars '%_options';        # From AUTOMAKE_OPTIONS
+use vars '%_global_options'; # From AM_INIT_AUTOMAKE or the command line.
+
+# Whether process_option_list has already been called for the current
+# Makefile.am.
+use vars '$_options_processed';
+# Whether process_global_option_list has already been called.
+use vars '$_global_options_processed';
 
 =head2 Constants
 
@@ -135,6 +140,7 @@ previous F<Makefile.am>.
 
 sub reset ()
 {
+  $_options_processed = 0;
   %_options = %_global_options;
   # The first time we are run,
   # remember the current setting as the default.
@@ -222,135 +228,180 @@ sub unset_global_option ($)
 }
 
 
-=item C<process_option_list ($where, @options)>
+=item C<process_option_list (@list)>
+
+=item C<process_global_option_list (@list)>
 
-=item C<process_global_option_list ($where, @options)>
+Process Automake's option lists.  C<@list> should be a list of hash
+references with keys C<option> and C<where>, where C<option> is an
+option as they occur in C<AUTOMAKE_OPTIONS> or C<AM_INIT_AUTOMAKE>,
+and C<where> is the location where that option occurred.
 
-Process Automake's option lists.  C<@options> should be a list of
-words, as they occur in C<AUTOMAKE_OPTIONS> or C<AM_INIT_AUTOMAKE>.
+These functions should be called at most once for each set of options
+having the same precedence; i.e., do not call it twice for two options
+from C<AM_INIT_AUTOMAKE>.
 
 Return 1 on error, 0 otherwise.
 
 =cut
 
+# _option_must_be_from_configure ($OPTION, $WHERE)
+# ----------------------------------------------
+# Check that the $OPTION given in location $WHERE is specified with
+# AM_INIT_AUTOMAKE, not with AUTOMAKE_OPTIONS.
+sub _option_must_be_from_configure ($$)
+{
+  my ($opt, $where)= @_;
+  return
+    if $where->get =~ /^configure\./;
+  error $where,
+        "option '$opt' can only be used as argument to AM_INIT_AUTOMAKE\n" .
+        "but not in AUTOMAKE_OPTIONS makefile statements";
+}
+
+# _is_valid_easy_option ($OPTION)
+# -------------------------------
+# Explicitly recognize valid automake options that require no
+# special handling by '_process_option_list' below.
+sub _is_valid_easy_option ($)
+{
+  my $opt = shift;
+  return scalar grep { $opt eq $_ } qw(
+    check-news
+    color-tests
+    cygnus
+    dejagnu
+    dist-bzip2
+    dist-lzip
+    dist-shar
+    dist-tarZ
+    dist-xz
+    dist-zip
+    no-define
+    no-dependencies
+    no-dist
+    no-dist-gzip
+    no-exeext
+    no-installinfo
+    no-installman
+    no-texinfo.tex
+    nostdinc
+    readme-alpha
+    std-options
+    subdir-objects
+  );
+}
+
 # $BOOL
-# _process_option_list (\%OPTIONS, $WHERE, @OPTIONS)
-# --------------------------------------------------
-# Process a list of options.  Return 1 on error, 0 otherwise.
-# \%OPTIONS is the hash to fill with options data, $WHERE is
-# the location where @OPTIONS occurred.
-sub _process_option_list (\%$@)
+# _process_option_list (\%OPTIONS, @LIST)
+# ------------------------------------------
+# Process a list of options.  \%OPTIONS is the hash to fill with options
+# data.  @LIST is a list of options as get passed to public subroutines
+# process_option_list() and process_global_option_list() (see POD
+# documentation above).
+sub _process_option_list (\%@)
 {
-  my ($options, $where, @list) = @_;
+  my ($options, @list) = @_;
+  my @warnings = ();
 
-  foreach (@list)
+  foreach my $h (@list)
     {
+      local $_ = $h->{'option'};
+      my $where = $h->{'where'};
       $options->{$_} = $where;
       if ($_ eq 'gnits' || $_ eq 'gnu' || $_ eq 'foreign')
-       {
-         set_strictness ($_);
-       }
+        {
+          set_strictness ($_);
+        }
       elsif (/^(.*\/)?ansi2knr$/)
-       {
-          # This feature is deprecated, will be removed in the next
-          # Automake major release.
-          msg 'obsolete', $where,
-              "automatic de-ANSI-fication support is deprecated\n";
-         # An option like "../lib/ansi2knr" is allowed.  With no
-         # path prefix, we assume the required programs are in this
-         # directory.  We save the actual option for later.
-         $options->{'ansi2knr'} = [$_, $where];
-       }
+        {
+          # Obsolete (and now removed) de-ANSI-fication support.
+          error ($where,
+                 "automatic de-ANSI-fication support has been removed");
+        }
       elsif ($_ eq 'dist-lzma')
         {
-          # Creation of distribution tarball compressed with lzma is
-          # deprecated, will be removed in the next major release.
-          msg 'obsolete', $where,
-              "lzma compression is deprecated; use `dist-xz' " .
-              "or `dist-lzip' instead\n";
+          error ($where, "support for lzma-compressed distribution " .
+                         "archives has been removed");
         }
-      elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
-            || $_ eq 'dist-shar' || $_ eq 'dist-zip'
-            || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
-            || $_ eq 'dist-lzip' || $_ eq 'dist-xz'
-            || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
-            || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
-            || $_ eq 'readme-alpha' || $_ eq 'check-news'
-            || $_ eq 'subdir-objects' || $_ eq 'nostdinc'
-            || $_ eq 'no-exeext' || $_ eq 'no-define'
-            || $_ eq 'std-options'
-            || $_ eq 'color-tests' || $_ eq 'parallel-tests'
-            || $_ eq 'cygnus' || $_ eq 'no-dependencies')
-       {
-         # Explicitly recognize these.
-       }
-      elsif ($_ =~ /^filename-length-max=(\d+)$/)
-       {
-         delete $options->{$_};
-         $options->{'filename-length-max'} = [$_, $1];
-       }
-      elsif ($_ eq  'silent-rules')
+      elsif ($_ eq 'parallel-tests')
         {
-         error ($where,
-                "option `$_' can only be used as argument to 
AM_INIT_AUTOMAKE\n"
-                . "but not in AUTOMAKE_OPTIONS makefile statements")
-           if $where->get !~ /^configure\./;
-       }
+          # Just recognize it explicitly.
+        }
+      elsif ($_ eq 'serial-tests')
+        {
+          # This is a little of an hack, but good enough for the moment.
+          delete $options->{'parallel-tests'};
+        }
+      elsif (/^filename-length-max=(\d+)$/)
+        {
+          delete $options->{$_};
+          $options->{'filename-length-max'} = [$_, $1];
+        }
+      elsif ($_ eq 'silent-rules')
+        {
+          _option_must_be_from_configure ($_, $where);
+        }
       elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
-       {
-         error ($where,
-                "option `$_' can only be used as argument to 
AM_INIT_AUTOMAKE\n"
-                . "but not in AUTOMAKE_OPTIONS makefile statements")
-           if $where->get !~ /^configure\./;
-         for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
-           {
-             next if $opt eq $_;
-             if (exists $options->{$opt})
-               {
-                 error ($where,
-                        "options `$_' and `$opt' are mutually exclusive");
-                 last;
-               }
-           }
-       }
+        {
+          _option_must_be_from_configure ($_, $where);
+          for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
+            {
+              next
+                if $opt eq $_ or ! exists $options->{$opt};
+              error ($where,
+                     "options '$_' and '$opt' are mutually exclusive");
+              last;
+            }
+        }
       elsif (/^\d+\.\d+(?:\.\d+)?[a-z]?(?:-[A-Za-z0-9]+)?$/)
-       {
-         # Got a version number.
-         if (Automake::Version::check ($VERSION, $&))
-           {
-             error ($where, "require Automake $_, but have $VERSION",
-                    uniq_scope => US_GLOBAL);
-             return 1;
-           }
-       }
+        {
+          # Got a version number.
+          if (Automake::Version::check ($VERSION, $&))
+            {
+              error ($where, "require Automake $_, but have $VERSION",
+                     uniq_scope => US_GLOBAL);
+              return 1;
+            }
+        }
       elsif (/^(?:--warnings=|-W)(.*)$/)
-       {
-         foreach my $cat (split (',', $1))
-           {
-             msg 'unsupported', $where, "unknown warning category `$cat'"
-               if switch_warning $cat;
-           }
-       }
-      else
-       {
-         error ($where, "option `$_' not recognized",
-                uniq_scope => US_GLOBAL);
-         return 1;
-       }
+        {
+          my @w = map { { cat => $_, loc => $where} } split (',', $1);
+          push @warnings, @w;
+        }
+      elsif (! _is_valid_easy_option $_)
+        {
+          error ($where, "option '$_' not recognized",
+                 uniq_scope => US_GLOBAL);
+          return 1;
+        }
+    }
+  # We process warnings here, so that any explicitly-given warning setting
+  # will take precedence over warning settings defined implicitly by the
+  # strictness.
+  foreach my $w (@warnings)
+    {
+      msg 'unsupported', $w->{'loc'},
+          "unknown warning category '$w->{'cat'}'"
+        if switch_warning $w->{cat};
     }
   return 0;
 }
 
-sub process_option_list ($@)
+sub process_option_list (@)
 {
-  my ($where, @list) = @_;
-  return _process_option_list (%_options, $where, @list);
+  prog_error "local options already processed"
+    if $_options_processed;
+  return _process_option_list (%_options, @_);
+  $_options_processed = 1;
 }
 
-sub process_global_option_list ($@)
+sub process_global_option_list (@)
 {
-  my ($where, @list) = @_;
-  return _process_option_list (%_global_options, $where, @list);
+  prog_error "global options already processed"
+    if $_global_options_processed;
+  return _process_option_list (%_global_options, @_);
+  $_global_options_processed = 1;
 }
 
 =item C<set_strictness ($name)>
@@ -381,7 +432,7 @@ sub set_strictness ($)
     }
   else
     {
-      prog_error "level `$strictness_name' not recognized\n";
+      prog_error "level '$strictness_name' not recognized";
     }
 }
 
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 3184b24..3f17daa 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2006, 2007, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Rule;
+
+use 5.006;
 use strict;
 use Carp;
 
@@ -159,7 +160,7 @@ use vars '$suffix_rules';
 
 Pattern that matches all know input extensions (i.e. extensions used
 by the languages supported by Automake).  Using this pattern (instead
-of `\..*$') to match extensions allows Automake to support dot-less
+of '\..*$') to match extensions allows Automake to support dot-less
 extensions.
 
 New extensions should be registered with C<accept_extensions>.
@@ -377,7 +378,7 @@ sub reset()
 
      # Phonying.
      '.PHONY'               => [],
-     # Recursive install targets (so `make -n install' works for BSD Make).
+     # Recursive install targets (so "make -n install" works for BSD Make).
      '.MAKE'               => [],
      );
   %actions = ();
@@ -401,13 +402,13 @@ sub register_suffix_rule ($$$)
 
   # When transforming sources to objects, Automake uses the
   # %suffix_rules to move from each source extension to
-  # `.$(OBJEXT)', not to `.o' or `.obj'.  However some people
-  # define suffix rules for `.o' or `.obj', so internally we will
-  # consider these extensions equivalent to `.$(OBJEXT)'.  We
-  # CANNOT rewrite the target (i.e., automagically replace `.o'
-  # and `.obj' by `.$(OBJEXT)' in the output), or warn the user
-  # that (s)he'd better use `.$(OBJEXT)', because Automake itself
-  # output suffix rules for `.o' or `.obj' ...
+  # '.$(OBJEXT)', not to '.o' or '.obj'.  However some people
+  # define suffix rules for '.o' or '.obj', so internally we will
+  # consider these extensions equivalent to '.$(OBJEXT)'.  We
+  # CANNOT rewrite the target (i.e., automagically replace '.o'
+  # and '.obj' by '.$(OBJEXT)' in the output), or warn the user
+  # that (s)he'd better use '.$(OBJEXT)', because Automake itself
+  # output suffix rules for '.o' or '.obj' ...
   $dest = '.$(OBJEXT)' if ($dest eq '.o' || $dest eq '.obj');
 
   # Reading the comments near the declaration of $suffix_rules might
@@ -497,7 +498,7 @@ sub rule ($)
 {
   my ($name) = @_;
   # Strip $(EXEEXT) from $name, so we can diagnose
-  # a clash if `ctags$(EXEEXT):' is redefined after `ctags:'.
+  # a clash if 'ctags$(EXEEXT):' is redefined after 'ctags:'.
   $name =~ s,\$\(EXEEXT\)$,,;
   return $_rule_dict{$name} || 0;
 }
@@ -566,7 +567,7 @@ sub _new ($$)
   my ($class, $name) = @_;
 
   # Strip $(EXEEXT) from $name, so we can diagnose
-  # a clash if `ctags$(EXEEXT):' is redefined after `ctags:'.
+  # a clash if 'ctags$(EXEEXT):' is redefined after 'ctags:'.
   (my $keyname = $name) =~ s,\$\(EXEEXT\)$,,;
 
   my $self = Automake::Item::new ($class, $name);
@@ -574,6 +575,178 @@ sub _new ($$)
   return $self;
 }
 
+sub _rule_defn_with_exeext_awareness ($$$)
+{
+  my ($target, $cond, $where) = @_;
+
+  # For now 'foo:' will override 'foo$(EXEEXT):'.  This is temporary,
+  # though, so we emit a warning.
+  (my $noexe = $target) =~ s/\$\(EXEEXT\)$//;
+  my $noexerule = rule $noexe;
+  my $tdef = $noexerule ? $noexerule->def ($cond) : undef;
+
+  if ($noexe ne $target
+      && $tdef
+      && $noexerule->name ne $target)
+    {
+      # The no-exeext option enables this feature.
+      if (! option 'no-exeext')
+       {
+         msg ('obsolete', $tdef->location,
+              "deprecated feature: target '$noexe' overrides "
+              . "'$noexe\$(EXEEXT)'\n"
+              . "change your target to read '$noexe\$(EXEEXT)'",
+              partial => 1);
+         msg ('obsolete', $where, "target '$target' was defined here");
+       }
+    }
+    return $tdef;
+}
+
+sub _maybe_warn_about_duplicated_target ($$$$$$)
+{
+  my ($target, $tdef, $source, $owner, $cond, $where) = @_;
+
+  my $oldowner  = $tdef->owner;
+  # Ok, it's the name target, but the name maybe different because
+  # 'foo$(EXEEXT)' and 'foo' have the same key in our table.
+  my $oldname = $tdef->name;
+
+  # Don't mention true conditions in diagnostics.
+  my $condmsg =
+    $cond == TRUE ? '' : (" in condition '" . $cond->human . "'");
+
+  if ($owner == RULE_USER)
+    {
+      if ($oldowner == RULE_USER)
+        {
+          # Ignore '%'-style pattern rules.  We'd need the
+          # dependencies to detect duplicates, and they are
+          # already diagnosed as unportable by -Wportability.
+          if ($target !~ /^[^%]*%[^%]*$/)
+            {
+              ## FIXME: Presently we can't diagnose duplicate user rules
+              ## because we don't distinguish rules with commands
+              ## from rules that only add dependencies.  E.g.,
+              ##   .PHONY: foo
+              ##   .PHONY: bar
+              ## is legitimate. (This is phony.test.)
+
+              # msg ('syntax', $where,
+              #      "redefinition of '$target'$condmsg ...", partial => 1);
+              # msg_cond_rule ('syntax', $cond, $target,
+              #                "... '$target' previously defined here");
+            }
+        }
+      else
+        {
+          # Since we parse the user Makefile.am before reading
+          # the Automake fragments, this condition should never happen.
+          prog_error ("user target '$target'$condmsg seen after Automake's"
+                      . " definition\nfrom " . $tdef->source);
+        }
+    }
+  else # $owner == RULE_AUTOMAKE
+    {
+      if ($oldowner == RULE_USER)
+        {
+          # -am targets listed in %dependencies support a -local
+          # variant.  If the user tries to override TARGET or
+          # TARGET-am for which there exists a -local variant,
+          # just tell the user to use it.
+          my $hint = 0;
+          my $noam = $target;
+          $noam =~ s/-am$//;
+          if (exists $dependencies{"$noam-am"})
+            {
+              $hint = "consider using $noam-local instead of $target";
+            }
+
+          msg_cond_rule ('override', $cond, $target,
+                         "user target '$target' defined here"
+                         . "$condmsg ...", partial => 1);
+          msg ('override', $where,
+               "... overrides Automake target '$oldname' defined here",
+               partial => $hint);
+          msg_cond_rule ('override', $cond, $target, $hint)
+            if $hint;
+        }
+      else # $oldowner == RULE_AUTOMAKE
+        {
+          # Automake should ignore redefinitions of its own
+          # rules if they came from the same file.  This makes
+          # it easier to process a Makefile fragment several times.
+          # However it's an error if the target is defined in many
+          # files.  E.g., the user might be using bin_PROGRAMS = ctags
+          # which clashes with our 'ctags' rule.
+          # (It would be more accurate if we had a way to compare
+          # the *content* of both rules.  Then $targets_source would
+          # be useless.)
+          my $oldsource = $tdef->source;
+          if (not ($source eq $oldsource && $target eq $oldname))
+            {
+               msg ('syntax',
+                    $where, "redefinition of '$target'$condmsg ...",
+                    partial => 1);
+               msg_cond_rule ('syntax', $cond, $target,
+                              "... '$oldname' previously defined here");
+            }
+        }
+    }
+}
+
+# Return the list of conditionals in which the rule was defined.  In case
+# an ambiguous conditional definition is detected, return the empty list.
+sub _conditionals_for_rule ($$$$)
+{
+  my ($rule, $owner, $cond, $where) = @_;
+  my $target = $rule->name;
+  my @conds;
+  my ($message, $ambig_cond) = $rule->conditions->ambiguous_p ($target, $cond);
+
+  return $cond if !$message; # No ambiguity.
+
+  if ($owner == RULE_USER)
+    {
+      # For user rules, just diagnose the ambiguity.
+      msg 'syntax', $where, "$message ...", partial => 1;
+      msg_cond_rule ('syntax', $ambig_cond, $target,
+                     "... '$target' previously defined here");
+      return ();
+    }
+
+  # FIXME: for Automake rules, we can't diagnose ambiguities yet.
+  # The point is that Automake doesn't propagate conditions
+  # everywhere.  For instance &handle_PROGRAMS doesn't care if
+  # bin_PROGRAMS was defined conditionally or not.
+  # On the following input
+  #   if COND1
+  #   foo:
+  #           ...
+  #   else
+  #   bin_PROGRAMS = foo
+  #   endif
+  # &handle_PROGRAMS will attempt to define a 'foo:' rule
+  # in condition TRUE (which conflicts with COND1).  Fixing
+  # this in &handle_PROGRAMS and siblings seems hard: you'd
+  # have to explain &file_contents what to do with a
+  # condition.  So for now we do our best *here*.  If 'foo:'
+  # was already defined in condition COND1 and we want to define
+  # it in condition TRUE, then define it only in condition !COND1.
+  # (See cond14.test and cond15.test for some test cases.)
+  @conds = $rule->not_always_defined_in_cond ($cond)->conds;
+
+  # No conditions left to define the rule.
+  # Warn, because our workaround is meaningless in this case.
+  if (scalar @conds == 0)
+    {
+      msg 'syntax', $where, "$message ...", partial => 1;
+      msg_cond_rule ('syntax', $ambig_cond, $target,
+                     "... '$target' previously defined here");
+      return ();
+    }
+  return @conds;
+}
 
 =item C<@conds = define ($rulename, $source, $owner, $cond, $where)>
 
@@ -600,185 +773,38 @@ sub define ($$$$$)
   # Don't even think about defining a rule in condition FALSE.
   return () if $cond == FALSE;
 
-  # For now `foo:' will override `foo$(EXEEXT):'.  This is temporary,
-  # though, so we emit a warning.
-  (my $noexe = $target) =~ s,\$\(EXEEXT\)$,,;
-  my $noexerule = rule $noexe;
-  my $tdef = $noexerule ? $noexerule->def ($cond) : undef;
-
-  if ($noexe ne $target
-      && $tdef
-      && $noexerule->name ne $target)
-    {
-      # The no-exeext option enables this feature.
-      if (! option 'no-exeext')
-       {
-         msg ('obsolete', $tdef->location,
-              "deprecated feature: target `$noexe' overrides "
-              . "`$noexe\$(EXEEXT)'\n"
-              . "change your target to read `$noexe\$(EXEEXT)'");
-         msg ('obsolete', $where, "target `$target' was defined here");
-       }
-      # Don't `return ()' now, as this might hide target clashes
-      # detected below.
-    }
-
+  my $tdef = _rule_defn_with_exeext_awareness ($target, $cond, $where);
 
   # A GNU make-style pattern rule has a single "%" in the target name.
   msg ('portability', $where,
-       "`%'-style pattern rules are a GNU make extension")
+       "'%'-style pattern rules are a GNU make extension")
     if $target =~ /^[^%]*%[^%]*$/;
 
-  # Diagnose target redefinitions.
+  # See whether this is a duplicated target declaration.
   if ($tdef)
     {
-      my $oldowner  = $tdef->owner;
-      # Ok, it's the name target, but the name maybe different because
-      # `foo$(EXEEXT)' and `foo' have the same key in our table.
-      my $oldname = $tdef->name;
-
-      # Don't mention true conditions in diagnostics.
-      my $condmsg =
-       $cond == TRUE ? '' : " in condition `" . $cond->human . "'";
-
-      if ($owner == RULE_USER)
-       {
-         if ($oldowner == RULE_USER)
-           {
-             # Ignore `%'-style pattern rules.  We'd need the
-             # dependencies to detect duplicates, and they are
-             # already diagnosed as unportable by -Wportability.
-             if ($target !~ /^[^%]*%[^%]*$/)
-               {
-                 ## FIXME: Presently we can't diagnose duplicate user rules
-                 ## because we don't distinguish rules with commands
-                 ## from rules that only add dependencies.  E.g.,
-                 ##   .PHONY: foo
-                 ##   .PHONY: bar
-                 ## is legitimate. (This is phony.test.)
-
-                 # msg ('syntax', $where,
-                 #      "redefinition of `$target'$condmsg...", partial => 1);
-                 # msg_cond_rule ('syntax', $cond, $target,
-                 #                "... `$target' previously defined here");
-               }
-             # Return so we don't redefine the rule in our tables,
-             # don't check for ambiguous condition, etc.  The rule
-             # will be output anyway because &read_am_file ignore the
-             # return code.
-             return ();
-           }
-         else
-           {
-             # Since we parse the user Makefile.am before reading
-             # the Automake fragments, this condition should never happen.
-             prog_error ("user target `$target'$condmsg seen after Automake's"
-                         . " definition\nfrom " . $tdef->source);
-           }
-       }
-      else # $owner == RULE_AUTOMAKE
-       {
-         if ($oldowner == RULE_USER)
-           {
-             # -am targets listed in %dependencies support a -local
-             # variant.  If the user tries to override TARGET or
-             # TARGET-am for which there exists a -local variant,
-             # just tell the user to use it.
-             my $hint = 0;
-             my $noam = $target;
-             $noam =~ s/-am$//;
-             if (exists $dependencies{"$noam-am"})
-               {
-                 $hint = "consider using $noam-local instead of $target";
-               }
-
-             msg_cond_rule ('override', $cond, $target,
-                            "user target `$target' defined here"
-                            . "$condmsg...", partial => 1);
-             msg ('override', $where,
-                  "... overrides Automake target `$oldname' defined here",
-                  partial => $hint);
-             msg_cond_rule ('override', $cond, $target, $hint)
-               if $hint;
-
-             # Don't overwrite the user definition of TARGET.
-             return ();
-           }
-         else # $oldowner == RULE_AUTOMAKE
-           {
-             # Automake should ignore redefinitions of its own
-             # rules if they came from the same file.  This makes
-             # it easier to process a Makefile fragment several times.
-             # However it's an error if the target is defined in many
-             # files.  E.g., the user might be using bin_PROGRAMS = ctags
-             # which clashes with our `ctags' rule.
-             # (It would be more accurate if we had a way to compare
-             # the *content* of both rules.  Then $targets_source would
-             # be useless.)
-             my $oldsource = $tdef->source;
-             return () if $source eq $oldsource && $target eq $oldname;
-
-             msg ('syntax', $where, "redefinition of `$target'$condmsg...",
-                  partial => 1);
-             msg_cond_rule ('syntax', $cond, $target,
-                            "... `$oldname' previously defined here");
-             return ();
-           }
-       }
-      # Never reached.
-      prog_error ("Unreachable place reached.");
+      # Diagnose invalid target redefinitions, if any.  Note that some
+      # target redefinitions are valid (e.g., for multiple-targets
+      # pattern rules).
+      _maybe_warn_about_duplicated_target ($target, $tdef, $source,
+                                           $owner, $cond, $where);
+      # Return so we don't redefine the rule in our tables, don't check
+      # for ambiguous condition, etc.  The rule will be output anyway
+      # because '&read_am_file' ignores the return code.
+      return ();
     }
 
-  # Conditions for which the rule should be defined.
-  my @conds = $cond;
-
-  # Check ambiguous conditional definitions.
   my $rule = _crule $target;
-  my ($message, $ambig_cond) = $rule->conditions->ambiguous_p ($target, $cond);
-  if ($message)                        # We have an ambiguity.
-    {
-      if ($owner == RULE_USER)
-       {
-         # For user rules, just diagnose the ambiguity.
-         msg 'syntax', $where, "$message ...", partial => 1;
-         msg_cond_rule ('syntax', $ambig_cond, $target,
-                        "... `$target' previously defined here");
-         return ();
-       }
-      else
-       {
-         # FIXME: for Automake rules, we can't diagnose ambiguities yet.
-         # The point is that Automake doesn't propagate conditions
-         # everywhere.  For instance &handle_PROGRAMS doesn't care if
-         # bin_PROGRAMS was defined conditionally or not.
-         # On the following input
-         #   if COND1
-         #   foo:
-         #           ...
-         #   else
-         #   bin_PROGRAMS = foo
-         #   endif
-         # &handle_PROGRAMS will attempt to define a `foo:' rule
-         # in condition TRUE (which conflicts with COND1).  Fixing
-         # this in &handle_PROGRAMS and siblings seems hard: you'd
-         # have to explain &file_contents what to do with a
-         # condition.  So for now we do our best *here*.  If `foo:'
-         # was already defined in condition COND1 and we want to define
-         # it in condition TRUE, then define it only in condition !COND1.
-         # (See cond14.test and cond15.test for some test cases.)
-         @conds = $rule->not_always_defined_in_cond ($cond)->conds;
-
-         # No conditions left to define the rule.
-         # Warn, because our workaround is meaningless in this case.
-         if (scalar @conds == 0)
-           {
-             msg 'syntax', $where, "$message ...", partial => 1;
-             msg_cond_rule ('syntax', $ambig_cond, $target,
-                            "... `$target' previously defined here");
-             return ();
-           }
-       }
-    }
+
+  # Conditions for which the rule should be defined.  Due to some
+  # complications in the automake internals, this aspect is not as
+  # obvious as it might be, and in come cases this list must contain
+  # other entries in addition to '$cond'.  See the comments in
+  # '_conditionals_for_rule' for a rationale.
+  my @conds = _conditionals_for_rule ($rule, $owner, $cond, $where);
+
+  # Stop if we had ambiguous conditional definitions.
+  return unless @conds;
 
   # Finally define this rule.
   for my $c (@conds)
@@ -801,12 +827,10 @@ sub define ($$$$$)
       # two known extensions...
       if ($t =~ /^($KNOWN_EXTENSIONS_PATTERN)($KNOWN_EXTENSIONS_PATTERN)$/
          # ...or it's a rule with unknown extensions (i.e., the rule
-         # looks like `.foo.bar:' but `.foo' or `.bar' are not
+         # looks like '.foo.bar:' but '.foo' or '.bar' are not
          # declared in SUFFIXES and are not known language
          # extensions).  Automake will complete SUFFIXES from
          # @suffixes automatically (see handle_footer).
-
-
          || ($t =~ /$_SUFFIX_RULE_PATTERN/o && accept_extensions($1)))
        {
          ++$inference_rule_count;
@@ -818,7 +842,7 @@ sub define ($$$$$)
   # definitions of multiple inference rules.  It's also
   # disallowed to mix plain targets with inference rules.
   msg ('portability', $where,
-       "Inference rules can have only one target before the colon (POSIX).")
+       "inference rules can have only one target before the colon (POSIX)")
     if $inference_rule_count > 0 && $target_count > 1;
 
   return @conds;
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 20bc106..571111c 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::RuleDef;
+
+use 5.006;
 use strict;
 use Carp;
 use Automake::ChannelDefs;
@@ -36,6 +38,7 @@ Automake::RuleDef - a class for rule definitions
 =head1 DESCRIPTION
 
 This class gathers data related to one Makefile-rule definition.
+It shouldn't be needed outside of F<Rule.pm>.
 
 =head2 Constants
 
@@ -50,6 +53,20 @@ Possible owners for rules.
 use constant RULE_AUTOMAKE => 0; # Rule defined by Automake.
 use constant RULE_USER => 1;     # Rule defined in the user's Makefile.am.
 
+=back
+
+=head2 Methods
+
+=over 4
+
+=item C<new Automake::RuleDef ($name, $comment, $location, $owner, $source)>
+
+Create a new rule definition with target C<$name>, with associated comment
+C<$comment>, Location C<$location> and owner C<$owner>, defined in file
+C<$source>.
+
+=cut
+
 sub new ($$$$$)
 {
   my ($class, $name, $comment, $location, $owner, $source) = @_;
@@ -60,12 +77,24 @@ sub new ($$$$$)
   return $self;
 }
 
+=item C<$source = $rule-E<gt>source>
+
+Return the source of the rule.
+
+=cut
+
 sub source ($)
 {
   my ($self) = @_;
   return $self->{'source'};
 }
 
+=item C<$name = $rule-E<gt>name>
+
+Return the name of the rule.
+
+=cut
+
 sub name ($)
 {
   my ($self) = @_;
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
deleted file mode 100644
index ae42db2..0000000
--- a/lib/Automake/Struct.pm
+++ /dev/null
@@ -1,628 +0,0 @@
-# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This file is basically Perl 5.6's Class::Struct, but made compatible
-# with Perl 5.5.  If someday this has to be updated, be sure to rename
-# all the occurrences of Class::Struct into Automake::Struct, otherwise
-# if we `use' a Perl module (e.g., File::stat) that uses Class::Struct,
-# we would have two packages defining the same symbols.  Boom.
-
-###############################################################
-# The main copy of this file is in Automake's git repository. #
-# Updates should be sent to address@hidden         #
-###############################################################
-
-package Automake::Struct;
-
-## See POD after __END__
-
-use 5.005_03;
-
-use strict;
-use vars qw(@ISA @EXPORT $VERSION);
-
-use Carp;
-
-require Exporter;
address@hidden = qw(Exporter);
address@hidden = qw(struct);
-
-$VERSION = '0.58';
-
-## Tested on 5.002 and 5.003 without class membership tests:
-my $CHECK_CLASS_MEMBERSHIP = ($] >= 5.003_95);
-
-my $print = 0;
-sub printem {
-    if (@_) { $print = shift }
-    else    { $print++ }
-}
-
-{
-    package Automake::Struct::Tie_ISA;
-
-    sub TIEARRAY {
-        my $class = shift;
-        return bless [], $class;
-    }
-
-    sub STORE {
-        my ($self, $index, $value) = @_;
-        Automake::Struct::_subclass_error();
-    }
-
-    sub FETCH {
-        my ($self, $index) = @_;
-        $self->[$index];
-    }
-
-    sub FETCHSIZE {
-        my $self = shift;
-        return scalar(@$self);
-    }
-
-    sub DESTROY { }
-}
-
-sub struct {
-
-    # Determine parameter list structure, one of:
-    #   struct( class => [ element-list ])
-    #   struct( class => { element-list })
-    #   struct( element-list )
-    # Latter form assumes current package name as struct name.
-
-    my ($class, @decls);
-    my $base_type = ref $_[1];
-    if ( $base_type eq 'HASH' ) {
-        $class = shift;
-        @decls = %{shift()};
-        _usage_error() if @_;
-    }
-    elsif ( $base_type eq 'ARRAY' ) {
-        $class = shift;
-        @decls = @{shift()};
-        _usage_error() if @_;
-    }
-    else {
-        $base_type = 'ARRAY';
-        $class = (caller())[0];
-        @decls = @_;
-    }
-    _usage_error() if @decls % 2 == 1;
-
-    # Ensure we are not, and will not be, a subclass.
-
-    my $isa = do {
-        no strict 'refs';
-        address@hidden . '::ISA'};
-    };
-    _subclass_error() if @$isa;
-    tie @$isa, 'Automake::Struct::Tie_ISA';
-
-    # Create constructor.
-
-    croak "function 'new' already defined in package $class"
-        if do { no strict 'refs'; defined &{$class . "::new"} };
-
-    my @methods = ();
-    my %refs = ();
-    my %arrays = ();
-    my %hashes = ();
-    my %classes = ();
-    my $got_class = 0;
-    my $out = '';
-
-    $out = "{\n  package $class;\n  use Carp;\n  sub new {\n";
-    $out .= "    my (\$class, \%init) = address@hidden;\n";
-    $out .= "    \$class = __PACKAGE__ unless address@hidden;\n";
-
-    my $cnt = 0;
-    my $idx = 0;
-    my( $cmt, $name, $type, $elem );
-
-    if( $base_type eq 'HASH' ){
-        $out .= "    my(\$r) = {};\n";
-        $cmt = '';
-    }
-    elsif( $base_type eq 'ARRAY' ){
-        $out .= "    my(\$r) = [];\n";
-    }
-    while( $idx < @decls ){
-        $name = $decls[$idx];
-        $type = $decls[$idx+1];
-        push( @methods, $name );
-        if( $base_type eq 'HASH' ){
-            $elem = "{'${class}::$name'}";
-        }
-        elsif( $base_type eq 'ARRAY' ){
-            $elem = "[$cnt]";
-            ++$cnt;
-            $cmt = " # $name";
-        }
-        if( $type =~ /^\*(.)/ ){
-            $refs{$name}++;
-            $type = $1;
-        }
-        my $init = "defined(\$init{'$name'}) ? \$init{'$name'} :";
-        if( $type eq '@' ){
-            $out .= "    croak 'Initializer for $name must be array 
reference'\n";
-            $out .= "        if defined(\$init{'$name'}) && 
ref(\$init{'$name'}) ne 'ARRAY';\n";
-            $out .= "    \$r->$elem = $init [];$cmt\n";
-            $arrays{$name}++;
-        }
-        elsif( $type eq '%' ){
-            $out .= "    croak 'Initializer for $name must be hash 
reference'\n";
-            $out .= "        if defined(\$init{'$name'}) && 
ref(\$init{'$name'}) ne 'HASH';\n";
-            $out .= "    \$r->$elem = $init {};$cmt\n";
-            $hashes{$name}++;
-        }
-        elsif ( $type eq '$') {
-            $out .= "    \$r->$elem = $init undef;$cmt\n";
-        }
-        elsif( $type =~ /^\w+(?:::\w+)*$/ ){
-            $init = "defined(\$init{'$name'}) ? \%{\$init{'$name'}} : ()";
-            $out .= "    croak 'Initializer for $name must be hash 
reference'\n";
-            $out .= "        if defined(\$init{'$name'}) && 
ref(\$init{'$name'}) ne 'HASH';\n";
-            $out .= "    \$r->$elem = '${type}'->new($init);$cmt\n";
-            $classes{$name} = $type;
-            $got_class = 1;
-        }
-        else{
-            croak "'$type' is not a valid struct element type";
-        }
-        $idx += 2;
-    }
-    $out .= "    bless \$r, \$class;\n  }\n";
-
-    # Create accessor methods.
-
-    my( $pre, $pst, $sel );
-    $cnt = 0;
-    foreach $name (@methods){
-        if ( do { no strict 'refs'; defined &{$class . "::$name"} } ) {
-            carp "function '$name' already defined, overrides struct accessor 
method";
-        }
-        else {
-            $pre = $pst = $cmt = $sel = '';
-            if( defined $refs{$name} ){
-                $pre = "\\(";
-                $pst = ")";
-                $cmt = " # returns ref";
-            }
-            $out .= "  sub $name {$cmt\n    my \$r = shift;\n";
-            if( $base_type eq 'ARRAY' ){
-                $elem = "[$cnt]";
-                ++$cnt;
-            }
-            elsif( $base_type eq 'HASH' ){
-                $elem = "{'${class}::$name'}";
-            }
-            if( defined $arrays{$name} ){
-                $out .= "    my \$i;\n";
-                $out .= "    address@hidden ? (\$i = shift) : return 
\$r->$elem;\n";
-                $sel = "->[\$i]";
-            }
-            elsif( defined $hashes{$name} ){
-                $out .= "    my \$i;\n";
-                $out .= "    address@hidden ? (\$i = shift) : return 
\$r->$elem;\n";
-                $sel = "->{\$i}";
-            }
-            elsif( defined $classes{$name} ){
-                if ( $CHECK_CLASS_MEMBERSHIP ) {
-                    $out .= "    croak '$name argument is wrong class' if 
address@hidden && ! UNIVERSAL::isa(\$_[0], '$classes{$name}');\n";
-                }
-            }
-            $out .= "    croak 'Too many args to $name' if address@hidden > 
1;\n";
-            $out .= "    address@hidden ? ($pre\$r->$elem$sel = shift$pst) : 
$pre\$r->$elem$sel$pst;\n";
-            $out .= "  }\n";
-        }
-    }
-    $out .= "}\n1;\n";
-
-    print $out if $print;
-    my $result = eval $out;
-    carp $@ if $@;
-}
-
-sub _usage_error {
-    confess "struct usage error";
-}
-
-sub _subclass_error {
-    croak 'struct class cannot be a subclass (@ISA not allowed)';
-}
-
-1; # for require
-
-
-__END__
-
-=head1 NAME
-
-Automake::Struct - declare struct-like datatypes as Perl classes
-
-=head1 SYNOPSIS
-
-    use Automake::Struct;
-            # declare struct, based on array:
-    struct( CLASS_NAME => [ ELEMENT_NAME => ELEMENT_TYPE, ... ]);
-            # declare struct, based on hash:
-    struct( CLASS_NAME => { ELEMENT_NAME => ELEMENT_TYPE, ... });
-
-    package CLASS_NAME;
-    use Automake::Struct;
-            # declare struct, based on array, implicit class name:
-    struct( ELEMENT_NAME => ELEMENT_TYPE, ... );
-
-
-    package Myobj;
-    use Automake::Struct;
-            # declare struct with four types of elements:
-    struct( s => '$', a => '@', h => '%', c => 'My_Other_Class' );
-
-    $obj = new Myobj;               # constructor
-
-                                    # scalar type accessor:
-    $element_value = $obj->s;           # element value
-    $obj->s('new value');               # assign to element
-
-                                    # array type accessor:
-    $ary_ref = $obj->a;                 # reference to whole array
-    $ary_element_value = $obj->a(2);    # array element value
-    $obj->a(2, 'new value');            # assign to array element
-
-                                    # hash type accessor:
-    $hash_ref = $obj->h;                # reference to whole hash
-    $hash_element_value = $obj->h('x'); # hash element value
-    $obj->h('x', 'new value');        # assign to hash element
-
-                                    # class type accessor:
-    $element_value = $obj->c;           # object reference
-    $obj->c->method(...);               # call method of object
-    $obj->c(new My_Other_Class);        # assign a new object
-
-
-=head1 DESCRIPTION
-
-C<Automake::Struct> exports a single function, C<struct>.
-Given a list of element names and types, and optionally
-a class name, C<struct> creates a Perl 5 class that implements
-a "struct-like" data structure.
-
-The new class is given a constructor method, C<new>, for creating
-struct objects.
-
-Each element in the struct data has an accessor method, which is
-used to assign to the element and to fetch its value.  The
-default accessor can be overridden by declaring a C<sub> of the
-same name in the package.  (See Example 2.)
-
-Each element's type can be scalar, array, hash, or class.
-
-
-=head2 The C<struct()> function
-
-The C<struct> function has three forms of parameter-list.
-
-    struct( CLASS_NAME => [ ELEMENT_LIST ]);
-    struct( CLASS_NAME => { ELEMENT_LIST });
-    struct( ELEMENT_LIST );
-
-The first and second forms explicitly identify the name of the
-class being created.  The third form assumes the current package
-name as the class name.
-
-An object of a class created by the first and third forms is
-based on an array, whereas an object of a class created by the
-second form is based on a hash. The array-based forms will be
-somewhat faster and smaller; the hash-based forms are more
-flexible.
-
-The class created by C<struct> must not be a subclass of another
-class other than C<UNIVERSAL>.
-
-It can, however, be used as a superclass for other classes. To facilitate
-this, the generated constructor method uses a two-argument blessing.
-Furthermore, if the class is hash-based, the key of each element is
-prefixed with the class name (see I<Perl Cookbook>, Recipe 13.12).
-
-A function named C<new> must not be explicitly defined in a class
-created by C<struct>.
-
-The I<ELEMENT_LIST> has the form
-
-    NAME => TYPE, ...
-
-Each name-type pair declares one element of the struct. Each
-element name will be defined as an accessor method unless a
-method by that name is explicitly defined; in the latter case, a
-warning is issued if the warning flag (B<-w>) is set.
-
-
-=head2 Element Types and Accessor Methods
-
-The four element types -- scalar, array, hash, and class -- are
-represented by strings -- C<'$'>, C<'@'>, C<'%'>, and a class name --
-optionally preceded by a C<'*'>.
-
-The accessor method provided by C<struct> for an element depends
-on the declared type of the element.
-
-=over
-
-=item Scalar (C<'$'> or C<'*$'>)
-
-The element is a scalar, and by default is initialized to C<undef>
-(but see L<Initializing with new>).
-
-The accessor's argument, if any, is assigned to the element.
-
-If the element type is C<'$'>, the value of the element (after
-assignment) is returned. If the element type is C<'*$'>, a reference
-to the element is returned.
-
-=item Array (C<'@'> or C<'*@'>)
-
-The element is an array, initialized by default to C<()>.
-
-With no argument, the accessor returns a reference to the
-element's whole array (whether or not the element was
-specified as C<'@'> or C<'*@'>).
-
-With one or two arguments, the first argument is an index
-specifying one element of the array; the second argument, if
-present, is assigned to the array element.  If the element type
-is C<'@'>, the accessor returns the array element value.  If the
-element type is C<'*@'>, a reference to the array element is
-returned.
-
-=item Hash (C<'%'> or C<'*%'>)
-
-The element is a hash, initialized by default to C<()>.
-
-With no argument, the accessor returns a reference to the
-element's whole hash (whether or not the element was
-specified as C<'%'> or C<'*%'>).
-
-With one or two arguments, the first argument is a key specifying
-one element of the hash; the second argument, if present, is
-assigned to the hash element.  If the element type is C<'%'>, the
-accessor returns the hash element value.  If the element type is
-C<'*%'>, a reference to the hash element is returned.
-
-=item Class (C<'Class_Name'> or C<'*Class_Name'>)
-
-The element's value must be a reference blessed to the named
-class or to one of its subclasses. The element is initialized to
-the result of calling the C<new> constructor of the named class.
-
-The accessor's argument, if any, is assigned to the element. The
-accessor will C<croak> if this is not an appropriate object
-reference.
-
-If the element type does not start with a C<'*'>, the accessor
-returns the element value (after assignment). If the element type
-starts with a C<'*'>, a reference to the element itself is returned.
-
-=back
-
-=head2 Initializing with C<new>
-
-C<struct> always creates a constructor called C<new>. That constructor
-may take a list of initializers for the various elements of the new
-struct.
-
-Each initializer is a pair of values: I<element name>C< =E<gt> >I<value>.
-The initializer value for a scalar element is just a scalar value. The
-initializer for an array element is an array reference. The initializer
-for a hash is a hash reference.
-
-The initializer for a class element is also a hash reference, and the
-contents of that hash are passed to the element's own constructor.
-
-See Example 3 below for an example of initialization.
-
-
-=head1 EXAMPLES
-
-=over
-
-=item Example 1
-
-Giving a struct element a class type that is also a struct is how
-structs are nested.  Here, C<timeval> represents a time (seconds and
-microseconds), and C<rusage> has two elements, each of which is of
-type C<timeval>.
-
-    use Automake::Struct;
-
-    struct( rusage => {
-        ru_utime => timeval,  # seconds
-        ru_stime => timeval,  # microseconds
-    });
-
-    struct( timeval => [
-        tv_secs  => '$',
-        tv_usecs => '$',
-    ]);
-
-        # create an object:
-    my $t = new rusage;
-
-        # $t->ru_utime and $t->ru_stime are objects of type timeval.
-        # set $t->ru_utime to 100.0 sec and $t->ru_stime to 5.0 sec.
-    $t->ru_utime->tv_secs(100);
-    $t->ru_utime->tv_usecs(0);
-    $t->ru_stime->tv_secs(5);
-    $t->ru_stime->tv_usecs(0);
-
-
-=item Example 2
-
-An accessor function can be redefined in order to provide
-additional checking of values, etc.  Here, we want the C<count>
-element always to be nonnegative, so we redefine the C<count>
-accessor accordingly.
-
-    package MyObj;
-    use Automake::Struct;
-
-    # declare the struct
-    struct ( 'MyObj', { count => '$', stuff => '%' } );
-
-    # override the default accessor method for 'count'
-    sub count {
-        my $self = shift;
-        if ( @_ ) {
-            die 'count must be nonnegative' if $_[0] < 0;
-            $self->{'count'} = shift;
-            warn "Too many args to count" if @_;
-        }
-        return $self->{'count'};
-    }
-
-    package main;
-    $x = new MyObj;
-    print "\$x->count(5) = ", $x->count(5), "\n";
-                            # prints '$x->count(5) = 5'
-
-    print "\$x->count = ", $x->count, "\n";
-                            # prints '$x->count = 5'
-
-    print "\$x->count(-5) = ", $x->count(-5), "\n";
-                            # dies due to negative argument!
-
-=item Example 3
-
-The constructor of a generated class can be passed a list
-of I<element>=>I<value> pairs, with which to initialize the struct.
-If no initializer is specified for a particular element, its default
-initialization is performed instead. Initializers for non-existent
-elements are silently ignored.
-
-Note that the initializer for a nested struct is specified
-as an anonymous hash of initializers, which is passed on to the nested
-struct's constructor.
-
-
-    use Automake::Struct;
-
-    struct Breed =>
-    {
-        name  => '$',
-        cross => '$',
-    };
-
-    struct Cat =>
-    [
-        name     => '$',
-        kittens  => '@',
-        markings => '%',
-        breed    => 'Breed',
-    ];
-
-
-    my $cat = Cat->new( name     => 'Socks',
-                        kittens  => ['Monica', 'Kenneth'],
-                        markings => { socks=>1, blaze=>"white" },
-                        breed    => { name=>'short-hair', cross=>1 },
-                      );
-
-    print "Once a cat called ", $cat->name, "\n";
-    print "(which was a ", $cat->breed->name, ")\n";
-    print "had two kittens: ", join(' and ', @{$cat->kittens}), "\n";
-
-=back
-
-=head1 Author and Modification History
-
-Modified by Akim Demaille, 2001-08-03
-
-    Rename as Automake::Struct to avoid name clashes with
-    Class::Struct.
-
-    Make it compatible with Perl 5.5.
-
-Modified by Damian Conway, 1999-03-05, v0.58.
-
-    Added handling of hash-like arg list to class ctor.
-
-    Changed to two-argument blessing in ctor to support
-    derivation from created classes.
-
-    Added classname prefixes to keys in hash-based classes
-    (refer to "Perl Cookbook", Recipe 13.12 for rationale).
-
-    Corrected behavior of accessors for '*@' and '*%' struct
-    elements.  Package now implements documented behavior when
-    returning a reference to an entire hash or array element.
-    Previously these were returned as a reference to a reference
-    to the element.
-
-
-Renamed to C<Class::Struct> and modified by Jim Miner, 1997-04-02.
-
-    members() function removed.
-    Documentation corrected and extended.
-    Use of struct() in a subclass prohibited.
-    User definition of accessor allowed.
-    Treatment of '*' in element types corrected.
-    Treatment of classes as element types corrected.
-    Class name to struct() made optional.
-    Diagnostic checks added.
-
-
-Originally C<Class::Template> by Dean Roehrich.
-
-    # Template.pm   --- struct/member template builder
-    #   12mar95
-    #   Dean Roehrich
-    #
-    # changes/bugs fixed since 28nov94 version:
-    #  - podified
-    # changes/bugs fixed since 21nov94 version:
-    #  - Fixed examples.
-    # changes/bugs fixed since 02sep94 version:
-    #  - Moved to Class::Template.
-    # changes/bugs fixed since 20feb94 version:
-    #  - Updated to be a more proper module.
-    #  - Added "use strict".
-    #  - Bug in build_methods, was using @var when @$var needed.
-    #  - Now using my() rather than local().
-    #
-    # Uses perl5 classes to create nested data types.
-    # This is offered as one implementation of Tom Christiansen's "structs.pl"
-    # idea.
-
-=cut
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 568c82a..dde99ac 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::VarDef;
+
+use 5.006;
 use strict;
 use Carp;
 use Automake::ChannelDefs;
@@ -47,7 +49,7 @@ Automake::VarDef - a class for variable definitions
   $def->append ('value to append', 'comment to append');
 
   # Accessors.
-  my $value    = $def->value;  # with trailing `#' comments and
+  my $value    = $def->value;  # with trailing '#' comments and
                                # continuation ("\\\n") omitted.
   my $value    = $def->raw_value; # the real value, as passed to new().
   my $comment  = $def->comment;
@@ -148,11 +150,11 @@ sub new ($$$$$$$$)
 {
   my ($class, $var, $value, $comment, $location, $type, $owner, $pretty) = @_;
 
-  # A user variable must be set by either `=' or `:=', and later
-  # promoted to `+='.
+  # A user variable must be set by either '=' or ':=', and later
+  # promoted to '+='.
   if ($owner != VAR_AUTOMAKE && $type eq '+')
     {
-      error $location, "$var must be set with `=' before using `+='";
+      error $location, "$var must be set with '=' before using '+='";
     }
 
   my $self = Automake::ItemDef::new ($class, $comment, $location, $owner);
@@ -182,19 +184,21 @@ sub append ($$$)
   #   VAR += bar
   # does not become
   #   VAR = foo # com bar
-  # Furthermore keeping `#' would not be portable if the variable is
+  # Furthermore keeping '#' would not be portable if the variable is
   # output on multiple lines.
   $val =~ s/ ?#.*//;
   # Insert a separator, if required.
   $val .= ' ' if $val;
   $self->{'value'} = $val . $value;
   # Turn ASIS appended variables into PRETTY variables.  This is to
-  # cope with `make' implementation that cannot read very long lines.
+  # cope with 'make' implementation that cannot read very long lines.
   $self->{'pretty'} = VAR_PRETTY if $self->{'pretty'} == VAR_ASIS;
 }
 
 =item C<$def-E<gt>value>
 
+=item C<$def-E<gt>raw_value>
+
 =item C<$def-E<gt>type>
 
 =item C<$def-E<gt>pretty>
@@ -208,7 +212,7 @@ sub value ($)
 {
   my ($self) = @_;
   my $val = $self->raw_value;
-  # Strip anything past `#'.  `#' characters cannot be escaped
+  # Strip anything past '#'.  '#' characters cannot be escaped
   # in Makefiles, so we don't have to be smart.
   $val =~ s/#.*$//s;
   # Strip backslashes.
@@ -247,7 +251,7 @@ sub set_owner ($$$)
 {
   my ($self, $owner, $location) = @_;
   # We always adjust the location when the owner changes (even for
-  # `+=' statements).  The risk otherwise is to warn about
+  # '+=' statements).  The risk otherwise is to warn about
   # a VAR_MAKEFILE variable and locate it in configure.ac...
   $self->{'owner'} = $owner;
   $self->{'location'} = $location;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 8f712bd..4d346f0 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Variable;
+
+use 5.006;
 use strict;
 use Carp;
 
@@ -140,7 +141,7 @@ my @_var_order;
 
 # This keeps track of all variables defined by &_gen_varname.
 # $_gen_varname{$base} is a hash for all variables defined with
-# prefix `$base'.  Values stored in this hash are the variable names.
+# prefix '$base'.  Values stored in this hash are the variable names.
 # Keys have the form "(COND1)VAL1(COND2)VAL2..." where VAL1 and VAL2
 # are the values of the variable for condition COND1 and COND2.
 my %_gen_varname = ();
@@ -156,7 +157,6 @@ my %_gen_varname_n = ();
 # Macros accessible via aclocal.
 my %_am_macro_for_var =
   (
-   ANSI2KNR => 'AM_C_PROTOTYPES',
    CCAS => 'AM_PROG_AS',
    CCASFLAGS => 'AM_PROG_AS',
    EMACS => 'AM_PATH_LISPDIR',
@@ -169,7 +169,6 @@ my %_am_macro_for_var =
    pyexecdir => 'AM_PATH_PYTHON',
    PYTHON => 'AM_PATH_PYTHON',
    pythondir => 'AM_PATH_PYTHON',
-   U => 'AM_C_PROTOTYPES',
    );
 
 # Macros shipped with Autoconf.
@@ -470,10 +469,10 @@ sub _check_ambiguous_condition ($$$)
   # We allow silent variables to be overridden silently,
   # by either silent or non-silent variables.
   my $def = $self->def ($ambig_cond);
-  if ($message && !($def && $def->pretty == VAR_SILENT))
+  if ($message && $def->pretty != VAR_SILENT)
     {
       msg 'syntax', $where, "$message ...", partial => 1;
-      msg_var ('syntax', $var, "... `$var' previously defined here");
+      msg_var ('syntax', $var, "... '$var' previously defined here");
       verb ($self->dump);
     }
 }
@@ -527,7 +526,7 @@ sub output ($@)
   foreach my $cond (@conds)
     {
       my $def = $self->def ($cond);
-      prog_error ("unknown condition `" . $cond->human . "' for `"
+      prog_error ("unknown condition '" . $cond->human . "' for '"
                  . $self->name . "'")
        unless $def;
 
@@ -675,8 +674,8 @@ sub has_conditional_contents ($)
 
   # Traverse the variable recursively until we
   # find a variable defined conditionally.
-  # Use `die' to abort the traversal, and pass it `$full_cond'
-  # to we can find easily whether the `eval' block aborted
+  # Use 'die' to abort the traversal, and pass it '$full_cond'
+  # to we can find easily whether the 'eval' block aborted
   # because we found a condition, or for some other error.
   eval
     {
@@ -747,7 +746,7 @@ sub scan_variable_expansions ($)
     {
       my $var = $1 || $2;
       # The occurrence may look like $(string1[:subst1=[subst2]]) but
-      # we want only `string1'.
+      # we want only 'string1'.
       $var =~ s/:[^:=]*=[^=]*$//;
       push @result, $var;
     }
@@ -844,14 +843,14 @@ sub define ($$$$$$$$)
                               || $pretty == VAR_SILENT
                               || $pretty == VAR_SORTED);
 
-  error $where, "bad characters in variable name `$var'"
+  error $where, "bad characters in variable name '$var'"
     if $var !~ /$_VARIABLE_PATTERN/o;
 
-  # `:='-style assignments are not acknowledged by POSIX.  Moreover it
+  # ':='-style assignments are not acknowledged by POSIX.  Moreover it
   # has multiple meanings.  In GNU make or BSD make it means "assign
   # with immediate expansion", while in OSF make it is used for
   # conditional assignments.
-  msg ('portability', $where, "`:='-style assignments are not portable")
+  msg ('portability', $where, "':='-style assignments are not portable")
     if $type eq ':';
 
   check_variable_expansions ($value, $where);
@@ -880,11 +879,11 @@ sub define ($$$$$$$$)
       if ($def->type ne $type && $def->owner == VAR_AUTOMAKE)
        {
          error ($def->location,
-                "Automake variable `$var' was set with `"
-                . $def->type . "=' here...", partial => 1);
-         error ($where, "... and is now set with `$type=' here.");
+                "Automake variable '$var' was set with '"
+                . $def->type . "=' here ...", partial => 1);
+         error ($where, "... and is now set with '$type=' here.");
          prog_error ("Automake variable assignments should be consistently\n"
-                     . "defined with the same sign.");
+                     . "defined with the same sign");
        }
 
       # If Automake tries to override a value specified by the user,
@@ -894,15 +893,15 @@ sub define ($$$$$$$$)
          if (! exists $_silent_variable_override{$var})
            {
              my $condmsg = ($cond == TRUE
-                            ? '' : (" in condition `" . $cond->human . "'"));
+                            ? '' : (" in condition '" . $cond->human . "'"));
              msg_cond_var ('override', $cond, $var,
-                           "user variable `$var' defined here$condmsg...",
+                           "user variable '$var' defined here$condmsg ...",
                            partial => 1);
              msg ('override', $where,
-                  "... overrides Automake variable `$var' defined here");
+                  "... overrides Automake variable '$var' defined here");
            }
          verb ("refusing to override the user definition of:\n"
-               . $self->dump ."with `" . $cond->human . "' => `$value'");
+               . $self->dump ."with '" . $cond->human . "' => '$value'");
          return;
        }
     }
@@ -991,16 +990,16 @@ sub define ($$$$$$$$)
          #   endif
          #   X += Z
          # should be rejected because X is not defined for all conditions
-         # where `+=' applies.
+         # where '+=' applies.
          my $undef_cond = $self->not_always_defined_in_cond ($cond);
          if (! $undef_cond->false)
            {
              error ($where,
-                    "Cannot apply `+=' because `$var' is not defined "
+                    "cannot apply '+=' because '$var' is not defined "
                     . "in\nthe following conditions:\n  "
                     . join ("\n  ", map { $_->human } $undef_cond->conds)
-                    . "\nEither define `$var' in these conditions,"
-                    . " or use\n`+=' in the same conditions as"
+                    . "\neither define '$var' in these conditions,"
+                    . " or use\n'+=' in the same conditions as"
                     . " the definitions.");
            }
          else
@@ -1027,7 +1026,7 @@ sub define ($$$$$$$$)
        if ! $new_var && $owner < $def->owner;
 
       # Assignments to a macro set its location.  We don't adjust
-      # locations for `+='.  Ideally I suppose we would associate
+      # locations for '+='.  Ideally I suppose we would associate
       # line numbers with random bits of text.
       $def = new Automake::VarDef ($var, $value, $comment, $where->clone,
                                   $type, $owner, $pretty);
@@ -1078,7 +1077,7 @@ For debugging.
 
 sub variables_dump ()
 {
-  my $text = "All variables:\n{\n";
+  my $text = "all variables:\n{\n";
   foreach my $var (sort { $a->name cmp $b->name } variables)
     {
       $text .= $var->dump;
@@ -1142,7 +1141,7 @@ sub require_variables ($$$@)
       next VARIABLE
        if vardef ($var, $cond);
 
-      my $text = "$reason`$var' is undefined\n";
+      my $text = "$reason'$var' is undefined\n";
       my $v = var $var;
       if ($v)
        {
@@ -1159,20 +1158,20 @@ sub require_variables ($$$@)
       if (exists $_am_macro_for_var{$var})
        {
          my $mac = $_am_macro_for_var{$var};
-         $text .= "  The usual way to define `$var' is to add "
-           . "`$mac'\n  to `$configure_ac' and run `aclocal' and "
-           . "`autoconf' again.";
+         $text .= "  The usual way to define '$var' is to add "
+           . "'$mac'\n  to '$configure_ac' and run 'aclocal' and "
+           . "'autoconf' again.";
          # aclocal will not warn about undefined macros unless it
          # starts with AM_.
-         $text .= "\n  If `$mac' is in `$configure_ac', make sure\n"
+         $text .= "\n  If '$mac' is in '$configure_ac', make sure\n"
            . "  its definition is in aclocal's search path."
            unless $mac =~ /^AM_/;
        }
       elsif (exists $_ac_macro_for_var{$var})
        {
-         $text .= "  The usual way to define `$var' is to add "
-           . "`$_ac_macro_for_var{$var}'\n  to `$configure_ac' and "
-           . "run `autoconf' again.";
+         $text .= "  The usual way to define '$var' is to add "
+           . "'$_ac_macro_for_var{$var}'\n  to '$configure_ac' and "
+           . "run 'autoconf' again.";
        }
 
       error $where, $text, uniq_scope => US_GLOBAL;
@@ -1314,7 +1313,7 @@ recursive calls).
 
 =cut
 
-# Contains a stack of `from' and `to' parts of variable
+# Contains a stack of 'from' and 'to' parts of variable
 # substitutions currently in force.
 my @_substfroms;
 my @_substtos;
@@ -1343,7 +1342,7 @@ sub _do_recursive_traversal ($$&&$$$$)
 
   if ($var->{'scanned'} == $_traversal)
     {
-      err_var $var, "variable `" . $var->name() . "' recursively defined";
+      err_var $var, "variable '" . $var->name() . "' recursively defined";
       return ();
     }
   $var->{'scanned'} = $_traversal;
@@ -1372,7 +1371,7 @@ sub _do_recursive_traversal ($$&&$$$$)
          my $val = shift @to_process;
          # If $val is a variable (i.e. ${foo} or $(bar), not a filename),
          # handle the sub variable recursively.
-         # (Backslashes before `}' and `)' within brackets are here to
+         # (Backslashes before '}' and ')' within brackets are here to
          # please Emacs's indentation.)
          if ($val =~ /^\$\{([^\}]*)\}$/ || $val =~ /^\$\(([^\)]*)\)$/)
            {
@@ -1414,7 +1413,7 @@ sub _do_recursive_traversal ($$&&$$$$)
              next;
            }
          # Try to expand variable references inside filenames such as
-         # `$(NAME).txt'.  We do not handle `:.foo=.bar'
+         # '$(NAME).txt'.  We do not handle ':.foo=.bar'
          # substitutions, but it would make little sense to use this
          # here anyway.
          elsif ($inner_expand
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 347f8f6..423375b 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Automake::Version;
+
+use 5.006;
 use strict;
 use Automake::ChannelDefs;
 
@@ -130,7 +132,7 @@ sub check ($$)
     if $#required == -1;
 
   # If we require 3.4n-foo then we require something
-  # >= 3.4n, with the `foo' fork identifier.
+  # >= 3.4n, with the 'foo' fork identifier.
   return 1
     if ($required[4] ne '' && $required[4] ne $version[4]);
 
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 66213d1..34b349e 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 
 package Automake::Wrap;
 
+use 5.006;
 use strict;
 
 require Exporter;
@@ -48,10 +49,10 @@ maximum length allowed.  (Ticket #17141, fixed in Perl 
5.8.0.)
 
 =cut
 
-# tab_length ($TXT)
-# -----------------
+# _tab_length ($TXT)
+# ------------------
 # Compute the length of TXT, counting tab characters as 8 characters.
-sub tab_length($)
+sub _tab_length($)
 {
   my ($txt) = @_;
   my $len = length ($txt);
@@ -78,16 +79,16 @@ sub wrap($$$$@)
   my ($head, $fill, $eol, $max_len, @values) = @_;
 
   my $result = $head;
-  my $column = tab_length ($head);
+  my $column = _tab_length ($head);
 
-  my $fill_len = tab_length ($fill);
-  my $eol_len = tab_length ($eol);
+  my $fill_len = _tab_length ($fill);
+  my $eol_len = _tab_length ($eol);
 
   my $not_first_word = 0;
 
   foreach (@values)
     {
-      my $len = tab_length ($_);
+      my $len = _tab_length ($_);
 
       # See if the new variable fits on this line.
       # (The + 1 is for the space we add in front of the value.).
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 46483e6..177dad9 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,13 +31,13 @@ Automake::XFile - supply object methods for filehandles 
with error handling
     use Automake::XFile;
 
     $fh = new Automake::XFile;
-    $fh->open ("< file");
+    $fh->open ("file", "<");
     # No need to check $FH: we died if open failed.
     print <$fh>;
     $fh->close;
     # No need to check the return value of close: we died if it failed.
 
-    $fh = new Automake::XFile "> file";
+    $fh = new Automake::XFile "file", ">";
     # No need to check $FH: we died if new failed.
     print $fh "bar\n";
     $fh->close;
@@ -68,21 +67,9 @@ methods C<close>, C<lock> (corresponding to C<flock>), 
C<new>,
 C<open>, C<seek>, and C<truncate>.  It also overrides the C<getline>
 and C<getlines> methods to translate C<\r\n> to C<\n>.
 
-=head1 SEE ALSO
-
-L<perlfunc>,
-L<perlop/"I/O Operators">,
-L<IO::File>
-L<IO::Handle>
-L<IO::Seekable>
-
-=head1 HISTORY
-
-Derived from IO::File.pm by Akim Demaille E<lt>F<address@hidden>E<gt>.
-
 =cut
 
-require 5.000;
+use 5.006;
 use strict;
 use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
 use Carp;
@@ -110,12 +97,16 @@ eval {
   push (@EXPORT, @O);
 };
 
-# Used in croak error messages.
-my $me = basename ($0);
+=head2 Methods
+
+=over
+
+=item C<$fh = new Automake::XFile ([$expr, ...]>
 
-################################################
-## Constructor
-##
+Constructor a new XFile object.  Additional arguments
+are passed to C<open>, if any.
+
+=cut
 
 sub new
 {
@@ -129,17 +120,20 @@ sub new
   $fh;
 }
 
-################################################
-## Open
-##
+=item C<$fh-E<gt>open ([$file, ...])>
+
+Open a file, passing C<$file> and further arguments to C<IO::File::open>.
+Die if opening fails.  Store the name of the file.  Use binmode for writing.
+
+=cut
 
 sub open
 {
   my $fh = shift;
-  my ($file) = @_;
+  my ($file, $mode) = @_;
 
   # WARNING: Gross hack: $FH is a typeglob: use its hash slot to store
-  # the `name' of the file we are opening.  See the example with
+  # the 'name' of the file we are opening.  See the example with
   # io_socket_timeout in IO::Socket for more, and read Graham's
   # comment in IO::Handle.
   ${*$fh}{'autom4te_xfile_file'} = "$file";
@@ -153,12 +147,19 @@ sub open
   # (This circumvents a bug in at least Cygwin bash where the shell
   # parsing fails on lines ending with the continuation character '\'
   # and CRLF).
-  binmode $fh if $file =~ /^\s*>/;
+  # Correctly recognize usages like:
+  #  - open ($file, "w")
+  #  - open ($file, "+<")
+  #  - open (" >$file")
+  binmode $fh
+    if (defined $mode && $mode =~ /^[+>wa]/ or $file =~ /^\s*>/);
 }
 
-################################################
-## Close
-##
+=item C<$fh-E<gt>close>
+
+Close the file, handling errors.
+
+=cut
 
 sub close
 {
@@ -172,12 +173,15 @@ sub close
     }
 }
 
-################################################
-## Getline
-##
+=item C<$line = $fh-E<gt>getline>
+
+Read and return a line from the file.  Ensure C<\r\n> is translated to
+C<\n> on input files.
+
+=cut
 
-# Some Win32/perl installations fail to translate \r\n to \n on input
-# so we do that here.
+# Some native Windows/perl installations fail to translate \r\n to \n on
+# input so we do that here.
 sub getline
 {
   local $_ = $_[0]->SUPER::getline;
@@ -187,9 +191,11 @@ sub getline
   return $_;
 }
 
-################################################
-## Getlines
-##
+=item C<@lines = $fh-E<gt>getlines>
+
+Slurp lines from the files.
+
+=cut
 
 sub getlines
 {
@@ -199,9 +205,11 @@ sub getlines
   return @res;
 }
 
-################################################
-## Name
-##
+=item C<$name = $fh-E<gt>name>
+
+Return the name of the file.
+
+=cut
 
 sub name
 {
@@ -209,23 +217,27 @@ sub name
   return ${*$fh}{'autom4te_xfile_file'};
 }
 
-################################################
-## Lock
-##
+=item C<$fh-E<gt>lock>
+
+Lock the file using C<flock>.  If locking fails for reasons other than
+C<flock> being unsupported, then error out if C<$ENV{'MAKEFLAGS'}> indicates
+that we are spawned from a parallel C<make>.
+
+=cut
 
 sub lock
 {
   my ($fh, $mode) = @_;
   # Cannot use @_ here.
 
-  # Unless explicitly configured otherwise, Perl implements its `flock' with 
the
+  # Unless explicitly configured otherwise, Perl implements its 'flock' with 
the
   # first of flock(2), fcntl(2), or lockf(3) that works.  These can fail on
   # NFS-backed files, with ENOLCK (GNU/Linux) or EOPNOTSUPP (FreeBSD); we
   # usually ignore these errors.  If $ENV{MAKEFLAGS} suggests that a parallel
-  # invocation of `make' has invoked the tool we serve, report all locking
+  # invocation of 'make' has invoked the tool we serve, report all locking
   # failures and abort.
   #
-  # On Unicos, flock(2) and fcntl(2) over NFS hang indefinitely when `lockd' is
+  # On Unicos, flock(2) and fcntl(2) over NFS hang indefinitely when 'lockd' is
   # not running.  NetBSD NFS clients silently grant all locks.  We do not
   # attempt to defend against these dangers.
   #
@@ -234,7 +246,7 @@ sub lock
     {
       my $make_j = (exists $ENV{'MAKEFLAGS'}
                    && " -$ENV{'MAKEFLAGS'}" =~ / 
(-[BdeikrRsSw]*[jP]|--[jP]|---?jobs)/);
-      my $note = "\nforgo `make -j' or use a file system that supports locks";
+      my $note = "\nforgo \"make -j\" or use a file system that supports 
locks";
       my $file = $fh->name;
 
       msg ($make_j ? 'fatal' : 'unsupported',
@@ -243,9 +255,11 @@ sub lock
     }
 }
 
-################################################
-## Seek
-##
+=item C<$fh-E<gt>seek ($position, [$whence])>
+
+Seek file to C<$position>.  Die if seeking fails.
+
+=cut
 
 sub seek
 {
@@ -254,13 +268,15 @@ sub seek
   if (!seek ($fh, $_[0], $_[1]))
     {
       my $file = $fh->name;
-      fatal "$me: cannot rewind $file with @_: $!";
+      fatal "cannot rewind $file with @_: $!";
     }
 }
 
-################################################
-## Truncate
-##
+=item C<$fh-E<gt>truncate ($len)>
+
+Truncate the file to length C<$len>.  Die on failure.
+
+=cut
 
 sub truncate
 {
@@ -272,6 +288,22 @@ sub truncate
     }
 }
 
+=back
+
+=head1 SEE ALSO
+
+L<perlfunc>,
+L<perlop/"I/O Operators">,
+L<IO::File>
+L<IO::Handle>
+L<IO::Seekable>
+
+=head1 HISTORY
+
+Derived from IO::File.pm by Akim Demaille E<lt>F<address@hidden>E<gt>.
+
+=cut
+
 1;
 
 ### Setup "GNU" style for perl-mode and cperl-mode.
diff --git a/lib/INSTALL b/lib/INSTALL
index a1e89e1..6e90e07 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler 
(unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index 260b9c9..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake lib.
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
-
-## -------------------------------------------------------------------- ##
-##  Auxiliary scripts and files for use with "automake --add-missing".  ##
-## -------------------------------------------------------------------- ##
-
-dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
-  config-ml.in
-
-## These must all be executable when installed.  However, if we use
-## _SCRIPTS, then the program transform will be applied, which is not
-## what we want.  So we make them executable by hand.
-scriptdir = $(pkgvdatadir)
-dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
-  mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
-  symlink-tree ar-lib
-
-install-data-hook:
-       @$(POST_INSTALL)
-       @for prog in $(dist_script_DATA); do \
-         echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
-         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
-       done
-
-## `test -x' is not portable.  So we use Perl instead.  If Perl
-## doesn't exist, then this test is meaningless anyway.
-installcheck-local:
-       for file in $(dist_script_DATA); do \
-         $(PERL) -e "exit ! -x '$(pkgvdatadir)/$$file';" || exit 1; \
-       done
-
-## ---------------------------------------------------- ##
-##  Private perl modules used by automake and aclocal.  ##
-## ---------------------------------------------------- ##
-
-perllibdir = $(pkgvdatadir)/Automake
-dist_perllib_DATA = \
-  Automake/ChannelDefs.pm \
-  Automake/Channels.pm \
-  Automake/Condition.pm \
-  Automake/Configure_ac.pm \
-  Automake/DisjConditions.pm \
-  Automake/FileUtils.pm \
-  Automake/General.pm \
-  Automake/Getopt.pm \
-  Automake/Item.pm \
-  Automake/ItemDef.pm \
-  Automake/Location.pm \
-  Automake/Options.pm \
-  Automake/Rule.pm \
-  Automake/RuleDef.pm \
-  Automake/Struct.pm \
-  Automake/Variable.pm \
-  Automake/VarDef.pm \
-  Automake/Version.pm \
-  Automake/XFile.pm \
-  Automake/Wrap.pm
-
-nodist_perllib_DATA = Automake/Config.pm
-CLEANFILES = $(nodist_perllib_DATA)
-
-## We can't use configure to do the substitution here; we must do it
-## by hand.  We use a funny notation here to avoid configure
-## substitutions in our text.
-do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-  -e 's,address@hidden@],$(APIVERSION),g' \
-  -e 's,address@hidden@],$(PACKAGE),g' \
-  -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-  -e 's,address@hidden@],$(PERL),g' \
-  -e 's,address@hidden@],$(PERL_THREADS),g' \
-  -e 's,address@hidden@],$(SHELL),g' \
-  -e 's,address@hidden@],$(VERSION),g' \
-  -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
-  -e 's,address@hidden@],$(datadir),g'
-
-## This file depends on Makefile so it is rebuilt if $(VERSION),
-## $(datadir) or other do_subst'ituted variables change.
-## Use chmod a-w to prevent people from editing the wrong file by accident.
-Automake/Config.pm: Automake/Config.in Makefile
-       $(AM_V_at)rm -f $@ address@hidden
-       $(AM_V_at)test -d Automake || mkdir Automake
-       $(AM_V_GEN)$(do_subst) $(srcdir)/Automake/Config.in >address@hidden
-       $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
-EXTRA_DIST += Automake/Config.in
-
-## --------------------- ##
-##  Makefile fragments.  ##
-## --------------------- ##
-
-amdir = $(pkgvdatadir)/am
-
-dist_am_DATA = \
-  am/ansi2knr.am \
-  am/check.am \
-  am/check-html.am \
-  am/check2.am \
-  am/clean-hdr.am \
-  am/clean.am \
-  am/compile.am \
-  am/configure.am \
-  am/data.am \
-  am/dejagnu.am \
-  am/depend.am \
-  am/depend2.am \
-  am/distdir.am \
-  am/footer.am \
-  am/header-vars.am \
-  am/header.am \
-  am/install.am \
-  am/inst-vars.am \
-  am/java.am \
-  am/lang-compile.am \
-  am/lex.am \
-  am/library.am \
-  am/libs.am \
-  am/libtool.am \
-  am/lisp.am \
-  am/ltlib.am \
-  am/ltlibrary.am \
-  am/mans-vars.am \
-  am/mans.am \
-  am/multilib.am \
-  am/program.am \
-  am/progs.am \
-  am/python.am \
-  am/remake-hdr.am \
-  am/scripts.am \
-  am/subdirs.am \
-  am/tags.am \
-  am/texi-vers.am \
-  am/texibuild.am \
-  am/texinfos.am \
-  am/vala.am \
-  am/yacc.am
diff --git a/lib/acinstall b/lib/acinstall
deleted file mode 100755
index 2bd0bad..0000000
--- a/lib/acinstall
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-# Install an aclocal-style M4 file.  A script is needed to do this
-# because we want to do serial-number checking; newer versions of
-# macro files should always be preferred.
-
-# Usage:
-#  acinstall file directory installprogram [install-args]...
-
-# Copyright 1996 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-file="$1"
-dir="$2"
-shift
-shift
-
-localserial=`grep '^# serial ' $file | sed -e 's/^# serial 
\([0-9][0-9]*\).*$/\1/; q'`
-if test -z "$localserial"; then
-   echo "acinstall: no serial number in $file" 1>&2
-   exit 1
-fi
-
-# Maybe if the installed file has no serial number we should just
-# assume it is ancient.
-instserial=`grep '^# serial ' $dir/$file | sed -e 's/^# serial 
\([0-9][0-9]*\).*$/\1/; q'`
-if test -z "$instserial"; then
-   echo "acinstall: no serial number in $dir/$file" 1>&2
-   exit 1
-fi
-
-if test $localserial -lt $instserial; then
-   # Installed file is newer.
-   exit 0
-fi
-
-# Install the file.
-$* $file $dir/$file
diff --git a/lib/am/ansi2knr.am b/lib/am/ansi2knr.am
deleted file mode 100644
index c4e1990..0000000
--- a/lib/am/ansi2knr.am
+++ /dev/null
@@ -1,77 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2008, 2009
-## Free Software Foundation, Inc.
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-## %ANSI2KNR-DIR% is the directory where ansi2knr is, `' if
-## is the current directory.
-
-
-## ---------- ##
-## ansi2knr.  ##
-## ---------- ##
-
-if %?ANSI2KNR-DIR%
-
-ANSI2KNR = %ANSI2KNR-DIR%/ansi2knr
-%ANSI2KNR-DIR%/ansi2knr:
-       $(am__cd) %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ./ansi2knr
-.MAKE: %ANSI2KNR-DIR%/ansi2knr
-
-else !%?ANSI2KNR-DIR%
-
-## Substitution from AM_C_PROTOTYPES.  This makes it be built only when
-## necessary.
-ANSI2KNR = @ANSI2KNR@
-./ansi2knr: ansi2knr.$(OBJEXT)
-       $(LINK) ansi2knr.$(OBJEXT) $(LIBS)
-ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
-
-endif !%?ANSI2KNR-DIR%
-
-
-## ------------------- ##
-## Cleaning ansi2knr.  ##
-## ------------------- ##
-
-
-if !%?ANSI2KNR-DIR%
-.PHONY: clean-krextra
-
-clean-am: clean-krextra
-clean-krextra:
-## Why `clean' and not somewhere else?  Not `mostlyclean' because
-## people usually don't want to recompile this file.  And not
-## `distclean' because of our informal rule: if `make' built it, then
-## `clean' should delete it; if `configure' built it, then `distclean'
-## should remove it (and if the maintainer built it, then
-## maintainer-clean should remove it).
-       -rm -f ansi2knr
-endif !%?ANSI2KNR-DIR%
-
-
-
-## --------------------------------- ##
-## Cleaning the output of ansi2knr.  ##
-## --------------------------------- ##
-
-.PHONY: mostlyclean-kr
-
-mostlyclean-am: mostlyclean-kr
-mostlyclean-kr:
-## Only delete *_.c when ansi2knr is actually in use, so as to avoid
-## deleting sources that happen to end in "_" after being truncated on a DOS
-## 8.3 filesystem with srcdir==builddir.
-       -test "$U" = "" || rm -f *_.c
diff --git a/lib/am/check-html.am b/lib/am/check-html.am
deleted file mode 100644
index 13f0a47..0000000
--- a/lib/am/check-html.am
+++ /dev/null
@@ -1,61 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-## Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-## Makefile.am fragment to produce HTML output from RST-formatted
-## log files produced by the parallel-tests output.
-## This fragment was part of the automake core in the 1.11.x release
-## series, but is to be moved out in the 1.12 release.
-
-TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
-
-mostlyclean-am: am--mostlyclean-test-html
-.PHONY: am--mostlyclean-test-html
-am--mostlyclean-test-html:
-## Expand $(TEST_LOGS) only once, to avoid exceeding line length limits.
-       list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
-       rm -f $(TEST_SUITE_HTML)
-
-.log.html:
-       @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \
-       for r2h in $$list; do                                           \
-         if ($$r2h --version) >/dev/null 2>&1; then                    \
-           R2H=$$r2h;                                                  \
-         fi;                                                           \
-       done;                                                           \
-       if test -z "$$R2H"; then                                        \
-         echo >&2 "cannot find rst2html, cannot create $@";            \
-         exit 2;                                                       \
-       fi;                                                             \
-       $$R2H $< >address@hidden
-       @mv address@hidden $@
-
-# Be sure to run check first, and then to convert the result.
-# Beware of concurrent executions.  Run "check" not "check-TESTS", as
-# check-SCRIPTS and other dependencies are rebuilt by the former only.
-# And expect check to fail.
-check-html recheck-html:
-       @target=`echo $@ | sed 's/-html$$//'`; \
-       rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
-## The nullification of $(TEST_LOGS) is required to ensure that
-## "make recheck-html" do not try to uselessly re-run tests.
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
-       exit $$rv
-
-AM_RECURSIVE_TARGETS += check-html recheck-html
-
-.PHONY: check-html recheck-html
-.MAKE: check-html recheck-html
diff --git a/lib/am/check.am b/lib/am/check.am
index 7e2e771..7866570 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -15,25 +14,30 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
 if %?COLOR%
 # If stdout is a non-dumb tty, use colors.  If test -t is not supported,
 # then this fails; a conservative approach.  Of course do not redirect
 # stdout here, just stderr.
 am__tty_colors = \
-red=; grn=; lgn=; blu=; std=; \
+$(am__tty_colors_dummy); \
 test "X$(AM_COLOR_TESTS)" != Xno \
 && test "X$$TERM" != Xdumb \
 && { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
 && { \
+  am__color_tests=yes; \
   red=''; \
   grn=''; \
   lgn=''; \
   blu=''; \
+  mgn=''; \
+  brg=''; \
   std=''; \
 }
 else !%?COLOR%
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors = $(am__tty_colors_dummy)
 endif !%?COLOR%
 
 .PHONY: check-TESTS
@@ -44,253 +48,332 @@ include inst-vars.am
 
 ## New parallel test driver.
 ##
-## This code is adapted from check.mk which was originally
-## written at EPITA/LRDE, further developed at Gostai, then made
-## its way from GNU coreutils to end up, largely rewritten, in
-## Automake.
-##
-## It provides special support for "unit tests", that is to say,
-## tests that (once run) no longer need to be re-compiled and
-## re-run at each "make check", unless their sources changed.  To
-## enable unit-test supports, set RECHECK_LOGS to empty.  In such a
-## setting, that heavily relies on correct dependencies, its users may
-## prefer to define EXTRA_PROGRAMS instead of check_PROGRAMS, because
-## it allows intertwined compilation and execution of the tests.
-## Sometimes this helps catching errors earlier (you don't have to
-## wait for all the tests to be compiled).
-##
-## Define TEST_SUITE_LOG to be the name of the global log to create.
-## Define TEST_LOGS to the set of logs to include in it.  It defaults
-## to $(TESTS), with `.test' and address@hidden@' removed, and `'.log'
-## appended.
-##
-## In addition to the magic "exit 77 means SKIP" feature (which was
-## imported from automake), there is a magic "exit 99 means FAIL" feature
-## which is useful if you need to issue a hard error no matter whether the
-## test is XFAIL or not.  You can disable this feature by setting the
-## variable DISABLE_HARD_ERRORS to a nonempty value.
+## The first version of the code here was adapted from check.mk, which was
+## originally written at EPITA/LRDE, further developed at Gostai, then made
+## its way from GNU coreutils to end up, largely rewritten, in Automake.
+## The current version is an heavy rewrite of that, to allow for support
+## of more test metadata, and the use of custom test derivers and protocols
+## (among them, TAP).
 
 # Restructured Text title and section.
-am__rst_title   = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
-am__rst_section = sed 'p;s/./=/g;p;g'
-
-# Put stdin (possibly several lines separated by ".  ") in a box.
-# Prefix each line by 'col' and terminate each with 'std', for coloring.
-# Multi line coloring is problematic with "less -R", so we really need
-# to color each line individually.
-am__text_box = $(AWK) '{                       \
-  n = split($$0, lines, "\\.  "); max = 0;     \
-  for (i = 1; i <= n; ++i)                     \
-    if (max < length(lines[i]))                        \
-      max = length(lines[i]);                  \
-  for (i = 0; i < max; ++i)                    \
-    line = line "=";                           \
-  print col line std;                          \
-  for (i = 1; i <= n; ++i)                     \
-    if (lines[i])                              \
-      print col lines[i] std;                  \
-  print col line std;                          \
-}'
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+am__rst_section = { sed 'p;s/./=/g;' && echo; }
 
 # Solaris 10 'make', and several other traditional 'make' implementations,
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
 # by disabling -e (using the XSI extension "set +e") if it's set.
 am__sh_e_setup = case $$- in *e*) set +e;; esac
 
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log, and passes
-# TESTS_ENVIRONMENT.  Save and restore TERM around use of
-# TESTS_ENVIRONMENT, in case that unsets it.
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
 am__check_pre =                                                \
 $(am__sh_e_setup);                                     \
 $(am__vpath_adj_setup) $(am__vpath_adj)                        \
+$(am__tty_colors);                                     \
 srcdir=$(srcdir); export srcdir;                       \
-rm -f address@hidden;                                          \
-am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit 
$$st'; \
-trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;      \
-trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
 am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;           \
 test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;        \
 if test -f "./$$f"; then dir=./;                       \
 elif test -f "$$f"; then dir=;                         \
 else dir="$(srcdir)/"; fi;                             \
-tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;           \
-$(TESTS_ENVIRONMENT)
-
-# To be appended to the command running the test.  Handle the stdout
-# and stderr redirection, and catch the exit status.
-am__check_post =                                       \
->address@hidden 2>&1;                                          \
-estatus=$$?;                                           \
-if test -n '$(DISABLE_HARD_ERRORS)'                    \
-   && test $$estatus -eq 99; then                      \
-  estatus=1;                                           \
-fi;                                                    \
-TERM=$$__SAVED_TERM; export TERM;                      \
-$(am__tty_colors);                                     \
-xfailed=PASS;                                          \
+tst=$$dir$$f; log='$@';                                \
+if test -n '$(DISABLE_HARD_ERRORS)'; then              \
+  am__enable_hard_errors=no;                           \
+else                                                   \
+  am__enable_hard_errors=yes;                          \
+fi;                                                    \
+## The use of $dir below is required to account for VPATH
+## rewriting done by Sun make.
 case " $(XFAIL_TESTS) " in                             \
   *[\ \        ]$$f[\ \        ]* | *[\ \      ]$$dir$$f[\ \   ]*) \
-    xfailed=XFAIL;;                                    \
-esac;                                                  \
-case $$estatus.$$xfailed in                            \
-    0.XFAIL) col=$$red; res=XPASS;;                    \
-    0.*)     col=$$grn; res=PASS ;;                    \
-    77.*)    col=$$blu; res=SKIP ;;                    \
-    99.*)    col=$$red; res=FAIL ;;                    \
-    *.XFAIL) col=$$lgn; res=XFAIL;;                    \
-    *.*)     col=$$red; res=FAIL ;;                    \
-esac;                                                  \
-echo "$${col}$$res$${std}: $$f";                       \
-echo "$$res: $$f (exit: $$estatus)" |                  \
-  $(am__rst_section) >$@;                              \
-cat address@hidden >>$@;                                               \
-rm -f address@hidden
+    am__expect_failure=yes;;                           \
+  *)                                                   \
+    am__expect_failure=no;;                            \
+esac;                                                  \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+## Trim away any extra whitespace.  This has already proved useful
+## in avoiding weird bug on lesser make implementations.  It also
+## works around the GNU make 3.80 bug where trailing whitespace in
+## "TESTS = foo.test $(empty)" causes $(TESTS_LOGS)  to erroneously
+## expand to "foo.log .log".
+  bases=`echo $$bases`
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+       rm -f $< $@
+       $(MAKE) $(AM_MAKEFLAGS) $<
 
 $(TEST_SUITE_LOG): $(TEST_LOGS)
-       @$(am__sh_e_setup);                                             \
-       list='$(TEST_LOGS)';                                            \
-       results=`for f in $$list; do                                    \
-                  test -r $$f && read line < $$f && echo "$$line"      \
-                    || echo FAIL;                                      \
-                done`;                                                 \
-       all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[      
]*//'`; \
-       fail=`echo "$$results" | grep -c '^FAIL'`;                      \
-       pass=`echo "$$results" | grep -c '^PASS'`;                      \
-       skip=`echo "$$results" | grep -c '^SKIP'`;                      \
-       xfail=`echo "$$results" | grep -c '^XFAIL'`;                    \
-       xpass=`echo "$$results" | grep -c '^XPASS'`;                    \
-       failures=`expr $$fail + $$xpass`;                               \
-       all=`expr $$all - $$skip`;                                      \
-       if test "$$all" -eq 1; then tests=test; All=;                   \
-       else tests=tests; All="All "; fi;                               \
-       case fail=$$fail:xpass=$$xpass:xfail=$$xfail in                 \
-         fail=0:xpass=0:xfail=0)                                       \
-           msg="$$All$$all $$tests passed.  ";                         \
-           exit=true;;                                                 \
-         fail=0:xpass=0:xfail=*)                                       \
-           msg="$$All$$all $$tests behaved as expected";               \
-           if test "$$xfail" -eq 1; then xfailures=failure;            \
-           else xfailures=failures; fi;                                \
-           msg="$$msg ($$xfail expected $$xfailures).  ";              \
-           exit=true;;                                                 \
-         fail=*:xpass=0:xfail=*)                                       \
-           msg="$$fail of $$all $$tests failed.  ";                    \
-           exit=false;;                                                \
-         fail=*:xpass=*:xfail=*)                                       \
-           msg="$$failures of $$all $$tests did not behave as expected"; \
-           if test "$$xpass" -eq 1; then xpasses=pass;                 \
-           else xpasses=passes; fi;                                    \
-           msg="$$msg ($$xpass unexpected $$xpasses).  ";              \
-           exit=false;;                                                \
-         *)                                                            \
-           echo >&2 "incorrect case"; exit 4;;                         \
-       esac;                                                           \
-       if test "$$skip" -ne 0; then                                    \
-         if test "$$skip" -eq 1; then                                  \
-           msg="$$msg($$skip test was not run).  ";                    \
-         else                                                          \
-           msg="$$msg($$skip tests were not run).  ";                  \
-         fi;                                                           \
-       fi;                                                             \
+       @$(am__set_TESTS_bases); \
+## Helper shell function, tells whether a path refers to an existing,
+## regular, readable file.
+       am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+## We need to ensures that all the required '.trs' and '.log' files will
+## be present and readable.  The direct dependencies of $(TEST_SUITE_LOG)
+## only ensure that all the '.log' files exists; they don't ensure that
+## the '.log' files are readable, and worse, they don't ensure that the
+## '.trs' files even exist.
+       redo_bases=`for i in $$bases; do \
+                     am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+                   done`; \
+       if test -n "$$redo_bases"; then \
+## Uh-oh, either some '.log' files were unreadable, or some '.trs' files
+## were missing (or unreadable).  We need to re-run the corresponding
+## tests in order to re-create them.
+         redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+         redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+         if $(am__make_dryrun); then :; else \
+## Break "rm -f" into two calls to minimize the possibility of exceeding
+## command line length limits.
+           rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+         fi; \
+       fi; \
+## Use a trick to to ensure that we don't go into an infinite recursion
+## in case a test log in $(TEST_LOGS) is the same as $(TEST_SUITE_LOG).
+## Yes, this has already happened in practice.  Sigh!
+       if test -n "$$am__remaking_logs"; then \
+         echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+              "recursion detected" >&2; \
+       else \
+         am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+       fi; \
+       if $(am__make_dryrun); then :; else \
+## Sanity check: each unreadable or non-existent test result file should
+## has been properly remade at this point, as should the corresponding log
+## file.
+         st=0;  \
+         errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+         for i in $$redo_bases; do \
+           test -f $$i.trs && test -r $$i.trs \
+             || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+           test -f $$i.log && test -r $$i.log \
+             || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+         done; \
+         test $$st -eq 0 || exit 1; \
+       fi
+## We need a new subshell to work portably with "make -n", since the
+## previous part of the recipe contained a $(MAKE) invocation.
+       @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+       ws='[   ]'; \
+## List of test result files.
+       results=`for b in $$bases; do echo $$b.trs; done`; \
+       test -n "$$results" || results=/dev/null; \
+## Prepare data for the test suite summary.  These do not take into account
+## unreadable test results, but they'll be appropriately updated later if
+## needed.
+       all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+       pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+       fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+       skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+       xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+       xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+       error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+## Whether the testsuite was successful or not.
+       if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+         success=true; \
+       else \
+         success=false; \
+       fi; \
+## Make $br a line of exactly 76 '=' characters, that will be used to
+## enclose the testsuite summary report when displayed on the console.
+       br='==================='; br=$$br$$br$$br$$br; \
+## When writing the test summary to the console, we want to color a line
+## reporting the count of some result *only* if at least one test
+## experienced such a result.  This function is handy in this regard.
+       result_count () \
+       { \
+           if test x"$$1" = x"--maybe-color"; then \
+             maybe_colorize=yes; \
+           elif test x"$$1" = x"--no-color"; then \
+             maybe_colorize=no; \
+           else \
+             echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+           fi; \
+           shift; \
+           desc=$$1 count=$$2; \
+           if test $$maybe_colorize = yes && test $$count -gt 0; then \
+             color_start=$$3 color_end=$$std; \
+           else \
+             color_start= color_end=; \
+           fi; \
+           echo "$${color_start}# $$desc $$count$${color_end}"; \
+       }; \
+## A shell function that creates the testsuite summary.  We need it
+## because we have to create *two* summaries, one for test-suite.log,
+## and a possibly-colorized one for console output.
+       create_testsuite_report () \
+       { \
+         result_count $$1 "TOTAL:" $$all   "$$brg"; \
+         result_count $$1 "PASS: " $$pass  "$$grn"; \
+         result_count $$1 "SKIP: " $$skip  "$$blu"; \
+         result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+         result_count $$1 "FAIL: " $$fail  "$$red"; \
+         result_count $$1 "XPASS:" $$xpass "$$red"; \
+         result_count $$1 "ERROR:" $$error "$$mgn"; \
+       }; \
+## Write "global" testsuite log.
        {                                                               \
          echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
            $(am__rst_title);                                           \
-         echo "$$msg";                                                 \
+         create_testsuite_report --no-color;                           \
          echo;                                                         \
          echo ".. contents:: :depth: 2";                               \
          echo;                                                         \
-         for f in $$list; do                                           \
-           test -r $$f && read line < $$f || line=;                    \
-           case $$line in                                              \
-             PASS:*|XFAIL:*);;                                         \
-             *) echo; cat $$f;;                                        \
-           esac;                                                       \
-         done;                                                         \
+         for i in $$bases; do                                          \
+## FIXME: one fork per test -- this is horrendously inefficient!
+           if grep "^$$ws*:copy-in-global-log:$$ws*no$$ws*$$" $$i.trs \
+                >/dev/null; then continue; \
+           fi; \
+## Get the declared "global result" of the test.
+## FIXME: yet another one fork per test here!
+           glob_res=`sed -n -e "s/$$ws*$$//" \
+                            -e "s/^$$ws*:global-test-result:$$ws*//p" \
+                       $$i.trs`; \
+## If no global result is explicitly declared, we'll merely mark the
+## test as "RUN" in the global test log.
+           test -n "$$glob_res" || glob_res=RUN; \
+## Write the name and result of the test as an RST section title.
+           echo "$$glob_res: $$i" | $(am__rst_section); \
+## If we should have remade any unreadable '.log', above.
+           if test ! -r $$i.log; then \
+             echo "fatal: making $@: $$i.log is unreadable" >&2; \
+             exit 1; \
+           fi; \
+           cat $$i.log; echo; \
+         done; \
        } >$(TEST_SUITE_LOG).tmp;                                       \
        mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);                     \
-       if test "$$failures" -ne 0; then                                \
-         msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";              \
-         if test -n "$(PACKAGE_BUGREPORT)"; then                       \
-           msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";      \
-         fi;                                                           \
-       fi;                                                             \
-       test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);       \
-       $(am__tty_colors);                                              \
-       if $$exit; then                                                 \
+## Emit the test summary on the console.
+       if $$success; then                                              \
          col="$$grn";                                                  \
         else                                                           \
          col="$$red";                                                  \
+         test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);               \
        fi;                                                             \
-       echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";         \
-## The use of "exit 1" below is required to work around a FreeBSD make bug
-## (present only when running in concurrent mode).  See automake bug#9245:
+## Multi line coloring is problematic with "less -R", so we really need
+## to color each line individually.
+       echo "$${col}$$br$${std}";                                      \
+       echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";   \
+       echo "$${col}$$br$${std}";                                      \
+## This is expected to go to the console, so it might have to be colorized.
+       create_testsuite_report --maybe-color;                          \
+       echo "$$col$$br$$std";                                          \
+       if $$success; then :; else                                      \
+         echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
+         if test -n "$(PACKAGE_BUGREPORT)"; then                       \
+           echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+         fi;                                                           \
+         echo "$$col$$br$$std";                                        \
+       fi;                                                             \
+## Be sure to exit with the proper exit status.  The use of "exit 1" below
+## is required to work around a FreeBSD make bug (present only when running
+## in concurrent mode).  See automake bug#9245:
 ##  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>
 ## and FreeBSD PR bin/159730:
 ##  <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>.
-       $$exit || exit 1
+       $$success || exit 1
 
 RECHECK_LOGS = $(TEST_LOGS)
 
+## ------------------------------------------ ##
+## Running all tests, or rechecking failures. ##
+## ------------------------------------------ ##
+
 check-TESTS recheck:
 ## If we are running "make recheck", it's not the user which can decide
 ## which tests to consider for re-execution, so we must ignore the value
 ## of $(RECHECK_LOGS).
+## Here and below, we expand $(RECHECK_LOGS) only once, to avoid exceeding
+## line length limits.
        @if test $@ != recheck; then \
-## Expand $(RECHECK_LOGS) only once, to avoid exceeding line length limits.
-          list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
+          list='$(RECHECK_LOGS)'; \
+          test -z "$$list" || rm -f $$list; \
+        fi
+       @if test $@ != recheck; then \
+          list='$(RECHECK_LOGS:.log=.trs)'; \
+          test -z "$$list" || rm -f $$list; \
         fi
 ## We always have to remove TEST_SUITE_LOG, to ensure its rule is run
 ## in any case even in lazy mode: otherwise, if no test needs rerunning,
 ## or a prior run plus reruns all happen within the same timestamp (can
-## happen with a prior `make TESTS=<subset>'), then we get no log output.
-## OTOH, this means that, in the rule for `$(TEST_SUITE_LOG)', we
-## cannot use `$?' to compute the set of lazily rerun tests, lest
+## happen with a prior "make TESTS=<subset>"), then we get no log output.
+## OTOH, this means that, in the rule for '$(TEST_SUITE_LOG)', we
+## cannot use '$?' to compute the set of lazily rerun tests, lest
 ## we rely on .PHONY to work portably.
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-       @list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
-## Trailing whitespace in `TESTS = foo.test $(empty)' causes GNU make
-## 3.80 to erroneously expand $(TESTS_LOGS) to `foo.log .log'.
-## Work around this bug.
-         test .log = $$f && continue; \
-## If running a "make recheck", we must only consider tests that had
-## an unexpected outcome (FAIL or XPASS) in the earlier run.
+       @ws='[  ]'; \
+       log_list='' trs_list=''; $(am__set_TESTS_bases); \
+       for i in $$bases; do \
+## If running a "make recheck", we must only consider tests that had an
+## unexpected outcome (FAIL or XPASS) in the earlier run.  In particular,
+## skip tests that haven't been run.  But recover gracefully from deleted
+## '.trs' files.
          if test $@ = recheck; then \
-           test -f $$f || continue; \
-           if test -r $$f && read line < $$f; then \
-             case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
-           fi; \
-         fi; \
+           test -f $$i.trs || test -f $$i.log || continue; \
+## FIXME: one fork per test -- this is horrendously inefficient!
+           grep "^$$ws*:recheck:$$ws*no$$ws*$$" $$i.trs \
+             >/dev/null 2>&1 && continue; \
+         else :; fi; \
 ## Be careful to avoid extra whitespace in the definition of $list, since
 ## its value will be passed to the recursive make invocation below through
 ## the TEST_LOGS macro, and leading/trailing white space in a make macro
 ## definition can be problematic.  In this particular case, trailing white
 ## space was known to cause a segmentation fault on Solaris 10 XPG4 make:
 ## <http://lists.gnu.org/archive/html/bug-automake/2010-08/msg00004.html>
-         if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
+         if test -z "$$log_list"; then \
+           log_list="$$i.log"; \
+         else \
+           log_list="$$log_list $$i.log"; \
+         fi; \
+         if test -z "$$trs_list"; then \
+           trs_list="$$i.trs"; \
+         else \
+           trs_list="$$trs_list $$i.trs"; \
+         fi; \
        done; \
-## Under "make recheck", remove the logs of the files to recheck, so that
-## those will be rerun by the "make test-suite.log" recursive invocation
-## below.  But avoid extra files removal when running under "make -n".
-       if test $@ = recheck && test -n "$$list"; then \
-         $(am__make_dryrun) || rm -f $$list || exit 1; \
+## Under "make recheck", remove the .log and .trs files associated
+## with the files to recheck, so that those will be rerun by the
+## "make test-suite.log" recursive invocation below.  But use a proper
+## hack to avoid extra files removal when running under "make -n".
+       if test $@ != recheck || $(am__make_dryrun); then :; else \
+         test -z "$$log_list" || rm -f $$log_list; \
+         test -z "$$trs_list" || rm -f $$trs_list; \
        fi; \
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
 
 ## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
-recheck: %CHECK_DEPS%
+## It must also depend on the 'all' target.  See automake bug#11252.
+recheck: all %CHECK_DEPS%
 
 AM_RECURSIVE_TARGETS += check recheck
 
 .PHONY: recheck
 
-## ----------------------------------------------- ##
-## Produce HTML.  To be removed in automake 1.12.  ##
-## ----------------------------------------------- ##
-
-include check-html.am
-
 else !%?PARALLEL_TESTS%
 
 check-TESTS: $(TESTS)
@@ -304,10 +387,10 @@ check-TESTS: $(TESTS)
          for tst in $$list; do \
            if test -f ./$$tst; then dir=./; \
 ## Note: Solaris 2.7 seems to expand TESTS using VPATH.  That's
-## why we also try `dir='
+## why we also try 'dir='.
            elif test -f $$tst; then dir=; \
            else dir="$(srcdir)/"; fi; \
-           if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+           if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
 ## Success
              all=`expr $$all + 1`; \
              case " $(XFAIL_TESTS) " in \
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 054c62d..9847a44 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,10 +14,34 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## From a test file to a log file.
+if %?FIRST%
+## When BSD make is run in parallel mode, it apparently strips any
+## leading directory component from the automatic variable '$*' (of
+## course, against what POSIX mandates).  Try to detect and work
+## around this incompatibility.
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+endif %?FIRST%
+
+## From a test file to a .log and .trs file.
 ?GENERIC?%EXT%.log:
 ?!GENERIC?%OBJ%: %SOURCE%
-       @p='%SOURCE%'; $(am__check_pre) %COMPILE% "$$tst" $(am__check_post)
+       @p='%SOURCE%'; \
+## Another hack to support BSD make in parallel mode.
+?!GENERIC?     b='%BASE%'; \
+?GENERIC?      $(am__set_b); \
+       $(am__check_pre) %DRIVER% --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 
 ## If no programs are built in this package, then this rule is removed
 ## at automake time.  Otherwise, %am__EXEEXT% expands to a configure time
@@ -25,5 +49,12 @@
 ## conflict with the previous one.
 if %am__EXEEXT%
 ?GENERIC?%EXT%$(EXEEXT).log:
-       @p='%SOURCE%'; $(am__check_pre) %COMPILE% "$$tst" $(am__check_post)
+       @p='%SOURCE%'; \
+       ## Another hack to support BSD make in parallel mode.
+?!GENERIC?     b='%BASE%'; \
+?GENERIC?      $(am__set_b); \
+       $(am__check_pre) %DRIVER% --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) %DRIVER_FLAGS% -- %COMPILE% \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 endif %am__EXEEXT%
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 8edbce3..3f377c8 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/clean.am b/lib/am/clean.am
index c85feb1..da46435 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2008
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/compile.am b/lib/am/compile.am
index 98e82e5..7b37da2 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/configure.am b/lib/am/configure.am
index cadb27c..20534c7 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009  Free
-## Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -71,7 +70,7 @@ endif %?TOPDIR_P%
 ## in newly added directories.
        @case '$?' in \
 ## Don't prefix $(top_builddir), because GNU make will strip it out
-## when it's `.'.
+## when it's '.'.
          *config.status*) \
 ?TOPDIR_P?         echo ' $(SHELL) ./config.status'; \
 ?TOPDIR_P?         $(SHELL) ./config.status;; \
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 660050a..f1ee471 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -60,7 +59,7 @@ check-DEJAGNU: site.exp
            if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) 
$(RUNTESTFLAGS); \
            then :; else exit_status=1; fi; \
          done; \
-       else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+       else echo "WARNING: could not find 'runtest'" 1>&2; :;\
        fi; \
        exit $$exit_status
 
@@ -73,7 +72,7 @@ check-DEJAGNU: site.exp
 ## the possibility of a corrupted site.exp if make is interrupted.
 ## Jim Meyering has some useful text on this topic.
 site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
-       @echo 'Making a new site.exp file...'
+       @echo 'Making a new site.exp file ...'
        @echo '## these variables are automatically generated by make ##' 
>site.tmp
        @echo '# Do not edit here.  If you wish to override these values' 
>>site.tmp
        @echo '# edit the last section' >>site.tmp
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 3765d71..643c6ab 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2008
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 9a193a4..845472f 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2006, 2008, 2009, 2010  Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,13 +18,13 @@
 ## - once per *extension* (not per language) for generic compilation rules
 ## - once for each file which requires specific flags.
 
-## Note it is on purpose we wrote `if %AMDEP%', since:
+## Note it is on purpose we wrote "if %AMDEP%", since:
 ##
 ## - if deps are turned off, %AMDEP% is mapped onto FALSE, and therefore
-##   the `if FALSE' chunk is removed (automake-time conditionals).
+##   the "if FALSE" chunk is removed (automake-time conditionals).
 ##
 ## - if deps are on, %AMDEP% is mapped onto AMDEP,  and therefore
-##   the `if AMDEP' chunk is prefix with @AMDEP_TRUE@ just like for any
+##   the "if AMDEP" chunk is prefix with @AMDEP_TRUE@ just like for any
 ##   other configure-time conditional.
 ##
 ## We do likewise for %FASTDEP%; this expands to an ordinary
@@ -43,10 +42,10 @@
 ##     do not care about build details such as dependency generation
 ##     (the if/then/else machinery in FASTDEP rules).  Their point is
 ##     that it is hard to spot diagnostics in a verbose output.
-## (3) Other people want `make -s' to work as expected: silently.
+## (3) Other people want "make -s" to work as expected: silently.
 ##     This way they can spot any diagnostic really easily.
 ##
-## The second point suggests we hide rules with @ and that we `echo'
+## The second point suggests we hide rules with @ and that we 'echo'
 ## only the relevant parts.  However this goes against the two others.
 ## There are regular complaints about this on the mailing list, but
 ## it's hard to please everybody.  On April 2003, William Fulton (from
@@ -131,7 +130,7 @@ if %AMDEP%
        %VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-## We can always use `-o' with Libtool.
+## We can always use '-o' with Libtool.
 ?GENERIC?      %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
 ?!GENERIC?     %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f 
'%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index da9028b..e27b650 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010, 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -34,6 +33,7 @@ am__remove_distdir = \
 ## See automake bug#10470.
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 endif %?TOPDIR_P%
 
 if %?SUBDIRS%
@@ -91,7 +91,7 @@ if  %?CK-NEWS%
 endif  %?CK-NEWS%
 endif %?TOPDIR_P%
 ##
-## `missing help2man' may have created some bogus man pages.  Ensure they
+## 'missing help2man' may have created some bogus man pages.  Ensure they
 ## are not distributed.
 ##
 if %?INSTALL-MAN%
@@ -107,10 +107,10 @@ if %?HAVE-MANS%
            if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
          if test -n "$$list" && \
            grep 'ab help2man is required to generate this page' $$list 
>/dev/null; then \
-           echo "error: found man pages containing the \`missing help2man' 
replacement text:" >&2; \
+           echo "error: found man pages containing the 'missing help2man' 
replacement text:" >&2; \
            grep -l 'ab help2man is required to generate this page' $$list | 
sed 's/^/         /' >&2; \
            echo "       to fix them, install help2man, remove and regenerate 
the man pages;" >&2; \
-           echo "       typically \`make maintainer-clean' will remove them" 
>&2; \
+           echo "       typically 'make maintainer-clean' will remove them" 
>&2; \
            exit 1; \
          else :; fi; \
        else :; fi
@@ -130,9 +130,9 @@ endif %?TOPDIR_P%
 ##
 ## Yet another hack to support SUN make.
 ##
-## Let's assume `foo' appears in DISTFILES and is not a built file.
+## Let's assume 'foo' appears in DISTFILES and is not a built file.
 ## When building with VPATH=$(srcdir), SUN make and OSF1/Tru64 will
-## rewrite `foo' as `$(srcdir)/foo'.  An attempt to install the file
+## rewrite 'foo' as '$(srcdir)/foo'.  An attempt to install the file
 ## with
 ##    cp $file $(distdir)/$file
 ## will thus install $(srcdir)/foo as $(distdir)/$(srcdir)/foo
@@ -148,20 +148,21 @@ endif %?TOPDIR_P%
 ## same pattern as $(srcdir)?
 ## Well, it can't happen without the Makefile author distributing
 ## something out of the distribution (which is bad).  As an example,
-## consider `EXTRA_DIST = ../bar'.  This is an issue if $srcdir is `..',
-## however getting this value for srcdir is impossible: `EXTRA_DIST = ../bar'
-## implies we are in a subdirectory (so `../bar' is within the package),
-## hence `$srcdir' is something like `../../subdir'.
+## consider "EXTRA_DIST = ../bar".  This is an issue if $srcdir is
+## '..', however getting this value for srcdir is impossible:
+## "EXTRA_DIST = ../bar" implies we are in a subdirectory (so '../bar'
+## is within the package), hence '$srcdir' is something like
+## '../../subdir'.
 ##
 ## There is more to say about files which are above the current directory,
-## like `../bar' in the previous example.  The OSF1/Tru64 make
+## like '../bar' in the previous example.  The OSF1/Tru64 make
 ## implementation can simplify filenames resulting from a VPATH lookup.
-## For instance if `VPATH = ../../subdir' and `../bar' is found in that
-## VPATH directory, then occurrences of `../bar' will be replaced by
-## `../../bar' (instead of `../../subdir/../bar').  This obviously defeats
+## For instance if "VPATH = ../../subdir" and '../bar' is found in that
+## VPATH directory, then occurrences of '../bar' will be replaced by
+## '../../bar' (instead of '../../subdir/../bar').  This obviously defeats
 ## any attempt to strip a leading $srcdir.  Presently we have no workaround
-## for this.  We avoid this issue by writing `EXTRA_DIST = $(srcdir)/../bar'
-## instead of `EXTRA_DIST = ../bar'.  This prefixing is needed only for files
+## for this.  We avoid this issue by writing "EXTRA_DIST = $(srcdir)/../bar"
+## instead of "EXTRA_DIST = ../bar".  This prefixing is needed only for files
 ## above the current directory.  Fortunately, apart from auxdir files which
 ## can be located in .. or ../.., this situation hardly occurs in practice.
 ##
@@ -172,7 +173,7 @@ endif %?TOPDIR_P%
          dist_files=`for file in $$list; do echo $$file; done | \
          sed -e "s|^$$srcdirstrip/||;t" \
              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-## (The second `t' command clears the flag for the next round.)
+## (The second 't' command clears the flag for the next round.)
 ##
 ## Make the subdirectories for the files.
 ##
@@ -199,18 +200,18 @@ endif %?TOPDIR_P%
 ##
          if test -d $$d/$$file; then \
 ## Don't mention $$file in the destination argument, since this fails if
-## the destination directory already exists.  Also, use `-R' and not `-r'.
-## `-r' is almost always incorrect.
-##
-## If a directory exists both in `.' and $(srcdir), then
-## We copy the files from $(srcdir) first and then install those from
-## `.'.  This can help people who distribute directories made of
-## source files _and_ generated files.  It is also important when the
-## directory exists only in $(srcdir), because some vendor Make (such
-## as Tru64) will magically create an empty directory in `.'
+## the destination directory already exists.  Also, use '-R' and not '-r'.
+## '-r' is almost always incorrect.
+##
+## If a directory exists both in '.' and $(srcdir), then we copy the
+## files from $(srcdir) first and then install those from '.'.  This
+## can help people who distribute directories made of source files
+## *and* generated files.  It is also important when the directory
+## exists only in $(srcdir), because some vendor Make (such as Tru64)
+## will magically create an empty directory in '.'.
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 ## If the destination directory already exists, it may contain read-only
-## files, e.g., during `make distcheck'.
+## files, e.g., during "make distcheck".
            if test -d "$(distdir)/$$file"; then \
              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
@@ -223,6 +224,7 @@ endif %?TOPDIR_P%
 ## Test for file existence because sometimes a file gets included in
 ## DISTFILES twice.  For example this happens when a single source
 ## file is used in building more than one program.
+## See also test 'dist-repeated.test'.
            test -f "$(distdir)/$$file" \
            || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
@@ -234,7 +236,7 @@ endif %?TOPDIR_P%
 ## explicitly set distdir for the subdir make; that lets us mix-n-match
 ## many automake-using packages into one large package, and have "dist"
 ## at the top level do the right thing.  If we're in the topmost
-## directory, then we use `distdir' instead of `top_distdir'; this lets
+## directory, then we use 'distdir' instead of 'top_distdir'; this lets
 ## us work correctly with an enclosing package.
 if %?SUBDIRS%
        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
@@ -319,9 +321,9 @@ endif %?TOPDIR_P%
 ## Building various distribution flavors.  ##
 ## --------------------------------------- ##
 
-## Note that we don't use GNU tar's `-z' option.  One reason (but not
+## Note that we don't use GNU tar's '-z' option.  One reason (but not
 ## the only reason) is that some versions of tar (e.g., OSF1)
-## interpret `-z' differently.
+## interpret '-z' differently.
 ##
 ## The -o option of GNU tar used to exclude empty directories.  This
 ## behavior was fixed in tar 1.12 (released on 1997-04-25).  But older
@@ -329,6 +331,10 @@ endif %?TOPDIR_P%
 ## with tar 1.11.2).  We do not do anything specific w.r.t. this
 ## incompatibility since packages where empty directories need to be
 ## present in the archive are really unusual.
+##
+## We order DIST_TARGETS by expected duration of the compressors,
+## slowest first, for better parallelism in "make dist".  Do not
+## reorder DIST_ARCHIVES, users may expect gzip to be first.
 
 if %?TOPDIR_P%
 
@@ -337,50 +343,52 @@ GZIP_ENV = --best
 .PHONY: dist-gzip
 dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
 .PHONY: dist-bzip2
 dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?LZIP?DIST_ARCHIVES += $(distdir).tar.lz
 .PHONY: dist-lzip
 dist-lzip: distdir
        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} 
>$(distdir).tar.lz
-       $(am__remove_distdir)
-
-?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
-.PHONY: dist-lzma
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
 .PHONY: dist-tarZ
 dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
 .PHONY: dist-shar
 dist-shar: distdir
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 ?ZIP?DIST_ARCHIVES += $(distdir).zip
 .PHONY: dist-zip
 dist-zip: distdir
        -rm -f $(distdir).zip
        zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
+
+?LZIP?DIST_TARGETS += dist-lzip
+?XZ?DIST_TARGETS += dist-xz
+?SHAR?DIST_TARGETS += dist-shar
+?BZIP2?DIST_TARGETS += dist-bzip2
+?GZIP?DIST_TARGETS += dist-gzip
+?ZIP?DIST_TARGETS += dist-zip
+?COMPRESS?DIST_TARGETS += dist-tarZ
 
 endif %?TOPDIR_P%
 
@@ -400,17 +408,9 @@ if %?SUBDIRS%
 AM_RECURSIVE_TARGETS += dist dist-all
 endif %?SUBDIRS%
 
-dist dist-all: distdir
-?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
-?BZIP2?        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
-?LZIP? tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} 
>$(distdir).tar.lz
-?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-?XZ?   tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
-?COMPRESS?     tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-?ZIP?  -rm -f $(distdir).zip
-?ZIP?  zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
+dist dist-all:
+       $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+       $(am__post_remove_distdir)
 
 endif %?TOPDIR_P%
 
@@ -435,8 +435,6 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.lz*) \
          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
@@ -456,13 +454,13 @@ distcheck: dist
        mkdir $(distdir)/_inst
 ## Undo the write access.
        chmod a-w $(distdir)
-## With GNU make, the following command will be executed even with `make -n',
-## due to the presence of `$(MAKE)'.  That is normally all well (and `$(MAKE)'
+## With GNU make, the following command will be executed even with "make -n",
+## due to the presence of '$(MAKE)'.  That is normally all well (and '$(MAKE)'
 ## is necessary for things like parallel distcheck), but here we don't want
 ## execution.  To avoid MAKEFLAGS parsing hassles, use a witness file that a
-## non-`-n' run would have just created.
+## non-'-n' run would have just created.
        test -d $(distdir)/_build || exit 0; \
-## Compute the absolute path of `_inst'.  Strip any leading DOS drive
+## Compute the absolute path of '_inst'.  Strip any leading DOS drive
 ## to allow DESTDIR installations.  Otherwise "$(DESTDIR)$(prefix)" would
 ## expand to "c:/temp/am-dc-5668/c:/src/package/package-1.0/_inst".
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 
's,^[^:\\/]:[\\/],/,'` \
@@ -472,7 +470,7 @@ distcheck: dist
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 ?DISTCHECK-HOOK?         && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
 ## Parallel BSD make may not start a new shell for each command in a recipe,
-## so be sure to `cd' back to the original directory after this.
+## so be sure to 'cd' back to the original directory after this.
          && am__cwd=`pwd` \
          && $(am__cd) $(distdir)/_build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
@@ -493,14 +491,14 @@ distcheck: dist
 ## Make sure the package has proper DESTDIR support (we could not test this
 ## in the previous install/installcheck/uninstall test, because it's reasonable
 ## for installcheck to fail in a DESTDIR install).
-## We make the `$dc_install_base' read-only because this is where files
+## We make the '$dc_install_base' read-only because this is where files
 ## with missing DESTDIR support are likely to be installed.
          && chmod -R a-w "$$dc_install_base" \
 ## The logic here is quite convoluted because we must clean $dc_destdir
 ## whatever happens (it won't be erased by the next run of distcheck like
 ## $(distdir) is).
          && ({ \
-## Build the directory, so we can cd into it even if `make install'
+## Build the directory, so we can cd into it even if "make install"
 ## didn't create it.  Use mkdir, not $(MKDIR_P) because we want to
 ## fail if the directory already exists (PR/413).
               (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
@@ -517,7 +515,7 @@ distcheck: dist
 ## Cater to parallel BSD make (see above).
          && cd "$$am__cwd" \
          || exit 1
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
        @(echo "$(distdir) archives ready for distribution: "; \
          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -526,7 +524,7 @@ distcheck: dist
 ## from distcheck, so that they can be overridden by the user.
 .PHONY: distuninstallcheck
 distuninstallcheck_listfiles = find . -type f -print
-## The `dir' file (created by install-info) might still exist after
+## The 'dir' file (created by install-info) might still exist after
 ## uninstall, so we must be prepared to account for it.  The following
 ## check is not 100% strict, but is definitely good enough, and even
 ## accounts for overridden $(infodir).
diff --git a/lib/am/footer.am b/lib/am/footer.am
index a398093..71ac76b 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 2d81009..ba4aa0b 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2005,
-## 2006 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/header.am b/lib/am/header.am
index 077a2c9..752af19 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003 Free Software 
Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index a807f79..3096f0a 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2004, 2007, 2008  Free Software Foundation, Inc.
+## Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -59,9 +59,9 @@ am__base_list = \
 ## to the directory where the files to be removed are, and to the list of
 ## such files.
 am__uninstall_files_from_dir = { \
-## Some rm implementations complain if `rm -f' is used without arguments.
+## Some rm implementations complain if 'rm -f' is used without arguments.
   test -z "$$files" \
-## At least Solaris /bin/sh still lacks `test -e', so we use the multiple
+## At least Solaris /bin/sh still lacks 'test -e', so we use the multiple
 ## tests below instead.  We expect $dir to be either non-existent or a
 ## directory, so the failure we'll experience if it is a regular file
 ## is indeed desired and welcome (better to fail loudly thasn silently).
diff --git a/lib/am/install.am b/lib/am/install.am
index 01ae49a..b587d08 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,10 +19,10 @@
 ## ----------------------------------------- ##
 
 ## The reason we loop over %am__installdirs% (instead of simply running
-## `$(MKDIR_P) %am__installdirs%') is that directories variable such as
-## `"$(DESTDIR)$(mydir)"' can potentially expand to `""' if `$(mydir)'
-## is conditionally defined.  BTW, those directories are quoted in
-## order to support installation paths with spaces.
+## $(MKDIR_P) %am__installdirs%) is that directories variable such as
+## "$(DESTDIR)$(mydir)" can potentially expand to "" if $(mydir) is
+## conditionally defined.  BTW, those directories are quoted in order
+## to support installation paths with spaces.
 
 if %?SUBDIRS%
 .PHONY: installdirs installdirs-am
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 66adaa1..04cafb3 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 ## Preprocessed Fortran 77.  ##
 ## ------------------------- ##
 
-## We also handle the case of preprocessing `.F' files into `.f' files.
+## We also handle the case of preprocessing '.F' files into '.f' files.
 if %?PPF77%
 .F.f:
        $(F77COMPILE) -F $<
diff --git a/lib/am/lex.am b/lib/am/lex.am
index fb4077d..7467f4f 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009  Free Software
-## Foundation, Inc.
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/library.am b/lib/am/library.am
index 4045558..686b648 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1999, 2003, 2009, 2010, 2012 Free
-## Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index dc2e199..3681c45 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2005,
-## 2008  Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 968439f..ba5c92a 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -46,16 +46,16 @@ elc-stamp: $(LISP)
 $(am__ELCFILES): elc-stamp
 ## Recover from the removal of address@hidden
 ##
-## Do not call `make elc-stamp' if emacs is not available, because it would
+## Do not call "make elc-stamp" if emacs is not available, because it would
 ## be useless.
 ##
-## If `make -n' is called, do not execute any command in the recipe that
+## If "make -n" is called, do not execute any command in the recipe that
 ## changes the tree; however, invoke the recursive make for debuggability.
        @if $(am__make_dryrun); then dry=:; else dry=; fi; \
        if test "$(EMACS)" != no && test ! -f $@; then \
-## If `make -j' is used and more than one file has been erased, several
+## If "make -j" is used and more than one file has been erased, several
 ## processes can execute this block.  We have to make sure that only
-## the first one will run `$(MAKE) $(AM_MAKEFLAGS) elc-stamp', and the
+## the first one will run "$(MAKE) $(AM_MAKEFLAGS) elc-stamp", and the
 ## other ones will wait.
 ##
 ## There is a race here if only one child of make receive a signal.
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 62ee1d2..1ca26b5 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -105,12 +105,14 @@ endif %?INSTALL%
 .PHONY clean-am: clean-%DIR%LTLIBRARIES
 clean-%DIR%LTLIBRARIES:
        -test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES)
-## `so_locations' files are created by some linkers (IRIX, OSF) when
+## 'so_locations' files are created by some linkers (IRIX, OSF) when
 ## building a shared object.  Libtool places these files in the
 ## directory where the shared object is created.
-       @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
+       @list='$(%DIR%_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index dd958fd..b758880 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2003, 2005, 2008, 2009, 2010, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index c99de88..5d582d7 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 2001, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/mans.am b/lib/am/mans.am
index b92576d..bfc71dc 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -45,7 +45,7 @@ if %?NOTRANS_MANS%
 ## This must be done dynamically to support conditionals.
        if test -n "$$list2"; then \
          for i in $$list2; do echo "$$i"; done \
-## Accept for `man1' files like `foo.1c' but not `sub.1/foo.2' or `foo-2.1.4'.
+## Accept for 'man1' files like 'foo.1c' but not 'sub.1/foo.2' or 'foo-2.1.4'.
            | sed -n '/\.%SECTION%[a-z]*$$/p'; \
        fi; \
 ## Extract basename of manpage, change the extension if needed.
@@ -86,7 +86,7 @@ if %?TRANS_MANS%
 ## This must be done dynamically to support conditionals.
        if test -n "$$list2"; then \
          for i in $$list2; do echo "$$i"; done \
-## Accept for `man1' files like `foo.1c' but not `sub.1/foo.2' or `foo-2.1.4'.
+## Accept for 'man1' files like `foo.1c' but not 'sub.1/foo.2' or 'foo-2.1.4'.
            | sed -n '/\.%SECTION%[a-z]*$$/p'; \
        fi; \
 ## Extract basename of manpage, change the extension if needed.
@@ -131,7 +131,7 @@ if %?NOTRANS_MANS%
 ## Extract all items from notrans_man_MANS that should go in this section.
 ## This must be done dynamically to support conditionals.
 ?HAVE_NOTRANS? l2='%NOTRANS_LIST%'; for i in $$l2; do echo "$$i"; done | \
-## Accept for `man1' files like `foo.1c' but not `sub.1/foo.2' or `foo-2.1.4'.
+## Accept for 'man1' files like 'foo.1c' but not 'sub.1/foo.2' or 'foo-2.1.4'.
 ?HAVE_NOTRANS?   sed -n '/\.%SECTION%[a-z]*$$/p'; \
 ## Extract basename of manpage, change the extension if needed.
        } | sed 's,.*/,,;s,\.[^%SECTION%][0-9a-z]*$$,.%SECTION%,'`; \
@@ -144,7 +144,7 @@ if %?TRANS_MANS%
 ## Extract all items from man_MANS that should go in this section.
 ## This must be done dynamically to support conditionals.
 ?HAVE_TRANS?   l2='%TRANS_LIST%'; for i in $$l2; do echo "$$i"; done | \
-## Accept for `man1' files like `foo.1c' but not `sub.1/foo.2' or `foo-2.1.4'.
+## Accept for 'man1' files like 'foo.1c' but not 'sub.1/foo.2' or 'foo-2.1.4'.
 ?HAVE_TRANS?     sed -n '/\.%SECTION%[a-z]*$$/p'; \
 ## Extract basename of manpage, run it through the program rename
 ## transform, and change the extension if needed.
diff --git a/lib/am/multilib.am b/lib/am/multilib.am
deleted file mode 100644
index 6897b5d..0000000
--- a/lib/am/multilib.am
+++ /dev/null
@@ -1,60 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 2001, 2003, 2004 Free Software Foundation, Inc.
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-## Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-# GNU Make needs to see an explicit $(MAKE) variable in the command it
-# runs to enable its job server during parallel builds.  Hence the
-# comments below.
-
-all-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-install-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
-
-.MAKE .PHONY: all-multi install-multi
-
-
-mostlyclean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
-clean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
-distclean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
-maintainer-clean-multi:
-       $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-
-.MAKE .PHONY: mostlyclean-multi clean-multi distclean-multi 
maintainer-clean-multi
-
-install-exec-am: install-multi
-## No uninstall rule?
-
-
-## These cleaning rules are recursive.  They should not be
-## registered as dependencies of *-am rules.  For instance
-## otherwise running `make clean' would cause both
-## clean-multi and mostlyclean-multi to be run, while only
-## clean-multi is really expected (since clean-multi recursively
-## call clean, it already do the job of mostlyclean).
-mostlyclean: mostlyclean-multi
-clean: clean-multi
-distclean: distclean-multi
-maintainer-clean: maintainer-clean-multi
diff --git a/lib/am/program.am b/lib/am/program.am
index 42c585e..699afb5 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 2009, 2010,
-## 2012 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/progs.am b/lib/am/progs.am
index da26277..2be8bca 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -31,7 +31,7 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
          $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
        fi; \
        for p in $$list; do echo "$$p $$p"; done | \
-## On Cygwin with libtool test won't see `foo.exe' but instead `foo'.
+## On Cygwin with libtool test won't see 'foo.exe' but instead 'foo'.
 ## So we check for both.
        sed 's/$(EXEEXT)$$//' | \
        while read p p1; do if test -f $$p%LIBTOOL? || test -f $$p1%; \
@@ -44,7 +44,7 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
        sed 'N;N;N;s,\n, ,g' | \
 ## The following awk script turns that into one line containing directories
-## and then lines of 'type target_name_or_directory sources...', with type
+## and then lines of 'type target_name_or_directory sources ...', with type
 ## 'd' designating directories, and 'f' files.
        $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
          { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
@@ -100,14 +100,14 @@ endif %?INSTALL%
 .PHONY clean-am: clean-%DIR%PROGRAMS
 clean-%DIR%PROGRAMS:
 ?!LIBTOOL?     -test -z "$(%DIR%_PROGRAMS)" || rm -f $(%DIR%_PROGRAMS)
-## Under Cygwin, we build `program$(EXEEXT)'.  However, if this
+## Under Cygwin, we build 'program$(EXEEXT)'.  However, if this
 ## program uses a Libtool library, Libtool will move it in
-## `_libs/program$(EXEEXT)' and create a `program' wrapper (without
-## `$(EXEEXT)').  Therefore, if Libtool is used, we must try to erase
-## both `program$(EXEEXT)' and `program'.
-## Cleaning the `_libs/' or `.libs/' directory is done from clean-libtool.
+## '_libs/program$(EXEEXT)' and create a 'program' wrapper (without
+## '$(EXEEXT)').  Therefore, if Libtool is used, we must try to erase
+## both 'program$(EXEEXT)' and 'program'.
+## Cleaning the '_libs/' or '.libs/' directory is done from clean-libtool.
 ## FIXME: In the future (i.e., when it works) it would be nice to delegate
-## this task to `libtool --mode=clean'.
+## this task to "libtool --mode=clean".
 ?LIBTOOL?      @list='$(%DIR%_PROGRAMS)'; test -n "$$list" || exit 0; \
 ?LIBTOOL?      echo " rm -f" $$list; \
 ?LIBTOOL?      rm -f $$list || exit $$?; \
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 35f4a46..f61400a 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005,
-## 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -46,13 +45,13 @@ if %?FIRST%
 ## out-of-date config.h without knowing it).  One situation where this
 ## can occur is the following:
 ## 1. the user updates some configure dependency (let's say foo.m4)
-##    and runs `make'
+##    and runs 'make';
 ## 2. the rebuild rules detect that a foo.m4 has changed,
 ##    run aclocal, autoconf, automake, and then run ./config.status.
 ##    (Note that autoheader hasn't been called yet, so ./config.status
-##    outputs a config.h from an obsolete config.hin.)
-## 3. Once Makefile has been regenerated, make continues, and
-##    discovers that config.h is a dependency of the `all' rule.
+##    outputs a config.h from an obsolete config.hin);
+## 3. once Makefile has been regenerated, make continues, and
+##    discovers that config.h is a dependency of the 'all' rule.
 ##    Because config.h depends on stamp-h1, stamp-h1 depends on
 ##    config.hin, and config.hin depends on aclocal.m4, make runs
 ##    autoheader to rebuild config.hin.
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 9c01a8c..1d1295e 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,7 +17,7 @@
 RECURSIVE_TARGETS += all-recursive check-recursive installcheck-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-## All documented targets which invoke `make' recursively, or depend
+## All documented targets which invoke 'make' recursively, or depend
 ## on targets that do so.
 AM_RECURSIVE_TARGETS += $(RECURSIVE_TARGETS:-recursive=) \
   $(RECURSIVE_CLEAN_TARGETS:-recursive=)
@@ -27,11 +26,11 @@ AM_RECURSIVE_TARGETS += $(RECURSIVE_TARGETS:-recursive=) \
 .MAKE: $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
 
 $(RECURSIVE_TARGETS):
 ## Using $failcom allows "-k" to keep its natural meaning when running a
@@ -66,7 +65,7 @@ clean: clean-recursive
 distclean: distclean-recursive
 maintainer-clean: maintainer-clean-recursive
 
-## We run all `clean' targets in reverse order.  Why?  It's an attempt
+## We run all 'clean' targets in reverse order.  Why?  It's an attempt
 ## to alleviate a problem that can happen when dependencies are
 ## enabled.  In this case, the .P file in one directory can depend on
 ## some automatically generated header in an earlier directory.  Since
@@ -84,7 +83,7 @@ $(RECURSIVE_CLEAN_TARGETS):
        done; \
        dot_seen=no; \
 ## For distclean and maintainer-clean we make sure to use the full
-## list of subdirectories.  We do this so that `configure; make
+## list of subdirectories.  We do this so that 'configure; make
 ## distclean' really is a no-op, even if SUBDIRS is conditional.  For
 ## other clean targets this doesn't matter.
        case "$@" in \
@@ -96,7 +95,7 @@ $(RECURSIVE_CLEAN_TARGETS):
            rev="$$subdir $$rev"; \
          fi; \
        done; \
-## Always do `.' last.
+## Always do '.' last.
        rev="$$rev ."; \
        target=`echo $@ | sed s/-recursive//`; \
        for subdir in $$rev; do \
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 7463e2f..fccacca 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2007, 2008, 2009  Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -48,13 +47,11 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% 
$(TAGS_DEPENDENCIES) \
 ## absolute names, without the need to worry about white space in `pwd`.
        set x; \
        here=`pwd`; \
-## It is tempting to use if/endif here, but don't: the previous
-## backslash will cause bad results (automake doesn't `see' the `if').
 ## Exuberant Ctags wants --etags-include,
 ## GNU Etags             --include
 ## Furthermore Exuberant Ctags 5.5.4 fails to create TAGS files
 ## when no files are supplied, despite any --etags-include option.
-## A workaround is to pass `.' as a file.  This is what $empty_fix is for.
+## A workaround is to pass '.' as a file.  This is what $empty_fix is for.
 ?SUBDIRS?      if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 ?SUBDIRS?        include_option=--etags-include; \
 ?SUBDIRS?        empty_fix=.; \
@@ -63,7 +60,7 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% 
$(TAGS_DEPENDENCIES) \
 ?SUBDIRS?        empty_fix=; \
 ?SUBDIRS?      fi; \
 ?SUBDIRS?      list='$(SUBDIRS)'; for subdir in $$list; do \
-## Do nothing if we're trying to look in `.'.
+## Do nothing if we're trying to look in '.'.
 ?SUBDIRS?        if test "$$subdir" = .; then :; else \
 ?SUBDIRS?          test ! -f $$subdir/TAGS || \
 ## Note that the = is mandatory for --etags-include.
@@ -78,7 +75,7 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% 
$(TAGS_DEPENDENCIES) \
          done | \
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
              END { if (nonempty) { for (i in files) print i; }; }'`; \
-## Remove the `x' we added first:
+## Remove the 'x' we added first:
        shift; \
 ## Make sure we have something to run etags on.
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
@@ -93,9 +90,9 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% 
$(TAGS_DEPENDENCIES) \
        fi
 
 
-## ------------- ##
-## vi-style tags ##
-## ------------- ##
+## --------------- ##
+## vi-style tags.  ##
+## --------------- ##
 
 CTAGS = ctags
 .PHONY: CTAGS ctags
@@ -104,7 +101,7 @@ AM_RECURSIVE_TARGETS += ctags CTAGS
 endif %?SUBDIRS%
 ctags: CTAGS
 
-## We have a dummy name here because `tags' has already been in use
+## We have a dummy name here because 'tags' has already been in use
 ## for a long time to mean Emacs-style tags.  Oops.  This means the
 ## dependencies here are useless.
 CTAGS: %CTAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
@@ -124,7 +121,7 @@ CTAGS: %CTAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% 
$(TAGS_DEPENDENCIES) \
 
 
 ## --------------- ##
-## `Global' tags.  ##
+## "Global tags".  ##
 ## --------------- ##
 
 .PHONY: GTAGS
@@ -134,6 +131,43 @@ GTAGS:
          && gtags -i $(GTAGS_ARGS) "$$here"
 
 
+## ------- ##
+## cscope  ##
+## ------- ##
+
+if %?TOPDIR_P%
+
+CSCOPE = cscope
+.PHONY: cscope clean-cscope
+AM_RECURSIVE_TARGETS += cscope
+
+cscope: cscope.files
+       test ! -s cscope.files \
+         || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files 
$(CSCOPE_ARGS)
+
+clean-cscope:
+       -rm -f cscope.files
+
+cscope.files: clean-cscope %CSCOPEDIRS% cscopelist
+
+endif %?TOPDIR_P%
+
+.PHONY: cscopelist
+cscopelist: %CSCOPEDIRS% $(HEADERS) $(SOURCES) $(LISP)
+       list='$(SOURCES) $(HEADERS) $(LISP)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
+
+
 ## ---------- ##
 ## Cleaning.  ##
 ## ---------- ##
@@ -142,3 +176,6 @@ GTAGS:
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+if %?TOPDIR_P%
+       -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+endif %?TOPDIR_P%
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 680630b..4065524 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-## 2004, 2005  Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,7 +16,7 @@
 
 DIST_COMMON += %VTEXI% %STAMPVTI%
 
-## Don't give this rule a command (even `@:').
+## Don't give this rule a command (even '@:').
 ## %STAMPVTI% is always newer than %VTEXI%, so this rule is always
 ## triggered.  If you equip this rule with a command, GNU make will
 ## assume %VTEXI% has been rebuild in the current directory and
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index dca9ce1..f77748a 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-##   2003, 2004, 2005, 2008  Free Software Foundation, Inc.
+## Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,8 +17,8 @@
 
 ?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%:
 ?!GENERIC_INFO?%DEST_INFO_PREFIX%%DEST_SUFFIX%: %SOURCE_INFO% %DEPS%
-## It is wrong to have `info' files dependent on %DIRSTAMP%, because
-## `info' files are distributed and %DIRSTAMP% isn't: a distributed file
+## It is wrong to have 'info' files dependent on %DIRSTAMP%, because
+## 'info' files are distributed and %DIRSTAMP% isn't: a distributed file
 ## should never be dependent upon a non-distributed built file.
 ## Therefore we ensure that %DIRSTAMP% exists in the rule.
 ?!INSRC??DIRSTAMP?     @test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) 
%DIRSTAMP%
@@ -32,11 +31,11 @@
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
 ## *.iNN files are used on DJGPP.  See the comments in install-info-am
-       restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+       %AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 ?INSRC?        am__cwd=`pwd` && $(am__cd) $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
 ## If makeinfo is not installed we must not backup the files so
-##`missing' can do its job and touch $@ if it exists.
+## 'missing' can do its job and touch $@ if it exists.
        if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
          for f in $@ address@hidden address@hidden $(@:.info=).i[0-9] 
$(@:.info=).i[0-9][0-9]; do \
            if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
@@ -62,23 +61,33 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
 
 ?GENERIC?%SOURCE_SUFFIX%.dvi:
 ?!GENERIC?%DEST_PREFIX%.dvi: %SOURCE% %DEPS% %DIRSTAMP%
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       
%AM_V_TEXI2DVI%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
-## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
-?GENERIC?      $(TEXI2DVI) %SOURCE%
-?!GENERIC?     $(TEXI2DVI) -o $@ `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
+## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
+## texi2dvi doesn't silence everything with -q, redirect to /dev/null instead.
+## We still want -q (%TEXIQUIET%) because it turns on batch mode.
+## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
+## directory (see automake bug#11146).  We should start using '--tidy' when we
+## can assume Texinf 4.9 or later.
+?GENERIC?      $(TEXI2DVI) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
+?!GENERIC?     $(TEXI2DVI) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' || 
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
 
 ?GENERIC?%SOURCE_SUFFIX%.pdf:
 ?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       
%AM_V_TEXI2PDF%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
-## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
-?GENERIC?      $(TEXI2PDF) %SOURCE%
-?!GENERIC?     $(TEXI2PDF) -o $@ `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
+## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
+## texi2pdf doesn't silence everything with -q, redirect to /dev/null instead.
+## We still want -q (%TEXIQUIET%) because it turns on batch mode.
+## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
+## directory (see automake bug#11146).  We should start using '--tidy' when we
+## can assume Texinf 4.9 or later.
+?GENERIC?      $(TEXI2PDF) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
+?!GENERIC?     $(TEXI2PDF) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' || 
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
 
 ?GENERIC?%SOURCE_SUFFIX%.html:
 ?!GENERIC?%DEST_PREFIX%.html: %SOURCE% %DEPS% %DIRSTAMP%
@@ -88,8 +97,8 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
 ## in the manual change, it may leave unused pages.  Our fix
 ## is to build under a temporary name, and replace the target on
 ## success.
-       rm -rf $(@:.html=.htp)
-       if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS% \
+       %AM_V_MAKEINFO%rm -rf $(@:.html=.htp)
+       %SILENT%if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS% \
 ?GENERIC?       -o $(@:.html=.htp) %SOURCE%; \
 ?!GENERIC?      -o $(@:.html=.htp) `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%; \
        then \
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 1a1766e..42787c7 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -54,8 +54,8 @@ endif %?LOCAL-TEXIS%
 if %?LOCAL-TEXIS%
 DVIPS = dvips
 .dvi.ps:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       $(DVIPS) -o $@ $<
+       
%AM_V_DVIPS%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+       $(DVIPS) %TEXIQUIET% -o $@ $<
 endif %?LOCAL-TEXIS%
 
 .PHONY: dvi dvi-am html html-am info info-am pdf pdf-am ps ps-am
@@ -111,7 +111,7 @@ endif
 ## break a possible install-sh reference.
 ##
 ## Funny name due to --cygnus influence; we want to reserve
-## `install-info' for the user.
+## 'install-info' for the user.
 ##
 ## TEXINFOS primary are always installed in infodir, hence install-data
 ## is hard coded.
@@ -221,7 +221,7 @@ install-info-am: $(INFO_DEPS)
 ##
 ## If $file == foo.info, then $file_i == foo.i.  The reason we use two
 ## shell commands instead of one ('s|\.info$$|.i|') is so that a suffix-less
-## `foo' becomes `foo.i' too.
+## 'foo' becomes 'foo.i' too.
          file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
@@ -239,14 +239,14 @@ install-info-am: $(INFO_DEPS)
          for file in $$list; do \
 ## Strip directory
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
-## Run `:' after install-info in case install-info fails.  We really
+## Run ":" after install-info in case install-info fails.  We really
 ## don't care about failures here, because they can be spurious.  For
 ## instance if you don't have a dir file, install-info will fail.  I
 ## think instead it should create a new dir file for you.  This bug
-## causes the `make distcheck' target to fail reliably.
+## causes the "make distcheck" target to fail reliably.
            echo " install-info --info-dir='$(DESTDIR)$(infodir)' 
'$(DESTDIR)$(infodir)/$$relfile'";\
-## Use `|| :' here because Sun make passes -e to sh; if install-info
-## fails then we'd fail if we used `;'.
+## Use "|| :" here because Sun make passes -e to sh; if install-info
+## fails then we'd fail if we used ";".
            install-info --info-dir="$(DESTDIR)$(infodir)" 
"$(DESTDIR)$(infodir)/$$relfile" || :;\
          done; \
        else : ; fi
@@ -331,7 +331,7 @@ uninstall-info-am:
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
 ## install-info needs the actual info file.  We use the installed one,
 ## rather than relying on one still being in srcdir or builddir.
-## However, `make uninstall && make uninstall' should not fail,
+## However, "make uninstall && make uninstall" should not fail,
 ## so we ignore failure if the file did not exist.
            echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove 
'$(DESTDIR)$(infodir)/$$relfile'"; \
            if install-info --info-dir="$(DESTDIR)$(infodir)" --remove 
"$(DESTDIR)$(infodir)/$$relfile"; \
@@ -398,20 +398,20 @@ endif %?LOCAL-TEXIS%
 ## ---------- ##
 
 ## The funny name is due to --cygnus influence; in Cygnus mode,
-## `clean-info' is a target that users can use.
+## 'clean-info' is a target that users can use.
 
 if %?LOCAL-TEXIS%
 .PHONY mostlyclean-am: mostlyclean-aminfo
 .PHONY: mostlyclean-aminfo
 mostlyclean-aminfo:
-## Use `-rf', not just `-f', because the %*CLEAN% substitutions can also
-## contain any directory created by `makeinfo --html'.
+## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
+## contain any directory created by "makeinfo --html".
        -rm -rf %MOSTLYCLEAN%
 
 .PHONY clean-am: clean-aminfo
 clean-aminfo:
-## Use `-rf', not just `-f', because the %*CLEAN% substitutions can also
-## contain any directory created by `makeinfo --html'.
+## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
+## contain any directory created by "makeinfo --html".
 ?TEXICLEAN?    -test -z "%TEXICLEAN%" \
 ?TEXICLEAN?    || rm -rf %TEXICLEAN%
 
@@ -423,8 +423,8 @@ maintainer-clean-aminfo:
          echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] 
$$i_i[0-9][0-9]"; \
          rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
        done
-## Use `-rf', not just `-f', because the %*CLEAN% substitutions can also
-## contain any directory created by `makeinfo --html'.
+## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
+## contain any directory created by "makeinfo --html".
 ?MAINTCLEAN?   -test -z "%MAINTCLEAN%" \
 ?MAINTCLEAN?   || rm -rf %MAINTCLEAN%
 
diff --git a/lib/am/vala.am b/lib/am/vala.am
index 63aa299..b4d0190 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+## Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 6d35cd4..e74259f 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -1,6 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2009
-##   Free Software Foundation, Inc.
+## Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,7 +19,7 @@
 ##   2. --enable-maintainer-mode is not specified, and
 ##   3. parser.c already exist, and
 ##   4. parser.y and parser.c are distributed.
-## Point #3 is because `make maintainer-clean' erases parser.c, yet
+## Point #3 is because "make maintainer-clean" erases parser.c, yet
 ## the GNU Coding Standards require that ./configure; make works even
 ## after that.
 ## Point #4 is because parsers listed in nodist_*_SOURCES are always
@@ -33,16 +32,19 @@
 ## distributed or not.  We cannot have a generic rule that works in
 ## both cases, so we ensure in automake that nodist_ parsers always
 ## use non-generic rules.
-if %?MAINTAINER-MODE%
 if %?FIRST%
+if %?MAINTAINER-MODE%
 @address@hidden = test -f $@ ||
-endif %?FIRST%
 endif %?MAINTAINER-MODE%
+## The 's/c$/h/' substitution *must* be the last one.
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+                  -e s/c++$$/h++/ -e s/c$$/h/
+endif %?FIRST%
 
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
-?GENERIC?      %VERBOSE%$(am__skipyacc) $(SHELL) $(YLWRAP) %SOURCE% y.tab.c 
%OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+?GENERIC?      %VERBOSE%$(am__skipyacc) $(SHELL) $(YLWRAP) %SOURCE% y.tab.c 
%OBJ% y.tab.h `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%
 ?!GENERIC?     %VERBOSE% \
 ?!GENERIC??DIST_SOURCE?        $(am__skipyacc) \
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- 
%COMPILE%
+?!GENERIC?     $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h `echo %OBJ% | $(am__yacc_c2h)` 
y.output %BASE%.output -- %COMPILE%
diff --git a/lib/ansi2knr.1 b/lib/ansi2knr.1
deleted file mode 100644
index f9ee5a6..0000000
--- a/lib/ansi2knr.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH ANSI2KNR 1 "19 Jan 1996"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-[--varargs] input_file [output_file]
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes function definitions by seeing a non-keyword identifier at the left
-margin, followed by a left parenthesis, with a right parenthesis as the last
-character on the line, and with a left brace as the first token on the
-following line (ignoring possible intervening comments).  It will recognize a
-multi-line header provided that no intervening line ends with a left or right
-brace or a semicolon.  These algorithms ignore whitespace and comments, except
-that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
-     - Any other construct that starts at the left margin and follows the
-above syntax (such as a macro or function call).
-.br
-     - Some macros that tinker with the syntax of the function header.
-.sp
-The --varargs switch is obsolete, and is recognized only for
-backwards compatibility.  The present version of
-.I ansi2knr
-will always attempt to convert a ... argument to va_alist and va_dcl.
-.SH AUTHOR
-L. Peter Deutsch <address@hidden> wrote the original ansi2knr and
-continues to maintain the current version; most of the code in the current
-version is his work.  ansi2knr also includes contributions by Francois
-Pinard <address@hidden> and Jim Avera <address@hidden>.
diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c
deleted file mode 100644
index e84c210..0000000
--- a/lib/ansi2knr.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
-
-/*$Id: ansi2knr.c,v 1.14 2003/09/06 05:36:56 eggert Exp $*/
-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY.  No author or distributor accepts responsibility to anyone for the
-consequences of using it or for whether it serves any particular purpose or
-works at all, unless he says so in writing.  Refer to the GNU General Public
-License (the "GPL") for full details.
-
-Everyone is granted permission to copy, modify and redistribute ansi2knr,
-but only under the conditions described in the GPL.  A copy of this license
-is supposed to have been given to you along with ansi2knr so you can know
-your rights and responsibilities.  It should be in a file named COPYLEFT,
-or, if there is no file named COPYLEFT, a file named COPYING.  Among other
-things, the copyright notice and this notice must be preserved on all
-copies.
-
-We explicitly state here what we believe is already implied by the GPL: if
-the ansi2knr program is distributed as a separate set of sources and a
-separate executable file which are aggregated on a storage medium together
-with another program, this in itself does not bring the other program under
-the GPL, nor does the mere fact that such a program or the procedures for
-constructing it invoke the ansi2knr executable bring any other part of the
-program under the GPL.
-*/
-
-/*
- * Usage:
-       ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
- * --filename provides the file name for the #line directive in the output,
- * overriding input_file (if present).
- * If no input_file is supplied, input is read from stdin.
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis, with a
- * right parenthesis as the last character on the line, and with a left
- * brace as the first token on the following line (ignoring possible
- * intervening comments and/or preprocessor directives), except that a line
- * consisting of only
- *     identifier1(identifier2)
- * will not be considered a function definition unless identifier2 is
- * the word "void", and a line consisting of
- *     identifier1(identifier2, <<arbitrary>>)
- * will not be considered a function definition.
- * ansi2knr will recognize a multi-line header provided that no intervening
- * line ends with a left or right brace or a semicolon.  These algorithms
- * ignore whitespace, comments, and preprocessor directives, except that
- * the function name must be the first thing on the line.  The following
- * constructs will confuse it:
- *     - Any other construct that starts at the left margin and
- *         follows the above syntax (such as a macro or function call).
- *     - Some macros that tinker with the syntax of function headers.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * <address@hidden>.  Other authors are noted in the change history
- * that follows (in reverse chronological order):
-
-       lpd 2000-04-12 backs out Eggert's changes because of bugs:
-       - concatlits didn't declare the type of its bufend argument;
-       - concatlits didn't recognize when it was inside a comment;
-       - scanstring could scan backward past the beginning of the string; when
-       - the check for \ + newline in scanstring was unnecessary.
-
-       2000-03-05  Paul Eggert  <address@hidden>
-
-       Add support for concatenated string literals.
-       * ansi2knr.c (concatlits): New decl.
-       (main): Invoke concatlits to concatenate string literals.
-       (scanstring): Handle backslash-newline correctly.  Work with
-       character constants.  Fix bug when scanning backwards through
-       backslash-quote.  Check for unterminated strings.
-       (convert1): Parse character constants, too.
-       (appendline, concatlits): New functions.
-       * ansi2knr.1: Document this.
-
-       lpd 1999-08-17 added code to allow preprocessor directives
-               wherever comments are allowed
-       lpd 1999-04-12 added minor fixes from Pavel Roskin
-               <address@hidden> for clean compilation with
-               gcc -W -Wall
-       lpd 1999-03-22 added hack to recognize lines consisting of
-               identifier1(identifier2, xxx) as *not* being procedures
-       lpd 1999-02-03 made indentation of preprocessor commands consistent
-       lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
-               endless loop; quoted strings within an argument list
-               confused the parser
-       lpd 1999-01-24 added a check for write errors on the output,
-               suggested by Jim Meyering <address@hidden>
-       lpd 1998-11-09 added further hack to recognize identifier(void)
-               as being a procedure
-       lpd 1998-10-23 added hack to recognize lines consisting of
-               identifier1(identifier2) as *not* being procedures
-       lpd 1997-12-08 made input_file optional; only closes input and/or
-               output file if not stdin or stdout respectively; prints
-               usage message on stderr rather than stdout; adds
-               --filename switch (changes suggested by
-               <address@hidden>)
-       lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
-               compilers that don't understand void, as suggested by
-               Tom Lane
-       lpd 1996-01-15 changed to require that the first non-comment token
-               on the line following a function header be a left brace,
-               to reduce sensitivity to macros, as suggested by Tom Lane
-               <address@hidden>
-       lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
-               undefined preprocessor symbols as 0; changed all #ifdefs
-               for configuration symbols to #ifs
-       lpd 1995-04-05 changed copyright notice to make it clear that
-               including ansi2knr in a program does not bring the entire
-               program under the GPL
-       lpd 1994-12-18 added conditionals for systems where ctype macros
-               don't handle 8-bit characters properly, suggested by
-               Francois Pinard <address@hidden>;
-               removed --varargs switch (this is now the default)
-       lpd 1994-10-10 removed CONFIG_BROKETS conditional
-       lpd 1994-07-16 added some conditionals to help GNU `configure',
-               suggested by Francois Pinard <address@hidden>;
-               properly erase prototype args in function parameters,
-               contributed by Jim Avera <address@hidden>;
-               correct error in writeblanks (it shouldn't erase EOLs)
-       lpd 1989-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* or without the GNU configure machinery. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#if HAVE_CONFIG_H
-
-/*
-   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
-   This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/* Otherwise do it the hard way */
-
-# ifdef BSD
-#  include <strings.h>
-# else
-#  ifdef VMS
-    extern int strlen(), strncmp();
-#  else
-#   include <string.h>
-#  endif
-# endif
-
-#endif /* not HAVE_CONFIG_H */
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-/*
-   malloc and free should be declared in stdlib.h,
-   but if you've got a K&R compiler, they probably aren't.
- */
-# ifdef MSDOS
-#  include <malloc.h>
-# else
-#  ifdef VMS
-     extern char *malloc();
-     extern void free();
-#  else
-     extern char *malloc();
-     extern int free();
-#  endif
-# endif
-
-#endif
-
-/* Define NULL (for *very* old compilers). */
-#ifndef NULL
-# define NULL (0)
-#endif
-
-/*
- * The ctype macros don't always handle 8-bit characters correctly.
- * Compensate for this here.
- */
-#ifdef isascii
-# undef HAVE_ISASCII           /* just in case */
-# define HAVE_ISASCII 1
-#else
-#endif
-#if STDC_HEADERS || !HAVE_ISASCII
-# define is_ascii(c) 1
-#else
-# define is_ascii(c) isascii(c)
-#endif
-
-#define is_space(c) (is_ascii(c) && isspace(c))
-#define is_alpha(c) (is_ascii(c) && isalpha(c))
-#define is_alnum(c) (is_ascii(c) && isalnum(c))
-
-/* Scanning macros */
-#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *ppdirforward();
-char *ppdirbackward();
-char *skipspace();
-char *scanstring();
-int writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
-    int argc;
-    char *argv[];
-{      FILE *in = stdin;
-       FILE *out = stdout;
-       char *filename = 0;
-       char *program_name = argv[0];
-       char *output_name = 0;
-#define bufsize 5000                   /* arbitrary size */
-       char *buf;
-       char *line;
-       char *more;
-       char *usage =
-         "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
-       /*
-        * In previous versions, ansi2knr recognized a --varargs switch.
-        * If this switch was supplied, ansi2knr would attempt to convert
-        * a ... argument to va_alist and va_dcl; if this switch was not
-        * supplied, ansi2knr would simply drop any such arguments.
-        * Now, ansi2knr always does this conversion, and we only
-        * check for this switch for backward compatibility.
-        */
-       int convert_varargs = 1;
-       int output_error;
-
-       while ( argc > 1 && argv[1][0] == '-' ) {
-         if ( !strcmp(argv[1], "--varargs") ) {
-           convert_varargs = 1;
-           argc--;
-           argv++;
-           continue;
-         }
-         if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
-           filename = argv[2];
-           argc -= 2;
-           argv += 2;
-           continue;
-         }
-         fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
-                 argv[1]);
-         fprintf(stderr, usage);
-         exit(1);
-       }
-       switch ( argc )
-          {
-       default:
-               fprintf(stderr, usage);
-               exit(0);
-       case 3:
-               output_name = argv[2];
-               out = fopen(output_name, "w");
-               if ( out == NULL ) {
-                 fprintf(stderr, "%s: Cannot open output file %s\n",
-                         program_name, output_name);
-                 exit(1);
-               }
-               /* falls through */
-       case 2:
-               in = fopen(argv[1], "r");
-               if ( in == NULL ) {
-                 fprintf(stderr, "%s: Cannot open input file %s\n",
-                         program_name, argv[1]);
-                 exit(1);
-               }
-               if ( filename == 0 )
-                 filename = argv[1];
-               /* falls through */
-       case 1:
-               break;
-          }
-       if ( filename )
-         fprintf(out, "#line 1 \"%s\"\n", filename);
-       buf = malloc(bufsize);
-       if ( buf == NULL )
-          {
-               fprintf(stderr, "Unable to allocate read buffer!\n");
-               exit(1);
-          }
-       line = buf;
-       while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
-          {
-test:          line += strlen(line);
-               switch ( test1(buf) )
-                  {
-               case 2:                 /* a function header */
-                       convert1(buf, out, 1, convert_varargs);
-                       break;
-               case 1:                 /* a function */
-                       /* Check for a { at the start of the next line. */
-                       more = ++line;
-f:                     if ( line >= buf + (bufsize - 1) ) /* overflow check */
-                         goto wl;
-                       if ( fgets(line, (unsigned)(buf + bufsize - line), in) 
== NULL )
-                         goto wl;
-                       switch ( *skipspace(ppdirforward(more), 1) )
-                         {
-                         case '{':
-                           /* Definitely a function header. */
-                           convert1(buf, out, 0, convert_varargs);
-                           fputs(more, out);
-                           break;
-                         case 0:
-                           /* The next line was blank or a comment: */
-                           /* keep scanning for a non-comment. */
-                           line += strlen(line);
-                           goto f;
-                         default:
-                           /* buf isn't a function header, but */
-                           /* more might be. */
-                           fputs(buf, out);
-                           strcpy(buf, more);
-                           line = buf;
-                           goto test;
-                         }
-                       break;
-               case -1:                /* maybe the start of a function */
-                       if ( line != buf + (bufsize - 1) ) /* overflow check */
-                         continue;
-                       /* falls through */
-               default:                /* not a function */
-wl:                    fputs(buf, out);
-                       break;
-                  }
-               line = buf;
-          }
-       if ( line != buf )
-         fputs(buf, out);
-       free(buf);
-       if ( output_name ) {
-         output_error = ferror(out);
-         output_error |= fclose(out);
-       } else {                /* out == stdout */
-         fflush(out);
-         output_error = ferror(out);
-       }
-       if ( output_error ) {
-         fprintf(stderr, "%s: error writing to %s\n", program_name,
-                 (output_name ? output_name : "stdout"));
-         exit(1);
-       }
-       if ( in != stdin )
-         fclose(in);
-       return 0;
-}
-
-/*
- * Skip forward or backward over one or more preprocessor directives.
- */
-char *
-ppdirforward(p)
-    char *p;
-{
-    for (; *p == '#'; ++p) {
-       for (; *p != '\r' && *p != '\n'; ++p)
-           if (*p == 0)
-               return p;
-       if (*p == '\r' && p[1] == '\n')
-           ++p;
-    }
-    return p;
-}
-char *
-ppdirbackward(p, limit)
-    char *p;
-    char *limit;
-{
-    char *np = p;
-
-    for (;; p = --np) {
-       if (*np == '\n' && np[-1] == '\r')
-           --np;
-       for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
-           if (np[-1] == 0)
-               return np;
-       if (*np != '#')
-           return p;
-    }
-}
-
-/*
- * Skip over whitespace, comments, and preprocessor directives,
- * in either direction.
- */
-char *
-skipspace(p, dir)
-    char *p;
-    int dir;                   /* 1 for forward, -1 for backward */
-{
-    for ( ; ; ) {
-       while ( is_space(*p) )
-           p += dir;
-       if ( !(*p == '/' && p[dir] == '*') )
-           break;
-       p += dir;  p += dir;
-       while ( !(*p == '*' && p[dir] == '/') ) {
-           if ( *p == 0 )
-               return p;       /* multi-line comment?? */
-           p += dir;
-       }
-       p += dir;  p += dir;
-    }
-    return p;
-}
-
-/* Scan over a quoted string, in either direction. */
-char *
-scanstring(p, dir)
-    char *p;
-    int dir;
-{
-    for (p += dir; ; p += dir)
-       if (*p == '"' && p[-dir] != '\\')
-           return p + dir;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-int
-writeblanks(start, end)
-    char *start;
-    char *end;
-{      char *p;
-       for ( p = start; p < end; p++ )
-         if ( *p != '\r' && *p != '\n' )
-           *p = ' ';
-       return 0;
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- *     0 - definitely not a function definition;
- *     1 - definitely a function definition;
- *     2 - definitely a function prototype (NOT USED);
- *     -1 - may be the beginning of a function definition,
- *             append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
-    char *buf;
-{      char *p = buf;
-       char *bend;
-       char *endfn;
-       int contin;
-
-       if ( !isidfirstchar(*p) )
-         return 0;             /* no name at left margin */
-       bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
-       switch ( *bend )
-          {
-          case ';': contin = 0 /*2*/; break;
-          case ')': contin = 1; break;
-          case '{': return 0;          /* not a function */
-          case '}': return 0;          /* not a function */
-          default: contin = -1;
-          }
-       while ( isidchar(*p) )
-         p++;
-       endfn = p;
-       p = skipspace(p, 1);
-       if ( *p++ != '(' )
-         return 0;             /* not a function */
-       p = skipspace(p, 1);
-       if ( *p == ')' )
-         return 0;             /* no parameters */
-       /* Check that the apparent function name isn't a keyword. */
-       /* We only need to check for keywords that could be followed */
-       /* by a left parenthesis (which, unfortunately, is most of them). */
-          {    static char *words[] =
-                  {    "asm", "auto", "case", "char", "const", "double",
-                       "extern", "float", "for", "if", "int", "long",
-                       "register", "return", "short", "signed", "sizeof",
-                       "static", "switch", "typedef", "unsigned",
-                       "void", "volatile", "while", 0
-                  };
-               char **key = words;
-               char *kp;
-               unsigned len = endfn - buf;
-
-               while ( (kp = *key) != 0 )
-                  {    if ( strlen(kp) == len && !strncmp(kp, buf, len) )
-                         return 0;     /* name is a keyword */
-                       key++;
-                  }
-          }
-          {
-              char *id = p;
-              int len;
-              /*
-               * Check for identifier1(identifier2) and not
-               * identifier1(void), or identifier1(identifier2, xxxx).
-               */
-
-              while ( isidchar(*p) )
-                  p++;
-              len = p - id;
-              p = skipspace(p, 1);
-              if (*p == ',' ||
-                  (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
-                  )
-                  return 0;    /* not a function */
-          }
-       /*
-        * If the last significant character was a ), we need to count
-        * parentheses, because it might be part of a formal parameter
-        * that is a procedure.
-        */
-       if (contin > 0) {
-           int level = 0;
-
-           for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
-               level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
-           if (level > 0)
-               contin = -1;
-       }
-       return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
-    char *buf;
-    FILE *out;
-    int header;                        /* Boolean */
-    int convert_varargs;       /* Boolean */
-{      char *endfn;
-       char *p;
-       /*
-        * The breaks table contains pointers to the beginning and end
-        * of each argument.
-        */
-       char **breaks;
-       unsigned num_breaks = 2;        /* for testing */
-       char **btop;
-       char **bp;
-       char **ap;
-       char *vararg = 0;
-
-       /* Pre-ANSI implementations don't agree on whether strchr */
-       /* is called strchr or index, so we open-code it here. */
-       for ( endfn = buf; *(endfn++) != '('; )
-         ;
-top:   p = endfn;
-       breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-       if ( breaks == NULL )
-          {    /* Couldn't allocate break table, give up */
-               fprintf(stderr, "Unable to allocate break table!\n");
-               fputs(buf, out);
-               return -1;
-          }
-       btop = breaks + num_breaks * 2 - 2;
-       bp = breaks;
-       /* Parse the argument list */
-       do
-          {    int level = 0;
-               char *lp = NULL;
-               char *rp = NULL;
-               char *end = NULL;
-
-               if ( bp >= btop )
-                  {    /* Filled up break table. */
-                       /* Allocate a bigger one and start over. */
-                       free((char *)breaks);
-                       num_breaks <<= 1;
-                       goto top;
-                  }
-               *bp++ = p;
-               /* Find the end of the argument */
-               for ( ; end == NULL; p++ )
-                  {    switch(*p)
-                          {
-                          case ',':
-                               if ( !level ) end = p;
-                               break;
-                          case '(':
-                               if ( !level ) lp = p;
-                               level++;
-                               break;
-                          case ')':
-                               if ( --level < 0 ) end = p;
-                               else rp = p;
-                               break;
-                          case '/':
-                               if (p[1] == '*')
-                                   p = skipspace(p, 1) - 1;
-                               break;
-                          case '"':
-                              p = scanstring(p, 1) - 1;
-                              break;
-                          default:
-                               ;
-                          }
-                  }
-               /* Erase any embedded prototype parameters. */
-               if ( lp && rp )
-                 writeblanks(lp + 1, rp);
-               p--;                    /* back up over terminator */
-               /* Find the name being declared. */
-               /* This is complicated because of procedure and */
-               /* array modifiers. */
-               for ( ; ; )
-                  {    p = skipspace(p - 1, -1);
-                       switch ( *p )
-                          {
-                          case ']':    /* skip array dimension(s) */
-                          case ')':    /* skip procedure args OR name */
-                          {    int level = 1;
-                               while ( level )
-                                switch ( *--p )
-                                  {
-                                  case ']': case ')':
-                                      level++;
-                                      break;
-                                  case '[': case '(':
-                                      level--;
-                                      break;
-                                  case '/':
-                                      if (p > buf && p[-1] == '*')
-                                          p = skipspace(p, -1) + 1;
-                                      break;
-                                  case '"':
-                                      p = scanstring(p, -1) + 1;
-                                      break;
-                                  default: ;
-                                  }
-                          }
-                               if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
-                                  {    /* We found the name being declared */
-                                       while ( !isidfirstchar(*p) )
-                                         p = skipspace(p, 1) + 1;
-                                       goto found;
-                                  }
-                               break;
-                          default:
-                               goto found;
-                          }
-                  }
-found:         if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
-                 {     if ( convert_varargs )
-                         {     *bp++ = "va_alist";
-                               vararg = p-2;
-                         }
-                       else
-                         {     p++;
-                               if ( bp == breaks + 1 ) /* sole argument */
-                                 writeblanks(breaks[0], p);
-                               else
-                                 writeblanks(bp[-1] - 1, p);
-                               bp--;
-                         }
-                  }
-               else
-                  {    while ( isidchar(*p) ) p--;
-                       *bp++ = p+1;
-                  }
-               p = end;
-          }
-       while ( *p++ == ',' );
-       *bp = p;
-       /* Make a special check for 'void' arglist */
-       if ( bp == breaks+2 )
-          {    p = skipspace(breaks[0], 1);
-               if ( !strncmp(p, "void", 4) )
-                  {    p = skipspace(p+4, 1);
-                       if ( p == breaks[2] - 1 )
-                          {    bp = breaks;    /* yup, pretend arglist is 
empty */
-                               writeblanks(breaks[0], p + 1);
-                          }
-                  }
-          }
-       /* Put out the function name and left parenthesis. */
-       p = buf;
-       while ( p != endfn ) putc(*p, out), p++;
-       /* Put out the declaration. */
-       if ( header )
-         {     fputs(");", out);
-               for ( p = breaks[0]; *p; p++ )
-                 if ( *p == '\r' || *p == '\n' )
-                   putc(*p, out);
-         }
-       else
-         {     for ( ap = breaks+1; ap < bp; ap += 2 )
-                 {     p = *ap;
-                       while ( isidchar(*p) )
-                         putc(*p, out), p++;
-                       if ( ap < bp - 1 )
-                         fputs(", ", out);
-                 }
-               fputs(")  ", out);
-               /* Put out the argument declarations */
-               for ( ap = breaks+2; ap <= bp; ap += 2 )
-                 (*ap)[-1] = ';';
-               if ( vararg != 0 )
-                 {     *vararg = 0;
-                       fputs(breaks[0], out);          /* any prior args */
-                       fputs("va_dcl", out);           /* the final arg */
-                       fputs(bp[0], out);
-                 }
-               else
-                 fputs(breaks[0], out);
-         }
-       free((char *)breaks);
-       return 0;
-}
diff --git a/lib/ar-lib b/lib/ar-lib
index 0f62c6f..67f5f36 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
 # Written by Peter Rosin <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/lib/compile b/lib/compile
index 862a14e..7b4a9a7 100755
--- a/lib/compile
+++ b/lib/compile
@@ -3,8 +3,7 @@
 
 scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 # Written by Tom Tromey <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/lib/config-ml.in b/lib/config-ml.in
deleted file mode 100644
index 1198346..0000000
--- a/lib/config-ml.in
+++ /dev/null
@@ -1,877 +0,0 @@
-# Configure fragment invoked in the post-target section for subdirs
-# wanting multilib support.
-#
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2010, 2011  Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Please report bugs to <address@hidden>
-# and send patches to <address@hidden>.
-
-# It is advisable to support a few --enable/--disable options to let the
-# user select which libraries s/he really wants.
-#
-# Subdirectories wishing to use multilib should put the following lines
-# in the "post-target" section of configure.in.
-#
-# if [ "${srcdir}" = "." ] ; then
-#   if [ "${with_target_subdir}" != "." ] ; then
-#     . ${with_multisrctop}../../config-ml.in
-#   else
-#     . ${with_multisrctop}../config-ml.in
-#   fi
-# else
-#   . ${srcdir}/../config-ml.in
-# fi
-#
-#
-# Things are complicated because 6 separate cases must be handled:
-# 2 (native, cross) x 3 (absolute-path, relative-not-dot, dot) = 6.
-#
-# srcdir=. is special.  It must handle make programs that don't handle VPATH.
-# To implement this, a symlink tree is built for each library and for each
-# multilib subdir.
-#
-# The build tree is layed out as
-#
-# ./
-#   newlib
-#   m68020/
-#          newlib
-#          m68881/
-#                 newlib
-#
-# The nice feature about this arrangement is that inter-library references
-# in the build tree work without having to care where you are.  Note that
-# inter-library references also work in the source tree because symlink trees
-# are built when srcdir=.
-#
-# Unfortunately, trying to access the libraries in the build tree requires
-# the user to manually choose which library to use as GCC won't be able to
-# find the right one.  This is viewed as the lesser of two evils.
-#
-# Configure variables:
-# ${with_target_subdir} = "." for native, or ${target_alias} for cross.
-# Set by top level Makefile.
-# ${with_multisrctop} = how many levels of multilibs there are in the source
-# tree.  It exists to handle the case of configuring in the source tree:
-# ${srcdir} is not constant.
-# ${with_multisubdir} = name of multilib subdirectory (eg: m68020/m68881).
-#
-# Makefile variables:
-# MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
-# (FIXME: note that this is different than ${with_multisrctop}.  Check out.).
-# MULTIBUILDTOP = number of multilib levels in build tree
-# MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
-# (only defined in each library's main Makefile).
-# MULTISUBDIR = installed subdirectory name with leading '/' (eg: /m68000)
-# (only defined in each multilib subdir).
-
-# FIXME: Multilib is currently disabled by default for everything other than
-# newlib.  It is up to each target to turn on multilib support for the other
-# libraries as desired.
-
-# Autoconf incoming variables:
-# srcdir, host, ac_configure_args
-#
-# We *could* figure srcdir and host out, but we'd have to do work that
-# our caller has already done to figure them out and requiring these two
-# seems reasonable.
-# Note that `host' in this case is GCC's `target'.  Target libraries are
-# configured for a particular host.
-
-Makefile=${ac_file-Makefile}
-ml_config_shell=${CONFIG_SHELL-/bin/sh}
-ml_realsrcdir=${srcdir}
-
-# Scan all the arguments and set all the ones we need.
-
-ml_verbose=--verbose
-for option in ${ac_configure_args}
-do
-  # strip single quotes surrounding individual options
-  case $option in
-  \'*\') eval option=$option ;;
-  esac
-
-  case $option in
-  --*) ;;
-  -*) option=-$option ;;
-  esac
-
-  case $option in
-  --*=*)
-       optarg=`echo $option | sed -e 's/^[^=]*=//'`
-       ;;
-  esac
-
-  case $option in
-  --disable-*)
-       enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
-       eval $enableopt=no
-       ;;
-  --enable-*)
-       case "$option" in
-       *=*)    ;;
-       *)      optarg=yes ;;
-       esac
-       enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-       # enable_shared and enable_static are handled by configure.
-       # Don't undo its work.
-       case $enableopt in
-       enable_shared | enable_static) ;;
-       *) eval $enableopt="$optarg" ;;
-       esac
-       ;;
-  --norecursion | --no-recursion)
-       ml_norecursion=yes
-       ;;
-  --silent | --sil* | --quiet | --q*)
-       ml_verbose=--silent
-       ;;
-  --verbose | --v | --verb*)
-       ml_verbose=--verbose
-       ;;
-  --with-*)
-       case "$option" in
-       *=*)    ;;
-       *)      optarg=yes ;;
-       esac
-       withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-       eval $withopt="$optarg"
-       ;;
-  --without-*)
-       withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
-       eval $withopt=no
-       ;;
-  esac
-done
-
-# Only do this if --enable-multilib.
-if [ "${enable_multilib}" = yes ]; then
-
-# Compute whether this is the library's top level directory
-# (ie: not a multilib subdirectory, and not a subdirectory like newlib/src).
-# ${with_multisubdir} tells us we're in the right branch, but we could be
-# in a subdir of that.
-# ??? The previous version could void this test by separating the process into
-# two files: one that only the library's toplevel configure.in ran (to
-# configure the multilib subdirs), and another that all configure.in's ran to
-# update the Makefile.  It seemed reasonable to collapse all multilib support
-# into one file, but it does leave us with having to perform this test.
-ml_toplevel_p=no
-if [ -z "${with_multisubdir}" ]; then
-  if [ "${srcdir}" = "." ]; then
-    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
-    # ${with_target_subdir} = "." for native, otherwise target alias.
-    if [ "${with_target_subdir}" = "." ]; then
-      if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
-       ml_toplevel_p=yes
-      fi
-    else
-      if [ -f ${ml_realsrcdir}/../../config-ml.in ]; then
-       ml_toplevel_p=yes
-      fi
-    fi
-  else
-    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
-    if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
-      ml_toplevel_p=yes
-    fi
-  fi
-fi
-
-# If this is the library's top level directory, set multidirs to the
-# multilib subdirs to support.  This lives at the top because we need
-# `multidirs' set right away.
-
-if [ "${ml_toplevel_p}" = yes ]; then
-
-multidirs=
-for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
-  dir=`echo $i | sed -e 's/;.*$//'`
-  if [ "${dir}" = "." ]; then
-    true
-  else
-    if [ -z "${multidirs}" ]; then
-      multidirs="${dir}"
-    else
-      multidirs="${multidirs} ${dir}"
-    fi
-  fi
-done
-
-# Target libraries are configured for the host they run on, so we check
-# $host here, not $target.
-
-case "${host}" in
-arm-*-*)
-       if [ x"$enable_fpu" = xno ]
-       then
-         old_multidirs=${multidirs}
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "${x}" in
-             *fpu*) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x"$enable_26bit" = xno ]
-       then
-         old_multidirs=${multidirs}
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "${x}" in
-             *26bit*) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x"$enable_underscore" = xno ]
-       then
-         old_multidirs=${multidirs}
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "${x}" in
-             *under*) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x"$enable_interwork" = xno ]
-       then
-         old_multidirs=${multidirs}
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "${x}" in
-             *interwork*) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_biendian = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *le* ) : ;;
-             *be* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x"$enable_nofmult" = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *nofmult* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       ;;
-m68*-*-*)
-       if [ x$enable_softfloat = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *soft-float* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_m68881 = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *m68881* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_m68000 = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *m68000* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_m68020 = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *m68020* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       ;;
-mips*-*-*)
-       if [ x$enable_single_float = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *single* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_biendian = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *el* ) : ;;
-             *eb* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_softfloat = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *soft-float* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       ;;
-powerpc*-*-* | rs6000*-*-*)
-       if [ x$enable_aix64 = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *ppc64* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_pthread = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *pthread* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_softfloat = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *soft-float* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_powercpu = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             power | */power | */power/* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_powerpccpu = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *powerpc* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_powerpcos = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *mcall-linux* | *mcall-solaris* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_biendian = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *mlittle* | *mbig* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       if [ x$enable_sysv = xno ]
-       then
-         old_multidirs="${multidirs}"
-         multidirs=""
-         for x in ${old_multidirs}; do
-           case "$x" in
-             *mcall-sysv* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-           esac
-         done
-       fi
-       ;;
-esac
-
-# Remove extraneous blanks from multidirs.
-# Tests like `if [ -n "$multidirs" ]' require it.
-multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ 
][ ]*/ /g'`
-
-# Add code to library's top level makefile to handle building the multilib
-# subdirs.
-
-cat > Multi.tem <<\EOF
-
-PWD_COMMAND=$${PWDCMD-pwd}
-
-# FIXME: There should be an @-sign in front of the `if'.
-# Leave out until this is tested a bit more.
-multi-do:
-       if [ -z "$(MULTIDIRS)" ]; then \
-         true; \
-       else \
-         rootpre=`${PWD_COMMAND}`/; export rootpre; \
-         srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
-         lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
-         compiler="$(CC)"; \
-         for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
-           dir=`echo $$i | sed -e 's/;.*$$//'`; \
-           if [ "$${dir}" = "." ]; then \
-             true; \
-           else \
-             if [ -d ../$${dir}/$${lib} ]; then \
-               flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
-               if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
-                               CFLAGS="$(CFLAGS) $${flags}" \
-                               CCASFLAGS="$(CCASFLAGS) $${flags}" \
-                               FCFLAGS="$(FCFLAGS) $${flags}" \
-                               FFLAGS="$(FFLAGS) $${flags}" \
-                               ADAFLAGS="$(ADAFLAGS) $${flags}" \
-                               prefix="$(prefix)" \
-                               exec_prefix="$(exec_prefix)" \
-                               GCJFLAGS="$(GCJFLAGS) $${flags}" \
-                               GOCFLAGS="$(GOCFLAGS) $${flags}" \
-                               CXXFLAGS="$(CXXFLAGS) $${flags}" \
-                               LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
-                               LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
-                               LDFLAGS="$(LDFLAGS) $${flags}" \
-                               MULTIFLAGS="$${flags}" \
-                               DESTDIR="$(DESTDIR)" \
-                               INSTALL="$(INSTALL)" \
-                               INSTALL_DATA="$(INSTALL_DATA)" \
-                               INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-                               INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
-                               $(DO)); then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else true; \
-             fi; \
-           fi; \
-         done; \
-       fi
-
-# FIXME: There should be an @-sign in front of the `if'.
-# Leave out until this is tested a bit more.
-multi-clean:
-       if [ -z "$(MULTIDIRS)" ]; then \
-         true; \
-       else \
-         lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
-         for dir in : $(MULTIDIRS); do \
-           test $$dir != : || continue; \
-EOF
-cat >>Multi.tem <<EOF
-           if [ -f ../\$\${dir}/\$\${lib}/${Makefile} ]; then \\
-EOF
-cat >>Multi.tem <<\EOF
-             if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
-             then true; \
-             else exit 1; \
-             fi; \
-           else true; \
-           fi; \
-         done; \
-       fi
-EOF
-
-cat ${Makefile} Multi.tem > Makefile.tem
-rm -f ${Makefile} Multi.tem
-mv Makefile.tem ${Makefile}
-
-fi # ${ml_toplevel_p} = yes
-
-if [ "${ml_verbose}" = --verbose ]; then
-  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
-  if [ "${ml_toplevel_p}" = yes ]; then
-    echo "multidirs=${multidirs}"
-  fi
-  echo "with_multisubdir=${with_multisubdir}"
-fi
-
-if [ "${srcdir}" = "." ]; then
-  if [ "${with_target_subdir}" != "." ]; then
-    ml_srcdotdot="../"
-  else
-    ml_srcdotdot=""
-  fi
-else
-  ml_srcdotdot=""
-fi
-
-if [ -z "${with_multisubdir}" ]; then
-  ml_subdir=
-  ml_builddotdot=
-  : # ml_srcdotdot= # already set
-else
-  ml_subdir="/${with_multisubdir}"
-  # The '[^/][^/]*' appears that way to work around a SunOS sed bug.
-  ml_builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`/
-  if [ "$srcdir" = "." ]; then
-    ml_srcdotdot=${ml_srcdotdot}${ml_builddotdot}
-  else
-    : # ml_srcdotdot= # already set
-  fi
-fi
-
-if [ "${ml_toplevel_p}" = yes ]; then
-  ml_do='$(MAKE)'
-  ml_clean='$(MAKE)'
-else
-  ml_do=true
-  ml_clean=true
-fi
-
-# TOP is used by newlib and should not be used elsewhere for this purpose.
-# MULTI{SRC,BUILD}TOP are the proper ones to use.  MULTISRCTOP is empty
-# when srcdir != builddir.  MULTIBUILDTOP is always some number of ../'s.
-# FIXME: newlib needs to be updated to use MULTI{SRC,BUILD}TOP so we can
-# delete TOP.  Newlib may wish to continue to use TOP for its own purposes
-# of course.
-# MULTIDIRS is non-empty for the cpu top level Makefile (eg: newlib/Makefile)
-# and lists the subdirectories to recurse into.
-# MULTISUBDIR is non-empty in each cpu subdirectory's Makefile
-# (eg: newlib/h8300h/Makefile) and is the installed subdirectory name with
-# a leading '/'.
-# MULTIDO is used for targets like all, install, and check where
-# $(FLAGS_TO_PASS) augmented with the subdir's compiler option is needed.
-# MULTICLEAN is used for the *clean targets.
-#
-# ??? It is possible to merge MULTIDO and MULTICLEAN into one.  They are
-# currently kept separate because we don't want the *clean targets to require
-# the existence of the compiler (which MULTIDO currently requires) and
-# therefore we'd have to record the directory options as well as names
-# (currently we just record the names and use --print-multi-lib to get the
-# options).
-
-sed -e "s:^TOP[        ]*=[    ]*\([./]*\)[    ]*$:TOP = ${ml_builddotdot}\1:" 
\
-    -e "s:^MULTISRCTOP[        ]*=.*$:MULTISRCTOP = ${ml_srcdotdot}:" \
-    -e "s:^MULTIBUILDTOP[      ]*=.*$:MULTIBUILDTOP = ${ml_builddotdot}:" \
-    -e "s:^MULTIDIRS[  ]*=.*$:MULTIDIRS = ${multidirs}:" \
-    -e "s:^MULTISUBDIR[        ]*=.*$:MULTISUBDIR = ${ml_subdir}:" \
-    -e "s:^MULTIDO[    ]*=.*$:MULTIDO = $ml_do:" \
-    -e "s:^MULTICLEAN[         ]*=.*$:MULTICLEAN = $ml_clean:" \
-       ${Makefile} > Makefile.tem
-rm -f ${Makefile}
-mv Makefile.tem ${Makefile}
-
-# If this is the library's top level, configure each multilib subdir.
-# This is done at the end because this is the loop that runs configure
-# in each multilib subdir and it seemed reasonable to finish updating the
-# Makefile before going on to configure the subdirs.
-
-if [ "${ml_toplevel_p}" = yes ]; then
-
-# We must freshly configure each subdirectory.  This bit of code is
-# actually partially stolen from the main configure script.  FIXME.
-
-if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
-
-  if [ "${ml_verbose}" = --verbose ]; then
-    echo "Running configure in multilib subdirs ${multidirs}"
-    echo "pwd: `${PWDCMD-pwd}`"
-  fi
-
-  ml_origdir=`${PWDCMD-pwd}`
-  ml_libdir=`echo "$ml_origdir" | sed -e 's,^.*/,,'`
-  # cd to top-level-build-dir/${with_target_subdir}
-  cd ..
-
-  for ml_dir in ${multidirs}; do
-
-    if [ "${ml_verbose}" = --verbose ]; then
-      echo "Running configure in multilib subdir ${ml_dir}"
-      echo "pwd: `${PWDCMD-pwd}`"
-    fi
-
-    if [ -d ${ml_dir} ]; then true; else
-      # ``mkdir -p ${ml_dir}'' See also mkinstalldirs.
-      pathcomp=""
-      for d in `echo ":${ml_dir}" | sed -ne 's/^:\//#/;s/^://;s/\// 
/g;s/^#/\//;p'`; do
-        pathcomp="$pathcomp$d"
-        case "$pathcomp" in
-          -* ) pathcomp=./$pathcomp ;;
-        esac
-        if test ! -d "$pathcomp"; then
-           echo "mkdir $pathcomp" 1>&2
-           mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
-        fi
-        if test ! -d "$pathcomp"; then
-          exit $lasterr
-        fi
-        pathcomp="$pathcomp/"
-      done
-    fi
-    if [ -d ${ml_dir}/${ml_libdir} ]; then true; else mkdir 
${ml_dir}/${ml_libdir}; fi
-
-    # Eg: if ${ml_dir} = m68000/m68881, dotdot = ../../
-    dotdot=../`echo ${ml_dir} | sed -e 's|[^/]||g' -e 's|/|../|g'`
-
-    case ${srcdir} in
-    ".")
-      echo "Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}"
-      if [ "${with_target_subdir}" != "." ]; then
-       ml_unsubdir="../"
-      else
-       ml_unsubdir=""
-      fi
-      (cd ${ml_dir}/${ml_libdir};
-       ../${dotdot}${ml_unsubdir}symlink-tree 
../${dotdot}${ml_unsubdir}${ml_libdir} "")
-      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
-       if [ x"${MAKE}" = x ]; then
-         (cd ${ml_dir}/${ml_libdir}; make distclean)
-       else
-         (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
-       fi
-      fi
-      ml_newsrcdir="."
-      ml_srcdiroption=
-      multisrctop=${dotdot}
-      ;;
-    *)
-      case "${srcdir}" in
-      /* | [A-Za-z]:[\\/]* ) # absolute path
-        ml_newsrcdir=${srcdir}
-        ;;
-      *) # otherwise relative
-        ml_newsrcdir=${dotdot}${srcdir}
-        ;;
-      esac
-      ml_srcdiroption="-srcdir=${ml_newsrcdir}"
-      multisrctop=
-      ;;
-    esac
-
-    case "${progname}" in
-    /* | [A-Za-z]:[\\/]* )     ml_recprog=${progname} ;;
-    *)      ml_recprog=${dotdot}${progname} ;;
-    esac
-
-    # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
-    ML_POPDIR=`${PWDCMD-pwd}`
-    cd ${ml_dir}/${ml_libdir}
-
-    if [ -f ${ml_newsrcdir}/configure ]; then
-      ml_recprog="${ml_newsrcdir}/configure"
-    fi
-
-    # find compiler flag corresponding to ${ml_dir}
-    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
-      dir=`echo $i | sed -e 's/;.*$//'`
-      if [ "${dir}" = "${ml_dir}" ]; then
-        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
-        break
-      fi
-    done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" 
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
-
-    if [ "${with_target_subdir}" = "." ]; then
-       CC_=$CC' '
-       CXX_=$CXX' '
-       F77_=$F77' '
-       GCJ_=$GCJ' '
-       GFORTRAN_=$GFORTRAN' '
-       GOC_=$GOC' '
-    else
-       # Create a regular expression that matches any string as long
-       # as ML_POPDIR.
-       popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'`
-       CC_=
-       for arg in ${CC}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           CC_="${CC_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           CC_="${CC_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           CC_="${CC_}${arg} " ;;
-         esac
-       done
-
-       CXX_=
-       for arg in ${CXX}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           CXX_="${CXX_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           CXX_="${CXX_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           CXX_="${CXX_}${arg} " ;;
-         esac
-       done
-
-       F77_=
-       for arg in ${F77}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           F77_="${F77_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           F77_="${F77_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           F77_="${F77_}${arg} " ;;
-         esac
-       done
-
-       GCJ_=
-       for arg in ${GCJ}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           GCJ_="${GCJ_}${arg} " ;;
-         esac
-       done
-
-       GFORTRAN_=
-       for arg in ${GFORTRAN}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           GFORTRAN_="${GFORTRAN_}${arg} " ;;
-         esac
-       done
-
-       GOC_=
-       for arg in ${GOC}; do
-         case $arg in
-         -[BIL]"${ML_POPDIR}"/*)
-           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         "${ML_POPDIR}"/*)
-           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-         *)
-           GOC_="${GOC_}${arg} " ;;
-         esac
-       done
-
-       if test "x${LD_LIBRARY_PATH+set}" = xset; then
-         LD_LIBRARY_PATH_=
-         for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
-           case "$arg" in
-           "${ML_POPDIR}"/*)
-             arg=`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`
-             ;;
-           esac
-           if test "x$LD_LIBRARY_PATH_" != x; then
-             LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
-           else
-             LD_LIBRARY_PATH_=$arg
-           fi
-          done
-         ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
-       fi
-
-       if test "x${SHLIB_PATH+set}" = xset; then
-         SHLIB_PATH_=
-         for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
-           case "$arg" in
-           "${ML_POPDIR}"/*)
-             arg=`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`
-             ;;
-           esac
-           if test "x$SHLIB_PATH_" != x; then
-             SHLIB_PATH_=$SHLIB_PATH_:$arg
-           else
-             SHLIB_PATH_=$arg
-           fi
-          done
-         ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
-       fi
-    fi
-
-    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
-       --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
-       ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
-      true
-    else
-      exit 1
-    fi
-
-    cd "${ML_POPDIR}"
-
-  done
-
-  cd "${ml_origdir}"
-fi
-
-fi # ${ml_toplevel_p} = yes
-fi # ${enable_multilib} = yes
diff --git a/lib/depcomp b/lib/depcomp
index 25a39e6..debb6ff 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -3,8 +3,7 @@
 
 scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/elisp-comp b/lib/elisp-comp
index ecc6b15..7766db4 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,6 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
 scriptversion=2010-02-06.18; # UTC
 
@@ -30,16 +29,16 @@ scriptversion=2010-02-06.18; # UTC
 
 case $1 in
   '')
-     echo "$0: No files.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No files.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: elisp-comp [--help] [--version] FILES...
 
-This script byte-compiles all `.el' files listed as FILES using GNU
-Emacs, and put the resulting `.elc' files into the current directory,
-so disregarding the original directories used in `.el' arguments.
+This script byte-compiles all '.el' files listed as FILES using GNU
+Emacs, and put the resulting '.elc' files into the current directory,
+so disregarding the original directories used in '.el' arguments.
 
 This script manages in such a way that all Emacs LISP files to
 be compiled are made visible between themselves, in the event
diff --git a/lib/install-sh b/lib/install-sh
index a9244eb..377bb86 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-       # Protect names problematic for `test' and other utilities.
+       # Protect names problematic for 'test' and other utilities.
        case $dst_arg in
          -* | [=\(\)!]) dst_arg=./$dst_arg;;
        esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                  # other-writeable bit of parent directory when it shouldn't.
+                  # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
                   case $ls_ld_tmpdir in
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 60dc485..4614441 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -3,8 +3,7 @@
 
 scriptversion=2010-08-21.06; # UTC
 
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
 # written by Ulrich Drepper <address@hidden>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -40,7 +39,7 @@ fi
 
 case $1 in
   '')
-     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No file.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -76,7 +75,7 @@ LC_TIME=C
 export LC_TIME
 
 # GNU ls changes its time format in response to the TIME_STYLE
-# variable.  Since we cannot assume `unset' works, revert this
+# variable.  Since we cannot assume 'unset' works, revert this
 # variable to its documented default.
 if test "${TIME_STYLE+set}" = set; then
   TIME_STYLE=posix-long-iso
@@ -96,14 +95,14 @@ if ls -n /dev/null 1>/dev/null 2>&1; then
   ls_command="$ls_command -n"
 fi
 
-# A `ls -l' line looks as follows on OS/2.
+# A 'ls -l' line looks as follows on OS/2.
 #  drwxrwx---        0 Aug 11  2001 foo
 # This differs from Unix, which adds ownership information.
 #  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
 #
 # To find the date, we split the line on spaces and iterate on words
 # until we find a month.  This cannot work with files whose owner is a
-# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
+# user named "Jan", or "Feb", etc.  However, it's unlikely that '/'
 # will be owned by a user whose name is a month.  So we first look at
 # the extended ls output of the root directory to decide how many
 # words should be skipped to get the date.
@@ -116,7 +115,7 @@ month=
 command=
 until test $month
 do
-  test $# -gt 0 || error "failed parsing \`$ls_command /' output"
+  test $# -gt 0 || error "failed parsing '$ls_command /' output"
   shift
   # Add another shift to the command.
   command="$command shift;"
@@ -136,7 +135,7 @@ do
   esac
 done
 
-test -n "$month" || error "failed parsing \`$ls_command /' output"
+test -n "$month" || error "failed parsing '$ls_command /' output"
 
 # Get the extended ls output of the file or directory.
 set dummy x`eval "$ls_command \"\\\$save_arg1\""`
diff --git a/lib/missing b/lib/missing
index 86a8fc3..9a55648 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-01-06.18; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <address@hidden>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
@@ -34,7 +33,7 @@ run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
   configure_ac=configure.ac
@@ -65,7 +64,7 @@ case $1 in
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 
 Options:
@@ -74,20 +73,20 @@ Options:
   --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  aclocal      touch file 'aclocal.m4'
+  autoconf     touch file 'configure'
+  autoheader   touch file 'config.h.in'
   autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
+  automake     touch all 'Makefile.in' files
+  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
+  flex         create 'lex.yy.c', if possible, from existing .c
   help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
+  lex          create 'lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <address@hidden>."
     exit $?
@@ -99,8 +98,8 @@ Send bug reports to <address@hidden>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: Unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
@@ -127,7 +126,7 @@ case $1 in
        exit 1
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
        # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # running '$TOOL --version' or '$TOOL --help' to check whether
        # $TOOL exists and not knowing $TOOL uses missing.
        exit 1
     fi
@@ -139,27 +138,27 @@ esac
 case $program in
   aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+         to install the Automake and Perl packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+WARNING: '$1' is $msg.  You should only need it if
+         you modified '${configure_ac}'.  You might want to install the
+         Autoconf and GNU m4 packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+         to install the Autoconf and GNU m4 packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' 
${configure_ac}`
     test -z "$files" && files="config.h"
@@ -176,9 +175,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   automake*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+         You might want to install the Automake and Perl packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
           sed 's/\.am$/.in/' |
@@ -187,10 +186,10 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   autom4te*)
     echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
          You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get '$1' as part of Autoconf from any GNU
          archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
@@ -210,10 +209,10 @@ WARNING: \`$1' is needed, but is $msg.
 
   bison*|yacc*)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
+WARNING: '$1' $msg.  You should only need it if
+         you modified a '.y' file.  You may need the Bison package
          in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+         Bison from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
         eval LASTARG=\${$#}
@@ -240,10 +239,10 @@ WARNING: \`$1' $msg.  You should only need it if
 
   lex*|flex*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.l' file.  You may need the Flex package
          in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+         Flex from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
         eval LASTARG=\${$#}
@@ -263,10 +262,10 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   help2man*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: '$1' is $msg.  You should only need it if
         you modified a dependency of a manual page.  You may need the
-        \`Help2man' package in order for those modifications to take
-        effect.  You can get \`Help2man' from any GNU archive site."
+        Help2man package in order for those modifications to take
+        effect.  You can get Help2man from any GNU archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -281,12 +280,12 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   makeinfo*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.texi' or '.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
+         call might also be the consequence of using a buggy 'make' (AIX,
+         DU, IRIX).  You might want to install the Texinfo package or
+         the GNU make package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n "$sed_output"`
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -310,12 +309,12 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: '$1' is needed, and is $msg.
          You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
+         proper tools for further handling them.  Check the 'README' file,
          it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
+         some other package would contain this missing '$1' program."
     exit 1
     ;;
 esac
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index 4191a45..55d537f 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -81,9 +81,9 @@ case $dirmode in
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
     else
-      # On NextStep and OpenStep, the `mkdir' command does not
+      # On NextStep and OpenStep, the 'mkdir' command does not
       # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
+      # directories to create, and then abort because '.' already
       # exists.
       test -d ./-p && rmdir ./-p
       test -d ./--version && rmdir ./--version
diff --git a/lib/py-compile b/lib/py-compile
index 15c834c..699e28f 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -3,8 +3,7 @@
 
 scriptversion=2011-06-08.12; # UTC
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/symlink-tree b/lib/symlink-tree
deleted file mode 100755
index a9d5083..0000000
--- a/lib/symlink-tree
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-# Create a symlink tree.
-#
-# Copyright (C) 1995, 2000, 2003  Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Please report bugs to <address@hidden>
-# and send patches to <address@hidden>.
-
-# Syntax: symlink-tree srcdir "ignore1 ignore2 ..."
-#
-# where srcdir is the directory to create a symlink tree to,
-# and "ignoreN" is a list of files/directories to ignore.
-
-prog=$0
-srcdir=$1
-ignore="$2"
-
-if test $# -lt 1; then
-  echo "symlink-tree error:  Usage: symlink-tree srcdir \"ignore1 ignore2 
...\""
-  exit 1
-fi
-
-ignore_additional=". .. CVS"
-
-# If we were invoked with a relative path name, adjust ${prog} to work
-# in subdirs.
-case ${prog} in
-/* | [A-Za-z]:[\\/]*) ;;
-*) prog=../${prog} ;;
-esac
-
-# Set newsrcdir to something subdirectories can use.
-case ${srcdir} in
-/* | [A-Za-z]:[\\/]*) newsrcdir=${srcdir} ;;
-*) newsrcdir=../${srcdir} ;;
-esac
-
-for f in `ls -a ${srcdir}`; do
-  if [ -d ${srcdir}/$f ]; then
-    found=
-    for i in ${ignore} ${ignore_additional}; do
-      if [ "$f" = "$i" ]; then
-       found=yes
-      fi
-    done
-    if [ -z "${found}" ]; then
-      echo "$f         ..working in"
-      if [ -d $f ]; then true; else mkdir $f; fi
-      (cd $f; ${prog} ${newsrcdir}/$f "${ignore}")
-    fi
-  else
-    echo "$f           ..linked"
-    rm -f $f
-    ln -s ${srcdir}/$f .
-  fi
-done
-
-exit 0
diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl
new file mode 100755
index 0000000..7f420af
--- /dev/null
+++ b/lib/tap-driver.pl
@@ -0,0 +1,564 @@
+#! /usr/bin/env perl
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
+
+# ---------------------------------- #
+#  Imports, static data, and setup.  #
+# ---------------------------------- #
+
+use warnings FATAL => 'all';
+use strict;
+use Getopt::Long ();
+use TAP::Parser;
+
+my $VERSION = '2012-02-01.19'; # UTC
+
+my $ME = "tap-driver.pl";
+
+my $USAGE = <<'END';
+Usage:
+  tap-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+             [--expect-failure={yes|no}] [--color-tests={yes|no}]
+             [--enable-hard-errors={yes|no}] [--ignore-exit]
+             [--diagnostic-string=STRING] [--merge|--no-merge]
+             [--comments|--no-comments] [--] TEST-COMMAND
+The `--test-name', `--log-file' and `--trs-file' options are mandatory.
+END
+
+my $HELP = "$ME: TAP-aware test driver for Automake testsuite harness." .
+           "\n" . $USAGE;
+
+# Keep this in sync with `lib/am/check.am:$(am__tty_colors)'.
+my %COLOR = (
+  red => "\e[0;31m",
+  grn => "\e[0;32m",
+  lgn => "\e[1;32m",
+  blu => "\e[1;34m",
+  mgn => "\e[0;35m",
+  brg => "\e[1m",
+  std => "\e[m",
+);
+
+# It's important that NO_PLAN evaluates "false" as a boolean.
+use constant NO_PLAN => 0;
+use constant EARLY_PLAN => 1;
+use constant LATE_PLAN => 2;
+
+# ------------------- #
+#  Global variables.  #
+# ------------------- #
+
+my $testno = 0;     # Number of test results seen so far.
+my $bailed_out = 0; # Whether a "Bail out!" directive has been seen.
+my $parser;         # TAP parser object (will be initialized later).
+
+# Whether the TAP plan has been seen or not, and if yes, which kind
+# it is ("early" is seen before any test result, "late" otherwise).
+my $plan_seen = NO_PLAN;
+
+# ----------------- #
+#  Option parsing.  #
+# ----------------- #
+
+my %cfg = (
+  "color-tests" => 0,
+  "expect-failure" => 0,
+  "merge" => 0,
+  "comments" => 0,
+  "ignore-exit" => 0,
+);
+
+my $test_script_name = undef;
+my $log_file = undef;
+my $trs_file = undef;
+my $diag_string = "#";
+
+Getopt::Long::GetOptions
+  (
+    'help' => sub { print $HELP; exit 0; },
+    'version' => sub { print "$ME $VERSION\n"; exit 0; },
+    'test-name=s' => \$test_script_name,
+    'log-file=s' => \$log_file,
+    'trs-file=s' => \$trs_file,
+    'color-tests=s'  => \&bool_opt,
+    'expect-failure=s'  => \&bool_opt,
+    'enable-hard-errors=s' => sub {}, # No-op.
+    'diagnostic-string=s' => \$diag_string,
+    'comments' => sub { $cfg{"comments"} = 1; },
+    'no-comments' => sub { $cfg{"comments"} = 0; },
+    'merge' => sub { $cfg{"merge"} = 1; },
+    'no-merge' => sub { $cfg{"merge"} = 0; },
+    'ignore-exit' => sub { $cfg{"ignore-exit"} = 1; },
+  ) or exit 1;
+
+# ------------- #
+#  Prototypes.  #
+# ------------- #
+
+sub add_test_result ($);
+sub bool_opt ($$);
+sub colored ($$);
+sub copy_in_global_log ();
+sub decorate_result ($);
+sub extract_tap_comment ($);
+sub finish ();
+sub get_global_test_result ();
+sub get_test_exit_message ();
+sub get_test_results ();
+sub handle_tap_bailout ($);
+sub handle_tap_plan ($);
+sub handle_tap_result ($);
+sub is_null_string ($);
+sub main (@);
+sub must_recheck ();
+sub report ($;$);
+sub setup_io ();
+sub setup_parser (@);
+sub stringify_result_obj ($);
+sub testsuite_error ($);
+sub trap_perl_warnings_and_errors ();
+sub write_test_results ();
+sub yn ($);
+
+# -------------- #
+#  Subroutines.  #
+# -------------- #
+
+sub bool_opt ($$)
+{
+  my ($opt, $val) = @_;
+  if ($val =~ /^(?:y|yes)\z/i)
+    {
+      $cfg{$opt} = 1;
+    }
+  elsif ($val =~ /^(?:n|no)\z/i)
+    {
+      $cfg{$opt} = 0;
+    }
+  else
+    {
+      die "$ME: invalid argument '$val' for option '$opt'\n";
+    }
+}
+
+# If the given string is undefined or empty, return true, otherwise
+# return false.  This function is useful to avoid pitfalls like:
+#   if ($message) { print "$message\n"; }
+# which wouldn't print anything if $message is the literal "0".
+sub is_null_string ($)
+{
+  my $str = shift;
+  return ! (defined $str and length $str);
+}
+
+# Convert a boolean to a "yes"/"no" string.
+sub yn ($)
+{
+  my $bool = shift;
+  return $bool ? "yes" : "no";
+}
+
+TEST_RESULTS :
+{
+  my (@test_results_list, %test_results_seen);
+
+  sub add_test_result ($)
+  {
+    my $res = shift;
+    push @test_results_list, $res;
+    $test_results_seen{$res} = 1;
+  }
+
+  sub get_test_results ()
+  {
+    return @test_results_list;
+  }
+
+  # Whether the test script should be re-run by "make recheck".
+  sub must_recheck ()
+  {
+    return grep { !/^(?:XFAIL|PASS|SKIP)$/ } (keys %test_results_seen);
+  }
+
+  # Whether the content of the log file associated to this test should
+  # be copied into the "global" test-suite.log.
+  sub copy_in_global_log ()
+  {
+    return grep { not $_ eq "PASS" } (keys %test_results_seen);
+  }
+
+  # FIXME: this can certainly be improved ...
+  sub get_global_test_result ()
+  {
+    return "ERROR"
+      if $test_results_seen{"ERROR"};
+    return "FAIL"
+      if $test_results_seen{"FAIL"} || $test_results_seen{"XPASS"};
+    return "SKIP"
+      if scalar keys %test_results_seen == 1 && $test_results_seen{"SKIP"};
+    return "PASS";
+  }
+
+}
+
+sub write_test_results ()
+{
+  open RES, ">", $trs_file or die "$ME: opening $trs_file: $!\n";
+  print RES ":global-test-result: " . get_global_test_result . "\n";
+  print RES ":recheck: " . yn (must_recheck) . "\n";
+  print RES ":copy-in-global-log: " . yn (copy_in_global_log) . "\n";
+  foreach my $result (get_test_results)
+    {
+      print RES ":test-result: $result\n";
+    }
+  close RES or die "$ME: closing $trs_file: $!\n";
+}
+
+sub trap_perl_warnings_and_errors ()
+{
+  $SIG{__WARN__} = $SIG{__DIE__} = sub
+    {
+      # Be sure to send the warning/error message to the original stderr
+      # (presumably the console), not into the log file.
+      open STDERR, ">&OLDERR";
+      die @_;
+    }
+}
+
+sub setup_io ()
+{
+  # Redirect stderr and stdout to a temporary log file.  Save the
+  # original stdout stream, since we need it to print testsuite
+  # progress output. Save original stderr stream, so that we can
+  # redirect warning and error messages from perl there.
+  open LOG, ">", $log_file or die "$ME: opening $log_file: $!\n";
+  open OLDOUT, ">&STDOUT" or die "$ME: duplicating stdout: $!\n";
+  open OLDERR, ">&STDERR" or die "$ME: duplicating stdout: $!\n";
+  *OLDERR = *OLDERR; # To pacify a "used only once" warning.
+  trap_perl_warnings_and_errors;
+  open STDOUT, ">&LOG" or die "$ME: redirecting stdout: $!\n";
+  open STDERR, ">&LOG" or die "$ME: redirecting stderr: $!\n";
+}
+
+sub setup_parser (@)
+{
+  local $@ = '';
+  eval { $parser = TAP::Parser->new ({exec => address@hidden, merge => 
$cfg{merge}}) };
+  if ($@ ne '')
+    {
+      # Don't use the error message in $@ as set by TAP::Parser, since
+      # currently it's both too generic (at the point of being basically
+      # useless) and quite long.
+      report "ERROR", "- couldn't execute test script";
+      finish;
+    }
+}
+
+sub get_test_exit_message ()
+{
+  my $wstatus = $parser->wait;
+  # Watch out for possible internal errors.
+  die "$ME: couldn't get the exit status of the TAP producer"
+    unless defined $wstatus;
+  # Return an undefined value if the producer exited with success.
+  return unless $wstatus;
+  # Otherwise, determine whether it exited with error or was terminated
+  # by a signal.
+  use POSIX qw (WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG);
+  if (WIFEXITED ($wstatus))
+  {
+    return sprintf "exited with status %d", WEXITSTATUS ($wstatus);
+  }
+  elsif (WIFSIGNALED ($wstatus))
+    {
+      return sprintf "terminated by signal %d", WTERMSIG ($wstatus);
+    }
+  else
+    {
+      return "terminated abnormally";
+    }
+}
+
+sub stringify_result_obj ($)
+{
+  my $result_obj = shift;
+  my $COOKED_PASS = $cfg{"expect-failure"} ? "XPASS": "PASS";
+  my $COOKED_FAIL = $cfg{"expect-failure"} ? "XFAIL": "FAIL";
+  if ($result_obj->is_unplanned || $result_obj->number != $testno)
+    {
+      return "ERROR";
+    }
+  elsif ($plan_seen == LATE_PLAN)
+    {
+      return "ERROR";
+    }
+  elsif (!$result_obj->directive)
+    {
+      return $result_obj->is_ok ? $COOKED_PASS: $COOKED_FAIL;
+    }
+  elsif ($result_obj->has_todo)
+    {
+      return $result_obj->is_actual_ok ? "XPASS" : "XFAIL";
+    }
+  elsif ($result_obj->has_skip)
+    {
+      return $result_obj->is_ok ? "SKIP" : $COOKED_FAIL;
+    }
+  die "$ME: INTERNAL ERROR"; # NOTREACHED
+}
+
+sub colored ($$)
+{
+  my ($color_name, $text) = @_;
+  return $COLOR{$color_name} . $text . $COLOR{'std'};
+}
+
+sub decorate_result ($)
+{
+  my $result = shift;
+  return $result unless $cfg{"color-tests"};
+  my %color_for_result =
+    (
+      "ERROR" => 'mgn',
+      "PASS"  => 'grn',
+      "XPASS" => 'red',
+      "FAIL"  => 'red',
+      "XFAIL" => 'lgn',
+      "SKIP"  => 'blu',
+    );
+  if (my $color = $color_for_result{$result})
+    {
+      return colored ($color, $result);
+    }
+  else
+    {
+      return $result; # Don't colorize unknown stuff.
+    }
+}
+
+sub report ($;$)
+{
+  my ($msg, $result, $explanation) = (undef, @_);
+  if ($result =~ /^(?:X?(?:PASS|FAIL)|SKIP|ERROR)/)
+    {
+      $msg = ": $test_script_name";
+      add_test_result $result;
+    }
+  elsif ($result eq "#")
+    {
+      $msg = " $test_script_name:";
+    }
+  else
+    {
+      die "$ME: INTERNAL ERROR"; # NOTREACHED
+    }
+  $msg .= " $explanation" if defined $explanation;
+  $msg .= "\n";
+  # Output on console might be colorized.
+  print OLDOUT decorate_result ($result) . $msg;
+  # Log the result in the log file too, to help debugging (this is
+  # especially true when said result is a TAP error or "Bail out!").
+  print $result . $msg;
+}
+
+sub testsuite_error ($)
+{
+  report "ERROR", "- $_[0]";
+}
+
+sub handle_tap_result ($)
+{
+  $testno++;
+  my $result_obj = shift;
+
+  my $test_result = stringify_result_obj $result_obj;
+  my $string = $result_obj->number;
+
+  my $description = $result_obj->description;
+  $string .= " $description"
+    unless is_null_string $description;
+
+  if ($plan_seen == LATE_PLAN)
+    {
+      $string .= " # AFTER LATE PLAN";
+    }
+  elsif ($result_obj->is_unplanned)
+    {
+      $string .= " # UNPLANNED";
+    }
+  elsif ($result_obj->number != $testno)
+    {
+      $string .= " # OUT-OF-ORDER (expecting $testno)";
+    }
+  elsif (my $directive = $result_obj->directive)
+    {
+      $string .= " # $directive";
+      my $explanation = $result_obj->explanation;
+      $string .= " $explanation"
+        unless is_null_string $explanation;
+    }
+
+  report $test_result, $string;
+}
+
+sub handle_tap_plan ($)
+{
+  my $plan = shift;
+  if ($plan_seen)
+    {
+      # Error, only one plan per stream is acceptable.
+      testsuite_error "multiple test plans";
+      return;
+    }
+  # The TAP plan can come before or after *all* the TAP results; we speak
+  # respectively of an "early" or a "late" plan.  If we see the plan line
+  # after at least one TAP result has been seen, assume we have a late
+  # plan; in this case, any further test result seen after the plan will
+  # be flagged as an error.
+  $plan_seen = ($testno >= 1 ? LATE_PLAN : EARLY_PLAN);
+  # If $testno > 0, we have an error ("too many tests run") that will be
+  # automatically dealt with later, so don't worry about it here.  If
+  # $plan_seen is true, we have an error due to a repeated plan, and that
+  # has already been dealt with above.  Otherwise, we have a valid "plan
+  # with SKIP" specification, and should report it as a particular kind
+  # of SKIP result.
+  if ($plan->directive && $testno == 0)
+    {
+      my $explanation = is_null_string ($plan->explanation) ?
+                        undef : "- " . $plan->explanation;
+      report "SKIP", $explanation;
+    }
+}
+
+sub handle_tap_bailout ($)
+{
+  my ($bailout, $msg) = ($_[0], "Bail out!");
+  $bailed_out = 1;
+  $msg .= " " . $bailout->explanation
+    unless is_null_string $bailout->explanation;
+  testsuite_error $msg;
+}
+
+sub extract_tap_comment ($)
+{
+  my $line = shift;
+  if (index ($line, $diag_string) == 0)
+    {
+      # Strip leading `$diag_string' from `$line'.
+      $line = substr ($line, length ($diag_string));
+      # And strip any leading and trailing whitespace left.
+      $line =~ s/(?:^\s*|\s*$)//g;
+      # Return what is left (if any).
+      return $line;
+    }
+  return "";
+}
+
+sub finish ()
+{
+  write_test_results;
+  close LOG or die "$ME: closing $log_file: $!\n";
+  exit 0;
+}
+
+sub main (@)
+{
+  setup_io;
+  setup_parser @_;
+
+  while (defined (my $cur = $parser->next))
+    {
+      # Verbatim copy any input line into the log file.
+      print $cur->raw . "\n";
+      # Parsing of TAP input should stop after a "Bail out!" directive.
+      next if $bailed_out;
+
+      if ($cur->is_plan)
+        {
+          handle_tap_plan ($cur);
+        }
+      elsif ($cur->is_test)
+        {
+          handle_tap_result ($cur);
+        }
+      elsif ($cur->is_bailout)
+        {
+          handle_tap_bailout ($cur);
+        }
+      elsif ($cfg{comments})
+        {
+          my $comment = extract_tap_comment ($cur->raw);
+          report "#", "$comment" if length $comment;
+       }
+    }
+  # A "Bail out!" directive should cause us to ignore any following TAP
+  # error, as well as a non-zero exit status from the TAP producer.
+  if (!$bailed_out)
+    {
+      if (!$plan_seen)
+        {
+          testsuite_error "missing test plan";
+        }
+      elsif ($parser->tests_planned != $parser->tests_run)
+        {
+          my ($planned, $run) = ($parser->tests_planned, $parser->tests_run);
+          my $bad_amount = $run > $planned ? "many" : "few";
+          testsuite_error (sprintf "too %s tests run (expected %d, got %d)",
+                                   $bad_amount, $planned, $run);
+        }
+      if (!$cfg{"ignore-exit"})
+        {
+          my $msg = get_test_exit_message ();
+          testsuite_error $msg if $msg;
+        }
+    }
+  finish;
+}
+
+# ----------- #
+#  Main code. #
+# ----------- #
+
+main @ARGV;
+
+# Local Variables:
+# perl-indent-level: 2
+# perl-continued-statement-offset: 2
+# perl-continued-brace-offset: 0
+# perl-brace-offset: 0
+# perl-brace-imaginary-offset: 0
+# perl-label-offset: -2
+# cperl-indent-level: 2
+# cperl-brace-offset: 0
+# cperl-continued-brace-offset: 0
+# cperl-label-offset: -2
+# cperl-extra-newline-before-brace: t
+# cperl-merge-trailing-else: nil
+# cperl-continued-statement-offset: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = "
+# time-stamp-format: "'%:y-%02m-%02d.%02H'"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
new file mode 100755
index 0000000..259ca0d
--- /dev/null
+++ b/lib/tap-driver.sh
@@ -0,0 +1,652 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
+
+scriptversion=2011-12-27.17; # UTC
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+me=tap-driver.sh
+
+fatal ()
+{
+  echo "$me: fatal: $*" >&2
+  exit 1
+}
+
+usage_error ()
+{
+  echo "$me: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
+                [--expect-failure={yes|no}] [--color-tests={yes|no}]
+                [--enable-hard-errors={yes|no}] [--ignore-exit]
+                [--diagnostic-string=STRING] [--merge|--no-merge]
+                [--comments|--no-comments] [--] TEST-COMMAND
+The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the result and output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=0
+color_tests=0
+merge=0
+ignore_exit=0
+comments=0
+diag_string='#'
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "$me $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) shift;; # No-op.
+  --merge) merge=1;;
+  --no-merge) merge=0;;
+  --ignore-exit) ignore_exit=1;;
+  --comments) comments=1;;
+  --no-comments) comments=0;;
+  --diagnostic-string) diag_string=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+test $# -gt 0 || usage_error "missing test command"
+
+case $expect_failure in
+  yes) expect_failure=1;;
+    *) expect_failure=0;;
+esac
+
+if test $color_tests = yes; then
+  init_colors='
+    color_map["red"]="" # Red.
+    color_map["grn"]="" # Green.
+    color_map["lgn"]="" # Light green.
+    color_map["blu"]="" # Blue.
+    color_map["mgn"]="" # Magenta.
+    color_map["std"]=""     # No color.
+    color_for_result["ERROR"] = "mgn"
+    color_for_result["PASS"]  = "grn"
+    color_for_result["XPASS"] = "red"
+    color_for_result["FAIL"]  = "red"
+    color_for_result["XFAIL"] = "lgn"
+    color_for_result["SKIP"]  = "blu"'
+else
+  init_colors=''
+fi
+
+# :; is there to work around a bug in bash 3.2 (and earlier) which
+# does not always set '$?' properly on redirection failure.
+# See the Autoconf manual for more details.
+:;{
+  (
+    # Ignore common signals (in this subshell only!), to avoid potential
+    # problems with Korn shells.  Some Korn shells are known to propagate
+    # to themselves signals that have killed a child process they were
+    # waiting for; this is done at least for SIGINT (and usually only for
+    # it, in truth).  Without the `trap' below, such a behaviour could
+    # cause a premature exit in the current subshell, e.g., in case the
+    # test command it runs gets terminated by a SIGINT.  Thus, the awk
+    # script we are piping into would never seen the exit status it
+    # expects on its last input line (which is displayed below by the
+    # last `echo $?' statement), and would thus die reporting an internal
+    # error.
+    # For more information, see the Autoconf manual and the threads:
+    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    # 
<http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
+    trap : 1 3 2 13 15
+    if test $merge -gt 0; then
+      exec 2>&1
+    else
+      exec 2>&3
+    fi
+    "$@"
+    echo $?
+  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
+        -v me="$me" \
+        -v test_script_name="$test_name" \
+        -v log_file="$log_file" \
+        -v trs_file="$trs_file" \
+        -v expect_failure="$expect_failure" \
+        -v merge="$merge" \
+        -v ignore_exit="$ignore_exit" \
+        -v comments="$comments" \
+        -v diag_string="$diag_string" \
+'
+# FIXME: the usages of "cat >&3" below could be optimized when using
+# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
+
+# Implementation note: in what follows, `result_obj` will be an
+# associative array that (partly) simulates a TAP result object
+# from the `TAP::Parser` perl module.
+
+## ----------- ##
+##  FUNCTIONS  ##
+## ----------- ##
+
+function fatal(msg)
+{
+  print me ": " msg | "cat >&2"
+  exit 1
+}
+
+function abort(where)
+{
+  fatal("internal error " where)
+}
+
+# Convert a boolean to a "yes"/"no" string.
+function yn(bool)
+{
+  return bool ? "yes" : "no";
+}
+
+function add_test_result(result)
+{
+  if (!test_results_index)
+    test_results_index = 0
+  test_results_list[test_results_index] = result
+  test_results_index += 1
+  test_results_seen[result] = 1;
+}
+
+# Whether the test script should be re-run by "make recheck".
+function must_recheck()
+{
+  for (k in test_results_seen)
+    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
+      return 1
+  return 0
+}
+
+# Whether the content of the log file associated to this test should
+# be copied into the "global" test-suite.log.
+function copy_in_global_log()
+{
+  for (k in test_results_seen)
+    if (k != "PASS")
+      return 1
+  return 0
+}
+
+# FIXME: this can certainly be improved ...
+function get_global_test_result()
+{
+    if ("ERROR" in test_results_seen)
+      return "ERROR"
+    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
+      return "FAIL"
+    all_skipped = 1
+    for (k in test_results_seen)
+      if (k != "SKIP")
+        all_skipped = 0
+    if (all_skipped)
+      return "SKIP"
+    return "PASS";
+}
+
+function stringify_result_obj(result_obj)
+{
+  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
+    return "ERROR"
+
+  if (plan_seen == LATE_PLAN)
+    return "ERROR"
+
+  if (result_obj["directive"] == "TODO")
+    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
+
+  if (result_obj["directive"] == "SKIP")
+    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
+
+  if (length(result_obj["directive"]))
+      abort("in function stringify_result_obj()")
+
+  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
+}
+
+function decorate_result(result)
+{
+  color_name = color_for_result[result]
+  if (color_name)
+    return color_map[color_name] "" result "" color_map["std"]
+  # If we are not using colorized output, or if we do not know how
+  # to colorize the given result, we should return it unchanged.
+  return result
+}
+
+function report(result, details)
+{
+  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
+    {
+      msg = ": " test_script_name
+      add_test_result(result)
+    }
+  else if (result == "#")
+    {
+      msg = " " test_script_name ":"
+    }
+  else
+    {
+      abort("in function report()")
+    }
+  if (length(details))
+    msg = msg " " details
+  # Output on console might be colorized.
+  print decorate_result(result) msg
+  # Log the result in the log file too, to help debugging (this is
+  # especially true when said result is a TAP error or "Bail out!").
+  print result msg | "cat >&3";
+}
+
+function testsuite_error(error_message)
+{
+  report("ERROR", "- " error_message)
+}
+
+function handle_tap_result()
+{
+  details = result_obj["number"];
+  if (length(result_obj["description"]))
+    details = details " " result_obj["description"]
+
+  if (plan_seen == LATE_PLAN)
+    {
+      details = details " # AFTER LATE PLAN";
+    }
+  else if (result_obj["is_unplanned"])
+    {
+       details = details " # UNPLANNED";
+    }
+  else if (result_obj["number"] != testno)
+    {
+       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
+                         details, testno);
+    }
+  else if (result_obj["directive"])
+    {
+      details = details " # " result_obj["directive"];
+      if (length(result_obj["explanation"]))
+        details = details " " result_obj["explanation"]
+    }
+
+  report(stringify_result_obj(result_obj), details)
+}
+
+# `skip_reason` should be empty whenever planned > 0.
+function handle_tap_plan(planned, skip_reason)
+{
+  planned += 0 # Avoid getting confused if, say, `planned` is "00"
+  if (length(skip_reason) && planned > 0)
+    abort("in function handle_tap_plan()")
+  if (plan_seen)
+    {
+      # Error, only one plan per stream is acceptable.
+      testsuite_error("multiple test plans")
+      return;
+    }
+  planned_tests = planned
+  # The TAP plan can come before or after *all* the TAP results; we speak
+  # respectively of an "early" or a "late" plan.  If we see the plan line
+  # after at least one TAP result has been seen, assume we have a late
+  # plan; in this case, any further test result seen after the plan will
+  # be flagged as an error.
+  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
+  # If testno > 0, we have an error ("too many tests run") that will be
+  # automatically dealt with later, so do not worry about it here.  If
+  # $plan_seen is true, we have an error due to a repeated plan, and that
+  # has already been dealt with above.  Otherwise, we have a valid "plan
+  # with SKIP" specification, and should report it as a particular kind
+  # of SKIP result.
+  if (planned == 0 && testno == 0)
+    {
+      if (length(skip_reason))
+        skip_reason = "- "  skip_reason;
+      report("SKIP", skip_reason);
+    }
+}
+
+function extract_tap_comment(line)
+{
+  if (index(line, diag_string) == 1)
+    {
+      # Strip leading `diag_string` from `line`.
+      line = substr(line, length(diag_string) + 1)
+      # And strip any leading and trailing whitespace left.
+      sub("^[ \t]*", "", line)
+      sub("[ \t]*$", "", line)
+      # Return what is left (if any).
+      return line;
+    }
+  return "";
+}
+
+# When this function is called, we know that line is a TAP result line,
+# so that it matches the (perl) RE "^(not )?ok\b".
+function setup_result_obj(line)
+{
+  # Get the result, and remove it from the line.
+  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
+  sub("^(not )?ok[ \t]*", "", line)
+
+  # If the result has an explicit number, get it and strip it; otherwise,
+  # automatically assing the next progresive number to it.
+  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
+    {
+      match(line, "^[0-9]+")
+      # The final `+ 0` is to normalize numbers with leading zeros.
+      result_obj["number"] = substr(line, 1, RLENGTH) + 0
+      line = substr(line, RLENGTH + 1)
+    }
+  else
+    {
+      result_obj["number"] = testno
+    }
+
+  if (plan_seen == LATE_PLAN)
+    # No further test results are acceptable after a "late" TAP plan
+    # has been seen.
+    result_obj["is_unplanned"] = 1
+  else if (plan_seen && testno > planned_tests)
+    result_obj["is_unplanned"] = 1
+  else
+    result_obj["is_unplanned"] = 0
+
+  # Strip trailing and leading whitespace.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+
+  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
+  result_obj["description"] = line
+  result_obj["directive"] = ""
+  result_obj["explanation"] = ""
+
+  if (index(line, "#") == 0)
+    return # No possible directive, nothing more to do.
+
+  # Directives are case-insensitive.
+  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
+
+  # See whether we have the directive, and if yes, where.
+  pos = match(line, rx "$")
+  if (!pos)
+    pos = match(line, rx "[^a-zA-Z0-9_]")
+
+  # If there was no TAP directive, we have nothing more to do.
+  if (!pos)
+    return
+
+  # Let`s now see if the TAP directive has been escaped.  For example:
+  #  escaped:     ok \# SKIP
+  #  not escaped: ok \\# SKIP
+  #  escaped:     ok \\\\\# SKIP
+  #  not escaped: ok \ # SKIP
+  if (substr(line, pos, 1) == "#")
+    {
+      bslash_count = 0
+      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
+        bslash_count += 1
+      if (bslash_count % 2)
+        return # Directive was escaped.
+    }
+
+  # Strip the directive and its explanation (if any) from the test
+  # description.
+  result_obj["description"] = substr(line, 1, pos - 1)
+  # Now remove the test description from the line, that has been dealt
+  # with already.
+  line = substr(line, pos)
+  # Strip the directive, and save its value (normalized to upper case).
+  sub("^[ \t]*#[ \t]*", "", line)
+  result_obj["directive"] = toupper(substr(line, 1, 4))
+  line = substr(line, 5)
+  # Now get the explanation for the directive (if any), with leading
+  # and trailing whitespace removed.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+  result_obj["explanation"] = line
+}
+
+function get_test_exit_message(status)
+{
+  if (status == 0)
+    return ""
+  if (status !~ /^[1-9][0-9]*$/)
+    abort("getting exit status")
+  if (status < 127)
+    exit_details = ""
+  else if (status == 127)
+    exit_details = " (command not found?)"
+  else if (status >= 128 && status <= 255)
+    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
+  else if (status > 256 && status <= 384)
+    # We used to report an "abnormal termination" here, but some Korn
+    # shells, when a child process die due to signal number n, can leave
+    # in $? an exit status of 256+n instead of the more standard 128+n.
+    # Apparently, both behaviours are allowed by POSIX (2008), so be
+    # prepared to handle them both.  See also Austing Group report ID
+    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
+    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
+  else
+    # Never seen in practice.
+    exit_details = " (abnormal termination)"
+  return sprintf("exited with status %d%s", status, exit_details)
+}
+
+function write_test_results()
+{
+  print ":global-test-result: " get_global_test_result() > trs_file
+  print ":recheck: "  yn(must_recheck()) > trs_file
+  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
+  for (i = 0; i < test_results_index; i += 1)
+    print ":test-result: " test_results_list[i] > trs_file
+  close(trs_file);
+}
+
+BEGIN {
+
+## ------- ##
+##  SETUP  ##
+## ------- ##
+
+'"$init_colors"'
+
+# Properly initialized once the TAP plan is seen.
+planned_tests = 0
+
+COOKED_PASS = expect_failure ? "XPASS": "PASS";
+COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
+
+# Enumeration-like constants to remember which kind of plan (if any)
+# has been seen.  It is important that NO_PLAN evaluates "false" as
+# a boolean.
+NO_PLAN = 0
+EARLY_PLAN = 1
+LATE_PLAN = 2
+
+testno = 0     # Number of test results seen so far.
+bailed_out = 0 # Whether a "Bail out!" directive has been seen.
+
+# Whether the TAP plan has been seen or not, and if yes, which kind
+# it is ("early" is seen before any test result, "late" otherwise).
+plan_seen = NO_PLAN
+
+## --------- ##
+##  PARSING  ##
+## --------- ##
+
+is_first_read = 1
+
+while (1)
+  {
+    # Involutions required so that we are able to read the exit status
+    # from the last input line.
+    st = getline
+    if (st < 0) # I/O error.
+      fatal("I/O error while reading from input stream")
+    else if (st == 0) # End-of-input
+      {
+        if (is_first_read)
+          abort("in input loop: only one input line")
+        break
+      }
+    if (is_first_read)
+      {
+        is_first_read = 0
+        nextline = $0
+        continue
+      }
+    else
+      {
+        curline = nextline
+        nextline = $0
+        $0 = curline
+      }
+    # Copy any input line verbatim into the log file.
+    print | "cat >&3"
+    # Parsing of TAP input should stop after a "Bail out!" directive.
+    if (bailed_out)
+      continue
+
+    # TAP test result.
+    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
+      {
+        testno += 1
+        setup_result_obj($0)
+        handle_tap_result()
+      }
+    # TAP plan (normal or "SKIP" without explanation).
+    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
+      {
+        # The next two lines will put the number of planned tests in $0.
+        sub("^1\\.\\.", "")
+        sub("[^0-9]*$", "")
+        handle_tap_plan($0, "")
+        continue
+      }
+    # TAP "SKIP" plan, with an explanation.
+    else if ($0 ~ /^1\.\.0+[ \t]*#/)
+      {
+        # The next lines will put the skip explanation in $0, stripping
+        # any leading and trailing whitespace.  This is a little more
+        # tricky in truth, since we want to also strip a potential leading
+        # "SKIP" string from the message.
+        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
+        sub("[ \t]*$", "");
+        handle_tap_plan(0, $0)
+      }
+    # "Bail out!" magic.
+    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
+    # recognize a "Bail out!" directive when preceded by leading
+    # whitespace, but more modern versions (e.g., 3.23) do.  So we
+    # emulate the latter, "more modern" behaviour.
+    else if ($0 ~ /^[ \t]*Bail out!/)
+      {
+        bailed_out = 1
+        # Get the bailout message (if any), with leading and trailing
+        # whitespace stripped.  The message remains stored in `$0`.
+        sub("^[ \t]*Bail out![ \t]*", "");
+        sub("[ \t]*$", "");
+        # Format the error message for the
+        bailout_message = "Bail out!"
+        if (length($0))
+          bailout_message = bailout_message " " $0
+        testsuite_error(bailout_message)
+      }
+    # Maybe we have too look for dianogtic comments too.
+    else if (comments != 0)
+      {
+        comment = extract_tap_comment($0);
+        if (length(comment))
+          report("#", comment);
+      }
+  }
+
+## -------- ##
+##  FINISH  ##
+## -------- ##
+
+# A "Bail out!" directive should cause us to ignore any following TAP
+# error, as well as a non-zero exit status from the TAP producer.
+if (!bailed_out)
+  {
+    if (!plan_seen)
+      {
+        testsuite_error("missing test plan")
+      }
+    else if (planned_tests != testno)
+      {
+        bad_amount = testno > planned_tests ? "many" : "few"
+        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
+                                bad_amount, planned_tests, testno))
+      }
+    if (!ignore_exit)
+      {
+        # Fetch exit status from the last line.
+        exit_message = get_test_exit_message(nextline)
+        if (exit_message)
+          testsuite_error(exit_message)
+      }
+  }
+
+write_test_results()
+
+exit 0
+
+} # End of "BEGIN" block.
+'
+
+# TODO: document that we consume the file descriptor 3 :-(
+} 3>"$log_file"
+
+test $? -eq 0 || fatal "I/O or internal error"
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/lib/test-driver b/lib/test-driver
new file mode 100755
index 0000000..2398a06
--- /dev/null
+++ b/lib/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic driver script for the `parallel-tests' mode.
+
+scriptversion=2011-08-17.14; # UTC
+
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <address@hidden> or send patches to
+# <address@hidden>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with `lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 85b68e7..e4dca02 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-03-11.15}
+\def\texinfoversion{2012-04-06.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4451,6 +4451,7 @@ end
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
+  \definedummyword\lbracechar
   \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
@@ -4463,6 +4464,7 @@ end
   \definedummyword\quoteleft
   \definedummyword\quoteright
   \definedummyword\quotesinglbase
+  \definedummyword\rbracechar
   \definedummyword\result
   \definedummyword\textdegree
   %
@@ -4514,6 +4516,7 @@ end
   \definedummyword\t
   %
   % Commands that take arguments.
+  \definedummyword\abbr
   \definedummyword\acronym
   \definedummyword\anchor
   \definedummyword\cite
@@ -4525,7 +4528,9 @@ end
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\image
   \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -4572,7 +4577,10 @@ end
   % content at all.  So for index sorting, we map @{ and @} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
   \def\{{|a}%
+  \def\lbracechar{|a}%
+  %
   \def\}{|b}%
+  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -7807,7 +7815,7 @@ end
   \fi\fi
 }
 
-
+% 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
@@ -7817,16 +7825,21 @@ end
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
 %
-\newbox\topbox
+\newbox\toprefbox
 \newbox\printedrefnamebox
+\newbox\infofilenamebox
 \newbox\printedmanualbox
 %
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
   \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
   %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
   \def\printedmanual{\ignorespaces #5}%
   \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
   %
@@ -7861,11 +7874,18 @@ end
      \turnoffactive
      \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
      \edef\pdfxrefdest{#1}%
-     \txiescapepdf\pdfxrefdest
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -7898,7 +7918,7 @@ end
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
     \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
@@ -7913,32 +7933,20 @@ end
     % this is a loss.  Therefore, we give the text of the node name
     % again, so it is as if TeX is seeing it for the first time.
     % 
-    % Cross-manual reference.  Only include the "Section ``foo'' in" if
-    % the foo is neither missing or Top.  Thus, @xref{,,,foo,The Foo Manual}
-    % outputs simply "see The Foo Manual".
     \ifdim \wd\printedmanualbox > 0pt
-      % What is the 7sp about?  The idea is that we also want to omit
-      % the Section part if we would be printing "Top", since they are
-      % clearly trying to refer to the whole manual.  But, this being
-      % TeX, we can't easily compare strings while ignoring the possible
-      % spaces before and after in the input.  By adding the arbitrary
-      % 7sp, we make it much less likely that a real node name would
-      % happen to have the same width as "Top" (e.g., in a monospaced font).
-      % I hope it will never happen in practice.
+      % Cross-manual reference with a printed manual name.
       % 
-      % For the same basic reason, we retypeset the "Top" at every
-      % reference, since the current font is indeterminate.
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
       % 
-      \setbox\topbox = \hbox{Top\kern7sp}%
-      \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-      \ifdim \wd2 > 7sp
-        \ifdim \wd2 = \wd\topbox \else
-          \putwordSection{} ``\printedrefname'' \putwordin{}\space
-        \fi
-      \fi
-      \cite{\printedmanual}%
+      \crossmanualxref{\code{\infofilename\unskip}}%
+    %
     \else
-      % Reference in this manual.
+      % Reference within this manual.
       %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
@@ -7959,11 +7967,37 @@ end
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}
 
+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
diff --git a/lib/ylwrap b/lib/ylwrap
index 9253635..36543da 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -3,8 +3,7 @@
 
 scriptversion=2011-08-25.18; # UTC
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <address@hidden>.
 #
@@ -32,7 +31,7 @@ scriptversion=2011-08-25.18; # UTC
 
 case "$1" in
   '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
     exit 1
     ;;
   --basedir)
@@ -129,7 +128,7 @@ if test $ret -eq 0; then
   # The directory holding the input.
   input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
   # Quote $INPUT_DIR so we can use it in a regexp.
-  # FIXME: really we should care about more than `.' and `\'.
+  # FIXME: really we should care about more than '.' and '\'.
   input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
 
   while test "$#" -ne 0; do
@@ -146,7 +145,7 @@ if test $ret -eq 0; then
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
-      # otherwise prepend `../'.
+      # otherwise prepend '../'.
       case "$2" in
         [\\/]* | ?:[\\/]*) target="$2";;
         *) target="../$2";;
@@ -162,7 +161,7 @@ if test $ret -eq 0; then
         realtarget="$target"
         target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
-      # Edit out `#line' or `#' directives.
+      # Edit out '#line' or '#' directives.
       #
       # We don't want the resulting debug information to point at
       # an absolute srcdir; it is better for it to just mention the
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index c1442f6..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake m4.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
-# 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-automake_acdir = $(datadir)/aclocal-$(APIVERSION)
-system_acdir = $(datadir)/aclocal
-
-dist_automake_ac_DATA = \
-$(top_srcdir)/m4/amversion.m4 \
-ar-lib.m4 \
-as.m4 \
-auxdir.m4 \
-ccstdc.m4 \
-cond.m4 \
-cond-if.m4 \
-depend.m4 \
-depout.m4 \
-dmalloc.m4 \
-gcj.m4 \
-header.m4 \
-init.m4 \
-install-sh.m4 \
-lead-dot.m4 \
-lex.m4 \
-lispdir.m4 \
-maintainer.m4 \
-make.m4 \
-minuso.m4 \
-missing.m4 \
-mkdirp.m4 \
-multi.m4 \
-obsol-gt.m4 \
-obsol-lt.m4 \
-obsolete.m4 \
-options.m4 \
-protos.m4 \
-python.m4 \
-regex.m4 \
-runlog.m4 \
-sanity.m4 \
-silent.m4 \
-strip.m4 \
-substnot.m4 \
-tar.m4 \
-upc.m4 \
-vala.m4
-
-# So that $(system_acdir) will be created by "make install".
-dist_system_ac_DATA =
-
-EXTRA_DIST = acdir/dirlist amversion.in
-
-# We build amversion.m4 here, instead of from config.status,
-# because config.status is rerun each time one of configure's
-# dependencies change and amversion.m4 happens to be a configure
-# dependency.  configure and amversion.m4 would be rebuilt in
-# loop otherwise.
-# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
-# how amversion.m4 appears in our dependencies.
-$(top_srcdir)/m4/amversion.m4: $(top_srcdir)/configure.ac 
$(srcdir)/amversion.in
-       $(AM_V_at)sed \
-           -e 's,address@hidden@],$(VERSION),g' \
-           -e 's,address@hidden@],$(APIVERSION),g' \
-           -e "s,address@hidden@],Generated from amversion.in; do not edit by 
hand.,g" \
-           $(srcdir)/amversion.in > address@hidden
-       @$(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
diff --git a/m4/acdir/README b/m4/acdir/README
new file mode 100644
index 0000000..c2bf903
--- /dev/null
+++ b/m4/acdir/README
@@ -0,0 +1,9 @@
+This directory is where .m4 files providing third-party autoconf
+macros can be placed to be automatically found by the aclocal(1)
+program.
+
+The .m4 files placed here could be shared among different versions
+of aclocal, so be careful.
+
+Even no actual .m4 files are present, this directory is required
+in order for aclocal to work properly.  Please do not remove it.
diff --git a/m4/acdir/dirlist b/m4/acdir/dirlist
deleted file mode 100644
index 82339e4..0000000
--- a/m4/acdir/dirlist
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is used by the testsuite (dirlist*.test)
-# it should not be installed
-./dirlist-test
-./dirlist2*-test
diff --git a/m4/amversion.in b/m4/amversion.in
index 61a86ab..e44ace1 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,13 +1,12 @@
 ##                                                          -*- Autoconf -*-
 ## @configure_input@
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 8
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 5f1f2b7..f6ed132 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,13 +1,12 @@
 ##                                                          -*- Autoconf -*-
 ## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 8
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
@@ -15,10 +14,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.0a], [],
+m4_if([$1], [1.12.0a], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -34,7 +33,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.0a])dnl
+[AM_AUTOMAKE_VERSION([1.12.0a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4
index e45c558..470def4 100644
--- a/m4/ar-lib.m4
+++ b/m4/ar-lib.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/as.m4 b/m4/as.m4
index cc8bf47..fa6d3c8 100644
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -1,6 +1,6 @@
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 4b810b0..3dda02b 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -1,16 +1,16 @@
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -29,7 +29,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
index ec1541e..d57f055 100644
--- a/m4/ccstdc.m4
+++ b/m4/ccstdc.m4
@@ -3,22 +3,21 @@
 ## From Franc,ois Pinard                     ##
 ## ----------------------------------------- ##
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # This was merged into AC_PROG_CC in Autoconf.
 
 AU_DEFUN([AM_PROG_CC_STDC],
 [AC_PROG_CC
 AC_DIAGNOSE([obsolete], [$0:
-       your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
-       `ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
+       your code should no longer depend upon 'am_cv_prog_cc_stdc', but upon
+       'ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
        you adjust the code.  You can also remove the above call to
        AC_PROG_CC if you already called it elsewhere.])
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
diff --git a/m4/cond-if.m4 b/m4/cond-if.m4
index 3a25e32..80e687b 100644
--- a/m4/cond-if.m4
+++ b/m4/cond-if.m4
@@ -1,6 +1,6 @@
 # AM_COND_IF                                            -*- Autoconf -*-
 
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond.m4 b/m4/cond.m4
index fd248b2..03644ab 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -1,21 +1,20 @@
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
diff --git a/m4/depend.m4 b/m4/depend.m4
index 359c349..8d7adf6 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,14 +1,13 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 16
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -31,12 +30,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -44,8 +43,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -85,16 +84,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -103,8 +102,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
        continue
       else
@@ -112,7 +111,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -160,7 +159,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -170,9 +169,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
diff --git a/m4/depout.m4 b/m4/depout.m4
index 80a3926..749e592 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,13 +1,12 @@
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
+# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -26,7 +25,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -38,21 +37,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
     test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -70,7 +67,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index aea5f9d..be1a5b3 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -3,28 +3,28 @@
 ## From Franc,ois Pinard               ##
 ## ----------------------------------- ##
 
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 AC_DEFUN([AM_WITH_DMALLOC],
 [AC_MSG_CHECKING([if malloc debugging is wanted])
-AC_ARG_WITH(dmalloc,
-[  --with-dmalloc          use dmalloc, as in http://www.dmalloc.com],
+AC_ARG_WITH([dmalloc],
+[AS_HELP_STRING([--with-dmalloc],
+                [use dmalloc, as in http://www.dmalloc.com])],
 [if test "$withval" = yes; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(WITH_DMALLOC,1,
+  AC_MSG_RESULT([yes])
+  AC_DEFINE([WITH_DMALLOC], [1],
            [Define if using the dmalloc debugging malloc package])
   LIBS="$LIBS -ldmalloc"
   LDFLAGS="$LDFLAGS -g"
 else
-  AC_MSG_RESULT(no)
-fi], [AC_MSG_RESULT(no)])
+  AC_MSG_RESULT([no])
+fi], [AC_MSG_RESULT([no])])
 ])
 
 AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index 49dbe1f..e7cdd69 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,21 +1,20 @@
 # Check for Java compiler.                                  -*- Autoconf -*-
 # For now we only handle the GNU compiler.
 
-# Copyright (C) 1999, 2000, 2003, 2005, 2009, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 8
 
-AC_DEFUN([AM_PROG_GCJ],[
-AC_CHECK_TOOLS(GCJ, gcj, gcj)
+AC_DEFUN([AM_PROG_GCJ],
+[AC_CHECK_TOOLS([GCJ], [gcj], [gcj])
 test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
 if test "x${GCJFLAGS-unset}" = xunset; then
    GCJFLAGS="-g -O2"
 fi
-AC_SUBST(GCJFLAGS)
+AC_SUBST([GCJFLAGS])
 _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)])
 ])
diff --git a/m4/header.m4 b/m4/header.m4
index c328ceb..2555b96 100644
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -1,6 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/init.m4 b/m4/init.m4
index 365c9ac..6a69244 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,13 +1,12 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
+# serial 18
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -58,23 +57,25 @@ m4_ifval([$2],
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -88,28 +89,28 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
                             [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                 [_AM_DEPENDENCIES(CC)],
+                 [_AM_DEPENDENCIES([CC])],
                  [define([AC_PROG_CC],
-                         defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+                         defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                 [_AM_DEPENDENCIES(CXX)],
+                 [_AM_DEPENDENCIES([CXX])],
                  [define([AC_PROG_CXX],
-                         defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+                         defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                 [_AM_DEPENDENCIES(OBJC)],
+                 [_AM_DEPENDENCIES([OBJC])],
                  [define([AC_PROG_OBJC],
-                         defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+                         defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
 ])
 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
 dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index 20d71c6..8061e7e 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -1,12 +1,11 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 8
 
 # AM_PROG_INSTALL_SH
 # ------------------
@@ -21,4 +20,4 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
index d83bfa0..8a86805 100644
--- a/m4/lead-dot.m4
+++ b/m4/lead-dot.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lex.m4 b/m4/lex.m4
index 022f6a8..4cda8a9 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -1,20 +1,19 @@
 ## Replacement for AC_PROG_LEX.                            -*-  Autoconf -*-
 ## by Alexandre Oliva <address@hidden>
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 # AM_PROG_LEX
 # -----------
 # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
 # "missing" invocation, for better error output.
 AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
+[AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
 AC_REQUIRE([AC_PROG_LEX])dnl
 if test "$LEX" = :; then
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 62c2daf..2dd6a0f 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -3,14 +3,13 @@
 ## From Ulrich Drepper
 ## Almost entirely rewritten by Alexandre Oliva
 ## ------------------------
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006  Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 11
 
 # AM_PATH_LISPDIR
 # ---------------
@@ -23,7 +22,8 @@ AC_DEFUN([AM_PATH_LISPDIR],
  AC_ARG_VAR([EMACS], [the Emacs editor command])
  AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path])
  AC_ARG_WITH([lispdir],
- [  --with-lispdir          override the default lisp directory],
+ [AS_HELP_STRING([--with-lispdir],
+                 [override the default lisp directory])],
  [ lispdir="$withval"
    AC_MSG_CHECKING([where .elc files should go])
    AC_MSG_RESULT([$lispdir])],
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index 085e96c..a8f39a3 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -1,20 +1,19 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 7
 
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -25,10 +24,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules 
and dependencies not useful
-                         (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
diff --git a/m4/make.m4 b/m4/make.m4
index 68d15b9..c4ba1a6 100644
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -1,12 +1,12 @@
 # Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -25,7 +25,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
diff --git a/m4/minuso.m4 b/m4/minuso.m4
index d8b1620..7787ddf 100644
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -1,6 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/missing.m4 b/m4/missing.m4
index 136399c..e124803 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -1,13 +1,12 @@
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 7
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -37,6 +36,6 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 152d7fb..2d88b92 100644
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -1,16 +1,15 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
diff --git a/m4/multi.m4 b/m4/multi.m4
deleted file mode 100644
index 447591f..0000000
--- a/m4/multi.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2012
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR])
-# ---------------------------------------------------
-# Add --enable-multilib to configure.
-AC_DEFUN([AM_ENABLE_MULTILIB],
-[m4_warn([obsolete], [$0 will be removed from Automake core soon.
-Files implementing the "multilib" feature are (and will remain) available
-to the 'contrib/' directory in the Automake distribution.])]dnl
-[# Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib       build many library versions (default)],
-[case "$enableval" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
- esac],
-             [multilib=yes])
-
-# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
-# See config-ml.in if you want the gory details.
-
-if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
-    multi_basedir="$srcdir/$with_multisrctop../$2"
-  else
-    multi_basedir="$srcdir/$with_multisrctop$2"
-  fi
-else
-  multi_basedir="$srcdir/$2"
-fi
-AC_SUBST(multi_basedir)
-
-# Even if the default multilib is not a cross compilation,
-# it may be that some of the other multilibs are.
-if test $cross_compiling = no && test $multilib = yes \
-   && test "x${with_multisubdir}" != x ; then
-   cross_compiling=maybe
-fi
-
-AC_OUTPUT_COMMANDS([
-# Only add multilib support code if we just rebuilt the top-level
-# Makefile.
-case " $CONFIG_FILES " in
- *" ]m4_default([$1],Makefile)[ "*)
-   ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in
-   ;;
-esac],
-                  [
-srcdir="$srcdir"
-host="$host"
-target="$target"
-with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
-with_target_subdir="$with_target_subdir"
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-multi_basedir="$multi_basedir"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"])])dnl
diff --git a/m4/obsol-gt.m4 b/m4/obsol-gt.m4
index d380c6d..bd2400d 100644
--- a/m4/obsol-gt.m4
+++ b/m4/obsol-gt.m4
@@ -1,6 +1,6 @@
 # Support for obsolete Gettext macro.                       -*- Autoconf -*-
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsol-lt.m4 b/m4/obsol-lt.m4
index 12c4d7d..af8fb1b 100644
--- a/m4/obsol-lt.m4
+++ b/m4/obsol-lt.m4
@@ -1,6 +1,6 @@
 # Support for obsolete Libtool macro.                       -*- Autoconf -*-
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
index bad1db7..9a26cac 100644
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/options.m4 b/m4/options.m4
index 6824d84..76ad642 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -1,13 +1,12 @@
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -18,7 +17,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
diff --git a/m4/protos.m4 b/m4/protos.m4
index f710293..942154b 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -1,31 +1,15 @@
-## ------------------------------- ##                       -*- Autoconf -*-
-## Check for function prototypes.  ##
-## From Franc,ois Pinard           ##
-## ------------------------------- ##
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
-# Free Software Foundation, Inc.
+#  -*- Autoconf -*-
+# Obsolete (and now removed) automatic de-ANSI-fiction support.
+#
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 AC_DEFUN([AM_C_PROTOTYPES],
-[AC_REQUIRE([AC_C_PROTOTYPES])
-AC_DIAGNOSE([obsolete],
-            [$0: automatic de-ANSI-fication support is deprecated])
-if test "$ac_cv_prog_cc_stdc" != no; then
-  U= ANSI2KNR=
-else
-  U=_ ANSI2KNR=./ansi2knr
-fi
-# Ensure some checks needed by ansi2knr itself.
-AC_REQUIRE([AC_HEADER_STDC])
-AC_CHECK_HEADERS([string.h])
-AC_SUBST([U])dnl
-AC_SUBST([ANSI2KNR])dnl
-_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
-])
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
 
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/m4/python.m4 b/m4/python.m4
index ee3eb95..3548886 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,14 +3,13 @@
 ## From Andrew Dalke
 ## Updated by James Henstridge
 ## ------------------------
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 9
 
 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # ---------------------------------------------------------------------------
@@ -55,10 +54,11 @@ AC_DEFUN([AM_PATH_PYTHON],
     dnl A version check is needed.
     if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
+      AC_MSG_CHECKING([whether $PYTHON version is >= $1])
       AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-                             [AC_MSG_RESULT(yes)],
-                             [AC_MSG_ERROR(too old)])
+                             [AC_MSG_RESULT([yes])],
+                             [AC_MSG_RESULT([no])
+                              AC_MSG_ERROR([Python interpreter is too old])])
       am_display_PYTHON=$PYTHON
     else
       # Otherwise, try each interpreter until we find one that satisfies
diff --git a/m4/regex.m4 b/m4/regex.m4
deleted file mode 100644
index 9355840..0000000
--- a/m4/regex.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-## --------------------------------- ##                     -*- Autoconf -*-
-## Check if --with-regex was given.  ##
-## --------------------------------- ##
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# AM_WITH_REGEX
-# -------------
-#
-# THIS MACRO IS OBSOLETE now, since rx doesn't seem to be maintained,
-# while regex is.  This macro should be removed in the next major
-# automake version (1.12).
-#
-# The idea is to distribute rx.[hc] and regex.[hc] together, for a
-# while.  The WITH_REGEX symbol is used to decide which of regex.h or
-# rx.h should be included in the application.  If `./configure
-# --with-regex' is given (the default), the package will use gawk's
-# regex.  If `./configure --without-regex', a check is made to see if
-# rx is already installed, as with newer Linux'es.  If not found, the
-# package will use the rx from the distribution.  If found, the
-# package will use the system's rx which, on Linux at least, will
-# result in a smaller executable file.
-#
-AC_DEFUN([AM_WITH_REGEX],
-[AC_PREREQ(2.50)dnl
-m4_warn([obsolete], [$0 is obsolete, since GNU rx is unmantained now])dnl
-AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
-AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
-AC_ARG_WITH([regex],
-[  --without-regex         use GNU rx in lieu of gawk's regex for matching],
-           [test "$withval" = yes && am_with_regex=1],
-           [am_with_regex=1])
-if test -n "$am_with_regex"; then
-  AC_MSG_RESULT([regex])
-  AC_DEFINE([WITH_REGEX], 1, [Define if using GNU regex])
-  AC_CACHE_CHECK([for GNU regex in libc], [am_cv_gnu_regex],
-    [AC_TRY_LINK([],
-                [extern int re_max_failures; re_max_failures = 1],
-                [am_cv_gnu_regex=yes],
-                [am_cv_gnu_regex=no])])
-  if test $am_cv_gnu_regex = no; then
-    AC_LIBOBJ([regex])
-  fi
-else
-  AC_MSG_RESULT([rx])
-  AC_CHECK_FUNC([re_rx_search], , [AC_LIBOBJ([rx])])
-fi[]dnl
-])
-
-AU_DEFUN([fp_WITH_REGEX], [AM_WITH_REGEX])
diff --git a/m4/runlog.m4 b/m4/runlog.m4
index 0bfd30d..6d127a8 100644
--- a/m4/runlog.m4
+++ b/m4/runlog.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index db87c8b..c90bc98 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,13 +1,12 @@
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 9
 
 # AM_SANITY_CHECK
 # ---------------
@@ -23,23 +22,23 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
+   am_has_slept=no
    for am_try in 1 2; do
-     echo timestamp > conftest.file
+     echo "timestamp, slept: $am_has_slept" > conftest.file
      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
      if test "$[*]" = "X"; then
        # -L didn't work.
        set X `ls -t "$srcdir/configure" conftest.file`
      fi
-     rm -f conftest.file
      if test "$[*]" != "X $srcdir/configure conftest.file" \
        && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
@@ -55,6 +54,7 @@ if (
      fi
      # Just in case.
      sleep 1
+     am_has_slept=yes
    done
    test "$[2]" = conftest.file
    )
@@ -65,4 +65,20 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
diff --git a/m4/silent.m4 b/m4/silent.m4
index 8bd931b..d499ecb 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,27 +1,32 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -39,7 +44,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
diff --git a/m4/strip.m4 b/m4/strip.m4
index e73f607..42833ca 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -1,28 +1,28 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index a4cbdf5..64d91ff 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tar.m4 b/m4/tar.m4
index 0683951..244c729 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -1,17 +1,17 @@
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -34,7 +34,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
 # Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
+# Solaris sh will not grok spaces in the rhs of '-'.
 for _am_tool in $_am_tools
 do
   case $_am_tool in
diff --git a/m4/upc.m4 b/m4/upc.m4
index 23a8c0b..9ba1025 100644
--- a/m4/upc.m4
+++ b/m4/upc.m4
@@ -1,6 +1,6 @@
 # Find a compiler for Unified Parallel C.                  -*- Autoconf -*-
 
-# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/m4/vala.m4 b/m4/vala.m4
index d95734a..cc6ba53 100644
--- a/m4/vala.m4
+++ b/m4/vala.m4
@@ -1,14 +1,14 @@
 # Autoconf support for the Vala compiler
 
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
-# Check whether the Vala compiler exists in `PATH'. If it is found, the
+# Check whether the Vala compiler exists in $PATH. If it is found, the
 # variable VALAC is set. Optionally a minimum release number of the
 # compiler can be requested.
 #
@@ -25,5 +25,5 @@ AC_DEFUN([AM_PROG_VALAC],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Vala $1 not found.])])])])
+          AC_MSG_ERROR([Vala $1 not found.], [77])])])])
 ])
diff --git a/old/ChangeLog-tests b/old/ChangeLog-tests
new file mode 100644
index 0000000..8464944
--- /dev/null
+++ b/old/ChangeLog-tests
@@ -0,0 +1,1448 @@
+2001-02-07  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Removed remake3.test,
+       distcommon.test.
+
+       * Makefile.am (XFAIL_TESTS): Added new files.
+
+       * remake3.test: New file.
+       * Makefile.am (TESTS): Added new file.
+
+       * distcommon.test: New file.
+       * Makefile.am (TESTS): Added new file.
+
+2001-02-04  Tom Tromey  <address@hidden>
+
+       * exsource.test: Updated for new include code.
+
+2001-02-03  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Removed colon7.test.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * check.test: New.
+
+2001-01-28  Tom Tromey  <address@hidden>
+
+       * listval.test: New file.
+       * Makefile.am (TESTS): Added listval.test.
+
+2001-01-26  Tom Tromey  <address@hidden>
+
+       * makevars.test: Fail if automake fails.
+
+2001-01-26  Pavel Roskin  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Added colon7.test.
+
+2001-01-26  Akim Demaille  <address@hidden>
+
+       * vtexi.test (info_TEXINFOS): Check that the path to mdate-sh is
+       already correct.
+
+       * defs (AUTOCONF, has_autoconf, needs_autoconf): New.
+       * ansi3.test, cond9.test, depacl2.test, install2.test, pr19.test,
+       * pr87.test, pr9.test, subobj3.test, target-cflags.test: Use them.
+
+2001-01-25  Pavel Roskin  <address@hidden>
+
+       * makevars.test: Disable shell tracing.
+
+2001-01-25  Akim Demaille  <address@hidden>
+
+       * makevars.test: New.
+
+2001-01-24  Akim Demaille  <address@hidden>
+
+       * vtexi.test (info_TEXINFOS): Escape a $ in egrep pattern.
+
+2001-01-23  Akim Demaille  <address@hidden>
+
+       * vtexi.test: Also check that stamp-vti properly depends upon
+       configure.in and the Texinfo source file.
+
+2001-01-21  Kevin Ryde <address@hidden>
+
+       * colon7.test: Grep for a couple of AC_OUTPUT problems.
+
+2001-01-15  Tom Tromey  <address@hidden>
+
+       * subdir3.test: Allow any number of dependencies.
+
+       * subobj4.test: Fixed test case.
+
+       * amassign.test: New file.
+       * Makefile.am (TESTS): Added new file.
+
+2001-01-12  Tom Tromey  <address@hidden>
+
+       * subobj4.test: New file.
+       * Makefile.am (TESTS): Added subobj4.test.
+
+       * cxxansi.test: New file.
+       * Makefile.am (TESTS): Added cxxansi.test.
+
+2000-12-21  Tom Tromey  <address@hidden>
+
+       * vtexi.test: Fixed to reflect new rules.
+
+2000-12-17  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Don't mention ldflags.test.
+
+2000-11-25  Tom Tromey  <address@hidden>
+
+       * space.test: New file.
+       * Makefile.am (TESTS): Added space.test.
+
+2000-11-23  Pavel Roskin  <address@hidden>
+
+       * pr87.test: Prevent automake from looking into .. and ../..
+       by using AC_CONFIG_AUX_DIR(.) in configure.in.
+
+2000-11-23  Tom Tromey  <address@hidden>
+
+       * pr87.test: New file.  From PR automake/87.
+       * Makefile.am (TESTS): Added pr87.test.
+
+2000-10-17  Pavel Roskin  <address@hidden>
+
+       * Makefile.am (TESTS): Added aclocali1.test.
+       * aclocali1.test: New file.
+
+2000-08-30  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Removed pr72.test.
+
+       For PR automake/72:
+       * Makefile.am (TESTS): Added pr72.test.
+       (XFAIL_TESTS): Likewise.
+       * pr72.test: New file.
+
+2000-08-28  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Added ldflags.test.
+
+2000-08-27  Tom Tromey  <address@hidden>
+
+       For PR automake/75:
+       * Makefile.am (TESTS): Added fortdep.test.
+       * fortdep.test: New file.
+
+       For PR automake/68:
+       * Makefile.am (TESTS): Added header.test.
+       * header.test: New file.
+
+2000-08-26  Tom Tromey  <address@hidden>
+
+       For PR automake/73:
+       * Makefile.am (TESTS): Added instman2.test.
+       * instman2.test: New file.
+
+       For PR automake/77:
+       * Makefile.am (TESTS): Added ldflags.test.
+       * ldflags.test: New file.
+
+2000-08-06  Jim Meyering  <address@hidden>
+
+       * Makefile.am (TESTS): Add subdir4.test.
+       * subdir4.test: New test for the just-fixed depcomp failure.
+
+2000-08-02  Akim Demaille  <address@hidden>
+
+       * depacl.test: Weaken the regexp looking for AM_PROG_CC_C_STDC in
+       aclocal.m4.
+
+2000-05-01  Pavel Roskin  <address@hidden>
+
+       * install2.test: Prevent automake from looking into .. and ../..
+       by using AC_CONFIG_AUX_DIR(.) in configure.in
+       * pr19.test: Likewise
+       * subobj3.test: Likewise
+
+2000-03-19  Tom Tromey  <address@hidden>
+
+       * libobj2.test: Put depcomp into subdir.
+       * confsub.test: Put depcomp into subdir.
+       * defs: Always copy `depcomp'.
+
+       * defs: Correctly create `depcomp'.
+       * nodepcomp.test: Remove depcomp.
+
+       More for PR automake/38:
+       * symlink3.test: New file.
+       * Makefile.am (TESTS): Added symlink3.test.
+
+       For PR automake/38:
+       * symlink2.test: New file.
+       * Makefile.am (TESTS): Added symlink2.test.
+
+       For PR automake/45:
+       * defs, acoutnoq.test, texinfo8.test, tagsub.test, subdir2.test,
+       subdir.test, scripts.test, remake2.test, remake.test, pr2.test,
+       parse.test, output4.test, output3.test, output2.test, output.test,
+       libobj10.test, libobj9.test, libobj8.test, libobj7.test,
+       libobj6.test, libobj2.test, libobj.test, fpinstall.test,
+       fpinst2.test, depend3.test, confsub.test, config.test,
+       confh4.test, confh3.test, confh2.test, confh.test, conf2.test,
+       colon7.test, colon6.test, colon5.test, colon4.test, colon3.test,
+       colon2.test, colon.test, acouttbs.test, acoutqnl.test,
+       acoutput.test: Put AM_INIT_AUTOMAKE into configure.in.
+
+       * install2.test: Expect a `dist' failure.
+
+2000-03-19  Tom Tromey  <address@hidden>
+
+       * nodepcomp.test: New file.
+       * Makefile.am (TESTS): Added nodepcomp.test.
+
+2000-02-02  Assar Westerlund  <address@hidden>
+
+       * target-cflags.test: new test case to target-specific CFLAGS
+
+2000-01-08  Tom Tromey  <address@hidden>
+
+       * ansi.test, texinfo.test, empty.test, insh2.test, texinfo8.test:
+       Remove @SET_MAKE@ before using Makefile.
+       * backsl2.test: Don't add AC_PROG_MAKE_SET in configure.in;
+       already done.
+       * defs: Put AC_PROG_MAKE_SET in configure.in.
+       * acoutnoq.test, acoutput.test, acoutqnl.test, acouttbs.test,
+       acouttbs2.test, colon.test, colon2.test, colon3.test, colon4.test,
+       colon5.test, colon6.test, colon7.test, conf2.test, confh.test,
+       confh2.test, confh3.test, confh4.test, config.test, depend3.test,
+       discover.test, fpinst2.test, gnits.test, ldadd.test, libobj.test,
+       libobj10.test, libobj2.test, libobj6.test, libobj7.test,
+       libobj8.test, libobj9.test, output.test, output2.test,
+       output3.test, output4.test, output5.test, package.test,
+       parse.test, pr2.test, remake.test, remake2.test, scripts.test,
+       stamph.test, texinfo8.test: Likewise.
+
+1999-12-26  Tom Tromey  <address@hidden>
+
+       * subobj3.test: Remove depcomp.
+       * pr9.test: Remove depcomp.
+       Remove opportunistic check.
+       * pr19.test: Remove depcomp.
+
+1999-12-25  Tom Tromey  <address@hidden>
+
+       * suffix2.test: Create config.guess and config.sub so user doesn't
+       need libtoolize.  From Klaus Reichl.
+
+1999-12-19  Tom Tromey  <address@hidden>
+
+       Test for PR automake/9:
+       * pr9.test: New file.
+       * Makefile.am (TESTS): Added pr9.test.
+
+       * pr19.test: Fail gracefully if gzip missing.
+       * install2.test: Fail gracefully if gzip missing.
+
+1999-12-19  Pavel Roskin  <address@hidden>
+
+       * tests/defs: add all permissions to testSubDir before
+       removing it.
+
+1999-12-19  Tom Tromey  <address@hidden>
+
+       * pr2.test: Use egrep, not grep.
+
+       Test for PR automake/2:
+       * pr2.test: New file.
+       * Makefile.am (TESTS): Added pr2.test.
+
+1999-12-15  Tom Tromey  <address@hidden>
+
+       * dup3.test: New file.
+       * Makefile.am (TESTS): Added dup3.test.
+
+1999-12-13  Tom Tromey  <address@hidden>
+
+       * pr19.test: New file.  For PR automake/19.
+       * Makefile.am (TESTS): Added pr19.test.
+
+       * lex4.test: New file.  For PR automake/6.
+       * Makefile.am (TESTS): Added lex4.test.
+
+       * suffix3.test: New file.
+       * Makefile.am (TESTS): Added suffix3.test.
+
+       * suffix2.test: Added `no-dependencies' to options in
+       Makefile.am.  Removed trailing `exit 1'.
+
+       * nostdinc.test: New file.
+       * Makefile.am (TESTS): Added nostdinc.test.
+
+       * condincl2.test: New file.
+       * condincl.test: New file.
+       * Makefile.am (TESTS): Added condincl.test, condincl2.test.
+
+       * suffix2.test: New file.
+       * Makefile.am (TESTS): Added suffix2.test.
+
+       * subobj.test: Remove final test.
+
+1999-12-12  Tom Tromey  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): Removed subobj3.test.
+
+1999-12-10  Tom Tromey  <address@hidden>
+
+       * install2.test: New file.
+       * Makefile.am (TESTS): Added install2.test.
+
+       * specflags5.test: New file.
+       * Makefile.am (TESTS): Added specflags5.test.
+
+1999-12-06  Tom Tromey  <address@hidden>
+
+       * confh4.test: Corrected final test.
+
+       * confh4.test: New file.  PR automake/34.
+       * Makefile.am (TESTS): Mention confh4.test.
+
+1999-11-22  Tom Tromey  <address@hidden>
+
+       * defs: Never hard link `depcomp'.  From Pavel Roskin
+
+       * exsource.test: Don't use configure substitution in _SOURCES.
+       * depend.test: Don't use configure substitution in _SOURCES.
+       * cygwin32.test: Don't use configure substitution in _SOURCES.
+
+       * subobj.test: Check for another bug.
+
+       * Makefile.am (XFAIL_TESTS): Removed sourcesub.test,
+       ltlibobjs.test.
+
+1999-11-21  Tom Tromey  <address@hidden>
+
+       * specflags3.test: Updated test for new dependency
+       implementation.
+
+1999-10-02  Alexandre Oliva  <address@hidden>
+
+       * defs: Set CDPATH to avoid verbose cd.
+
+1999-09-14  Alexandre Oliva  <address@hidden>
+
+       * defs: Avoid printing the full pathname of testSubDir.
+
+       * exsource.test: Update.
+
+1999-06-01  Alexandre Oliva  <address@hidden>
+
+       * exsource.test: sed @AMDEP@ away from `include' line.
+
+       * compile_f_c_cxx.test: depcomp is no longer in the same line.
+
+1999-04-25  Alexandre Oliva  <address@hidden>
+
+       * compile_f_c_cxx.test: Look for $(depcomp) for C and C++.
+       * suffix.test: We no longer emit % rules.
+
+1999-04-10  Alexandre Oliva  <address@hidden>
+
+       * defs: Create link or copy of depcomp.
+       * depend2.test: Removed, no more disted dependencies.
+       * Makefile.am (TESTS): Likewise.
+       * exsource.test: Adjust dependency filenames.
+       * mdate3.test: Adjust for depcomp.
+
+1999-11-07  Tom Tromey  <address@hidden>
+
+       * dash.test: New file.
+       * Makefile.am (TESTS): Added dash.test.
+
+1999-08-26  Tom Tromey  <address@hidden>
+
+       * texinfo8.test: Use directory named `sub'.
+
+       * symlink.test: Use directory named `sub' (just in case; for
+       Windows).
+
+1999-08-15  Tom Tromey  <address@hidden>
+
+       * ansi4.test: New file.
+       * Makefile.am (TESTS): Added ansi4.test.
+
+1999-07-30  Tom Tromey  <address@hidden>
+
+       * double.test (bin_PROGRAMS): New file.
+       * Makefile.am (TESTS): Added double.test.
+
+1999-07-27  Tom Tromey  <address@hidden>
+
+       * empty4.test: New file.
+       * Makefile.am (TESTS): Added empty4.test.
+
+1999-07-13  Tom Tromey  <address@hidden>
+
+       * empty3.test: New file.
+       * Makefile.am (TESTS): Added empty3.test.
+
+       * empty2.test: Also look for `pavel.o'.
+
+       * empty2.test: New file.
+       * Makefile.am (TESTS): Added empty2.test.
+
+1999-05-27  Tom Tromey  <address@hidden>
+
+       * subobj3.test: New file.
+       * Makefile.am (TESTS): Added subobj3.test.
+       (XFAIL_TESTS): Likewise.
+
+       * ltlibobjs.test: New file.
+       * Makefile.am (TESTS): Added ltlibobjs.test.
+       (XFAIL_TESTS): Added ltlibobjs.test.
+
+       * Makefile.am (XFAIL_TESTS): Added sourcesub.test.
+
+1999-05-19  Tom Tromey  <address@hidden>
+
+       * specflags4.test: Typo fix.
+
+       * specflags4.test: New file.  From Pavel Roskin.
+       * Makefile.am (TESTS): Added specflags4.test.
+
+       * specflags.test: Added regression test for missing space.
+
+1999-05-13  Tom Tromey  <address@hidden>
+
+       * sourcesub.test: New file.
+       * Makefile.am (TESTS): Added sourcesub.test.
+
+1999-05-01  Tom Tromey  <address@hidden>
+
+       * libobj2.test: Reverted previous change; it is incorrect.
+
+       * libobj2.test: Error if libtu.a.P is mentioned.
+
+1999-04-27  Tom Tromey  <address@hidden>
+
+       * cond9.test: New file.  From Raja R Harinath.
+       * Makefile.am (TESTS): Added cond9.test.
+
+       * pluseq8.test: New file.
+       * Makefile.am (TESTS): Added pluseq8.test.
+
+       * canon5.test: Updated to reflect change to MACRO_PATTERN.
+
+       * specflags3.test: New file.
+       * Makefile.am (TESTS): Added specflags3.test.
+       (TESTS): Now lists one file per line, for simpler maintenance.
+
+       * specflags2.test: New file.
+       * specflags.test: New file.
+       * Makefile.am (TESTS): Added specflags.test, specflags2.test.
+
+1999-04-27  Alexandre Oliva  <address@hidden>
+
+       * canon5.test (bin_PROGRAMS): New file.
+       * Makefile.am (TESTS): Added canon5.test.
+
+1999-04-20  Alexandre Oliva  <address@hidden>
+
+       * libobj10.test: New file.
+       * Makefile.am (TESTS): Added libobj10.test.
+
+1999-04-11  Tom Tromey  <address@hidden>
+
+       * subobj2.test: New file.
+       * Makefile.am (TESTS): Added subobj2.test.
+
+       * subobj.test: New file.
+       * Makefile.am (TESTS): Added subobj.test.
+
+       * confh.test: Use `sed' to extract full definition of
+       DIST_COMMON.  Look for stamp-h.in rule in include/Makefile.in.
+       * Makefile.am (XFAIL_TESTS): Removed confh.test.
+
+1999-04-10  Tom Tromey  <address@hidden>
+
+       * defs: Ensure srcdir is always absolute.
+
+       * Makefile.am (XFAIL_TESTS): Removed cond8.test.
+
+       * gcj2.test: New file.
+       * Makefile.am (TESTS): Added gcj2.test.
+
+1999-04-10  Alexandre Oliva  <address@hidden>
+
+       * suffix.test: New file.
+       * Makefile.am: Added suffix.test.
+
+       * Makefile.am (XFAIL_TESTS): Added cond8.test.
+
+       * cond3.test: Refer to am_targ_OBJECTS.
+
+       * yacc2.test, yacc3.test: New files.
+       * Makefile.am (TESTS): Added yacc2.test and yacc3.test.
+
+1999-04-09  Tom Tromey  <address@hidden>
+
+       * nodist.test: New file.
+       * Makefile.am (TESTS): Added nodist.test.
+
+       * gcj.test: New file.
+       * Makefile.am (TESTS): Added gcj.test.
+
+1999-04-08  Tom Tromey  <address@hidden>
+
+       * cond8.test: New file.
+       * Makefile.am (TESTS): Added cond8.test.
+
+1999-04-07  Alexandre Oliva  <address@hidden>
+
+       * backsl2.test: New file.
+       * Makefile.am (TESTS): Added backsl2.test.
+
+       * texinfo8.test: texinfo.tex is only disted by aux/Makefile.
+
+       * texinfo8.test: New file.
+       * Makefile.am (TESTS): Added texinfo8.test.
+
+1999-03-31  Tom Tromey  <address@hidden>
+
+       * pluseq2.test, pluseq3.test: Updated for recent \-preservation
+       change.
+
+1999-03-31  Alexandre Oliva  <address@hidden>
+
+       * Makefile.am (XFAIL_TESTS): add confh.test
+
+1999-03-30  Tom Tromey  <address@hidden>
+
+       * mclean.test: Fixed typo.
+
+       * mclean.test: New file.
+       * Makefile.am (TESTS): Added mclean.test.
+
+1999-03-30  Alexandre Oliva  <address@hidden>
+
+       * confh.test: if include/Makefile.am is created, the test fails
+
+1999-03-27  Tom Tromey  <address@hidden>
+
+       * extra4.test: Allow EXTRA_DATA to be specified.
+
+1999-03-22  Tom Tromey  <address@hidden>
+
+       * ldadd.test: Use AC_PROG_LIBTOOL, not AM_PROG_LIBTOOL.
+
+       * pluseq7.test: New file.
+       * Makefile.am (TESTS): Added pluseq7.test.
+       * pluseq6.test: New file.
+       * Makefile.am (TESTS): Added pluseq6.test.
+
+1999-03-21  Tom Tromey  <address@hidden>
+
+       * nodep.test: New file.
+       * Makefile.am (TESTS): Added nodep.test.
+
+       * subdir3.test: Correctly mention _SOURCES in Makefile.am.
+
+       * subdir3.test: New file.
+       * Makefile.am (TESTS): Added subdir3.test.
+       * xsource.test: Changed to check whether multiple source files
+       with same object name cause failure.
+
+1999-03-11  Tom Tromey  <address@hidden>
+
+       * libobj9.test: New file.
+       * Makefile.am (TESTS): Added libobj9.test.
+
+       * insthook.test: Don't require GNU grep.  From John Pierce.
+
+       * lex3.test: New file.
+       * Makefile.am (TESTS): Added lex3.test.
+
+1999-03-01  Tom Tromey  <address@hidden>
+
+       * ansi3.test: Use no-dependencies option to avoid GNU make
+       requirement.  From Jerome Lovy.
+
+1999-02-27  Tom Tromey  <address@hidden>
+
+       * ext.test (foo_SOURCES): New file.
+       * Makefile.am (TESTS): Added ext.test.
+
+1999-02-11  Tom Tromey  <address@hidden>
+
+       * cygwin32.test: Use AC_EXEEXT, not AM_EXEEXT.
+
+       * obsolete2.test: New file.
+       * Makefile.am (TESTS): Added obsolete2.test.
+
+1999-02-01  Tom Tromey  <address@hidden>
+
+       * installsh.test (AUTOMAKE): Use $PERL.  From Pavel Roskin.
+
+       * cond5.test: Sleep 15 seconds, not 5.  Some people still run the
+       test on slow machines.
+
+1999-01-22  Tom Tromey  <address@hidden>
+
+       * copy.test: New file.
+       * Makefile.am (TESTS): Added copy.test.
+
+       * ppf77.test: New file.
+       * Makefile.am (TESTS): Added ppf77.test.
+
+1999-01-14  Tom Tromey  <address@hidden>
+
+       * confh3.test: New file.
+       * Makefile.am (TESTS): Added confh3.test.
+
+       * confh2.test: New file.
+       * Makefile.am (TESTS): Added confh2.test.
+
+       * confh.test: Run automake differently the second time.
+
+       * mdate3.test: New file.
+       * Makefile.am (TESTS): Added mdate3.test.
+
+1999-01-11  Tom Tromey  <address@hidden>
+
+       * confh.test: New file.
+       * Makefile.am (TESTS): Added confh.test.
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * objc.test: Updated to account for new ObjC support.
+
+       * pluseq5.test: New file.
+       * Makefile.am (TESTS): Added pluseq5.test.
+
+       * all.test: Test all *-local targets, not just all-local.
+
+       * all.test: New file.
+       * Makefile.am (TESTS): Added all.test.
+
+1999-01-07  Tom Tromey  <address@hidden>
+
+       * include.test: New file.
+       * Makefile.am (TESTS): Added include.test.
+
+1998-12-21  Tom Tromey  <address@hidden>
+
+       * insthook.test: Updated to fail when it should.
+
+1998-12-11  Tom Tromey  <address@hidden>
+
+       * insthook.test: New file.
+       * Makefile.am (TESTS): Added insthook.test.
+
+1998-11-27  Tom Tromey  <address@hidden>
+
+       * cond7.test: New file.  From Pavel Roskin.
+       * Makefile.am (TESTS): New file.
+
+1998-11-10  Tom Tromey  <address@hidden>
+
+       * pluseq4.test: New file.
+       * Makefile.am (TESTS): Added pluseq4.test.
+
+1998-11-09  Tom Tromey  <address@hidden>
+
+       * pluseq3.test: New file.
+       * Makefile.am (TESTS): Added pluseq3.test.
+
+       * pluseq2.test: New file.
+       * Makefile.am (TESTS): Added pluseq2.test.
+
+1998-10-30  Tom Tromey  <address@hidden>
+
+       * pluseq.test: New file.
+       * Makefile.am (TESTS): Added pluseq.test.
+
+1998-10-28  Tom Tromey  <address@hidden>
+
+       * Makefile.am (distclean-local): Typo fix.
+
+1998-10-20  Tom Tromey  <address@hidden>
+
+       * Makefile.am (TESTS): Sorted tests.  From Jeff Garzik.
+
+1998-10-13  Tom Tromey  <address@hidden>
+
+       * libobj7.test: Updated to reflect minor change in automake (test
+       wasn't resilient enough).
+       * instman.test: Updated to reflect fact that mkinstalldirs will be
+       in distribution.
+
+       * cxxonly.test: Removed.
+
+Mon Aug 31 09:46:59 1998  Matthew D. Langston  <address@hidden>
+
+       * Makefile.am (TESTS): Added compile_f_c_cxx.test.
+       * compile_f_c_cxx.test: New file.
+
+Sat Aug 29 18:17:58 1998  Matthew D. Langston  <address@hidden>
+
+       * Makefile.am (TESTS): Added flink.test link_c_cxx.test
+       link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test.
+       Removed flink.test.
+       * flibs.test: New File.
+       * link_c_cxx.test: New file.
+       * link_f_c.test: New file.
+       * link_f_c_cxx.test: New file.
+       * link_f_cxx.test: New file.
+       * link_f_only.test: New file.
+
+Tue Aug 11 10:46:36 1998  Matthew D. Langston  <address@hidden>
+
+       * Makefile.am (TESTS): Add cxxonly.test, fonly.test, flink.test,
+       fnoc.test and fo.test.
+       * cxxonly.test: New file.
+       * fonly.test: New file.
+       * flink.test: New file.
+       * fnoc.test: New file.
+       * fo.test: New file.
+
+1998-10-08  Tom Tromey  <address@hidden>
+
+       * confdist.test: New file.
+       * Makefile.am (TESTS): Added confdist.test.
+
+1998-10-07  Tom Tromey  <address@hidden>
+
+       * extra4.test: New file.
+       * extra3.test: New file.
+       * Makefile.am (TESTS): Added extra3.test, extra4.test.
+
+Mon Oct  5 12:47:32 1998  Tom Tromey  <address@hidden>
+
+       * badline.test: New file.
+       * Makefile.am (TESTS): Added badline.test.
+
+Thu Oct  1 00:03:39 1998  Tom Tromey  <address@hidden>
+
+       * seenc.test: Updated test to account for removed line numbers.
+
+       * xsource.test: Correctly fail if source in subdir.
+
+Wed Sep 30 12:17:34 1998  Tom Tromey  <address@hidden>
+
+       * colon7.test: New file.
+       * Makefile.am (TESTS): Added colon7.test.
+
+Tue Sep 29 02:09:11 1998  Tom Tromey  <address@hidden>
+
+       * config.test: New file.
+       * Makefile.am (TESTS): Added config.test.
+
+       * Makefile.am (TESTS): Reference clean.test, not clean.am.
+
+Mon Sep 28 01:46:34 1998  Tom Tromey  <address@hidden>
+
+       * recurs2.test: New file, from Jim Meyering.
+       * Makefile.am (TESTS): Added recurs2.test.
+
+       * Makefile.am (TESTS): Added clean.am.
+       * clean.test: New file.
+       * ansi2.test: Updated test for new SUBDIRS change.
+       * noinst.test: Updated test for new SUBDIRS change.
+       * checkall.test: Added check to make sure check-local is handled.
+       Updated test for new SUBDIRS change.
+       * java.test: Updated test for new SUBDIRS change.
+
+Sun Sep 27 20:01:20 1998  Tom Tromey  <address@hidden>
+
+       * Makefile.am (TESTS): Added else.test.
+       * else.test: New file.
+
+       * Makefile.am (TESTS): Added parse.test.
+       * parse.test: New file.
+
+Sat Sep 26 19:17:43 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.test: Put AM_INIT_AUTOMAKE into configure.in.
+       * library.test: Use AC_EXEEXT.
+       * texinfo5.test: Use AC_EXEEXT.
+       * Many files: use AC_PROG_INSTALL, not AM_PROG_INSTALL.
+
+       Test suite updates for the @SHELL@ change:
+       * exsource.test: Set SHELL on `make' command line.
+       * ansi.test: Set SHELL on `make' command line.
+       * texinfo.test: Set SHELL on `make' command line.
+       * insh2.test: Set SHELL on `make' command line.
+       * empty.test: Rewrite @SHELL@ to /bin/sh.
+
+Tue Sep 22 01:20:00 1998  Tom Tromey  <address@hidden>
+
+       * ansi3.test: Use gcc and not gcc -traditional.
+
+Tue Sep 15 22:19:48 1998  Tom Tromey  <address@hidden>
+
+       * texinfo7.test: New file.
+
+Sun Aug 16 23:17:38 1998  Tom Tromey  <address@hidden>
+
+       * colon6.test: New file.
+
+Fri Aug 14 11:09:03 1998  Tom Tromey  <address@hidden>
+
+       * cond6.test: New file.
+
+Mon Aug 10 21:05:15 1998  Tom Tromey  <address@hidden>
+
+       * ansi3.test: New file.
+
+Sat Jul 18 00:27:26 1998  Tom Tromey  <address@hidden>
+
+       * recurs.test: New file.
+
+       * cond3.test: Changed to match recent fixes.
+
+Fri Jul 17 23:44:49 1998  Tom Tromey  <address@hidden>
+
+       * cond4.test, cond5.test: New files.
+
+Tue May 26 01:44:37 1998  Tom Tromey  <address@hidden>
+
+       * syntax.test: New file.
+
+Sun Apr  5 15:26:42 1998  Tom Tromey  <address@hidden>
+
+       * version3.test: Increased version number to ensure failure for a
+       long time to come.
+
+       * library.test: New file.
+
+       * lex2.test: Updated since lex error changed to warning.
+
+Fri Apr  3 13:04:50 1998  Tom Tromey  <address@hidden>
+
+       * colon5.test: New file.
+
+       * exdir2.test: New file.
+       * instdata.test: New file.
+
+Wed Mar 25 15:30:39 1998  Tom Tromey  <address@hidden>
+
+       * badopt.test: new file.
+       * version3.test: New file.
+
+Mon Mar 23 10:52:36 1998  Tom Tromey  <address@hidden>
+
+       * libobj8.test: New file.
+
+Fri Mar 20 00:32:16 1998  Tom Tromey  <address@hidden>
+
+       * lex2.test: New file.
+
+       * aclocalii.test: New file.
+
+       * javasubst.test: New file.
+
+Thu Mar 19 14:11:45 1998  Tom Tromey  <address@hidden>
+
+       * javaprim.test: New file.
+
+       * sinclude.test: New file.
+
+Wed Mar 18 17:15:22 1998  Tom Tromey  <address@hidden>
+
+       * java.test: New file.
+
+Sun Mar  8 15:35:14 1998  Tom Tromey  <address@hidden>
+
+       * colon4.test: New file.
+
+Fri Mar  6 21:17:10 1998  Tom Tromey  <address@hidden>
+
+       * colon3.test: Refined tests.
+
+Tue Feb 24 12:29:05 1998  Tom Tromey  <address@hidden>
+
+       * man.test: Removed.
+
+       * condman2.test: New file.
+
+Mon Feb 23 16:20:49 1998  Tom Tromey  <address@hidden>
+
+       * texinfo6.test: New file.
+
+Mon Feb 16 00:08:58 1998  Tom Tromey  <address@hidden>
+
+       * aclocali.test: New file.
+
+Fri Feb 13 00:36:38 1998  Tom Tromey  <address@hidden>
+
+       * texinfo5.test (info_TEXINFOS): New file.
+
+       * condman.test: New file.
+
+       * Makefile.am (distclean-local): Ignore rm return value.
+
+Thu Feb 12 21:00:34 1998  Tom Tromey  <address@hidden>
+
+       * unused.test: New file.
+
+       * whoami.test: New file.
+
+       * alpha.test: New file.
+
+Wed Feb 11 17:28:30 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.test: New file.
+
+Thu Feb  5 13:22:17 1998  Tom Tromey  <address@hidden>
+
+       * cxxcpp.test: New file.
+
+Mon Dec  1 15:48:16 1997  Tom Tromey  <address@hidden>
+
+       * cond3.test: New file.
+
+Sat Nov 29 22:09:27 1997  Tom Tromey  <address@hidden>
+
+       * objc.test: New file.
+
+Sat Oct 25 00:04:04 1997  Tom Tromey  <address@hidden>
+
+       * libobj7.test: New file.
+
+Tue Oct 21 00:46:24 1997  Tom Tromey  <address@hidden>
+
+       * lex2.test: Removed; @LEXLIB@ no longer required.
+
+       * depacl2.test: Use -I, not --acdir.
+
+       * install.test: New file.
+       * ammissing.test: New file.
+
+Sun Sep 28 17:19:52 1997  Tom Tromey  <address@hidden>
+
+       * cxxnoc.test: Changed to reflect MKDEP change.
+
+Wed Sep 24 16:01:59 1997  Tom Tromey  <address@hidden>
+
+       * output5.test: New file.
+
+       * depend3.test: New file.
+
+Mon Aug 25 17:24:42 1997  Tom Tromey  <address@hidden>
+
+       * cygwin32.test: Use AM_EXEEXT, not AM_CYGWIN32.
+
+Tue Aug  5 20:33:33 1997  Tom Tromey  <address@hidden>
+
+       * libobj6.test: New file.
+
+Mon May 26 22:47:36 1997  Tom Tromey  <address@hidden>
+
+       * depend.test: Fixed test.
+
+Sat May 10 18:28:14 1997  Tom Tromey  <address@hidden>
+
+       * depend2.test: Fixed test; added another check.
+
+Sun May  4 15:47:24 1997  Tom Tromey  <address@hidden>
+
+       * xsource.test: New file.
+
+Tue Apr 29 19:08:47 1997  Tom Tromey  <address@hidden>
+
+       * cond.test, cond2.test: New files from Ian Taylor.
+
+Sun Apr 27 21:07:49 1997  Tom Tromey  <address@hidden>
+
+       * confsub.test: Fixed bug.
+
+Fri Apr 25 12:30:22 1997  Tom Tromey  <address@hidden>
+
+       * conf2.test: New file.
+
+Tue Apr  8 19:26:07 1997  Tom Tromey  <address@hidden>
+
+       * ansi.test, empty.test, exsource.test, insh2.test, man.test,
+       mkinst2.test, texinfo.test, texinfo2.test: Use $MAKE.
+
+       * defs (MAKE): Define.
+
+Mon Apr  7 17:35:49 1997  Tom Tromey  <address@hidden>
+
+       * version2.test: New file.
+
+Wed Apr  2 00:12:26 1997  Tom Tromey  <address@hidden>
+
+       * ldadd.test: New file.
+
+Fri Mar 28 23:36:04 1997  Tom Tromey  <address@hidden>
+
+       * stamph.test: New file.
+
+Thu Mar 27 18:10:47 1997  Tom Tromey  <address@hidden>
+
+       * lisp.test: New file.
+
+Sat Mar 22 01:14:03 1997  Tom Tromey  <address@hidden>
+
+       * cygwin32.test: New file.
+
+Thu Mar 20 00:34:33 1997  Tom Tromey  <address@hidden>
+
+       * exsource.test: Exit if not using GNU make.
+
+Tue Mar 18 22:36:34 1997  Tom Tromey  <address@hidden>
+
+       * remake2.test: Changed for `missing' support.
+
+Sun Mar 16 14:29:45 1997  Tom Tromey  <address@hidden>
+
+       * seenc.test: New file.
+
+       * checkall.test, noinst.test: Don't use bogus construct when
+       checking.
+
+       * libobj3.test, canon.test, target.test, spell2.test,
+       primary2.test, discover.test, lex2.test: Fixed to test what it
+       claims to test.
+
+Mon Mar 10 23:21:03 1997  Tom Tromey  <address@hidden>
+
+       * libobj.test, libobj2.test: Use AC_PROG_CC.
+
+       * confsub.test: Modified for definition of CONFIG_HEADER_FULL.
+
+       * cxxlibobj.test: New file.
+
+Wed Feb 26 13:05:42 1997  Tom Tromey  <address@hidden>
+
+       * tagsub.test: New file.
+
+Sun Feb 23 11:58:00 1997  Tom Tromey  <address@hidden>
+
+       * texinfo.test, texinfo2.test, texinfo3.test, info.test,
+       mdate.test, vtexi.test, canon2.test, mdate2.test, vtexi2.test:
+       Updated for new texinfo handling.
+
+       * texinfo4.test: New file.
+       * texinfo3.test: New file.
+
+Sat Feb 22 09:48:44 1997  Tom Tromey  <address@hidden>
+
+       * yaccpp.test: New file.
+
+Tue Feb 11 09:51:47 1997  Tom Tromey  <address@hidden>
+
+       * texinfo2.test: Fixed quoting bug.  From Michael Brantley.
+
+Tue Feb  4 18:41:32 1997  Tom Tromey  <address@hidden>
+
+       * confsub.test: Check subdir/Makefile.in to make sure dependency
+       is correct.
+
+       * ansi2.test: ANSI2KNR dependency of all.
+
+Tue Dec 10 00:43:14 1996  Tom Tromey  <address@hidden>
+
+       * defun2.test: New file.
+       * subst.test: New file.
+
+Sun Dec  8 12:25:22 1996  Tom Tromey  <address@hidden>
+
+       * colneq2.test: New file.
+
+Sat Dec  7 12:52:45 1996  Tom Tromey  <address@hidden>
+
+       * output4.test: New file.
+       * output3.test: New file.
+       * remake2.test: New file.
+       * output2.test: New file.
+
+Fri Dec  6 19:00:31 1996  Tom Tromey  <address@hidden>
+
+       * output.test: New file.
+
+Thu Dec  5 18:23:17 1996  Tom Tromey  <address@hidden>
+
+       * remake.test: New file.
+       * colon3.test: New file.
+       * colon2.test: New file.
+       * cxxo.test: New file.
+
+Wed Dec  4 00:41:44 1996  Tom Tromey  <address@hidden>
+
+       * defs: Allow user to set interpreter via PERL environment
+       variable.
+
+       * Makefile.am (distclean-local): New target.
+
+Tue Dec  3 11:55:18 1996  Gordon Matzigkeit  <address@hidden>
+
+       * dup.test, dup2.test: Modified, now that aclocal allows
+       acinclude.m4 to override any installed macro file.
+
+Mon Dec  2 22:44:16 1996  Gordon Matzigkeit  <address@hidden>
+
+       * alllib.test: Removed from distribution, since LIBFILES are no
+       longer computed.
+
+Sun Nov 24 14:36:00 1996  Tom Tromey  <address@hidden>
+
+       * extra2.test: New file.
+
+Fri Nov 22 00:10:04 1996  Tom Tromey  <address@hidden>
+
+       * stdlib.test: New file.
+
+Thu Nov 21 22:51:35 1996  Tom Tromey  <address@hidden>
+
+       * confsub.test: Use AM_CONFIG_HEADER.
+
+Tue Nov 19 23:37:32 1996  Tom Tromey  <address@hidden>
+
+       * confvar2.test: New file.
+
+Fri Nov 15 00:09:18 1996  Tom Tromey  <address@hidden>
+
+       * ansi2.test: New file.
+
+       * libfiles.test: Removed (obsolete).
+
+       * libobj.test, canon4.test, libobj2.test, alllib.test,
+       ranlib.test: Fixed for Gord's changes to library handling.
+
+       * Many files: Use AC_PROG_CC to avoid error.
+
+Thu Oct 24 15:22:53 1996  Tom Tromey  <address@hidden>
+
+       * confvar.test: New file.
+       * ranlib.test: New file.
+
+Mon Oct 21 22:57:51 1996  Tom Tromey  <address@hidden>
+
+       * version.test: New file.
+
+Fri Oct 11 00:51:04 1996  Tom Tromey  <address@hidden>
+
+       * libobj5.test: New file.
+       * libobj4.test: New file.
+       * distdir.test: New file.
+       * lex2.test: New file.
+
+Sun Oct  6 11:00:44 1996  Tom Tromey  <address@hidden>
+
+       * acsilent.test: New file.
+       * req.test: New file.
+       * acinclude.test: New file.
+
+Sat Oct  5 11:31:38 1996  Tom Tromey  <address@hidden>
+
+       * discover.test: New file.
+
+       * mkinst2.test: Renamed from mkinstall2.test.
+
+       * symlink.test: New file.
+
+Thu Oct  3 19:55:23 1996  Tom Tromey  <address@hidden>
+
+       * vpath.test: New file.
+
+Mon Sep 30 08:34:07 1996  Tom Tromey  <address@hidden>
+
+       * comment2.test: New file.
+
+Mon Sep 23 00:23:34 1996  Tom Tromey  <address@hidden>
+
+       * spell3.test: New file.
+
+Sun Sep 22 14:42:09 1996  Tom Tromey  <address@hidden>
+
+       * depend2.test: New file.
+
+Sat Sep 21 14:01:10 1996  Tom Tromey  <address@hidden>
+
+       * primary2.test: New file.
+       * primary.test: New file.
+
+Fri Sep 20 09:39:27 1996  Tom Tromey  <address@hidden>
+
+       * confsub.test: New file.
+
+Mon Sep 16 00:05:52 1996  Tom Tromey  <address@hidden>
+
+       * spell2.test: New file.
+
+       * spell.test: New file.
+
+Thu Sep 12 14:57:49 1996  Tom Tromey  <address@hidden>
+
+       * implicit.test: New file.
+
+Wed Sep 11 13:57:10 1996  Tom Tromey  <address@hidden>
+
+       * colneq.test: New file.
+
+       * interp2.test: New file.
+
+Sun Sep  8 10:47:07 1996  Tom Tromey  <address@hidden>
+
+       * gnits.test: New file.
+
+Thu Sep  5 22:54:26 1996  Tom Tromey  <address@hidden>
+
+       * libobj3.test: New file.
+
+Tue Sep  3 20:57:38 1996  Tom Tromey  <address@hidden>
+
+       * block.test: New file.
+
+Mon Aug 26 23:04:01 1996  Tom Tromey  <address@hidden>
+
+       * alllib.test: New file.
+
+       * interp.test: New file.
+
+Mon Aug 12 13:58:55 1996  Tom Tromey  <address@hidden>
+
+       * libobj2.test: New file.
+
+       * order.test: New file.
+
+Sun Aug 11 00:10:42 1996  Tom Tromey  <address@hidden>
+
+       * cxxnoc.test: New file.
+
+       * cxxlink.test: Use AC_PROG_CXX.
+
+       * lex.test: Use AC_PROG_LEX, AC_DECL_YYTEXT.
+
+       * yacc.test: Use AC_PROG_YACC in configure.in.
+
+       * cxxlink.test: New file.
+
+       * yacc.test: Fixed test for new yacc code.
+
+Sat Aug 10 10:09:45 1996  Tom Tromey  <address@hidden>
+
+       * defun.test: New file.
+
+       * dup.test: New file.
+
+Fri Aug  9 09:18:07 1996  Tom Tromey  <address@hidden>
+
+       * canon4.test: New file.
+
+Thu Aug  8 10:47:45 1996  Tom Tromey  <address@hidden>
+
+       * exsource.test: New file.
+
+       * subdir2.test: New file.
+
+       * scripts.test: New file.
+
+Tue Aug  6 12:30:41 1996  Tom Tromey  <address@hidden>
+
+       * lex.test: New file.
+
+Mon Aug  5 01:03:03 1996  Tom Tromey  <address@hidden>
+
+       * obsolete.test: New file.
+
+       * Many files: Use AM_ macros, not fp_ macros.
+
+       * info.test: New file.
+
+Sun Aug  4 12:47:34 1996  Tom Tromey  <address@hidden>
+
+       * man.test: New file.
+
+       * acouttbs2.test: New file.
+
+       * libfiles.test: New file.
+
+       * comment.test: New file.
+
+       * tags.test: New file.
+
+       * vtexi2.test: New file.
+
+       * colon.test: New file.
+
+Sun Jul 28 11:43:00 1996  Tom Tromey  <address@hidden>
+
+       * defs (ACLOCAL): Added definition.
+
+       * depacl.test, depacl2.test, error.test: New tests for aclocal.
+
+Fri Jul 19 10:09:56 1996  Tom Tromey  <address@hidden>
+
+       * ansi.test: New file.
+
+Sun Jun  9 23:20:03 1996  Tom Tromey  <address@hidden>
+
+       * texinfo2.test: New file.
+
+Sat Jun  8 10:00:42 1996  Tom Tromey  <address@hidden>
+
+       * mkinstall2.test: New file.
+
+Fri Jun  7 18:17:11 1996  Tom Tromey  <address@hidden>
+
+       * yacc.test: New file.
+
+Sun Jun  2 09:04:52 1996  Tom Tromey  <address@hidden>
+
+       * dejagnu.test: New file.
+
+       * texinfo.test: New file.
+
+Thu May 23 09:58:48 1996  Tom Tromey  <address@hidden>
+
+       * fpinst2.test: New file.
+
+       * fpinstall.test: New file.
+
+Wed May 22 09:45:52 1996  Tom Tromey  <address@hidden>
+
+       * outdir.test: New file.
+
+Sat May 18 10:51:37 1996  Tom Tromey  <address@hidden>
+
+       * insh2.test: New file.
+
+Fri May 17 17:32:35 1996  Tom Tromey  <address@hidden>
+
+       * number.test: New file.
+
+       * defs, many .test files: Define PACKAGE and VERSION in
+       configure.in.
+
+       * package.test: New file.
+
+       * backsl.test: New file.
+
+Thu May 16 09:15:57 1996  Tom Tromey  <address@hidden>
+
+       * subdir.test: New file.
+
+Tue May 14 10:17:17 1996  Tom Tromey  <address@hidden>
+
+       * mdate2.test: New file, from report by Jim Meyering.
+
+       * canon3.test: New file.
+
+       * auxdir.test: New file.
+
+       * mkinstall.test: New file.
+
+       * extra.test: Reversed sense of test.
+
+Fri Apr 26 15:15:01 1996  Tom Tromey  <address@hidden>
+
+       * instman.test: New file.
+
+Thu Apr 25 17:12:30 1996  Tom Tromey  <address@hidden>
+
+       * noinst.test: New file
+
+       * exdir.test: Quoting change from Gord Matzigkeit.
+
+       * extra.test (EXTRA_PROGRAMS): New file.
+
+Tue Apr  9 22:55:07 1996  Tom Tromey  <address@hidden>
+
+       * target.test: New file.
+
+Wed Apr  3 15:10:54 1996  Tom Tromey  <address@hidden>
+
+       * canon2.test: New file
+
+       * insh.test: New file.
+
+Wed Mar 27 23:31:51 1996  Tom Tromey  <address@hidden>
+
+       * rulepat.test: New file.
+
+Sat Mar 16 08:37:36 1996  Tom Tromey  <address@hidden>
+
+       * empty.test: New file.
+
+Fri Mar 15 17:55:13 1996  Tom Tromey  <address@hidden>
+
+       * installsh.test: New file.
+
+Tue Mar  5 16:22:46 1996  Tom Tromey  <address@hidden>
+
+       * badprog.test: Rewrote.
+
+       * canon.test: New file.
+
+Mon Mar  4 21:08:37 1996  Tom Tromey  <address@hidden>
+
+       * exdir.test: New file.
+
+Fri Mar  1 17:23:53 1996  Tom Tromey  <address@hidden>
+
+       * depend.test: New file.
+
+       * badprog.test: New file.
+
+       * defs (AUTOMAKE): Pass --foreign.
+
+Thu Feb 29 20:23:42 1996  Tom Tromey  <address@hidden>
+
+       More tests:
+       * prefix.test: New file.
+       * spelling.test: New file
+       * confincl.test: New file.
+       * Makefile.am (TESTS): Updated.
+
+Wed Feb 28 11:57:02 1996  Tom Tromey  <address@hidden>
+
+       * acoutqnl.test: New file.
+       * Makefile.am (TESTS): Include it.
+
+Tue Feb 27 10:52:58 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (DIST_OTHER): Include "defs".
+
+       * defs (AUTOMAKE): Never relative to $srcdir.
+
+Mon Feb 26 23:14:08 1996  Tom Tromey  <address@hidden>
+
+       * libobj.test: Put AC_PROG_RANLIB in configure.in
+
+Mon Feb 19 08:22:22 1996  Tom Tromey  <address@hidden>
+
+       * proginst.test: New file.
+
+Tue Feb 13 18:54:39 1996  Tom Tromey  <address@hidden>
+
+       * libobj.test: New file.
+
+Mon Feb 12 17:05:48 1996  Tom Tromey  <address@hidden>
+
+       * acouttbs.test: New file.
+
+       * Makefile.am (DIST_OTHER): New variable.
+
+       * acoutnoq.test: New file.
+
+Sun Feb 11 16:39:14 1996  Tom Tromey  <address@hidden>
+
+       * checkall.test: Delay a little.
+
+       * Makefile.am (check-local): Print name of failing test.
+
+Sat Feb 10 17:08:39 1996  Tom Tromey  <address@hidden>
+
+       * checkall.test: New file.
+
+       * instexec.test: New file.
+
+       * mdate.test, vtexi.test, acoutput.test: New files.
+
+       * Started.
+
+-----
+
+Copyright 2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.00 b/old/ChangeLog.00
new file mode 100644
index 0000000..c50c4eb
--- /dev/null
+++ b/old/ChangeLog.00
@@ -0,0 +1,2211 @@
+2000-12-29  Derek Price  <address@hidden>
+
+       * automake.in (handle_dependencies): Switched the DEP_FILES
+       definition to be conditional on @address@hidden
+
+2001-02-03  Ville Laurikari  <address@hidden>
+
+       * depcomp (aix): New side-effect dependency tracking mode, for
+       the C for AIX compiler.
+       * m4/depend.m4 (AM_DEPENDENCIES): Recreate `conftest.c' and
+       `conftest.h' for each test.
+
+2001-02-03  Tom Tromey  <address@hidden>
+
+       * automake.texi (Dist): Updated to mention caveat of putting
+       directory in EXTRA_DIST and also providing a nice example of
+       removing the CVS dir.
+       From Ganesan Rajagopal.
+
+       * m4/depend.m4 (depcpp): Run tests in a subdir.  Fixes report from
+       Bob Proulx.
+
+       * automake.in (scan_one_autoconf_file): Disable warning about
+       AM_PROG_LIBTOOL.
+
+       * automake.in (handle_configure): Don't modify variable which
+       aliases list element.  Don't push @inputs onto the dist list.
+       Fixes colon7.test.
+       (initialize_per_input) [dist_dirs]: New variable.
+       (handle_dist_worker): Use global dist_dirs.
+       (handle_configure): Set dist_dirs entries at toplevel.
+
+2001-02-02  Gordon Sadler  <address@hidden>
+
+       * automake.texi (Java Support): Added index, @section.
+
+2001-02-02  Pavel Roskin  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Restore trace messages.
+
+       * automake.in (handle_aclocal_m4): Fix stripping of the initial
+       "./" from the dependencies of aclocal.m4.
+       Reported by Ralf Corsepius.
+
+2001-02-01  Pavel Roskin  <address@hidden>
+
+       * aclocal.in: Rename "verbosity" to "verbose". Always prepend
+       "aclocal: " to the verbose output.
+
+       * automake.in: Remove all debugging messages.
+
+2001-01-31  Akim Demaille  <address@hidden>
+
+       * automake.in (add_depend2): Quote properly $obj and $source.
+
+2001-01-31  Akim Demaille  <address@hidden>
+
+       * depend2.am: Instead of replacing @PFX@ in $(@address@hidden), and
+       then replacing `$(@address@hidden)' for the files that need some
+       special flags, use only @address@hidden  Similarly for @address@hidden
+       Try to document this file.
+       * automake.in (add_depend2): Adjust to these changes.
+
+2001-01-31  Akim Demaille  <address@hidden>
+
+       * automake.in (%factored_dependencies): New.
+       (file_contents): Use it.
+       (handle_phony): Rename as...
+       (handle_factored_dependencies): this.
+       * subdirs.am: No need for convolved syntax to declare .PHONY.
+
+2001-01-31  Akim Demaille  <address@hidden>
+
+       * automake.in: maintainer-check fixes.
+
+2001-01-31  Akim Demaille  <address@hidden>
+
+       * automake.in (file_contents): Rewrite: instead of trying to parse
+       it line by line, first swallow it completely into $CONTENTS,
+       *then*, parse it *paragraph* by paragraph.
+
+2001-01-30  Akim Demaille  <address@hidden>
+
+       * automake.in (file_contents): Remove.
+       (file_contents_with_transform): Swap the order of the arguments,
+       and rename as...
+       (file_contents): this.
+       Adjust all uses.
+
+2001-01-30  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Don't mention
+       omit_dependencies.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_autoconf_config_files): Extract from
+       &scan_one_autoconf_file.
+       (&scan_one_autoconf_file): Use it.
+       (&scan_autoconf_traces): New.
+       ($scan_autoconf_files): Use it.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * texinfos.am, tags.am, subdirs.am, multilib.am, mans.am: Add a
+       .PHONY target.
+       * automake.in (handle_texinfo, handle_man_pages, handle_multilib)
+       (handle_etags, handle_subdirs): Don't push into @phony.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Correctly recognize
+       configure.ac.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_tests_dejagnu): New, extracted from...
+       (handle_tests): here.  Use `.PHONY:'.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_phony): Sort.
+       (file_contents_with_transform): Catch `.PHONY:'.
+       (handle_tests): Instead dumping the hard coded target check-TESTS
+       and registering its .PHONYsm, get them from...
+       * check.am: here, new file.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (add_depend2): Use &transform.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_tags): Use &transform.
+       (am_error, am_line_error, am_conf_error, read_am_file): Use
+       directly arrays in strings, no need for &join.
+       Require Perl 5.
+       * Makefile.am (maintainer-check): Use grep -w when looking for
+       words.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (prog_error): New.
+       Spread its use.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_single_transform_list): if (@list) { foreach
+       (@list) ...} can be written as a simple `foreach' loop.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (define_standard_variables): Use &transform instead
+       of build_rx.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): Use the new $texinfodir instead of
+       the removed $texinfo_tex.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_libraries, handle_ltlibraries): Use
+       &transform.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_programs) <xexe>: Remove, replaced by
+       `exeext'.
+       Use it, and &transform.
+
+2001-01-29  Akim Demaille  <address@hidden>
+
+       * automake.in (get_object_extension) <$default_includes>: New.
+       Use it and &transform.
+
+2001-01-28  Tom Tromey  <address@hidden>
+
+       * automake.in (variable_value_as_list_worker): Handle entries in
+       %am_var_defs.  Fixes listval.test.
+
+2001-01-26  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): Don't use $conf_pat, just
+       $conf_dir to transform MDDIR since now &transform handles the
+       escaping of RE special characters by itself.
+
+2001-01-24  Akim Demaille  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Don't leave `AC_PROG_CC' etc. in
+       clear.
+       * m4/init.m4: Likewise.
+       * m4/sanity.m4: s/conftestfile/conftest.file/.
+
+2001-01-24  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_libraries): Use $configure_ac; typo fix.
+
+       * automake.in (transform): Quote substitution.
+
+2001-01-21  Alexandre Duret-Lutz  <address@hidden>
+           Tom Tromey  <address@hidden>
+
+       * automake.in (obsolete_rx): Match whole macro names, not
+       substrings.
+       * aclocal.in (obsolete_rx): Likewise.
+
+2001-01-21  Tom Tromey  <address@hidden>
+
+       * automake.texi: Changed dir category.
+
+2001-01-18  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): Use &transform, and transform
+       CONFIGURE_AC.
+       Reported by Lars Hecking, and diagnosed by Raja R Harinath.
+
+2001-01-16  Akim Demaille  <address@hidden>
+
+       Let Automake support `configure.ac'.
+
+       * automake.in: In the comments, prefer `configure.ac' to
+       `configure.in'.
+       When using &am_conf_error, don't repeat `in configure.in', since
+       the function already reports it.
+       When referring to `configure.in' use `$configure_ac' instead.
+       (configure_ac): New global variable.
+       (scan_configure, scan_one_configure_file): Rename as...
+       (scan_autoconf_files, scan_one_autoconf_file): this.
+       (scan_autoconf_files): Compute $configure_ac.
+       (transform): New function.
+       (handle_configure): Use it to transform CONFIGURE_AC in
+       `remake.am' and in `remake-hdr.am'.
+       (common_files): Also consider `configure.ac'.
+       Use consistently single quotes.
+       * aclocal.in (configure_ac): New variable.
+       Use it.
+       * texi-vers.am: Depend on CONFIGURE_AC not configure.in.
+       * remake.am: Likewise.
+       * remake-hdr.am: Likewise.
+
+2001-01-16  Akim Demaille  <address@hidden>
+
+       * m4/multi.m4: Remove the hairy useless quotation of `$'.
+       Simplify `ifelse([$2],,,[$2])' into... `$2'!
+       * m4/minuso.m4: Don't use changequote!
+       * m4/cond.m4: Fix quotation.
+       * m4/sanity.m4: Follow the Autoconf coding style.
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Use a for loop.
+       * m4/depend.m4 (AM_DEPENDENCIES): Fix quotation issues.
+       Use AC_CACHE_CHECK.
+
+2001-01-15  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Don't print rule
+       here when source is in subdir and object is not.  Fixes
+       subobj4.test.
+
+       * automake.in (handle_single_transform_list): Correctly compute
+       $nonansi_obj.  Fixes cxxansi.test.
+
+       * automake.texi (Man pages): Updated to account for man1_MANS,
+       etc.
+
+2001-01-13  Steve Robbins  <address@hidden>
+           Tom Tromey  <address@hidden>
+
+       * aclocal.in (scan_configure): Don't recognize macro assignments
+       or AC_SUBSTs.
+       (add_file): Likewise.
+
+2001-01-13  Kevin Ryde  <address@hidden>
+
+       * automake.in (handle_ltlibraries): Omit -rpath from
+       check_LTLIBRARIES, as per noinst_LTLIBRARIES.
+
+2001-01-11  Tom Tromey  <address@hidden>
+
+       * depcomp (case gcc3): Use -MD, not -M.
+
+2001-01-10  Tom Tromey  <address@hidden>
+
+       * depcomp: Handle gcc 3.
+
+2000-12-23  Tom Tromey  <address@hidden>
+
+       * configure.in: Updated to 1.4c for cvs.
+
+       * configure.in: Updated to 1.4b and released.
+
+       * config.guess, config.sub, texinfo.tex: New versions.
+
+       * automake.in (handle_dist_worker): Always define DIST_SUBDIRS.
+       Re-fixes pr87.test.
+
+       * subdirs.am (maintainer-clean-recursive): Use DIST_SUBDIRS for
+       distclean and maintainer-clean.
+       * automake.texi (Top level): Document use of DIST_SUBDIRS.
+
+       From Rusty Ballinger:
+       * automake.in (handle_java): Don't skip `noinst' prefix.
+
+       * automake.texi (Invoking aclocal): Mention ## comments.
+
+2000-12-22  Tom Tromey  <address@hidden>
+
+       From Raja R Harinath:
+       * automake.in (libtoolize_sometimes): New global.
+       (initialize_global_constants): Added libtoolize_sometimes to
+       common_files.
+
+       * m4/depend.m4 (AM_SET_DEPDIR): Ignore errors when running rmdir.
+
+       * m4/depend.m4 (AM_SET_DEPDIR): Remove .deps directory when done.
+
+2000-12-21  Tom Tromey  <address@hidden>
+
+       * automake.texi (Tags): Document GTAGS target.
+       * tags.am (GTAGS): New target.
+
+       * automake.in (libtoolize_files): Removed ltconfig.
+       (initialize_global_constants): Added ltconfig to common_files.
+
+2000-12-21  Kevin Ryde  <address@hidden>
+
+       * automake.in (handle_footer): Generate .SUFFIXES target when user
+       defines suffixes but automake does not.
+
+2000-12-20  Marc Espie  <address@hidden>
+
+       * automake.in (handle_texinfo): Make path of $vtexi explicit in
+       dependency.
+       * texi-vers.am: Likewise.
+
+2000-12-20  Tom Tromey  <address@hidden>
+
+       From Kevin Ryde:
+       * automake.in (handle_footer): Always push user suffixes at the
+       start of .SUFFIXES:.
+       * automake.texi (Suffixes): Updated to reflect new suffix
+       handling.
+
+2000-12-18  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_built_sources): Removed.
+       (handle_merge_targets): Handle BUILT_SOURCES.
+       * automake.texi (Sources): Updated documentation of
+       BUILT_SOURCES.
+
+2000-12-17  Tom Tromey  <address@hidden>
+
+       * m4/protos.m4: Always do header checks.
+
+       * automake.in (handle_ltlibraries): Check for LDFLAGS variables
+       before using values.
+
+       * automake.in (handle_ltlibraries): Allow _LDFLAGS to be
+       conditionally defined.  Fixes PR automake/77 and ldflags.test.
+
+2000-11-25  Tom Tromey  <address@hidden>
+
+       * automake.in (file_contents_with_transform): Added file name and
+       line number to error report.
+       (MACRO_PATTERN, BOGUS_MACRO_PATTERN): Leading spaces are ok.
+
+2000-11-23  Pavel Roskin  <address@hidden>
+
+       * m4/regex.m4 (AM_WITH_REGEX): This macro was broken because
+       of M4 underquoting.
+       * m4/ccstdc.m4 (AC_PROG_CC_STDC): Added some M4 quotes.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
+       * m4/multi.m4 (AM_WITH_DMALLOC): Likewise.
+       * m4/python.m4 (AM_PATH_PYTHON): Likewise.
+       * m4/strtod.m4 (AM_FUNC_STRTOD): Likewise.
+
+2000-11-23  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file_internal): Pass $file as second
+       argument to maybe_push_required_file.  Fixes PR automake/87.
+
+2000-11-18  Tom Tromey  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Redirect `$am_depcomp' stdout to
+       /dev/null.  From Paul Martinolich.
+
+2000-11-16  Morten Eriksen  <address@hidden>
+
+       * aclocal.in (write_aclocal): Set ``binmode'' after file has been
+       opened, otherwise it has no effect.
+
+2000-10-23  Morten Eriksen  <address@hidden>
+
+       * aclocal.in (write_aclocal): Don't write aclocal.m4 with
+       CRLFs. This circumvents a bug in Cygwin bash.
+
+       * automake.in (generate_makefile): Don't write Makefile.in
+       files with CRLFs, as it causes problems for the dependency-file
+       extraction in AM_OUTPUT_DEPENDENCY_COMMANDS.
+
+2000-10-19  Alex Hornby  <address@hidden>
+
+       * automake.in (handle_merge_targets): Allow parallel install
+       with forced relink.
+
+2000-10-19  Akim Demaille  <address@hidden>
+
+       * subdir4.test (depcomp): Don't create it, defs does.
+
+2000-10-17  Pavel Roskin  <address@hidden>
+
+       * automake.in (handle_aclocal_m4): exclude aclocal.m4 and
+       acinclude.m4 from the dependencies of aclocal.m4 to avoid
+       circular and duplicated dependencies. Strip "./" from the
+       dependencies.
+
+2000-10-17  Lars J. Aas  <address@hidden>
+
+       * aclocal.in (write_aclocal): Set up aclocal.m4 header with
+       normal comments (#) instead of m4 dnl-type comments.
+
+2000-10-17  Alex Hornby  <address@hidden>
+
+       * depcomp: Altered sed clause to strip of inclusion depth
+       numbers generated by cpp. Also output in gcc style.
+
+2000-10-16  Morten Eriksen  <address@hidden>
+
+       * depcomp (msvisualcpp): New dependency tracking mode, for
+       Microsoft Visual C++.
+
+2000-10-16  Morten Eriksen  <address@hidden>
+
+       * depcomp: Fix a bug in SGI dependency tracking mode with source
+       files which do not dependend on any other source files.
+
+2000-10-16  Rodney Brown  <address@hidden>
+
+       * aclocal.in, aclocal.m4: Standardize FSF Copyright statements.
+       * automake.in, automake.texi: Likewise.
+       * clean-kr.am, clean.am: Likewise.
+       * comp-vars.am: Likewise.
+       * compile, compile.am: Likewise.
+       * data-clean.am: Likewise.
+       * data.am: Likewise.
+       * dejagnu.am: Likewise.
+       * depcomp: Likewise.
+       * depend.am, depend2.am: Likewise.
+       * dist-vars.am, dist.am: Likewise.
+       * elisp-comp: Likewise.
+       * footer.am: Likewise.
+       * header-vars.am, header.am: Likewise.
+       * java-clean.am java.am: Likewise.
+       * kr-extra.am: Likewise.
+       * library.am: Likewise.
+       * libs-clean.am, libs.am: Likewise.
+       * libtool.am: Likewise.
+       * lisp-clean.am lisp.am: Likewise.
+       * ltlib-clean.am ltlib.am: Likewise.
+       * ltlibrary.am: Likewise.
+       * m4/Makefile.in: Likewise.
+       * m4/strtod.m4: Likewise.
+       * mans-vars.am, mans.am: Likewise.
+       * mdate-sh: Likewise.
+       * missing: Likewise.
+       * multilib.am: Likewise.
+       * program.am: Likewise.
+       * progs-clean.am, progs.am: Likewise.
+       * python-clean.am, python.am: Likewise.
+       * remake-hdr.am, remake.am: Likewise.
+       * scripts.am: Likewise.
+       * subdirs.am: Likewise.
+       * tags-clean.am, tags.am: Likewise.
+       * texi-vers.am: Likewise.
+       * texinfos.am: Likewise.
+       * ylwrap: Likewise.
+
+2000-10-09  Pavel Roskin  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't rely on variable
+       assignments changing $? - it's broken in ash-0.2.
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
+
+       * automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is
+       defined use it as the list of M4 files aclocal.m4 depends on.
+
+2000-10-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (add_file): Strip comments while scanning for
+       macro dependencies.
+
+2000-09-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (initialize_global_constants): End the
+       result of dist-bzip2 with tar.bz2, not bz2.
+
+2000-08-30  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/72:
+       * automake.in (initialize_per_input): Define `need_link'.
+       (finish_languages): Use need_link.
+       (handle_source_transform): Set need_link if required.
+
+2000-08-28  Tom Tromey  <address@hidden>
+
+       * automake.in (yacc, yaccxx, lex, lexxx): Set `derived-autodep'
+       key.
+       (register_language): Default the `derived-autodep' option.
+       (handle_single_transform_list): Add to %dep_files if language has
+       `derived-autodep' set.  Re-fixes lex4.test.
+
+2000-08-27  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Only add to
+       %dep_files if language is found and supports automatic dependency
+       tracking.  Fixes PR automake/75.
+
+       * automake.in (am_primary_prefixes): Don't set `valid' for
+       configure variables that don't satisfy the other constraints.
+       Fixes PR automake/68.
+
+2000-04-14  Victor V. Vengerov  <address@hidden>
+
+       Fix for PR automake/67.
+       * automake.in (handle_multilib): remove .am suffix in fragment
+       name passed to file_contents.
+       * m4/multi.m4: Add missing ')' in AC_ARG_ENABLE invocation.
+       Remove external quotes in first arg of AC_OUTPUT_COMMANDS.
+       Remove unnecessary "rel-to-top-srcdir" before config-ml.in.
+
+2000-08-26  Tom Tromey  <address@hidden>
+
+       * subdirs.am (maintainer-clean-recursive): Always run clean rules
+       in `.' after all subdirs.  Fixes PR automake/3 and PR automake/24.
+
+       * automake.in (handle_man_pages): Generate install targets for man
+       even if man_MANS not defined.  From `danpb'.  Fixes PR automake/73.
+
+       * m4/depend.m4 (depcpp): Use `-o conftest.o'.
+       Fix for PR automake/74.  From js pendry.
+
+2000-08-20  Eli Zaretskii  <address@hidden>
+
+       * depcomp (gcc): Support DOS-style absolute file names with drive
+       letters.
+
+2000-08-06  Jim Meyering  <address@hidden>
+
+       * automake.in (handle_dependencies): Set $require_file_found{'depcomp'}
+       if the depcomp file exists, before calling require_config_file on
+       `depcomp'.  This makes require_file_internal skip its buggy existence
+       test that would make automake fail (with `required file `lib/depcomp'
+       not found') when AC_CONFIG_AUX_DIR is not set.
+
+       This change change does not fix the existing bug where, if `depcomp'
+       is not present in the build directory (at the top level), automake
+       still gives the inaccurate diagnostic about *lib*/depcomp rather
+       than ./depcomp.
+
+2000-08-05  Jim Meyering  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): Fix typo in last change:
+       add missing closing bracket and closing parenthesis.
+       Don't quote the first argument to AC_OUTPUT_COMMANDS.
+       Backslash-escape the backquotes and `$' in `am_indx'-incrementing stmt.
+
+2000-08-04  Tom Tromey  <address@hidden>
+
+       Idea from Nicolas Thiery:
+       * automake.texi (Tests): Document DEJATOOL as a list.
+       * dejagnu.am (RUNTESTDEFAULTFLAGS): Use $$tool, not $(DEJATOOL).
+       (check-DEJAGNU): Run runtest in a loop.
+
+2000-08-02  Akim Demaille  <address@hidden>
+
+       * m4: Quote properly the name of the macros being defined.
+       Use `#' instead of `dnl' where appropriate.
+       * m4/header.m4 (AM_CONFIG_HEADER): Get rid of changequote, just
+       quote.
+       Don't quote passive characters.
+       Pull the AC_PREREQ outside the macro.
+       * m4/init.m4: Pull the AC_PREREQ outside the macro.
+
+2000-07-28  Tom Tromey  <address@hidden>
+
+       * lisp.am (address@hidden@LISP): Prefix file with $(DESTDIR).
+       From Bruno Haible.
+
+2000-07-13  Kevin Ryde  <address@hidden>
+
+       * automake.in (am_install_var): Apply the $(EXEEXT) hack to
+       EXTRA_PROGRAMS as well as other _PROGRAMS.
+
+2000-07-02  Jim Meyering  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Recognize AC_LIBOBJ.
+
+2000-06-19  Paolo Bonzini    <address@hidden>
+
+       * texi-vers.am: define UPDATED-MONTH variable (for an example, see
+       GNU make's manual)
+
+2000-06-02  Morten Eriksen  <address@hidden>
+
+       * depcomp: workaround for problem with SGI IRIX sed (it can only
+       handle lines of up to 8192 characters, the rest of the line will
+       be mangled).
+
+2000-05-31  Morten Eriksen  <address@hidden>
+
+       * depcomp: tell SGI MIPSpro compilers to generate dependencies
+       through the pre-processor (only CVS libtool has the -Wc option
+       yet).
+
+2000-05-15  Brendan O'Dea  <address@hidden>
+
+       * missing: Add support for `help2man'.
+
+2000-05-11  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Work correctly if TESTS is empty;
+       print nothing if it is.  From Kevin Ryde.
+
+2000-05-08  Tom Tromey  <address@hidden>
+
+       * automake.texi (Texinfo): Mention vers*.texi.
+
+2000-05-04  Akim Demaille  <address@hidden>
+
+       AM_INIT_AUTOMAKE is no longer optional, so don't look for
+       `VERSION=' and `PACKAGE='.
+       * automake.in (seen_package, seen_version): Remove initializations of
+       unnecessary variables.
+       (scan_one_configure_file): Don't set them.
+       (scan_configure): Don't use them.
+
+2000-05-01  Akim Demaille  <address@hidden>
+
+       * m4/init.m4 (AC_PROVIDE_IFELSE): If it is not defined, do it.
+       (AM_INIT_AUTOMAKE): Update the writing conventions.
+       Quote the arguments properly.
+       Add a few missing `dnl'.
+       Use AC_PROVIDE_IFELSE.
+
+2000-04-26  Jim Meyering  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Handle the AC_CONFIG_FILES
+       macro.  Based on a patch from Harlan Stenn.
+
+2000-04-13  Akim Demaille  <address@hidden>
+
+       * compile: Remove unnecessary double quotes in assignments.
+
+2000-04-13  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Also recognize
+       AC_CONFIG_HEADERS.
+       Remove trailing blanks.
+
+2000-04-05  Tom Tromey  <address@hidden>
+
+       * header-vars.am (DESTDIR): Commented out definition.
+
+       * automake.in (require_file_internal): Pass --copy to libtoolize
+       if automake was run with `--copy'.
+
+2000-03-22  Tom Tromey  <address@hidden>
+
+       * automake.texi (Uniform): Fix definition of pkglibdir.
+       From thi <address@hidden>.
+
+2000-03-19  Tom Tromey  <address@hidden>
+
+       * aclocal.in (parse_arguments): Copyright 2000.
+       (write_aclocal): Likewise.
+       * automake.in (parse_arguments): Copyright 2000.
+       (initialize_global_constants): Likewise.
+
+       * automake.in (generate_makefile): Call handle_dist after
+       handle_dependencies and handle_tests.  Fixes subobj3.test and
+       pr19.test regressions.
+
+2000-03-19  Gordon Matzigkeit  <address@hidden>
+
+       * depend2.am (@address@hidden): Look for the source file in srcdir as 
well
+       as the current directory.
+       (@address@hidden): Likewise.
+
+2000-03-19  OKUJI Yoshinori  <address@hidden>
+
+       * automake.in (handle_data): Pass -candist instead of
+       -defaultdist, for the compatibility.
+
+2000-03-19  Tom Tromey  <address@hidden>
+
+       Fix for test nodepcomp.test:
+       * automake.in (require_file_internal): Use readlink on symlinks.
+       Only unlink file if we are going to try to add it again.
+       (handle_dependencies): Require `depcomp' here.
+       (scan_configure): Don't require `depcomp'.
+
+2000-03-16  OKUJI Yoshinori  <address@hidden>
+
+       * automake.in (handle_configure): Remove $(BUILT_SOURCES) from
+       the rule to remake Makefile, whether $use_dependencies is true
+       or not. This was a historical one and doesn't make sense any
+       longer.
+
+2000-03-19  Tom Tromey  <address@hidden>
+
+       More for PR automake/38:
+       * automake.texi (Invoking Automake): Document --force-missing.
+       * automake.in (force_missing): New global.
+       (parse_arguments): Recognize --force-missing.
+       (initialize_global_constants): Document --force-missing.
+       (require_file_internal): Handle --force-missing.
+
+       Fix for PR automake/38:
+       * automake.in (require_file_internal): Check for and handle
+       dangling symlinks.  Fixes symlink2.test.
+
+       Fix for PR automake/45:
+       * automake.texi (configure): Mention requirement to run
+       AM_INIT_AUTOMAKE.
+       (Requirements): Removed most text.
+       * automake.in (seen_init_automake): New global.
+       (scan_configure): Error if AM_INIT_AUTOMAKE not seen.
+       (scan_one_configure_file): Don't support AM_INIT_GUILE_MODULE.
+       Set seen_init_automake if needed.
+
+       Fix for PR automake/41:
+       * automake.in (require_file_found): New global.
+       (require_file_internal): Set require_file_found entry.
+       (handle_texinfo): Require file any number of times.
+
+       * automake.in (handle_dist_worker): Exit if `cp' fails.  Fixes
+       install2.test.
+
+       * tags.am: Don't reference $$here.  Report from Sven Verdoolaege.
+
+2000-03-13  Alexandre Oliva  <address@hidden>
+
+       * m4/missing.m4: Print the backtick in a way that won't cause
+       autoconf CVS to emit any warnings.
+
+2000-03-01  Jim Meyering  <address@hidden>
+
+       * automake.in (handle_dist_worker) [generating rules for distdir]:
+       Don't use `ln' (which was just a space optimization anyway) to
+       populate $(distdir).  Otherwise, the dist rules that change
+       permissions would end up affecting the master sources.
+       * texinfos.am (dist-info): Likewise.
+
+2000-02-13  Jim Meyering  <address@hidden>
+
+       * automake.in (generate_makefile): Detect write/close failure.
+
+2000-02-02  Assar Westerlund  <address@hidden>
+
+       * automake.in (handle_single_transform_list): do not use $< which
+       is not handled by all non-GNU makes.  Instead do explicit sh code
+       testing for the file in this directory and srcdir.  Based on a
+       suggestion by Alexandre Oliva <address@hidden>
+
+2000-01-12  Tom Tromey  <address@hidden>
+
+       * m4/lispdir.m4: Added --with-lispdir argument processing.
+       From Kevin Dalley.
+
+2000-01-06  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Don't check for
+       AC_PROG_MAKE_SET.
+       (scan_configure): Check for AC_PROG_MAKE_SET.
+
+       * header-vars.am (@SET_MAKE@): Added.
+       * subdirs.am (@SET_MAKE@): Removed.  Report from Motoyuki
+       Kasahara.
+
+1999-12-19  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Expand DIST_COMMON under all
+       conditions.
+       (require_file_internal): Corrected arguments to second invocation
+       of maybe_push_required_file.
+
+       Fix for PR automake/9:
+       * automake.in (make_dirs, make_dirs_set): New globals.
+       (is_make_dir): New function.
+       (handle_configure): Use it.
+       (require_file_internal): Push file if there is no Makefile in its
+       directory.
+       (initialize_per_input): Initialize handle_dist_run.
+       (push_dist_common): Inspect handle_dist_run.
+       (handle_dist): Set handle_dist_run.  Push items from
+       configure_dist_common onto dist_common if appropriate.
+       (configure_dist_common): New global.
+       (scan_configure): Set it.
+       (maybe_push_required_file): New function.
+       (require_file_internal): Use it.
+
+       * automake.in (handle_dist_worker): Scan DIST_COMMON to see if
+       more subdirs are defined.  From Axel Belinfante.  Fixes
+       PR automake/2.
+
+1999-12-18  Tom Tromey  <address@hidden>
+
+       Partial fix for PR automake/40:
+       * lisp.am (address@hidden@LISP): Handle nobase_ case.
+       (address@hidden@LISP): Likewise.
+       * header.am (address@hidden@HEADERS): Handle nobase_ case.
+       (address@hidden@HEADERS): Likewise.
+       * data.am (address@hidden@DATA): Handle nobase_ case.
+       (address@hidden@DATA): Likewise.
+       * automake.in (am_primary_prefixes): Recognize `nobase_' prefix.
+       (am_install_var): Recognize and handle `nobase_' prefix.
+
+1999-12-17  Tom Tromey  <address@hidden>
+
+       * automake.in (get_object_extension): Added space before `-I.'.
+       Report from Ralf Corsepius.
+
+1999-12-15  Tom Tromey  <address@hidden>
+
+       * aclocal.in: Don't pass $acdir to scan_m4_files.
+       (parse_arguments): Push $acdir on end of dirlist.
+       (scan_file): Don't warn if duplicate macro seen.
+
+1999-12-13  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/30 and PR automake/23.  Fixes test
+       suffix3.test.
+       * automake.in (initialize_per_input): Initialize
+       source_suffix_pattern.
+       (derive_suffix): New function.
+       (handle_single_transform_list): Call it.
+
+       * automake.in (add_depend2): Handle the no-dependency-tracking
+       case.  Fixes test suffix2.test.
+
+       * depcomp (tmpdepfile): [case sgi] Added missing `fi'.
+
+       * automake.in (get_object_extension): Fixed quoting on
+       -I$(srcdir).
+
+       * depend2.am: Removed erroneous comment.
+
+       * automake.texi (Program variables): Document nostdinc.
+       (Options): Likewise.
+       * automake.in (get_object_extension): Respect nostdinc option.
+       (handle_options): Recognize nostdinc.
+       * comp-vars.am (DEFS): Use @DEFAULT_INCLUDES@ as sole
+       substitution.
+
+       * automake.in (read_am_file): Allow conditional includes.  Fixes
+       test condincl.test.
+
+       * depcomp: Handle case on SGI when libtool is `yes'.
+       * depend2.am (@address@hidden): Set libtool.
+       (@address@hidden): Likewise.
+       (@address@hidden): Likewise.
+
+       * depcomp: Unify dashmstdout and dashXmstdout cases.  Move hp case
+       after gcc case.
+
+1999-12-13  Pavel Roskin  <address@hidden>
+
+       * automake.in (add_depend2): substitute $rule in the rules
+       for individual files.  Fixes test specflags5.test.
+
+1999-12-12  Tom Tromey  <address@hidden>
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Run mkinstalldirs
+       to create directories.  Fixes test subobj3.test.
+
+1999-12-10  Tom Tromey  <address@hidden>
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Don't print
+       message when creating .deps files.
+
+       * automake.in (initialize_global_constants): If unreadable by
+       owner, make it readable by owner regardless of number of links.
+       Fixes more of install2.test.
+
+       * missing: Try to see if gnutar or gtar exist before invoking
+       them.
+
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Remove ${SHELL} from
+       install_sh value.  Look for install-sh and install.sh in a
+       somewhat more sensible way.  Fixes test install2.test.  Partially
+       from Jim Meyering.
+
+1999-12-09  Pavel Roskin  <address@hidden>
+
+       * m4/missing.m4: remove redundant backquote
+
+1999-11-23  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Use `bzip2 -9', not
+       `bzip --best'  Report from Jim Meyering.
+
+1999-11-22  Tom Tromey  <address@hidden>
+
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Don't take argument.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't pass argument to
+       AM_MISSING_INSTALL_SH.
+       * automake.in (scan_one_configure_file): Reverted previous
+       change.
+
+       * automake.in (scan_one_configure_file): Define `install_sh'
+       configure variable when AM_INIT_AUTOMAKE seen.  Report from Jim
+       Meyering.
+
+       * automake.in (handle_single_transform_list): Generate explicit
+       rule for subdir objects.  Fixes new addition to subobj.test.
+
+       * automake.in (handle_lib_objects_cond): Allow LIBOBJS to be
+       defined by AC_SUBST.  Fixes ltlibobjs.test.
+
+       Fix for sourcesub.test:
+       * automake.in (handle_single_transform_list): Added `var'
+       argument.  If config sub found, give error.
+       (handle_source_transform): Updated for new
+       handle_source_transform.
+
+       * py-compile: New file.
+       * m4/Makefile.am (m4data_DATA): Added python.m4.
+       * m4/python.m4: New file.
+       * automake.texi (Uniform): Mention PYTHON.
+       (Python): New node.
+       * Makefile.am (amfiles): Added python.am, python-clean.am.
+       (dist_script_DATA): Added py-compile.
+       * python.am: New file.
+       * python-clean.am: New file.
+       * automake.in (seen_pythondir): New global.
+       (generate_makefile): Call handle_python.
+       (handle_python): New function.
+       (scan_one_configure_file): Set seen_pythondir if AM_PATH_PYTHON
+       seen.
+       (am_install_var): Special-case PYTHON like JAVA.
+       (scan_configure): Check for py-compile.
+       (initialize_global_constants): Added py-compile to @common_files.
+
+       * ltlib.am (address@hidden@LTLIBRARIES): Added missing space.
+
+1999-11-21  Tom Tromey  <address@hidden>
+
+       * automake.in (finish_languages): Only generate suffix rule when
+       not doing dependency tracking.
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AM_MISSING_INSTALL_SH.
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): New macro.
+
+       * depend2.am: Use @SOURCE@, @OBJ@, @LTOBJ@, @OBJOBJ@, and 
@address@hidden
+       Always use `-o'.
+
+1999-11-19  Tom Tromey  <address@hidden>
+
+       * dist.am: Set `CDPATH=:' to avoid problems.  Merged from
+       Alexandre's change on branch.
+
+1999-10-02  Alexandre Oliva  <address@hidden>
+
+       * Makefile.am (maintainer-check): Look for occurrences of ``cd'
+       without `CDPATH'.
+       * dejagnu.am: Set CDPATH before cd.
+       * Makefile.in: Rebuilt.
+
+       * automake.in (handle_single_transform_list): Change `\1' for `$1'
+       in `s///' replacement.
+
+       * automake.in (handle_dist): Set CDPATH before cd.
+       * dejagnu.am (check-DEJAGNU): Likewise.
+       * texinfos.am (install-info-am, dist-info): Likewise.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
+       * aclocal.m4, configure, Makefile.in: Rebuilt.
+
+       * AUTHORS: Added myself.
+
+1999-09-14  Alexandre Oliva  <address@hidden>
+
+       * m4/missing.m4: Support relative srcdir and ac_aux_dir.
+       Reported by Tim Wilkinson <address@hidden>
+       * aclocal.m4, configure: Rebuilt.
+
+1999-08-17  Alexandre Oliva  <address@hidden>
+
+       * m4/lex.m4 (AM_PROG_LEX): Require AM_MISSING_HAS_RUN and, if no
+       LEX program is found, use `${am_missing_run}flex'.
+
+1999-08-16  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Replace `$(OBJEXT)'
+       with `o' in depfile.
+
+       * automake.in (handle_lib_objects_cond): Remove second dot from
+       dependency file names.
+
+       * depend2.am (address@hidden@.obj): Dependency file should be .Po,
+       regardless of OBJEXT.
+
+       * automake.in (handle_dependencies): Add blank line after depend2.
+       (handle_dependencies): Start DEP_FILES with address@hidden@'.  Output
+       blank line before `include's, not after them.
+       (scan_one_configure_file): Do not special-case `DEP_' any more.
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Run for loop only
+       if AMDEP is empty.
+       * aclocal.m4, configure: Rebuilt.
+
+       * m4/depend.m4 (AMDEPBACKSLASH): Define.
+       * depend2.am (@address@hidden, @address@hidden, @address@hidden): Use 
AMDEPBACKSLASH.
+
+       * automake.in (handle_dependencies): Generate `include's for
+       dependency files after address@hidden@'.
+
+       * m4/missing.m4: Use eval, instead of a sub-shell, to test for
+       --run support in the missing script, since SHELL is not exported.
+       Reported by job bogan <address@hidden>
+       * aclocal.m4, configure: Rebuilt.
+
+1999-08-15  Alexandre Oliva  <address@hidden>
+
+       * aclocal.m4, configure: Rebuilt with itself.
+       * Makefile.in, m4/Makefile.in, tests/Makefile.in: Likewise.
+
+       * m4/missing.m4 (AM_MISSING_PROG): Remove DIRECTORY argument.
+       Require AM_MISSING_HAS_RUN.  Use am_missing_run, defined by...
+       (AM_MISSING_HAS_RUN): New macro.
+       * m4/init.m4: Remove missing_dir from calls to AM_MISSING_PROG.
+       * automake.texi (Requirements): Likewise.
+       * version.texi, stamp-vti: Rebuilt.
+
+1999-07-28  Tom Tromey  <address@hidden>
+
+       * depcomp: Handle the `hp' mode.
+
+1999-07-06  Tom Tromey  <address@hidden>
+
+       * depcomp: Work around HP-UX 10.20 sed bug.
+
+1999-07-05  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Generate a separate include
+       for each dep file.  Report from Alexandre Oliva.
+       * depend.am: Don't include DEP_FILES.
+
+1999-06-01  Alexandre Oliva  <address@hidden>
+
+       * depend.am: Add @AMDEP@ before `include', so that dependency
+       tracking can be disabled.
+       * depend2.am: Ditto, before all lines related with dependency
+       tracking.
+       * m4/depend.m4 (AM_DEP_TRACK): New macro, that documents
+       --enable/disable-dependency-tracking and sets AMDEP accordingly.
+       It is implicitly disabled if depcomp is missing.
+       (AM_DEPENDENCIES): Disable dependency tracking unless it can be
+       generated by side-effect.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_DEP_TRACK.
+       * automake.in (handle_dependencies): Add @AMDEP@ before the value
+       of DEP_FILES.
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Handle DEP_FILES
+       starting with `#'.
+
+       * depcomp: Support -xM for dependency generation, for Sun CC.
+       Reported by Alex Hornby <address@hidden>
+       * m4/depend.m4: Extract the list of supported dependency-tracking
+       mechanisms from the depcomp script and use it to test each one.
+       * THANKS: Added Alex Hornby.
+
+       * depend2.am: Move $(depcomp) to the line of $(...DEPMODE), so as
+       to leave $(...COMPILE) in a line by itself.
+
+       * THANKS: Added Miles Bader.
+
+1999-06-01  Miles Bader  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Add check for `makedepend'.
+       Fix `dashmstdout' to ignore non-dependency-generating uses of the
+       -M flag.
+       * depcomp (makedepend): New dependency-generating method.
+
+1999-06-01  Alexandre Oliva  <address@hidden>
+
+       * missing: If given `--run' as first argument, try to run the
+       given program before falling back to the ``emulated'' behavior.
+       Add support for `tar'.
+       * automake.in: Use new `tar' support for `dist'.
+       * m4/missing.m4 (AM_MISSING_PROG): Instead of checking for the
+       program, prepend `missing --run' to the given program name.
+       * m4/init.m4: Remove AMTAR-related stuff.
+       * NEWS: Updated.
+
+       * m4/depout.m4: Instead of `find'ing Makefiles, just iterate on
+       CONFIG_FILES.  Do not use temporary variable for list of
+       dependency files, it breaks Cygwin.
+
+1999-04-27  Alexandre Oliva  <address@hidden>
+
+       * depcomp (gcc): Imported comments removed from depend2.am, so
+       that we don't lose them.
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Avoid sed s/$U//
+       when not using ansi2knr.
+
+1999-04-26  Alexandre Oliva  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Test for depcc -E support.
+       * depcomp (cpp): Extract dependencies from `# nnn "..."' lines.
+
+1999-04-25  Alexandre Oliva  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Add a definition to conftest.h,
+       so as not to compile an empty source; some compilers fail on this.
+       Redirect stderr of depcc to /dev/null.  Test for -M with -o,
+       because some compilers will output the rules to the output file.
+       * depcomp (dashmstdout): Add --silent before --mode=compile, so
+       that we don't get libtool output mixed up with make rules.
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_DEPDIR.
+       * depend2.am: Set tmpdepfile too, to speed up depcomp.  Always use
+       -o for libtool, otherwise it may try to deduce the object name
+       from the dependency-generation flag.
+       * depcomp: Assume depdir exists.  Preserve depfile on unsuccessful
+       compilations.
+
+       * libtool.am: Do not emit .c.lo here...
+       * depend2.am: ... emit .*.lo here, only when using libtool.
+       * automake.in (get_object_extension): No more @MINUSO@ here.
+       (handle_single_transform_list): Set $depfile from $object.
+       (handle_dependencies): Emit depend2.am for all used languages,
+       regardless of $use_dependencies; the setting of depcomp makes the
+       difference.
+       (lang_cxx_finish): Do not emit compilation rules.
+       (lang_objc_finish): Likewise.
+       (lang_java_finish): Likewise.
+
+1999-04-21  Tom Tromey  <address@hidden>
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Correctly
+       interpolate DEPDIR in DEP_FILES expansion.
+
+1999-04-20  Lee Iverson  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Fix up test for SGI-style
+       dependency updating.
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Fix sed script to
+       handle multi-line dependency lists.
+
+1999-11-12  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/14:
+       * aclocal.in: Added `ud_GNU_GETTEXT'.  Updated to mention
+       AC_CYGWIN.
+       * automake.in: Mention AC_CYGWIN, not AC_CYGWIN32.
+
+       * m4/multi.m4: Added missing `]'.  From Akim Demaille.
+
+       * Makefile.am (path-check): Make sure distdir is writeable before
+       removing it.
+       * automake.in (handle_texinfo): Added `cm' and `ov' extensions.
+       (handle_dist_worker): Make sure distdir is writeable before
+       removing it.
+       (initialize_global_constants [$dist_trailer]): Make sure distdir
+       is writeable before removing it.
+       * dist.am (distcheck): Make the new source tree read-only before
+       compiling.  Idea from Karl Berry.
+
+       * automake.texi (Gnits): Allow COPYING.LIB again.
+       * automake.in (check_gnits_standards): Allow COPYING.LIB again.
+
+1999-11-11  Jim Meyering  <address@hidden>
+
+       * dist.am (distcheck): Remove $(distdir).tar.gz before counting
+       files.
+
+1999-11-09  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Typo fix.  From Jim Meyering.
+
+1999-11-09  Jim Meyering  <address@hidden>
+
+       * automake.in (handle_dist): Remove the DISTHOOK and GETTEXT
+       markers, no matter what.
+
+1999-11-08  Tom Tromey  <address@hidden>
+
+       * dist.am (distcheck): Put `&&' at the start of the distcheck-hook
+       line.
+
+       * automake.in (handle_dist_worker): Use `cp -R', not `cp -r'.
+       From Jim Meyering.  Also, don't mention file name in `cp'
+       destination.  From Olly Betts.
+
+1999-10-27  Miodrag Vallat  <address@hidden>
+
+       * texinfos.am (uninstall-info): Use installed info file, not one
+       from srcdir or builddir.
+
+1999-11-07  Tom Tromey  <address@hidden>
+
+       * clean.am (maintainer-clean-generic): Remove Makefile.in.  From
+       Jeff Bailey
+
+       Fix for PR automake/18:
+       * automake.in (handle_dist): Add contents of dist.am to the output
+       rules.
+       * Makefile.am (amfiles): Added dist.am.
+       * dist.am: New file.
+       (distcheck): Added uninstall and distclean checks.
+
+       * automake.in (PATH_PATTERN): Added `-' as allowable character.
+       Fixes PR automake/20.  From Matthew D. Langston.
+
+       * automake.in (SUFFIX_RULE_PATTERN): Add `0-9' as characters
+       allowed in suffixes.  Fixes PR 22.  From Matthias Clasen.
+
+1999-10-03  Alexandre Oliva  <address@hidden>
+
+       * m4/lispdir.m4: -batch must come before -q.
+       * elisp-comp: Likewise.
+       Reported by Lars Hecking <address@hidden>
+       * THANKS: Added Lars.
+
+1999-08-15  Tom Tromey  <address@hidden>
+
+       * automake.in (get_object_extension): Fixed quoting bug.  Fixes
+       ansi4.test.
+
+1999-07-27  Tom Tromey  <address@hidden>
+
+       * config.guess, config.sub: New versions from autoconf.
+
+1999-07-13  Tom Tromey  <address@hidden>
+
+       Work around losing `awk'.  Report from Harlan Stenn.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AC_PROG_AWK.
+       * tags.am (ID, TAGS): Use $(AWK), not `awk'.
+
+       * automake.in (handle_source_transform): Mark prefix as seen if
+       corresponding _SOURCES variable exists.  Fixes empty2.test.
+
+1999-06-25  OKUJI Yoshinori  <address@hidden>
+
+       * configure.in (ACLOCAL): Do not prepend the variable SRCDIR to
+       m4.
+       (AUTOMAKE): Set --amdir to current directory.
+
+1999-06-20  Tom Tromey  <address@hidden>
+
+       * Makefile.am (TAGS_FILES): New macro.
+       (ETAGS_ARGS): Moved files into TAGS_FILES.
+       (TAGS_DEPENDENCIES): Likewise.
+       (ETAGS_ARGS): Removed.
+       (TAGS_DEPENDENCIES): Removed duplicate definition.
+
+       * tags.am (ID): Handle VPATH correctly.  Use TAGS_FILES.  Report
+       from Ganesan Rajagopal.
+       (TAGS): Likewise.
+
+1999-06-18  Thomas Tanner  <address@hidden>
+
+       * automake.in (handle_ltlibraries): Check for -module in LDFLAGS,
+       too.
+
+1999-06-20 Mark Elbrecht <address@hidden>
+
+       * ylwrap: Handle filenames output by the DOS version of Bison.
+
+1999-06-20  Tom Tromey  <address@hidden>
+
+       * ylwrap: Be less strict when recognizing DOS paths.  From Mark
+       Elbrecht.
+
+1999-06-19  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Remove redundant entries from
+       DIST_SUBDIRS.
+
+       * automake.in (handle_lib_objects_cond): Better error message when
+       unrecognized option passed in LDADD.
+
+1999-06-08  Alexandre Oliva  <address@hidden>
+
+       * configure.in (ACLOCAL, AUTOMAKE): Use our own scripts, with
+       appropriate --acdir and --amdir arguments.
+
+1999-06-07  Alexandre Oliva  <address@hidden>
+
+       * automake.in (dist_header): Avoid changing permissions of files
+       in the source tree, trying a complex `find/chmod' command before
+       falling back to plain chmod.
+       (handle_dist_worker): Do not create directories with mode 777, the
+       find above will take care of that.
+       * m4/init.m4: Set install_sh for find/chmod above.
+
+       * THANKS: Added Shuhei Amakawa.
+
+1999-06-07  Shuhei Amakawa <address@hidden>
+
+       * mans.am: Strip dirname from given filename.
+
+1999-06-07  Jim Meyering  <address@hidden>
+
+       * automake.in (handle_dist): Change emitted rules so that a failure
+       in `$(MAKE) distcheck-hook' propagates to the outer make.
+
+1999-05-27  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Replace AM_FLAG and
+       not FLAG in compilation rule.
+       (add_depend2): Likewise.
+
+       * ltlib.am (address@hidden@LTLIBRARIES): Pass INSTALL_STRIP_FLAG to
+       libtool.
+
+       * m4/dmalloc.m4: Updated dmalloc site information.
+
+1999-05-19  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Push object name
+       without extension onto lang_specific_files.  Fixes
+       specflags4.test.
+
+       * automake.in (handle_single_transform_list): Added missing
+       space.  Fixes specflags.test.
+
+1999-05-05  Tom Tromey  <address@hidden>
+
+       * automake.in: Disabled dependency tracking for Java.
+
+1999-05-04  Tom Tromey  <address@hidden>
+
+       * library.am (@LIBRARY@): Use $(@address@hidden).
+       * automake.in (handle_libraries): Recognize _AR variable.
+
+1999-04-30  Tom Tromey  <address@hidden>
+
+       * automake.in (finish_languages): Always use `-o $@' with
+       libtool.  Define ltcompile and ltlink at outermost scope in
+       function.
+       * libtool.am (.c.lo): Removed.
+
+       * automake.in (finish_languages): Put `.' before extension in
+       suffix list, `.obj' rule, and `.lo' rule.  Look at `-flags', not
+       `-flag'.  From Pavel Roskin.
+
+1999-04-28  Tom Tromey  <address@hidden>
+
+       * automake.in (finish_languages): Fixed scoping of ltcompile and
+       ltlink.  From Pavel Roskin.
+
+1999-04-27  Tom Tromey  <address@hidden>
+
+       * automake.in (read_main_am_file): Don't start macro definition
+       with backslash-newline.  Instead, append newline at the end if
+       required.
+
+       * automake.in (read_am_file): Insert a backslash before a trailing
+       newline.  Fixes pluseq8.test.
+
+       * automake.in (MACRO_PATTERN): Allow digits and `_' to start a
+       macro name.
+       (check_canonical_spelling): Don't insert `AM' before macro name
+       (reverts Alexandre's 1999-04-27 patch).
+       * automake.texi: Reverted documentation change for `AM' patch.
+
+       * automake.in (handle_lib_objects_cond): Prefer `$1' over `\1'.
+       Minor rewrite for clarity.
+       (check_canonical_spelling): Prefer `$1' over `\1'.
+
+       * depend2.am (@OBJ@): Renamed.  Use @SOURCE@, @address@hidden  Always
+       use `-o $@'.
+       (@LTOBJ@): Likewise.
+       * automake.in (handle_single_transform_list): Don't print rule if
+       doing dependency tracking and the file's language supports it.
+       (initialize_per_input): Initialize lang_specific_files.
+       (add_depend2): New function.
+       (handle_dependencies): Use it.
+
+       * automake.in (lang_ppf77_finish): Use lang_f77_finish.
+       ratfor compiler name is `RCOMPILE'.  ppf77 compiler name changed
+       to `PPF77COMPILE' to allow use of f77 and ppf77 in the same
+       directory.
+       (lang_ratfor_finish): Use lang_f77_finish.
+
+       * compile.am (NOTDEPEND.c.o): Removed.
+       (OBJEXT.c.obj): Likewise.
+       * automake.in: Added `flags' attribute to all relevant languages.
+       (handle_single_transform_list): Handle per-derived-object flags.
+       Changed interface and all callers.
+       (handle_built_sources): Don't call handle_single_transform_list.
+       Added `compile' and `compiler-name' attribute to all relevant
+       languages.
+       (finish_languages): Define compiler variables here.
+       (lang_cxx_finish): Don't call define_compiler_variable.  Don't
+       define flag variable or .o rules.  Don't add to @suffixes.
+       (lang_f77_finish): Likewise.
+       (lang_ppf77_finish): Likewise.
+       (lang_objc_finish): Likewise.
+       (lang_java_finish): Likewise.
+       (finish_languages): Define flag variable here.
+       Added `output-arg' attribute to all relevant languages.
+       (finish_languages): Define `.o' rules here.
+       (finish_languages): Put extension on @suffixes.
+       (get_object_extension): Don't transform NOTDEPEND or MINUSO.
+
+1999-04-27  Alexandre Oliva  <address@hidden>
+
+       * automake.in (initialize_global_constants): Invoke gzip for
+       dist-shar just like in plain dist, i.e., pass it GZIP_ENV and -c.
+
+       * automake.in (initialize_global_constants): Remove zip file
+       before re-creating it.
+       Reported by Bob Friesenhahn <address@hidden>
+
+       * texinfos.am (uninstall-info): Look for info file in srcdir, just
+       like in install-info-am.
+       Reported by Tudor Hulubei <address@hidden>
+
+       * automake.in (handle_lib_objects_cond): \Q doesn't work either.
+       Let's use the good ol' substitution, then.
+       Reported by Russ Allbery <address@hidden>
+
+       * automake.in (check_canonical_spelling): Insert AM before names
+       starting with non-letters.
+
+       * automake.texi: Document it.
+
+1999-04-26  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_lib_objects_cond): Do not use quotemeta, it
+       doesn't work on perl4.  Maybe \Q and \E do.
+
+1999-04-24  Tom Tromey  <address@hidden>
+
+       * automake.in: Treat `.zip' and `.jar' files as Java.
+
+       * automake.in (generate_makefile): Define `subdir' after reading
+       .am file.
+       (read_main_am_file): Give programming error if variable defined
+       before invocation.
+
+1999-04-22  Tom Tromey  <address@hidden>
+
+       * automake.in (generate_makefile): Define `subdir' variable.
+       (handle_dist): Don't define `subdir'.
+
+       * automake.in (handle_texinfo): Change numbering scheme for
+       stamp-vti files, to avoid problems with DOS.
+       From Michel de Ruiter.
+
+       * automake.texi: Don't mention AM_FUNC_MKTIME.
+       * aclocal.in (obsolete_macros): Mention AM_FUNC_MKTIME.
+       * automake.in (scan_one_configure_file): Recognize
+       AC_FUNC_MKTIME, not AM_FUNC_MKTIME.
+       (obsolete_macros): Mention AM_FUNC_MKTIME.
+       * m4/Makefile.am (m4data_DATA): Removed mktime.m4.
+       * m4/mktime.m4: Removed.
+
+1999-04-20  Tom Tromey  <address@hidden>
+
+       * automake.texi (Top level): Don't recommend substing SUBDIRS.
+
+1999-04-20  Brian Ford <address@hidden>
+
+       * scripts.am: Change else if's to elif.
+
+1999-04-20  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_lib_objects_cond): Only require the source
+       of a LIBOBJ if it's not in BUILT_SOURCES.
+       Reported by Erez Zadok.
+
+1999-04-19  Tom Tromey  <address@hidden>
+
+       * automake.in: Treat `.class' files as Java source.
+       (lang_java_finish): Handle `.class' files.
+
+1999-04-18  Alexandre Oliva  <address@hidden>
+
+       * m4/lispdir.m4: Match only `/(share|lib)/x?emacs/site-lisp/*$'.
+
+       * m4/lispdir.m4: Do not override lispdir if it's already defined.
+       Run some emacs-lisp to find out the site-lisp directory, but
+       relocate it into prefix.
+
+1999-04-17  Paul Eggert  <address@hidden>
+
+       * m4/mktime.m4 (bigtime_test, main): Move alarm from
+       bigtime_test to main, since Solaris 7 (64-bit) mktime loops
+       even outside of bigtime_test.  Use a time limit of 60 seconds
+       for the whole test, not 10 seconds per iteration.
+
+1999-04-17  Erez Zadok  <address@hidden>
+
+       * automake.in: Create stamps for headers in appropriate
+       directories, even if the input file lives in a different place.
+       * remake-hdr.am: Likewise.
+
+1999-04-16  Tom Tromey  <address@hidden>
+
+       From Brian Ford:
+       * progs.am (address@hidden@PROGRAMS, address@hidden@PROGRAMS):
+       Invoke `sed' only once per program.
+       * scripts.am (address@hidden@SCRIPTS, address@hidden@SCRIPTS):
+       Invoke `sed' only once per program.
+
+1999-04-13  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_subdirs): Make `install-recursive' phony.
+       From Michel de Ruiter.
+
+       * automake.in (handle_ltlibraries): Added missing `check'.
+
+1999-04-12  Tom Tromey  <address@hidden>
+
+       * ansi2knr.c: New version from Pavel Roskin (via ansi2knr.c
+       maintainer).
+
+1999-04-11  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Use AMTAR.
+       (initialize_global_constants): Likewise.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AMTAR, not TAR.
+
+       * automake.in (lang_sub_obj): New function.
+       (lang_cxx_rewrite): Use it.
+       (lang_asm_rewrite): Likewise.
+       (lang_objc_rewrite): Likewise.
+       (lang_cxx_finish): Add `-o $@' to all C++ rules.
+       (lang_asm_finish): Add `-o' to suffix rules when appropriate.
+       (lang_objc_finish): Add `-o $@' to all ObjC rules.
+       (lang_java_finish): Likewise.
+
+       * automake.in: Only register `asm' once.
+       (lang_asm_finish): Put assembly suffixes on @suffixes.
+
+       * libtool.am (.s.lo): Removed.
+       (.S.lo): Likewise.
+       * automake.in (lang_asm_finish): Handle libtool.
+
+       * libtool.am (.c.o): Always pass -c to libtool.
+
+       * automake.in (lang_yacc_rewrite): Handle sources in subdirs.
+       (lang_yaccxx_rewrite): Likewise.
+       (lang_lex_rewrite): Likewise.
+       (lang_lexxx_rewrite): Likewise.
+
+       Assembly code no longer included by default:
+       * compile.am (.s.o): Removed.
+       (.S.o): Likewise.
+       * automake.in: Register `asm' language.
+       (lang_asm_finish): Generate suffix rules for assembly.
+       (get_object_extension): Don't add `.s' or `.S' to suffix list.
+
+       * automake.in (get_object_extension): Substitute @MINUSO@ when
+       including compile.am.
+       * compile.am (.c.o): Added @address@hidden
+       (.c.obj): Likewise.
+
+       First cut at allowing objects in subdirectories:
+       * m4/Makefile.am (m4data_DATA): Added minuso.m4.
+       * Makefile.am (dist_script_DATA): Added compile.
+       * m4/minuso.m4: New file.
+       * automake.in (initialize_global_constants): Added compile to
+       common_files.
+       (seen_cc_c_o): New global.
+       (scan_one_configure_file): Set it when AM_PROG_CC_C_O seen.
+       (handle_options): Recognize `subdir-objects' option.
+       (lang_c_rewrite): Added directory argument.
+       (lang_yacc_rewrite): Likewise.
+       (lang_yaccxx_rewrite): Likewise.
+       (lang_lex_rewrite): Likewise.
+       (lang_lexxx_rewrite): Likewise.
+       (handle_single_transform_list): Pass directory to _rewrite
+       function.  Generate dependencies for dirstamp files for each .o;
+       it is just the rules we want to create once.
+       (lang_c_rewrite): Handle `subdir-objects' option.
+       (lang_c_rewrite): Require `compile' program.
+       * compile: New file.
+
+       * automake.in (initialize_per_input): Initialize %directory_map.
+       (handle_single_transform_list): Only create .dirstamp rules once
+       per directory.
+
+       * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_PROGS, not AC_CHECK_PROG.
+
+       Fix for confh.test:
+       * automake.in (configure_input_files): New global.
+       (scan_configure): Set it.
+       (handle_configure): Use configure_input_files when determining
+       which subdirs have a Makefile.am.  Fixes confh.test.
+       (handle_configure): Only recognize acconfig.h in top srcdir.
+
+1999-04-10  Tom Tromey  <address@hidden>
+
+       * depend2.am (%.o): Use `$(*D)/$(*F)', not just `$(*F)'.
+       (%.lo): Likewise.
+
+       * automake.in (am_install_var): Remove redundancies from the
+       result.  Fixes test cond8.test.
+
+       * automake.in (handle_single_transform_list): Handle dependency
+       tracking when files are created in subdirs.  Error if object in
+       subdir has `..' component.
+
+       * automake.in (initialize_global_constants): Use $(TAR), not tar.
+
+       * automake.in (handle_ltlibraries): Allow check_LTLIBRARIES.
+
+       * automake.in (lang_yacc_finish): Added missing `&'.
+
+1999-04-10  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_configure): Replace multiple occurrences of
+       @STAMP@ in the same line; completes the patch for remake-hdr.am
+       below.
+
+       * automake.in (handle_dependencies): Fix test for `autodep'
+       support.
+
+       * automake.in (handle_source_transform): Add a pfx to used_pfx
+       only if it's conditional or non-empty, to reduce the number of
+       empty variables.  Emit _OBJECS variable based on program name if
+       no SOURCES were explicitly specified.
+
+       * remake-hdr.am: Create the stamp file before the header file,
+       and just rename it after, so that the timestamps will be correct.
+       Reported by Marc Horowitz <address@hidden>
+
+       * automake.in (lang_yacc_finish): Generate and dist a `.h' for a
+       `.y' iff YFLAGS or AM_YFLAGS contain `-d'.
+       Reported by Jim Meyering <address@hidden>
+
+       * automake.in (lang_yacc_finish): $hname must not contain a `.'.
+
+1999-04-10  Tom Tromey  <address@hidden>
+
+       * Makefile.am (EXTRA_DIST): New macro.
+       * ChangeLog.1996, ChangeLog.1998: New files.
+
+1999-04-09  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Handle dist and nodist
+       prefixes.
+       (initialize_per_input): Initialize dist_sources.
+       (check_libobjs_sources): Handle dist and nodist prefixes.
+       (generate_makefile): Define DIST_SOURCES.
+       * dist-vars.am (DISTFILES): Reference DIST_SOURCES, not SOURCES.
+
+       * automake.texi (Macros): Mention AM_PROG_GCJ.
+       (Java Support): New node.
+       (Dist): Documented dist_ and nodist_ prefixes.
+
+       * m4/gcj.m4 (AM_PROG_GCJ): Renamed from AC_PROG_GCJ.
+
+       * automake.in (lang_java_finish): Generate .lo rule for `.java'
+       files, not `.gcj' files.
+
+       * m4/gcj.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Added gcj.m4.
+
+       * automake.in: Register the `java' language.
+       (resolve_linker): Handle GCJLINK.
+       (lang_java_rewrite): New function.
+       (LANG_IGNORE, LANG_PROCESS, LANG_SUBDIR): New constants.
+       (lang_c_rewrite): Use new constants.
+       (lang_cxx_rewrite): Likewise.
+       (lang_header_rewrite): Likewise.
+       (lang_yacc_rewrite): Likewise.
+       (lang_yaccxx_rewrite): Likewise.
+       (lang_lex_rewrite): Likewise.
+       (lang_lexxx_rewrite): Likewise.
+       (lang_asm_rewrite): Likewise.
+       (lang_f77_rewrite): Likewise.
+       (lang_ppf77_rewrite): Likewise.
+       (lang_ratfor_rewrite): Likewise.
+       (lang_objc_rewrite): Likewise.
+       (handle_single_transform_list): Likewise.  Handle LANG_SUBDIR
+       return from rewrite function.
+       (lang_java_finish): New function.
+       (register_language): Changed interface and all calls.  Added
+       `autodep' settings to various languages.
+       (handle_dependencies): Use `autodep' property of language when
+       including dependency-tracking code.
+
+1999-04-07  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Indentation fixes.
+
+1999-04-07  Alexandre Oliva  <address@hidden>
+
+       * automake.in (value_to_list): Skip *only* trailing backslashes.
+
+1999-04-07  Pavel Roskin  <address@hidden>
+
+       * automake.in (value_to_list): Skip trailing backslashes.
+
+1999-04-07  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_texinfo): Add texinfo.tex to config_aux_dir
+       when appropriate.
+       Reported by Per Cederqvist <address@hidden>
+       (handle_texinfo): Do not define texinfo_tex='.', use
+       '$(srcdir)/texinfo.tex' instead; the directory name will be
+       properly extracted.
+       (require_conf_file_with_line): Fixed typo.
+
+1999-04-03  Raja R Harinath  <address@hidden>
+
+       * automake.in (handle_tests): Test `dir=./' before `dir=', so that
+       we do not depend on PATH starting with `.'.
+
+1999-03-31  Tom Tromey  <address@hidden>
+
+       * automake.in (quote_cond_val): Quote \n.
+       (unquote_cond_val): Unquote \n.
+       (read_am_file): If line ends with `\', preserve it and add a
+       newline.
+       (read_main_am_file): In conditional case, put conditional text at
+       beginning of each generated line.
+
+1999-03-31  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_tests): support XFAIL_TEST
+       * automake.texi: document it
+
+1999-04-12  Alexandre Oliva  <address@hidden>
+
+       * End of merge from trunk.
+
+1999-04-12  Alexandre Oliva  <address@hidden>
+
+       * automake.in (cmdline_use_dependencies): Reintroduce it.
+       (--ignore-deps): Set cmdline_use_dependencies again.
+       (handle_dependencies): If use_dependencies is not set, define
+       depcomp as empty.
+       (handle_configure): Pass --ignore-deps to generated Makefile.ins.
+       (scan_configure): Do not require depcomp when ignoring
+       dependencies.
+       (initialize_global_constants): Reintroduce --ignore-deps.
+
+1999-04-10  Alexandre Oliva  <address@hidden>
+
+       * depcomp: New file.
+       * Makefile.am (dist_script_DATA): Added depcomp.
+       * automake.in (cmdline_use_dependencies, omit_dependencies,
+       dependency_macros): Removed.
+       (--ignore-deps): Just ignore.
+       (handle_single_transform_list, dep_files): Named dependency files
+       as \$(DEPDIR)/$base.P$obj
+       (handle_lib_objects_cond): Likewise.
+       (generate_dependency_code): Do not check for AM_*_DEPENDENCIES.
+       (scan_one_configure_file): Likewise.
+       (handle_dependencies): Always enable auto-dep.  Define `depcomp'.
+       Ignore OMIT_DEPENDENCIES.
+       (handle_configure): Do not pass --ignore-deps.
+       (scan_configure): Require `depcomp'.
+       (initialize_global_constants): Make `depcomp' common.  Remove
+       `--ignore-deps' from usage.
+       (get_object_extension): No more NOTDEPEND in compile nor libtool.
+       * compile.am: Remove rules for .c.o and .c.obj
+       * depend.am (distclean-depend): Wipe out $(DEPDIR)
+       * depend2.am (@address@hidden): Define from config.status.
+       Use it and depcomp in suffix rules.
+       * libtool.m4: Likewise.
+       * m4/ccdepend.m4, m4/cxxdepend.m4: Removed.
+       * m4/depvars.m4, m4/objcdepend.m4: Likewise.
+       * m4/Makefile.am (dist_m4data_DATA): Likewise.
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Extract DEPDIR
+       from the Makefile and subst it in deps.  Report creation of deps
+       files (for now).  Replace $U with `_' and the empty string.  Write
+       a comment to each created file.
+       * m4/depend.m4 (AM_SET_DEPDIR): Select a valid deps dir name.
+       (AM_DEPENDENCIES): Accept CC, CXX and OBJC.  Just determine the
+       dependency mode and AC_SUBST [$1]DEPMODE.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Automatically call
+       AM_DEPENDENCIES for CC and CXX, if the corresponding AC_PROG
+       appears in configure.in, before or after AM_INIT_AUTOMAKE.
+
+1999-04-02  Raja R Harinath  <address@hidden>
+
+       * depout.m4: Fix sed expression for extracting `dirpart'.
+
+1999-03-29  Tom Tromey  <address@hidden>
+
+       * depend2.am (address@hidden@COMPILE): Use `!=' and not `-ne'.
+
+       * compile.am (.c.obj): Also disabled when dependency tracking
+       enabled.
+       * depend2.am (@address@hidden): New target.
+       * automake.in (get_object_extension): Added explanatory comment.
+       (generate_dependency_code): Handle $seen_objext.
+
+       * depend.am: Removed obsolete comment.
+       * depend2.am: Minor formatting fix.
+
+1999-03-28  Tom Tromey  <address@hidden>
+
+       * m4/Makefile.am (dist_m4data_DATA): Renamed, and added new
+       files.
+       (EXTRA_DIST): Removed.
+       * automake.in (dependency_macros): New global.
+       (scan_one_configure_file): Recognize new dependency tracking
+       macros, and define new resulting configure variables.
+       (generate_dependency_code): New sub.
+       (handle_dependencies): Use it.
+       * depend2.am (address@hidden@COMPILE): New macro.
+       (@address@hidden): Use it.
+       (@address@hidden): Likewise.
+       * m4/depvars.m4: New file.
+       * m4/objcdepend.m4: New file.
+       * m4/cxxdepend.m4: New file.
+       * m4/init.m4: Moved dependency handling code into depout.m4.
+       * m4/depout.m4: New file.
+       * m4/ccdepend.m4: New file.
+       * m4/depend.m4: New file.
+
+       * depend2.am (@address@hidden): Renamed to be old-style suffix pattern.
+       (@address@hidden): Likewise.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't create `.deps/.P'; it is no
+       longer needed.
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Add code to config.status which
+       will create the required .P files for dependency tracking.
+       * automake.in (scan_dependency_file): Removed.
+       (handle_dependencies): Never call scan_dependency_file.
+       (generate_deps): Removed.
+       (parse_arguments): Don't recognize --generate-deps, --build-dir,
+       --srcdir-name, or --include-deps.  Do recognize --ignore-deps.
+       (srcdir_name): Removed.
+       (build_directory): Removed.
+       (initialize_global_constants): Changed $USAGE to reflect argument
+       parsing changes.
+       (handle_dist_worker): Never run automake in `dist' rule.
+       (handle_configure): Use --ignore-deps, not --include-deps.
+       * depend.am (DEPS_MAGIC): Removed.
+       (DEP_FILES): Unconditionally include.
+
+1999-03-27  Tom Tromey  <address@hidden>
+
+       * automake.in (saw_sources_p): Correctly count header extensions
+       seen.
+       (handle_headers): Fixed order of arguments to am_install_var.
+
+       * automake.in (am_install_var): Don't error if EXTRA_foo is
+       defined uselessly.
+
+       * scripts.am (address@hidden@SCRIPTS): Use NDIR when appropriate.
+       (address@hidden@SCRIPTS): Likewise.
+       * progs.am (address@hidden@PROGRAMS): Use NDIR when appropriate.
+       (address@hidden@PROGRAMS): Likewise.
+       * ltlib.am (address@hidden@LTLIBRARIES): Use NDIR when appropriate.
+       (address@hidden@LTLIBRARIES): Likewise.
+       * lisp.am (address@hidden@LISP): Use NDIR when appropriate.
+       (address@hidden@LISP): Likewise.
+       * libs.am (address@hidden@LIBRARIES): Use NDIR when appropriate.
+       (address@hidden@LIBRARIES): Likewise.
+       * java.am (address@hidden@JAVA): Use NDIR when appropriate.
+       (address@hidden@JAVA): Likewise.
+       * header.am (address@hidden@HEADERS): Use NDIR when appropriate.
+       (address@hidden@HEADERS): Likewise.
+       * data.am (address@hidden@DATA): Use NDIR when appropriate.
+       (address@hidden@DATA): Likewise.
+       * Makefile.in: Rebuilt.
+       * Makefile.am (dist_pkgdata_DATA): Renamed.
+       (EXTRA_DIST): Removed.
+       (install-data-hook): Added POST_INSTALL; print commands as they
+       are run; respect DESTDIR.
+       * dist-vars.am (DISTFILES): Removed $(HEADERS).
+       * automake.in (am_install_var): Accept `-candist' and
+       `-defaultdist' options.  Handle `dist_' and `nodist_' prefixes.
+       (am_primary_prefixes): Added can_dist argument.  Recognize `dist_'
+       and `nodist_' prefixes.
+       (handle_scripts): Pass -candist to am_install_var.
+       (handle_data): Pass -defaultdist to am_install_var.
+       (handle_headers): Likewise.
+       (handle_emacs_lisp): Pass -candist to am_install_var.
+       (handle_java): Pass -candist to am_install_var.
+
+1999-03-26  Tom Tromey  <address@hidden>
+
+       * m4/init.m4: Fixed typo when invoking SHELL.
+
+       * automake.in (lang_yacc_finish): Always use `.h' as suffix for
+       yacc header file.  From Ralf Corsepius.
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am: Updated to reflect removal of TAR subst.
+       * automake.texi (Options): Document dist-bzip2.
+       * automake.in (TAR): Removed global.
+       (initialize_global_constants): Changed `dist' to use pipe with
+       gzip; work with non-GNU tar.
+       (handle_dist): Handle non-GNU tar.  Don't define TAR.
+       (initialize_global_constants): Added `dist-bzip2' entry.
+       (handle_options): Recognize dist-bzip2 option.
+       (handle_dist): Likewise.
+       * configure: Rebuilt.
+       * configure.in: Don't check for tar.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Check for `tar'.  Substitute
+       AMTARFLAGS.
+
+       * automake.in (am_install_var): Removed obsolete comment.
+
+       * texinfos.am (uninstall-info): Don't print loop but instead print
+       commands.  Simplified pre-uninstall loop.
+       * scripts.am (address@hidden@SCRIPTS): Don't print loop but
+       instead print commands.
+       * progs.am (address@hidden@PROGRAMS): Don't print loop but instead
+       print commands.
+       * ltlib.am (address@hidden@LTLIBRARIES): Don't print loop but
+       instead print commands.
+       * lisp.am (address@hidden@LISP): Strip subdir from file name.
+       (address@hidden@LISP): Likewise.  Also, don't print loop but
+       instead print commands.
+       * libs.am (address@hidden@LIBRARIES): Don't print loop but instead
+       print commands.
+       * java.am (address@hidden@JAVA): Don't print loop but instead
+       print commands.
+       * header.am (address@hidden@HEADERS): Strip subdir from file name.
+       (address@hidden@HEADERS): Likewise.  Also, don't print loop but
+       instead print commands.
+       * data.am (address@hidden@DATA): Strip subdir from file name.
+       (address@hidden@DATA): Likewise.  Also, don't print loop but
+       instead print commands.
+
+       * automake.in (handle_merge_targets): `install-strip' is a phony
+       target.  From Michel de Ruiter.
+
+1999-03-25  Tom Tromey  <address@hidden>
+
+       * automake.in (define_compiler_variable): Don't define variable
+       with trailing `_'.
+
+1999-03-25  Alexandre Oliva  <address@hidden>
+
+       * automake.in (LDADD): accept -dlopen and -dlpreopen here
+       * automake.texi: ditto
+
+1999-03-25  Alexandre Oliva  <address@hidden>
+
+       * automake.in (TESTS): make from Solaris 7/x86 loses if srcdir
+       is absolute and != objdir.  dir="" or "$(srcdir)/" fixes it
+
+1999-03-24  Tom Tromey  <address@hidden>
+
+       * automake.in (define_compiler_variable): New sub.
+       (finish_languages): Use it.
+       (lang_cxx_finish): Likewise.
+       (lang_f77_finish): Likewise.
+       (lang_ppf77_finish): Likewise.
+       (lang_ratfor_finish): Likewise.
+       (lang_objc_finish): Likewise.
+
+1999-03-23  Tom Tromey  <address@hidden>
+
+       * progs.am (address@hidden@PROGRAMS): Use `-e' instead of multiple
+       sed invocations.  From Elrond.
+       (address@hidden@PROGRAMS): Likewise.
+
+       * automake.in (lang_lex_finish): Rewrite `l', not `y', to `c'.
+       From Ralf Corsepius.
+
+1999-02-01  Thomas Tanner  <address@hidden>
+
+       * automake.in: accept both A(C|M)_PROG_LIBTOOL, print a
+       warning when AM_PROG_LIBTOOL was found
+       * automake.texi: renamed AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
+
+1999-03-22  Tom Tromey  <address@hidden>
+
+       Made `+=' more robust.  Fixes pluseq6.test and pluseq7.test.
+       * automake.in (define_standard_variables): New sub.
+       (read_main_am_file): Use two passes to scan standard variables.
+       (read_am_file): Don't special-case configure variables with `+='.
+       (initialize_per_input): Initialize %var_was_plus_eq.
+       (read_am_file): Set var_was_plus_eq element correctly.
+       (define_variable): Give error if variable assigned with `+=' is
+       internally defined.
+       (initialize_per_input): Initialize %am_var_defs.
+       (file_contents_with_transform): Set element in %am_var_defs.
+       (read_am_file): Use %am_var_defs.
+
+1999-03-21  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_per_input): Initialize %object_map.
+       (handle_single_transform_list): Allow source files in
+       subdirectories.
+
+1999-03-21  Jim Meyering  <address@hidden>
+
+       * automake.in (handle_dist): Add missing newline after the first
+       semicolon.
+
+1999-03-11  Tom Tromey  <address@hidden>
+
+       * m4/error.m4, m4/mktime.m4, m4/obstack.m4, m4/regex.m4,
+       m4/strtod.m4: Use $ac_objext, not `.o'.  From Jim Meyering.
+
+       From Jim Meyering:
+       * automake.in (handle_dist): Add `;\' to end of distcheck-hook
+       line.
+       (scan_one_configure_file): In LIBOBJS, recognize `$ac_objext' as
+       legitimate ending.  Fixes libobj9.test.
+
+       From Ralf Corsepius.  Fixes lex3.test.
+       * automake.in (lang_yacc_finish): Include `.' in name pushed onto
+       maintainer-clean list.
+       (lang_lex_finish): Likewise.
+
+1999-03-02  Tom Tromey  <address@hidden>
+
+       * subdirs.am (maintainer-clean-recursive): Changed "&&" into "if"
+       construct to work around FreeBSD make/sh problem.  From Rich Wales.
+
+1999-03-01  Tom Tromey  <address@hidden>
+
+       Fixes from Pavel Roskin:
+       * automake.in (variable_conditions_sub): Sort list passed to
+       variable_conditions_permutations.
+       (variable_conditions): Sort list before returning.
+
+1999-02-27  Tom Tromey  <address@hidden>
+
+       * automake.in (lang_extensions): New sub.
+       (handle_dependencies): Use it.
+       (cxx_extensions): Removed.
+       (lang_cxx_finish): Use lang_extensions.
+       (f77_extensions): Removed.
+       (lang_f77_finish): Use lang_extensions.
+       (objc_extensions): Removed.
+       (lang_ppf77_finish): Put `.' before extension.  Fixes ext.test.
+       Report from Dave Morrison.
+       (lang_ratfor_finish): Likewise.
+
+1999-02-26  Tom Tromey  <address@hidden>
+
+       * automake.in (finish_languages): Added AM_LDFLAGS.
+       (lang_cxx_finish): Likewise.
+       (lang_f77_finish): Likewise.
+       (lang_ppf77_finish): Likewise.
+       (lang_ratfor_finish): Likewise.
+       (lang_objc_finish): Likewise.
+
+1999-02-11  Tom Tromey  <address@hidden>
+
+       * aclocal.in (obsolete_macros): Copied from automake.in.
+       (obsolete_rx): Use only keys of obsolete_macros.
+       (scan_configure): Report replacement macro for an obsolete macro.
+       * automake.in (obsolete_macros): Added ud_GNU_GETTEXT.
+
+       * automake.in (obsolete_macros): Corrected typo in AM_EXEEXT
+       entry.  Fixes obsolete2.test.
+
+       * automake.in (obsolete_macros): Use empty string to indicate no
+       substitution.
+       (scan_one_configure_file): Likewise.
+
+1999-02-07  Paul Eggert  <address@hidden>
+
+       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Prefer -Ae to -Aa
+       -D_HPUX_SOURCE, since -Ae allows `long long' and this is
+       needed by some programs.
+
+1999-02-10  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Added `pgs' to list of
+       extensions.  From NISHIDA Keisuke.
+
+1999-02-04  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): remove texinfo.tex from
+       TEXINFODIR.
+
+1999-02-02  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG.
+       * progs.am (address@hidden@PROGRAMS): Added INSTALL_STRIP_FLAG.
+       * header-vars.am (INSTALL_PROGRAM): Removed
+       AM_INSTALL_PROGRAM_FLAGS.
+       (INSTALL_STRIP_FLAG): New macro.
+
+       * automake.in: Handle `ypp' as C++ yacc source and `lpp' as C++
+       lex source.
+       (lang_yacc_finish): Likewise.
+       (lang_lex_finish): Likewise.
+
+1999-02-01  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Correctly find find in $$d,
+       not $$.  From Bill Davidson.
+
+       * automake.in (finish_languages): Use "&", not "do".  From Pavel
+       Roskin.
+       (handle_single_transform_list): Likewise.
+
+1999-01-29  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Removed unused variable.  From
+       Pavel Roskin.
+
+       * ansi2knr.c: New version from L. Peter Deutsch.
+
+1999-01-22  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file_internal): Correctly examine return
+       value of `system'.  From Andris Pavenis.  Fixes copy.test.
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require autoconf 2.13.
+
+       * automake.in (lang_ppf77_rewrite): New function.  From Jochen
+       Kuepper.  Fixes ppf77.test.
+       (lang_ratfor_rewrite): New function
+
+       * automake.in (handle_configure): Use `&' before sub calls (Perl 4
+       fix).  From Erez Zadok.
+
+1999-01-15  Tom Tromey  <address@hidden>
+
+       * configure.in: Version 1.4a (oops).
+
+       * configure.in: Updated version to 1.5a.
+
+1999-01-14  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Compute $header_dir based on
+       $one_name, not $one_hdr.  Reported by Erez Zadok.  Fixes
+       confh2.test.
+       (handle_configure): Compute relative path to input header
+       correctly in all cases.
+
+       * automake.in (handle_tests): Avoid error messages from dejagnu
+       test rules.  From Karl Heuer.
+
+       * automake.in (handle_texinfo): Add `/' to end of $conf_dir.
+
+       * Makefile.am (AUTOMAKE_OPTIONS): Added `1.4'.
+
+       * texi-vers.am ($(srcdir)/address@hidden@): Find @TEXI@ in srcdir.
+       From Alexandre Oliva and Erez Zadok.
+
+       * automake.in (create): Renamed from touch.
+       (handle_configure): Use create, not touch.
+
+       * config.sub, config.guess: New versions from autoconf.
+
+       * mkinstalldirs: New version from autoconf.
+
+1999-01-12  Tom Tromey  <address@hidden>
+
+       * config.sub, config.guess, COPYING, texinfo.tex: New versions
+       from FSF.
+
+1999-01-11  Marcus G. Daniels  <address@hidden>
+
+       * automake.in (PATH_PATTERN): New variable:
+       (INCLUDE_PATTERN): Use it.  Ignore all include commands using
+       symbols besides $(top_srcdir) and $(srcdir).
+
+1999-01-11  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_dist_worker): avoid failure in `make dist'
+       if last file is a builddir-only file
+
+1999-01-11  Alexandre Oliva  <address@hidden>
+
+       * missing (autoheader): `s' was missing from sed script; grr
+
+1999-01-11  Tom Tromey  <address@hidden>
+
+       * remake-hdr.am (@STAMP@): Reverted timestamp change.
+       ($(srcdir)/@address@hidden): Likewise.
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * Makefile.am (scriptdir): New macro.
+       (script_DATA): Likewise.
+       (install-data-hook): Use them.
+       (EXTRA_DIST): Added script_DATA.
+       (installcheck-local): Use script_DATA.
+
+       * Makefile.am (pkgdata_DATA): Removed duplicate definition.
+
+1999-01-10  Alexandre Oliva  <address@hidden>
+
+       * missing (autoheader): accept multiple header files
+       (automake): simplify sed processing
+
+1999-01-10  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_configure, stamp_dir): create only one stamp
+       file per header, instead of one in the top-level directory and one
+       in the directory that contains the header.
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * automake.in (lang_objc_finish): Formatting fix.
+
+       * automake.in (objc_extensions): New sub.
+       (handle_dependencies): Only generate dependency-tracking code for
+       ObjC when ObjC source seen.
+
+-----
+
+Copyright 1999-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.01 b/old/ChangeLog.01
new file mode 100644
index 0000000..cb7b37a
--- /dev/null
+++ b/old/ChangeLog.01
@@ -0,0 +1,4937 @@
+2001-12-31  Tom Tromey  <address@hidden>
+
+       * automake.texi (Extending): Document installcheck-local.  Added
+       installdirs-local index entry.
+       (Tests): Document installcheck-local.
+
+       * automake.in (handle_single_transform_list): Indentation fix.
+
+2001-12-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (common_files): Add COPYING.DOC.
+       Suggested by Karl Berry.
+
+2001-12-30  Tom Tromey  <address@hidden>
+
+       * automake.in (define_configure_variable): Define a user macro,
+       not an automake macro.
+       * tests/Makefile.am (TESTS): Added ar.test.
+       * tests/ar.test: New file.
+
+       For PR automake/211:
+       * automake.in (object_compilation_map): New global.
+       (initialize_per_input): Initialize it.
+       (COMPILE_LIBTOOL): New constant.
+       (COMPILE_ORDINARY): Likewise.
+       * tests/Makefile.am (TESTS): Added pr211.test.
+       * tests/pr211.test: New file.
+
+       For PR automake/215:
+       * configure.in: Use AM_AUTOMAKE_OPTIONS.
+       * Makefile.am (AUTOMAKE_OPTIONS): Removed.
+       * automake.texi (Macros): Document AM_AUTOMAKE_OPTIONS.
+       (Options): Mention AM_AUTOMAKE_OPTIONS.
+       * automake.in (global_options): New global.
+       (global_options_line): Likewise.
+       (scan_autoconf_traces): Trace AM_AUTOMAKE_OPTIONS.
+       (scan_one_autoconf_file): Likewise.
+       (process_option_list): New function.
+       (handle_options): Use it.  Also, handle global options.
+       * m4/Makefile.am (m4data_DATA): Added options.m4.
+       * m4/options.m4: New file.
+
+       * lib/am/install.am (?SUBDIRS?installdirs-am): Handle
+       installdirs-local.
+       (?!SUBDIRS?installdirs): Likewise.
+       * automake.in (handle_installdirs): Handle installdirs-local.
+       * automake.texi (Extending): Mention installdirs.
+       * tests/Makefile.am (TESTS): Added installdir.test.
+       * tests/installdir.test: New file.
+
+2001-12-30  Akim Demaille  <address@hidden>
+
+       * lib/am/yacc.am: Also rename the possible y.output file.
+       Remove the trailing y.tab.h.
+
+2001-12-30  Paolo Bonzini  <address@hidden>
+
+       * automake.texi (Install): Remove mention of nonexistent
+       uninstall-hook.
+
+2001-12-30  Alan Modra  <address@hidden>
+
+       * automake.in (generate_makefile): Unlink output file before
+       opening so that any hard links are not changed.
+
+2001-12-30  Tom Tromey  <address@hidden>
+
+       * tests/pr220.test: Use `required' to pick up gcc.
+
+       For PR automake/243:
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Strip everything
+       after `:'.
+       * tests/Makefile.am (TESTS): Added pr243.test.
+       * tests/pr243.test: New file.
+
+       For PR automake/220:
+       * tests/Makefile.am (TESTS): Added pr220.test.
+       * tests/pr220.test: New file.
+       * m4/cond.m4 (AM_CONDITIONAL): Cause creation of config.status to
+       fail if conditional was never run.
+
+       For PR automake/260:
+       * lib/depcomp (tru64): Correctly handle libtool case.
+       From address@hidden
+
+2001-12-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distcleancheck_listfiles): Unquote.
+       Reported by Yann Droneaud.
+
+2001-12-29  Tom Tromey  <address@hidden>
+
+       For PR automake/266:
+       * tests/Makefile.am (TESTS): Added pr266.test.
+       * tests/pr266.test: New file.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Handle
+       non-standard name for makefile.
+
+       For PR automake/279:
+       * automake.in (conditional_ambiguous_p): New sub.
+       (handle_lib_objects_cond): Use it.
+       (check_ambiguous_conditional): Use it.
+       * tests/Makefile.am (TESTS): Added pr279.test, pr279-2.test.
+       * tests/pr279.test: New file.
+       * tests/pr279-2.test: New file.
+
+2001-12-26  Tom Tromey  <address@hidden>
+
+       For PR automake/249:
+       * tests/Makefile.am (TESTS): Added nodist2.test.
+       * tests/nodist2.test: New file
+
+2001-12-26  Ralf Corsepius <address@hidden>
+
+       * m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS.
+
+2001-12-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Test for Autoconf >= 2.52.
+       * tests/defs (needs_autoconf, has_autoconf): Delete definition.
+       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
+       tests/cond4.test, tests/cond9.test, tests/cond16.test,
+       tests/cond18.test, tests/cond19.test, tests/cond20.test,
+       tests/confsub.test, tests/depcomp2.test, tests/depdist.test,
+       tests/depend2.test, tests/dirname.test, tests/distname.test,
+       tests/extra5.test, tests/install2.test, tests/lex3.test,
+       tests/make.test, tests/nobase.test, tests/pr9.test,
+       tests/pr87.test, tests/stamph2.test, tests/subdir5.test,
+       tests/subdirbuiltsources.test, tests/subobj3.test,
+       tests/subobj5.test, tests/subobj6.test, tests/substref.test,
+       tests/target-cflags.test, tests/yacc4.test, tests/yacc7.test,
+       tests/yaccvpath.test: Do not use $needs_autoconf.
+
+2001-12-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.5c.
+
+2001-12-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.5b.
+
+       * lib/config.sub, lib/config.guess: New versions from FSF.
+
+       * lib/am/lex.am, lib/am/yacc.am: Use `rm -f', not `rm'.
+
+2001-12-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (check_gnu_standards, check_gnits_standards): Pass
+       "$am_file.am" as WHERE argument to require_file.
+
+2001-12-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (AM_PATH_PYTHON): Check all known Python interpreters
+       in loop until we find one the satisfies the user supplied version.
+       Add python2 to the list of known interpreters.  Don't use
+       changequote.  Cache the calculation of PYTHON_VERSION and
+       PYTHON_PLATFORM.
+       (AM_PYTHON_CHECK_VERSION): New function, extracted from
+       AM_PATH_PYTHON and modernized.
+       * m4/runlog.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Add it.
+
+2001-12-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/confsub.test, tests/depdist.test, tests/extra5.test,
+       tests/nobase.test, tests/stamph2.test,
+       tests/subdirbuiltsources.test: Require Autoconf.
+
+2001-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Dist): Document $(DISTCHECK_CONFIGURE_FLAGS).
+       * lib/am/distdir.am (distcheck): Honnor $(DISTCHECK_CONFIGURE_FLAGS).
+       Suggested by Merijn de Jonge.
+
+2001-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/tags.am (ID): Search $(LISP) files in $(srcdir),
+       like other ID dependencies.
+       Suggested by Christian Cornelssen.
+
+2001-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_dist): Distribute common files which
+       do not exist but are target of a Makefile rule.
+       * automake.texi (Dist): Update.
+       * test/builtcommon3.test: New file.
+       * test/Makefile.am (TESTS): Add distcommon3.test.
+
+2001-12-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (macro_define): Fix misuse of chomp introduced on
+       2001-11-28.
+
+2001-11-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (append_comments): New.  Extracted from
+       read_am_file.  Match '\n' with a regexp, don't use substr (the
+       perlport man page says '\n' is not always one byte wide).
+       (read_am_file):  Use it.  Always chomp $_.
+       (file_contents_internal):  Use append_comments.
+       (macro_define): Don't treat the trailing '\n' with substr, use
+       a regexp or chomp.
+
+2001-11-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs: Turn on shell traces when VERBOSE=x.
+
+2001-11-26  Tom Tromey  <address@hidden>
+
+       * automake.texi (Assembly Support): Mention .s and .S as only
+       suffixes.
+
+2001-11-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/subdirbuiltsources.test: Set -e after sourcing defs, not
+       before.
+
+2001-11-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/lex3.test: Require GNU Make.
+
+2001-11-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
+       directory.
+
+2001-11-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/tags.am (TAGS): Search %CONFIG% and $(LISP) files
+       in $(srcdir), like other TAGS dependencies.
+       Suggested by Christian Cornelssen.
+
+2001-11-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): Use $where when reporting an error,
+       not the place where the macro was first defined since (i) if this
+       is the first definition, then obviously it was not defined before,
+       and (ii) anyway, the error is with the new definition, not the
+       first.
+
+2001-11-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Call distcleancheck.
+       (distcleancheck_listfiles, distcleancheck): New, extracted from
+       distcheck.
+       * automake.texi (Checking the distribution): Document
+       distcleancheck_listfiles and distcleancheck.
+
+2001-11-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Parenthesize qw// in
+       foreach invocation, otherwise Perl5.005_03 complains about a
+       syntax error.  Reported by Yann Droneaud.
+
+2001-11-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Suppress FIXME about strange
+       map behavior.
+
+2001-11-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (aclocaldir): Check for existence of libtool.m4 and
+       gettext.m4 if required.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (define_objects_from_sources,
+       handle_lib_objects_cond, value_to_list): Use quotemeta instead of
+       the equivalant substitution.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (SUFFIX_RULE_PATTERN): Add '_(){}$@' to the
+       set of accepted characters in extensions.
+       (rule_define): Convert '.o' and '.obj' into '$(OBJEXT)' for
+       internall use.
+       * tests/suffix6.test: Ensure that `.o' is handled like `.$(OBJEXT)'.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Suffixes): Don't require SUFFIXES, but document
+       its use for the "extreme" cases.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (rule_define): Use $KNOWN_EXTENSIONS_PATTERN
+       to match suffix rules for known extensions, or call
+       accept_extensions on suffixe rules for unknown extensions.
+       (var_SUFFIXES_trigger): New function.
+       (macro_define): Call var_VAR_trigger when $VAR is updated.
+       * tests/suffix6.test, tests/suffix7.test: New files.
+       * tests/Makefile.am (TESTS): Add suffix6.test and suffix7.test.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (KNOWN_EXTENSIONS_PATTERN, known_extensions_list):
+       New variables.
+       (handle_single_transform_list, lang_yacc_target_hook): Use
+       KNOWN_EXTENSIONS_PATTERN.
+       (accept_extension): New function.
+       (register_language): Call it.
+
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       At every place where an "$extension" is used, include the leading
+       dot in the extension, don't hardcode it when building the filename.
+       That will make any support for a dot-less extension easier to add.
+
+       * automake.in (SUFFIX_RULE_PATTERN): Include extension dots in
+       backref groups.
+       ("main"): Prepend a '.' to the supported extensions of all
+       languages (e.g. 'c' becomes '.c').
+       (handle_languages, handle_single_transform_list,
+       handle_lib_objects_cond, handle_headers, derive_suffix,
+       rule_define): Do not add a dot
+       before extensions, and include dots in matching groups.
+       * lib/am/depend2.am (.%EXT%.o, .%EXT%.obj, .%EXT%.lo): Rename as ...
+       (%EXT%.o, %EXT%.obj, %EXT%.lo): ... these.
+       * lib/am/lex.am (.%EXT%.%DERIVED-EXT%): Rename as ...
+       (%EXT%%DERIVED-EXT%): ... this.
+       * lib/am/yacc.am: Likewise.
+
+2001-11-12  Akim Demaille  <address@hidden>
+
+       * m4/make.m4 (AM_MAKE_INCLUDE): Serial 2.
+       Use `"#"' and `"\""', which
+       Autoconf mode prefers over `'#'' and `'"''.
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Serial 3.
+       Rely on AC_MSG 2.50's quotation.
+
+2001-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Typo from 2001-11-05.
+
+2001-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distdir): Also look for directory in build
+       directory first. (See 2001-05-14.)
+       * tests/Makefile.am (TESTS): Add extra5.test.
+       * tests/extra5.test: New file.
+       From Dean Povey.
+
+2001-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for distcommon2.test:
+       * automake.in (automake_needs_to_reprocess_all_files): New
+       variable.
+       ("main"): Process all Makefiles a second time if
+       $automake_needs_to_reprocess_all_files is set.
+       (maybe_push_required_file): Return 1 or 0 whether the file is
+       pushed or not.
+       (require_file_internal): Set $automake_needs_to_reprocess_all_files
+       if an added file can't be pushed.
+
+       * test/distcommon2.test: New file.
+       * test/Makefile.am (TESTS): Add distcommon2.test.
+       From Pavel Roskin.
+
+2001-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (exec_dir_p): Remove.  Replace by...
+       (EXEC_DIR_PATTERN):... this.
+       (am_install_var): Adjust to use EXEC_DIR_PATTERN.
+
+2001-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for nobase.test:
+       * lib/am/header-vars.am (install_sh_DATA): New.
+       * lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use
+       %DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead
+       of $(INSTALL_DATA) for nobase_ targets.
+       * lib/am/lisp.am (install-%DIR%LISP): Likewise.
+       * lib/am/python.am (install-%DIR%PYTHON): Likewise.
+       * tests/nobase.test (configure.in): Append AC_OUTPUT.
+       * tests/Makefile.am (XFAIL_TESTS): Remove nobase.test.
+
+2001-11-08  Akim Demaille  <address@hidden>
+
+       * automake.texi: Remove references to stamp-h.in, which no longer
+       exists.
+       * tests/stamph2.test: Formatting change.
+
+2001-11-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/suffix3.test: Check for foo.$(OBJEXT) in Makefile.in.
+       Don't use -Wno-error.
+
+2001-11-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/suffix4.test ($AUTOMAKE): Don't use -Wno-error.
+       * tests/suffix5.test ($AUTOMAKE): Likewise.
+
+2001-11-07  Akim Demaille  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't escape quotes in
+       AC_MSG_ERROR.
+       Reported by Jim Meyering.
+
+2001-11-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (am__remove_distdir): Define in topdir only.
+
+2001-11-05  Paul Eggert  <address@hidden>
+
+       * lib/am/distdir.am (am__remove_distdir):
+       New macro.  Do not change permission of non-directories.
+       Change only user permission, as there's no point to changing group
+       or other permission.
+       (distdir, dist, dist-bzip2, dist-tarZ, dist-shar, dist-zip, dist-all,
+        distcheck): Use it.
+
+2001-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/python.am: Cleanup the cleaning section.
+       * automake.texi (Python): Remove documentation for PYCFILES
+       and PYOFILES.  Update the first paragraphes.
+
+2001-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (FOREIGN, GNU, GNITS, AC_CANONICAL_HOST,
+       AC_CANONICAL_SYSTEM, MOSTLY_CLEAN, DIST_CLEAN): Define as constants.
+       Adjust usage everywhere.
+
+2001-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (libtool_files, libtool_sometimes, common_files,
+       common_sometimes, config_aux_path): Use qw to simplify definition.
+       (scan_texinfo_file) <clean_suffixes, predefined_index,
+       hidden_index>: Likewise.
+       (scan_autoconf_traces) <traced>: Likewise.
+       (scan_one_autoconf_file, check_gnu_standards, resolve_linker):
+       Likewise.
+
+2001-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Pass $nonansi_obj to
+       derive_suffix.  Don't use an hardcoded 'o' for object extensions.
+       (derive_suffix): Accept $OBJ as a second argument, don't
+       hardcode 'o'.
+       * tests/suffix5.test: New test.
+       * tests/Makefile.am (TESTS): Add suffix5.test.
+       Reported by Arkadiusz Miskiewicz <address@hidden>.
+
+2001-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Don't call
+       $lang->target_hook for undefinied langages.
+       * tests/suffix4.test: New test.
+       * tests/Makefile.am (TESTS): Add suffix4.test.
+       Reported by Dmitry Mikhin <address@hidden>.
+
+2001-11-05  Akim Demaille  <address@hidden>
+
+       * automake.in (@common_sometimes, &handle_configure): No longer
+       use stamp-hin.
+       * lib/am/remake-hdr.am: Adjust.
+       * tests/confh.test: There is no stamp.hin.
+
+2001-11-01  Akim Demaille  <address@hidden>
+
+       * lib/am/lex.am, lib/am/yacc.am: Use the output file name in
+       `#line' and multiple inclusion guards.
+       * lib/ylwrap: Remove debugging code.
+       (input_dir, input_rx): Move where used.
+       Use the output file name in `#line'.
+
+2001-10-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (transform): Update documentation.
+
+2001-10-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/gcj.m4 (AM_PROG_GCJ): Define GCJFLAGS if unset.
+       Reported by Olivier Louchart-Fletcher <address@hidden>.
+
+2001-10-30  Akim Demaille  <address@hidden>
+
+       * automake.in (&create): Reinstall.
+
+2001-10-30  Akim Demaille  <address@hidden>
+
+       * automake.in (&append_exeext): Use macro_delete.
+
+2001-10-30  Akim Demaille  <address@hidden>
+
+       * automake.in ($verbose): Remove, inherited from
+       Automake::General.
+       (&variable_delete): Rename as...
+       (&macro_delete): this, for consistency.
+       (&variable_assert): New.
+       (&variable_value_as_list, &variable_value_as_list_recursive_worker):
+       Use it.
+
+2001-10-29  Akim Demaille  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Use AC_RUN_LOG to avoid
+       cluttering configure's stdout.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in: Various formatting changes.
+       (create): Remove, unused.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (&append_exeext): New.
+       (&am_primary_prefixes): Use it.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (am_primary_prefixes): Now, in accordance with its
+       comment, return the list of prefixes actually used, not all the
+       possible prefixes for a primary.
+       (&handle_libraries, &handle_ltlibraries, &handle_java)
+       (&am_install_var): Adjust.
+       * Makefile.am (maintainer-check): Allow `local $_;'.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in: Various formatting changes.
+       (&variable_defined): Second argument is optional.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_primary_prefixes): Now returns a list, not a
+       hash.
+       (&handle_libraries, &handle_ltlibraries, &handle_java)
+       (&am_install_var): Adjust.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (@libtoolize_files, @libtoolize_sometimes): Rename
+       as...
+       (@libtool_files, @libtool_sometimes): these.
+       ($libtool_location): Remove, completely replaced by $seen_libtool.
+       (&require_file_internal): Do not run libtoolize, that's
+       autoreconf's job.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
+       * tests/acouttbs.test, tests/auxdir.test, tests/colon.test,
+       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       * tests/conf2.test, tests/config.test, tests/depcomp.test,
+       * tests/depcomp2.test, tests/discover.test, tests/fpinst2.test,
+       * tests/fpinstall.test, tests/ldadd.test, tests/libobj7.test,
+       * tests/libobj8.test, tests/output.test, tests/output2.test,
+       * tests/output3.test, tests/output4.test, tests/output5.test,
+       * tests/pr2.test, tests/remake.test, tests/remake2.test,
+       * tests/remake3.test, tests/scripts.test, tests/stamph.test,
+       * tests/subdir.test, tests/subdir2.test, tests/subdir4.test,
+       * tests/tagsub.test, tests/texinfo8.test: Remove PACKAGE and VERSION
+       assignments.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_autoconf_traces): Use eq for equality.
+       Anchor regexps.
+       Remove dead comment.
+       (&initialize_per_input): Don't initialize several times the same
+       vars.
+
+2001-10-28  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): When using %generalize, be
+       sure to replace only words.  AC_FUNC_OBSTACK was matching
+       M4_AC_FUNC_OBSTACK.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * tests/stamph2.test: Strengthen.
+       * tests/confh2.test, tests/confh3.test: Remove.
+       These are bad tests: they don't check the effects, but some
+       internal details in Makefile.
+       And they are covered by stamph2.test.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       Now that stamp-h's are created by config.status, we don't need to
+       handle them in Makefile's.
+
+       * lib/am/remake-hdr.am (%STAMP%): Just run config.status.
+       * m4/header.m4 (_AM_STAMP): New.
+       (_AM_CONFIG_HEADER): Use it.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&generate_makefile, &handle_texinfo_helper)
+       (&handle_man_pages, &handle_dist, &handle_configure, &handle_all)
+       (&define_pretty_variable, &read_am_file, &file_contents_internal)
+       (&am_install_var, &push_dist_common, &unquote_m4_arg): Simplify
+       `join (' ', @list)' into `"@list"'.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * automake.in (@config_fullnames, @config_names): Remove.
+       (@config_headers): Now contains the actual spec used in
+       AC_CONFIG_HEADERS.
+       (&split_config_file_spec): New.
+       (&handle_tags, &handle_configure, &handle_all, &scan_autoconf_traces)
+       (&scan_one_autoconf_file): Adjust.
+       (&scan_one_autoconf_file): Pff, don't think _AM_CONFIG_HEADER is
+       AM_CONFIG_HEADER.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * m4/header.m4 (_AM_CONFIG_HEADER): New.
+       (AM_CONFIG_HEADER): Use it.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_configure): Use the config.status 2.50
+       invocation syntax for config files and headers.
+       autoheader needs the name of the file to create, not from what it
+       must be created, hence CONFIG_HEADER_FULL is $one_name, not
+       $one_fullname.
+       * lib/am/configure.am, lib/am/remake-hdr.am: Likewise.
+       * tests/confsub.test (SUBDIRS): Adjust to the new config.status
+       invocation.
+       Strengthen: Use the non-default config.hin source.
+       Strengthen: Make sure config.h is properly updated when config.hin
+       is changed.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_configure): Seeing Automake files in
+       @other_input_files is a programming error, not merely something to
+       ignore.
+       Factor slightly the code.
+
+2001-10-26  Akim Demaille  <address@hidden>
+
+       * automake.in ($canonical_location): New.
+       Use it.
+       (&require_config_file, $line_error): Remove.
+
+2001-10-24  Akim Demaille  <address@hidden>
+
+       * automake.in: Use &verbose.
+       (&generate_makefile, &scan_texinfo_file, &scan_aclocal_m4): Use
+       Automake::XFile.
+
+2001-10-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
+       Have the basename step optional and use %NDIR% instead of %DIR% in
+       filenames in order to support 'nobase_'.
+
+2001-10-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages, handle_single_transform_list,
+       lang_c_rewrite): Use require_conf_file instead of
+       require_config_file to require depcomp or compile from
+       Makefile.am.  (This is a part of my patch of 2001-10-15 which got
+       mistakenly reverted.)
+
+2001-10-24  Akim Demaille  <address@hidden>
+
+       * tests/confh.test: Since 2001-10-20 Kevin Ryde, stamp-h is
+       stamp-h1.
+
+2001-10-24  Akim Demaille  <address@hidden>
+
+       Since the ansi2knr patch from 2001-10-20 Kevin Ryde, `$U' can
+       appear in Makefile.in in the clean rule.
+
+       * tests/cxxansi.test: Adjust.
+
+2001-10-24  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_print_error, &am_file_error, &am_macro_error)
+       (&am_target_error, &am_line_error, &am_conf_error, &am_file_warning):
+       Rename as...
+       (&print_error, &file_error, &macro_error, &target_error, &line_error)
+       (&conf_error, &file_warning): these.
+       (&file_warning): Fix the prototype and argument handling.
+       (&am_line_warning): Remove, unused.
+
+       Also, repair the misapplication of previous patches.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in ($ac_output_location): Replace with...
+       ($ac_config_files_location): this.
+       (&scan_autoconf_traces): We don't need $file and $line, $here is
+       enough.
+       (&scan_one_autoconf_file): Use `$in_ac_output' to store the macro
+       name (AC_OUTPUT or AC_CONFIG_FILES) for error messages.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&require_file_with_macro): Use &require_file.
+       (&read_am_file): Move the definition of $here at its proper place.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in ($libtool_line, $seen_pythondir): Replace with...
+       ($libtool_location, $pythondir_location): these.
+       (&require_conf_file_with_line, &require_conf_file_with_line):
+       Remove, unused.
+       (&require_file): Don't forget $where.
+       (&require_conf_file): Ahem...  Fix the name.
+       (&require_config_file): Invoke &require_conf_file, not yourself.
+       (&am_line_error): Fix the default am_file_error invocation.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in ($seen_lispdir): Replace with...
+       ($am_lispdir_location): this.
+       (&require_conf_file): New.
+       (&require_config_file, &require_conf_file_with_line,
+       (&require_conf_file_with_conf_line): Use it.
+       (&require_conf_file_with_macro): New.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in ($config_header_line, $ac_output_line)
+       ($ac_gettext_line, $package_version_line): Replace with...
+       ($config_header_location, $ac_output_location)
+       ($ac_gettext_location, $package_version_location): these.
+       (&require_file_with_conf_line, &require_file_with_line): Remove,
+       no longer used.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&require_file_internal): Instead of $file and $line,
+       take $where as first argument.
+       Adjust all callers.
+       (&require_file_with_macro): New.
+       Use it where internal black magic was used to recover the location
+       of a macro definition.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file): Define and use `$here'.
+       Avoid using am_line_error.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_target_error): New.
+       Use it where appropriate instead of...
+       (&am_line_error): this.
+       Using it for a target is a croak error.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_macro_error): New.
+       Use it where appropriate instead of...
+       (&am_line_error): this.
+       Using it for a macro is a croak error.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * tests/asm.test: s/AC_PROG_AS/AM_PROG_AS/.
+       AC_OUTPUT a Makefile.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (%var_line): Rename as...
+       (%var_location): this.
+       Use it consistently as the location where the macro is defined,
+       file and line when possible, otherwise just file.
+       (&read_am_file): Rules have their own location tracking, don't
+       pollute %var_location.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (am_line_error): Clarify.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_print_error): Set $exit_status since all your
+       users do.
+       (&am_error, &am_file_error, &am_line_error, &am_conf_error):
+       Don't.
+       (&am_conf_line_error, &am_conf_line_warning): Remove.
+       Adjust callers to use &am_file_error and...
+       (&am_file_warning): new.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * m4/regex.m4: Use AC_LIBOBJ.
+       Require 2.50, and use AC_LIBSOURCES freely.
+       * tests/asm.tests: Formatting changes.
+       Exercise AM_PROG_AS.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * tests/install.test: This test is an empty shell, do not run
+       automake.
+       * tests/Makefile.am (TESTS): Don't run it.
+       * tests/defs (ACLOCAL): When using gettext, pass in the installed
+       aclocaldir.
+       * tests/subdircond.test (SUBDIRS): AM_GNU_GETTEXT needs automake
+       --add--missing.
+       * tests/obsolete2.test: Remove, merged into...
+       * tests/obsolete.test: here.
+       Both aclocal and automake should complain.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Don't recognize AC_SUBSTs
+       for symbols which cannot be Make macro names.
+       (scan_one_autoconf_file): `$here' is new.
+       Use it consistently instead of `1' to remember a token was seen.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * tests/subdircond.test: Requires gettext.
+       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
+       * tests/libobj6.test, tests/libobj9.test, tests/libtool.test,
+       * tests/libtool2.test, tests/ltdeps.test, tests/ltlibobjs.test,
+       * tests/nolink.test, tests/obsolete.test, tests/pr72.test,
+       * tests/sinclude.test, tests/subdircond.test, tests/subobj4.test:
+       Produce valid configure.in, use aclocal appropriately, declare
+       when libtool is required.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * m4/lex.m4: Don't run AC_DECL_YYTEXT, Autoconf does.
+       * automake.texi (Macros, Yacc and Lex): Adjust.
+       * automake.in ($seen_decl_yytext): Rename as...
+       ($seen_prog_lex): this.
+       (&scan_autoconf_traces): Add AC_PROG_LEX support.
+       (&scan_one_autoconf_file, &lang_lex_finish): Adjust.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_autoconf_traces): Add support for
+       AM_PATH_LISPDIR and AM_PATH_PYTHON.
+
+2001-10-21  Akim Demaille  <address@hidden>
+
+       * tests/defs (ACLOCAL): Point to the installed aclocaldir if
+       libtool is required.
+       * tests/lex.test: Run AC_INIT once.
+       * tests/ldflags.test, tests/listval.test, tests/suffix2.test:
+       Libtool is required.
+       * tests/header.test: Build a correct configure.in.
+       * tests/defun2.test (configure.in): Be a bit respectful with
+       Autoconf, close the macro invocations.
+       * tests/confdeps.test: Even when not using aclocal, aclocal.m4
+       must be correct.
+
+       * automake.in (scan_autoconf_traces): Add support for
+       AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, A[CM]_PROG_LIBTOOL,
+       AM_CONFIG_HEADER, AM_MAINTAINER_MODE.
+       * tests/condincl.test (target): Better pattern, to avoid matching
+       the definition of `target_alias' which is now properly discovered
+       as an AC_SUBST by traces.
+       * cond4.test: Better grep pattern: After all, why shouldn't
+       TWO_FALSE be AC_SUBST properly.
+       * tests/installsh.test (AUTOMAKE, ACLOCAL): Adjust.
+
+2001-10-20  Kevin Ryde <address@hidden>
+
+       * lib/am/ansi2knr.am (mostlyclean-kr): Only rm *_.c when
+       actually using ansi2knr.
+
+       * automake.in (handle_configure): Always put a number on $stamp_name,
+       to match AM_CONFIG_HEADER.
+
+2001-10-20  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added condd.test.
+       (XFAIL_TESTS): Added condd.test.
+       * tests/condd.test: New file.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_autoconf_traces): Add support for
+       AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and
+       AC_CONFIG_AUX_DIR.
+       * tests/alpha.test (configure.in): Automake wants a Makefile.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Use an unlikely to be used
+       separator between trace arguments, in particular not `:' as it is
+       within AC_CONFIG_FILES's $1.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * tests/alpha.test (configure.in): Create, don't append.  A single
+       AC_INIT is enough.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
+       * tests/acoutqnl.test, tests/acouttbs.test, tests/all.test,
+       * tests/alpha.test, tests/ansi.test, tests/asm.test,
+       * tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test,
+       * tests/badline.test, tests/block.test, tests/canon2.test,
+       * tests/check.test, tests/checkall.test, tests/clean.test,
+       * tests/colneq.test, tests/colneq2.test, tests/colon.test,
+       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       * tests/comment.test, tests/comment3.test, tests/cond.test,
+       * tests/cond2.test, tests/cond6.test, tests/cond7.test,
+       * tests/condincl.test, tests/condincl2.test, tests/condman.test,
+       * tests/condman2.test, tests/confdist.test, tests/confh.test,
+       * tests/confh2.test, tests/confh3.test, tests/confvar.test,
+       * tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
+       * tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test,
+       * tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test,
+       * tests/else.test, tests/empty.test, tests/exdir.test,
+       * tests/exdir2.test, tests/extra3.test, tests/extra4.test,
+       * tests/flibs.test, tests/fnoc.test, tests/fo.test,
+       * tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
+       * tests/fpinstall.test, tests/gcj2.test, tests/gnits.test,
+       * tests/include.test, tests/info.test, tests/insh.test,
+       * tests/insh2.test, tests/install.test, tests/installsh.test,
+       * tests/instdata.test, tests/instdata2.test, tests/instexec.test,
+       * tests/insthook.test, tests/instman.test, tests/instman2.test,
+       * tests/java.test, tests/javaprim.test, tests/javasubst.test,
+       * tests/libobj3.test, tests/link_f_only.test, tests/lisp.test,
+       * tests/man.test, tests/mclean.test, tests/mdate.test,
+       * tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
+       * tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test,
+       * tests/noinst.test, tests/obsolete.test, tests/obsolete2.test,
+       * tests/outdir.test, tests/output.test, tests/output2.test,
+       * tests/output3.test, tests/output4.test, tests/output5.test,
+       * tests/package.test, tests/pluseq.test, tests/pluseq2.test,
+       * tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test,
+       * tests/pluseq8.test, tests/ppf77.test, tests/pr2.test,
+       * tests/primary.test, tests/proginst.test, tests/python.test,
+       * tests/remake.test, tests/remake2.test, tests/remake3.test,
+       * tests/rulepat.test, tests/scripts.test, tests/seenc.test,
+       * tests/sinclude.test, tests/spell.test, tests/spell3.test,
+       * tests/spelling.test, tests/stamph.test, tests/subdir.test,
+       * tests/subdir2.test, tests/subdircond.test, tests/subst.test,
+       * tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
+       * tests/syntax.test, tests/tags.test, tests/tagsub.test,
+       * tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test,
+       * tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test,
+       * tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test,
+       * tests/texinfo9.test, tests/vars.test, tests/vartar.test,
+       * tests/version.test, tests/version2.test, tests/version3.test,
+       * tests/version4.test, tests/vpath.test, tests/vtexi.test,
+       * tests/vtexi2.test, tests/werror.test: Run aclocal before automake.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
+       * tests/acouttbs.test, tests/asm.test, tests/colon.test,
+       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       * tests/conf2.test, tests/confh.test, tests/confh2.test,
+       * tests/confh3.test, tests/confh4.test, tests/config.test,
+       * tests/confsub.test, tests/depend3.test, tests/discover.test,
+       * tests/fpinst2.test, tests/fpinstall.test, tests/gnits.test,
+       * tests/header.test, tests/ldadd.test, tests/ldflags.test,
+       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
+       * tests/libobj6.test, tests/libobj7.test, tests/libobj8.test,
+       * tests/libobj9.test, tests/mdate4.test, tests/obsolete.test,
+       * tests/output.test, tests/output2.test, tests/output3.test,
+       * tests/output4.test, tests/output5.test, tests/package.test,
+       * tests/parse.test, tests/pr2.test, tests/remake.test,
+       * tests/remake2.test, tests/remake3.test, tests/scripts.test,
+       * tests/stamph.test, tests/subdir.test, tests/subdir2.test,
+       * tests/subdir4.test, tests/subdirbuiltsources.test,
+       * tests/subobj4.test, tests/tagsub.test, tests/texinfo8.test,
+       * tests/yacc5.test, tests/yacc6.test, tests/yacc7.test: Remove
+       AC_ARG_PROGRAM, AC_PROG_INSTALL and AC_PROG_MAKE_SET invocation
+       since AM_INIT_AUTOMAKE requires them.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * tests/defs (configure.in): Use credible AM_INIT_AUTOMAKE
+       arguments.
+       Don't run AC_ARG_PROGRAM another time, it is required by
+       AM_INIT_AUTOMAKE.
+       * tests/aclocal.test: Work on the default configure.in
+       * tests/config.test (configure.in): Don't AC_ARG_PROGRAM.
+       First AM_INIT_AUTOMAKE, then AM_CONFIG_HEADER.
+
+       Be realistic in testing: AC_INIT is required for Autoconf.
+       Broken so called optimized tests break trace handling.
+
+       * tests/aclibobj.test, tests/aclocal.test, tests/acoutnoq.test,
+       * tests/acoutput.test, tests/acoutput2.test, tests/acoutqnl.test,
+       * tests/acouttbs.test, tests/acsilent.test, tests/alpha.test,
+       * tests/colon.test, tests/colon2.test, tests/colon3.test,
+       * tests/colon4.test, tests/colon5.test, tests/colon6.test,
+       * tests/colon7.test, tests/cond.test, tests/cond2.test,
+       * tests/cond3.test, tests/cond5.test, tests/conf2.test,
+       * tests/confh.test, tests/confh2.test, tests/confh3.test,
+       * tests/confh4.test, tests/config.test, tests/confsub.test,
+       * tests/ctarget1.test, tests/depcomp.test, tests/depend3.test,
+       * tests/distcommon.test, tests/dup3.test, tests/fpinst2.test,
+       * tests/fpinstall.test, tests/header.test, tests/ldflags.test,
+       * tests/libobj.test, tests/libobj10.test, tests/libobj2.test,
+       * tests/libobj6.test, tests/libobj7.test, tests/libobj8.test,
+       * tests/libobj9.test, tests/output.test, tests/output2.test,
+       * tests/output3.test, tests/output4.test, tests/parse.test,
+       * tests/pr2.test, tests/recurs.test, tests/recurs2.test,
+       * tests/remake.test, tests/remake2.test, tests/remake3.test,
+       * tests/req.test, tests/scripts.test, tests/subdir.test,
+       * tests/subdir2.test, tests/subdir4.test, tests/subobj4.test,
+       * tests/tagsub.test, tests/texinfo8.test, tests/version.test,
+       * tests/version2.test: Add AC_INIT in `configure.in'.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_autoconf_traces): Add support for
+       AM_INIT_AUTOMAKE, AM_CONDITIONAL.
+       Let @args have a more natural M4 correspondence: $1 is args[1], no
+       args[0] etc.
+       (&scan_autoconf_files): Using autoconf traces is no longer a
+       complement of the previous ad hoc scheme: use either.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_one_autoconf_file): `%generalize' is new, and
+       factors dedicated $libsources assignments.
+
+2001-10-20  Akim Demaille  <address@hidden>
+
+       * m4/error.m4, m4/obstack.m4, m4/ptrdiff.m4, m4/strtod.m4:
+       Remove, since Autoconf 2.52 has them.
+       * automake.in, aclocal.in, automake.texi: Adjust.
+
+2001-10-19  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_main_am_file): s/generated automatically/
+       generated/.
+       Insert @configure_input@, since 2.50 no longer output this
+       automatically for Makefiles.
+
+2001-10-19  Kevin Ryde <address@hidden>
+
+       * lib/am/check.am (check-TESTS): Add an "else true" to work with
+       Ultrix 4.5 /bin/sh when $(TESTS) is empty.
+
+2001-10-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add nobase.test.
+       * tests/nobase.test: New file.  Based on a bug report
+       from Martin Frydl <address@hidden>.
+
+2001-10-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (am_install_var): Don't strip nobase_ from $X, do
+       this with $nodir_name only.  Use $nodir_name where appropriate.
+
+2001-10-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages, handle_single_transform_list,
+       lang_c_rewrite): Use require_conf_file instead of
+       require_config_file to require depcomp or compile from Makefile.am.
+       (require_aux_file_with_line): New function, adapted from
+       require_conf_gile_with_line.
+       (require_conf_file_with_line, require_conf_file_with_conf_line):
+       Simplify using require_aux_file_with_line.
+       (require_config_file): Simplify using require_conf_file_with_conf_line.
+       (require_conf_file): New function.
+
+2001-10-15  Akim Demaille  <address@hidden>
+
+       * m4/depend.m4 (AM_DEP_TRACK): Use AC_SUBST([AMDEPBACKSLASH])
+       normally, what is wrong is that automake outputs a variable
+       definition for it, hence...
+       * automake.in (scan_one_autoconf_file): don't.
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): New, extracted
+       from...
+       (AM_OUTPUT_DEPENDENCY_COMMANDS): here.  Adjust.
+       Use AC_CONFIG_COMMANDS.
+       (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use AS_DIRNAME and AS_MKDIR_P.
+
+2001-10-15  Akim Demaille  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): Don't use m4_patsubst.
+
+2001-10-15  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_conditions): Be deterministic and Perl
+       version independent: sort the result.
+       (&variable_output, &variable_pretty_output): Sort all the @conds,
+       not only when defaulted.
+       * tests/cond3.test: Adjust.
+
+2001-10-15  Akim Demaille  <address@hidden>
+
+       * automake.in: Formatting changes.
+
+2001-10-15  Akim Demaille  <address@hidden>
+
+       * aclocal.in: Use Automake::General and Automake::XFile.
+       Use find_configure_ac.
+       Output the Emacs tags for Autoconf mode selection.
+
+2001-10-10  Akim Demaille  <address@hidden>
+
+       * lib/COPYING, COPYING, lib/config.guess, lib/config.sub: Update
+       from master copies.
+
+2001-10-09  Akim Demaille  <address@hidden>
+
+       Do not use Autoconf internals.
+
+       * tests/dirname.test: Don't use AC_PLAIN_SCRIPT.
+       * m4/header.m4 (_AM_DIRNAME): Use regexp and patsubst, not
+       m4_regexp and m4_patsubst, since the latter are reserved for ERE
+       macro in GNU M4 1.5.
+
+2001-10-08  Akim Demaille  <address@hidden>
+
+       * m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf
+       changed its name.
+
+2001-10-05  Akim Demaille  <address@hidden>
+
+       * automake.in (scan_autoconf_files): Use find_configure_ac from
+       General.
+
+2001-10-02  Akim Demaille  <address@hidden>
+
+       * lib/Automake/Struct.pm: Update from Autoconf.
+       * lib/Automake/General.pm, lib/Automake/XFile.pm: New, from CVS
+       Autoconf.
+       * automake.in: Use them.
+       (&uniq, $me): Remove, as they are provided by Automake::General.
+
+2001-10-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Don't check for 'cd' calls in m4.
+       * lib/am/tags.am (GTAGS): Use $(am__cd) instead of 'CDPATH=: && cd'.
+       * lib/am/dejagnu.am (check-DEJAGNU): Likewise.
+       * lib/am/distdir.am (distcheck): Likewise.
+       * lib/am/texinfos.am (install-info-am, dist-info): Rewrite without
+       using cd so we don't have to fiddle with CDPATH.
+       * lib/am/header-vars.am (am__cd): Define so as to support Zsh and
+       DOSish path separator.
+
+2001-10-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/python.am (install-%DIR%PYTHON,
+       uninstall-%DIR%PYTHON): Strip path of source file.
+       (clean-python): Comment out.
+
+2001-10-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_python): Use require_conf_file_with_conf_line
+       instead of require_file_with_conf_line, so that elisp-comp and
+       py-compile are installed in the aux-directory.
+       (handle_emacs_lisp): Likewise.  Define elisp_comp.
+       * lib/am/lisp.am (.el.elc): Use elisp_comp.
+
+2001-10-01  Akim Demaille  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Report the trailing files.
+       Run `dist-gzip', not `dist', as it may leave other distribution
+       flavors.
+
+2001-09-29  Paul Eggert  <address@hidden>
+
+       * lib/mkinstalldirs: Use "mkdir -p" if it works, as that fixes
+       bugs when making file names with unusual characters.  Quote chmod
+       arg "$dirmode", in case it contains white space.
+
+       Incorporate the following change from autoconf mkinstalldirs:
+
+       1999-04-10  Ben Elliston  <address@hidden>
+
+       Add `-m' flag to specify the mode of a newly created
+       directory.  Add command line usage and `-h', `--help' options.
+       Contributed by Jeff Garzik.
+
+2001-09-27  Akim Demaille  <address@hidden>
+
+       * m4/cond.m4, m4/init.m4, m4/header.m4: Remove Autoconf 2.13 code.
+
+2001-09-27  Akim Demaille  <address@hidden>
+
+       * lib/am/distdir.am (dist): Rename as...
+       (dist-gzip): this.
+       (dist): Additional name for dist-all.
+       * automake.texi (Options, Dist): Adjust.
+
+2001-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (obsolete_macros): Update AM_EXEEXT message.
+       * automake.in (obsolete_macros): Likewise.
+       (seen_objext): Remove (unused).
+       (scan_one_autoconf_file): Don't handle AC_OBJEXT.
+       * lib/am/header-vars.am (EXEEXT, OBJEXT,
+       PATH_SEPARATOR): New variables.
+       * tests/obsolete2.test: Use AM_FUNC_FNMATCH instead of AM_EXEEXT.
+
+2001-09-23  Tim Van Holder  <address@hidden>
+
+       * m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
+       neutralize CDPATH for us.
+       * m4/init.m4: Don't substitute EXEEXT or OBJEXT anymore.
+       * lib/am/texibuild.am: Use $(PATH_SEPARATOR), not ':' to build
+       TEXINPUTS.
+
+2001-09-22  Akim Demaille  <address@hidden>
+
+       * configure.in, NEWS: Bump to 1.5a.
+       Require 2.52.
+
+2001-09-22   Paul Eggert  <address@hidden>
+
+       * ChangeLog, ChangeLog.1996, ChangeLog.1998, ChangeLog.2000,
+       Makefile.am, NEWS, README, TODO, configure.in, lib/Makefile.am,
+       lib/acinstall, lib/am/Makefile.am, m4/Makefile.am, m4/as.m4,
+       m4/auxdir.m4, m4/ccstdc.m4, m4/cond.m4, m4/depend.m4,
+       m4/depout.m4, m4/dmalloc.m4, m4/error.m4, m4/gcj.m4, m4/header.m4,
+       m4/init.m4, m4/install-sh.m4, m4/lex.m4, m4/lispdir.m4,
+       m4/maintainer.m4, m4/make.m4, m4/minuso.m4, m4/missing.m4,
+       m4/multi.m4, m4/obstack.m4, m4/protos.m4, m4/ptrdiff.m4,
+       m4/python.m4, m4/regex.m4, m4/sanity.m4, m4/strip.m4,
+       m4/termios.m4, m4/winsz.m4: Add copyright notice.
+
+       * INSTALL, lib/INSTALL: Upgrade to latest autoconf version,
+       which has a copyright notice.
+
+       * m4/strtod.m4: Correct the dates on the copyright notice.
+
+2001-09-17  Akim Demaille  <address@hidden>
+
+       * lib/missing (autom4te): New.
+       (aclocal, autoconf, automake, autoheader, help2man): Propagate
+       actual failures.
+
+2001-08-27  Tom Tromey  <address@hidden>
+
+       * automake.texi (A Shared Library): Clarify installation
+       requirement.
+       (Install): Typo.  From Adrian Bunk.
+
+2001-08-27  Tom Tromey  <address@hidden>
+
+       * automake.texi (Macros): Typo fix.
+       From Christian Cornelssen
+
+2001-08-27  Tom Tromey  <address@hidden>
+
+       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
+       tests/cond4.test, tests/cond16.test, tests/cond18.test,
+       tests/cond19.test, tests/depcomp2.test, tests/depend2.test,
+       tests/lex3.test, tests/pr87.test, tests/subobj3.test,
+       tests/substref.test: Clear CFLAGS.
+
+       * automake.texi (Yacc and Lex): Mention lex, not yacc.
+       From Alexey Mahotkin.
+
+2001-08-27  Tom Tromey  <address@hidden>
+
+       * tests/yacc7.test: Use test -f, not test -e.
+
+2001-08-27  Adrian Bunk  <address@hidden>
+
+       * automake.texi (etags): Typo fix.
+
+2001-08-27  Guido Draheim <address@hidden>
+
+       * automake.in : restrict ansi2knr option to be a filepath
+
+2001-08-23  Richard Boulton <address@hidden>
+
+       * tests/yacc7.test: Actually add this file: was accidentally omitted.
+
+2001-08-22  Tom Tromey  <address@hidden>
+
+       * automake.texi (Conditionals): Mention that conditionals must
+       always be invoked.  For PR automake/220.
+
+2001-08-22  Richard Boulton <address@hidden>
+           Tom Tromey  <address@hidden>
+
+       * automake.in (lang_yacc_target_hook): Make header file depend on
+       .c file, not .y file.
+       * lib/am/yacc.am: Non-generic rule changed to depend on %OBJ% (the
+       .c file) rather than %SOURCE% (the .y file)  Removed `.y.h' rule.
+       * tests/yacc7.test: New file.
+       * tests/Makefile.am (TESTS): Added yacc7.test.
+
+2001-08-22  Tim Van Holder  <address@hidden>
+
+       * m4/missing.m4: Require AM_AUX_DIR_EXPAND and use $am_aux_dir.
+
+2001-08-18  Tom Tromey  <address@hidden>
+
+       * automake.texi (Dist): Mention dist-all.
+
+2001-08-18  Tom Tromey  <address@hidden>
+
+       * tests/cond3.test: Use portable sed expression.
+       From Richard Boulton.
+
+2001-08-13  Richard Boulton <address@hidden>
+
+       * automake.in (handle_source_transform): Call
+       define_objects_from_sources() instead of calling
+       variable_value_as_list(), handle_single_transform_list() and
+       define_pretty_variable() directly.
+       (handle_single_transform_list): Add $topparent parameter, used for
+       error messages.  Improved error message.
+       (define_objects_from_sources): New function.
+       (subobjname): New function.
+       (variable_conditions_recursive): New name for variable conditions.
+       (variable_value_as_list_recursive): New name for variable_value_as_list.
+       (variable_value_as_list_worker): Renamed to ...
+       (variable_value_as_list_recursive_worker): ... this.
+       (variable_conditions_sub): Renamed to ...
+       (variable_conditions_recursive_sub): ... this.
+       (variable_conditions): Rewritten: now doesn't recurse subvariables.
+       (variable_value_as_list): Rewritten: now doesn't recurse subvariables.
+       (substfroms): New global.
+       (substtos): New global.
+       (substnums): New global.
+       * tests/cond3.test: Update to work with new method of defining _OBJECTS.
+       * tests/cond4.test: Update to work with new method of defining _OBJECTS.
+       * tests/sourcesub2.test: New test.
+       * tests/Makefile.am (TEST): Added sourcesub2.test.
+
+2001-08-11  Tom Tromey  <address@hidden>
+
+       * configure.in: Upped to 1.4s.
+
+2001-08-09  Richard Boulton <address@hidden>
+
+       * automake.in (handle_single_transform_list): Use new global,
+       `%linkers_used', to store the linkers used, rather than an internal
+       variable.  Enables correct linker to be calculated across a group
+       of calls to &handle_single_transform_list.  Return only list of
+       objects, since linker to be used is now externally determined.
+       (handle_source_transform): adapted for new calling conventions of
+       handle_single_transform_list.  Calls resolve_linker() on a set of
+       all the linkers used for any prefix, rather than for each prefix in
+       turn.
+       (linkers_used): New global.
+       * tests/link_dist.test: New test.
+       * tests/Makefile.am (TESTS): Added link_dist.test.
+
+2001-08-08  Raja R Harinath  <address@hidden>
+
+       Dissociate testsuite 'make' invocations from outer 'make'.
+       * tests/defs: Unset the MFLAGS, MAKEFLAGS and MAKELEVEL
+       environment variables.
+       * tests/cond16.test: Use '$MAKE -s', and avoid GNU make
+       dependency.
+       * tests/substref.test: Likewise.
+
+2001-08-08  Richard Boulton <address@hidden>
+
+       * tests/cond18.test: New file.
+       * tests/cond19.test: New file.
+       * tests/cond20.test: New file.
+       * tests/cond4.test: Updated to check the generated _OBJECTS more
+       thoroughly.
+       * tests/Makefile.am (TESTS): Added cond18.test, cond19.test and
+       cond20.test
+
+2001-08-08  Richard Boulton <address@hidden>
+
+       * automake.in (file_contents_internal): if a rule is conditionally
+       defined, define the standard automake definition for it for those
+       conditions which are not conditionally defined.
+       (invert_conditions): New function: invert a list of conditionals.
+
+       * tests/cond14.test: New file.
+       * tests/cond15.test: New file.
+       * tests/Makefile.am (TESTS): Added cond14.test and cond15.test.
+
+2001-08-05  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added dejagnu2.test.
+       * tests/dejagnu2.test: New file.
+       * lib/am/dejagnu.am (site.exp): Don't conditionalize.
+       * automake.in (handle_scripts): Removed dead code.
+       (handle_tests_dejagnu): Don't handle site.exp generation
+       specially.
+
+2001-08-04  Richard Boulton <address@hidden>
+
+       * tests/cond17.test: New file: test for being able to define an
+       object to be generated in different ways according to a
+       conditional.
+       * tests/Makefile.am (XFAIL_TESTS): Add cond17.test.
+       (TESTS): Added cond17.test.
+
+2001-08-02  Richard Boulton <address@hidden>
+
+       * automake.in (variable_conditions_sub): Handle variable
+       substitution refs when computing conditions based on subvariable
+       conditions.  Fixes substitution refs of system variables when sub
+       variable is conditional.
+       (SUBST_REF_PATTERN): New global.
+       * tests/cond16.test: New file: regression test for variable
+       substitution refs.
+       * test/Makefile.am (TESTS): Added cond16.test.
+
+2001-08-03  Tom Tromey  <address@hidden>
+
+       * tests/substref.test: Require GNU make; backed out previous
+       change.
+
+       * tests/substref.test: Handle entering/leaving directory
+       messages.
+
+2001-08-03  Richard Boulton <address@hidden>
+
+       * automake.in (value_to_list): Check for whether $from is defined,
+       rather than whether it is true, so that empty $froms are allowed in
+       substitution reference patterns.
+
+       * tests/substref.test: New file: test behavior of substitution
+       references when the $from side of the substitution is empty.
+       * tests/Makefile.am (TESTS): Added substref.test.
+
+2001-08-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/install-sh.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Add install-sh.m4.
+       * m4/missing.m4 (AM_MISSING_INSTALL_SH): Move ...
+       * m4/install-sh.m4 (AM_PROG_INSTALL_SH): ... here.  Don't check
+       for install.sh any longer, always use install-sh, don't even
+       fall back to missing.  Use $am_aux_dir, making $install_sh absolute.
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Simplify, since $install_sh
+       is absolute.
+       * m4/init.m4: Adjust call to AM_PROG_INSTALL_SH.
+
+2001-08-02  Tim Van Holder  <address@hidden>
+
+       * automake.texi (EXEEXT): Clarify.
+
+2001-08-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Typo.
+
+       * m4/auxdir.m4: More comments.
+
+2001-07-31  Richard Boulton <address@hidden>
+           Raja R Harinath <address@hidden>
+
+       * automake.in (variable_conditions_sub): Remove @parent_conds
+       argument.  This was old logic - duplicate or impossible
+       conditionals are removed later by &variable_conditions_reduce().
+       Fixes tests/cond13.test.
+       (conditionals_true_when): Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Removed cond13.test.
+
+2001-07-31  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added cond13.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/cond13.test: New file.
+
+       * configure.in: Upped to version 1.4k.
+
+       * configure.in: Released 1.4j.
+
+       * lib/config.guess: Updated from master sources.
+       * lib/config.sub: Likewise.
+
+2001-07-30  Tom Tromey  <address@hidden>
+
+       * automake.texi (A Program): Typo.  Added subsections and more
+       text about conditional compilation.
+       (A Shared Library): Moved earlier.
+       (Program variables): Updated LINK text.  Added AM_CFLAGS.
+       (C++ Support): Added AM_CXXFLAGS.
+       (Fortran 77 Support): Added AM_FFLAGS and AM_RFLAGS.
+       (EXEEXT): New node.
+
+       * tests/Makefile.am (TESTS): Added aclibobj.test.
+       * tests/aclibobj.test: New file.
+       * automake.in (handle_lib_objects_cond): Avoid undefined variable
+       error.
+       (scan_one_autoconf_file): Handle AC_LIBSOURCE and AC_LIBSOURCES.
+
+       * automake.texi (Dist): Mention other distribution types.
+       (Install): Updates.
+
+2001-07-29  Tom Tromey  <address@hidden>
+
+       * automake.texi (Program and Library Variables): Texinfo fix.
+       From Alexey Mahotkin.
+
+2001-07-28  Tom Tromey  <address@hidden>
+
+       * automake.texi (Strictness): Mention Cygnus mode.
+       (Cygnus): Updated.
+       (Uniform): Likewise.
+       (Canonicalization): Likewise.
+       (Install): Add `nobase_' to example; typo fix.
+       (Clean): Typo.
+       (Dist): Expand on putting a directory into EXTRA_DIST.  Insert
+       section markers.
+       (Options): Texinfo fixes; some text updates.
+       (Tags): Update.
+
+2001-07-27  Tom Tromey  <address@hidden>
+
+       * automake.texi (Invoking Automake): Document --Werror and
+       --Wno-error.
+
+2001-07-26  Tom Tromey  <address@hidden>
+
+       * tests/nolink.test: Added no-exeext.
+
+       * automake.in (check_variable_defined_unconditionally): Don't call
+       macro_dump.
+
+       * automake.texi (Optional): Don't mention ALL_LINGUAS.
+       (gettext): Likewise.
+       * automake.in (seen_linguas, all_linguas, all_linguas_line):
+       Removed.
+       (handle_gettext): Don't do any checking of the languages.
+       (scan_one_autoconf_file): Don't look for ALL_LINGUAS.
+
+       * automake.in (am_print_error): New function.
+       (am_error): Use it.
+       (am_file_error): Likewise.
+       (am_line_error): Likewise.
+       (am_conf_error): Likewise.
+       (am_conf_line_error): Likewise.
+
+       * automake.texi (Options): Document no-exeext.
+       * automake.in (handle_options): Recognize no-exeext.
+       (rule_define): Handle no-exeext.
+       * tests/Makefile.am (TESTS): Added new file.
+       * tests/exeext2.test: New file.
+
+       * automake.in (make_input_list): Removed.
+       (scan_autoconf_config_files): Don't add to make_input_list.
+       (scan_one_autoconf_file): Don't use make_input_list.
+       (scan_autoconf_files): Use make_list, not make_input_list.
+       (scan_autoconf_files): Likewise.
+
+       * automake.in (seen_exeext): Removed.
+       (generate_makefile): Don't define EXEEXT or OBJEXT.
+       (scan_one_autoconf_file): Don't check for AC_EXEEXT.
+       (am_install_var): Don't check $seen_exeext.
+       (handle_programs): Likewise.
+       (rule_define): Allow x to override x$(EXEEXT), for now.
+       (file_contents_internal): Only define rule if rule_define allows
+       us to.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Define EXEEXT and OBJEXT.
+
+2001-07-25  Tom Tromey  <address@hidden>
+
+       From Nicolas Joly:
+       * tests/pr9.test: Require GNU make.
+       * tests/dirname.test: Don't use `-u'.
+
+2001-07-22  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added auxdir2.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/auxdir2.test: New file.
+
+       * tests/Makefile.am (XFAIL_TESTS): Removed substtarg.test.
+       * automake.in (TARGET_PATTERN): Add `@' as allowable character.
+
+       * tests/Makefile.am (XFAIL_TESTS): Removed exeext.test.
+       * automake.in (am_install_var): Add $(EXEEXT) even if program name
+       holds `.'.  Don't add $(EXEEXT) if program name already has it.
+       (handle_programs): Don't add $(EXEEXT) if user already did.
+       (make_paragraphs): Don't compute EXEEXT.
+
+       * tests/Makefile.am (TESTS): Added exeext.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/exeext.test: New file.
+
+2001-07-22  Tom Tromey  <address@hidden>
+
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Test for `prog', not
+       `prog.exe' on Cygwin with libtool.  From Robert Collins.
+
+2001-07-21  Tim Van Holder  <address@hidden>
+
+       * tests/dirname.test: Explicitly use $SHELL to run the
+       script; this avoids failures on DJGPP.
+       * tests/install2.test: Skip if 'chmod 000' doesn't make
+       a file unreadable.
+
+2001-07-21  Tom Tromey  <address@hidden>
+
+       * tests/libtool2.test: Check for libtoolize.
+
+       * tests/Makefile.am (TESTS): Added substtarg.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/substtarg.test: New file.
+
+       * automake.in (handle_dist): Handle case where aux dir doesn't
+       have a Makefile.  Fixes depdist.test.
+       * tests/Makefile.am (XFAIL_TESTS): Removed depdist.test.
+       * tests/depdist.test: Look for config/depcomp.
+
+       * tests/Makefile.am (TESTS): Added depdist.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/depdist.test: New file.  From Eric Magnien.
+
+       * tests/ccnoco.test: Removed `configure.2' test; in autoconf 2.50
+       AC_PROG_CC_C_O does require AC_PROG_CC.
+
+       From Erik Lindahl:
+       * lib/depcomp (tru64): Some Tru64 compilers use `foo.d' and not
+       `foo.o.d'.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Check to make sure compilation
+       output is suitable for make.
+
+       * automake.texi (Macros): Document AM_PROG_AS.
+       (Assembly Support): New node.
+       * m4/Makefile.am (m4data_DATA): Added as.m4.
+       * m4/as.m4: New file.
+
+       * automake.texi (Tags): Added uref to global tags.
+
+2001-07-21  Tim Van Holder  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Use $(DEPDIR)
+       instead of hardcoding '.deps'.
+       * m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check.
+
+2001-07-20  Derek Price  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): Create stamp-h files in the correct
+       locations.
+       * tests/dirname.test: New test.
+       * tests/stamph2.test: New test.
+       * tests/Makefile.am: Add new tests.
+       * tests/Makefile.in: Regenerated.
+
+2001-07-19  Tom Tromey  <address@hidden>
+
+       * automake.texi (Tags): Document GTAGS_ARGS.
+       * lib/am/tags.am (GTAGS): Added GTAGS_ARGS.  From Shigio Yamaguchi.
+
+2001-07-19  Tom Tromey  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for ccnoco.test, subobj8.test:
+       * m4/Makefile.am (m4data_DATA): Added auxdir.m4.
+       * tests/Makefile.am (XFAIL_TESTS): Removed ccnoco.test,
+       subobj8.test.
+       * m4/minuso.m4 (AM_PROG_CC_C_O): Use absolute path to compile.
+       Use AM_AUX_DIR_EXPAND.
+       * lib/compile: Handle case where `-o' argument is the name of an
+       executable, not an object file.
+       * m4/auxdir.m4: New file, from...
+       * m4/missing.m4: ... here.  Moved AM_AUX_DIR_EXPAND.
+       * automake.in (handle_single_transform_list, lang_c_rewrite):
+       Require compile using `require_config_file'.
+
+2001-07-19  Tom Tromey  <address@hidden>
+
+       * automake.texi (Program and Library Variables): Added X example
+       for _LDADD.
+
+2001-07-19  Tom Tromey  <address@hidden>
+
+       * automake.texi (Distributing): Updated to reflect new license.
+
+2001-07-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (require_build_directory): New function, extracted
+       from ...
+       (handle_single_transform_list): ... here.
+       (require_build_directory_maybe): New function.
+       (handle_prograns, handle_libraries, handle_ltlibraries): Call
+       require_build_directory_maybe() to ensure the subdirectory
+       in which a target may lie will exist when the target is created.
+       (handle_libraries, handle_ltlibraries): Use basename before
+       checking library name.
+       * lib/am/library.am (%LIBRARY%): Depend on %DIRSTAMP%.
+       * lib/am/ltlibrary.am (%LTLIBRARY%): Likewise.
+       * lib/am/program.am (%PROGRAM%): Likewise.
+
+2001-07-18  Tim Van Holder  <address@hidden>
+
+       * m4/missing.m4: Reword comment.
+
+2001-07-18  Pavel Roskin  <address@hidden>
+
+       * automake.texi: Rename AM_DEPENDENCIES to _AM_DEPENDENCIES.
+       * tests/gcj.test: Likewise.
+       * tests/gcj2.test: Likewise.
+       * tests/gcj3.test: Likewise.
+
+2001-07-18  Tom Tromey  <address@hidden>
+
+       * lib/compile: Change how lockdir is computed.  If linking or
+       compiling without `-o', just run the compiler.
+
+       * tests/Makefile.am (TESTS): Added ccnoco.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/ccnoco.test: New file.
+
+2001-07-17  Tom Tromey  <address@hidden>
+
+       * lib/ylwrap: Added special exception.
+       * lib/py-compile: Added license.
+       * lib/mdate-sh: Added special exception.
+       * lib/elisp-comp: Added special exception.
+       * lib/compile: Added special exception.
+       * lib/depcomp: Added special exception.
+
+       Report from Motoyuki Kasahara:
+       * tests/make.test: Use am__include.
+       * tests/exsource.test: Use am__include.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Use am__include and am__quote.
+       * automake.in (handle_languages): Use am__include and am__quote.
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Renamed to _AM_DEPENDENCIES.
+       * m4/init.m4: Updated callers.
+
+2001-06-10  Tim Mooney  <address@hidden>
+
+       * aclocal.in (parse_arguments, write_aclocal): Update Copyrights.
+       * aclocal.in (scan_configure, add_file): Handle the full macro
+       name even if it contains numbers, such as I18N.
+
+2001-07-16  Tom Tromey  <address@hidden>
+
+       * automake.texi (Dependencies): Link to dependency tracking page.
+       (Data): Mention dist_.
+       (Clean): Mention clean heuristics.
+       (Install): Mention nobase_.
+
+       * automake.texi (Program and Library Variables): Document _LINK.
+
+2001-07-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_libraries): Allow libraries to lie in
+       a subdirectory by constraining only the basename to start
+       with 'lib', not the whole path.
+
+2001-07-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/subobj8.test: New file.
+       * tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test.
+
+2001-07-16  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/212:
+       * lib/am/lisp.am (install-%DIR%LISP): Added missing `\'.
+       (uninstall-%DIR%LISP): Likewise.
+
+2001-07-15  Tom Tromey  <address@hidden>
+
+       * automake.in (usage): Rewrote code to handle columnization.
+       From Alexey Mahotkin and Maxim Sinev.
+
+       Report from Ralf Corsepius:
+       * automake.in (TARGET_PATTERN): Add `+' as valid character.
+       (SUFFIX_RULE_PATTERN): Likewise.
+       * tests/Makefile.am (TESTS): Added cxx.test.
+       * tests/cxx.test: New file.
+
+       * lib/am/tags.am (distclean-tags): Remove files for gtags.
+       From Shigio Yamaguchi.
+
+2001-07-14  Steve M. Robbins  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Emit diagnostic when files
+       remain after "make uninstall".
+
+2001-07-14  Tom Tromey  <address@hidden>
+
+       * lib/am/tags.am (.PHONY): Depend on GTAGS.  From Shigio Yamaguchi.
+
+       * lib/missing (makeinfo): Redirect stdout and stderr outside
+       subshell.  From Alexandre Oliva.
+
+2001-07-14  Akim Demaille  <address@hidden>
+
+       * automake.in ($obsolete_rx): No need for `\b(foo\b|\bbar)\b',
+       `\b(foo|bar)\b' is what we want.
+       * aclocal.in: Likewise.
+
+2001-07-14  Akim Demaille  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Don't define `depcpp' which is
+       not used.
+       Do not require the corresponding AC_PROG_CC as AC_PROG_CC is
+       actually modified to require AM_DEPENDENCIES.
+       Rename `confdir' as `conftest.dir' so that the configure trap
+       remove it.
+
+2001-07-04  Tom Tromey  <address@hidden>
+
+       Fix for nolink.test:
+       * tests/Makefile.am (XFAIL_TESTS): Removed nolink.test.
+       * lib/am/program.am (%PROGRAM%%EXEEXT%): Use %EXEEXT%.
+       * automake.in (am_install_var): Only rewrite PROGRAMS if
+       $seen_exeext.
+       (make_paragraphs): Always define %EXEEXT%.
+
+2001-07-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nolink.test: New file.
+       * tests/Makefile.am (TEST, XFAIL_TESTS): Add nolink.test.
+
+2001-07-04  OKUJI Yoshinori  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Add the second argument to
+       address@hidden' into @CLEAN_SUFFIXES, because the combined index
+       itself may not be used directly.
+
+2001-07-04  Tom Tromey  <address@hidden>
+
+       * missing: Updated.
+       * lib/missing (makeinfo): Use subshell, not explicit sh
+       invocation.
+
+       * automake.texi (Headers): Mention that we prefer uninstalled
+       headers in _SOURCES.
+       (ANSI): Mention cross-compilation limitation.
+
+2001-07-03  Tom Tromey  <address@hidden>
+
+       * configure.in: Upped to 1.4i.
+
+       * configure.in: Released 1.4h.
+
+       * lib/config.guess, lib/config.sub: Updated.
+
+2001-07-02  Tom Tromey  <address@hidden>
+
+       Fix for libtool2.test:
+       * tests/libtool2.test: Use `rm -f' to placate maintainer-check.
+       * lib/am/libtool.am (distclean-libtool): Conditional on TOPDIR.
+       * automake.in (generate_makefile): Call handle_libtool
+       unconditionally.
+       * tests/Makefile.am (XFAIL_TESTS): Removed libtool2.test.
+
+       * tests/libtool2.test: Look for `.lo' files to be removed.
+
+       * tests/Makefile.am (XFAIL_TESTS): Added libtool2.test.
+
+       * tests/Makefile.am (TESTS): Removed dup.test.
+       * tests/dup.test: Removed.
+       * aclocal.in (scan_file): Don't give error for duplicate macro.
+
+2001-07-01  Tom Tromey  <address@hidden>
+
+       * automake.texi (Program and Library Variables): Document
+       subdir-objects.  Document fact that per-object flags override AM_
+       flags.
+       (Options): Likewise.
+       (Yacc and Lex): Document YFLAGS, AM_YFLAGS, LFLAGS, AM_LFLAGS.
+       (Multilibs): New node.
+       (Macros): Documented missing macros.
+       (Auxiliary Programs): New node.
+
+       * lib/missing (makeinfo): If makeinfo exists, and we're in --run
+       mode, then simply fail.
+
+2001-07-01  Tim Van Holder  <address@hidden>
+
+       * lib/ylwrap: Improve support for DOS paths (and paths
+       containing backslashes in general).
+
+2001-07-01  Tom Tromey  <address@hidden>
+
+       * lib/missing: Added special exception to license.
+
+       * missing: Updated.
+       * lib/missing: Updated.  Added comment explaining configure.ac
+       oddity.
+
+       * lib/depcomp: Reorder arguments to gcc3.
+       From Per Oyvind Hvidsten.
+
+       * tests/Makefile.am (TESTS): Added libtool2.test.
+       * tests/libtool2.test: New file.
+
+       * automake.texi (Program and Library Variables): Added example for
+       _AR.
+
+2001-06-29  Tom Tromey  <address@hidden>
+
+       * tests/cond11.test: Use `=', not `=='.
+       * tests/cond12.test: Look for automake in build directory, not
+       source directory.
+
+2001-06-29  Richard Boulton  <address@hidden>
+
+       * automake.in (conditionals_true_when): Pass first parameters by
+       reference, avoiding bug which put all parameters in @CONDS instead
+       of @WHENS.  Report by Kalle Olavi Niemitalo.
+       Take a single WHEN instead of an array of WHENS.
+       Remove FIXME; can't now have an empty @WHENS.
+       (conditional_is_redundant): New sub.
+       (variable_conditions_reduce): Check whether each condition is
+       implied by any of the other conditions (other those already
+       discarded), rather than checking only against those already
+       considered (and kept).  Also, fix sense of check: was keeping
+       tautologous terms instead of discarding them.  Use
+       conditional_is_redundant instead of conditionals_true_when.
+       * tests/Makefile.am (TESTS): Added cond11.test and cond12.test.
+       * tests/cond11.test: New file.
+       * tests/cond12.test: New file.
+
+2001-06-29  Raja R Harinath  <address@hidden>
+
+       * automake.in (saw_sources_p): Work even if there are more
+       than one header files, and more than of one type of header.
+       * tests/Makefile.am (TESTS): Added new file.
+       * tests/depend4.test: New file.
+
+2001-06-28  Tom Tromey  <address@hidden>
+
+       * lib/am/libs.am (RANLIB): Don't define.
+
+2001-06-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (am_install_var): Assign 1 to $first on
+       first interation.
+
+2001-06-23  Tom Tromey  <address@hidden>
+
+       Fix for yacc5.test:
+       * lib/ylwrap: Changed usage.
+       * lib/am/yacc.am: Rewrote to use new substitutions.
+       * lib/am/lex.am: Likewise.
+       * automake.in (handle_languages): Skip files whose language
+       doesn't have a compiler.  Handle `define_flag' attribute.
+       Changed '$' to "\$" to aid Emacs fontification.
+       (struct): Added `rule_file'.  Removed `derived_autodep'.  Added
+       `_target_hook' and `define_flag'.
+       (yacc, yaccxx, lex, lexxx): Set `rule_file', `flags', `compile',
+       and `compiler' attributes.  Removed `linker', `derived_autodep',
+       and `ansi' attributes.  Added `define_flag'.
+       (yacc, yaccxx): Added `_target_hook'.
+       (saw_extension): Count number of times extension seen.
+       (count_files_for_language): New sub.
+       (saw_sources_p): Use it.
+       (handle_single_transform_list): Allow language rewrite function
+       to return a new source extension.  Call target_hook.
+       (yacc_sources, lex_sources): Removed.
+       (initialize_per_input): Don't initialize yacc_sources or
+       lex_sources.
+       (lang_yacc_rewrite): Rewrote.
+       (lang_yaccxx_rewrite): Likewise.
+       (lang_lex_rewrite): Likewise.
+       (lang_lexxx_rewrite): Likewise.
+       (output_yacc_build_rule): Removed.
+       (output_lex_build_rule): Removed.
+       (lang_yacc_finish): Removed build rule generation.
+       (lang_lex_finish): Likewise.
+       (DASH_D_PATTERN): New global.
+       (lang_yacc_target_hook): New function.
+       (_target_hook): New function.
+       (register_language): Default `define_flag'.
+       * tests/yacc5.test: Updated test.
+       * tests/yacc4.test: Exit with status 77 if bison doesn't work.
+       * tests/yacc3.test: Remove bogus `make' invocation.  Added test
+       for all YFLAGS variables.
+
+2001-06-20  Tom Tromey  <address@hidden>
+
+       * tests/yacc5.test: Check for per-executable YFLAGS.
+
+2001-06-19  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added yacc5.test.
+       * tests/yacc5.test: New file.
+
+2001-06-17  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file_internal): Check for already-required
+       file after searching for it, and only if it is not found.  Don't
+       use `readlink' when checking for dangling symlink.  Work if
+       --force-missing specified.
+       * tests/acoutput2.test: Also test --force-missing.
+
+       Fix for libtool.test:
+       * automake.in (generate_makefile): Call handle_libtool.
+       (handle_libtool): New sub.
+       (handle_compile): Don't read `libtool' file.
+
+       * tests/acoutput2.test: New file.
+       * tests/Makefile.am (TESTS): Added acoutput2.test.
+
+2001-06-15  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added libtool.test.
+       * tests/libtool.test: New file.
+
+2001-06-14  Tom Tromey  <address@hidden>
+
+       Fix some lisp bugs reported by Bruno Haible:
+       * lib/am/lisp.am (uninstall-%DIR%LISP): Added DESTDIR to the
+       echo.
+       (install-%DIR%LISP): Handle case where lispdir is not defined.
+       (uninstall-%DIR%LISP): Likewise.
+       (.el.elc): Added `else' clause.
+
+       Fix for bug reported by Steve M. Robbins:
+       * automake.in (handle_single_transform_list): When building a file
+       from a subdirectory, continue to use `AM_' prefix.
+       * tests/Makefile.am (TESTS): Added subobj7.test.
+       * tests/subobj7.test: New file.
+
+       * lib/am/configure.am ($(top_builddir)/config.status): Added
+       $(top_builddir) prefix to work around problems with some vendor
+       makes.  From Nicolas Joly.
+
+       * automake.in (yacc_lex_finish_helper): Find ylwrap in
+       top_srcdir.  From Tim Van Holder.
+       * tests/Makefile.am (TESTS): Added yacc6.test.
+       * tests/yacc6.test: New file.
+
+2001-06-14  Tim Van Holder  <address@hidden>
+
+       * tests/defs, tests/installsh.test: Properly support
+       DOS-style paths.
+
+2001-06-14  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added mdate4.test.
+       * tests/mdate4.test: New file.
+
+       * aclocal.in (scan_m4_files): Removed unused variable.
+
+2001-06-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (scan_m4_files): Tweak the building of &search so
+       that multiple macro names can be found on the same line.  Ensure
+       we match whole macro name, not only substrings.
+
+2001-06-12  Tom Tromey  <address@hidden>
+
+       * automake.texi (ANSI): Minor clarification.
+       (Other GNU Tools): Don't mention Guile.
+       (Guile): Removed.
+       (Java Support): Mention file extensions.
+       (Man pages): Mention dist_.  Don't mention info pages.
+
+2001-06-11  Tom Tromey  <address@hidden>
+
+       * automake.texi (Program variables): Document AM_CPPFLAGS.
+       Deprecate INCLUDES.
+       (Java Support): Document AM_GCJFLAGS.
+       (Support for Other Languages): Removed `fixme'; added link to
+       suffix rule handling.
+
+       * automake.texi (Program and Library Variables): Document _LIBADD,
+       _LDADD, _LDFLAGS, _AR, and _DEPENDENCIES.
+
+2001-06-11  Kevin Dalley  <address@hidden>
+
+       * missing: Support configure.ac.
+
+2001-06-08  Tom Tromey  <address@hidden>
+
+       * tests/version4.test: New file.
+       * automake.in (version_check): New sub.
+       (handle_options): Use it.
+       * tests/Makefile.am (AUTOMAKE_OPTIONS): Removed.
+       (TESTS): Added version4.test.
+       * m4/Makefile.am (AUTOMAKE_OPTIONS): Removed.
+       * Makefile.am (AUTOMAKE_OPTIONS): Remove `gnits'.
+
+2001-06-04  Kevin Dalley  <address@hidden>
+
+       * lib/am/dejagnu.am (site.exp): Fix typo.
+
+2001-06-02  Tom Tromey  <address@hidden>
+
+       * automake.in (variable_conditions_sub): Move parent-only code
+       from here...
+       (variable_conditions): ... to here.
+       (variable_conditions_sub): Include this variable's conditions in
+       the resulting condition list.
+       * tests/Makefile.am (XFAIL_TESTS): Removed ltdeps.test.
+
+2001-06-01  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (XFAIL_TESTS): Added ltdeps.test.
+       (TESTS): Likewise.
+       * tests/ltdeps.test: New file.  Report from Lars J. Aas.
+
+2001-05-31  Tom Tromey  <address@hidden>
+
+       * automake.texi (Alternative): New node.
+       (Macros): Use new name for gcc.
+       (Java Support): Likewise.
+       (Dependencies): Rewrote.
+       (Invoking Automake): (Re-)document -i, --ignore-deps, and
+       --include-deps.
+
+       * automake.texi (Top level): Removed erroneous spaces.  Documented
+       MAKE and MAKEFLAGS.
+
+2001-05-29  Tom Tromey  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Allow any AM_*FLAGS variable.
+
+       * automake.texi (Include): Rewrote.
+       (Suffixes): Remove Java example.
+       (Java): Added more explanation.  Document variables.
+       (Uniform): Mention JAVA as a primary.
+       (Python): Updated for new Python support.
+       (Sources): Added a weak example.
+
+       * lib/am/java.am (class%DIR%.stamp): Use AM_JAVACFLAGS.
+
+       * automake.texi (A Program): Mention `check' prefix.
+       (Program and Library Variables): New node.
+       (Texinfo): Document UPDATED-MONTH, MAKEINFOFLAGS, and
+       AM_MAKEINFOFLAGS.
+       (etags): Mention per-program flags.
+       (Tests): Document AM_RUNTESTFLAGS; added sectioning; more
+       updates.
+
+       * lib/am/texinfos.am (.PHONY): Always list uninstall-info-am and
+       install-info-am.
+
+2001-05-28  Tom Tromey  <address@hidden>
+
+       * m4/Makefile.am (MAINT_CHARSET): Removed.
+       * Makefile.am (MAINT_CHARSET): Removed.
+       * automake.in (maint_charset, dist_charset): Removed.
+       (local_maint_charset): Removed.
+       (initialize_per_input): Don't use maint_charset.
+       (handle_dist): Don't compute maint_charset or check DIST_CHARSET.
+
+       * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and
+       AM_MAKEINFOFLAGS.
+       (.%SUFFIX%.dvi): Likewise.
+       (.%SUFFIX%): Likewise.
+
+2001-05-27  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_multilib): Only add multilib support code at
+       top level.
+       * lib/am/multilib.am: Handle invocation of *-multi targets
+       differently for SUBDIRS and non-SUBDIRS Makefiles.
+       * m4/multi.m4 (AM_ENABLE_MULTILIB): Removed erroneous comment.
+       Only add multilib code when the Makefile in question is actually
+       rebuilt.
+
+       * lib/am/dejagnu.am (check-DEJAGNU): Added AM_RUNTESTFLAGS.
+
+2001-05-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Skip unknown
+       extensions.
+
+2001-05-25  Tom Tromey  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Ignore AM_RUNTESTFLAGS.
+
+2001-05-24  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo_helper): Find mdate-sh in current
+       directory in some situations.
+
+       * automake.in (generate_makefile): Better explanation for ansi2knr
+       fix.
+
+2001-05-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages): Skip unknown extensions.
+       (derive_suffix): Check whether $extension_map{$source_ext}
+       is undefined, not empty.
+
+2001-05-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (read_am_file): Ignore trailing backslash on
+       comment lines.
+
+2001-05-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (ASSIGNMENT_PATTERN): Forbid : and + in variable names.
+
+2001-05-21  Akim Demaille  <address@hidden>
+
+       * automake.texi (Macros): Explain the ``AC_PROG_LEX invoked
+       multiple times'' warning.
+
+2001-05-20  Tom Tromey  <address@hidden>
+
+       * configure.in: Updated to 1.4g.
+
+       * configure.in: Updated to 1.4f.
+
+       * Makefile.am (EXTRA_DIST): Added ChangeLog.2000.
+
+       * lib/ansi2knr.c: New version.
+
+       * Makefile.am (FETCHFILES): Added ansi2knr.c.
+       (fetch): Likewise.
+
+2001-05-19  Tom Tromey  <address@hidden>
+
+       * config.guess, config.sub: New versions from FSF.
+
+       * Makefile.am (fetch): Compare against files in srcdir.
+
+       For for ansi2knr report from Harlan Stenn:
+       * automake.in (generate_makefile): Run handle_compile before
+       handle_languages.
+
+2001-05-18  Tom Tromey  <address@hidden>
+
+       * automake.in: Reverted erroneous checkin.
+
+2001-05-18  Akim Demaille  <address@hidden>
+
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust
+       to missing `install-info'.
+
+2001-05-17  Tom Tromey  <address@hidden>
+
+       * automake.in (lang_c_finish): Use `rm -f'.
+
+       * automake.in (lang_c_finish): Remove _.c file if ansi2knr fails.
+       * tests/Makefile.am (TESTS): Added new file.
+       * tests/ansi5.test: New file.
+
+2001-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/install.am (install-strip): Set INSTALL_PROGRAM_ENV if
+       STRIP is not empty.
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Set INSTALL_STRIP_PROGRAM
+       to install-sh unconditionally.  Don't set INSTALL_STRIP_PROGRAM_ENV.
+       * automake.texi (Requirements): Document the use of the STRIP
+       variable in cross-compilation environments.
+
+2001-05-17  Tom Tromey  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): If depcomp doesn't exist, revert
+       to no dependency tracking.
+       * tests/Makefile.am (TESTS): Added depcomp2.test.
+       * tests/depcomp2.test: New file.  From Pavel Roskin.
+
+       * lib/depcomp (aix): Bug fix and simplification from Larry Jones.
+
+       * lib/depcomp (tru64): New dependency tracking mode.
+
+       Fix for PR automake/159:
+       * lib/depcomp (aix): Rewrote.
+       (sgi): Likewise.
+
+       Fix for PR automake/174:
+       * tests/Makefile.am (XFAIL_TESTS): Removed comment3.test.
+       * automake.in (read_am_file): Warn if `#' is at start of rule.
+
+2001-05-16  Tom Tromey  <address@hidden>
+
+       For PR automake/174:
+       * tests/Makefile.am (TESTS): Added comment3.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/comment3.test: New file.
+
+       Fix for PR automake/175:
+       * tests/Makefile.am (XFAIL_TESTS): Removed make.test.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Omit `Entering directory' and
+       `Leaving directory' messages.
+
+       For PR automake/175:
+       * tests/Makefile.am (XFAIL_TESTS): Added make.test.
+       * tests/make.test: Run test with `make -w'.
+
+       * tests/Makefile.am (TESTS): Removed maintclean.test.
+       * lib/am/clean.am (maintainer-clean-generic): Don't remove
+       Makefile.in.
+       * lib/am/configure.am (maintainer-clean-am): Removed.
+       (maintainer-clean-conf): Removed.
+       * tests/maintclean.test: Removed.
+
+2001-05-15  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/177:
+       * Makefile.am (maintainer-clean): Set perllibdir before invoking
+       automake or aclocal.
+
+       Fix for maintclean.test:
+       * tests/Makefile.am (XFAIL_TESTS): Removed maintclean.test.
+       * lib/am/clean.am (distclean-generic): Don't remove config.cache
+       or config.log.
+       (distclean, maintainer-clean): Moved to...
+       * lib/am/configure.am: ... here.
+       (distclean): Remove config.cache and config.log.
+       (maintainer-clean): Removed.
+       (maintainer-clean-conf): New target.
+       (maintainer-clean-am): New target.
+
+       * tests/Makefile.am (TESTS): Added maintclean.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/maintclean.test: New file.
+
+       Fixes PR automake/175:
+       * tests/target-cflags.test: Use $needs_gnu_make.
+       * tests/exsource.test: Use $needs_gnu_make.
+       * tests/make.test: Require GNU make.
+       * tests/defs (needs_gnu_make): Compute.
+
+2001-05-14  Tom Tromey  <address@hidden>
+
+       * lib/ylwrap: Fixed quoting on regular expression.  Fixes
+       yacc4.test.
+
+       Fix for texinfo10.test.
+       * tests/Makefile.am (XFAIL_TESTS): Remove texinfo10.test.
+       * lib/am/texinfos.am: Use LOCAL-TEXIS liberally.
+       * automake.in (handle_texinfo_helper): New sub.
+       (handle_texinfo): Rewrote.  Now defines LOCAL-TEXIS.
+       * tests/texinfo10.test: Added more cases.
+
+       Fix for yaccvpath.test:
+       * tests/Makefile.am (XFAIL_TESTS): Removed yaccvpath.test.
+       * lib/am/distdir.am (distdir): Always look for file in build
+       directory first.
+       * lib/ylwrap: Quote the `#line' regular expression.
+       * lib/am/yacc.am (%YACC_SUFFIX%%C_SUFFIX%): Reverted earlier
+       change; don't run sed on the generated file.
+       * tests/yaccvpath.test: Create new parser in srcdir.  Added test
+       to make sure parser will be rebuilt at dist time.
+
+2001-05-13  Pavel Roskin  <address@hidden>
+
+       * automake.in ($IGNORE_PATTERN): Allow spaces before comments
+       beginning with `##'.
+       * automake.texi (General Operation): Document it.
+
+2001-05-13  Tom Tromey  <address@hidden>
+
+       Reported by Rainer Orth:
+       * lib/am/distdir.am (?DISTDIR?distdir): Define conditional on
+       TOPDIR_P.
+       * tests/Makefile.am (TESTS): Added distname.test.
+       * tests/distname.test: New file.
+
+       * Makefile.am (dist_pkgdata_DATA): Removed.
+
+       * tests/defs: Find files to copy in lib/.
+       * automake.in (perllibdir): Set to Automake directory.
+       * ansi2knr.c, ansi2knr.1: Removed.
+       * Makefile.am (dist_am_DATA): Removed.
+       (amdir): Removed.
+       (maintainer-check): Look for lib/am/*.am.  Expect 28 lines of
+       diffs.
+       (scriptdir): Removed.
+       (dist_script_DATA): Likewise.
+       (install-data-hook): Likewise.
+       (installcheck-local): Likewise.
+       (TAGS_FILES): Removed amfiles.
+       (dist_pkgdata_DATA): Removed ansi2knr.c and ansi2knr.1.
+       * tests/installsh.test (AUTOMAKE): Use --libdir, not --amdir, and
+       point it to the right directory.
+       * ansi2knr.am, check.am, clean-hdr.am, clean.am, comp-vars.am,
+       compile.am, configure.am, data.am, dejagnu.am, depend.am,
+       depend2.am, distdir.am, footer.am, header-vars.am, header.am,
+       install.am, java.am, lang-compile.am, lex.am, library.am, libs.am,
+       libtool.am, lisp.am, ltlib.am, ltlibrary.am, mans-vars.am,
+       mans.am, multilib.am, program.am, progs.am, python.am,
+       remake-hdr.am, scripts.am, subdirs.am, tags.am, texi-vers.am,
+       texibuild.am, texinfos.am, yacc.am: Moved to lib/am/.
+       * configure.in (AC_OUTPUT): Added lib/am/Makefile.
+       (AUTOMAKE): Use --libdir, not --amdir.
+       Ues AC_CONFIG_AUX_DIR.
+       * lib/Makefile.am (SUBDIRS): Added `am'.
+       (scriptdir): New macro.
+       (dist_script_DATA): Likewise.
+       (dist_pkgdata_DATA): Likewise.
+       (install-data-hook): New target.
+       (installcheck-local): Likewise.
+       * lib/am/Makefile.in: New file.
+       * lib/am/Makefile.am: Removed everything except amdir and
+       dist_am_DATA.
+
+2001-05-13  Akim Demaille  <address@hidden>
+
+       * automake.in ($pkgdata_dir): Rename as...
+       ($libdir): this.
+       ($am_dir): Remove, replace its uses with $libdir.
+       (&parse_arguments): Replace --amdir with --libdir.
+       * automake.texi (Invoking Automake): Document --libdir, not
+       --amdir.
+       * tests/defs (AUTOMAKE): Use --libdir, not --amdir.
+
+2001-05-13  Tom Tromey  <address@hidden>
+
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Use AMDEP_TRUE,
+       not AMDEP.
+       * m4/depend.m4 (AM_DEPENDENCIES): Require AM_DEP_TRACK.
+       Correctly look at AMDEP_TRUE, not AMDEP.
+
+       Report from Robert Boehne:
+       * tests/Makefile.am (TESTS): Added depend2.test.
+       * tests/depend2.test: New file.
+
+2001-05-13  James Henstridge  <address@hidden>
+
+       * m4/python.m4 (AM_PATH_PYTHON): Added more names for python.
+       Point pythondir at site-packages directory.  Rename
+       PYTHON_SITE_PACKAGE to pkgpythondir.  Rename PYTHON_SITE_EXEC to
+       pyexecdir.  Removed package/module argument.  Removed
+       PYTHON_SITE_INSTALL.  Added version checking.
+
+2001-05-14  Jim Meyering  <address@hidden>
+
+       * automake.in (macro_define): Change one remaining use of
+       `variable_dump' to `macro_dump'.
+
+2001-05-13  Tom Tromey  <address@hidden>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Prefer gcc3 over gcc for objc
+       and gcj.
+
+2001-05-13  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_texinfo_file, &handle_dist, &handle_gettext)
+       (&handle_footer, &handle_factored_dependencies, &handle_emacs_lisp)
+       (&am_primary_prefixes): Use `map' rather than `grep'.
+
+2001-05-13  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Set config_vars for yacc, yaccxx, lex,
+       lexxx, asm.
+       (&lang_c_finish, &lang_yacc_finish, &lang_lex_finish): Simplify.
+       (&lang_asm_finish): Remove, set asm's finisher to C's one.
+
+2001-05-13  Akim Demaille  <address@hidden>
+
+       * lang-compile.am: New file, loaded once per language.
+       * depend2.am: Move definitions loaded once per language in the
+       aforementioned file.
+       * automake.in (&handle_languages): Load it.
+       (&lang_ppf77_finish, &lang_ratfor_finish): Remove as it's now
+       handled by lang-compile.am.
+
+2001-05-13  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added python.test.
+       * tests/python.test: New file.
+       * automake.in (handle_languages): Use
+       config_aux_dir_set_in_configure_in.
+       (handle_python): Correctly mention AM_PATH_PYTHON.  Use
+       py-compile, not py_comp.  Define py_compile macro.
+
+2001-05-13  Derek Price  <address@hidden>
+
+       * automake.in (require_file_with_conf_line,
+       require_file_with_line, require_file): Pass a @require_file_path
+       of $relative_dir instead of '.' to require_file_internal so that
+       all the special casing of '.' can be removed elsewhere.
+       (require_config_file, require_conf_file_with_line,
+       require_conf_file_with_conf_line): Remove special casing for '.'
+       and make sure $config_aux_dir is maintained properly.
+       (require_file_internal): Remove special casing of '.' and set
+       @require_file_path when missing files are added.
+       (maybe_push_required_file): Remove special casing of '.'
+       (handle_dependencies): Remove a workaround for a bug now fixed
+       and remove $config_aux_dir special casing.
+       (handle_configure): Remove special casing for $config_aux_dir
+       (handle_python): Ditto.
+       (yacc_lex_finish_helper): Change $config_aux_dir switch to
+       switch on the value of $config_aux_dir_set_in_configure_in.
+       (handle_texinfo): Ditto.
+       (scan_one_configure_file): Set $config_aux_dir and
+       $config_aux_dir_set_in_configure_in properly so special casing
+       on the value of $config_aux_dir can be removed elsewhere.
+       * tests/depcomp.test: New file.
+       * tests/confsub.test: Look for depcomp in $(top_srcdir) instead of the
+       first subdir containing a C file.
+       * tests/libobj2.test: Ditto.
+       * tests/Makefile.am (TESTS): Added 'depcomp.test'.
+
+2001-05-12  Tom Tromey  <address@hidden>
+
+       * tests/gcj.test: Updated for gcj dependency tracking.
+       * tests/gcj2.test: Likewise.
+
+       Fixes PR automake/169.
+       * m4/depend.m4 (AM_DEPENDENCIES): Handle GCJ.  Don't assume gcc
+       style for OBJC.
+       * automake.in (java): Added autodep entry.
+       * tests/Makefile.am (TESTS): Added gcj3.test.
+       * tests/gcj3.test: New file.
+
+2001-05-12  Raja R Harinath  <address@hidden>
+
+       * automake.in (ASSIGNMENT_PATTERN): Make variable-name pattern
+       stop at the first '='.
+       * tests/Makefile.am (TESTS): Added vars.test.
+       * tests/vars.test: New file.
+
+2001-05-12  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_single_transform_list): Simplify
+       computation of $object and $this_obj_ext.
+       * tests/lex3.test: Merge into...
+       * tests/lex.test: here.
+       * tests/pr19.test: Improve and rename as...
+       * tests/lex3.test: this.
+
+2001-05-09  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Correctly compute $saw_bk.
+       (scan_autoconf_files): Ensure configure_dist_common is always
+       set.
+       * tests/defs (AUTOMAKE): Added --Werror.
+
+2001-05-09  Pavel Roskin  <address@hidden>
+
+       * automake.in (define_compiler_variable): Escape $(LIBTOOL) in
+       double quotes.
+
+2001-05-09  Tom Tromey  <address@hidden>
+
+       * tests/werror.test: Use `rm -f'.
+
+2001-05-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_line_warning): Invoke `am_line_error', not itself.
+
+2001-05-09  Akim Demaille  <address@hidden>
+
+       * automake.in: Remove some code left from bad patches.
+       (&handle_dependency): Remove, for the same reason.
+
+2001-05-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_paragraphs): Transform BUILD, HOST and TARGET.
+       (&handle_tests_dejagnu, &define_standard_variables): Don't.
+       (&define_standard_variables): Don't transform %top_builddir% since...
+       * header-vars.am: Use %TOPDIR% instead.
+
+2001-05-09  Akim Demaille  <address@hidden>
+
+       * automake.in (@objects): Remove, unused.
+       Remove all the code related to it, and to former `$(OBJECTS)'.
+
+2001-05-08  Tom Tromey  <address@hidden>
+
+       For PR automake/29:
+       * ylwrap: Handle arguments to program.  Remove old code that tried
+       to avoid absolute paths and add new code to do it in all cases.
+       Removed ancient logic that tried to deal with relative path.
+       * tests/Makefile.am (TESTS): Added yacc4.test.
+       * tests/yacc4.test: New file.
+
+       Fix for PR automake/149 and werror.test:
+       * automake.in (require_file_internal): Use am_line_warning or
+       am_conf_line_warning when suppressing error.
+       (am_line_warning): New sub.
+       (am_conf_line_warning): Save and restore warning signal.
+       * tests/Makefile.am (XFAIL_TESTS): Removed werror.test.
+
+       Fix for PR automake/36:
+       * tests/Makefile.am (TESTS): Added asm.test.
+       * tests/asm.test: New file.
+       * automake.in (asm): Use ASFLAGS and AS.
+       (lang_asm_finish): New sub.
+
+       * automake.in (read_am_file): Removed debugging code.
+
+       For PR automake/149:
+       * tests/Makefile.am (TESTS): Added werror.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/werror.test: New file.
+
+       * automake.in (conditional_true_when): Don't return if we see
+       `TRUE'.
+
+       * tests/objc.test: Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Removed objc.test.
+       (TESTS): Likewise.
+
+       * automake.in (subst): New sub.
+       (handle_languages): Use it.
+       (output_lex_build_rule): Likewise; also use _am_quote.
+       (check_libobjs_sources): Likewise.
+       (make_paragraphs): Use subst.
+
+       * automake.in (check_libobjs_sources): Re-fixed AMDEP_TRUE
+       problem.
+
+       * automake.in (file_contents_internal): Prototype now `$$%'.
+       (register_language): Prototype now `%'.
+
+       Fixes test subobj6.test and PR automake/160:
+       * tests/Makefile.am (XFAIL_TESTS): Removed subobj6.test.
+       * compile.am (mostlyclean-compile): Added MOSTLYRMS.
+       (distclean-compile): Added DISTRMS.
+       * tests/subobj6.test (wish_SOURCES): Updated to reflect
+       `mostlyclean' use; added test for non-subdir case.
+       * automake.in (compile_clean_files): New global.
+       (MOSTLY_CLEAN, DIST_CLEAN): New constants.
+       (initialize_per_input): Initialize compile_clean_files.
+       (handle_single_transform_list): Set compile_clean_files entries.
+       (handle_compile): Handle compilation cleanups.
+
+2001-05-08  Lars J. Aas  <address@hidden>
+
+       * automake.texi (Canonicalizing Automake macros): Document not
+       canonicalizing strudels (@) anymore.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * distdir.am (dist-all): Build all the flavors using a single
+       distdir.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents_internal): Apply the @cond_stack to
+       the rules and assignments.
+       Don't rely on `$.' as it's biased by &make_paragraphs.
+       Don't remove backslashes in variable values.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in ($IGNORE_PATTERN): Improve for multi-line matches.
+       ($RULE_PATTERN): Use that from `&make_paragraphs'.
+       ($MACRO_PATTERN): Just catch the name of a macro.
+       ($BOGUS_MACRO_PATTERN): Remove.
+       ($ASSIGNMENT_PATTERN): New.
+       (&file_contents_internal, &make_paragraphs): Adjust.
+       (&macro_define): Catch bad macro names.
+       (&cond_stack_endif): Better error message.
+       (&file_contents_internal): Don't remove backslashes in variable
+       values.
+       (&macro_define): Do it for `+=' user variables.
+       (&define_standard_variables): Use `undef' instead of a dummy
+       variable.
+       (&make_paragraph): Be sure not to chop the trail of hash only
+       lines: adjust the `##' regexp.
+       (&rule_define): Fix a bug: don't read $1 but $target.
+       * tests/condincl.test: Strengthen.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attributes `Name' and `config_vars'.
+       (&finish): Work properly if there is no _finish.
+       (Automake): Register language Names and AC_SUBST dependencies.
+       Register Fortran 77 variables upon which ratfor and ppf77 depend.
+       (&handle_languages): Once per language, invoke
+       `define_linker_variables', and check its config_vars.
+       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
+       (&lang_java_finish): Remove.
+       (&lang_ppf77_finish, &lang_ratfor_finish): Adjust.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents_internal): Accept $IS_AM.
+       (&handle_compile, &define_standard_variables, &file_contents): Adjust.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (am_install_var): Use `next' instead of `if' on the
+       body of $X loop.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attributes `lder' and `ld'.
+       (&register_language): Specify for cxx, objc, f77, gcj.
+       (&define_linker_variable): New.
+       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
+       (&lang_java_finish): Adjust.
+       (&libtool_compiler): Remove.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_lib_objects_cond): Don't take $LEX_SEEN as
+       argument, as you don't use it.
+       Hence...
+       (&handle_lib_objects): Don't take $LEX_SEEN as argument, as you
+       don't use it.
+       Hence...
+       (&handle_programs): Don't mess with %lex_sources, as you don't use
+       it.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attribute `link'.
+       (&register_language): Specify for cxx, objc, f77, gcj.
+       (&lang_cxx_finish, &lang_f77_finish, &lang_objc_finish)
+       (&lang_java_finish): Adjust.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&define_compiler_variables): Use only $LANG as
+       argument.
+       (&handle_languages): Adjust.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&define_program_variable): Remove.
+       (&scan_one_autoconf_file): Skip MAKEINFO when found in an
+       AM_MISSING_PROG.
+       (&handle_texinfo): Don't define MAKEINFO and TEXI2DVI.
+       * texinfos.am: Do it.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_tests_dejagnu): Don't define EXPECT and
+       RUNTEST.
+       * dejagnu.am: Do it.
+       (site.exp): Use `if'.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in: Formatting changes.
+       (variable_dump, variables_dump): Rename as...
+       (macro_dump, macros_dump): these.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       Support `if !COND', `else COND', `end COND'.
+
+       * automake.texi (Conditionals): Document it.
+       * automake.in ($WHITE_PATTERN, $MACRO_PATTERN, $BOGUS_MACRO_PATTERN)
+       ($GNITS_VERSION_PATTERN, $INCLUDE_PATTERN): Use `\d' and `\s'.
+       ($IF_PATTERN, $ELSE_PATTERN, $ENDIF_PATTERN): Likewise, and accept
+       a leading `!' before the condition.
+       (&handle_options): Use `\d'.
+       (&cond_stack_if, &cond_stack_else, &&cond_stack_endif): New.
+       (&read_am_file, &file_contents_internal): Use them.
+       (&transform): No longer substitute `%!COND%', forcing the use of
+       `! %?COND%'.
+       * ansi2knr.am, lex.am, tags.am, texinfos.am, yacc.am: Adjust.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       Uniform handling of per-object compilation rules.
+       Note: Automake is repaired.
+
+       * automake.in (&handle_languages): Output per object rules for all
+       the objects, not only for those which language supports dependency
+       tracking.
+       Fix Automake: when outputting per-object rules, use `-o' if the
+       language has no `output_flag', as it's really needed.
+       (&handle_single_transform_list): Instead of special casing files
+       which need per object rules but which language don't support
+       dependency tracking, keep them in the queue for processing by
+       `&handle_languages'.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): `ext-compile.am' and
+       `depend2.am' are now equivalent for generic rules: output only the
+       latter.
+       * ext-compile.am: Remove.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       Note: This patch breaks Automake.  Repaired within two patches.
+
+       * automake.in (Language): Replace the attribute `output_arg' with
+       `compile_flag' and `output_flag'.
+       (Automake): Adjust language registrations.
+       (&handle_languages): Transform `-c' and `-o' for both suffix and
+       per object rules, instead of `OUTARG' and `LTOUTARG' only for
+       generic rules.
+       (&handle_single_transform_list): Adjust to `compile_flag' and
+       `output_flag'.
+       * depend2.am, ext-compile.am: Use `%-c%' and `%-o%'.
+
+2001-05-08  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Don't transform %COMPILER%.
+       Use `$lang->compiler' instead of `$pfx' to transform generic
+       %COMPILE% and %LTCOMPILE%.
+       * ext-compile.am: Use %COMPILE%, %LTCOMPILE% and %SOURCE% instead
+       of %COMPILER% and $<.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Use the same `%transform' for
+       both `depend2.am' and `ext-compile.am'.
+       Delay the definition of `$flag' so it is right before the first use,
+       and rename as `$flags'.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Compute `$ltoutarg' and
+       `$outarg' independently of dependency code.
+       There is no use looping on a language's possible extensions since
+       we loop over used extensions.
+       Therefore, there is no use for a local `%transform'.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Don't use $comp.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Merge the two loops over
+       %extension_seen/%languages into one and group code to be run once
+       per language together.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_languages): Move the `if
+       ($use_dependencies)' block so that loops over extensions and
+       languages are next to each other.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&depend2): Remove, merged into...
+       (&handle_languages): here.
+
+2001-05-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&finish_languages): Rename as...
+       (&handle_languages): this.
+       Include the body of...
+       (&handle_dependency): this.
+       Remove.
+
+2001-05-06  Tom Tromey  <address@hidden>
+
+       For PR automake/46:
+       * tests/Makefile.am (TESTS): Add subdir5.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/subdir5.test: New file.
+
+       * tests/subobj6.test (wish_SOURCES): Use $MAKE.
+       * tests/subobj5.test (wish_SOURCES): Use $MAKE.
+
+       * automake.in (GNITS_VERSION_PATTERN): Document.  Add `fork
+       identifier'.
+       (handle_options): Handle fork identifier in version number.
+
+       * automake.texi (Dist): Document distcheck-hook.
+
+       * tests/confh4.test: Update to reflect DEFS change.
+       For PR automake/132.
+
+       Fix for PR automake/132:
+       * automake.in (c, c++, objc, asm, ppf77): Add DEFAULT_INCLUDES to
+       compilation.
+       (java): Remove INCLUDES and DEFS from compilation.
+       (lang_c_finish): Add DEFAULT_INCLUDES to compilation.
+       * compile.am (DEFS): Don't include %DEFAULT_INCLUDES%.
+       (DEFAULT_INCLUDES): New macro.
+
+       * automake.in (usage): Re-align explanatory text.
+       Fixes PR automake/148.
+
+       * automake.texi (Uniform): Don't use @address@hidden
+       Fixes PR automake/154.
+
+       For PR automake/160:
+       * tests/Makefile.am (TESTS): Add subobj5.test and subobj6.test.
+       (XFAIL_TESTS): Add subobj6.test.
+       * tests/subobj6.test: New file.
+
+       * automake.texi (Uniform): Mention dist_, nodist_, and nobase_.
+       (Top level): Don't mention `flat'.
+       (Extending): Likewise.
+       (User Variables): New node.
+
+       * distdir.am (distdir): Make subdirectory for each file.
+       Fixes test subobj5.test.
+
+       * tests/Makefile.am (TESTS): Add new file.
+       (XFAIL_TESTS): Likewise.
+       * tests/texinfo10.test: New file.
+
+2001-05-05  Pavel Roskin <address@hidden>
+
+       * automake.in (scan_texinfo_file): Treat @defindex and @synindex
+       in the same way as @defcodeindex and @syncodeindex respectively.
+
+2001-05-05  Tom Tromey  <address@hidden>
+
+       * mans.am (install-man%SECTION%): Minor cleanup.
+       (uninstall-man%SECTION%): Likewise.
+
+       * tests/Makefile.am (XFAIL_TESTS): Removed man.test.
+       * mans.am (install-man%SECTION%): Handle dist_ and nodist_
+       prefixes.
+       (uninstall-man%SECTION%): Likewise.
+       * automake.in (handle_man_pages): Handle dist_ and nodist_
+       prefixes.
+
+       * automake.texi (Future): Removed.
+       (Depth): Removed.
+       (Hello): Don't mention `deep'.
+       (Top level): Likewise.
+
+       * automake.in (conditional_true_when): Use a hash, not index().
+       Also, a TRUE component always results in a true return.
+       Fixes test cond10.test.  For PR automake/164.
+       * tests/Makefile.am (XFAIL_TESTS): Removed cond10.test.
+
+2001-05-05  Raja R Harinath  <address@hidden>
+
+       For PR automake/164:
+       * tests/Makefile.am (TESTS): Added new file.
+       (XFAIL_TESTS): Likewise.
+       * tests/cond10.test: New file.
+
+2001-05-05  Tom Tromey  <address@hidden>
+
+       * texinfos.am (uninstall-info-am): Debian install-info v1.8.3
+       prints to stderr.
+       (install-info-am): Likewise.
+
+2001-05-05  Pavel Roskin <address@hidden>
+
+       * automake.in (scan_texinfo_file): Don't push undefined values
+       to @clean_suffixes.
+
+2001-05-05  Richard Boulton  <address@hidden>
+
+       * automake.in (handle_dist): Check for existence of DIST_SUBDIRS
+       first.
+
+2001-05-05  Robert Collins  <address@hidden>
+
+       * automake.in (required_targets): Added uninstall-am.
+
+2001-05-05  Tom Tromey  <address@hidden>
+
+       Fix bug reported by Robert Boehne:
+       * automake.in (output_lex_build_rule): Don't let AMDEP_TRUE be
+       substituted.
+       (handle_dependencies): Likewise.
+       * Makefile.am (maintainer-check): Look for AMDEP_TRUE
+       substitution.  Correct diff now has 30 lines.  Look for space
+       after losing `undef'.
+
+2001-05-04  Peter Eisentraut  <address@hidden>
+
+       * m4/sanity.m4: Remove the temp file before possible error exits.
+
+2001-05-04  Akim Demaille  <address@hidden>
+
+       * configure.in: Set perllibdir.
+       From Dave Morrison.
+
+2001-05-04  Ralf Corsepius  <address@hidden>
+
+       * automake.in ($pkgdata_dir): New.
+       (&require_file_internal): Use it.
+
+2001-05-03  Akim Demaille  <address@hidden>
+
+       Case insensitive FS choke on Automake/ vs automake.
+       Reported by Tim Van Holder.
+
+       * Automake/: Move into...
+       * lib/: this new directory.
+
+2001-05-03  Raja R Harinath  <address@hidden>
+
+       * data.am (install-%DIR%%PRIMARY%): Execute the same command as
+       echoed.
+
+2001-04-30  Jim Meyering  <address@hidden>
+
+       * automake.in: Remove `/lib' from include directory.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       AM_INIT_AUTOMAKE is no longer optional.
+
+       * automake.in ($seen_make_set, $seen_prog_install)
+       ($seen_arg_prog): Remove.
+       (&handle_programs, &handle_scripts, &scan_one_autoconf_file):
+       Remove related code.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * tests/specflags4.test, tests/specflags5.test: Remove, merged
+       into...
+       * tests/specflags3.test: here.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in ($seen_path_xtra): Remove.
+       (&handle_compile): Don't handle `AC_PATH_XTRA' AC_SUBST variables.
+       (&scan_one_autoconf_file): Do it, instead of setting $seen_path_xtra.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents_internal): Declare it.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file, &file_contents_internal): Don't
+       define macros when `FALSE', to avoid errors on doubly defined
+       variables but under condition `FALSE'.  In order to allow...
+       (&am_install_var): When reading the associated file for the first
+       time, enable `%?FIRST%'.
+       (&handle_libraries): Let libs.am define $(AR) and $(RANLIB).
+       * libs.am: Do it when `%?FIRST%'.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_compile): Let ansi2knr.am define $(ANSI2KNR).
+       * ansi2knr.am: Do it.
+       Prefer `if %?FOO%' to `if %!FOO%'.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&register_language, &finish_languages): Use `pure'
+       as a Boolean.
+       (&register_language): Use %done properly with objects, not names.
+       (&finish_languages): Replace `$non_c' with `$needs_c'.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       Unify LISP, PYTHON and JAVA primaries.
+
+       * automake.in (&handle_emacs_lisp): Be like &handle_python, i.e.,
+       return if there are no files, hook elisp-comp on the Autoconf
+       macro, rely on lisp.am to define variables.
+       (&handle_python, &handle_java): Likewise.
+       (&scan_one_autoconf_file): Pseudo AC_SUBST of `pythondir' and
+       `PYTHON' must be handled here, not in `&handle_python'.
+       * java.am: Define needed variables and rules.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Transform `ONE_PRIMARY'.
+       * data.am: Use it.
+       * header.am: Include data.am.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Transform `PRIMARY'.
+       * data.am: Equip with %PRIMARY%.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (@conditional_stack): Rename as...
+       (@cond_stack): this.
+       (&file_contents_internal): Support inclusion of files.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&lang_extensions): Remove.
+       (&add_depend2, &saw_sources_p): Adjust.
+       * depend2.am: `%EXT%' no longer includes the dot.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&finish_languages, &handle_single_transform_list)
+       (&add_depend2, &handle_dependencies): No longer use the language
+       name in `$lang'.  Rename `$lang_obj' as `$lang'.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&register_language): Use `new Language' with a hash.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&register_language): Rename `output-arg' and
+       `derived-autodep' as `output_arg' and `derived_autodep' to match
+       the Language attribute.
+       Set the defaults in %option instead of $lang.
+
+2001-04-27  Akim Demaille  <address@hidden>
+
+       * Automake/: New directory.
+       * Automake/Struct.pm: New file, based on Perl 5.6's Class::Struct.
+       * automake.in (Language): Use Automake::Struct.
+       * tests/defs: Adjust to find Struct.
+
+2001-04-23  Pavel Roskin <address@hidden>
+
+       * automake.in: Add forward declaration for register_language().
+       * tests/Makefile.am (XFAIL_TESTS): Remove installsh.test - it
+       passes now.
+
+2001-04-20  Akim Demaille  <address@hidden>
+
+       * automake.in (%required_targets): Add `uninstall'.
+       From Robert Collins.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attribute `name'.
+       (&register_language): The name of the language is now given in the
+       hash.
+       No longer use `$lang' as the name of the language.
+       Rename `$lang_obj' as `$lang'.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attribute `_finish'.
+       (&finish): New.
+       (Automake): Adjust.
+       (&lang_header_finish, &lang_yaccxx_finish, &lang_lexxx_finish)
+       (&lang_asm_finish): Remove.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attribute `extensions'.
+       (Automake): Pass a hash to `&register_language' instead of a
+       list of pseudo assignments.
+       (&register_language): Adjust.
+       (&finish_languages): Initialize `$ltoutarg'.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attribute `output_arg'.
+       (%language_map): Remove.
+       (&register_language): Build only the object, and store in
+       %languages only.
+       (&finish_languages, &handle_single_transform_list): Adjust.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): Add attributes `flags', `compile' and
+       `compiler'.
+       (&finish_languages, &handle_single_transform_list, &handle_dist)
+       (&add_depend2, &register_language): Use them and the `linker' and
+       `pure' attributes.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_single_transform_list, &finish_languages)
+       (&handle_dist, &handle_dependencies): Use the language object for
+       autodep and derived-autodep too.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): Ignore Automake definition for
+       ($var, $cond) if there is already a user definition for ($var, $cond).
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_texinfo_file): Catch @cindex and the like,
+       but also @deffn and so on which push data in indexes.
+       Reported by Derek R. Price.
+
+2001-04-12  Akim Demaille  <address@hidden>
+
+       * automake.in (Language): New package, temporarily in this file.
+       Use Class::Struct.
+       (Automake): New package.
+       (%languages): New.
+       (&handle_single_transform_list): Use the language object's `ansi'
+       attribute instead of `$language_map{"$lang-ansi-p"}'.
+       (&register_language): Build and register the language too.
+
+2001-04-11  Tom Tromey  <address@hidden>
+
+       Fixes report from Larry Jones:
+       * automake.in (handle_dependencies): Add address@hidden@' where
+       appropriate.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Handle BSD-style make.
+
+2001-04-11  Akim Demaille  <address@hidden>
+
+       * depend2.am: Fix the `if' condition for Libtool.
+       Reported by Robert Boehne.
+
+2001-04-10  Robert Collins  <address@hidden>
+
+       * tests/subobj5.test: New file.
+
+2001-04-10  Ralf Corsepius  <address@hidden>
+
+       * m4/make.m4 (AM_MAKE_INCLUDE): Pass `-s' to make.
+       * tests/Makefile.am (TESTS): Added make.test.
+       * tests/make.test: New file.
+
+2001-04-10  Tom Tromey  <address@hidden>
+
+       * tests/defs: Changed how ACLOCAL and AUTOMAKE are set.
+
+2001-04-10  Derek R. Price  <address@hidden>
+
+       * tests/defs: Allow user to override AUTOMAKE and ACLOCAL.
+
+2001-04-10  Akim Demaille  <address@hidden>
+
+       * distdir.am: Add a missing backslash.
+
+2001-04-10  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_aclocal_m4): Handle $relative_dir and special
+       variables.
+       Specify to the caller whether $regen_aclocal_m4.
+       (&handle_configure): Adjust.
+       Transform `REGEN-ACLOCAL-M4'.
+       Reported by Tom.
+       * configure.am: Use it.
+       * tests/defs (me): New.
+       * tests/confdeps.test: New.
+
+2001-04-09  Tom Tromey  <address@hidden>
+
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Use `true', not `:'.
+       Fixes report from Jim Meyering.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_configure): Don't bother with optimizing
+       macro uses.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * tests/cond3.test (expected): Adjust.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_single_transform_list): Remove $xbase,
+       unused.
+       (&handle_source_transform): All the variables have conditions now,
+       simplify.
+       (&variable_delete): Admit an argument @conds.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in ($source_suffix_pattern): Remove, unused.
+       %extension_map seems to have replaced it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * ext-compile.am: New file.
+       * automake.in (&finish_languages): Output it.
+       Require a C linker if there are several registered source suffixes.
+       (&handle_compile): No longer push the `.c', `.o', `.obj', `.lo'
+       extensions, which are discovered in ext-compile.am.
+       With the help from Robert Boehne.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_compile): Extract from...
+       (&get_object_extension): here.
+       (&read_am_file): Call it.
+       ($included_generic_compile, $included_knr_compile)
+       ($included_libtool_compile): Remove.
+       ($get_object_extension_was_run): New.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       Use AM_CONDITIONAL and if/endif for AMDEP.
+
+       * m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
+       * automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
+       to a configure time if/endif), or to `FALSE' (static removal of
+       the code).
+       (&handle_dependencies): Adjust to use `AMDEP_TRUE'.
+       * depend2.am: Use if/endif.
+
+       Adjust the 101 tests that use dependencies so that they
+       properly invoke aclocal before automake.  They need to `see'
+       `AM_CONDITIONAL([AMDEP], ...)'.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * tags.am: Fix missing leading tabs.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in: Use simple quotes to define the _PATTERN variables
+       to unobfuscate the regexps.
+       ($AM_CONDITIONAL_PATTERN): Let the user quote the variable.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&rule_define): When you discover a suffix rules,
+       register the extensions for .SUFFIXES.
+       (&handle_texinfo): Don't register the suffixes.
+       (&get_object_extension): Don't register suffixes, let them be
+       discovered in depend2.am.
+       (&handle_emacs_lisp): Depend on your lisp.am.
+       * lisp.am: Include the rule &handle_emacs_lisp used to output.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * subdirs.am: Don't define info related recursive targets.
+       * texinfos.am: Do.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * subdirs.am (RECURSIVE_TARGETS): New variable.
+       Use it.
+       * automake.in (&handle_subdirs): Output it.
+       (&file_contents_internal): Support value spread on several lines.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_man_pages): Rely on mans.am to define
+       man%SECTION%dir and MANS.
+       * mans.am: Do it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_dump): Use %var_type properly.
+       (&macro_define): Enforce better overriding rules.
+       Handle the special case that used to handle...
+       (&define_pretty_variable): this.
+       Hence, don't.
+       The variables you define are owned by Automake.
+       (&generate_makefile): PRE_INSTALL and co must not be defined *by
+       the user*.
+       (&variable_defined): Now independent of the owner.
+       (&variable_output, &variable_pretty_output): Adjust to %var_type.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (%var_was_plus_eq): Rename as...
+       (%var_type): this.
+       (%def_type): Remove.
+       (&macro_define): %var_type may now hold `', `+', or `:'.
+       (%conditional, %am_vars, %content_lines): Rename as...
+       (%var_value, %var_comment, %var_line): these.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_output): Admit a list of @CONDS.
+       (&variable_pretty_output): New.
+       (&define_pretty_variable): Use it.
+       (&read_am_file, &file_contents_internal): Prepend a separator to
+       $am_vars only if there is none yet.
+       (&file_contents_internal): Rename $separator as $spacing to
+       harmonize with &read_am_file.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Transform DIST, and let the *.am
+       files handle DIST_COMMON.
+       * data.am, header.am, java.am, list.am, python.am, script.am: Set
+       DIST_COMMON.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (%dist_common): Remove.
+       (%configure_dist_common): Replace with...
+       ($configure_dist_common): this.
+       (&generate_makefile): Read the user file before using
+       push_dist_common, as it sets DIST_COMMON, and read_am_file checks
+       that no variable is defined before it is run.
+       (&handle_texinfo): Don't handle DIST_COMMON, let your file do it.
+       (&dist_cmp): Rename as...
+       (&for_dist_common): this.
+       (&handle_dist): Don't handle DIST_COMMON, let `configure.am' do
+       it.
+       Adjust to $configure_dist_common.
+       * configure.am, texi-vers.am: Set DIST_COMMON.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_aclocal_m4): Rename as...
+       (&scan_aclocal_m4): this.
+       Return the list of aclocal.m4 dependencies.
+       (&handle_configure): Invoke it, and use it when loading...
+       * configure.am: Template the rules to recreate aclocal.m4.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&get_object_extension): Use ansi2knr.am.
+       * clean-kr.am, kr-extra.am: Remove, merged into...
+       * ansi2knr.am: this new file.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&transform): Fix an incredible bug which was
+       breaking the if/endif system.
+       ($ELSE_PATTERN): Admit an optional argument.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * comp-vars.am: Remove, merged into...
+       * compile.am: here.
+       * automake.in (&get_object_extension): Adjust.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * remake.am: Merge into...
+       * configure.am: ... here.
+       * automake.in (&handle_configure): Adjust.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&output_lex_build_rule): Output this...
+       * lex.am: New file.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&condition_negate): New.
+       (&variable_conditions_permutations): Use it.
+       (&read_am_file, &file_contents): Use it on `else' clauses to
+       support `if FALSE'.
+       (&output_yacc_build_rule): Output this...
+       * yacc.am: New file.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_paragraphs): Transform TOPDIR_P and TOPDIR.
+       (&handle_dist): Don't.
+       (&handle_clean): Don't handle config.status here, let...
+       * clean.am: ... do it.
+       * distdir.am: Adjust.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in: Use strict vars and subs.
+       Declare `%require_file_found'.
+       (&handle_source_transform, &make_paragraphs): Declare my variables.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
+       * progs.am, python.am: Use if/endif instead of ?INSTALL?.
+       * java.am (_am_installdirs): Be sure to set it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_condition): Return '#' when FALSE.
+       (&conditional_string): Return FALSE, not '#' in the corresponding
+       cases.
+       (&file_contents_internal): Adjust.
+       (&check_variable_defined_unconditional): Dump the guilty variable.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * distdir.am: Use and abuse of if/endif.
+       * scripts.am: Using if/endif with variables is fine.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_paragraphs):  Extract from &file_contents.
+       Make it more robust than the previous RE based scheme.
+       (&file_contents): Use it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_paragraphs):  Extract from &file_contents.
+       Make it more robust than the previous RE based scheme.
+       (&file_contents): Use it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * tests/yacc2.test: Don't define several times a variable, as
+       automake complains.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_source_transform): Fix pr72: don't define
+       $linker if there are no @files.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       Avoid reading twice header-vars.am as now macro_define
+       complains.
+
+       * automake.in (&define_standard_variables): Don't output the
+       variables.
+       (&read_main_am_file): Output first user variables, then Automake
+       variables.
+       Don't call twice &define_standard_variables.
+       Save variable comments in $am_vars.
+       (&variable_output): New.
+       (&file_contents_internal): New.
+       Save variable comments in $am_vars.
+       (&file_contents): Use it.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): The user is allowed to override
+       a value if it was set by Automake, or if it was found in AC_SUBST.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_source_transform): Better locality of the
+       variables.
+       Use `next' to skip nonexistent variables.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_dump): If a variable is undefined, say
+       it.
+       (&check_ambiguous_conditional): Give finer error messages.
+       (&macro_define): Check that a `+=' variable is not set with `='.
+       Check for ambiguous definitions each time you _set_ (even with `+=')
+       a variable.
+       (&read_main_am_file): Perform a deep copy of %conditional.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_defined): Some callers, e.g.,
+       &am_primary_prefixes, really want to know if the variable is
+       defined for any condition, not `TRUE' by default.
+       (&am_primary_prefixes): Give a more precise error message.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       (&variable_conditions): Don't include `FALSE' in the result.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_conditions_reduce): FALSE is absorbent.
+       (&variable_conditions): Don't include `FALSE' in the result.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * tests/defs, tests/depend3.test: Remove useless code.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_source_transform):  Use
+       &variable_conditions, don't read $conditional{$var}.
+       (&variable_conditions_sub): When the call is the top level call,
+       generate all the permutations of the conditions.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * depend2.am (@address@hidden): Define it when GENERIC so
+       that it does not get noticed twice by automake, which now
+       complains for multiple definitions.
+       * tests/vartar.test: s/INSTALL/install/g, automake now complains
+       because we defined INSTALL.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&generate_makefile) Use macro_define to define
+       SOURCES and OBJECTS.
+       (&variable_defined): Don't check for $conditional{VAR}{COND} as
+       this would make perl create $condition{VAR}, which we don't want.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_defined, &define_pretty_variable):
+       Simplify code which used to handle the cases where not all
+       variables were in %conditional.
+       (&define_variable): Use &define_pretty_variable.
+       (&variable_conditions_sub, &variable_value_as_list_worker)
+       (&variable_value_as_list, &rule_define): Simplify syntax.
+       (&read_main_am_file): Dump the guilty predefined variables.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_conditions_sub)
+       (&variable_value_as_list_worker): Remove dead code which used to
+       handle the cases where not all variables were in %conditional.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_source_transform, &read_main_am_file):
+       Simplify loops which were split in two parts, conditional vs
+       unconditional variables.
+
+2001-04-09  Akim Demaille  <address@hidden>
+
+       Handle unconditional values of variables as conditioned by
+       `TRUE'.
+
+       * automake.in (%contents): Remove.
+       (&generate_makefile, &handle_ltlibraries, &macro_define)
+       (&read_am_file, &variable_defined, &variable_conditions_sub)
+       (&variable_value, &variable_value_as_list_worker)
+       (&variable_value_as_list, &define_pretty_variable)
+       (&read_main_am_file): Use
+       $conditional, not %contents.
+       (&variable_conditions_permutations): Don't return TRUE and FALSE.
+       (&variable_conditionally_defined): New.
+       (&handle_dist): Use it.
+       (&check_ambiguous_conditional): When multiply defined, specify
+       under which condition.
+       (&macro_define): Use it.
+       (&variable_delete): New.
+       (&read_am_file): Use it.
+       (&am_install_var): Simplify, as all the variables are in
+       %conditional now.
+
+2001-04-07  Tom Tromey  <address@hidden>
+
+       * tests/Makefile.am (XFAIL_TESTS): Added man.test.
+       (TESTS): Likewise.
+       * tests/man.test: New file.
+
+2001-04-07  Raja R Harinath  <address@hidden>
+
+       * depcomp (gcc3): Invert test condition.
+
+2001-04-07  Tom Tromey  <address@hidden>
+
+       * depcomp (gcc3, gcc): Don't assume $? will be set in `if'
+       statement.  Report from Larry Jones.
+
+2001-04-07  Raja R Harinath  <address@hidden>
+
+       * depcomp (sgi): Fix sed expression.  Report from Robert Boehne.
+
+2001-04-01  Tom Tromey  <address@hidden>
+
+       * java.am (.PHONY clean-am): Removed trailing ":".
+       From Per Bothner.  Fixes PR automake/139.
+
+2001-03-28  Akim Demaille  <address@hidden>
+
+       * program.am: Fix a stupid typo: now *all* (not none) the programs
+       use `$(EXEEXT)'.
+       Reported by Robert Boehne.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file, &file_contents): Avoid name clashes
+       on $cond.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_conditionally_defined): Rename as...
+       (&check_variable_unconditionally_defined): this.
+       (&variable_dump): Fix the output.
+       (&variable_defined, &macro_define): Since conditions are
+       canonicalized, don't use a loop to look for a condition: read the
+       hash.
+       (&macro_define, &rule_define, &read_am_file, &file_contents):
+       Rename $cond_string as $cond.
+       * distdir.am (PACKAGE, VERSION): Remove; since they are already
+       discovered via AC_SUBST, they now trigger a `defined twice' error.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_footer, &handle_installdirs)
+       (&read_main_am_file): Don't read %contents directly, use
+       &variable_value.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file): Define the variables in a single
+       shot.
+       Factor the $saw_bk code.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file): Keep $cond_string up to date.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&define_variable): Use &macro_define.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): Don't lose the location if we
+       redefine a variable.
+       Don't push all the variables in @var_list, let...
+       (&read_am_file, &file_contents): ... do it.
+       (&define_pretty_variable): Use macro_define.
+       (&am_install_var): Delete the value of variables being redefined
+       to pacify &macro_define which checks that variables are not
+       doubly defined.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&conditional_dump): Rename as...
+       (&variables_dump): this.  Use...
+       (&variable_dump): this new sub.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Maintain $cond_string sync with
+       @cond_stack.
+       Output rules only if not under `FALSE'.
+       Define variables under $cond_string.
+       * scripts.am: For the time being if/endif does not work properly
+       with macros.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (IF_PATTERN): Unobfuscate the parens.
+       (ENDIF_PATTERN): Allow a condition to be specified.
+       (&file_contents): Use a @cond_stack.
+       (&transform): At least for an easy transition, also transform
+       %?FOO% and %!FOO%, as suggested by Lars.
+       * scripts.am: First test bed for static if/endif use.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Use rule_define.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): Don't rely on $1.
+       Initialize the variable.
+       Set its Automakism only if not defined or if given to the user.
+       When concatenating values, insert a separator only if the value
+       was not empty.
+       (&read_am_file): When dumping the @var_list, skip Automake
+       variables.
+       (&file_contents): Use macro_define.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&rule_define): Extract from...
+       (&read_am_file): here.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define, &read_am_file): More work for the
+       former from the latter.  Reorganize the latter.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&macro_define): Extract from...
+       (&read_am_file): here.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (%am_var_defs): Replace with...
+       (%var_is_am): this.
+       (&handle_installdirs, &variable_value_as_list_worker, &read_am_file)
+       (&file_contents, am_primary_&prefixes): Adjust.
+       (&variable_defined, &define_variable): The actual semantics is
+       `user defined'.
+       (&read_main_am_file): Assert the var is user defined when
+       outputting @var_list.
+
+2001-03-23  Akim Demaille  <address@hidden>
+
+       * automake.in (read_am_file): TRUE and FALSE are predefined
+       conditionals.
+       (&by_condition): Adjust.
+       (&conditional_string): Recognize `TRUE' and `FALSE'.
+       (&make_condition): Use it.
+       * m4/cond.m4: Reject TRUE and FALSE as conditionals.
+       * automake.texi (Conditionals): Adjust.
+       * tests/cond9.test: s/FALSE/WRONG/.
+
+2001-03-12  Pavel Roskin  <address@hidden>
+
+       * tests/Makefile.am (XFAIL_TESTS): Remove cond3.test, it passes
+       now.
+
+2001-03-12  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_conditions_permutations): Separate the
+       conditions.
+       * tests/cond3.test: Improve the sed expression.
+
+2001-03-09  Pavel Roskin  <address@hidden>
+
+       * Makefile.am (maintainer-check): Scan all *.am files and tests
+       for invocations of `rm' without `-f'.
+       * tests/mclean.test: Adjusted to prevent triggering the above
+       test.
+
+2001-03-09  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Fixed comment to avoid
+       maintainer-check failure.
+
+2001-03-09  Akim Demaille  <address@hidden>
+
+       * tests/cond3.test: Strengthen.
+
+2001-03-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&conditional_string): Produce a unique string
+       characterizing a condition stack.
+       (&conditional_same): Remove, comparing two strings is now enough.
+       (&variable_defined): Adjust.
+       (&read_am_file): Use conditional_string.
+
+2001-03-08  Akim Demaille  <address@hidden>
+
+       * automake.in: Use -w.
+       Normalize all use of `$lang . '-foo'' into `"$lang-foo"'.
+       (&parse_arguments): Support --Werror and --Wno-error as a
+       temporary hack until --warning/-W is properly implemented.
+       (&handle_single_transform_list): Prototype.
+       Be sure to define $directory.
+       Use `exists' instead of testing the value of a maybe undefined
+       hash value.
+       (&add_depend2, &handle_configure, &handle_footer, &file_contents)
+       (&handle_factored_dependencies): Use defined values.
+       (&scan_one_autoconf_file): Save $_.
+       * tests/lex2.test, tests/sinclude.test, tests/suffix3.test:
+       Run automake with --Wno-error.
+
+2001-03-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_all): Use an array instead of a scalar for
+       local_headers.
+       Get rid of all-redirect: let `all' be that target.
+
+2001-03-07  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_merge_targets): Ventilate its non `all'
+       related content into...
+       (&generate_makefile): here.
+       (&handle_merge_targets): Rename as...
+       (&handle_all): this.
+       Remove a useless `if': address@hidden' is obviously not empty, since it
+       contains at least the `basename ($makefile)' which has just been
+       unshifted.
+
+2001-03-07  Akim Demaille  <address@hidden>
+
+       * automake.in, aclocal.in: Backquote is inert in double quotes.
+
+2001-03-06  Akim Demaille  <address@hidden>
+
+       * Makefile.am (maintainer-check): Simplify `grep -v ... | grep .'
+       into `grep -v ...'.
+
+2001-03-06  Pavel Roskin  <address@hidden>
+
+       * java.am: Use `rm -f' instead of `rm'.
+
+2001-03-06  Akim Demaille  <address@hidden>
+
+       * automake.in (&push_dist_common): Simplify.
+
+2001-03-06  Jens Krüger <address@hidden>
+
+       * ltlib.am: Replaced spaces with tab.
+
+2001-03-06  Pavel Roskin  <address@hidden>
+
+       * tests/Makefile.am (XFAIL_TESTS): noinstdir.test removed, it's
+       fixed now.
+
+2001-03-05  Pavel Roskin  <address@hidden>
+
+       * header.am, scripts.am: Use ?INSTALL? in the install and
+       uninstall rules.
+
+2001-03-05  Pavel Roskin  <address@hidden>
+
+       * tests/copy.test: Never use `rm' without `-f' - it may ask
+       questions, notably for read-only files during `make distcheck'.
+       * tests/insh.test: Likewise.
+       * tests/installsh.test: Likewise.
+       * tests/symlink.test: Likewise.
+       * tests/symlink2.test: Likewise.
+       * tests/symlink3.test: Likewise.
+
+2001-03-05  Pavel Roskin  <address@hidden>
+
+       * noinstdir.test: New test.
+       * tests/Makefile.am (TESTS): Add noinstdir.test.
+       (XFAIL_TESTS): Likewise.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_options): Change the RE so that the third
+       part of the versions always exist.
+       (&file_contents): Don't pass uninitialized values to &transform.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Require a hash as second argument.
+       Adjust callers.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       Always use hashes with &file_contents.
+
+       * automake.in (&handle_texinfo): texibuild.am does not need
+       TEXINFODIR.
+       texinfos.am wants only TEXICLEANS.
+       (&handle_dist, &add_depend2, &handle_clean): Replace $xform with
+       %transform.
+       * texinfos.am: Adjust.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_programs, &handle_libraries, &handle_tags)
+       (&handle_ltlibraries, &handle_emacs_lisp, &handle_python): Adjust.
+       (&am_install_var): Forget about `-clean'.
+       Transform ?INSTALL?.
+       Always output the *.am file.
+       * data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
+       * ltlib-clean.am, progs-clean.am, python-clean.am, tags-clean.am:
+       Remove, merged into the corresponding *.am file.
+       * data.am, libs.am, ltlib.am, progs.am, python.am: Equip with
+       ?INSTALL?.
+
+2001-03-05  Pavel Roskin  <address@hidden>
+
+       * Makefile.am (amfiles): Add configure.am. Sort alphabetically.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       If OBJEXT and EXEEXT are not set, provide a default value, and use
+       them unconditionally.
+
+       * automake.in (&generate_makefile): Provide default values for
+       EXEEXT and OBJEXT.
+       (&get_object_extension, &finish_languages)
+       (&handle_single_transform_list, &handle_programs, &add_depend2)
+       (&check_cygnus, &lang_c_finish, am_install_var): Don't bother with
+       them, they are defined.
+       * compile.am, depend2.am, program.am, progs.am: Likewise.
+       * remake-hdr.am: Fix a typo.
+       * tests/cxxo.test, tests/fo.test, tests/implicit.test,
+       * tests/interp.test, tests/subobj.test, tests/subobj2.test,
+       * tests/suffix2.test: Adjust.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Map MAINTAINER-MODE to
+       @MAINTAINER_MODE_TRUE@ or nothing.
+       * configure.am, remake-hdr.am, remake.am, texi-vers.am: Adjust.
+       Suggested by Tom.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&do_one_merge_target): Remove, was only called from...
+       (&handle_merge_targets): here for `all'.
+       Adjust.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       Make the installation/uninstallation of Info pages follow the
+       regular am/recursive scheme.
+
+       * automake.in (%required_targets, %dependencies): Add
+       install-info.
+       (%dependencies): Add install-info, install-info-am, and
+       unstall-info.
+       (&handle_subdirs): Don't transform INSTALLINFO, which mapping was
+       reversed BTW.  Does anybody use the option `no-installinfo'?
+       (&handle_merge_targets): Let the handling of info related targets
+       to...
+       (&handle_factored_dependencies): this.
+       * subdirs.am: Use ?INSTALL-INFO?.
+       * texinfos.am: Define the install-info, uninstall-info and
+       uninstall-info-am targets.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (%required_targets, %dependencies): Add dvi, info,
+       dvi-am, info-am.
+       (@info, @dvi): Remove.
+       (&handle_texinfo, &handle_merge_targets): Adjust.
+       (&handle_factored_dependencies): Required targets are phony.
+       * texinfos.am: Build info, dvi, and the corresponding -am or
+       -recursive targets.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Remove $cygxform, unused.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Transform LIBTOOL.
+       (&am_install_var): Remove $ltxform.
+       * ltlib.am, progs.am: Adjust.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in: Require AC_PROG_INSTALL in...
+       (&scan_autoconf_files): here.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * configure.am: New file.
+       * automake.in (&file_contents): Transform CONFIGURE-AC.
+       (&handle_texinfo, &handle_configure): Don't transform
+       CONFIGURE_AM.
+       (&handle_configure): Use `configure.am'.
+       * remake-hdr.am, remake.am, texi-vers.am: Adjust to
+       MAINTAINER-MODE and CONFIGURE-AC.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&pretty_print_internal): Don't output useless
+       spaces.
+       (define_pretty_variable): Don't issue the space after the `=' sign
+       to avoid trailing spaces in Makefile.ins.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&generate_makefile): Invoke &initialize_per_input
+       *before* setting $am_file_name and $in_file_name.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in ($in_file_name, $am_file_name, $relative_dirs):
+       Globals, initialized...
+       (&initialize_per_input): here.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in ($am_relative_dir): Global.
+       (&initialize_per_input): Init it.
+       (%make_list, @make_input_list): My them from
+       (&scan_autoconf_files): here.
+       (&require_file_internal): Mying changes.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (%am_vars, @var_list, %def_type): Globals.
+       (&initialize_per_input): Initialize them.
+       (&read_main_am_file): Don't local them.
+       (&get_object_extension): $objext is private.
+       (&handle_single_transform_list): $lang is.
+       (&handle_ltlibraries): $libname_rx is.
+       (&scan_autoconf_config_files): How about actually paying attention
+       to your arguments, instead of working on $_? (this is no Perl
+       variable, it's a Perl variable followed by a question mark).
+       (&file_contents): $contents and $separator are private.
+       (&am_install_var): Declare @condvals, not $condvals.
+       (%make_dirs): My.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&initialize_per_input): Move to the top.
+       Precede with the `my' list of its variables.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in ($am_file): Use vars.
+       ($am_file_name, $in_file_name): Private to &generate_makefile.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in: Preparation for `use strict': Move the
+       initialization of the constants to the top, from...
+       (&initialize_global_constants): here.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_single_transform_list, &add_depend2): Let
+       $lang_specific_files{$lang} be a list instead of a string.
+
+2001-03-05  Akim Demaille  <address@hidden>
+
+       Let's make it run ten times faster...
+
+       * automake.in (&transform): Be sure to remove the `\n' with ?FOO?
+       transformations.
+       (&file_contents): Let `$command' remove the Automake commands, and
+       normalize the series of `\n'.
+       Slurp the file and apply $command in a single step.
+       No longer apply the address@hidden@' transformation which
+       is already normalized to be handled by &transform.
+
+2001-03-05  Tom Tromey  <address@hidden>
+
+       * automake.in (register_language): Add entry for `-pure'.
+       Added `pure=yes' entries for cxx, objc, f77, ppf77, ratfor, java.
+       (finish_languages): Use `-pure' field of language map.
+
+2001-03-03  Tom Tromey  <address@hidden>
+
+       * tests/yaccvpath.test: No need to remove dummy files.
+       * tests/subobj3.test: No need to remove dummy files.
+       * tests/pr9.test: No need to remove dummy files.
+       * tests/pr87.test: No need to remove dummy files.
+       * tests/pr19.test: No need to remove dummy files.
+       * tests/install2.test: No need to remove dummy files.
+       * tests/defs: Actually copy in install-sh, mkinstalldirs, missing,
+       and depcomp.
+
+2001-02-27  Pavel Roskin  <address@hidden>
+
+       * tests/yaccvpath.test: Add a delay to make parse.c really out
+       of date. Detect the problem earlier, after `make distdir'. Drop
+       dependency on flex. Always use the `-y' flag for bison. Comment
+       changes.
+       * tests/Makefile.am: Add yaccvpath.test to XFAIL_TESTS.
+
+2001-03-02  Jens Krüger <address@hidden>
+
+       * depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo.
+
+2001-02-28  Akim Demaille  <address@hidden>
+
+       * automake.in (&add_depend2): Transform `GENERIC'.
+       Get rid of the ad hoc transformation of address@hidden@.o:' which in
+       addition was broken by the `@ -> %' patch.
+       * depend2.am: Adjust to use ?GENERIC?.
+
+2001-02-28  Akim Demaille  <address@hidden>
+
+       * Makefile.am (maintainer-check): `undef $/' is OK.
+
+2001-02-28  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_configure): Fortunately, $top_reldir,
+       the definition of which was highly suspicious, was unused.
+
+2001-02-27  Akim Demaille  <address@hidden>
+
+       * automake.in (%exec_dir_p): Move to the top so that it is visible
+       to all routines.
+
+2001-02-27  Pavel Roskin  <address@hidden>
+
+       * tests/yaccvpath.test: Prevent automake from looking into ..
+       and ../.. by using AC_CONFIG_AUX_DIR in configure.in.
+
+2001-02-27  Akim Demaille  <address@hidden>
+
+       * automake.in (%exec_dir_p): Pulled out from...
+       (&am_primary_prefixes): here.
+
+2001-02-27  Akim Demaille  <address@hidden>
+
+       * automake.in (&usage): Display $0, not $me.
+
+2001-02-27  Akim Demaille  <address@hidden>
+
+       * mans.am: s/INSTALL_MAN/INSTALL-MAN/.
+       * automake.in (&handle_clean): Don't escape what's given to
+       &transform.
+
+2001-02-27  Akim Demaille  <address@hidden>
+
+       Distinguish automake substitutions from config.status
+       substitutions.
+
+       * automake.in (&add_depend2): Transform AMDEP.
+       (&handle_clean): Transform MCFILES and MFILES.
+       (&file_contents): Transform MAINTAINER_MODE.
+       (&transform, &am_install_var): Use `%', not `@'.
+       Adjust all the *.am files.
+       * clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
+       * depend2.am: Display the double dependency on both ?AMDEP? and
+       @address@hidden
+
+2001-02-27  Tom Tromey  <address@hidden>
+
+       * distdir.am (distcheck): Fixed new code.
+
+       * tests/yaccvpath.test: Fail gracefully if bison/flex not found.
+       Only configure once.
+
+       * distdir.am (distcheck): Print error message if distclean failed
+       to fully clean.
+
+2001-02-27  Pavel Roskin  <address@hidden>
+
+       * tests/Makefile.am (TESTS): s/yaccpvath/yaccvpath/.
+
+2001-02-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/Makefile.am (TESTS): Added yaccvpath.test.
+       * tests/yaccvpath.test: New file.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Recognize whether predefined
+       directories are `data' or `exec'.
+       * libs.am, ltlib.am, progs.am, python.am, scripts.am: Install
+       ?EXEC?.
+       * tests/instdata2.test: Update.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * texinfos.am: No ?EXEC? hook as currently installing TEXINFOS is
+       necessarily in infodir.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in ($am_file): Be `local', as my'd variables used in
+       `foreach' loops are always private to the loop.
+
+2001-02-26  Pavel Roskin  <address@hidden>
+
+       * Makefile.am: Add install.am.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&target_cmp, &dist_cmp): Do not prototype comparing
+       routines, otherwise the elements to compare are passed in @_
+       instead of $a and $b.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (%required_targets): `installcheck-am' is needed.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&transform_cond): Merge into...
+       (&transform): this.
+       Adjust all uses.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_dist): Use &transform instead of dedicated
+       magic for DISTDIRS.
+       But be sure to always do it.
+       * distdir.am: Adjust.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in: Use File::Basename.
+       (&dirname, &basename): Remove.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in ($me): New.
+       Use it.
+       (&usage): Display your full name.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.texi (Invoking Automake): Remove dead options.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_texinfo_file): Also compute the list of files
+       to clean.
+       Handle local errors.
+       (&handle_texinfo): Use it.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in: Don't pass arguments to...
+       (&parse_arguments): Work on @ARGV.
+       Use Getopt.
+       Add support for `-f'.
+       (&version): New.
+       (&usage): Update.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
+       handle installcheck and installcheck-am.
+       * install.am: Do it.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
+       handle install and install-am.
+       * install.am: Do it.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
+       work on targets handled by %dependencies.
+       (&handle_factored_dependencies): Do it.
+       * install.am: Install install-exec, install-data and uninstall's
+       suites.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_merge_targets): Move `install-strip' from
+       here...
+       * install.am: to here.
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * automake.in (@installdirs): Remove.
+       (&file_contents): Be able to grow Automake macros with `+='.
+       (&handle_texinfo, &handle_man_pages, &am_install_var): Let your
+       files define _am_installdirs.
+       (&handle_installdirs): Remove the code, just output `install.am'.
+       * install.am: New.
+       * data.am, header.am, libs.am, lisp.am, ltlib.am, mans.am, progs.am,
+       * python.am, scripts.am, texinfos.am: Extend $(_am_installdirs).
+
+2001-02-26  Akim Demaille  <address@hidden>
+
+       * tests/instdata2.test (libexec_DATA): Exercise more
+       possibilities.
+
+2001-02-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * header-vars.am (INSTALL_STRIP_FLAG): Remove (obsolete).
+
+2001-02-25  Tom Tromey  <address@hidden>
+
+       * tests/instdata2.test: Added `sbin_DATA' check.
+
+       * tests/Makefile.am (TESTS): Added subdircond.test.
+       * tests/subdircond.test: New file.
+       * automake.in (handle_gettext): Don't fail if SUBDIRS
+       conditionally defined.
+
+       * automake.in: Use IO::File.
+       (generate_makefile): Use IO::File.
+       (scan_texinfo_file): Likewise.
+       (handle_aclocal_m4): Likewise.
+       (scan_autoconf_traces): Likewise.
+       (scan_one_autoconf_file): Likewise.
+       (read_am_file): Likewise.
+       (file_contents): Likewise.
+       (create): Likewise.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): Remove code handled by texinfos.am.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&transform): Also call &transform_cond on your
+       arguments.
+       (&handle_dist): Adjust.
+       (&handle_factored_dependencies): Uniq dependencies.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_gettext): Simplify redundant `if'.
+       Used &variable_value, don't read %contents directly.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in ($install_recursive): Remove, replaced with calls to
+       `&variable_defined ('SUBDIRS')'.
+       (&handle_dist, &handle_clean): Don't transform_cond SUBDIRS since...
+       (&file_contents): now does.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_man_pages): $found is dead.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       Internally just store the conditionals as space separated lists of
+       CONDITIONS (instead of @CONDITIONS@).
+
+       * automake.in (&conditional_true_when, &variable_conditions_sub):
+       Split conditions at spaces.
+       (&handle_dependencies, &variable_conditions_permutations): Don't
+       put @ around conditions.
+       (&variable_conditions_cmp): There are no @ to strip.
+       (&make_condition): New.
+       (&define_pretty_variable, &read_main_am_file, &read_am_file): Use
+       it.
+       (&read_main_am_file, &read_am_file): Stop playing with @ by hand.
+       Join @conditional_stack with spaces.
+       (&read_main_am_file): Adjust the output of variables.
+       Output `TRUE = true' under the condition `TEST' as address@hidden@TRUE =
+       true' and no longer address@hidden@TRUE = @address@hidden'.
+       (&variable_conditions_cmp): Rename as...
+       (&by_condition): this.
+       Sort in a human pleasant order.
+       Use it everywhere a human can see conditions.
+       (&variable_conditions_reduce): Don't sort conditions, that's
+       pointless.
+       * tests/cond.test, ctarget1.test, pluseq3.test: Strengthen.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in: `my' the globals.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&initialize_per_input): %targets_conditionals is
+       new.
+       (&read_am_file): When slurping a rule, set the target related
+       variable, and no variable related variable.
+       (&file_contents): Likewise.
+       * tests/vartar.test, tests/ctarget1.test: New.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&variable_defined, &variable_value_as_list_worker):
+       If $VAR is effectively a variable, don't die if it's also a
+       target.
+       Plus some formatting changes.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in: Mying changes.
+       * Makefile.am (maintainer-check): Check the stability of the
+       number of uses of `local'.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in: Mying changes.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in: Mying changes.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in: Mying changes.
+       (&handle_tags): Fix a bug uncovered by the previous mying changes:
+       transform CONFIG into $config, not $xform.
+
+2001-02-25  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_texinfo, &handle_man_pages, &am_install_var):
+       Don't deal with install-data-am, install-exec-am and unstall-am.
+       (&initialize_per_input): Add them to %dependencies.
+       Remove %exec_dir_p since the *.am files are now in charge of it.
+       Remove @uninstall, @install_data, @install_exec.
+       (&handle_merge_targets): Adjust to these removals.
+       (&file_contents): Also &transform_cond for --no-installman and
+       --no-installinfo.
+       (&do_one_merge_target): Add some magic to install hooks on
+       %dependencies' targets.
+       (%required_targets): New.
+       (&handle_factored_dependencies): Output required targets.
+       * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
+       * mans-vars.am, mans.am, progs.am, python.am, scripts.am,
+       * texinfos.am: Declare your dependencies on install-data-am,
+       install-exec-am and uninstall-am.
+       * tests/instdata2.test (incldata_HEADERS): New test.
+
+2001-02-24  Tom Tromey  <address@hidden>
+
+       * Makefile.am (amfiles): Added texibuild.am.
+       * texibuild.am: New file.
+       * tests/Makefile.am (TESTS): Added texinfo9.test.
+       * tests/texinfo9.test: New file.
+       * automake.in (handle_texinfo): Keep track of suffixes used.  Give
+       error if suffix unrecognized.  Removed extraneous newline.
+
+2001-02-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&am_install_var): Don't hook on the clean targets
+       and .PHONY.
+       * data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
+       * ltlib-clean.am, progs-clean.am, python-clean.am, tags-clean.am:
+       Do it.
+
+2001-02-23  Akim Demaille  <address@hidden>
+
+       * automake.in: Promote local `my' over `local'.
+
+2001-02-23  Akim Demaille  <address@hidden>
+
+       * automake.in: Formatting and mying changes.
+
+2001-02-23  Akim Demaille  <address@hidden>
+
+       * automake.in: Formatting and mying changes.
+
+2001-02-23  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_man_pages): Let install-man and
+       uninstall-man be handled by the dependency tracker.
+       (&initialize_per_input): Let %dependencies track them.
+       * mans.am: Add the needed hooks with the proper dependencies.
+
+2001-02-22  Pavel Roskin  <address@hidden>
+
+       * tests/target-cflags.test: Don't use subshell to configure in
+       subdirectory. Typo fix - run `./foo', not `/foo'.
+
+2001-02-22  Akim Demaille  <address@hidden>
+
+       * automake.in: Formatting and mying changes.
+
+2001-02-21  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Introduce new variable to avoid extra
+       keys in %dist_dirs.  Fixes distdir.test.
+
+       * automake.in (handle_texinfo): Only remove suffixes we can
+       handle.
+
+       * tests/distdir.test: Check to make sure directory isn't made in
+       build directory.
+
+       * automake.in (handle_dist): Do nothing in Cygnus mode.
+
+2001-02-21  Pavel Roskin  <address@hidden>
+
+       * header-vars.am: Remove tabs before variable definitions.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * tests/distdir.test (EXTRA_DIST): Use a finer pattern to avoid
+       false diagnostics.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&dist_cmp, &target_cmp): Be sure to return a
+       numeric value as required by Perl 5.6.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * dist-vars.am: Remove, merge into...
+       * distdir.am: this.
+       * automake.in (dirname, basename, backname): Move to the top of
+       the file so that prototypes are checked,
+       Use them without `&'.
+       (&handle_dist): Adjust.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&check_ambiguous_conditional, &read_main_am_file):
+       Use a uniform naming scheme.
+       (&quote_cond_val, &unquote_cond_val): Delete, dead code.
+       (&read_am_file): Fix conditional definition of backslash continued
+       items.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       Change the handling of conditionals: instead of using an ad-hoc
+       encoding to store a hash in a string, use hashes.
+
+       * automake.in (&conditional_dump): New.
+       (&check_ambiguous_conditional, &variable_defined)
+       (&variable_conditions_sub, &variable_value_as_list_worker)
+       (&define_variable, read_am_file, &read_main_am_file): Be sure to
+       handle `$conditional{$vars}' as a hash instead of a plain string.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&conditional_true_when): Modernize, simplify.
+       Warning: `$comp' is now private (my), while it used to be
+       `inherited' from a `local' elsewhere in the code.  AFAICT it was
+       wrong, but some dirty side effect might show up.
+       (&conditionals_true_when): New.
+       (&variable_conditions_sub, &variable_conditions_reduce): Use it.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in ($top_builddir): Remove, used in one place.
+       (&define_standard_variables): Adjust.
+       Move the definition of triplet variables into...
+       * header-vars.am: here.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&initialize_global_constants): Don't define $USAGE.
+       (&usage): Handle the former content of $USAGE.
+       Don't pretend autoconf cares about Makefile.in.
+       Classify the options.
+       (&handle_tests): Formatting and mying changes.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&handle_tests_dejagnu): Move the definition of a
+       default `site.exp' into...
+       * dejagnu.am (site.exp): here.
+       Use DOS compliant file names.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&dist_cmp): New.
+       (&handle_dist): Use it.
+       Promote `my' over `local'.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * dist.am: Remove, merge into...
+       * distdir.am: here.  Use the neat sed snippet for banners.
+       BTW, distcheck is phony.
+       * automake.in (&handle_dist_worker): Remove, merge into...
+       (&handle_dist): this.
+       (&file_contents): Strip leading new lines.
+       Be sure to end comments with new lines.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * distdir.am (GZIP_ENV): Define.
+       * automake.in (&handle_dist): Don't.
+       (&uniq): New.
+       (&handle_dist_worker, &am_install_var): Use it.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * distdir.am (distdir): Handle the DIST-TARGETS.
+       * automake.in (&handle_dist_worker): Don't.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Transform the global options (such
+       as CYGNUS).
+       (&handle_texinfo, &handle_dist_worker, &handle_tests_dejagnu): Don't.
+
+2001-02-21  Akim Demaille  <address@hidden>
+
+       * distdir.am (distdir): Be sure to have permissive rights on its
+       contents.
+       (dist-all, dist-bzip2, dist-zip, dist-tarZ): New conditional
+       targets.
+       And BTW, all these guys are phony.
+       * automake.in (&handle_dist_worker): As its name doesn't indicate,
+       output distributions.
+       (&handle_dist): As its name doesn't indicate, don't.
+       (&initialize_global_constants): Don't define variables which
+       content is now handled by distdir.am.
+       But register `dist-all' as a factored target.
+       (&handle_factored_dependencies): Don't output empty targets.
+
+2001-02-20  Tom Tromey  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Simplify m4_pattern_allow
+       invocation.
+
+2001-02-18  Tom Tromey  <address@hidden>
+
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Don't call AM_PROG_STRIP.
+       Set INSTALL_STRIP_PROGRAM_ENV to `$(STRIP)', not `$STRIP'.
+       (AM_PROG_STRIP): Commented out.
+
+2001-02-17  Raja R Harinath  <address@hidden>
+
+       * depcomp (gcc3): Protect against the compiler deleting
+       the dependency output file.
+
+2001-02-17  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): Use double quotes around
+       setting of INSTALL_STRIP_PROGRAM.
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Set INSTALL_STRIP_PROGRAM
+       to absolute path at runtime.
+       (AM_PROG_STRIP): Don't explicitly test $STRIP.
+
+2001-01-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/strip.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Add strip.m4.
+       * m4/init.m4: Call AM_PROG_INSTALL_STRIP.
+       * m4/missing.m4 (AM_AUX_DIR_EXPAND): New function.
+       * automake.in (handle_merge_targets): In the install-strip rule,
+       set INSTALL_PROGRAM to INSTALL_STRIP_PROGRAM, and INSTALL_PROGRAM_ENV
+       to INSTALL_STRIP_PROGRAM_ENV; don't use INSTALL_STRIP_FLAG.
+       * progs.am (address@hidden@PROGRAMS): Adapt to use INSTALL_PROGRAM_ENV,
+       don't use INSTALL_STRIP_FLAG any longer.
+
+2001-02-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Unquote AC_CONFIG_AUX_DIR's
+       argument.
+
+2001-02-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (unquote_m4_arg): New function.
+       (scan_one_configure_file): Call unquote_m4_arg on
+       AM_CONFIG_HEADER argument, so that AM_CONFIG_HEADER([foobar.h])
+       works.
+
+2001-02-15  Tom Tromey  <address@hidden>
+
+       * config.guess, config.sub: New versions from FSF.
+
+       * Makefile.am (WGET): New macro.
+       (FETCHFILES): New macro.
+       (fetch): New target.
+
+       * tests/subobj3.test: Exit with status 77 if gcc not found.
+       * tests/pr9.test: Exit with status 77 if gzip not found.
+       * tests/pr87.test: Exit with status 77 if gcc not found.
+       * tests/pr19.test: Exit with status 77 if gzip or gcc not found.
+       * tests/install2.test: Exit with status 77 if gzip not found.
+       * tests/exsource.test: Exit with status 77 if GNU make not found.
+       * tests/ansi3.test: Exit with status 77 if gcc not found.
+
+       * tests/target-cflags.test: Require GNU make.  Exit with status 77
+       if gcc or make not found.  Fixes PR automake/121.
+
+       * configure.in: Require Perl 5.005.
+       * automake.in: Require 5.005.
+
+       * automake.texi (Top): Conditionalize on `nottex', not `info'.
+       Fixes PR automake/122.
+
+2001-02-14  Tom Tromey  <address@hidden>
+
+       * automake.in (add_depend2): Only emit a given object rule once.
+       Fixes specflags6.test.
+
+2001-02-14  Richard Boulton  <address@hidden>
+
+       * tests/specflags6.test: New file.
+
+2001-02-14  Tom Tromey  <address@hidden>
+
+       * automake.texi (A Shared Library): Mention -module.
+
+2001-02-13  Tom Tromey  <address@hidden>
+
+       * automake.in (do_one_merge_target): Always register $name and
+       $name-am as phony.
+
+       * automake.in (do_one_merge_target): Register `all' as phony
+       target.
+
+       * configure.in: Updated to 1.4e for cvs.
+
+2001-02-12  Tom Tromey  <address@hidden>
+
+       * configure.in: Updated to 1.4d and released.
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly allow various AM_*
+       names through autoconf.
+
+       Fix for subdirbuiltsources.test:
+       * automake.in (initialize_per_input): [all_target] Initialize to
+       empty string.
+       (handle_merge_targets): Use all-redirect target to handle built
+       sources.
+       (do_one_merge_target): Don't generate all-redirect rule.
+
+2001-02-11  Peter Muir  <address@hidden>
+
+       * tests/subdirbuiltsources.test: New file.
+       * tests/Makefile.am (TESTS): Added new file.
+
+2001-02-10  Tom Tromey  <address@hidden>
+
+       * tests/condlib.test: New file.
+       * tests/Makefile.am (TESTS): Added new file.
+
+2001-02-10  Lars J. Aas  <address@hidden>
+
+       * automake.in ($MACRO_PATTERN): Include '@' in name regex.
+       (&canonicalize): New. Includes '@' in canonical range.
+       (&check_canonical_spelling, &handle_programs, &handle_libraries,
+       &handle_ltlibraries, &handle_texinfo): Use &canonicalize.
+
+2001-02-10  Raja R Harinath  <address@hidden>
+
+       * automake.in (handle_configure): Revert part of
+       '2001-02-04  Kevin Ryde <address@hidden>'.  Don't
+       set CONFIG_COMMANDS explicitly.
+
+2001-02-09  Raja R Harinath  <address@hidden>
+
+       * depcomp (gcc3): Propagate exit code.
+
+2001-02-09  Lars J. Aas  <address@hidden>
+
+       * header.am (address@hidden@HEADERS): s,?!NOBASE?,?!BASE?, (typo)
+
+2001-02-09  Tom Tromey  <address@hidden>
+
+       Clean up maintainer-check warnings:
+       * Makefile.am (maintainer-check): Ignore comment lines in CDPATH
+       check.
+       * automake.in (handle_dist_worker): Removed redundant `my $xform'.
+
+2001-02-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&file_contents): Remove a dead branch.
+
+2001-02-09  Akim Demaille  <address@hidden>
+
+       * automake.in (&transform): Use `my', not `local'.
+       (&transform_cond): New.
+       (&get_object_extension, &handle_texinfo, &handle_tags)
+       (&handle_dist_worker, &handle_dist, &add_depend2, &handle_clean)
+       (&handle_tests_dejagnu): Use it.
+       * texinfos.am, lisp.am, header.am, dist.am, distdir.am, depend2.am
+       * dejagnu.am, data.am, clean.am: Adjust to the new syntax.
+
+2001-02-09  Akim Demaille  <address@hidden>
+
+       * automake.in: Various formatting changes, and modernization of
+       Perl constructs.
+       (&backname): New.
+       (&handle_configure, define_standard_variables): Use it.
+
+2001-02-08  Tom Tromey  <address@hidden>
+
+       * automake.in (file_contents): Only add $actions if any are
+       found.  Fixes new failure in pr87.test.
+
+2001-02-08  Pavel Roskin  <address@hidden>
+
+       * tests/pr87.test: Check foo/Makfile.in after it is created.
+
+2001-02-08  Tom Tromey  <address@hidden>
+
+       * tests/pr87.test: Added check for blank line after `.c.o' rule.
+       Report from Lars J. Aas.
+
+2001-02-07  Lars J. Aas  <address@hidden>
+
+       * lisp.am (address@hidden@LISP): Removed extra space.
+       * header.am (address@hidden@HEADERS): Removed extra space.
+       * data.am (address@hidden@DATA): Removed extra space.
+
+2001-02-07  Tom Tromey  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use \", not ".
+
+       * automake.in (handle_dependencies): Use _am_include, not
+       AMINCLUDE.
+       * tests/exsource.test: Use _am_include, not AMINCLUDE.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Use _am_include, not AMINCLUDE.
+
+       * tests/Makefile.am (XFAIL_TESTS): Removed distcommon.test.
+
+       * tests/Makefile.am (EXTRA_DIST): Added ChangeLog-old.
+
+       * automake.in (handle_configure): Handle case where output file is
+       in subdir with no Makefile of its own.  Fixes remake3.test,
+       distcommon.test.
+
+2001-02-06  Pavel Roskin  <address@hidden>
+
+       * automake.in (handle_dependencies): Rename AM_INCLUDE to
+       AMINCLUDE.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
+       * tests/exsource.test: Likewise.
+
+2001-02-06  Derek Price  <address@hidden>
+
+       * automake.in (handle_configure): Fix syntax error.
+
+2001-02-06  Akim Demaille  <address@hidden>
+
+       * subdirs.am: This file is the exception: clean recursive targets
+       are called by the clean targets, not the clean-am targets.
+       Otherwise we have a circular dependency: clean -> clean-am ->
+       clean-recursive -> clean.
+       * automake.in (handle_clean): Bind `-local' targets to `-am'
+       targets, not top targets.
+       Don't declare -recursive dependencies of the clean targets:
+       `subdirs.am' did it.  Less hard coded knowledge, transfered
+       into...
+       * clean.am: here.
+
+2001-02-06  Akim Demaille  <address@hidden>
+
+       Monstro unsplitable patch.
+
+       The aim is to remove hard coded knowledge about clean targets from
+       automake.in, leaving them in the *.am files.
+       In addition to the mechanic needed to factor some dependencies, it
+       appears some rules (most notably distclean and maintainer-clean)
+       need factored actions.  So first, be ready to catch factored
+       rules.
+
+       * automake.in (&file_contents): For the time being, use an extended
+       $RULE_PATTERN which is able to match any kind of rules, with or
+       without dependency, with or without actions.
+       Handle all the rules uniformly, storing in %actions the factored
+       actions.
+       (&flatten, &target_cmp): New.
+       (&handle_factored_dependencies): Output the %actions.
+       No longer special case `clean'.
+       Output the rules in alphabetical order, but keeping `.PHONY' last.
+
+       Now we must not use &push_phony_cleaners, which is doing all sort
+       of magic to push a bit of everything in all the clean targets.
+       The biggest problem being that, making a Cartesian product, it
+       requires many useless targets.  The `*.am' file know better.
+       But first, register the new factored rules.
+
+       * automake.in (&initialize_per_input): Include clean, mostlyclean,
+       maintainer-clean, distclean and their `*-am' counterpart in
+       %dependencies.
+       Initialize %actions.
+       (get_object_extension, handle_texinfo, handle_tags, handle_multilib)
+       handle_dependencies, handle_subdirs, handle_configure, handle_clean)
+       (handle_emacs_lisp, handle_python): Don't play with
+       &push_phony_cleaners nor &depend and `clean'.
+       * texinfos.am, texi-vers.am, tags-clean.am:
+       * subdirs.am,python-clean.am, multilib.am, lisp-clean.am:
+       * libtool.am, kr-extra.am, depend.am, compile.am, clean.am:
+       * clean-kr.am, clean-hdr.am: Do it.
+       Whenever a target is empty, just remove it, it will no longer be
+       called.
+
+       There is still some magic about clean to hard code.  But really,
+       that's the end of &do_one_clean_target.
+
+       * automake.in (&do_one_clean_target): Kaboom out.
+       (&handle_clean): Rewrite the magic code.
+       (&am_install_var): No longer use &push_phony_cleaners, nor depend
+       on `clean'.
+       (&push_phony_cleaners): Kaboom too.
+
+2001-02-06  Akim Demaille  <address@hidden>
+
+       * automake.in (do_one_clean_target): Don't hard code knowledge
+       about libtool, and maintainer-clean.
+       * clean.am, libtool.am: Handle these.
+
+2001-02-05  Akim Demaille  <address@hidden>
+
+       * automake.in (handle_texinfo): No longer hard code the clean
+       targets.
+       (texinfos.am): Include them.
+
+2001-02-05  Akim Demaille  <address@hidden>
+
+       * Makefile.am (perl4-check): Remove, we now require Perl 5.
+       (maintainer-check): Don't be silent when you find a problem, and
+       actually, even specify the locations.
+       Also check that @_ is assigned to arrays.
+
+2001-02-05  Akim Demaille  <address@hidden>
+
+       * m4/regex.m4: Use AC_LIBSOURCES.
+       * automake.in (scan_autoconf_traces): Trace AC_LIBSOURCE, not
+       _AC_LIBOBJ_DECL.
+
+2001-02-04  Tom Tromey  <address@hidden>
+
+       * m4/Makefile.am (m4data_DATA): Added make.m4.
+       * automake.in (handle_dependencies): Use @AM_INCLUDE@ to include
+       dependency files.
+       * m4/depend.m4 (AM_DEPNDENCIES): Require AM_MAKE_INCLUDE.
+       Copy depcomp to subdir.
+       * m4/make.m4: New file.
+
+2001-02-04  Pavel Roskin  <address@hidden>
+
+       * automake.in (handle_dist_worker): Remove a line that is now
+       in distdir.am.
+
+2001-02-04  Kevin Ryde  <address@hidden>
+
+       * automake.in (handle_configure): Call config.status with empty
+       CONFIG_LINKS and CONFIG_COMMANDS when regenerating a file.
+
+2001-02-04  Tom Tromey  <address@hidden>
+
+       * depcomp (ddashmd): Removed case.
+       (sgi): Handle failure exit correctly
+       (aix): Likewise.  Also, add dummy `.h' targets.
+
+2001-02-04  Akim Demaille  <address@hidden>
+
+       * distdir.am (distdir): New file, extracted from...
+       * automake.in (handle_dist_worker): here.
+       Adjust.
+
+2001-02-04  Akim Demaille  <address@hidden>
+
+       * automake.in (@clean): Remove, replaced by...
+       ($dependencies{'clean'}): this.
+       Use `&depend' instead of push'ing into @clean.
+       (handle_factored_dependencies): For the time being, skip 'clean'.
+       (do_one_clean_target): Don't ask for argument 1 and 4 as they are
+       always `clean', and address@hidden'.
+
+2001-02-04  Akim Demaille  <address@hidden>
+
+       * automake.in (%dependencies): Don't be initialize globally for
+       all the files, but in...
+       (&initialize_per_input): here.
+       (&depend): New.
+       (@phony): Replace all occurrences with the corresponding &depend
+       invocation.
+
+2001-02-03  Tom Tromey  <address@hidden>
+
+       * header.am (address@hidden@HEADERS): Use INSTALL_HEADER.
+       * header-vars.am (INSTALL_HEADER): New macro.
+
+       * automake.texi (Rebuilding): New node.
+
+-----
+
+Copyright (C) 2001-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.02 b/old/ChangeLog.02
new file mode 100644
index 0000000..b99f757
--- /dev/null
+++ b/old/ChangeLog.02
@@ -0,0 +1,3225 @@
+2002-12-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/ChannelDefs.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add ChannelDefs.pm.
+       * automake.in: Move all "register_channel" calls to ChannelDefs.pm.
+       (prog_error, error, fatal, verb, switch_warning, parse_WARNINGS,
+       parse_warnings): Move to ChannelDefs.pm.
+       (usage): Move the warning list to Automake::ChannelDefs::usage
+       and call it.
+       (set_strictness): Move channel setings to
+       Automake::ChannelDefs::set_strictness and call it.
+
+       * automake.in (err): Rename as ...
+       (error): ... this.  Adjust all callers.
+       Suggested by H.Merijn Brand.
+
+2002-12-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/version7.test: Require GNU make.
+       Reported by Patrick Welche.
+
+2002-12-11  Brian Ford  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Properly quote AC_PACKAGE_TARNAME
+       and AC_PACKAGE_VERSION.
+
+2002-12-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (ANSI): Since Autoconf 2.54, LIBOBJ and LTLIBOBJ
+       no longer have to be rewritten in order to support deansification.
+       (Tests): Link to the DejaGnu manual.
+       (Optional): Comment out FIXME.
+       (Complete, A Library, LIBOBJS): Use $(LIBOBJ) and $(ALLOCA)
+       instead of @LIBOBJ@ and @address@hidden
+       (Sources): Typo.
+
+2002-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Strip
+       directories from info filenames.
+       * tests/texinfo13.test: Make sure main.info gets installed
+       as $(infodir)/main.info.
+
+       * automake.in (handle_dist): Do not define %GETTEXT% if the user
+       is using $seen_gettext_external, this distcheck won't run
+       `./configure' with a meaningless `--with-included-gettext'.
+       * tests/gettext.test: Make sure distcheck uses --with-included-gettext.
+       * tests/gettext2.test: Make sure distcheck does not use
+       --with-included-gettext.
+
+       * m4/ccstdc.m4: Define am_cv_prog_cc_stdc for backward
+       compatibility and diagnose the use of AM_PROG_CC_STDC.
+       * automake.texi (Public macros) <AM_PROG_CC_STDC>: Remove
+       documentation, this macro is no longer supported.
+       Reported by Kevin Ryde.
+
+2002-12-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages): Test $objdir, not $srcdir, to
+       decide whether a _.c file is in a subdirectory and has to be
+       cleaned separately.
+       Reported by Kevin Ryde.
+
+       * tests/ansi10.test (liblib_a_LIBADD): Set ac_cv_prog_cc_stdc
+       not am_cv_prog_cc_stdc.
+
+       * automake.texi (Options): Some English nits from Eric Siegerman.
+       (Sources): Rewrite the introduction and move the example to ...
+       (Built sources example): ... this separate node.
+
+       * automake.in (variable_pretty_output): Strip trailing
+       backslashes in $val after $val is defined...
+       Reported by Kevin Ryde.
+
+       * tests/depcomp2.test: Pass CC='gcc' as an argument to ./configure
+       not in the environment.  Otherwise the test will fail when
+       run with ksh and VERBOSE=x.
+       Reported by Paul Jarc.
+
+       * tests/man2.test: Exercize `make uninstall', to test
+       the previous change.
+
+2002-12-03  Nicolas Joly  <address@hidden>
+
+       * lib/am/mans.am (uninstall-man%SECTION%): Change the extension of
+       the man pages being uninstalled, if needed.
+
+2002-12-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (macro_define): Do not strip escaped new lines
+       in Automake's +='ed variables.  We don't know whether it will
+       be pretty printed or not at this point.
+       (variable_pretty_output): Do this here.
+       * tests/pluseq10.test: New file.
+       * tests/Makefile.am (TESTS): Add pluseq10.test.
+       Reported by Ralf Corsepius.
+
+2002-12-02  Charles Wilson  <address@hidden>
+
+       * tests/gnits3.test (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT):
+       Append $(EXEEXT) again.
+
+2002-12-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Sources): Illustrate $(BUILT_SOURCES) with an
+       example.
+
+       * automake.texi (Options): Programs listed in
+       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT should have $(EXEEXT) appended.
+       * tests/gnits3.test (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT):
+       Append $(EXEEXT).
+       Reported by Charles Wilson.
+
+2002-12-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (lang_c_finish): Do not fill de_ansi_files with
+       subdirectory informations for %libsources files.  A LIBOBJS source
+       is always in the current directory.  This reverts part of a change
+       from 2002-01-13.
+       * tests/ansi10.test: New file.
+       * tests/Makefile.am (TESTS): Add ansi10.test.
+
+       * automake.in (do_check_merge_target): Add missing space.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+       * configure.in: Do not use missing while checking for Autoconf's
+       version, otherwise we won't notice that Autoconf isn't installed.
+       Augment the error message with a few questions to help users.
+
+2002-11-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/gnits2.test, tests/gnits3.test: Move the greps inside the
+       Makefile, so we can honor $(EXEEXT).  Otherwise these tests
+       fail under Cygwin.
+       Reported by Charles Wilson.
+
+       For PR automake/375 (Debian Bug #168671):
+       * automake.in (scan_texinfo_file): Erase all known index files, no
+       matter whether they are used at the top-level or not, because we
+       can never know if they are used in included files.  The remaining
+       macros we recognize at the top-level of a Texi document are
+       @defindex, @defcodeindex, @synindex, and @syncodeindex.
+       * tests/texinfo18.test: New file.
+       * tests/Makefile.am (TESTS): Add texinfo18.test.
+       Reported by Simon Richter.
+
+       * automake.in (scan_texinfo_file): Honor only the first @setfilename.
+       * tests/texinfo17.test: New file.
+       * tests/Makefile.am (TESTS): Add texinfo17.test.
+       Reported by Karl Berry.
+
+       For PR automake/357:
+       * automake.in (require_file_internal): Don't complain a file is "not
+       found" when it is a target.  Make sure "not found" files are otherwise
+       reported as error (they were reported as 'note').
+       * tests/distcommon3.test: Augment to test the above.
+       * tests/libobj12b.test: Touch ltmain.sh.
+       * tests/required2.test: Make sure Automake fails because ltmain.sh
+       has been removed.
+       Reported by Ronald Landheer.
+
+       * tests/texinfo3.test: Make sure we don't output single suffix
+       inference rules when building `.info'-less Info files (this
+       confuses Solaris make).  Run distcheck to make sure the rules
+       work.
+       * automake.in (output_texinfo_build_rules): Define GENERIC_INFO
+       and SOURCE_INFO.
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%,
+       %DEST_PREFIX%%DEST_SUFFIX%): Honor GENERIC_INFO and SOURCE_INFO.
+
+2002-11-29  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/359:
+       * automake.in (do_check_merge_target): Make `check' dependent on
+       $(BUILT_SOURCES) if the variable is defined.  Run `check-am' or
+       `check-recursive' in a submake in this case.
+       * tests/check2.test, tests/check3.test: New files.
+       * tests/check.test: Make sure `check' depends on `check-am'.
+       * tests/Makefile.am (TESTS): Add check2.test and check3.test.
+
+       For PR automake/371 and PR automake/372:
+       * automake.in (rule_define): Honor inference rules with multiple
+       targets, and warn when they are used.
+       * tests/suffix11.test: New file.
+       * tests/Makefile.am (TESTS): Add suffix11.test.
+       Reported by Duncan Gibson.
+
+2002-11-28  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/370:
+       * automake.in (handle_languages): Don't prepend $U to $myext
+       since handle_single_transform_list now appends it to $obj.
+       Process the rule twice to handle deansified files in subdirectories.
+       Mark _.c files in subdirectories for cleaning.
+       (handle_single_transform_list): Append $U to $obj_sans_ext if
+       needed: before this dependencies were output foo.Po instead
+       of foo$U.Po.  Don't output explicit dependencies for renamed
+       objects or sources in sub-directories: we already output
+       a full compile rule for them.
+       (lang_c_finish): Don't always use the full filename in the
+       .c -> _.c rule.  This reverts part of my change of 2002-11-21.
+       * tests/ansi6.test, tests/ansi7.test: Make sure deansified
+       files are created in the right directory, and cleaned.
+       Reported by Kevin Ryde.
+
+2002-11-25  Jim Meyering  <address@hidden>
+
+       * lib/install-sh: Put `$0:' at the beginning of each diagnostic,
+       not `install:'.
+
+2002-11-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (make_condition_string): New function.
+       (cond_stack_if, cond_stack_else, cond_stack_endif): Use it.
+       Suggested by Raja R Harinath.
+
+       * tests/texinfo13.test: Require texi2dvi-o.
+       * tests/defs.in: Handle required=texi2dvi-o.
+
+       * automake.in (lang_c_finish): Use $@ in the .c -> _.c rule.
+
+       * automake.in (handle_single_transform_list): Don't strip the
+       directory from $full_ansi.  This reverts my patch of 2002-10-16.
+       (lang_c_finish): Use the full filename, including the directory,
+       in the .c -> _.c rule.  These two files must reside in the same
+       directory.
+       * tests/ansi6.test: Also try to compile without ansi2knr.
+       Reported by Andreas Schwab
+
+2002-11-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Conditional.pm (strip): New function.
+       * lib/Automake/ConditionalSet.pm (sub_conditions): Use it.
+       Suggested by Raja R Harinath.
+
+       * automake.in (conditional_ambiguous_p, macro_define, rule_define,
+       require_variables): Use ->human instead of ->string.
+       * lib/Automake/Conditional.pm (string): Don't sort conditions, they
+       are already sorted.
+       (_to_human, human): New functions.
+       * lib/Automake/ConditionalSet.pm (human): New function.
+       * tests/cond27.test, tests/library3.test, tests/pluseq5.test,
+       tests/pluseq9.test: Adjust.
+
+       * lib/Automake/Conditional.pm [SYNOPSIS]: Fix not's description.
+       * lib/Automake/ConditionalSet.pm (sub_conditions): New function.
+       (multiply): Also accept an Automake::Conditional as argument.
+       * automake.in (variable_not_always_defined_in_cond): Simplify,
+       using only Automake::ConditionalSet methods.
+       Suggested by Raja R Harinath.
+
+       * lib/Automake/ConditionalSet.pm (conds): Use value() to simplify.
+       (invert): Rewrite as a product-of-sums to sum-of-products converter.
+       (_multiply, multiply): New functions.
+       * lib/Automake/Conditional.pm (not): New function.
+       * lib/Automake/tests/ConditionalSet.pl (test_invert): Update.
+       * automake.in (condition_negate): Move ...
+       * lib/Automake/Conditional.pm (negate_condition): ... here.
+       Suggested by Raja R Harinath.
+
+2002-11-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/ConditionalSet.pm (_simplify, simplify): New methods.
+       (true): Cache return value, so _simplify can use it.
+       * lib/Automake/tests/ConditionalSet.pl (test_simplify): New function.
+       * automake.in (variable_not_always_defined_in_cond): Return
+       a simplified ConditionalSet.
+       (macro_define, require_variables): Adjust.
+       * tests/Makefile.am (TEST): Add library3.test.
+       * tests/library3.test: New file.
+       * tests/pluseq9.test: Adjust.
+       Thanks to Raja R Harinath.
+
+2002-11-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/tests/Makefile.am, lib/Automake/tests/Conditional.pl,
+       lib/Automake/tests/ConditionalSet.pl: New files.
+       * lib/Automake/Makefile.am (SUBDIRS): New variable.
+       * configure.in: Output lib/Automake/tests/Makefile.
+       * lib/Automake/ConditionalSet.pm (by_conditions): Delete.
+       (conds): Don't use by_conditions, sort alphabetically, and
+       return sorted conds.
+       (string): Call ->string on each Conditional.
+       * tests/Makefile.am (TESTS): Remove cond12.test.
+       * tests/cond12.test: Remove, moved to
+       lib/Automake/tests/ConditionalSet.pl.
+       * tests/cond3.test: Adjust conditional ordering.
+
+2002-11-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/ConditionalSet.pm (_permutations_worker): Ignore TRUE
+       conditions.
+       (permutations): Treat empty permutations as TRUE.
+       (invert): Simplify.
+       Suggested by Raja R Harinath.
+
+2002-11-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (variable_defined): Thinko.
+       * lib/Automake/ConditionalSet.pm (true): Simplify.
+       (permutations): Fix documentation.
+       (new): Don't simplify conditional sets that contain TRUE.
+       Reported by Raja R Harinath.
+
+2002-11-14  Eric Blake  <address@hidden>
+
+       * lib/am/depend2.am: Add missing fi in c.obj rules.
+
+2002-11-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_installdirs): Reindent to workaround a
+       parsing bug in Perl 5.6.0.
+       Reported by Patrick Welche.
+
+       * lib/Automake/Conditional.pm: Add reference to ConditionalSet.pm.
+       * lib/Automake/ConditionalSet.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add ConditionalSet.pm.
+       * automake.in: Use ConditionalSet.
+       (by_condition, invert_conditions, variable_conditions_permutations):
+       Remove, now defined as Automake::ConditionalSet::by_condition,
+       Automake::ConditionalSet::invert, and
+       Automake::ConditionalSet::permutations.
+       (variable_sorted_conditions): Remove.
+       (msg_var, msg_target handle_source_transform, handle_lib_objects,
+       conditional_ambiguous_p, variable_not_always_defined_in_cond,
+       macro_define, macro_dump, variable_defined,
+       variable_conditions_recursive, variable_conditions,
+       target_conditions, variable_conditionally_defined,
+       variable_conditions_recursive_sub,
+       check_variable_defined_unconditionally, variable_value_as_list,
+       variable_value_as_list_recursive_worker, variable_output,
+       variable_pretty_output, rule_define, append_exeext,
+       am_install_var, require_variables_for_macro): Adjust to
+       use ConditionalSet.
+
+2002-11-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (variable_conditions): Split into ...
+       (variable_conditions, variable_sorted_conditions): ... these
+       functions, where variable_sorted_conditions has the semantic of
+       the old variable_condition.
+       (target_conditions): New function.
+       (msg_var, handle_lib_objects_cond, check_ambiguous_conditional,
+       variable_not_always_defined_in_cond, macro_define,
+       variable_defined, check_variable_defined_unconditionally,
+       variable_conditions_recursive_sub,
+       variable_conditions_permutations, variable_value_as_list,
+       variable_value_as_list_recursive_worker, append_exeext,
+       am_install_var, require_variables_for_macro): Use variable_conditions.
+       (msg_target, rule_define): Use target_conditions.
+       (define_objects_from_sources, macro_define, macro_dump,
+       variable_pretty_output): Use variable_sorted_conditions.
+
+       * automake.texi (Conditional Sources): Fix the `+=' example.
+       Reported by Mike Castle.
+
+       * automake.in: Don't declare TRUE and FALSE, import them from
+       Automake::Conditional.
+       * lib/Automake/Conditional.pm (TRUE, FALSE): New constants.
+       (new): Simplify using FALSE.
+       (reduce): New function, moved from ...
+       * automake.in (variable_conditions_reduce): ... here.
+       (variable_conditions_recursive_sub, invert_conditions):
+       Adjust calls to Automake::Conditional::reduce.
+       * tests/cond12.test: Adjust to use Automake::Conditional.
+
+2002-11-09  Jim Meyering  <address@hidden>
+
+       Make install-sh work even when names contain spaces or
+       certain (but not all) shell metachars.
+
+       * lib/install-sh: Remove lots of unnecessary quoting.
+       Add double quotes where necessary.
+       Write diagnostics to stderr, not stdout.
+       Normalize spacing in diagnostics: use one space (not two,
+       and not a TAB) after the leading `install:'.
+       Remove trailing white space.
+       Remove unnecessary curly braces.
+       If removing the destination fails, also try to move it aside.
+       Use `trap' more portably.
+       * tests/installsh2.test: New file, to test for the above fix.
+       * tests/Makefile.am (TESTS): Add installsh2.test.
+
+       * automake.texi: Fix some typos and a grammar nit.
+
+2002-11-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (switch_warning): Subject Perl warnings to -Werror.
+
+       * automake.texi (Extending): Complete unterminated sentence.
+       Reported by Mike Castle.
+
+2002-11-06  Akim Demaille  <address@hidden>
+
+       * automake.in (&conditional_ambiguous_p): Don't forget to ->string
+       the Conditionals.
+
+2002-10-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Dist): Fix the distcleancheck_listfiles example.
+       Reported by Karl Berry.
+
+2002-10-31  Akim Demaille  <address@hidden>
+
+       * tests/location.test (Makefile.am): Strengthen.
+       * lib/Automake/Channels.pm (_print_message): Be sure to flush
+       $partial when the message is output.
+       Thanks to Alexandre Duret-Lutz.
+
+2002-10-31  Akim Demaille  <address@hidden>
+
+       * automake.in (&read_am_file): Use $last_where to register the
+       _first_ line of a variable definition as location instead of the
+       last one.
+       (&conditional_ambiguous_p): Don't forget to ->string the
+       Conditionals.
+       (&rule_define): Likewise.
+       * tests/location.test: Adjust to exercise this.
+
+2002-10-25  Charles Wilson  <address@hidden>
+
+       * tests/defs.in: Add explicit stanza for python -V.
+
+2002-10-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
+       of am_cv_prog_cc_stdc.  This follows Akim's patch of 2002-10-09,
+       and reveals a bug in my patch of 2002-10-15.
+       * automake.in (handle_single_transform_list): Strip directory name
+       from $full_ansi if subdir-objects is not set.
+
+       * lib/texinfo.tex: New version from Texinfo 4.2b.
+
+2002-10-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list) <full_ansi>: New variable.
+       Use this to record correct dependencies about deansifiable files which
+       are using per-program flags or are in a subdirectory.
+       * tests/ansi9.test: New file.
+       * tests/Makefile.am (TESTS): Add ansi9.test.
+       Reported by Paul D. Smith
+
+2002-10-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (ac_defun_rx, ac_require_rx): If the macro name is
+       quoted, accept any character but `]'.  This makes it possible
+       to define macros such as `AC_LANG_PREPROC(Fortran 90)'.
+       (scan_m4_files): Quote $key in the regex.  Don't define $expr, it's
+       not used.
+       (add_file, scan_file): Adjust to the new definitions of $ac_defun_rx
+       and $ac_require_rx.
+       * tests/aclocal2.test: New file.
+       * tests/Makefile.am (TESTS): Add aclocal2.test.
+       Reported by Tamara L. Dahlgren and Tom Epperly.
+
+2002-10-11  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug#153697:
+       * lib/am/dejagnu.am (distclean-DEJAGNU): Remove $tool.sum and
+       $tool.log.
+       Suggested by Andrew Suffield.
+
+2002-10-10  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/369:
+       * lib/am/python.am: Lookup python files in build directory or
+       source directory.
+       From Mathias Doreille.
+       * tests/python3.test: New file.
+       * tests/Makefile.am (TESTS): Add python3.test.
+       * tests/defs: Handle `required=python'.
+
+       For PR automake/358:
+       * lib/am/texi-vers.am (%STAMPVTI%): Depend on configure instead of
+       configure.ac.
+       Suggested by Thien-Thi Nguyen.
+       * lib/am/configure.am ($(srcdir)/configure): Depends on
+       %CONFIGURE_DEPS%
+       * automake.in (@configure_deps): New array.
+       (scan_autoconf_traces): Scan for m4_include and m4_sinclude,
+       and fill @configure_deps.
+       (handle_configure): Substitute %CONFIGURE_DEPS%.
+       Distribute @configure_deps.
+       * tests/version7.texi: New file.
+       * tests/vtexi.test: Adjust.
+       * tests/Makefile.am (TESTS): Add version7.test.
+       * automake.texi (Dist): Mention that m4_include'd files
+       are distributed.
+
+2002-10-09  Akim Demaille  <address@hidden>
+
+       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Its definition is now empty:
+       the content of this macro was merged in AC_PROG_CC.
+       * m4/protos.m4 (AM_C_PROTOTYPES): Adjust to AC_C_PROTOTYPES.
+       * tests/depacl.test: Remove, it exercizes aclocal in a way that was
+       exercized by all the other tests since the test suite really uses
+       aclocal.
+       * tests/Makefile.am (TESTS): Remove depacl.test.
+
+2002-10-08  Paul Eggert  <address@hidden>
+
+       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
+       %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Use "makeinfo -o output
+       input", not "makeinfo input -o output", as the latter fails if
+       POSIXLY_CORRECT=1.
+       * lib/am/texinfos.am (.dvi.ps): Likewise for dvips.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Likewise for $depcc.
+
+2002-10-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (file_contents_internal): Fix the relationship
+       regex flags, don't use `m'.
+
+       For Debian Bug#162583:
+       * automake.in (file_contents_internal): Simplify regex to
+       separate relationship from actions in rules.
+       Reported by Sam Hocevar.
+
+       * lib/Automake/Conditional.pm (has): Simplify.
+
+2002-10-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Conditional.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Conditional.pm.
+       * automake.in: Use Automake::Conditional.
+       (TRUE, FALSE): New constants.
+       (%var_value, %var_location, %var_comment, %var_type, %var_owner,
+       %targets, %target_source, %target_name, %target_owner): Tie to
+       Tie::RefHash::Nestable.
+       (generate_makefile, process_option_list, handle_options,
+       handle_languages, handle_source_transform, handle_compile,
+       handle_libtool, handle_texinfo_helper, handle_dist, handle_subdirs,
+       scan_aclocal_m4, handle_emacs_lisp, handle_python,
+       scan_autoconf_files, variable_assert, define_variable,
+       define_pretty_variable, define_configure_variable, am_install_var,
+       push_dist_common): Use TRUE.
+       (define_objects_from_sources): Fix return value on
+       "recursively-defined" errors.
+       (conditional_string, conditional_true_when, conditional_is_redundant,
+       conditional_implies_any, make_conditions): Remove these functions,
+       obsoleted by Conditional.pm.
+       (cond_stack_if, cond_stack_else, cond_stack_endif): Return
+       an Automake::Conditional instance.
+       (by_condition, conditional_ambiguous_p,
+       variable_not_always_defined_in_cond, macro_define,
+       variable_conditions_recursive, variable_conditions_recursive_sub,
+       variable_conditions_reduce, invert_conditions,
+       variable_conditions_permutations,
+       check_variable_defined_unconditionally, variable_value_as_list,
+       variable_output, variable_pretty_output, rule_define,
+       read_am_file, file_contents_internal, require_variables): Adjust
+       to use Automake::Conditional objects.
+       (handle_footer): Get $(SUFFIXES) in 'all' conditions.
+       * tests/cond12.test: Adjust to use Automake::Conditional objects.
+
+2002-10-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_source_transform): If foo_SOURCES is defined
+       conditionally, create and use am__foo_SOURCES_DIST for distribution.
+       * tests/condd.test: Extend to check distributed files.
+       * tests/substref.test: Make sure we don't use such a variable when
+       it's not needed.
+       Reported by Marcus Brinkmann.
+
+2002-09-30  Ezra Peisach  <address@hidden>
+
+       * tests/defs.in: Run $MAKE --version -v.
+       * tests/dollar.test: Abort on ./defs failure.
+       * tests/lex5.test: Require GNUmake, not make.
+
+2002-09-30  Kevin Ryde  <address@hidden>
+
+       * m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual
+       values of $CC and $CFLAGS (as opposed to $(CC) and $(CFLAGS)), so
+       configure tests can use them.  Use AC_ARG_VAR instead of AC_SUBST.
+
+2002-09-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (require_variables): The fix introduced in 2002-09-19
+       is imcomplete.  Rewrite the conditional variable definition check
+       using &variable_not_always_defined_in_cond.
+       * tests/cond26.test, tests/cond27.test, tests/cond28.test: New file.
+       * tests/Makefile.am (TESTS): Add cond26.test, cond27.test, and
+       cond28.test.
+       Reported by Juergen Keil.
+
+       * automake.in (INTERNAL): Redefine as an empty location,
+       so that internal locations get displayed as `automake:'.
+
+       * lib/am/distdir.am (distdir): Create $dc_destdir right before
+       its use.
+       Reported by Akim Demaille.
+
+       Fix for PR automake/366:
+       * automake.in (handle_dist): Strip $(srcdir) and replace
+       $(top_srcdir) when computing DIST_COMMON directories.
+       * tests/include2.test: Use an obsolute $(srcdir), and check
+       for spurious directories in $(distdir)/sub.
+       * lib/am/distdir.am: Rewrite $(top_srcdir) as $(top_builddir).
+       Reported by Kevin Ryde.
+
+2002-09-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Channels.pm (%_default_options): Add 'partial'.
+       (_format_message): Rename as ...
+       (_format_sub_message): ... this.
+       (_format_message): New function, extracted from ...
+       (_print_message): ... here.  Honor the 'partial' option.
+       ($partial): New variable.
+       * automake.in (handle_ltlibraries, check_ambiguous_conditional,
+       rule_define): Mark partial messages.
+
+       * automake.in (handle_ltlibraries): Record library locations in
+       %liblocations, and print the previous declaration on error.
+       * tests/libtool6.test: Check that the locations of the two
+       definitions are shown.
+
+       For PR automake/360:  Propagate more locations.
+       * automake.in (handle_programs): Adjust usage of am_install_var's
+       return value.  Pass on locations as context to file_contents.
+       (handle_libraries, handle_ltlibraries): Likewise.  Use locations
+       in the 'not a standard library name' diagnostic.
+       (handle_emacs_lisp, handle_python): Adjust usage of am_install_var's
+       return value.  Pass on locations to require_variables and
+       require_conf_file.
+       (check_ambiguous_conditional): Strip trailing dot in message.
+       (value_to_list): Add the $WHERE and $LOC_WANTED arguments.
+       (variable_value_as_list_recursive_worker): Add the $LOC_WANTED
+       argument.  Adjust calls to value_to_list.
+       (variable_value_as_list_recursive): Call
+       variable_value_as_list_recursive_worker with $LOC_WANTED = 0.
+       (variable_loc_and_value_as_list_recursive): New function,
+       variable_value_as_list_recursive_worker with $LOC_WANTED = 1.
+       (am_install_var): Use variable_loc_and_value_as_list_recursive,
+       and return a list of [$location, $value] pairs.
+       (rule_define): Use better locations in EXEEXT diagnostic.
+       (handle_source_transform, define_objects_from_sources): Add and use
+       a $WHERE argument.  Adjust callers.
+       * tests/stdlib.test: Grep the location in error message.
+       * tests/location.test: New file.
+       * tests/Makefile.am (TESTS): Add location.test.
+
+       * tests/exeext3.test: New file.
+       * tests/Makefile.am (TESTS): Add exeext3.test.
+       * automake.in (%target_name): New hash.
+       (initialize_per_input): Reset %target_name.
+       (rule_define): Fill %target_name, and use it to detect targets
+       which have been registered with key X but really are X$(EXEEXT).
+
+2002-09-28  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/360:
+       * lib/Automake/Location.pm: New file.
+       * lib/Automake/Channels.pm (_print_message): Display contexts
+       when given an Automake::Location.
+       (msg): Clone the location.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Location.pm.
+       * tests/comment5.test: Make sure we display `included from' stacks.
+       * automake.in: Use Automake::Location.
+       (INTERNAL): New constant.
+       (file_contents, file_contents_internal, define_variable,
+       define_pretty_variable, read_am_file): Take $WHERE as argument.
+       Adjust all callers.
+       (scan_autoconf_traces) <$where>: Define as a Location, and use
+       it instead of $here.
+       (macro_define, rule_define): Make sure $WHERE is a location.
+       Clone it before updating $var_location or $targets.
+
+2002-09-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/mkinstalldirs: Reindent using `sh-indentation: 2'.
+       Suggested by Bruno Haible.
+
+       * Makefile.am (fetch, FETCHFILES): Don't fetch install-sh from
+       Autoconf.  Automake now has the master copy of install-sh and
+       mkinstalldirs.
+
+2002-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.7a.
+
+       * NEWS, configure.ac: Version 1.7.
+
+2002-09-25  Art Haas  <address@hidden>
+
+       * automake.texi (Optional, Options, Distributing, ANSI,
+       API versioning): Spelling fixes and Texi tweaks.
+
+2002-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Check for 'tex'.
+       * tests/defs.in: Handle required=tex using configure's result.
+       Reported by Patrick Welche.
+
+       * Makefile.am (mdate-sh): Remove.
+       * mdate-sh: Delete.
+       Suggested by Akim Demaille.
+
+2002-09-25  Tom Tromey  <address@hidden>
+
+       * NEWS: Mention distuninstallcheck.
+       * automake.texi (Dist): Document new macro and target.
+       * lib/am/distdir.am (distuninstallcheck_listfiles): New macro.
+       (distuninstallcheck): New target.
+       (distcheck): Use distuninstallcheck.
+
+2002-09-25  Rainer Orth  <address@hidden>
+
+       * tests/specflags7.test (true_CFLAGS, false_CFLAGS, false.c): Use
+       AM_TRUE, AM_FALSE to avoid bad interaction with Tru64 UNIX
+       <sys/types.h>.
+       * tests/specflags8.test (true_CPPFLAGS, false_CPPFLAGS, false.c):
+       Likewise.
+
+2002-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (output_texinfo_build_rules): Define %SOURCE_REAL%.
+       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%,
+       %DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Add %SOURCE_REAL% as dependency.
+
+2002-09-24  Rainer Orth  <address@hidden>
+
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Use $$dir in make
+       command.
+
+2002-09-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Revert the change
+       from 2002-09-22.  We need to erase .libs/ in the object directory
+       in addition to the library directory.
+
+       * tests/target-cflags.test: Build in `build/', not `obj/' because
+       `obj/' is special to BSD make.
+
+       * automake.in (read_am_file): Prefix included files with
+       $(top_srcdir) or $(srcdir) in DIST_COMMON.  Fixes
+       subdircond2.test, and subdircond3.test on OSF1.
+
+       * tests/defs.in (SHELL): Set it.
+
+       * lib/am/distdir.am (distcleancheck): Mention `in build directory'
+       in error message.
+
+2002-09-23  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/350:
+       * automake.in (handle_ltlibraries): Allow a library to be installed
+       many times in the same directory.
+       * tests/libtool5.test, tests/libtool6.test: New files.
+       * tests/Makefile.am (TESTS): Add libtool5.test and libtool6.test.
+
+2002-09-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_ltlibraries): Fill $libtool_clean_directories
+       here, with directories where .la files are built...
+       (handle_single_transform_list): ... not here with directories
+       where .lo files are built.
+       * tests/libtool3.test: Build a library in a subdirectory to
+       check for this.
+       Reported by Peter Gavin.
+
+       * tests/cond5.test: Give more time to automake.
+       Reported by Art Haas.
+
+       * configure.in: Really check for Autoconf 2.54.
+
+       * automake.texi (Yacc and Lex): ylwrap is used only when there is
+       more than one yacc or lex source file in a directory.
+
+       * automake.in (macro_define): Update a variable's location each
+       time its owner is updated.
+       * tests/gnuwarn.test: Append to CFLAGS to check for this.
+       Reported by Harlan Stenn.
+
+2002-09-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.6g.
+
+       * configure.in, NEWS: Bump version to 1.6f.
+
+       * Makefile.am (INSTALL): New rules.
+
+2002-09-20  Mirko Streckenbach  <address@hidden>
+
+       For PR automake/363:
+       * m4/cond.m4: Fix AC_MSG_ERROR quoting.
+
+2002-09-19  Pavel Roskin  <address@hidden>
+
+       * tests/warnopts.test: Fix random failures by removing Autoconf
+       cache directory when configure.in changes.  Use the code and the
+       comment from tests/asm.test.
+
+2002-09-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Program and Library Variables) <maude_LIBADD>:
+       Don't mention _LDADD for Libtool libraries.
+       Reported by Schleicher Ralph.
+
+       For PR automake/361:
+       * tests/suffix8.test: More explicit dependencies.
+       Reported by Paul Eggert.
+
+       * automake.in (rule_define): Don't diagnose duplicate user rules.
+       * tests/phony.test, tests/percent2.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+       Reported by Ralf Corsepius.
+
+       * automake.in (require_variables): Search variable definitions
+       in any condition implied by $cond.
+       * tests/cond25.test: New file.
+       * tests/Makefile.am (TESTS): Add cond25.test.
+       Reported by Pavel Roskin.
+
+       * tests/subobj9.test: Skip this test on configure errors.
+       Reported by Paul Eggert.
+
+2002-09-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.6e.
+
+       * configure.in, NEWS: Bump version to 1.6d.
+       * tests/libobj12.test, tests/libobj12b.test: Include ./defs,
+       not $srcdir/defs.
+       * tests/suffix8.test: Typo.
+
+       * automake.in (check_ambiguous_conditional, rule_define): Issue
+       syntactic warnings, not errors.
+       (macro_define): Don't adjust the owner of a variable which is being
+       appended in a condition different from its definition.
+       (variable_output, variable_pretty_output): Make sure the
+       requested condition exists.
+
+       For PR automake/353: fill %var_location, %var_comment,
+       %var_type, %var_owner for each condition.
+       * automake.in (msg_cond_var): New function.
+       (msg_var): Use it.
+       (generate_makefile, process_option_list, handle_languages,
+       handle_lib_objects_cond, handle_compile, handle_libtool,
+       handle_ltlibraries, handle_texinfo_helper, handle_tests,
+       handle_emacs_lisp, handle_python, macro_define, macro_delete,
+       macro_dump, variable_assert, variable_output,
+       variable_pretty_output, read_am_file, read_main_am_file,
+       file_contents_internal, am_primary_prefixes,
+       require_variables_for_macro): Adjust accesses to %var_location,
+       %var_comment, %var_type, %var_owner.
+       (append_comments, require_file_with_macro,
+       require_conf_file_with_macro, require_variables): Add the
+       $cond argument.
+       * tests/comment7.test: New file.
+       * tests/Makefile.am (TESTS): Add comment7.test.
+
+2002-09-17  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/353:
+       * automake.in (check_ambiguous_conditional): Display locations for
+       the two definitions of the ambiguous variable.  Show the macro_dump
+       output in --verbose only.  Accept $where as a third argument,
+       (macro_define): Pass $where.
+
+       * automake.in (handle_programs): Ooops.  Really add LDADD
+       objects into _DEPENDENCIES.
+       * tests/libobj12.test: Check for it.
+
+2002-09-17  Assar Westerlund  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_programs, handle_libraries,
+       handle_ltlibraries): Maintain $seen_libobjs on a
+       per-program/per-library basis, instead of globally to each
+       of these functions.
+       * tests/libobj12.test, tests/libobj12b.test: New files.
+       * tests/Makefile.am (TESTS): Add libobj12.test and libobj12b.test.
+
+2002-09-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in (configure.in): Don't call AC_PROG_INSTALL and
+       AC_PROG_MAKE_SET.
+
+       * lib/config.guess, lib/config.sub, lib/INSTALL,
+       lib/Automate/Struct.pm: New upstream version.
+       * Makefile.am (mdate-sh): New rule.
+       (FETCHFILES): Add Automate/Struct.pm.
+       (fetch): Get Automate/Struct.pm.
+       (AUTOMAKESOURCES, CLEANFILES): New macros.
+       (EXTRA_DIST, TAGS_FILES): Use them.
+       * install-sh, mkinstalldirs, missing: Delete.
+
+       * automake.in: Rename the 'unused' channel to 'syntax'.
+       (variable_defined): Issue a warning instead of an error
+       for variable-is-a-target conditions.
+       * automake.texi (Invoking Automake): Rename the 'unused'
+       channel to 'syntax'.
+       * tests/warnopts.test: Likewise.
+
+       * tests/suffix8.test: Add explicit dependencies.
+       * tests/texinfo13.test, tests/texinfo16.test: Require tex.
+
+2002-09-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in, m4/init.m4, NEWS: Require Autoconf 2.54.
+
+       * automake.in (variable_defined): Thinko in $cond handling.
+
+2002-09-15  Paul Eggert  <address@hidden>
+
+       * lib/Automake/Channels.pm: Don't use 'our', as it isn't portable
+       to Perl 5.00503.
+
+       * Makefile.am (maintainer-check): Don't use egrep.
+
+2002-09-15  Tom Tromey  <address@hidden>
+
+       * tests/subdircond3.test: Pass flags to make in environment.
+       * tests/subdircond2.test: Pass flags to make in environment.
+       * Makefile.am (maintainer-check): Add a new check for @...@
+       substitutions.  Updated correct number of diffs between source and
+       build trees.
+
+       * configure.in (aclocal, automake): Don't create.
+       * automake.in ($prefix): Don't define.
+       * aclocal.in ($prefix): Don't define.
+       * Makefile.am (do_subst): New macro.
+       (automake): New target.
+       (aclocal): Likewise.
+
+2002-09-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in, automake.in: Requote each "@var@" as '@var@'.
+
+2002-09-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/Makefile.am (XFAIL_TESTS): Remove specflags7.test and
+       specflags8.test.
+
+2002-09-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Building ctags and etags): Rename and adjust as ...
+       (Building true and false): ... this.
+       * tests/targetclash.test: New file.
+       * tests/specflags7.test, tests/specflags8.test: Adjust to build
+       true and false.
+       * tests/Makefile.am (TESTS): Add targetclash.test.
+
+       Diagnose target clashes, for PR automake/344:
+       * automake.in (%targets): Record conditionals for definitions.
+       (%target_conditional): Remove (obsoleted by %targets).
+       (%target_source, %target_owner): New hashes.
+       (TARGET_AUTOMAKE, TARGET_USER): New constants.
+       (initialize_per_input): Adjust to reset new variables.
+       (err_cond_target, msg_cond_target): New functions.
+       (msg_target): Adjust usage of %targets.
+       (conditional_ambiguous_p): Take a list of conditional to check
+       as a third parameter, so this can be used for other things that
+       variables.
+       (handle_lib_objects_cond): Adjust conditional_ambiguous_p usage.
+       (variable_defined): Restrict the target-with-same-name check
+       to user targets.
+       (rule_define): Add the $SOURCE argument, and take $OWNER instead
+       of $IS_AM.  Diagnose target clashes (including ambugious
+       conditionals).  Return a list of conditions where the rule should
+       be defined instead of a boolean.  Fill %target_source and
+       %target_owner.
+       (target_define): Use `exists', not `defined'.
+       (read_am_file): Adjust the call to rule_define.
+       (file_contents_internal): Add more FIXMEs.  Simplify my moving
+       and documenting the "define rules in undefined conditions" to
+       rule_define.
+       * tests/Makefile.am (XFAIL_TESTS): Add specflags7.test and
+       specflags8.test.
+
+2002-09-12  Akim Demaille  <address@hidden>
+
+       * aclocal.in: Prototype all the functions.
+       Add `(C)' to Copyrights.
+       (&add_file): Strip the comments before checking for `AC_REQUIRE'.
+       Remove Perl 4 hacks, since anyway we require 5.005 via General.pm.
+
+2002-09-11  Akim Demaille  <address@hidden>
+
+       * lib/am/texinfos.am (TEXI2PDF): Pass --batch to texi2dvi, since
+       it was already supported when --pdf support was added.
+
+2002-09-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Channels.pm (_default_options): Add `backtrace'.
+       (msg): Die with backtrace if requested.
+       * automake.in: Enable `backtrace' on the `automake' channel.
+
+       * automake.in (process_option_list): Mention `Automake' in
+       version-mismatch error.
+       Suggested by Akim Demaille.
+
+       * tests/Makefile.am ($(TESTS)): Replace by ...
+       (check_SCRIPTS): ... this.
+       Suggested by Raja R Harinath.
+
+2002-09-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/Makefile.am ($(TESTS)): New, depends on defs.
+       (BUILT_SOURCES): Remove (useless because of PR/359).
+
+       * m4/init.m4: Execute cygpath in a sub-shell.
+
+2002-09-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (macro_define): Warn about `:=' assignments.
+       * tests/colneq.test: Check for this warning.
+
+       * automake.texi (Include): Fragments are always distributed.
+       * NEWS: Likewise.
+
+2002-09-08  Andreas Buening  <address@hidden>
+
+       Fix for automake/334:
+       * lib/am/depend2.am: Replaced "cygpath -w" by $(CYGPATH_W).
+       * m4/init.m4: New make variable CYGPATH_W.
+
+2002-09-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Check for EGREP and FGREP.  Create tests/defs.
+       * tests/defs: Rename as ...
+       * tests/defs.in: ... this.  Add copyright notice.  Use configure's
+       values for PERL, EGREP, and FGREP.  Be verbose if $srcdir is unset.
+       * tests/Makefile.am (EXTRA_DIST): Remove defs.
+       (BUILT_SOURCES): New.
+       * tests/acinclude.test, tests/aclibobj.test, tests/aclocal.test,
+       tests/aclocali.test, tests/aclocali1.test, tests/aclocalii.test,
+       tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
+       tests/acoutqnl.test, tests/acouttbs.test, tests/acouttbs2.test,
+       tests/acsilent.test, tests/acsubst.test, tests/acsubst2.test,
+       tests/all.test, tests/alpha.test, tests/amassign.test,
+       tests/ammissing.test, tests/ansi.test, tests/ansi2.test,
+       tests/ansi3.test, tests/ansi4.test, tests/ansi5.test,
+       tests/ansi6.test, tests/ansi7.test, tests/ansi8.test,
+       tests/ar.test, tests/asm.test, tests/autoheader.test,
+       tests/autoheader2.test, tests/auxdir.test, tests/auxdir2.test,
+       tests/backsl.test, tests/backsl2.test, tests/badline.test,
+       tests/badopt.test, tests/badprog.test, tests/block.test,
+       tests/canon.test, tests/canon2.test, tests/canon3.test,
+       tests/canon4.test, tests/canon5.test, tests/ccnoco.test,
+       tests/check.test, tests/checkall.test, tests/clean.test,
+       tests/colneq.test, tests/colneq2.test, tests/colon.test,
+       tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       tests/comment.test, tests/comment2.test, tests/comment3.test,
+       tests/comment4.test, tests/comment5.test, tests/comment6.test,
+       tests/compile_f_c_cxx.test, tests/cond.test, tests/cond10.test,
+       tests/cond11.test, tests/cond12.test, tests/cond13.test,
+       tests/cond14.test, tests/cond15.test, tests/cond16.test,
+       tests/cond17.test, tests/cond18.test, tests/cond19.test,
+       tests/cond2.test, tests/cond20.test, tests/cond21.test,
+       tests/cond22.test, tests/cond23.test, tests/cond24.test,
+       tests/cond3.test, tests/cond4.test, tests/cond5.test,
+       tests/cond6.test, tests/cond7.test, tests/cond8.test,
+       tests/cond9.test, tests/condd.test, tests/condincl.test,
+       tests/condincl2.test, tests/condlib.test, tests/condman.test,
+       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
+       tests/confdist.test, tests/confh.test, tests/confh4.test,
+       tests/config.test, tests/confincl.test, tests/confsub.test,
+       tests/confvar.test, tests/confvar2.test, tests/copy.test,
+       tests/ctarget1.test, tests/cxx.test, tests/cxx2.test,
+       tests/cxxansi.test, tests/cxxcpp.test, tests/cxxlibobj.test,
+       tests/cxxlink.test, tests/cxxnoc.test, tests/cxxo.test,
+       tests/cygwin32.test, tests/dash.test, tests/defun.test,
+       tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
+       tests/depacl.test, tests/depacl2.test, tests/depcomp.test,
+       tests/depcomp2.test, tests/depdist.test, tests/depend.test,
+       tests/depend2.test, tests/depend3.test, tests/depend4.test,
+       tests/destdir.test, tests/dirforbid.test, tests/dirlist.test,
+       tests/discover.test, tests/distcommon.test,
+       tests/distcommon2.test, tests/distcommon3.test,
+       tests/distdir.test, tests/distname.test, tests/dollar.test,
+       tests/double.test, tests/dup2.test, tests/dup3.test,
+       tests/else.test, tests/empty.test, tests/empty2.test,
+       tests/empty3.test, tests/empty4.test, tests/error.test,
+       tests/exdir.test, tests/exdir2.test, tests/exeext.test,
+       tests/exeext2.test, tests/exsource.test, tests/ext.test,
+       tests/ext2.test, tests/extra.test, tests/extra2.test,
+       tests/extra3.test, tests/extra4.test, tests/extra5.test,
+       tests/extra6.test, tests/extra7.test, tests/flibs.test,
+       tests/fnoc.test, tests/fo.test, tests/fonly.test,
+       tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
+       tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
+       tests/gcj5.test, tests/getopt.test, tests/gettext.test,
+       tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
+       tests/gnits3.test, tests/gnuwarn.test, tests/header.test,
+       tests/implicit.test, tests/include.test, tests/include2.test,
+       tests/info.test, tests/insh.test, tests/insh2.test,
+       tests/install.test, tests/install2.test, tests/installdir.test,
+       tests/installsh.test, tests/instdata.test, tests/instdata2.test,
+       tests/instexec.test, tests/insthook.test, tests/instman.test,
+       tests/instman2.test, tests/interp.test, tests/interp2.test,
+       tests/java.test, tests/java2.test, tests/javaprim.test,
+       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
+       tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
+       tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
+       tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
+       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
+       tests/library.test, tests/library2.test, tests/libtool.test,
+       tests/libtool2.test, tests/libtool3.test, tests/libtool4.test,
+       tests/link_c_cxx.test, tests/link_dist.test, tests/link_f_c.test,
+       tests/link_f_c_cxx.test, tests/link_f_cxx.test,
+       tests/link_f_only.test, tests/lisp.test, tests/lisp2.test,
+       tests/listval.test, tests/ltdeps.test, tests/ltlibobjs.test,
+       tests/maintclean.test, tests/make.test, tests/makevars.test,
+       tests/man.test, tests/man2.test, tests/mclean.test,
+       tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
+       tests/mdate4.test, tests/mkinst2.test, tests/mkinstall.test,
+       tests/nobase.test, tests/nodefine.test, tests/nodefine2.test,
+       tests/nodep.test, tests/nodepcomp.test, tests/nodist.test,
+       tests/nodist2.test, tests/noinst.test, tests/noinstdir.test,
+       tests/nolink.test, tests/nostdinc.test, tests/number.test,
+       tests/obsolete.test, tests/order.test, tests/outdir.test,
+       tests/output.test, tests/output2.test, tests/output3.test,
+       tests/output4.test, tests/output5.test, tests/package.test,
+       tests/parse.test, tests/percent.test, tests/pluseq.test,
+       tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
+       tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
+       tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
+       tests/ppf77.test, tests/pr2.test, tests/pr204.test,
+       tests/pr211.test, tests/pr220.test, tests/pr224.test,
+       tests/pr229.test, tests/pr243.test, tests/pr266.test,
+       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
+       tests/pr300-lib.test, tests/pr300-ltlib.test,
+       tests/pr300-prog.test, tests/pr307.test, tests/pr72.test,
+       tests/pr87.test, tests/pr9.test, tests/prefix.test,
+       tests/primary.test, tests/primary2.test, tests/proginst.test,
+       tests/python.test, tests/python2.test, tests/ranlib.test,
+       tests/recurs.test, tests/recurs2.test, tests/remake.test,
+       tests/remake2.test, tests/remake3.test, tests/req.test,
+       tests/required.test, tests/required2.test, tests/rulepat.test,
+       tests/scripts.test, tests/seenc.test, tests/sinclude.test,
+       tests/sourcesub.test, tests/sourcesub2.test, tests/space.test,
+       tests/specflags.test, tests/specflags2.test,
+       tests/specflags3.test, tests/specflags6.test,
+       tests/specflags7.test, tests/specflags8.test,
+       tests/specflags9.test, tests/spell.test, tests/spell2.test,
+       tests/spell3.test, tests/spelling.test, tests/stamph.test,
+       tests/stamph2.test, tests/stdlib.test, tests/strip.test,
+       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
+       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
+       tests/subdir7.test, tests/subdirbuiltsources.test,
+       tests/subdircond.test, tests/subdircond2.test,
+       tests/subdircond3.test, tests/subobj.test, tests/subobj2.test,
+       tests/subobj3.test, tests/subobj4.test, tests/subobj5.test,
+       tests/subobj6.test, tests/subobj7.test, tests/subobj8.test,
+       tests/subobj9.test, tests/subobjname.test, tests/subpkg.test,
+       tests/subst.test, tests/substref.test, tests/substtarg.test,
+       tests/suffix.test, tests/suffix10.test, tests/suffix2.test,
+       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
+       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
+       tests/suffix9.test, tests/symlink.test, tests/symlink2.test,
+       tests/symlink3.test, tests/syntax.test, tests/tags.test,
+       tests/tagsub.test, tests/target-cflags.test, tests/target.test,
+       tests/texinfo.test, tests/texinfo10.test, tests/texinfo13.test,
+       tests/texinfo16.test, tests/texinfo2.test, tests/texinfo3.test,
+       tests/texinfo4.test, tests/texinfo5.test, tests/texinfo6.test,
+       tests/texinfo7.test, tests/texinfo8.test, tests/texinfo9.test,
+       tests/transform.test, tests/unused.test, tests/vars.test,
+       tests/vars2.test, tests/vars3.test, tests/vartar.test,
+       tests/version.test, tests/version2.test, tests/version3.test,
+       tests/version4.test, tests/version5.test, tests/version6.test,
+       tests/vpath.test, tests/vtexi.test, tests/vtexi2.test,
+       tests/warnopts.test, tests/werror.test, tests/whoami.test,
+       tests/xsource.test, tests/yacc.test, tests/yacc2.test,
+       tests/yacc3.test, tests/yacc4.test, tests/yacc5.test,
+       tests/yacc6.test, tests/yacc7.test, tests/yacc8.test,
+       tests/yaccpp.test, tests/yaccvpath.test: Add copyright notice.
+       Source ./defs instead of $srcdir/defs.
+
+2002-09-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Strip $(srcdir) prefix on
+       distributed files, to workaround Sun make VPATH munging.
+       This fixes subdircond2.test, subdircond3.test, and subpkg.test
+       on Solaris.
+       * tests/extra6.test, tests/lex3.test, tests/pr87.test,
+       tests/pr9.test, tests/target-cflags.test, tests/texinfo13.test,
+       tests/texinfo16.test, tests/yacc7.test, tests/yaccvpath.test:
+       Don't require GNU make.
+
+       * lib/am/distdir.am (distcheck): Add missing `;'.
+
+       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Account for
+       Sun make rewriting rules in VPATH builds.  (Fixes gnits3.test.)
+       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Likewise.
+
+2002-09-04  Alexandre Duret-Lutz  <address@hidden>
+
+       For automake/354:
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%.dvi, %SOURCE_SUFFIX%.pdf):
+       Don't use `-o' unless necessary.
+
+2002-08-25  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/343:
+       * automake.in (scan_texinfo_file) <clean_suffixes>: Remove dvi, ps,
+       and pdf.
+       (output_texinfo_build_rules): Define %DIRSTAMP% when processing
+       texibuild.am.  Return $dirstamp and a list of files to clean.
+       (handle_texinfo_helper): Process texi-vers.am after the call to
+       output_texinfo_build_rules and use $dirstamp to define %DIRSTAMP%.
+       * lib/am/texi-vers.am (%STAMPVTI%): Build %DIRSTAMP% if needed.
+       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%): Likewise.
+       (%DEST_PREFIX%.dvi, %DEST_PREFIX%.pdf): Depend on %DIRSTAMP%.
+       * tests/texinfo13.test: New file.
+       * tests/Makefile.am (TESTS): Add texinfo13.test.
+       * lib/am/texinfos.am (install-info-am, dist-info): Looks for
+       info files in build or source directory.
+       This completes the change from 2002-07-30 (for PR automake/168).
+
+2002-08-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (CLEAN, MAINTAINER_CLEAN): New constants.
+       (maintainer_clean_files): Replace by ...
+       (clean_files): ... this new variable.
+       (initialize_per_input, lang_yacc_target_hook,
+       lang_lex_target_hook): Use %clean_files instead of
+       @maintainer_clean_files.
+       (handle_clean): Rewrite, using %clean_files.
+       (require_build_directory_maybe): Use %clean_files instead
+       of %compile_clean_files.  This allows using
+       &require_build_directory_maybe for non-compiling targets.
+       * lib/am/clean.am (mostlyclean-generic, clean-generic,
+       distclean-generic, maintainer-clean-generic): Rewrite using
+       %MOSTLYCLEAN_RMS%, %CLEAN_RMS%, %DISTCLEAN_RMS%, and
+       %MAINTAINER_CLEAN_RMS%.
+
+       For Debian Bug#157778:
+       * m4/python.m4: Fix output of `python' in checking messages
+       when no version of Python is required.
+
+2002-08-23  Raja R Harinath  <address@hidden>
+
+       * lib/am/depend2.am (%EXT%.lo): Fix typo.  Rename the file that
+       was generated by gcc -MF.
+
+2002-08-23  Pavel Roskin  <address@hidden>
+
+       * lib/am/progs.am: Exit in case of install failure, otherwise
+       it is ignored on Cygwin because of the surrounding "for" loop.
+
+2002-08-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Top level): More words about conditional
+       subdirectories.  Don't mention AC_PROG_MAKE_SET.
+       * tests/subdircond2.test, tests/subdircond3.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+       For PR automake/347:
+       * automake.in (MACRO_PATTERN): Allow `.' in variable names.
+       (scan_variable_expansions, check_variable_expansions): New functions.
+       (macro_define): Call check_variable_expansions.
+       (read_am_file): Likewise, when outputing rules.
+       (variable_conditions_recursive_sub): Simplify using
+       scan_variable_expansions.
+       * tests/vars3.test: New file.
+       * tests/Makefile.am (TESTS): Add vars3.test.
+       * tests/colneq.test: Use -Wno-portability.
+
+       * lib/Automake/Channels.pm (buffering, backlog): New variables.
+       (buffer_messages, flush_messages): New functions.
+       (@EXPORT): Add buffer_messages and flush_messages.
+       * automake.in (generate_makefile): Call buffer_messages and
+       flush_messages to buffer warnings until AUTOMAKE_OPTIONS has
+       been read.
+
+       * automake.in (read_am_file): Fix computation of path to
+       included file when $(top_srcdir) is not used.
+       * tests/include2.test: Augment.
+
+2002-08-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (set_strictness): Never enable 'portability'
+       warnings for now.
+       (usage): Adjust `-Wportability' doc.
+       * automake.texi (Invoking Automake): Likewise.
+       Suggested by Ralf Corsepius.
+
+2002-08-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Fix cleanup of
+       so_location files in current directory.
+
+       Fix for PR automake/346:
+       * automake.texi (Optional): Supress the documentation for
+       AC_PATH_XTRA, AC_FUNC_ALLOCA, AC_FUNC_ERROR_AT_LINE, AC_FUNC_FNMATCH,
+       AC_FUNC_GETLOADAVG, AC_FUNC_MEMCMP, AC_FUNC_MKTIME, AC_FUNC_OBSTACK,
+       AC_FUNC_STRTOD, AC_REPLACE_FUNCS, AC_REPLACE_GNU_GETOPT,
+       AC_STRUCT_ST_BLOCKS, AM_WITH_REGEX, AC_CHECK_TOOL, AC_CHECK_PROG,
+       AC_CHECK_PROGS, AC_PATH_PROG, and AC_PATH_PROGS.  Augment the
+       documentation of AC_LIBSOURCE and AC_SUBST to explain this
+       applies to any macro that calls them.
+
+2002-08-19  Tom Tromey  <address@hidden>
+
+       For PR automake/348:
+       * tests/Makefile.am (TESTS): Added include2.test.
+       * tests/include2.test: New file.
+       * tests/include.test: Check to make sure include file is
+       distributed.
+       * automake.in (read_am_file): Distribute included files.
+
+2002-08-19  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/345:
+       * tests/defs: Add support for required=non-root, stolen
+       from fileutils' test suite.
+       * tests/destdir.test: Use required=non-root.
+
+       * tests/vtexi.test: Fix spurious failure introduced on 2002-07-30.
+
+2002-08-17  Tom Tromey  <address@hidden>
+
+       For PR automake/347:
+       * automake.in (rule_define): Given portability warning if "%" seen
+       in target name.
+       (TARGET_PATTERN): Added `%'.
+       * tests/Makefile.am (TESTS): Added percent.test.
+       * tests/percent.test: New file.
+
+2002-08-15  Art Haas  <address@hidden>
+
+       * lib/am/depend2.am: Use correct name for dependency file in
+       libtool fastdep case.
+
+2002-08-14  Art Haas  <address@hidden>
+
+       * lib/am/depend2.am: Added missing `;'.
+
+2002-08-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Python): Fix wording.
+
+       * tests/ext2.test: New file.  This bug is present in Automake 1.6.3
+       and was fixed by the change on variable_conditions_permutations
+       and invert_conditions on 2002-05-16.
+       * tests/Makefile.am (TESTS): Add ext2.test.
+       Reported by Ladislav Strojil.
+
+2002-08-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (parse_arguments): Add `dirlist' paths add the
+       very end of the search path, after aclocal-APIVERSION/ and
+       aclocal/.
+       * automake.texi (Macro search path): Adjust to reflect the
+       new ordering.
+       * tests/dirlist.test: Check for this.
+
+2002-07-31  Charles Wilson  <address@hidden>
+
+       * aclocal.in (parse_arguments): Add support for extending
+       default macro search path, using a `dirlist' file within
+       the aclocal directory.
+       * automake.texi (Invoking aclocal): Move option descriptions into ...
+       (aclocal options): ... this new node.
+       (Macro search path): New node.
+       * tests/dirlist.test: New file.
+       * tests/Makefile.am (TESTS): Add dirlist.test.
+       * m4/dirlist: New file.
+       * m4/Makefile.am (EXTRA_DIST): Add dirlist.
+       * tests/defs: Honor any installed dirlist when searching for
+       libtool.m4 and gettext.m4.
+
+2002-07-30  Alexandre Duret-Lutz  <address@hidden>
+
+       Build info files in builddir instead of srcdir (for PR automake/168),
+       and prepare support for info files in subdirecties.
+       * automake.in (output_texinfo_build_rules): New function.
+       (handle_texinfo_helper): Use output_texinfo_build_rules, and
+       prepare to support subdir texinfos.  Define am__TEXINFO_TEX_DIR.
+       * lib/am/texi-vers.am: Build version.texi and stamp-vti in the
+       current directory, not $(srcdir).  Use %STAMPVTI% to name the stamp
+       file.
+       * lib/am/texibuild.am: Rewrite to output files in the current
+       directory, not $(srcdir).  Also, support both generic and
+       non-generic output.  Pass `-o $@' to makeinfo, texinfo, and
+       texi2dvi (for PR automake/339).
+       * tests/texinfo3.test: Make sure the `.texi:' rule is output.
+       * tests/texinfo10.test: Use set -e, so the checks are not ignored.
+       * tests/texinfo16.test: New file.
+       * tests/Makefile.am (TESTS): Add texinfo16.test.
+
+2002-07-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (write_aclocal): Don't write the filename ($output_file)
+       in the aclocal.m4 header.
+
+       * configure.in: Require Autoconf 2.53b.
+
+2002-07-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Bump version to 1.6c.
+
+       * configure.in: Bump version to 1.6b.
+       * lib/config.guess, lib/config.sub, lib/Automake/XFile.pm: New
+       upstream versions.
+       * automake.in: Don't write @ALLOCA@ and @LIBOBJS@ in clear text,
+       since this file is processed by config.status.
+
+2002-07-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (read_am_file): Escaped newlines in comments are not
+       portable.  If a comment line doesn't start with a `#', add it.
+       * tests/comment6.test: Ensure this is done.
+
+2002-07-24  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix failures reported by Patrick Welche on NetBSD.
+       * tests/gnits2.test, tests/gnits3.test: Don't trust the exit
+       status of `make -k'.
+       * tests/obsolete.test: Source obs.1 and obs.2 from current
+       directory.
+
+2002-07-23  Patrick Welche  <address@hidden>
+
+       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): Add
+       configure.lineno.
+
+2002-07-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/required2.test: New file.
+       * tests/Makefile.am (TESTS): Add required2.test.
+       * automake.in (initialize_per_input): Remove %require_file_found
+       setting.  This reverts my change of 2002-04-19.
+       (require_file_internal): Use the full name of a file as a
+       key in %require_file_found, not only the basename.
+       Reported by Andrew Suffield.
+
+2002-07-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_subdirs): Warn if `obj' appears in SUBDIRS.
+       * tests/subdir7.test: New file.
+       * tests/Makefile.am (TESTS): Add subdir7.test.
+
+       * lib/mkinstalldirs: Remove Id keyword.
+
+       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Honor
+       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT.
+       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise.
+       * automake.texi (Options) <std-options>: Document
+       AM_INSTALLCHECK_STD_OPTIONS_EXEMPT.
+       (Gnits): Reference std-options.
+       * tests/gnits3.test: New file.
+       * tests/Makefile.am (TESTS): Add gnits3.test.
+       Suggested by Jim Meyering.
+
+2002-07-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/gnits2.test: Use --program-prefix.  Test for scripts too.
+       Replace the sed script by calls to grep, easier to debug.
+       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Honor nobase
+       and $(transform).
+       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise.
+
+       * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS):
+       Always strip the directory part before applying $(transform),
+       even for nobase_ targets.
+       * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS):
+       Likewise.
+       * tests/nobase.test: Use --program-prefix while testing nobase
+       support.
+
+2002-07-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dirname.test: Delete.  We don't define _AM_DIRNAME anymore.
+       * tests/Makefile.am (TESTS): Remove dirname.test.
+
+       * m4/init.m4: Require Autoconf 2.53b.
+       * m4/header.m4 (AM_CONFIG_HEADER): Redefine using AU_DEFUN.
+       * m4/ccstdc.m4 (fp_PROG_CC_STDC): New AU_DEFUN.
+       * m4/dmalloc.m4 (fp_WITH_DMALLOC): Likewise.
+       * m4/lispdir.m4 (ud_PATH_LISPDIR): Likewise.
+       * m4/maintainer.m4 (jm_MAINTAINER_MODE): Likewise.
+       * m4/protos.m4 (fp_C_PROTOTYPES): Likewise.
+       * m4/regex.m4 (fp_WITH_REGEX): Likewise.
+       * m4/termios.m4: Delete.  AM_SYS_POSIX_TERMIOS is now AU_DEFUNed
+       in m4/obsolete.m4.
+       * m4/winsz.m4: Delete. AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL is now
+       AU_DEFUNed in m4/obsolete.m4.
+       * m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4 : New files.
+       * m4/Makefile.am (dist_m4data_DATA): Add obsol-gt.m4, obsol-lt.m4,
+       and obsolete.m4. Remove termios.m4 and winsz.m4.
+       * aclocal.in (obsolete, obsolete_rx): Remove.
+       (scan_configure): Don't grep for obsolete macros.
+       * tests/defs (AUTOUPDATE): Define.
+       * Makefile.am (maintainer-check): Check for misuses of autoupdate.
+       * tests/obsolete.test: Rewrite.  Exercize the AU_DEFUN macros from
+       m4/obsolete.m4.
+
+       Fix for PR automake/338:
+       * automake.in (seen_gettext_external): New variable.
+       (handle_gettext): Conditionalize the intl/ check on
+       $seen_gettext_external.  Fix grep usage.
+       (scan_autoconf_traces): Set $seen_gettext_external if
+       `external' is passed to AM_GNU_GETTEXT.
+       * tests/gettext.test, tests/gettext2.test: New files.
+       * tests/Makefile.am (TESTS): Add gettext.test and gettext2.test.
+
+2002-07-18  Alexandre Duret-Lutz  <address@hidden>
+           Akim Demaille  <address@hidden>
+
+       * m4/header.m4 (_AM_DIRNAME, _AM_STAMP, _AM_CONFIG_HEADER,
+       _AM_CONFIG_HEADER_INSINUATE): Remove them all.  Leave just ...
+       (AM_CONFIG_HEADER): ... this new definition for compatibility.
+       * m4/init.m4: Don't call _AM_CONFIG_HEADER_INSINUATE.
+       (_AC_AM_CONFIG_HEADER_HOOK): New macro.
+       * tests/confh5.tests: Delete.
+       * tests/Makefile.am (TESTS): Remove confh5.tests.
+
+2002-07-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Typo.
+
+       * lib/Automake/Channels.pm (dup_channel_setup,
+       drop_channel_setup): New functions.
+       (@EXPORT): Add them.
+       * automake.in (generate_makefile): Call dup_channel_setup and
+       drop_channel_setup.
+       (process_option_list): Recognize --warnings and -W options.
+       * automake.texi (Options): Document them.
+       * tests/pluseq5.test: Check that -Wno-obsolete will disable the
+       warning.
+       * tests/warnopts.test: New file.
+       * tests/Makefile.am (TESTS): Add warnopts.test.
+
+2002-07-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in: Register warning channel `gnu'.
+       (set_strictness): Turn on `gnu' in --gnu and --gnits.
+       (usage): Mention the `gnu' category.
+       (%var_is_am): Replace by ...
+       (%var_owner): ... this, which uses ...
+       (VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE): ... these new constants.
+       Adjust all uses of %var_is_am.
+       (handle_languages): Warn about user variables being overriden.
+       (require_variables): Also check %configure_vars for the existence
+       of a required variable.
+       * automake.texi (Invoking Automake): Document -Wgnu.
+       * tests/yacc2.test, tests/yacc3.test: Use -Wno-gnu when
+       we test YFLAGS.
+       * tests/gnuwarn.test: New file.
+       * tests/Makefile.am (TESTS): Add gnuwarn.test.
+
+2002-07-11  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/337:
+       * automake.in: Redefine the `flags' attribute of each language
+       as a list.  List CPPFLAGS in `flags' when it is used.
+       (register_language): Set the default value of 'flags'.
+       (handle_single_transform_list): Adjust to treat `flags' as a list.
+       (handle_languages): Likewise.  Don't bother defining the
+       configure variable for `c', this is always done since we trace
+       configure.ac.
+       * automake.texi (etags): Use per-executable _CPPFLAGS.
+       (Program and Library Variables): Mention maude_CPPFLAGS.
+       (Program variables): Likewise.
+       * tests/specflags8.test: Use _CPPFLAGS instead of _CFLAGS.
+       * tests/specflags9.test: New file.
+       * tests/Makefile.am (TESTS): Add specflag9.test.
+
+2002-07-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi: Use `variable' instead of `macro' everywhere it
+       designates a Makefile variable.
+       (Texinfo): `VERSION', `UPDATED', `EDITION', and `UPDATED-MONTH' are
+       `flags', not `macros'.  `Macro' means something else in Texinfo.
+       Also show how to use these flags.
+       * automake.in (file_contents_internal): s/macro/variable/ in
+       error message.
+
+       * automake.in (parse_arguments): Call Getopt twice: once to catch
+       --help or --verbose, and once to process the other arguments.
+       (usage, verbose): Always exit 0, ignoring $exit_code (which anyway
+       should always be 0 because of the change to parse_arguments).
+       * tests/Makefile.am (TESTS): Add getopt.test.
+       * tests/getopt.test: New file.
+
+2002-07-09  Tom Tromey  <address@hidden>
+
+       For PR automake/286:
+       * automake.texi (Tags): Document ctags.
+       * automake.in (handle_tags): Handle ctags.
+       * lib/am/tags.am (CTAGS): New macro.
+       (CTAGSFLAGS): Likewise.
+       (ctags): New target.
+       (distclean-tags): Remove `tags'.
+
+       * lib/am/depend2.am: Reworked syntax to avoid parsing problem.
+
+       * lib/am/depend2.am: Search in srcdir and builddir for %SOURCE%
+       before passing to cygpath.  Partial fix for PR automake/334.
+
+2002-07-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (generate_makefile): Suggest using AM_CPPFLAGS
+       instead of INCLUDES.
+       * tests/pluseq5.test: Check that AM_CPPFLAGS is suggested.
+
+2002-07-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (usage, version): Honor $exit_code.
+       (parse_arguments): Use fatal.
+
+2002-07-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Invoking Automake): Document WARNINGS.
+       * automake.in (switch_warning, parse_WARNINGS): New function.
+       (setup_warnings): Rename to ...
+       (parse_warnings): ... this.  Move most of the code to switch_warning.
+       Accept a comma separated list of categories.
+       * tests/vars2.test: Use a comma separated list of warning categories.
+
+2002-07-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS (New in 1.6): Mention that libtoolize is no longer run
+       by automake.
+
+2002-07-08  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/291:
+       * automake.in (macro_define): Catch variable names starting
+       with `_'.
+       (handle_installdirs): Rename _am_installdirs to am__installdirs.
+       * lib/am/data.am, lib/am/install.am, lib/am/libs.am,
+       lib/am/lisp.am, lib/am/ltlibs.am, lib/am/mans.am,
+       lib/am/progs.am, lib/am/python.am, lib/am/scripts.am,
+       lib/am/texinfos.am: Likewise.
+       * tests/canon5.test: Use -Wno-portability.
+       * tests/vars2.test: New file.
+       * tests/Makefile.am (TESTS): Add vars2.test.
+
+2002-07-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (AUTOMAKE): Add -Wall.
+       * tests/outdir.test: Use -Wno-obsolete.
+
+2002-07-07  Tom Tromey  <address@hidden>
+
+       * m4/depend.m4 (_AM_DEPENDENCIES): Compute am__fastdep<compiler>
+       conditional.
+       * automake.in (handle_languages): Compute FASTDEP.
+       * lib/am/depend2.am: Added %FASTDEP% mode.
+
+2002-07-07  Tom Tromey  <address@hidden>
+
+       * automake.texi (Optional): AM_MAINTAINER_MODE is ok in Gnits mode
+       now.  Fixes PR automake/332.
+
+2002-07-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nobase.test (test-install-exec): Move all the `test -f'
+       tests in the Makefile so we can use $(EXEEXT) on programs.
+       Reported by Charles Wilson.
+
+2002-07-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): New macro.
+       * tests/confh5.test: Make sure that Autoconf complains if
+       AM_CONFIG_HEADER or AC_CONFIG_HEADERS is called before
+       AM_INIT_AUTOMAKE.
+
+2002-07-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Channels.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Channels.pm.
+       * automake.in: Use Automake::Channels and register some channels
+       for errors and warnings.
+       ($exit_status): Remove, replaced by Channels::$exit_code.
+       (%required_variables): Remove, Channels will filter-out duplicates
+       itself.
+       (initialize_per_input): Call reset_local_duplicates.
+       (prog_error): Adjust to all `msg'.
+       (setup_warnings): New functions.
+       (parse_arguments): Accept -W CATEGORY and --warnings=CATEGORY,
+       call setup_warnings.
+       (usage): Update usage text accordingly.
+       (macro_dump, macros_dump): Return the dump as a string instead
+       of printing it.
+       (am_install_var) <$warned_about_extra>: Remove, Channels will
+       filter-out duplicates itself.
+       (set_strictness): Turn on/off channels for each stricness.
+       (err, fatal, err_var, err_target, err_am, err_ac, msg_var,
+       msg_target, msg_am, msg_ac, reject_var, reject_target, verb):
+       New functions, to replace ...
+       (print_error, am_error, file_error, macro_error, target_error,
+       conf_error, file_warning): ... these functions.  Remove them.
+       Update all the code to use the new functions.  The rough
+       correspondance is
+          am_error                -> err_am
+          file_error              -> err
+          macro_error             -> err_var
+          target_error            -> err_target
+          conf_error              -> err_ac
+          die                     -> fatal
+          macro_error if defined  -> reject_var
+          target_error if defined -> reject_target
+          verbose                 -> verb
+       * automake.texi (Invoking Automake): Document -W and --warnings.
+       Remove the documentation for --Werror and --Wno-error.
+       * tests/defs: Use -Werror, not --Werror.
+       * tests/exeext2.test: Test that the error message
+       is enabled with -Wobsolete.
+       * tests/output5.test: Rewrite to test that Automake complains
+       when there is no Makefile specified. (The original test was
+       succeeding for the wrong reason.)
+       * tests/seenc.test: Don't use --Wno-error, there is no reason now
+       that -Werror doesn't stop after the first error.
+       * tests/subobj.test: Use --add-missing, and check that
+       `compile' is installed and that Automake says so.
+       * tests/subobj2.test: Don't create `compile'.
+
+2002-07-05  Tom Tromey  <address@hidden>
+
+       * automake.texi (Java Support): Mention --main and _LDFLAGS.
+       For PR automake/324.
+
+2002-07-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/asm.test: Erase Autom4te's cache between each test.
+
+2002-07-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (am_macro_for_var): Add LIBTOOL.
+       (ac_macro_for_var): Add RANLIB.
+       (seen_libtool): Remove.
+       (handle_libtool, lang_c_finish, define_compiler_variable,
+       make_paragraphs): Use
+       variable_defined ('LIBTOOL') instead of $seen_libtool.
+       (handle_languages) <%transform>: Don't set 'LIBTOOL', it is
+       already done in make_paragraphs.
+       (handle_libraries): Simplify by requiring RANLIB with
+       &require_variables_for_macro.
+       (handle_ltlibraries): Simplify by requiring LIBTOOL with
+       &require_variables_for_macro.
+       (scan_autoconf_traces): Don't trace for AC_PROG_LIBTOOL and
+       AM_PROG_LIBTOOL.
+       * tests/libtool4.test, tests/library2.test: New files.
+       * tests/Makefile.in (TESTS): Add libtool4.test and library2.test.
+
+2002-07-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (create, keyed_aclocal_warning): Delete, unused.
+
+2002-07-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (ac_macro_for_var): Add YACC.
+
+2002-07-01  Alexandre Duret-Lutz  <address@hidden>
+
+       Handle multiple suffix rules with the same input extension.
+       For PR automake/37.
+
+       * automake.in (suffix_rules_default): New variable.
+       (suffix_rules): Redefine as a hash of hashes of pairs.
+       (initialize_per_input): Setup suffix_rules_default from
+       suffix_rules on first call, an override suffix_rules
+       with suffix_rules_default on following calls.
+       (struct) <output_extensions>: New attribute.
+       (register_language): Set the default for output_extensions.
+       Call register_suffix_rule for each suffix.
+       (derive_suffix, handle_languages): Adjust to the new definition
+       of $suffix.
+       (register_suffix_rule): New function.
+       (rule_define): Call register_suffix_rule.
+       * tests/suffix8.test, tests/suffix9.test, tests/suffix10.test:
+       New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2002-06-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (am_macro_for_var, ac_macro_for_var,
+       required_variables): New variables.
+       (am_c_prototypes, seen_prog_lex, am_lispdir_location,
+       pythondir_location): Remove.
+       (initialize_per_input): Clear %required_variables.
+       (require_variables, require_variables_for_macro): New functions.
+       (handle_languages): Call &require_variables for $lang->config_vars.
+       (handle_compile): Call &require_variables_for_macro for the
+       ANSI2KNR and U variables.
+       (handle_emacs_lisp): Call &require_variables for EMACS and libdir.
+       (handle_python): Call &require_variables for PYTHON.  Don't
+       explicitly allow `python' as a prefix for PYTHON.
+       (scan_autoconf_traces): Don't scan AC_PROG_LEX, AM_C_PROTOTYPES,
+       AM_PATH_LISPDIR, and AM_PATH_PYTHON.
+       (scan_autoconf_traces) <AC_SUBST>: Don't filter out ANSI2KNR and
+       AMDEPBACKSLASH here...
+       (define_configure_variable): ... do this here.
+       (am_primary_prefixes): Probe the existence of ${X}dir using
+       &require_variables_for_macro.  If a standard prefix is not
+       legitimate, say so.  Ignore all configure variables.
+       * tests/ansi8.test, tests/cxx2.test, tests/gcj5.test,
+       tests/lisp2.test, tests/python2.test: New files
+       * tests/Makefile.am (TESTS): Add them.
+       * tests/asm.test: Grep stderr.
+       * tests/lex2.test: Rewrite to test that Automake suggests AM_PROG_LEX.
+       * tests/python.test: Make sure py-compile is installed.
+
+2002-06-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (LANG_IGNORE, LANG_PROCESS, LANG_SUBDIR,
+       COMPILE_LIBTOOL, COMPILE_ORDINARY): Redefine as constants.
+       Adjust all occurrences.
+
+2002-06-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in: Add local variables so that Emacs setups GNU style
+       for perl-mode and cperl-mode.
+       * automake.in: Likewise.
+       (WHITE_PATTERN, RULE_PATTERN, SUFFIX_RULE_PATTERN, MACRO_PATTERN,
+       ASSIGNMENT_PATTERN, IF_PATTERN, ELSE_PATTERN, ENDIF_PATTERN,
+       INCLUDE_PATTERN, EXEC_DIR_PATTERN): Write $ as "\$" to please
+       perl-mode.
+
+2002-06-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (fetch): Fetch install-sh from Autoconf CVS.
+       * lib/config.sub, lib/install-sh: New upstream versions.
+
+2002-06-26  Paul Eggert  <address@hidden>
+
+       * Makefile.am (maintainer-check): Don't assume that egrep exists;
+       this fixes a portability bug introduced in the 2002-06-08 fix for
+       PR automake/317.
+
+2002-06-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (required_targets): Add ps and ps-am.
+       (initialize_per_input): Reset them.
+       (handle_texinfo_helper): Fill @pss_list, and define the
+       PSS make variable.
+       * lib/am/texinfos.am (RECURSIVE_TARGETS): Add ps-recursive.
+       (ps, ps-am): New targets.
+       * automake.texi (Auxiliary Programs) <texinfo.tex>: Mention
+       `make ps' and `make pdf'.
+       (Texinfo): Document `make ps', `make pdf', and `make dvi'.
+       (Extending): The `ps' and `pdf' targets support a `-local' version.
+
+2002-06-26  Art Haas  <address@hidden>
+
+       * automake.texi: s/.../@dots{}/.
+
+2002-06-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Check that ln works, fall back to `cp -p'.
+       * Makefile.am (install-exec-hook): Use $(LN) instead of ln.
+       Reported by Andreas Buening.
+
+2002-06-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in: Register &lang_lex_target_hook for lex and lexxx.
+       (lang_lex_target_hook): New function.
+       * tests/lex3.c: Complete to check that maintainer-clean erases
+       Lex's output.
+       Reported by Flavien Astraud.  This was lost on 2001-06-23 too.
+
+2002-06-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (lang_yacc_target_hook): Add $output to
+       @maintainer_clean_files.  This was lost on 2001-06-23.
+       * tests/yacc7.test, tests/yacc4.test: Complete to check
+       that maintainer-clean erases YACC's output files,
+       respectively with and without `-d'.
+       Reported by Flavien Astraud.
+
+2002-06-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/lang-compile.am (%FPFX%DEPMODE): Delete.  This is now
+       traced from configure.ac.
+
+       * automake.in (macro_define): Don't accept to override an AC_SUBST
+       or Automake variable in a new condition.
+       * tests/cond23.test, tests/cond24.test: New file.
+       * tests/Makefile.am (TESTS): Add cond23.test and cond24.test.
+       Reported by Patrik Weiskirchre.
+
+2002-06-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nobase.test, tests/pr204.test, tests/pr300-lib.test,
+       tests/pr300-ltlib.test, tests/pr300-prog.test,
+       tests/specflags7.test, tests/specflags8.test, tests/subdir5.test,
+       tests/subobj6.test, tests/subpkg.test, tests/transform.test:
+       Require gcc.
+
+2002-06-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/libtool2.test: Use required=libtoolize.
+       * tests/install2.test: Use required=gzip.
+
+2002-06-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (required): Handle bison; set YACC automatically.
+       * tests/pr204.test, tests/yacc4.test, tests/yacc8.test,
+       tests/yaccvpath.test: Require bison.  Don't set YACC.
+
+2002-06-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (required): Handle `gcc' and `g++'; automatically
+       export CC and CXX when they are required.
+       * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
+       tests/cond4.test, tests/cond16.test, tests/cond18.test,
+       tests/cond19.test, tests/depcomp2.test, tests/depend2.test,
+       tests/lex3.test, tests/pr87.test, tests/pr220.test,
+       tests/substref.test, tests/target-cflags.test, tests/yacc4.test,
+       tests/yaccvpath.test: Require gcc.  Don't pass CC=gcc to
+       configure.
+       * tests/subobj9.test: Require g++.
+
+2002-06-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (required): Handle `GNUmake'.
+       (needs_gnu_make): Don't define anymore.
+       * tests/cond4.test, tests/cond18.test, tests/cond19.test,
+       tests/dollar.test, tests/exsource.test, tests/extra6.test,
+       tests/lex3.test, tests/make.test, tests/pr9.test, tests/pr87.test,
+       tests/subdir5.test, tests/target-cflags.test, tests/yacc7.test,
+       tests/yaccvpath.test: Use `required=GNUmake' instead of
+       `$needs_gnu_make'.
+
+2002-06-17  Paolo Bonzini  <address@hidden>
+
+       * automake.in (process_option_list): Recognize std-options.
+       (handle_options): Enable std-options in gnits strictness.
+       (am_install_var): If std-options, enable CK-OPTS section.
+       * lib/am/scripts.am (installcheck-am): New target.
+       * lib/am/progs.am (installcheck-am): New target.
+       * tests/gnits2.test: New file.
+       * tests/Makefile.am (TESTS): Add gnits2.test.
+       * automake.texi (Gnits, Options): Document std-options.
+
+2002-06-17  Kevin Ryde  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Add tmp to @clean_suffixes,
+       as generated by recent texinfo.tex.
+
+2002-06-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): Rename to ...
+       (_AM_CONFIG_HEADERS): ... this.
+       (_AM_CONFIG_HEADER_INSINUATE): Define AC_CONFIG_HEADERS to
+       call _AM_CONFIG_HEADERS; and AM_CONFIG_HEADER to call
+       AC_CONFIG_HEADERS.
+       * automake.in (scan_autoconf_traces): Trace AC_CONFIG_HEADERS
+       instead of AM_CONFIG_HEADER.
+       * tests/autoheader2.test: New file.
+       * tests/Makefile.am (TESTS): Add autoheader2.test.
+       Suggested by Raja R Harinath.
+
+2002-06-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): Use m4_copy instead
+       of m4_rename so that AC_CONFIG_HEADER is never undefined and
+       therefore still traced after the redefinition.
+       * tests/defs (AUTOHEADER): Define.
+       * tests/autoheader.test: New file.
+       * tests/Makefile.am (TESTS): Add autoheader.test.
+       Reported by Braden McDaniel.
+
+2002-06-13  Paolo Bonzini  <address@hidden>
+
+       * automake.in (check_gnu_standards): In --gnu mode, accept
+       one of COPTING, COPYING.LESSER, or COPYING.LIB.
+       (common_files): Add COPYING.LESSER.
+       * automake.texi (Gnits): Document this.
+
+2002-06-13  Paolo Bonzini  <address@hidden>
+
+       * automake.in (required_targets): Add the pdf and pdf-am targets.
+       (initialize_per_input): Likewise.
+       (scan_texinfo_file): Add pdf to @clean_suffixes.
+       (handle_texinfo_helper): Output the .pdf dependencies, and define
+       the PDFS variable.
+       * lib/am/texinfos.am (TEXI2PDF): New variable.
+       (pdf, pdf-am): New targets.
+       (.PHONY): Add pdf, pdf-am, and pdf-recursive.
+       * lib/am/texibuild.am (.%SUFFIX%.pdf): New rule.
+
+2002-06-13  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix pr307.test failure with gcc 3.x.
+       * lib/depcomp (dashmstdout): Strip the call to libtool, and
+       replace `-o $object' by `-o /dev/null' before running "$@"
+       to generate dependencies.
+       (cpp): Strip the call to libtool as well as `-o $object'.
+
+2002-06-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/depcomp (tru64): Expect dependency files in .libs/, maybe as
+       $base.lo.d, when libtool is used.
+       Reported by Nicolas Joly.
+
+2002-06-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there
+       is no file to compile.
+       * tests/java2.test: New file.
+       * tests/Makefile.am (TESTS): Add java2.test.
+       Reported by Braden N. McDaniel.
+
+2002-06-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/maintclean.test: Don't check for autom4te.cache if
+       it's not created by Autoconf.
+       Reported by Bernd Jendrissek.
+
+2002-06-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Tests): Document site.exp.  Update DejaGnu's url.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/header-vars.am (transform): Define.
+       Was removed by mistake on 2002-04-13.
+       * tests/transform.test: New file.
+       * tests/Makefile.am (TESTS): Add transform.test.
+       Reported by Nicolas Joly.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dollar.test: Require GNU make.
+       * tests/maintclean.test: Don't use `export YACC=false'.  Pass
+       YACC=false to configure instead.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex, lib/INSTALL,
+       INSTALL: New upstream versions.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/sinclude.test: Check for m4_include too.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/sinclude.test: Rename the package as amsinclude;
+       am__sinclude still trigers the sinclude macro once it has been
+       converted to am--sinclude.
+       Reported by Nicolas Joly.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (API versioning): Typo.
+
+2002-06-10  Nicolas Joly  <address@hidden>
+
+       * THANKS (Nicolas Joly): Remove duplicate.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Fix $MAKE -e detection.
+       * tests/yacc7.test: Use rm -f.
+
+2002-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (ACLOCAL, AUTOMAKE): Use absolute paths.
+       * tests/subpkg.test: New file.
+       * tests/Makefile.am (TESTS): Add subpkg.test.
+
+2002-06-09  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/318:
+       * tests/nobase.test: Rewrite to test _HEADERS, _DATA, _SCRIPTS,
+       _PROGRAMS, _LIBRARIES, and _LTLIBRARIES.
+       * lib/am/scripts.am (install-%DIR%SCRIPTS,
+       uninstall-%DIR%SCRIPTS): Honor nobase_; strip the directory by
+       default.
+       (?%DIR%SCRIPT_INSTALL): New variable.
+       * lib/am/header-vars.am (install_sh_SCRIPT): New variable.
+       Reported by Eric Siegerman.
+
+2002-06-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (lang_yacc_target_hook): Add rule to recover from
+       the removal of $header.
+       * lib/am/yacc.am (%BASE%.h): Remove (duplicate with the one
+       output by lang_yacc_target_hook).
+       * tests/yacc7.test: Try to recreate foo.h after its removal.
+       * tests/yacc8.test: Add `AM_YFLAGS = -d' and try to recreate
+       parse.h too.
+       Reported by Bernd Jendrissek.
+
+2002-06-08  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/317:
+       * Makefile.am (maintainer-check): Disallow `for f in $(FILES)',
+       suggest `list='$(FILES)'; for f in $$list' instead.
+       * lib/am/distdir.am (distdir): Adjust `for' usage.
+       * lib/am/texinfos.am (maintainer-clean-aminfo): Likewise.
+       * tests/dollar.test: New file.
+       * tests/Makefile.am (TESTS): Add dollar.test.
+       Reported by Eric Siegerman and Philip Fong.
+
+2002-06-06  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/47 (fixed a long time ago):
+       * tests/yacc7.test: Also check that parser sources are distributed.
+
+2002-06-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): New variable.
+       (distclean): Use it.
+       (maintainer-clean): Delete autom4te.cache and
+       $(am__CONFIG_DISTCLEAN_FILES).
+       * tests/maintclean.test: New file.
+       * tests/Makefile.am (TESTS): Add maintclean.test.
+
+2002-06-05  Miloslav Trmac  <address@hidden>
+
+       * lib/am/dejagnu.am (site.exp): Quote build_alias, host_alias, and
+       target_alias.
+
+2002-05-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for egrep and fgrep.
+
+       * test/cond22.test: Set SHELL when calling $MAKE -e.
+
+2002-05-31  Richard Boulton <address@hidden>
+
+       Fix PR automake/326:
+       * automake.in (define_objects_from_sources): Calculate the result in
+       all conditions before passing this to subobjname to pick a name to
+       store the result in.
+       (subobjname): Expect a list of condition/value pairs as input.
+       Combine this list and use it as the key to determine the variable name.
+       * test/cond22.test: New file.
+       * tests/Makefile.am (TESTS): Add cond22.test
+
+2002-05-30  Paul Eggert  <address@hidden>
+
+       * lib/am/distdir.am (distdir): Don't assume that 'grep -F' works;
+       instead, use shell pattern matching.
+
+2002-05-29  Paul Eggert  <address@hidden>
+
+       Don't assume that egrep and fgrep exist, as POSIX 1003.1-2001 no
+       longer requires them.
+
+       * Makefile.am (maintainer-check): Use grep -E and grep -F instead
+       of egrep and fgrep.  Omit unnecessary -E and -F.
+       Fix quoting typo -- "fgrep '\$${'" should have been "fgrep '$${'".
+       * lib/am/distdir.am (distdir): fgrep -> grep -F.
+       Use $(), not ${}, for Make variables.
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am):
+       fgrep -> grep
+       * m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
+       * tests/defs: Set FGREP and EGREP.
+
+       * tests/aclocali.test, tests/acoutput2.test, tests/all.test,
+       tests/ansi.test, tests/ansi4.test, tests/colon3.test,
+       tests/cond21.test, tests/condlib.test, tests/confh4.test,
+       tests/confsub.test, tests/cxxansi.test, tests/cxxo.test,
+       tests/depend4.test, tests/discover.test, tests/distname.test,
+       tests/dup3.test, tests/empty4.test, tests/fo.test,
+       tests/implicit.test, tests/insh2.test, tests/interp.test,
+       tests/lex.test, tests/lex3.test, tests/lex4.test,
+       tests/libobj5.test, tests/libobj7.test, tests/make.test,
+       tests/makevars.test, tests/nostdinc.test, tests/parse.test,
+       tests/pluseq.test, tests/pluseq4.test, tests/pluseq6.test,
+       tests/pr2.test, tests/pr9.test, tests/seenc.test,
+       tests/specflags.test, tests/specflags3.test,
+       tests/specflags6.test, tests/subobj.test, tests/subobj2.test,
+       tests/suffix3.test, tests/texinfo.test, tests/texinfo6.test,
+       tests/texinfo8.test, tests/vtexi.test, tests/yacc3.test,
+       tests/yacc6.test: fgrep -> $FGREP, egrep -> $EGREP
+
+2002-05-24  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/323:
+       * m4/depend.m4: Missing comma.
+       * tests/gcj4.test: New file.
+       * tests/Makefile.am (TESTS): Add gcj4.test.
+       Reported by David Pashley.
+
+2002-05-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (configure.in): Don't double-quote $me.
+       * tests/sinclude.test: Overwrite configure.in and use
+       `am__sinclude' instead of `sinclude' as package name.
+       Excercise `m4_sinclude' instead of `sinclude'.
+
+2002-05-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (conditional_implies_one_of): Rename as ...
+       (conditional_implies_any): ... this.
+       * tests/pluseq9.test: Exercise another case with the new
+       `C' variable.
+       Suggested by Raja R Harinath.
+
+2002-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (configure.in): Quote macro arguments.
+       Reported by Nicolas Joly.
+
+2002-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/header-vars.am (build_triplet, host_triplet,
+       target_triplet): Define.  Were removed by mistake on 2002-04-13.
+
+2002-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/186:
+       * lib/am/distdir.am (distcheck): Attempt a DESTDIR install.
+       * tests/destdir.test: New file.
+       * tests/Makefile.am (TESTS): Add destdir.test.
+
+2002-05-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (conditional_true_when): Return false if $WHEN == FALSE.
+       (conditional_is_redundant): Simplify.
+       (conditional_implies_one_of,
+       variable_not_always_defined_in_cond): New functions
+       (macro_define): Reject appends if the variable is not defined in
+       all conditions where `+=' applies.
+       (invert_conditions): Rewrite.  Before this patch,
+       invert_conditions("A_TRUE B_TRUE", "A_TRUE B_FALSE", "A_FALSE")
+       would return ("A_FALSE B_TRUE", "A_FALSE B_TRUE"), which seems
+       wrong (these conditions implies "A_FALSE").  Now it outputs (),
+       which just means the input conditions cover all cases.
+       (variable_conditions_permutations): Never output FALSE conditions.
+       * tests/pluseq2.test, tests/pluseq3.test: Define data_DATA
+       in the CHECK_FALSE condition to fix the test.
+       * tests/pluseq5.test: Actually check the diagnostic.
+       * tests/pluseq9.test: New file.
+       * tests/Makefile.am (TESTS): Add pluseq9.test.
+
+2002-05-14  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/322:
+       * automake.in (read_am_file): Rename $was_rule as $prev_state, and
+       set it with IN_RULE_DEF, IN_VAR_DEF, or IN_COMMENT as appropriate.
+       Handle comments continued by backslashes.
+       * tests/comment6.test: New file.
+       * tests/Makefile.am (TESTS): Add comment6.test.
+       Reported by Braden N. McDaniel.
+
+2002-05-08  Charles Wilson  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/progs.am (clean-%DIR%PROGRAMS): If Libtool is used, clean
+       both `program$(EXEEXT)' and `program'; needed under Cygwin.
+       * tests/libtool3.test: New file.
+       * tests/Makefile.am (TESTS): Add libtool3.test.
+
+2002-05-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * TODO: Undust.
+
+2002-05-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (FETCHFILES, fetch): Get INSTALL from Autoconf CVS.
+
+2002-05-06  Alexandre Duret-Lutz  <address@hidden>
+
+       Erase stamps from the Makefile that generates them.
+
+       * automake.in (handle_configure): Append each used stamp to
+       @distclean_config.  Don't warn about stamp-h in AC_OUTPUT, this
+       file is not used anymore.
+       * lib/am/clean.am (distclean-generic): Don't erase stamp-h and
+       stamp-h[0-9]*.
+       * tests/subdir6.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2002-05-06  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for condd.test (conditional `+='):
+       * automake.in (%appendvar): New.
+       (initialize_per_input): Clear it.
+       (macro_define): Handle += for variable defined in another condition.
+       * automake.texi (Conditional Sources): Use conditional += in
+       the example.
+       (General Operation, Conditionals): Remove note about broken +=.
+       * tests/cond21.test: New file.
+       * tests/condd.test: Also test conditional append to a _SOURCE
+       variable.  Create missing directories.
+       * tests/Makefile.am (TESTS): Add cond21.test.
+       (XFAILS): Remove condd.test.
+
+2002-05-05  Tom Tromey  <address@hidden>
+
+       * automake.texi (Program and Library Variables): Mention _LFLAGS.
+
+2002-04-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Erase so_locations
+       files.  Fix subobj9.test on OSF and IRIX.
+       Reported by Nelson H. F. Beebe.
+
+2002-04-26  Tom Tromey  <address@hidden>
+
+       * lib/am/dejagnu.am (distclean-DEJAGNU): New target.
+       For Debian bug 144221.
+
+2002-04-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/man2.test: Use `pwd`, not $PWD.  Use $MAKE -e.
+
+2002-04-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (subobjname): Use the length of %subobjvar
+       instead of $subobjnamenum.
+       (subobjnamenum): Remove.
+
+2002-04-25  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/307:
+       * lib/depcomp: Never compute dependencies in the background, this
+       can cause races with libtool.  Compute the dependencies after
+       the actual compilation.  Don't make libtool silent now that
+       it's run in the foreground.
+       * tests/pr307.test: New file.
+       * tests/Makefile.am (TESTS): Add pr307.test.
+       Reported by Laurent Morichetti.
+
+2002-04-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/check.am: Show skipped tests.  Display the
+       $(PACKAGE_BUGREPORT) address on failure.
+
+2002-04-24  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix PR automake/315:
+       * automake.in (subobjname): Rewrite to generate variable name
+       unique for each content.
+       (%substnums): Remove.
+       (%subobjvar): New hash.
+       (initialize_per_input): Clear %subobjvar.
+       (define_objects_from_sources): Return the name of the variable
+       defined, in addition to the linker.  Call subobjname only once
+       the content of the variable to define is known.
+       (handle_source_transform): Adjust call to define_objects_from_sources.
+       * tests/specflags8.test: Mention PR 315.
+       * tests/subobjname.test: New file.
+       * tests/Makefile.am (XFAIL_TESTS): Remove specflags8.test.
+       (TESTS): Add subobjname.test.
+
+2002-04-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Grep
+       the whole file for 'generated by automake', not only the
+       first line.  This accounts for post-processed Makefile.in's.
+       * tests/postproc.test: New file.
+       * tests/Makefile.am (TESTS): Add postproc.test.
+
+2002-04-22  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/151 and PR automake/314:
+       * automake.texi (A Program): Split into
+       (Program Sources, Linking, Conditional Sources, Conditional
+       Programs): ... these subsections; moving the Linking node
+       before the Conditional discussions.
+       (Conditional Sources): More details.  Notably, mention
+       hello_DEPENDENCIES.
+       (Conditionals): Adjust reference to Conditional Programs.
+
+2002-04-19  Paul Eggert  <address@hidden>
+
+       Fix some bugs when using "$@" when there might be zero positional
+       arguments in cases where this matters.  Zsh doesn't support
+       the workaround ${1+"$@"} that has been used by Automake since
+       the Mon Dec  4 11:55:36 1995 change.
+
+       * aclocal.in: Use 'case' statement to work around problem.
+       * automake.in: Likewise.
+       * lib/ylwrap: Likewise.
+       * lib/missing: No need for workaround, as the command is never
+       invoked with zero arguments.
+       * tests/ccnoco.test: Likewise.
+       * missing: Update from lib/missing.
+
+2002-04-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (initialize_per_input): Clear %require_file_found.
+       (%require_file_found): Group the declaration with the other
+       variables initialized by initialize_per_input.
+       * tests/required.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Reported by Marius Vollmer.
+
+2002-04-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/header.m4 (_AM_CONFIG_HEADER_INSINUATE): New function,
+       override AC_CONFIG_HEADERS with AM_CONFIG_HEADER.
+       (_AM_CONFIG_HEADER): Use _AM_AC_CONFIG_HEADERS.
+       * m4/init.m4: Call _AM_CONFIG_HEADER_INSINUATE.
+       * tests/stamph2.test: Use AC_CONFIG_HEADERS for some of the config
+       files.
+       * tests/confh5.test: New file.
+       * tests/Makefile.am (TESTS): Add confh5.test.
+       * automake.texi (Optional, Public macros): Update descriptions
+       of AC_CONFIG_HEADERS and AM_CONFIG_HEADER.
+
+2002-04-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/man2.test: New file.
+       * tests/Makefile.am (TESTS): Add man2.test.
+       * lib/am/mans.am (install-man%SECTION%): Change the extension
+       of the man pages being installed, as documented.
+
+2002-04-13  Alexandre Duret-Lutz  <address@hidden>
+
+       Enable traces; wipe out the old configure.in parser.
+
+       * automake.in (scan_autoconf_traces): Use '$ENF{AUTOCONF}' of
+       'autoconf'.  Honnor the $filename argument.
+       (scan_autoconf_files): Don't call scan_one_autoconf_file.
+       Always call scan_autoconf_traces.
+       (scan_one_autoconf_file): Remove, with it associated regexes.
+       (obsolete, obsolete_rx): Remove.
+       (register_language, handle_languages): Remove the 'define_flag'
+       support.  Remove it from the struct and language definitions too.
+       (unquote_m4_arg): Remove.
+       * lib/am/header-vars.am, lib/am/compile.am, lib/am/lisp.am: Remove
+       the `FOO = @FOO@' definitions for all AC_SUBST'ed variables.  They
+       are now generated automatically.
+       * aclocal.in (obsolete_macros): Don't mention obsolete_macros in
+       automake.in.
+       * automake.texi (Invoking Automake): Mention the AUTOCONF envvar.
+
+2002-04-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/version6.test: New file.
+       * tests/Makefile.am (TESTS): Add tests/version6.test.
+       * automake.in (version_check): Return 0 on equality.
+
+2002-04-13  Andreas Schwab  <address@hidden>
+
+       * THANKS: Update my mail address.
+
+2002-04-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/discover.test: Use a full configure.in that calls AC_INIT.
+       Use AC_LIBOBJ.  Grep the error message.
+       * test/ldadd.test: Don't use LIBOBJS.  Use a full configure.in.
+       Grep the error message.  Require libtool.
+       * tests/ldflags.test:  Don't use LIBOBJS.
+       * tests/seenc.test: Use AC_LIBOBJ, --Wno-error, and grep the
+       error messages for CC and CXX.
+
+2002-04-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_traces) <AC_SUBST>: Ignore ANSI2KNR
+       and AMDEPBACKSLASH.
+       * tests/distcommon2.test: Use a full configure.in that calls AC_INIT.
+       * tests/ext.test: Enable dependencies for OBJC.
+       * tests/libobj.test, tests/libobj6.test, tests/libobj9.test:
+       Delete.  They tests for different flavors of $LIBOBJS assignments
+       that wont be supported anymore.
+       * tests/libobj2.test, tests/libobj10.test: Use AC_LIBOBJ.
+       * tests/obsolete.test: Don't test Automake.
+       * tests/suffix5.test: Require libtool.
+       * tests/Makefile.am (TESTS): Remove libobj.test, libobj6.test and
+       libobj9.test.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in (APIVERSION): Fix definition.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS: Catch up with changes since 1.6.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/yacc8.test: Don't assume GNU make, run config.status
+       to regenerate the Makefile.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Make sure `$MAKE -e' is
+       always followed by a SHELL setting.
+       * tests/ansi3.test, tests/ansi5.test, tests/subobj3.test: Set
+       SHELL when calling `$MAKE -e'.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/subobj9.test: Use configure.in, not configure.ac,
+       otherwise this fails with old libtool versions.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+2002-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * ChangeLog.2001: New file, extracted from ChangeLog.
+       * Makefile.am (EXTRA_DIST): Add it.
+
+2002-04-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Canonicalization): The sources for libmumble++.a
+       go into libmumble___a_SOURCES.
+
+2002-04-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for `sleep 1' uses in the
+       test suite.  Suggest `sleep 2' instead.
+       * tests/confsub.test: Use `sleep 2'.
+
+2002-04-04  Paul Eggert  <address@hidden>
+
+       * lib/am/subdirs.am:
+       ($(RECURSIVE_TARGETS), maintainer-clean-recursive):
+       $(MAKEFLAGS) -> $$MAKEFLAGS, so that we don't run into problems if
+       MAKEFLAGS contains '$(...)'.
+
+2002-04-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/specflags8.test: Typo.
+
+2002-04-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/specflags6.test: Run aclocal.
+       * tests/Makefile.am (TESTS): Add specflags6.test.
+
+2002-04-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/specflags7.test, tests/specflags8.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+       (XFAIL_TESTS): Add specflags8.test.
+
+2002-03-29  Tom Tromey  <address@hidden>
+
+       * automake.in (check_typos): Examine AM_LDFLAGS.
+       Fixes PR automake/311.
+
+       For PR automake/312:
+       * lib/am/libtool.am (clean-libtool): Use LTRMS.
+       * automake.in (handle_single_transform_list): When processing a
+       libtool object, clean the ordinary object and register the
+       directory.
+       (libtool_clean_directories): New global.
+       (initialize_per_input): Initialize it.
+       (generate_makefile): Call handle_libtool later.
+       (handle_libtool): Handle libtool_clean_directories.
+       * tests/subobj9.test: New file.
+       * tests/Makefile.am (TESTS): Added subobj9.test.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/extra6.test, tests/subdir5.test: Require GNU make.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dup3.test (ACLOCAL): s/srcdir/testsrcdir/.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/extra7.test: New file.
+       * tests/Makefile.am: Add it.
+       * lib/am/distdir.an (distdir): When a distribuable directory
+       exists both in `.' and $(srcdir), merge both directories.  This
+       works around a failure of extra6.test on Tru64 reported by
+       Nicolas Joly.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/pr87.test, tests/yaccvpath.test: Require GNU make.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Catch occurrences of
+       `$MAKE foo=bar' in the testsuite.  Suggest using
+       `foo=bar $MAKE -e' instead.
+       * tests/ansi3.test, tests/ansi5.test, tests/subobj3.test:
+       Use $MAKE -e.  This fixes a ansi5.test failure with Solaris make.
+       * tests/defs: Unset $srcdir, and set $testsrcdir to its old value.
+       * tests/installsh.test (AUTOMAKE, ACLOCAL): Use $testsrcdir.
+
+2002-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/310:
+       * lib/am/depend2.am, lib/am/lex.am, lib/am/yacc.am: Quote %SOURCE%
+       so it never appears as a plain word.
+
+2002-03-25  Angus Leeming  <address@hidden>
+
+       * lib/depcomp (tru64): Correctly compute `base'.
+
+2002-03-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/pr211.test: s/requires/required/, otherwise the test fails
+       if libtool is not installed.
+
+2002-03-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dirname.test: Don't use $SHELL when calling ./configure.
+
+2002-03-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dirname.test: Use --quiet to fix failure on installations
+       using a site script.
+       Reported by Nicolas Joly.
+
+2002-03-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for misuses of make,
+       autoconf, automake, aclocal, and perl in the testsuite.  Suggest
+       using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead.
+       * tests/confsub.test: Use $AUTOCONF and $MAKE.
+       * tests/extra5.test, tests/extra6.test, tests/lex5.test,
+       tests/nobase.test, tests/nodist2.test, tests/pr204.test,
+       tests/pr224.test, tests/pr287.test, tests/strip.test,
+       tests/yacc8.test: Use $MAKE.
+
+2002-03-20  Alexandre Duret-Lutz  <address@hidden>
+
+       Add support for two-dot versions.
+
+       * tests/version5.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * automake.in (version_split, version_compare): New functions.
+       (version_check): Rewrite using version_split and version_compare.
+       (process_option_list): Adjust regex.
+
+2002-03-18  Richard Boulton <address@hidden>
+
+       Fix for PR automake/306:
+       * automake.texi (Generalities): Document +=.
+       (Conditionals): Document limitations of += with conditionals.
+
+2002-03-17  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/295:
+       * automake.texi (Invoking Automake): Deprecate --output-dir.
+       * automake.in (usage): Don't document --output-dir.
+       (output_directory): Don't initialize.
+       (parse_arguments): Deprecate --output-dir.
+
+       * m4/init.m4 (AUTOMAKE, ACLOCAL): Removed extra quotes.
+       Fixes PR automake/304.
+
+2002-03-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dirforbid.test: Workaround for NetBSD sh bug.
+       Fixes PR automake/305.
+
+2002-03-11  Richard Boulton <address@hidden>
+
+       * automake.in (check_typos): Allow variables with reserved
+       suffices (such as _LDFLAGS) and prefixes which aren't
+       recognised if the variable is defined in configure.ac.
+       Fixes acsubst.test.
+
+2002-03-11  Richard Boulton <address@hidden>
+
+       * tests/acsubst.test: New test, by Alexandre Duret-Lutz
+       * tests/acsubst2.test: New test, by Alexandre Duret-Lutz
+       * tests/Makefile.am (TEST): Added acsubst.test and acsubst2.test
+
+2002-03-11  Peter Breitenlohner  <address@hidden>
+
+       * tests/defs: Unset DESTDIR, otherwise `make DESTDIR=/foo check'
+       causes failures.
+
+2002-03-07  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/303:
+       * automake.in (version_check): Move the error message ...
+       (process_option_list): ... here, so we can distinguish between
+       global and local options.
+
+2002-03-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/pr300-lib.test, tests/pr300-ltlib.test,
+       tests/pr300-prog.test: Use AC_OUTPUT, not AC_OUTPUT(Makefile), so
+       Autoconf doesn't complain about Makefile being output twice.
+
+2002-03-06  Tom Tromey  <address@hidden>
+
+       * configure.in: Upped version to 1.6a.
+
+2002-03-05  Tom Tromey  <address@hidden>
+
+       * configure.in: Released 1.6.
+
+2002-03-05  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/300:
+       * tests/pr300-lib.test, tests/pr300-ltlib.test,
+       tests/pr300-prog.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+       * automake.in (handle_ltlibraries): Strip nobase_ prefix to
+       compute the directory.
+       * lib/am/header-vars.am (install_sh_PROGRAM): New variable.
+       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): New variable.
+       (install-%DIR%LIBRARIES): Use it.  Honor nobase_.
+       (uninstall-%DIR%LIBRARIES): Honor nobase_.
+       * lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): New variable.
+       (install-%DIR%LTLIBRARIES): Use it.  Honor nobase_.
+       (uninstall-%DIR%LTLIBRARIES): Honor nobase_.
+       * lib/am/progs.am (%DIR%PROGRAMS_INSTALL): New variable.
+       (install-%DIR%PROGRAMS): Use it.  Honor nobase_.
+       (uninstall-%DIR%PROGRAMS): Honor nobase_.
+       See also the fix for nobase.test on 2001-11-09.
+
+2002-03-05  Tom Tromey  <address@hidden>
+
+       * lib/config.sub, lib/config.guess, lib/texinfo.tex: Updated.
+
+2002-03-05  Pavel Roskin  <address@hidden>
+
+       * tests/yacc8.test: Add a command between "test" and "cd" to
+       work around a bug in bash-2.05.
+
+2002-03-05  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/294:
+       * tests/dirforbid.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * automake.in (standard_prefix): New hash.
+       (am_primary_prefixes): Forbid standard_prefixes which are not
+       explicitely allowed.
+       * automake.texi (Uniform): Remove FIXME.
+
+2002-03-05  Jim Meyering  <address@hidden>
+
+       * automake.in (@common_files): Add config.rpath.
+
+2002-03-05  Kevin Ryde  <address@hidden>
+
+       For PR automake/297:
+       * lex.m4 (AM_PROG_LEX): Don't set LEX=${am_missing_run}flex until
+       after AC_PROG_LEX, since it will try to run it and fail (in autoconf
+       2.52 at least).
+
+2002-02-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Declare
+       LEX_OUTPUT_ROOT and LEXLIB as configure variables when
+       AM_PROG_LEX or AC_PROG_LEX are seen.  This allows to ...
+       * lib/am/lex.am: ... remove the LEX_OUTPUT_ROOT and LEXLIB
+       definitions.  Search %SOURCE% in $(srcdir).  Use s||| instead
+       of s/// in the sed invocation, to support filenames containing
+       slashes.
+       * lib/am/yacc.am: Search %SOURCE% in $(srcdir).  Use s||| too.
+       * tests/lex5.test, tests/yacc8.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2002-02-23  Per Bothner  <address@hidden>
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Set `dirpart' to
+       `.' in else branch.
+
+2002-02-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/make.test: Revert the grep logic to work around a bug
+       in NetBSD sh (see NetBSD Problem Report #11542).
+       Reported by Patrick Welche.
+
+2002-02-20  Tim Van Holder  <address@hidden>
+
+       * m4/lispdir.m4: Redirect /dev/null to stdin when running $EMACS
+       to try and prevent a non-lisp emacs from starting in interactive
+       mode.
+       * automake.texi: Document this change.
+
+2002-02-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Macros): Split into ...
+       (Public Macros, Private Macros): ... these.
+
+2002-02-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/insthook.test: Use sed instead of "tail +X".
+
+2002-02-18  Paul Eggert  <address@hidden>
+
+       * lib/depcomp: Don't use "tail +3"; it's not portable to
+       POSIX 1003.1-2001 hosts.
+
+2002-02-18  Jim Meyering  <address@hidden>
+
+       * tests/cond12.test: Use sed 1q, not `head -n 1'.
+       The latter is not portable to some old systems.
+       * m4/depout.m4: Don't use `head -1'; it's no longer portable.
+       Use `sed 1q' instead.
+       * tests/insthook.test: Likewise.
+
+2002-02-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_lib_objects_cond): Tell the user to put
+       global linker flags in AM_LDFLAGS, not LDFLAGS.
+
+       * automake.texi (General Operation): AC_SUBST'ed variables
+       override Automake's variables.
+       (Uniform): More words and @refs.
+       (Auxiliary Programs) <config.sub, config.guess>: Add URL.
+       (etags): More explanations about the first example.
+       (Invoking Automake): Mention autoreconf.  More @refs.
+       (Requirements): Mention AC_CONFIG_FILES.
+       (Optional): AC_CHECK_TOOL will no longer install config.sub and
+       config.guess.  Mention AC_LIBOBJ, AC_LIBSOURCE, and AC_LIBSOURCES.
+       (Invoking aclocal): aclocal no longer warn about duplicates.
+       (Macros) <AM_INIT_AUTOMAKE>: More explanations.
+       (Extending aclocal): Suggest using the output of
+       `aclocal --print-ac-dir` to install third-party macros.
+       (Alternative): Specify ordering of dist_, nodist_, and nobase_
+       prefixes.
+       (A Program): Mention scripts.  The global LDADD variable is not
+       meant to hold link flags, suggest using AM_LDFLAGS instead.
+       (Program and Library Variables) <maude_LIBADD, maude_LDADD>:
+       _LIBADD and _LDADD are subject to the same restriction wrt to
+       link flags.
+       (Program and Library Variables) <maude_DEPENDECIES>: Is also
+       derived from maude_LIBADD.
+       (Program variables): Define AM_LDFLAGS.
+       (Dependencies): Passing the no-dependencies option to
+       AM_INIT_AUTOMAKE is prefered.
+       (Scripts): Explain why automake is magically cleaned.
+       Mention noinst_SCRIPTS and check_SCRIPTS.
+       (Data): Use dist_ in Automake's example.
+       (Dist): Reference AM_INIT_AUTOMAKE for PACKAGE and VERSION.
+       Mention AC_CONFIG_FILES instead of AC_OUTPUT.
+
+2002-02-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (FETCHFILES): Add Automake/XFile.pm.
+       (fetch): Fetch XFile.pm.  Update the files in $(srcdir) instead
+       of asking the maintainer to do it manually.
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex,
+       Automake/XFile.pm: New upstream versions.
+
+2002-02-02  Tom Tromey  <address@hidden>
+
+       * automake.texi (Macros): Warn about upgrading.
+
+2002-02-01  Tom Tromey  <address@hidden>
+
+       Change per GNU coding standards:
+       * aclocal.in (parse_arguments): Only mention most recent year in
+       copyright output.
+       * automake.in (version): Only mention most recent year.
+
+2002-01-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (API versioning): New Node.
+       (Extending): Use $(DESTDIR) in examples.
+
+2002-01-28  Akim Demaille  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Serial 5.
+       Respect the --help layout.
+
+2002-01-27  Tom Tromey  <address@hidden>
+
+       * configure.in: Bumped to 1.5e.
+
+       * lib/am/yacc.am: Use `rm -f'.
+
+       * configure.in: Released 1.5d.
+
+       * lib/config.guess: New version from FSF.
+
+       * Makefile.am (uninstall-hook): New target.
+
+2002-01-24  Akim Demaille  <address@hidden>
+
+       * lib/install-sh: Update, from Autoconf.
+
+2002-01-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Don't treat AC_CHECK_TOOL
+       as AC_CANONICAL_HOST (the former does not require the latter since
+       Autoconf 2.50).
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Check for strip.
+       * automake.texi (Requirements): Do not require STRIP to be
+       defined by the user.
+
+2002-01-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).
+       * automake.in (handle_languages): Compute and substitute %DEPDIRS%.
+       * tests/pr224.test: Make sure .deps subdirectories are
+       erased by distclean.
+
+2002-01-22  Tom Tromey  <address@hidden>
+
+       * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if
+       no-dependencies option is set.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't invoke dependency code if
+       no-dependencies option is set.  Don't call AM_DEP_TRACK or
+       AM_SET_DEPDIR.
+
+2002-01-22  Pavel Roskin  <address@hidden>
+
+       * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and
+       ASFLAGS.
+
+2002-01-22  Akim Demaille  <address@hidden>
+
+       * Makefile.am (FETCHFILES): Remove ansi2knr.c, add texinfo.tex.
+       (fetch): Adjust.
+
+2002-01-21  Tom Tromey  <address@hidden>
+
+       * Makefile.am (fetch): Don't fetch ansi2knr.
+
+       * automake.texi (Macros): Updated for new variable names.
+       (Program and Library Variables): Likewise.
+       (Assembly Support): Likewise.
+       * m4/as.m4: Use CCAS and CCASFLAGS.
+       * automake.in (asm): Use CCAS and CCASFLAGS.
+
+2002-01-21  Akim Demaille  <address@hidden>
+
+       * automake.in (&parse_arguments): Use a more GNUish error message
+       on wrong options.
+
+2002-01-20  Tom Tromey  <address@hidden>
+
+       Fix for PR automake/231:
+       * m4/gcj.m4 (AM_PROG_GCJ): Use _AM_DEPENDENCIES(GCJ).
+       * m4/depend.m4: Document `GCJ'.
+
+       For PR automake/224:
+       * tests/Makefile.am (TESTS): Added pr224.test.
+       * tests/pr224.test: New file.
+       * lib/depcomp: Fixed computation of depfile.
+       * lib/am/depend2.am: Use %DEPBASE%, not $(DEPDIR).
+       * automake.in (handle_single_transform_list): Only reject `..'
+       component for Java.  Put dependencies in directory near object.
+       (handle_languages): Set DEPBASE.  Handle de-ansi-fication.
+
+2002-01-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs: Export AUTOMAKE and ACLOCAL.
+
+2002-01-19  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/204:
+       * tests/pr204.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * automake.in (handle_single_transform_list): Don't distribute
+       sources derived from non-distributed sources.
+
+2002-01-18  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/229:
+       * tests/pr229.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * automake.in (scan_one_autoconf_file): Recognize AC_CYGWIN,
+       AC_EMXOS2, and AC_MINGW32.
+
+2002-01-18  Tom Tromey  <address@hidden>
+
+       * tests/cond7.test: Fix test bug exposed by copyright update.
+
+       For PR automake/288:
+       * automake.in (lang_c_rewrite): Don't prepend directory to base if
+       directory is `.'.  Also, properly compute de_ansi_files entry in
+       subdir-objects case
+       * tests/Makefile.am (TESTS): Added ansi7.test.
+       * tests/ansi7.test: New file.
+
+       * aclocal.in (parse_arguments): Added 2002.
+       (write_aclocal): Likewise.
+       (parse_arguments): Updated my email address.
+       * automake.in (gen_copyright): Added 2002.
+       (version): Likewise.  Also, changed my email address.
+
+       * configure.in (APIVERSION): Refined definition.
+
+2002-01-18  Tom Tromey  <address@hidden>
+
+       * missing: Updated.
+       * lib/missing: Accept versioned aclocal.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal.
+
+2002-01-17  Pavel Roskin  <address@hidden>
+
+       * m4/Makefile.am (m4datadir): Use APIVERSION.
+
+2002-01-16  Tom Tromey  <address@hidden>
+
+       * Makefile.am (install-exec-hook): Use APIVERSION.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
+       APIVERSION.
+       * automake.in (perllibdir): Use APIVERSION.
+       (libdir): Likewise.
+       * aclocal.in (perllibdir): Use APIVERSION.
+       (APIVERSION): New global.
+       (parse_arguments): Use APIVERSION.
+       * configure.in (APIVERSION): New subst.
+       (pkgvdatadir): Use APIVERSION.
+
+2002-01-15  Tom Tromey  <address@hidden>
+
+       * missing: Updated.
+       * lib/missing: Match against `automake*' to pick up versioned
+       automake.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use versioned automake name.
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__version
+       variable.
+       * lib/am/Makefile.am (amdir): Use pkgvdatadir.
+       * lib/Makefile.am (dist_pkgvdata_DATA): Renamed to use
+       pkgvdatadir.
+       (scriptdir): Use pkgvdatadir.
+       (installcheck-local): Likewise.
+       * lib/Automake/Makefile.am (perllibdir): Use pkgvdatadir.
+       * automake.in (perllibdir): Added VERSION.
+       (libdir): Likewise.
+       * aclocal.in (parse_arguments): Search versioned directory.  Don't
+       push unversioned directory unless it exists.
+       (perllibdir): Added VERSION.
+       (default_acdir): New global.
+       * m4/Makefile.am (m4datadir): Added $(VERSION).
+       * Makefile.am (install-exec-hook): New target.
+       * configure.in (ACLOCAL): Search build directory.
+       (pkgvdatadir): New subst.
+
+2002-01-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.sub, lib/config.guess: New versions from FSF.
+
+2002-01-13  Tom Tromey  <address@hidden>
+
+       For PR automake/288:
+       * automake.in (lang_c_rewrite): Set value for de_ansi_files entry
+       to directory.
+       (lang_c_finish): Likewise.  Also, use directory information from
+       de_ansi_files.
+
+2002-01-13  Kevin Ryde  <address@hidden>
+
+       For PR automake/288:
+       * tests/Makefile.am (TESTS): Added ansi6.test.
+       * tests/ansi6.test: New file.
+
+2002-01-13  Tom Tromey  <address@hidden>
+
+       For PR automake/287:
+       * lib/am/distdir.am (distdir): Use `$$list' trick when looping
+       over subdirs.
+       * tests/Makefile.am (TESTS): Added pr287.test.
+       * tests/pr287.test: New file.
+
+2002-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distdir): Handle subdirectories.
+       * tests/extra6.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2002-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/extra2.test: Run $ACLOCAL.
+
+2002-01-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from
+       AM_INIT_AUTOMAKE arguments when using the old-style call.
+       Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
+       Suggested by Pavel Roskin.
+
+2002-01-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * test/nodefine.test, test/nodefine2.test: Check that no-define
+       works, not the contrary...
+       * m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): A third argument implies no-define,
+       not the contrary.
+
+2002-01-12  Jim Meyering  <address@hidden>
+
+       * automake.in (scan_one_autoconf_file): Unquote AC_LIBOBJ argument.
+       * tests/libobj11.test: New file.
+       * tests/Makefile.am (TESTS): Add libobj11.test.
+
+2002-01-09  Ryan T. Sammartino  <address@hidden>
+
+       * lib/depcomp (msvisualcpp): Strip -Gm, -Gi, and -ZI options.
+
+2002-01-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (file_contents_internal): Introduce two variables,
+       $is_rule and $discard_rules to track rules spanning across multiple
+       paragraphs.  This fixes a very nasty bug reported by Dmitry Mikhin
+       where only the first paragraph of such a multi-paragraph rule was
+       discarded; but it leaves many similar latent bugs (see the FIXMEs).
+
+2002-01-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/dup3.test: Remove all -I from $ACLOCAL before using it.
+       * tests/error.test: Use some macro names which are not defined by
+       Automake itself.
+
+2002-01-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Complete, Macros, Options): Document the new style
+       AM_INIT_AUTOMAKE.  Remove AM_AUTOMAKE_OPTIONS documentaion.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Get PACKAGE and VERSION from
+       AC_INIT if they are available there.  Support a new call form
+       where the only argument is an optional space-separated list of
+       Automake options.
+       * m4/options.m4 (AM_AUTOMAKE_OPTIONS): Remove.
+       (_AM_MANGLE_OPTION, _AM_SET_OPTION, _AM_SET_OPTIONS,
+       _AM_IF_OPTION): New functions.
+       * automake.in (AC_INIT_PATTERN): New variable.
+       (global_options_line): Remove, use $seen_init_automake instead.
+       (scan_one_autoconf_file, scan_autoconf_traces): Set $package_version
+       from AC_INIT if available.  Support the new style AM_INIT_AUTOMAKE.
+       Remove the AM_AUTOMAKE_OPTIONS handling.
+       * configure.in: Modernize.
+       * tests/defs (configure.in): Modernize.  One third of the tests
+       still overwrite the default configure.in and use an old
+       AM_INIT_AUTOMAKE call,  so that makes testing for both.
+       * tests/nodefine.test, tests/nodefine2.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2002-01-08  Raja R Harinath  <address@hidden>
+
+       * automake.in (define_configure_variable): Propagate line numbers.
+
+2002-01-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.2.
+
+2002-01-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in: Run the Autoconf test in a subdirectory, then
+       erase this directory.
+
+2002-01-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in (AUTOMAKE): Create m4/amversion.m4.
+       * m4/amversion.in: New file.
+       * m4/Makefile.am (m4data_DATA, EXTRA_DIST): Replace by ...
+       (dist_m4data_DATA): ... this.
+       (nodist_m4data_DATA, DISTCLEANFILES): Add amversion.m4.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require
+       AM_SET_CURRENT_AUTOMAKE_VERSION.
+       * automake.in (seen_automake_version): New variable.
+       (scan_autoconf_traces, scan_one_autoconf_file,
+       scan_autoconf_files): Scan for AM_AUTOMAKE_VERSION and complain
+       when the version used in aclocal.m4 differs from Automake's.
+       * tests/defs (ACLOCAL): Look in ../m4 too.
+       * tests/installsh.test (ACLOCAL): Likewise.
+       * tests/installdir.test (installdirs-local): Run $ACLOCAL.
+
+2002-01-06  Raja R Harinath  <address@hidden>
+
+       * automake.in (handle_languages): Emit an automake
+       internal variable 'am__depfiles_maybe'.
+       * lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe.
+
+       * lib/am/configure.am (%MAKEFILE%): Pass `depfiles' to
+       config.status.
+
+2002-01-06  Tom Tromey  <address@hidden>
+
+       * automake.texi (Tags): Document new variables.
+       * lib/am/tags.am (ETAGS): New macro.
+       (ETAGSFLAGS): Likewise.
+       (TAGS): Use them.
+
+2002-01-04  Tom Tromey  <address@hidden>
+
+       * configure.in (ACLOCAL): Set perllibdir.  From Nicolas Joly.
+
+2002-01-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (read_am_file): Thinko in "comment following
+       trailing backslash" detection.
+       * tests/comment5.test: Test for this too.
+
+2002-01-02  Tom Tromey  <address@hidden>
+
+       * automake.texi (Extending): Added index for uninstall-hook.
+
+2002-01-02  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/278:
+       * m4/python.m4 (AM_PYTHON_CHECK_VERSION): Use `sys.hexversion' to cope
+       with versions such as '2.2c1'.  Also, use `int' instead of the
+       obsoleted `string.atoi'.
+       Reported by Enrico Scholz.
+
+2002-01-02  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/280:
+       * automake.in (read_am_file): Warn about trailing backslashes
+       in comments.
+       * tests/comment5.test: New file.
+       * tests/Makefile.am (TESTS): Add comment5.test.
+       Reported by Enrico Scholz.
+
+2002-01-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/comment4.test: New file.
+       * tests/Makefile.am (TESTS): Add comment4.test.
+
+       Fix for comment4.test:
+       * automake.in (read_am_file): Output leading comments only when
+       encountering white lines.
+
+2002-01-01  Tom Tromey  <address@hidden>
+
+       For PR automake/234:
+       * tests/Makefile.am (TESTS): Added strip.test.
+       * tests/strip.test: New file.
+
+       * automake.texi (Extending): Mention uninstall-hook.
+       (Install): Likewise.
+       * automake.in (handle_factored_dependencies): Allow
+       uninstall-hook.
+
+2002-01-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/install.am (install-strip): Set INSTALL_STRIP_FLAG=-s,
+       it is needed by install-%DIR%LTLIBRARIES in ltlib.am.
+       This fixes a bug introduced on 2001-01-28.
+       Reported by Jared Davis.
+
+-----
+
+Copyright (C) 2002-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.03 b/old/ChangeLog.03
new file mode 100644
index 0000000..b7e8c6a
--- /dev/null
+++ b/old/ChangeLog.03
@@ -0,0 +1,2971 @@
+2003-12-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (generate_makefile): Update misleading comment.
+
+       * automake.in (handle_languages): Define %DEPBASE% conditionally
+       on subdir-objects.  Define SUBDIROBJ.  Do not clean *_.c files
+       here ...
+       (lang_c_finish): ... do it here.
+       (handle_single_transform_list): Do not output specific rules for
+       subdir-objects files which are not renamed.  This should reduce
+       the size of Makefiles with lots of subdirectory sources.
+       * lib/depcomp: Simplify computation of dependency output, and use
+       DEPDIR.
+       * lib/am/depend2.am (%EXT%.o, %EXT%.obj, %EXT%.lo): Adjust call
+       to depcomp.  Compute depbase on-the-fly in generic fastdep rules
+       for subdir-objects.
+       * tests/ansi9.test: Do not grep for an explicit rule that
+       we no longer expect.  Really run $MAKE to make sure the chain
+       of rules works.
+       * tests/yacc5.test: Do not grep for an explicit rule that
+       we no longer expect.  Adjust to use set -e.
+
+2003-12-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (@common_files): Move configure, configure.ac, and
+       configure.in ...
+       (@common_sometimes): ... here so that these files do not appear
+       twice in DIST_COMMON.
+
+       * automake.in (maybe_push_required_file): Add $(srcdir) in front
+       a required files outside the current directory or its subdirectories.
+       * lib/am/distdir.am (distdir): Update comment.
+       Report from Nicolas Joly.
+
+2003-12-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (@copying): Do not repeat the version.
+       (Top): Use @insertcopying.  Add a @detailmenu, this works around
+       Emacs 21's inability to lookup indices in sub-nodes (reported
+       by Kevin Ryde).
+       (C++ Support, Assembly Support, Fortran 77 Support, Java Support,
+       Support for Other Languages, Preprocessing Fortran 77, Compiling
+       Fortran 77 Files, Mixing Fortran 77 With C and C++, How the Linker
+       is Chosen): Add missing descriptions in menus.
+       (Fortran 77 and Autoconf): Remove, this node was just saying "use
+       Autoconf 2.53 or greater".
+
+2003-12-26  Santiago Vila  <address@hidden>  (tiny change)
+
+       * NEWS: s/Gettext 1.12.1/Gettext 0.12.1/
+
+2003-12-25  Nicolas Joly  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Conditional Sources): Typo.
+
+2003-12-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Config.in: Require Exporter.
+       Report from Kevin Ryde (failure with Perl 5.005_03).
+
+2003-12-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/aclocal6.test: Check for autom4te.cache only if it has
+       been created.
+       * tests/maintclean.test: Update comment.
+       Report from Bruno Haible.
+
+       * tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
+       Require texi2dvi-o.
+       Report from Václav Haisman.
+
+2003-12-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.8a.
+
+       * configure.ac, NEWS: Bump version to 1.8.
+
+       * lib/texinfo.tex: New upstream version.
+
+       * Makefile.am (INSTALL): Copy the source from $(srcdir).
+
+2003-12-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Rule.pm (define): Remove debugging traces.
+       Report from Akim Demaille.
+
+2003-12-09  Ralf Wildenhues  <address@hidden>  (tiny change)
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (do_subst): Fix the substitution of @address@hidden
+       (automake, aclocal): Create the output atomically and make it
+       read-only, as done in the Autoconf package.
+       * lib/Automake/Makefile.am (do_subst): Fix the substitution of
+       @address@hidden
+       (Config.pm): Create the output atomically and make it read-only.
+       * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Substitute
+       @configure_input@ and make the output read-only.
+       * lib/Automake/Config.in, m4/amversion.in, tests/aclocal.in,
+       tests/automake.in, tests/defs.in: Add a @configure_input@ line.
+
+2003-12-09  Ralf Wildenhues  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Local Macros, CVS): Typos.
+
+2003-12-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (hook): Use $$ as prototype, not $\&.
+       Perl 5.6.0 will not accept a reference sub reference for the
+       latter.
+       * automake.in (var_SUFFIXES_trigger): Adjust registration via
+       Automake::Variable::hook.
+       (handle_texinfo_helper): Make sure `inner_expand => 1' appears
+       on one line, so that Perl 5.6.0 does not complain about
+       inner_expand being a bare identifier.
+
+2003-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (check_acinclude, scan_file): Output `warning:' in
+       front of warnings.
+       Report from Pavel Roskin.
+
+2003-12-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * TODO: Remove some old entries.
+
+       * doc/automake.texi (Rebuilding): Document CONFIGURE_DEPENDENCIES
+       and CONFIG_STATUS_DEPENDENCIES.  Move this sections later
+       in the manual since it's pretty advanced material.
+
+       * automake.in ($config_header_location): Remove.  Use
+       %ac_config_files_location instead.
+       (rewrite_inputs_into_dependencies): Do not prepend $(top_builddir)/
+       at the top-level.
+       (handle_configure): Use rewrite_inputs_into_dependencies to
+       distribute and compute AC_CONFIG_HEADERS dependencies.
+       (scan_autoconf_traces) <AC_CONFIG_HEADERS>: Fill
+       %ac_config_files_location.
+       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Rename as ...
+       (%CONFIG_HIN%): ... this.  $(srcdir) is already added in
+       scan_autoconf_traces.
+       * tests/Makefile.am (TESTS): Add confh5.test.
+       * tests/confh5.test: New file.
+
+       * tests/ltlibsrc.test: Fix the zoo_d_old2_la.c rule in Makefile.am,
+       $< is not portable and the source is in $(srcdir).
+
+2003-12-03  Paolo Bonzini  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_configure): Do not require link sources if
+       they contain a dollar, or if they were built.  Likewise, do not
+       clean link destination if they contain a dollar.
+       (scan_autoconf_traces) <AC_CONFIG_LINKS>: Populate
+       %ac_config_files_location with link destinations.  Do not
+       store locations in @config_links, now that %ac_config_files_location
+       have them.
+       * tests/conflnk3.test: New file.
+       * tests/Makefile.am (TESTS): Add conflnk3.test.
+
+2003-12-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.7i.
+
+       * configure.ac, NEWS: Bump version to 1.7h.
+
+       * doc/automake.texi (Default _SOURCES): Fix reference to true.
+
+       * lib/texinfo.tex: New upstream version.
+
+2003-11-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_source_transform): If it's present, use
+       libfoo_la.c instead of libfoo.c as the default source of
+       libfoo.la, and issue an -Wobsolete diagnostic.  Do not be
+       greedy in the suffix replacement regex.
+       * doc/automake.texi (Default _SOURCES): New node.
+       (Program Sources, Libtool Modules): Refer to it.
+       * tests/ltlibsrc.test: Update to check for old default source files.
+
+2003-11-30  Gary V. Vaughan  <address@hidden>
+
+       * automake.in (&handle_source_transform): Calculate a default file
+       for use in the absence of an appropriate _SOURCES declaration by
+       first stripping any suffix from the unxformed target name, and
+       appending `.c'.
+       * doc/automake.texi (Program Sources, Libtool Modules): Document this.
+       * tests/ltlibsrc.test: New file.
+       * tests/Makefile.am (TESTS): Add ltlibsrc.test.
+
+2003-11-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (loc_and_value_as_list_recursive,
+       _value_as_list_recursive_worker): Merge into ...
+       (value_as_list_recursive): ... this function.  Pass options
+       as a hash argument, and use the `location' option to trigger
+       the behavior of loc_and_value_as_list_recursive.
+       (traverse_recursively, transform_variable_recursively): Take
+       options as a %options argument.
+       (_do_recursive_traversal): Perform expansion of inner variables
+       (as in `$(FILE).ext') on request.
+       * automake.in (handle_options, check_libobjs_sources)
+       (handle_source_transform, handle_LIBOBJS, handle_ltlibraries)
+       (handle_ltlibraries, handle_man_pages, handle_dist)
+       (handle_gettext, am_install_var): Adjust usage of
+       value_as_list_recursive.
+       (handle_texinfo_helper): Pass inner_expand to
+       value_as_list_recursive.
+       * tests/txinfo28.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo28.test.
+       Report from Ralf Corsepius.
+
+       * lib/Automake/Variable.pm (_do_recursive_traversal): Do not
+       update @_substfroms and @_substfroms for undefined variables.
+       * tests/substre2.test: New file.
+       * tests/Makefile.am (TESTS): Add substre2.test.
+
+       * lib/Automake/VarDef.pm (value): Rename as ...
+       (raw_value): ... this.
+       (value): New method, strip # and \\\n.
+       (dump): Use raw_value.
+       * lib/Automake/Variable.pm (output): Use raw_value.
+       (value_as_list): Simplify, now that backslash and comments
+       are already removed.
+       * tests/txinfo22.test: Make sure Automake isn't confused
+       by comments in variables.
+
+2003-11-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi: More target vs. rule editing.  Back out some
+       of the previous changes.  It's OK to talk about targets as "entry
+       points", or as thing to build, but targets cannot be run: rules
+       are run.
+
+       * doc/automake.texi: s/target/rule/ where appropriate.  A target
+       is the destination of a target rule, not the rule itself.
+       Suggested by Bruno Haible.
+
+2003-11-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.7g.
+
+       * configure.ac, NEWS: Bump version to 1.7f.
+
+       * automake.in (prepend_srcdir): Parenthesize @inputs to remove
+       a maintainer-check warning.
+       * tests/subst2.test: Rewrite the $MAKE invocation to please
+       maintainer-check.
+
+       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream
+       versions.
+
+       * doc/automake.texi (Program variables): Mention per-target
+       _CPPFLAGS in the documentation of INCLUDES.
+       * automake.in (generate_makefile): Likewise in the INCLUDES diagnostic.
+       Report from Bob Friesenhahn.
+
+       * doc/automake.texi (Extending): Elaborate on overriding.
+       * NEWS: Likewise.
+       Suggested by Bruno Haible.
+
+2003-11-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (output): Add $(am__empty) to variable
+       definitions that end with a line full of @substitutions@ that
+       would confuse HP-UX Make if it were blank.
+       (transform_variable_recursively): Make sure not to erase empty
+       variables.
+       * tests/Makefile.am (TESTS): Add subst2.test.
+       * tests/subst2.test: New file.
+       Report from Harlan Stenn.
+
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Work around a
+       Texinfo 4.1 bug.
+       Report from Dalibor Topic.
+
+2003-11-22  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/411:
+       * automake.in (rewrite_inputs_into_dependencies): Simplify, and rename
+       into ...
+       (prepend_srcdir): ... this.
+       (rewrite_inputs_into_dependencies): New function, extracted from ...
+       (handle_configure): ... here.  Adjust to use prepend_srcdir
+       or rewrite_inputs_into_dependencies where needed.  Especially,
+       using (the new) rewrite_inputs_into_dependencies to compute
+       Makefile dependencies will fix PR/411.
+       * lib/am/configure.am (DIST_COMMON): Remove %MAKEFILE-IN%, it's
+       already distributed by rewrite_inputs_into_dependencies.
+       * tests/Makefile.am (TESTS): Add output10.test, remove distcom.test.
+       * tests/colon3.test: Use set -e.  Don't allow any AUTOMAKE
+       invocation refer to zardoz.  Make sure two.in and three.in
+       appear as $(srcdir)/two.in and $(srcdir)/three.in dependencies.
+       * tests/distcom.test: Delete.  This is covered by tests/output9.test.
+       * tests/output10.test: New file, for PR/411.
+
+2003-11-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (append_exeext): Do not append $(EXEEXT) to
+       @address@hidden
+       * tests/exeext4.test: New file.
+       * tests/Makefile.am (TESTS): Add exeext4.test.
+
+2003-11-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/configure.am (%MAKEFILE%): Remove %MAINTAINER-MODE%,
+       mistakenly added on 2001-03-05.
+       * tests/remake5.test: New file.
+       * tests/Makefile.am (TESTS): Add remake5.test.
+       Report from Ralf Corsepius.
+
+2003-11-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.7e.
+
+       * configure.ac, NEWS: Bump version to 1.7d.
+
+       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New
+       upstream versions.
+
+2003-11-18  Maciej W. Rozycki  <address@hidden>  (tiny change)
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texinfos.am (install-info): Depend on
+       install-info-recursive or install-info-am even if no-installinfo.
+       * tests/txinfo27.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo26.test.
+
+2003-11-18  Paolo Bonzini  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/ylwrap: Do not overwrite headers if they haven't changed.
+       Fix the include guard substitution.
+       * tests/yacc6.test: Augment to run ylwrap, and make sure it
+       does not needlessly update headers.
+       * tests/yacc8.test: Make sure headers are not needlessly updated
+       with ylwrap is not used.  Move `test -f foo.o' into the
+       Makefile as `test -f foo.$(OBJEXT)' for portability.
+
+2003-11-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (generate_makefile): Define SUBDIRS if it is
+       not defined and DIST_SUBDIRS is.
+       * tests/subpkg2.test: New file.
+       * tests/Makefile.am (TESTS): Add subpkg2.test.
+       Report from Gary V. Vaughan.
+
+       * tests/suffix11.test: Check for suffixes containing `-'.
+       * lib/Automake/Rule.pm ($_SUFFIX_RULE_PATTERN): Accept `-' in
+       suffixes.
+
+       * lib/Automake/Rule.pm (define): Suggest using target-local instead
+       of target-am, not target-am-local.
+       * tests/overrid.test: Check the diagnostic for clean-am.
+       Report from Bruno Haible.
+
+2003-11-17  Jim Meyering  <address@hidden>
+
+       * bootstrap: Require not only that `perl' have the executable
+       bit set, but also that it is not a directory.
+
+       * lib/am/configure.am: Mark %MAKEFILE% as `.PRECIOUS'.
+
+2003-11-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (ac_config_files_location): Declare as a hash.
+       (handle_configure): Rewrite the computation of AC_CONFIG_FILES
+       dependencies; make sure we don't use $(srcdir) or $(top_srcdir)
+       for inputs which are also outputs, and do not check inputs
+       relatively to the current directory.
+       (scan_autoconf_config_files): Take $where as argument, and
+       fill $ac_config_files_location.
+       * tests/output8.test, tests/output9.test: New files.
+       * tests/Makefile.am (TESTS): Add output8.test and output9.test.
+       Report from Bruno Haible.
+
+2003-11-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/aclibobj.test, tests/aclocal.test, tests/aclocal3.test,
+       tests/acoutbs.test, tests/acoutbs2.test, tests/acoutnoq.test,
+       tests/acoutpt.test, tests/acoutpt2.test, tests/acoutqnl.test,
+       tests/acsilent.test, tests/acsubst.test, tests/acsubst2.test,
+       tests/all.test, tests/alpha.test, tests/amassign.test,
+       tests/ammissing.test, tests/ansi.test, tests/ansi10.test,
+       tests/ansi2.test, tests/ansi3.test, tests/ansi3b.test,
+       tests/ansi4.test, tests/ansi5.test, tests/ansi6.test,
+       tests/ansi7.test, tests/ansi9.test, tests/ar.test,
+       tests/autohdr.test, tests/autohdr2.test, tests/auxdir.test,
+       tests/auxdir2.test, tests/backsl.test, tests/backsl2.test,
+       tests/badprog.test, tests/block.test, tests/canon2.test,
+       tests/canon3.test, tests/canon4.test, tests/canon5.test,
+       tests/ccnoco.test, tests/check.test, tests/check2.test,
+       tests/check3.test, tests/checkall.test, tests/clean.test,
+       tests/colneq2.test, tests/colon.test, tests/colon2.test,
+       tests/colon3.test, tests/colon4.test, tests/colon5.test,
+       tests/colon6.test, tests/colon7.test, tests/comment.test,
+       tests/comment2.test, tests/comment4.test, tests/comment6.test,
+       tests/comment7.test, tests/compile_f_c_cxx.test, tests/cond.test,
+       tests/cond10.test, tests/cond11.test, tests/cond13.test,
+       tests/cond14.test, tests/cond15.test, tests/cond16.test,
+       tests/cond17.test, tests/cond18.test, tests/cond19.test,
+       tests/cond21.test, tests/cond22.test, tests/cond25.test,
+       tests/cond26.test, tests/cond28.test, tests/cond3.test,
+       tests/cond4.test, tests/cond5.test, tests/cond6.test,
+       tests/cond7.test, tests/cond8.test, tests/cond9.test,
+       tests/condd.test, tests/condinc.test, tests/condlib.test,
+       tests/condman.test, tests/condman2.test, tests/conf2.test,
+       tests/confdeps.test, tests/confh.test, tests/confh4.test,
+       tests/config.test, tests/confincl.test, tests/conflnk.test,
+       tests/conflnk2.test, tests/confsub.test, tests/confvar.test,
+       tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
+       tests/cxx.test, tests/cxxansi.test, tests/cxxcpp.test,
+       tests/cxxlibobj.test, tests/cxxlink.test, tests/cxxnoc.test,
+       tests/cxxo.test, tests/cygwin32.test, tests/dash.test,
+       tests/defun.test, tests/defun2.test, tests/dejagnu.test,
+       tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
+       tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
+       tests/depcomp.test, tests/depcomp2.test, tests/depcomp4.test,
+       tests/depdist.test, tests/depend.test, tests/depend2.test,
+       tests/depend3.test, tests/depend4.test, tests/destdir.test,
+       tests/dirlist.test, tests/discover.test, tests/distcom.test,
+       tests/distcom2.test, tests/distdir.test, tests/distname.test,
+       tests/dollar.test, tests/double.test, tests/dup2.test,
+       tests/empty.test, tests/empty2.test, tests/empty3.test,
+       tests/empty4.test, tests/error.test, tests/exdir.test,
+       tests/exeext.test, tests/exeext3.test, tests/exsource.test,
+       tests/ext.test, tests/ext2.test, tests/extra.test,
+       tests/extra2.test, tests/extra3.test, tests/extra4.test,
+       tests/extra5.test, tests/extra6.test, tests/extra7.test,
+       tests/flibs.test, tests/fnoc.test, tests/fo.test,
+       tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
+       tests/fpinstall.test, tests/gcj.test, tests/gcj3.test,
+       tests/gcj4.test, tests/gnits2.test, tests/gnits3.test,
+       tests/header.test, tests/implicit.test, tests/include.test,
+       tests/include2.test, tests/info.test, tests/insh2.test,
+       tests/install2.test, tests/installdir.test, tests/instdat.test,
+       tests/instdat2.test, tests/instexec.test, tests/insthook.test,
+       tests/instman.test, tests/instman2.test, tests/instsh.test,
+       tests/instsh2.test, tests/interp.test, tests/interp2.test,
+       tests/java.test, tests/java2.test, tests/javaprim.test,
+       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
+       tests/lex.test, tests/lex3.test, tests/lex4.test, tests/lex5.test,
+       tests/libobj11.test, tests/libobj2.test, tests/libobj4.test,
+       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
+       tests/library.test, tests/libtool.test, tests/libtool2.test,
+       tests/libtool3.test, tests/libtool5.test, tests/link_c_cxx.test,
+       tests/link_dist.test, tests/link_f_only.test, tests/link_fc.test,
+       tests/link_fccxx.test, tests/link_fcxx.test, tests/lisp.test,
+       tests/listval.test, tests/ltdeps.test, tests/ltlibobjs.test,
+       tests/maintclean.test, tests/make.test, tests/makej.test,
+       tests/makevars.test, tests/man.test, tests/man2.test,
+       tests/mclean.test, tests/mdate.test, tests/mdate2.test,
+       tests/mdate3.test, tests/mdate4.test, tests/mkinst2.test,
+       tests/mkinstall.test, tests/nobase.test, tests/nodef.test,
+       tests/nodef2.test, tests/nodep.test, tests/nodepcomp.test,
+       tests/nodist.test, tests/nodist2.test, tests/nodist3.test,
+       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
+       tests/nostdinc.test, tests/number.test, tests/obsolete.test,
+       tests/order.test, tests/outdir.test, tests/output.test,
+       tests/output2.test, tests/output3.test, tests/output4.test,
+       tests/parse.test, tests/phony.test, tests/pluseq.test,
+       tests/pluseq10.test, tests/pluseq2.test, tests/pluseq3.test,
+       tests/pluseq4.test, tests/pluseq6.test, tests/pluseq8.test,
+       tests/postproc.test, tests/ppf77.test, tests/pr2.test,
+       tests/pr204.test, tests/pr220.test, tests/pr224.test,
+       tests/pr229.test, tests/pr243.test, tests/pr266.test,
+       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
+       tests/pr300-lib.test, tests/pr300-ltlib.test,
+       tests/pr300-prog.test, tests/pr307.test, tests/pr72.test,
+       tests/pr87.test, tests/pr9.test, tests/prefix.test,
+       tests/proginst.test, tests/python.test, tests/python3.test,
+       tests/python4.test, tests/python5.test, tests/python6.test,
+       tests/python7.test, tests/python8.test, tests/python9.test,
+       tests/recurs2.test, tests/remake.test, tests/remake2.test,
+       tests/remake3.test, tests/req.test, tests/reqd.test,
+       tests/rulepat.test, tests/scripts.test, tests/sinclude.test,
+       tests/space.test, tests/specflg3.test, tests/specflg6.test,
+       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
+       tests/spell3.test, tests/spelling.test, tests/spy.test,
+       tests/stamph2.test, tests/stdlib2.test, tests/strip.test,
+       tests/subcond.test, tests/subcond2.test, tests/subcond3.test,
+       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
+       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
+       tests/subdirbuiltsources.test, tests/subobj.test,
+       tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
+       tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
+       tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
+       tests/subpkg.test, tests/subst.test, tests/substref.test,
+       tests/suffix.test, tests/suffix10.test, tests/suffix2.test,
+       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
+       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
+       tests/suffix9.test, tests/symlink2.test, tests/symlink3.test,
+       tests/tags.test, tests/tagsub.test, tests/target-cflags.test,
+       tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
+       tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
+       tests/txinfo18.test, tests/txinfo2.test, tests/txinfo23.test,
+       tests/txinfo24.test, tests/txinfo25.test, tests/txinfo26.test,
+       tests/txinfo3.test, tests/txinfo5.test, tests/txinfo6.test,
+       tests/txinfo7.test, tests/txinfo8.test, tests/txinfo9.test,
+       tests/unused.test, tests/vars.test, tests/vars3.test,
+       tests/vartar.test, tests/version.test, tests/version2.test,
+       tests/version4.test, tests/version6.test, tests/version7.test,
+       tests/vpath.test, tests/vtexi.test, tests/vtexi2.test,
+       tests/werror.test, tests/whoami.test, tests/yacc.test,
+       tests/yacc3.test, tests/yacc4.test, tests/yacc5.test,
+       tests/yacc6.test, tests/yacc7.test, tests/yacc8.test,
+       tests/yaccpp.test, tests/yaccvpath.test: Fix license to refer
+       to Automake, not autoconf.
+
+       Fix for PR automake/408:
+       * lib/am/texinfos.am (install-info-am): Strip any $(srcdir)/ prefix
+       from $file, as already done for dist-info.
+       * tests/Makefile.am (TESTS): Add txinfo26.test.
+       * tests/txinfo26.test: New file.
+       Report from Nicholas Wourms.
+
+2003-11-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
+       running AC_CHECK_PROGS(EMACS).
+       * lib/am/lisp.am (elc-stamp): Quote $(EMACS).
+       Report from Jens Petersen.
+
+       * tests/mkinst2.test: Rewrite.
+
+       * m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.
+
+2003-11-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Honor sinclude.
+       * tests/sinclude.test: Check for sinclude.
+       Report from Roberto Bagnara.
+
+2003-11-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'
+       already build the tarballs.  Commit files right before tagging.
+       Check NEWS before running distcheck.
+
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Missing cosmetic space.
+
+       * configure.ac, NEWS: Bump version to 1.7c.
+
+       * configure.ac, NEWS: Bump version to 1.7b.
+       * Makefile.am (maintainer-check): Ignore comments while
+       scanning for rm without -f.
+
+       * Makefile.am (fetch): Get all files from savannah.  Do not
+       postprocess Struct.pm and XFiles.pm, since we now are the master
+       of these.
+       * lib/config.sub, lib/config.guess, lib/config-ml.in,
+       lib/texinfo.tex: New upstream versions.
+
+       * configure.ac: Check that autoconf is installed, that it works,
+       and that it is recent enough in three steps, not one.
+
+       * NEWS: Minor edits.
+
+       * lib/Makefile.am (dist_script_DATA): Move config-ml.in ...
+       (dist_pkgvdata_DATA): ... here.
+
+       * tests/spy.test: Document overlapping ::-rules incompatibilities,
+       and check only non-overlapping ::-rules.
+
+       * doc/automake.texi (Texinfo): Define MAKEINFO, MAKEINFOHTML,
+       MAKEINFOFLAGS, AM_MAKEINFOFLAGS, AM_MAKEINFOHTMLFLAGS, TEXI2DVI,
+       TEXI2PDF, DVIPS, and TEXINFO_TEX in a table.
+       (Uniform): Do not speak of missing HTML support, this is
+       confusing.
+       * lib/Automake/Variable.pm (_silent_variable_override): Add
+       AM_MAKEINFOHTMLFLAGS.
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Use MAKEINFOHTML and
+       AM_MAKEINFOHTMLFLAGS instead of MAKEINFO and AM_MAKEINFOFLAGS.
+       * lib/am/texinfos.am (MAKEINFOHTML, AM_MAKEINFOHTMLFLAGS): Define.
+       * tests/txinfo21.test: Add a test with AM_MAKEINFOHTMLFLAGS.
+
+2003-11-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/spy.test: New file.
+       * tests/Makefile.am (TESTS): Add spy.test.
+
+       * automake.in (handle_configure): Distribute and define mkinstalldirs
+       only if it is already present in the package.
+       (scan_autoconf_files): Do not require mkinstalldirs.
+       (require_build_directory): Use $(mkdir_p), not $(mkinstalldirs).
+       * lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
+       lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/mans.am,
+       lib/am/progs.am, lib/am/python.am, lib/am/scripts.am,
+       lib/am/texinfos.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+       * m4/mkdirp.m4: New file.
+       * m4/Makefile.am (dist_m4data_DATA): Add mkdirp.m4.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Call AM_PROG_MKDIR_P.
+       * tests/Makefile.am (TESTS): Remove insh.test.
+       * tests/insh.test: Delete.
+       * tests/defs.in, tests/instsh.test: Do not install mkinstalldirs.
+       * tests/auxdir.test: Install mkinstalldirs.
+       * tests/distdir.test, tests/instman.test, tests/pr2.test: Use
+       $(mkdir_p), not $(mkinstalldirs).
+       * tests/empty.test: Run configure, do not substitute things by hand.
+       * doc/automake.texi (Optional) <AC_CONFIG_FILES>: Take install-sh
+       as an example, not mkinstalldirs.
+       (Auxiliary Programs) <mkinstalldirs>: Update.
+
+       * tests/defs.in: Handle required=bzip2.
+
+       * tests/defs.in: Export SHELL.
+       * tests/cond11.test: Missing quotes.
+       * tests/nogzip2.test: Require bzip2.
+
+2003-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS: Add news entries from 1.6.x and 1.7.x.
+
+       * automake.texi (Optional) <AC_SUBST>: Grammar fixes.
+
+       * automake.in (check_gnu_standards): Install COPYING only if
+       none of COPYING, COPYING.LIB, or COPYING.LESSER exist.  Do not
+       overwrite the license otherwise.
+       * tests/Makefile.am (TESTS): Add license.test.
+       * tests/license.test: New file.
+
+       * lib/mkinstalldirs: Mention address@hidden and
+       address@hidden
+       * lib/compile, lib/depcomp, lib/elisp-comp, lib/mdate-sh:
+       Likewise.  Also add support for --help and --version.
+       * lib/py-compile, lib/ylwrap: Likewise, and reindent.
+
+2003-11-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.
+       * lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
+       * lib/am/java.am (JAVACFLAGS): Remove.
+       * tests/dejagnu3.test: Check that the environment value
+       of RUNTESTFLAGS get passed down to runtest.
+       Suggested by Mark Mitchell.
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
+       (?GENERIC?%EXT%.lo): Do not echo compile command manually, this
+       breaks `make -s'.  Instead, fold the compile command on two lines,
+       so that it take less space on the display.
+       Suggested by Karl Berry and William Fulton.
+
+       * lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%): Rename as ...
+       (%DEST_INFO_PREFIX%%DEST_SUFFIX%): ... this, and honor ?INSRC?
+       to select $(srcdir) or `.' builds.
+       (INFO_DEPS): Define here.
+       * lib/am/texinfos.am (dist-info): Strip filename starting with
+       "$(srcdir)/".
+       * automake.in (output_texinfo_build_rules): Take a new argument
+       $insrc, and adjust substitutions in 'texibuild'.
+       (handle_texinfo_helper): Compute a regex of all user-cleaned
+       files, and use this to select whether to build .info files in `.'
+       or $(srcdir).  Give an account of the $(srcdir) vs `.' debacle.
+       Alway build the version.texi and stamp files in $(srcdir).  Do not
+       define INFO_DEPS.
+       * tests/Makefile.am (TESTS): Add txinfo23.test, txinfo24.test,
+       and txinfo25.test.
+       * tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test:
+       New files.
+       * tests/txinfo13.test, tests/txinfo16.test, tests/txinfo3.test,
+       tests/vtexi.test: Adjust to new rules.
+
+2003-11-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.58.
+       * configure.ac: Require Autoconf 2.58a, and check for 2.58.
+
+2003-10-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Erase %STAMP%.
+       * tests/Makefile.am (TESTS): Add autohdr3.test
+       * tests/autohdr3.test: New file.
+
+       * automake.in (handle_configure): Rename am__configure_deps
+       as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
+       $configure_ac.  Define am__configure_deps as am__aclocal_m4_deps
+       + $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4).  Do not define
+       ACLOCAL_M4_DEPS while processing configure.am.
+       (make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
+       (scan_aclocal_m4): Do not distribute aclocal.m4, this
+       is done from lib/am/configure.am.
+       * lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
+       $(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
+       $(am__configure_deps) or $(am__aclocal_m4_deps).
+       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.
+
+2003-10-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Depend on
+       $(am__configure_deps).
+
+       * automake.in (handle_configure): Distribute all AC_CONFIG_HEADERS
+       sources, and without using require_file.  Define %CONFIG_H_DEPS%
+       and %FIRST_CONFIG_HIN% while processing remake-hdr.am.
+       * lib/am/remake-hdr.am (%STAMP%): Use %CONFIG_H_DEPS% instead
+       of (srcdir)/%CONFIG_HIN%.  Output the $(srcdir)/%CONFIG_HIN%
+       rule only for the first header (i.e., if %FIRST_CONFIG_HIN%).
+       * tests/autohdr4.test: New file.
+       * tests/Makefile.am (TESTS): Add autohdr4.test.
+       * tests/config.test: Do not grep, run things to see if they work.
+
+2003-10-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/output7.test: Populate sub/ with a dummy file, so that it
+       is not empty.  This fixes a failure reported by Patrick Welche.
+       * lib/am/distdir.am: Add note about tar's `-o' option and empty
+       directories.
+
+2003-10-24  Didier Cassirame  <address@hidden>  (tiny change)
+
+       * lib/ylwrap: Typo in regex.
+
+2003-10-23  Paul Eggert  <address@hidden>
+
+       * lib/Automake/XFile.pm: Don't assume -j is solo.
+       Issue a more-informative diagnostic.
+       Problems reported by Eric Sunshine.
+
+2003-10-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Always check for Emacs.
+       Always define lispdir.
+       * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Check
+       $(EMACS) to decide whether _LISP files must be installed,
+       not $(lispdir).
+       * doc/automake.texi (Emacs Lisp): Mention the two ways to install
+       non byte-compiled Emacs lisp files.
+       * tests/lisp4.test, tests/lisp5.test: Check "make install"
+       when EMACS=no.
+       Suggested by Simon Josefsson.
+
+       * NEWS: Clarify the entry about multiple conditional definitions
+       of _PROGRAMS, _LDADD, and _LIBADD.
+       Report from Simon Josefsson.
+
+       * lib/am/install.am (install-strip): Override install_sh_PROGRAM
+       too.
+       Report from Elmar Hoffmann.
+
+2003-10-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in ("MAIN", usage, parse_arguments): Move near
+       the end, so "MAIN" can use prototypes.
+       (scan_configure): Move later too, for the sake of prototypes.
+       (scan_configure_dep): Fix setting of $scanned_configure_dep.
+       (trace_used_macros): Do not take any argument.
+
+2003-10-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/stdlib2.test: Check AM_LDFLAGS alone.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+       * automake.in (handle_ltlibraries): Also grep AM_LDFLAGS for `-module'.
+       * tests/stdlib2.test: New file.
+       * tests/Makefile.am (TESTS): Add stdlib2.test.
+       Report from Kevin P. Fleming.
+
+2003-10-03  Richard Dawe  <address@hidden>  (tiny change)
+
+       * tests/defs.in: For required=runtest, check that we are using
+       a DejaGnu that supports specifying the program on the command-line.
+
+2003-10-03  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug #213524:
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Merge
+       stderr and stdout, and grep only the first line while testing
+       install-info --version's output.  This revert part of the change
+       from 2001-05-18.
+
+2003-10-01  Akim Demaille  <address@hidden>
+
+       * m4/amversion.in: Add (C) to the Copyright notice.
+
+2003-10-01  Paul Eggert  <address@hidden>
+
+       * lib/Automake/XFile.pm: Use Errno.
+       (lock): Ignore ENOLCK errors.  Problem reported Andreas Schwab in
+       <http://mail.gnu.org/archive/html/bug-autoconf/2003-09/msg00141.html>.
+
+2003-09-30  Tom Tromey  <address@hidden>
+
+       * lib/Automake/Options.pm (_process_option_list): Recognize
+       no-dist.
+       * NEWS: Update.
+       * doc/automake.texi (Options): Document no-dist.
+       * automake.in (check_cygnus): Set no-dist option.
+       (handle_dist): Recognize no-dist.
+       * tests/nodist3.test: New file.
+       * tests/Makefile.am (TESTS): Added nodist3.test.
+
+2003-09-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_clean): Take $makefile as argument, and
+       define %MAKEFILE% while processing clean.am.
+       (generate_makefile): Pass $makefile to handle_clean.
+       * lib/am/clean.am (distclean, maintainer-clean): Erase %MAKEFILE%,
+       not Makefile.
+       * tests/gnumake.test: New file.
+       * tests/Makefile.am (TESTS): Add gnumake.test.
+       Report from Braden N. McDaniel.
+
+2003-09-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Scripts): Update the example about automake.
+       Mention `dist_' for distributed scripts.
+
+       * lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
+       Suggested by Eric Sunshine.
+
+2003-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * README: More mailing lists.
+
+       * NEWS: Mention the switch to GNU FDL for the manual.
+
+2003-09-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/install-sh (src, dst): Protect names starting with `-',
+       as in mkinstalldirs.
+
+       * configure.in: Rename as ...
+       * configure.ac: ... this.
+       * README: s/configure.in/configure.ac/.
+
+       * doc/fdl.texi: New file.
+       * doc/Makefile.am (automake_TEXINFOS): New variable.
+       * doc/automake.texi (Copying This Manual): New appendix, include
+       fdl.texi.
+       (Macro and Variable Index, General Index): Move as subsections of ...
+       (Indices): This new appendix.
+
+       * doc/automake.texi: Refer to configure.ac instead of configure.in.
+
+       * automake.texi: Move ...
+       * doc/automake.texi: ... here.
+       * doc/Makefile.am: New file.
+       * configure.in: Output doc/Makefile.
+       * Makefile.am (SUBDIRS): Add doc.
+       (ETAGS_ARGS, TAGS_DEPENDENCIES): Move to doc/Makefile.am.
+
+2003-09-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (write_aclocal): Consider files with relative
+       paths as local to the project, i.e., subject to m4_include.
+       * tests/subpkg.test (ACLOCAL_AMFLAGS): Make sure m4_include
+       is also used for .m4 files in the outer project.
+
+       Support for multiple inputs in AC_CONFIG_FILES.
+       Requested long ago by Harlan Stenn.
+       * automake.in (handle_dist): Remove unused argument $makefile.
+       (handle_subdirs): Expect SUBDIRS elements in $relative_dir,
+       not $am_relative_dir.
+       (rewrite_inputs_into_dependencies): Allow $add_srcdir to
+       be a filename that must always be prefixed by $(srcdir) or
+       $(top_srcdir).
+       (handle_configure, generate_makefile): Revamp to make the
+       Makefile.am, Makefile.in, Makefile more independent.
+       (locate_am): New function.
+       (scan_configure_dep, parse_arguments): Use locate_am.
+       (MAIN): Adjust call to generate_makefile.
+       * lib/am/configure.am: Remove %MAKEFILE-IN% from the dependencies
+       of %MAKEFILE%.  %MAKEFILE-IN% is already in %MAKEFILE-DEPS%.
+       * tests/output6.test, tests/output7.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+       * automake.texi (Requirements) <AC_CONFIG_FILES>: Document how
+       multiple inputs are scanned.
+
+2003-09-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm
+       and lib/Automake/Struct.pm from Autoconf.
+       * lib/Automake/XFile.pm: Update comment, Automake is now
+       the master for this file.  Cosmetic changes.
+
+2003-09-09  Akim Demaille  <address@hidden>
+
+       * lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
+       Reported by Gary Vaughan.
+       (&find_file): Walk the @include in forward order.
+
+2003-09-09  Akim Demaille  <address@hidden>
+
+       * lib/Automake/FileUtils.pm (&update_file): Be sure not to leave
+       trailing files.
+
+2003-09-07  Alexandre Duret-Lutz  <address@hidden>
+
+       Changes to m4_included files should also cause aclocal.m4 to change.
+       * aclocal.in (m4_include_rx): New variable.
+       (scan_configure_dep): New function.
+       (scan_configure, add_file): Simplify using scan_configure_dep.
+       * tests/Makefile.am (TESTS): Add acloca13.test.
+       * tests/aclocal13.test: New file.
+
+       * tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
+       that we have fake version in the $PATH.
+
+       * aclocal.in (add_file): Remove useless filling of $output, probably
+       left a after CVS conflict.  This code is now in write_aclocal.
+
+       * aclocal.in (configure_ac): Do not call require_configure_ac
+       before parsing the options.
+       * automake.in (configure_ac): Likewise.
+       * lib/Automake/Variable.pm (configure_ac): Do not require configure.ac,
+       find it.
+       * lib/Automake/Configure_ac.pm (require_configure_ac):
+       find_configure_ac never return an undefined value, so test
+       the file's existence instead.
+       * tests/Makefile.am (TESTS): Add help.test.
+       * tests/help.test: New file.
+
+2003-09-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/XFile.pm: Update to use ChannelDefs.
+       (close): Call Automake::FileUtils::handle_exec_errors on errors.
+       * automake.in (scan_autoconf_files): Exit with $?=63 on version
+       mismatch.
+       (scan_autoconf_traces): Likewise.  Close the autoconf pipe to
+       capture abnormal exits.
+       * aclocal.in ($exit_status): Remove, and use Channels.pm's $exit_code
+       instead.
+       (trace_used_macros): Close the autom4te pipe to capture abnormal exits.
+       * lib/missing: When a tool has run and exited with $?=63, emulate
+       it.  Adjust the diagnostic and pretend the tool is tool old in this
+       case.  Use an emacs-updated "scriptversion" variable.
+       * configure.in: Output tests/aclocal-${APIVERSION} and
+       tests/automake-${APIVERSION}.
+       * tests/aclocal.in, tests/automake.in,
+       tests/missing.test, tests/missing2.test: New files.
+       * tests/defs.in (AUTOMAKE, ACLOCAL, PATH): Define
+       to use tests/aclocal-$APIVERSION and tests/automake-$APIVERSION.
+       * tests/dup3.test: Remove. alocal9.test, acloca10.test, and others are
+       already testing for this.
+       * tests/depacl2.test, tests/dup2.test, tests/order.test: Fix
+       configure.in so that aclocal works.
+       * tests/defun.test: Quote the AC_DEFUN body.
+       * tests/Makefile.am (TESTS): Add missing.test and missing2.test,
+       and remove dup3.test.
+       (check_SCRIPTS): Add aclocal and automake.
+
+       * tests/unused.test: Quote AC_DEFUN arguments.
+
+2003-09-05  Paul Eggert  <address@hidden>
+
+       * NEWS, aclocal.in, automake.in, automake.texi, lib/ansi2knr.c,
+       lib/depcomp, lib/missing, lib/py-compile,
+       lib/Automake/Channels.pm, lib/Automake/Rule.pm,
+       lib/Automake/Variable.pm, lib/Automake/tests/Condition.pl,
+       lib/am/dejagnu.am, lib/am/depend.am, lib/am/lisp.am,
+       lib/am/remake-hdr.am, lib/am/texi-vers.am, m4/obsolete.m4,
+       m4/python.m4, tests/backsl4.test, tests/defs.in,
+       tests/dejagnu7.test, tests/depacl2.test, tests/dirlist.test,
+       tests/error.test, tests/getopt.test, tests/gnuwarn.test,
+       tests/include2.test, tests/libobj10.test, tests/libtool5.test,
+       tests/libtool6.test, tests/lisp3.test, tests/phony.test,
+       tests/pr220.test, tests/subcond2.test, tests/subcond3.test,
+       tests/vtexi.test:
+       Spelling and minor grammar fixes.
+
+2003-09-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.sub, lib/config.guess, lib/texinfo.tex,
+       lib/config-ml.in, lib/symlink-tree: New upstream versions.
+
+2003-08-31  Thien-Thi Nguyen  <address@hidden>  (tiny change)
+
+       * tests/yacc7.test: Require bison.
+
+2003-08-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (scan_file): Warn about underquoted AC_DEFUN.
+       ($underquoted_manual_once): New variable.
+       * automake.texi (Extending aclocal): Document this.
+
+2003-08-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (@file_order): New variable, to make sure
+       files are output in the opposite order of the -I arguments.
+       (scan_file): Fill it.
+       (trace_used_macros, write_aclocal): Use it.
+       (scan_m4_files): Reverse the directory contents, so that
+       macros from the lexicographically greatest files are preferred.
+       * tests/aclocal9.test, tests/acloca10.test, tests/acloca11.test:
+       New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2003-08-24  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug #206299:
+       * automake.in ($configure_deps_greatest_timestamp,
+       $output_deps_greatest_timestamp): New variables.
+       (initialize_per_input): Reset $output_deps_greatest_timestamp.
+       (scan_autoconf_traces, scan_autoconf_files, read_am_file):
+       Update $configure_deps_greatest_timestamp and
+       $output_deps_greatest_timestamp
+       (generate_makefile): Rewrite the logic to decide whether
+       to rewrite the output.  Move the leading dup_channel_setup
+       and trailing drop_channel_setup to MAIN, so that
+       drop_channel_setup is executed for all exit paths.
+       * tests/aclocal7.test: Update to check for $AUTOMAKE --no-force
+       * tests/distcom6.test: New file.  Report from Scott James Remnant.
+       * tests/Makefile.am (TESTS): Add distcom6.test.
+
+       * configure.in: Require Autoconf 2.57b to be sure
+       aclocal can use autom4te --language Autoconf-without-aclocal-m4.
+       * m4/init.m4: Likewise.  Move the AC_PREREQ and m4_pattern_allow
+       calls inside the AM_INIT_AUTOMAKE macro.
+       * m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
+       AC_PREREQ calls inside the macros.
+       * m4/header.m4: Remove AC_PREREQ.
+
+       * automake.in (file_contents_internal): Do not add newlines before
+       empty actions.
+
+       * aclocal.in (write_aclocal): Take an output file and list of
+       used macros in arguments and make up the file contents here.
+       (trace_used_macros): New function.
+       (add_file): Do not update $output.
+       ($output): Delete.
+       (MAIN): Call trace_used_macros.  Then rewrite aclocal.m4 only
+       for these traced macros.  This should shorten aclocal.m4 by
+       stripping out unused macros.
+       * automake.texi (Invoking aclocal): Document ${AUTOM4TE}.
+       * tests/aclibobj.test: Make sure configure.in exists by the time
+       aclocal runs.
+       * tests/aclocal8.test: New file.
+       * tests/Makefile.am (TESTS): Add aclocal8.test.
+       Suggested by Bruno Haible and Akim Demaille.
+
+2003-08-21  Akim Demaille  <address@hidden>
+
+       * lib/Automake/Configure_ac.pm (&find_configure_ac)
+       (&require_configure_ac): Accept an optional directory argument.
+       ($configure_ac): Remove.
+       * aclocal.in, automake.in ($configure_ac): New.
+       * lib/Automake/Variable.pm: Don't use $configure_ac, just
+       configure.ac.
+
+2003-08-20  Akim Demaille  <address@hidden>
+
+       * lib/Automake/FileUtils.pm: More perldoc.
+       (&up_to_date_p): New.
+
+2003-08-17  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/398:
+       * m4/python.m4: Do not call AC_PATH_PROGS if $PYTHON is already
+       set.  Display `none' instead of `:' and $PYTHON is set to `:'
+       when no suitable interpreter is found.  Honor ACTION-IF-FOUND and
+       ACTION-IF-NOT-FOUND.
+       * automake.texi (Python): Document ACTION-IF-FOUND and
+       ACTION-IF-NOT-FOUND.
+       * tests/python4.test, tests/python5.test, tests/python6.test,
+       tests/python7.test, tests/python8.test, tests/python9.test: New
+       files.
+       * tests/Makefile.am (TESTS): Add them.
+       Report from Per Cederqvist.
+
+2003-08-13  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/399:
+       * m4/python.m4: Use AC_PATH_PROGS, not AC_PATH_PROG.
+       Report from Per Cederqvist.
+
+2003-08-12  Raja R Harinath  <address@hidden>
+
+       * lib/Automake/Condition.pm (strip): Replace loop with 'grep'.
+       (not): Replace loop with 'map'.
+       * lib/Automake/DisjConditions.pm (sub_conditions): Likewise.
+       * lib/Automake/Item.pm (not_alwasy_defined_in_cond):
+       Don't 'simplify' result of 'invert', since it's already in
+       canonical form.
+       * lib/Automake/Rule.pm (define): Replace loop with
+       'not_always_defined_in_cond'.
+
+       * lib/Automake/DisjConditions.pm (ambiguous_p): Typo in comment.
+       * lib/Automake/Rule.pm (accept_extensions, msg_cond_rule): Likewise.
+       (define): Reword comment slightly.
+       * Variable.pm (_var_order, msg_cond_var): Typo in comment.
+       * tests/cond20.test (var2): Use foo.c instead of foo.cc to avoid
+       spurious automake error exit.
+
+2003-08-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.
+       * lib/Automake/Rule.pm, lib/Automake/RuleDef.pm: New files.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add them.
+       * lib/Automake/VarDef.pm: Make this a subclass of Automake::ItemDef.
+       (new): Adjust to call Automake::ItemDef::new.
+       (comment, location, owner): Delete.  Now inherited from ItemDef.
+       * lib/Automake/Variable.pm: Make this a subclass of Automake::Item.
+       (_new): Adjust to call Automake::Item::new.
+       (name, def, rdef, _set, conditions, not_always_defined_in_cond):
+       Delete.  How inherited from Item, where `_set' is called `set'.
+       * automake.in (SUFFIX_RULE_PATTERN): Delete. Now in Automake::Rule.
+       (suffix_rules_default): Delete.  Now
+       Automake::Rule::_suffix_rules_default
+       (suffixes): Delete.  Now Automake::Rule::suffixes.
+       (TARGET_AUTOMAKE, TARGET_USER): Delete.  Now
+       Automake::RuleDef::RULE_AUTOMAKE and Automake::RuleDef::RULE_USER.
+       (%targets, %target_source, %target_name, %target_owner): Delete,
+       replaced by the Rule and RuleDef classes.
+       (dependencies, depend, actions): Delete.  Now in Automake::Rule.
+       (suffix_rules, register_suffix_rule): Likewise.
+       (KNOWN_EXTENSIONS_PATTERN, accept_extensions): Likewise.
+       (known_extensions_list): Delete.  Now
+       Automake::Rule::_known_extensions_list.
+       (target_conditions): Delete.  Now inherited by Automake::Rule
+       from Automake::Item::conditions.
+       (rule_define): Delete.  Now Automake::Rule::define.  Adjust all
+       callers.
+       (target_defined): Delete.  Now Automake::Rule::rule.  Adjust all
+       callers.
+       (initialize_per_input): Adjust to call Automake::Rule::reset.
+       (err_target, err_cond_target, msg_cond_target, msg_target,
+       reject_target): Delete.  Now defined in Automake::Rule as
+       err_rule, err_cond_rule, msg_cond_rule, msg_rule and reject_target.
+       Adjust all callers.
+       (handle_languages): Call suffix_rules_count.
+       * tests/location.test: Adjust expected diagnostics.  We now display
+       $(EXEEXT) accurately.
+
+2003-08-10  Alexandre Duret-Lutz  <address@hidden>
+
+       Revert the fix for PR automake/291:
+       * lib/Automake/Variable.pm (define): Do not warn about variables
+       starting with `_' which are an issue on NEWS-OS 4.2R.  According
+       to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
+       was released on 1996 and is not in wide use.  On the other hand,
+       variables starting with `_' are mandatory in several situations,
+       so diagnosing them is more annoying than useful.
+       * tests/canon5.test: Do not use -Wno-portability.
+       * tests/vars2.test: Delete.
+       * tests/Makefile.am (TESTS): Remove vars2.test.
+       Suggested by Jim Meyering.
+
+2003-08-09  Raja R Harinath  <address@hidden>
+
+       * lib/Automake/DisjConditions.pm (ambiguous_p): Simplify slightly.
+       * lib/Automake/tests/DisjConditions.pl (test_ambig): Test
+       Automake::Disjunctions::ambiguous_p.
+
+2003-08-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (condition_ambiguous_p): Move ...
+       * lib/Automake/DisjConditions.pm (ambiguous_p): ... here.
+       * automake.in (rule_define): Adjust usage.
+       * lib/Automake/Variable.pm (_check_ambiguous_condition): Likewise.
+
+       * lib/Automake/Options.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Options.pm.
+       * automake.in (FOREIGN, GNU, GNITS, $default_strictness)
+       ($default_strictness_name, $strictness, $strictness_name)
+       (%options, %global_options, process_option_list)
+       (set_strictness): Remove, now in Options.pm.
+       (initialize_per_input): Call Automake::Options::reset.
+       (handle_options, get_object_extension, get_object_extension)
+       (handle_languages, handle_single_transform_list, handle_compile)
+       (handle_texinfo_helper, handle_man_pages, handle_dist)
+       (handle_configure, do_check_merge_target)
+       (handle_factored_dependencies, handle_tests)
+       (handle_minor_options, scan_autoconf_traces, check_cygnus)
+       (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define)
+       (make_paragraphs, am_install_var, parse_arguments): Adjust
+       to set and read options via the new interface.
+
+2003-08-07  Raja R Harinath  <address@hidden>
+
+       * Makefile.am (maintainer-check): Update perllibdir.
+       * lib/Automake/Makefile.am (Config.pm): Depend on Makefile too.
+       (EXTRA_DIST): Add Config.in.
+       * Makefile.in, lib/Automake/Makefile.in: Regenerate.
+       * tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in
+       $perllibdir.
+
+2003-08-06  Raja R Harinath  <address@hidden>
+
+       * configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory
+       from the builddir too, to pick up Automake::Config.
+       * tests/defs.in (AUTOMAKE, ACLOCAL): Likewise.
+       * configure: Regenerate.
+       * automake.in (BEGIN): Handle multiple directories in $perllibdir.
+       * aclocal.in (BEGIN): Likewise.
+
+2003-08-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/ltcond.test: Thinko.
+
+2003-08-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Config.in: New file.
+       * lib/Automake/Makefile.am (nodist_perllib_DATA, do_subst,
+       CLEANFILES): New variables.
+       (Config.pm): New rule.
+       * Makefile.am (maintainer-check): Adjust expected differences
+       between automake.in and automake.
+       * aclocal.in, automake.in: Use Automake::Config.
+
+2003-08-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/ltconv.test: s/rm/rm -f/ to placate maintainer-check.
+
+       * automake.in (handle_texinfo_helper): Use the user definition
+       of TEXINFO_TEX before checking for cygnus or AC_CONFIG_AUX_DIR.
+       * tests/txinfo22.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo22.test.
+       Report from Tom Tromey.
+
+2003-08-03  Raja R Harinath  <address@hidden>
+
+       * lib/Automake/Variable.pm (@EXPORT): Remove
+       traverse_variable_recursively and
+       require_variables_for_variable.
+       (require_variables_for_variable, traverse_variable_recursively)
+       (_traverse_variable_recursively_worker): Convert to
+       Automake::Variable methods, remove support for being
+       invoked with variable names, and rename to ...
+       (requires_variables, traverse_recursively)
+       (_do_recursive_traversal): ... these.
+       (_value_as_list_recursive_worker, transform_variable_recursively):
+       Update to reflect changes.
+       * automake.in (handle_LIBOBJS, handle_ALLOCA)
+       (handle_libraries, handle_ltlibraries, am_primary_prefixes):
+       Likewise.
+       (define_objects_from_sources): Fix typo in comment.
+
+2003-08-02  Raja R Harinath  <address@hidden>
+
+       * automake.in (handle_source_transform): Replace 'grep' with 'map'.
+       (register_language): Replace 'grep' with 'foreach' modifier.
+
+2003-08-01  Raja R Harinath  <address@hidden>
+
+       * lib/Automake/Variables.pm (variables): Return a list of
+       Automake::Variable instances, not a list of strings.
+       (dump): Remove support for being invoked with a string.
+       (variables_dump): Adapt to these changes.
+       * automake.in (check_typos): Likewise.
+       (am_primary_prefixes): Likewise.
+
+2003-07-31  Ralf Wildenhues  <address@hidden>  (tiny change)
+
+       * lib/depcomp (aix): Support AIX Compiler version 6.
+
+2003-07-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (A Shared Library): Rewrite and split into
+       subsections.  Valuable comments from Norman Gray, Harlan Stenn,
+       Tim Van Holder, and Guido Draheim.
+       * tests/ltcond.test, tests/ltcond2.test, tests/ltconv.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2003-07-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Complain about
+       foo.$(OBJEXT) being created both with libtool and without, not
+       about foo.lo.
+       Report from Tim Van Holder.
+
+2003-07-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (FETCHFILES, fetch): Add config-ml.in and
+       symlink-tree.
+       * lib/config.sub, lib/config-ml.in, lib/texinfo.tex: New
+       upstream versions.
+
+2003-07-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_configure): Cosmetic change to avoid
+       a maintainer-check complaint.
+
+2003-07-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (@EXPORT): Remove variable_dump.
+       (variable_dump): Replace by ...
+       (dump): ... this method.
+       (rdef, _check_ambiguous_condition): Adjust to use ->dump.
+       (define, variables_dump): Adjust to use Automake::Variable::dump
+
+       * lib/am/compile.am (mostlyclean-compile): Do not erase core dumps.
+       * automake.texi (Built sources example): Adjust example.
+
+2003-07-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (get_object_extension, handle_languages)
+       (handle_single_transform_list, handle_compile, handle_compile)
+       (handle_texinfo_helper, handle_texinfo_helper, handle_man_pages)
+       (handle_tests, handle_minor_options, check_gnu_standards)
+       (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define):
+       Simplify "if (defined $options{'X'})" into "if ($options{'X'})".
+
+       Complete changes from 2003-07-08.
+       * automake.in ($cmdline_use_dependencies, $use_dependencies): Remove,
+       replaced by $options{'no-dependencies'}.
+       ($global_options): Remove.
+       (%global_options): New variable.
+       (initialize_per_input): Empty %options.
+       (process_option_list): Take a location and %options ref argument,
+       process no-dependencies as other options.
+       (handle_options): Do not reparse the global options, just initialize
+       %options from %global_options and fill it with local options.
+       (handle_languages, handle_single_transform_list)
+       (handle_configure, check_cygnus): Adjust usage of
+       $options{'no-dependencies'}.
+       (make_paragraphs): Adjust usage of $options{'cygnus'}.
+       (parse_arguments): Set cygnus and no-dependencies in %global_options.
+       (scan_autoconf_traces) <AM_INIT_AUTOMAKE>: Call process_option_list
+       to fill %global_options.
+
+2003-07-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/remake4.test: Use `$MAKE distdir' instead of `$MAKE dist' to
+       avoid the use of tar.
+
+2003-07-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/gnuwarn2.test: Typo.
+
+       * tests/insthook.test: Use $MAKE, not make.
+
+       Fix missing rebuilds during `make dist' with BSD make.
+       * automake.in (generate_makefile): Do not push Makefile.in, and
+       Makefile.am into DIST_COMMON here.
+       * lib/am/configure.am (DIST_COMMON): Do it here, and use
+       %MAKEFILE-AM% and %MAKEFILE-IN% so that items in DIST_COMMON
+       actually match the targets.  Prefix `configure' with `$(srcdir)/'
+       to match the target.
+       * tests/remake4.test: New file.
+       * tests/Makefile.am (TESTS): Add remake4.test.
+       Report from Akim Demaille.
+
+2003-07-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_multilib): Register all-multi.
+       (file_contents_internal): Insert \n when concatenating actions
+       from "factored" rules.
+       * lib/config-ml.in: New file, from GCC, including a patch
+       from Ralf Corsepius (see GCC's PR 11526).
+       * lib/symlink-tree.in: New file, from GCC.
+       * lib/Makefile.am (dist_script_DATA): Add config-ml.in and
+       symlink-tree.
+       * lib/am/clean.am (distclean-generic): Do not delete Makefile here...
+       (distclean, maintainer-clean): ... do it here.
+       * lib/am/depend.am (distclean-depend): Likewise, replace by
+       (distclean, maintainer-clean): ... these.
+       * lib/am/multilib.am (all-recursive, install-recursive,
+       mostlyclean-recursive, clean-recursive, distclean-recursive,
+       maintainer-clean-recursive): Remove these rules.
+       (mostlyclean-am, clean-am, distclean-am, maintainer-clean-am): Replace
+       by ...
+       (mostlyclean, clean, distclean, maintainer-clean): ... these.
+       (all-am): Remove, done in handle_multilib.
+       (install-am): Replace by ...
+       (install-exec-am): ... this.
+       * tests/Makefile.am (TESTS): Add multlib.test.
+       * tests/multlib.test: New file, based on a test case by
+       Ralf Corsepius
+
+2003-07-23  Tom Tromey  <address@hidden>
+
+       * lib/missing (autom4te): Typo.
+
+2003-07-16  Derek Price  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Handle AC_CONFIG_LINKS.
+       (handle_configure): Handle adding AC_CONFIG_LINKS arguments to
+       distclean targets (CONFIG_CLEAN_FILES makefile var).
+       * NEWS: Note new handling of AC_CONFIG_LINKS.
+       * automake.texi (Other things Automake recognizes): Ditto.
+       * tests/Makefile.am (TESTS): Add new tests.
+       * tests/conflnk.test: New test that links are cleaned on distclean.
+       * tests/conflnk2.test: New test that source files for links are
+       distributed.
+
+2003-07-15  Ralf Corsepius <address@hidden>  (tiny change)
+
+       * automake.in (scan_autoconf_traces): Trace AM_ENABLE_MULTILIB to
+       render $seen_multilib functional again.
+
+2003-07-10  Raja R Harinath  <address@hidden>
+
+       Avoid using refs as hash keys.
+       * lib/Automake/Variable.pm ($_traversal): New.
+       (reset): Reset $_traversal.
+       (_new): New attribute 'scanned'.
+       (%_vars_scanned): Remove.
+       (traverse_variable_recursively)
+       (traverse_variable_recursively_worker):
+       Use $_traversal instead of %_vars_scanned to detect recursively
+       defined variables.
+
+       * lib/am/configure.am (am--refresh): Silence.
+
+2003-07-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (define): Make clear the diagnostic
+       about variable names starting with `_' is about *Make* variables.
+
+       For Debian Bug #193907:
+       * automake.texi (Clean): make maintainer-clean should still
+       allow ./configure && make to run.
+
+       * automake.texi (CVS): Typo.
+
+2003-07-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in: Use Automake::FileUtils.
+       (parse_arguments, scan_configure, scan_m4_files): Never call
+       "die" to print an error message.  Use print and exit.
+       * automake.in: Use Automake::FileUtils.
+       * lib/Automake/General.pm ($debug, $help, $tmp, $verbose,
+       $version, &debug, &getopt, &mktmpdir, &verbose): Remove.
+       (END): Do not massage Perl's exit code.  Do not clean any temporary
+       directory.
+       (find_file, mtime, update_file, xsystem, contents): Move to ...
+       * lib/Automake/FileUtils.pm: ... this new file.  Adjust to
+       report errors using Channels.
+       (handle_exec_errors, xqx): New functions, from Autoconf.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add FileUtils.pm.
+
+       * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
+       Return the empty list on recursively defined variable.  This
+       supersedes my change of 2003-07-02.
+
+2003-07-08  Akim Demaille  <address@hidden>
+
+       * automake.in ($cygnus_mode): Replace with $options{'cygnus'}.
+       Adjust all dependencies.
+       (&depend): Move next to %dependencies and prototype.
+       (&initialize_per_input): Initialize the 'cygnus' field of
+       '%options' to spare the code from 'exists' or 'defined' when
+       testing it.
+       (&handle_configure, &do_check_merge_target, &check_cygnus): Prototype.
+       (&parse_arguments): Rename '%options' and '%options_1st_pass' as
+       '%cli_options' and '%cli_options_1st_pass' to avoid clashes and
+       inconsistencies.
+
+2003-07-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (generate_makefile): Move near the end of the
+       file, after the definition of all called functions, so that
+       prototypes can be enforced.
+
+2003-07-06  Akim Demaille  <address@hidden>
+
+       * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive,
+       install-exec-recursive, install-data-recursive and
+       uninstall-recursive addition to...
+       * lib/am/install.am: here.
+       * lib/am/texinfos.am, lib/am/subdirs.am: Remove the .PHONY
+       declaration of RECURSIVE_TARGETS.
+
+2003-07-06  Akim Demaille  <address@hidden>
+
+       * lib/Automake/Variable.pm, lib/Automake/VarDef.pm (VAR_SORTED):
+       New variable type.
+       Handle it.
+       * automake.in (&handle_subdirs): Prototype.
+       Adjust callers.
+       Make RECURSIVE_TARGETS a VAR_SORTED.
+
+2003-07-06  Akim Demaille  <address@hidden>
+
+       * automake.in (&define_files_variable): New.
+       (&handle_texinfo_helper): Move the handling of user variables from
+       here, to...
+       (&handle_texinfo): here.
+       This is to balance the size of these functions, and to match the
+       convention of other _helper functions.
+       (&handle_texinfo_helper): Use &define_files_variable.
+       Move some code to use less variables.
+       Rename $info_cursor as $texi.
+       (&handle_texinfo): Do not call handle_texinfo_helper if there are
+       no TEXINFOS.
+       * lib/am/texinfos.am: Sort the occurrences of dvi, info, pdf, ps
+       and html.
+       Remove *-recursive targets from .PHONY, they are part of
+       $(RECURSIVE_TARGETS) anyway.
+       (install-info, mostlyclean-aminfo): Are .PHONY.
+
+2003-07-05  Akim Demaille  <address@hidden>
+
+       * lib/am/distdir.am: Use ';' as a terminator, not a separator, for
+       sed complex commands, as required by NetBSD sed.
+       Reported by Patrick Welche.
+
+2003-07-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess, lib/config.sub: New upstream version.
+
+2003-07-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Optional, Dist): AC_CONFIG_AUX_DIR files
+       are automatically distributed.
+
+       * lib/depcomp (icc): Update to grok ICC 7.1's output.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Check dependency generation
+       in a subdirectory, and with many dependencies.  This
+       catches more failures of depcomp.
+       Reports from Ralf Wildenhues and Akim Demaille.
+
+2003-07-04  Akim Demaille  <address@hidden>
+
+       * automake.in (&scan_texinfo_file, &output_texinfo_build_rules,
+       (&handle_texinfo_helper, &handle_texinfo): Formatting changes.
+       Prototype properly.
+       Don't use & when calling functions.
+
+2003-07-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS: Categorize entries.
+       Suggested by Jim Meyering.
+
+       * Makefile.am (maintainer-clean): Disallow '$AUTOMAKE && exit 1'.
+       Ignore @...@ substitutions in comments.
+       * tests/defs.in: Try to make the shell more POSIX compliant.
+       (AUTOMAKE_run, AUTOMAKE_fails): New functions.
+       * tests/README: Mention AUTOMAKE_fails.
+       * tests/alloca.test, tests/alloca2.test, tests/ansi8.test,
+       * tests/asm.test, tests/backsl3.test, tests/backsl4.test,
+       * tests/badline.test, tests/badopt.test, tests/canon.test,
+       * tests/canon5.test, tests/colneq.test, tests/comment3.test,
+       * tests/comment5.test, tests/cond2.test, tests/cond20.test,
+       * tests/cond23.test, tests/cond24.test, tests/cond27.test,
+       * tests/condinc2.test, tests/conff2.test, tests/cxx2.test,
+       * tests/dejagnu2.test, tests/dirforbid.test,
+       * tests/distcom3.test, tests/else.test, tests/exdir2.test,
+       * tests/exeext2.test, tests/gcj2.test, tests/gcj5.test,
+       * tests/getopt.test, tests/gettext.test, tests/gettext2.test,
+       * tests/gnits.test, tests/gnuwarn.test, tests/gnuwarn2.test,
+       * tests/insh.test, tests/lex2.test, tests/libobj10.test,
+       * tests/libobj12.test, tests/libobj13.test,
+       * tests/libobj3.test, tests/library2.test,
+       * tests/library3.test, tests/libtool4.test,
+       * tests/libtool6.test, tests/lisp2.test, tests/location.test,
+       * tests/nogzip2.test, tests/output5.test, tests/overrid.test,
+       * tests/percent.test, tests/percent2.test,
+       * tests/pluseq5.test, tests/pluseq7.test, tests/pluseq9.test,
+       * tests/pr211.test, tests/primary.test, tests/primary2.test,
+       * tests/python2.test, tests/recurs.test, tests/reqd2.test,
+       * tests/seenc.test, tests/specflg.test, tests/specflg2.test,
+       * tests/spell.test, tests/spell2.test, tests/srcsub.test,
+       * tests/srcsub2.test, tests/stdlib.test, tests/subdir7.test,
+       * tests/substtarg.test, tests/suffix11.test,
+       * tests/symlink.test, tests/syntax.test,
+       * tests/targetclash.test, tests/txinfo4.test,
+       * tests/version3.test, tests/warnopts.test,
+       * tests/xsource.test, tests/yacc2.test: Use set -e,
+       AUTOMAKE_fails, and always grep error message.
+
+       * automake.in (handle_ltlibraries): Fix call to msg.
+
+       * tests/stamph.test: Delete.
+       * tests/Makefile.am (TESTS): Remove stamph.test.
+
+       * automake.in (handle_single_transform_list): Use $var->name
+       to print variable in the configure-substitution diagnostic.
+       Do not mention the parent when it is the variable itself.
+
+       * tests/package.test: Delete.
+       * tests/Makefile.am (TESTS): Remove package.test.
+
+       * automake.in (cond_stack_else): Return FALSE if `if' was not
+       used.
+       (cond_stack_endif): Return TRUE if `if' was not used.  Do not
+       display $negate and $cond, they are irrelevant and maybe undefined.
+
+2003-07-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
+       Do not return undef when a variable is recursively defined, this
+       causes warnings all over the place.  Return the empty string instead.
+
+       * lib/am/distdir.am (distcheck): Protect loop of DIST_ARCHIVES
+       from empty DIST_ARCHIVES.
+
+2003-07-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Check the expected
+       number of arguments of each traced macro.
+       * tests/overrid.test: Fix call to AM_CONDITIONAL.
+       * tests/conff2.test: New files.
+       * tests/Makefile.am (TESTS): Add conff2.test.
+       Report from Paolo Bonzini.
+
+2003-06-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in ($SUBST_REF_PATTERN): Do not define.
+       (%gen_varname): Move to Variable.pm, as %_gen_varname.
+       (initialize_per_input): Do not clean %gen_varname.
+       (handle_options, check_libobjs_sources, handle_source_transform,
+       handle_LIBOBJS, handle_ltlibraries, handle_texinfo_helper,
+       handle_man_pages, handle_dist, handle_subdirs, handle_gettext,
+       am_install_var): Adjust to use value_as_list_recursive,
+       loc_and_value_as_list_recursive, and has_conditional_contents.
+       (require_file_with_macro): Accept an Automake::Variable as argument.
+       (traverse_variable_recursively,
+       traverse_variable_recursively_worker, gen_varname,
+       transform_variable_recursively): Move ...
+       * lib/Automake/Variable.pm (traverse_variable_recursively,
+       _traverse_variable_recursively_worker,
+       _gen_varname, transform_variable_recursively): ... here.
+       * automake.in (variable_conditionally_defined,
+       variable_value_as_list_recursive_worker,
+       variable_value_as_list_recursive
+       variable_loc_and_value_as_list_recursive): Move ...
+       * lib/Automake/Variable.pm (has_conditional_contents,
+       _value_as_list_recursive_worker,
+       value_as_list_recursive, loc_and_value_as_list_recursive): ... here.
+       (reset): Reset %_gen_varname.
+       (require_variables_for_variable): Accept an Automake::Variable
+       as argument.
+
+2003-06-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/aclocal6.test: Test maintainer-clean in VPATH
+       builds. (For Ralf's fix.)
+
+2003-06-27  Ralf Corsepius  <address@hidden>  (tiny change)
+
+       * lib/am/configure.am (maintainer-clean): Remove
+       $(top_srcdir)/autom4te.cache, not autom4te.cache.
+
+2003-06-27  Akim Demaille  <address@hidden>
+
+       * automake.texi: Use @node with a single argument.
+
+2003-06-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/Makefile.am (dist_m4data_DATA): Add $(top_srcdir)/m4/amversion.m4.
+
+       * lib/am/distdir.am (distcheck): Run $(am__remove_distdir)
+       at the end of distcheck.  This was mistakenly removed on
+       2003-06-15.
+       * tests/subpkg.test: Make sure distcheck cleans up after itself.
+
+       * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ...
+       ($(top_srcdir)/m4/amversion.m4): ... this.
+       (DISTCLEANFILES): Remove.
+       (nodist_m4data_DATA): Remove. amversion.m4 is automatically
+       distributed.
+       (EXTRA_DIST): Add amversion.in.
+
+2003-06-25  Akim Demaille  <address@hidden>
+
+       * automake.texi (Top): Use @copying and @insertcopying.
+       Make Alexandre an author.
+       * automake.in ($gen_copyright): Add the "(C)" to Copyright.
+       * lib/depcomp: Likewise.
+
+2003-06-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (vardef, rvardef, set_seen): New functions.
+       (variable_defined, examine_variable): Remove.
+       (%_ac_macro_for_var): Add an entry for ALLOCA.
+       (require_variables): Use vardef instead of variable_defined.
+       Do not use _cvar.
+       * automake.in (generate_makefile): Do not push $(SOURCE) into
+       @sources.  Use define_pretty_variable to define SOURCES.
+       (handle_LIBOBJS, handle_ALLOCA): Use require_variables_for_variable
+       to require LIBOBJS, LTLIBOBJS and ALLOCA.
+       (handle_programs, handle_ltlibraries): Do not define an empty
+       _DEPENDENCIES or _LDFLAGS variable when none is defined.
+       (define_configure_variable): Do not check whether the variable
+       already exists (it's Automake::Variable::define's job).
+       (require_build_directory): Likewise, do not check
+       the existence of am__dirstamp.
+       (generate_makefile, handle_options, handle_languages)
+       (check_libobjs_sources, handle_single_transform_list)
+       (traverse_variable_recursively_worker, handle_source_transform)
+       (handle_lib_objects, handle_LIBOBJS, handle_compile)
+       (handle_libtool, handle_programs, handle_libraries)
+       (handle_ltlibraries, check_typos, handle_texinfo_helper)
+       (handle_man_pages, handle_tags, handle_dist, handle_subdirs)
+       (scan_aclocal_m4, handle_gettext, handle_footer, handle_install)
+       (handle_all, do_check_merge_target, handle_clean, lang_c_finish)
+       (handle_tests, lang_yacc_target_hook, define_pretty_variable)
+       (define_compiler_variable, define_linker_variable)
+       (make_paragraphs, am_primary_prefixes, am_install_var): Adjust to
+       call var, vardef, or set_seen, instead of variable_defined.  Use
+       set_seen only for variables which are actually checked by
+       check_typos.
+       * tests/target.test: Delete.
+       * tests/alloca.test, tests/alloca2.test: New files.
+       * tests/libobj3.test: Check error message.
+       * tests/distcom4.test: Make sure configure is in DIST_COMMON.
+       This replace confdist.test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Remove target.test.
+       (TESTS): Add alloca.test and alloca2.test.  Remove confdist.test.
+
+2003-06-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_dist): Delete DIST_COMMON before redefining
+       it.  Bug report from Akim Demaille.
+       (rewrite_inputs_into_dependencies): Make sure we always return
+       something, even when $add_srcdir is 0.
+       * tests/distcom4.test, tests/distcom5.test: New files.
+       * tests/Makefile.am (TESTS): Add distcom4.test and distcom5.test.
+
+       * tests/cond29.test: Also check for _SOURCES.
+       Report from Paolo Bonzini.
+
+2003-06-20  Akim Demaille  <address@hidden>
+
+       * lib/am/configure.am: Replace leading spaces with a real tab.
+
+2003-06-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nogzip.test, tests/nogzip2.test: New files.
+       * tests/Makefile.am (TESTS): Add nogzip.test and nogzip2.test
+
+2003-06-15  Akim Demaille  <address@hidden>
+
+       * automake.in (&make_paragraphs): Define %GZIP%.
+       (&process_option_list): Accept no-dist-gzip2.
+       (&handle_dist): Complain when no archive format is enabled.
+       * lib/am/distdir.am (DIST_ARCHIVES): New variable.
+       (dist-gzip, dist-bzip2, dist-tarZ, dist-zip): No longer
+       conditioned.
+       (dist): Build $(distdir).tar.gz conditionally.
+       (distcheck): Use DIST_ARCHIVES to find an archive to unpack, and
+       to list built archives.  Run $(MAKE) dist instead of dist-gzip.
+       * automake.texi (Options, The types of distributions): Adjust.
+
+2003-06-15  Jens Elkner  <address@hidden>  (tiny change)
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Fix sed commands to work with
+       POSIXLY_CORRECT=1.
+
+2003-06-14  Karl Berry  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * mkinstalldirs (scriptversion): New variable.  Setup emacs hooks
+       to update it each time the file is written, as in install-sh.
+       (usage): Improve message.
+       (--version): New option.
+       (--help): Output to stdout, not stderr.
+
+2003-06-13  Paul Eggert  <address@hidden>
+
+       * lib/install-sh (dsttmp, rmtmp): Do not use '#' in file names;
+       it's not guaranteed by POSIX and it doesn't work on OpenVMS.
+       Bug reported by Bernard Giroud in:
+       http://mail.gnu.org/archive/html/autoconf-patches/2003-06/msg00013.html
+
+2003-06-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (check_gnu_standards): Use no-installman and
+       no-installinfo's locations.
+       (process_option_list): Fill %options with locations.
+       (check_cygnus) Fill $options{'no-installinfo'} and
+       $options{'no-dependencies'} with $cygnus_mode, so that it
+       remains a Location.
+       * tests/gnuwarn2.test: New file.
+       * tests/Makefile.am (TESTS): Add gnuwarn2.test.
+
+2003-06-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (process_option_list): Record the location
+       of ansi2knr's definition.
+       (handle_compile): Use it.
+       * tests/ansi3.test: Make sure the location appears correctly.
+       Update to use set -e.
+       * tests/ansi3b.test: New file.
+       * tests/Makefile.am (TESTS): Add ansi3b.test.
+
+       * tests/alpha.test: Really run $MAKE.  Augment to test
+       subdirectories, and check-news report.
+       * tests/alpha2.test: New file.  Bug report from Akim Demaille.
+       * tests/gnits2.test: Make sure README-alpha is not distributed.
+       * tests/Makefile.am (TESTS): Add alpha2.test.
+       * automake.in (handle_minor_options): Distribute README-alpha
+       using push_dist_common, not require_file_with_macro.
+
+2003-06-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Configure_ac.pm
+       (search_configure_ac, find_configure_ac): Rename as ...
+       (find_configure_ac, require_configure_ac): ... these.
+       * aclocal.in (scan_configure): Adjust call to require_configure_ac.
+       * automake.in (scan_autoconf_files): Likewise.
+       Suggested by Tim Van Holder.
+
+       * alocal.in: Use Automake::Configure_ac.
+       ($configure_ac): Delete.
+       (scan_configure): Adjust use of find_configure_ac;
+       * automake.in: Use Automake::Configure_ac.
+       ($configure_ac): Delete.
+       (scan_autoconf_files): Adjust use of find_configure_ac;
+       * lib/Automake/Configure_ac.pm: New file.
+       * lib/Automake/General.pm (find_configure_ac): Delete.  Now
+       replaced by Automake::Configure_ac::search_configure_ac.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm.
+       * lib/Automake/Variable.pm: Use Automake::Configure_ac.
+       (require_variables): Adjust use of $configure_ac.
+
+2003-06-02  Akim Demaille  <address@hidden>
+
+       * lib/am/texi-vers.am, lib/am/subdirs.am, lib/am/scripts.am,
+       * lib/am/remake-hdr.am, lib/am/python.am, lib/am/progs.am,
+       * lib/am/program.am, lib/am/multilib.am, lib/am/mans.am,
+       * lib/am/mans-vars.am, lib/am/ltlibrary.am, lib/am/ltlib.am,
+       * lib/am/lisp.am, lib/am/libtool.am, lib/am/library.am,
+       * lib/am/lang-compile.am, lib/am/java.am, lib/am/header.am,
+       * lib/am/header-vars.am, lib/am/footer.am, lib/am/depend.am,
+       * lib/am/dejagnu.am, lib/am/data.am, lib/am/compile.am,
+       * lib/am/clean.am, lib/am/clean-hdr.am, lib/am/check.am,
+       * lib/am/ansi2knr.am, lib/am/Makefile.am, lib/Makefile.am,
+       * m4/strip.m4, m4/sanity.m4, m4/runlog.m4, m4/regex.m4,
+       * m4/python.m4, m4/protos.m4, m4/options.m4, m4/obsolete.m4,
+       * m4/obsol-lt.m4, m4/obsol-gt.m4, m4/multi.m4, m4/missing.m4,
+       * m4/minuso.m4, m4/maintainer.m4, m4/lispdir.m4, m4/lex.m4,
+       * m4/install-sh.m4, m4/header.m4, m4/gcj.m4, m4/dmalloc.m4,
+       * m4/depout.m4, m4/cond.m4, m4/ccstdc.m4, m4/auxdir.m4, m4/as.m4,
+       * m4/Makefile.am: White space changes and Copyright updates.
+
+2003-05-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (check_defined_unconditionally): Add
+       the $parent_cond argument.
+       (output): Use $self->name in diagnostic not $self.
+       (variable_value_as_list): Rename as ...
+       (value_as_list): ... this.  Declare as a method.  Take a $parent_cond
+       argument and pass it to check_defined_unconditionally.  Do not call
+       variable_assert, now that this is a method.
+       (variable_assert): Delete (unused).
+       * automake.in (traverse_variable_recursively_worker): Adjust to
+       use check_defined_unconditionally and value_as_list as a methods.
+
+       * lib/Automake/Variable.pm (output): Declare as a method, since it
+       is only used this way.
+       (define): Fix documentation of $cond.
+       Suggested by Raja R. Harinath.
+
+2003-05-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm, lib/Automake/VarDef.pm: New files.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Variable.pm
+       and VarDef.pm.
+       * automake.in: Use Automake::Variable and Automake::VarDef.
+       (MACRO_PATTERN): Delete. Now Automake::Variable::_MACRO_PATTERN.
+       (am_macro_for_var): Delete. Now Automake::Variable::_am_macro_for_var.
+       (ac_macro_for_var): Delete. Now Automake::Variable::_ac_macro_for_var.
+       (silent_variable_override): Delete.  Now
+       Automake::Variable::_silent_variable_override.
+       (var_value, var_location, var_comment, var_type, var_owner,
+       var_pretty, content_seen): Delete.  This functionality is now
+       offered by Automake::Variable and Automake::VarDef.
+       (VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE, VAR_ASIS, VAR_PRETTY):
+       Delete.  Now defined in Automake::VarDef.
+       (var_order): Delete.  Now Automake::Variable::_var_order.
+       (appendvar): Delete.  Now Automake::Variable::_appendvar.
+       (var_SUFFIX_trigger): Register using Automake::Variable::hook.
+       (initialize_per_input): Call Automake::Variable::reset.
+       (err_var, msg_cond_var, msg_var, reject_var): Delete.  Now
+       defined in Automake::Variable.
+       (generate_makefile, process_option_list, handle_languages)
+       (traverse_variable_recursively_worker)
+       (transform_variable_recursively, handle_compile)
+       (handle_libraries, handle_ltlibraries)
+       (check_typos, handle_dist, handle_subdirs, scan_autoconf_files):
+       Adjust to use Automake::Variable functions.
+       (check_ambiguous_condition): Delete.  Now
+       Automake::Variable::_check_ambiguous_condition.
+       (condition_ambiguous_p): Delete.  Now
+       Automake::Variable::condition_ambiguous_p.
+       (variable_not_always_defined_in_cond): Delete.  Now
+       Automake::Variable::not_always_defined_in_cond.
+       (macro_define): Delete.  Now Automake::Variable::define.
+       (macro_delete): Delete.  Now Automake::Variable::variable_delete.
+       (macro_dump): Delete.  Now Automake::Variable::variable_dump.
+       (macros_dump): Delete.  Now Automake::Variable::variables_dump.
+       (variable_defined): Delete.  Now
+       Automake::Variable::variable_defined, with the target check
+       temporarily disabled.
+       (variable_assert): Delete.  Now Automake::Variable::variable_assert.
+       (examine_variable): Delete.  Now
+       Automake::Variable::examine_variable.
+       (variable_conditions): Delete.  Now Automake::Variable::conditions.
+       (scan_variable_expansions): Delete.  Now
+       Automake::Variable::scan_variable_expansions.
+       (check_variable_expansions): Delete.  Now
+       Automake::Variable::check_variable_expansions.
+       (check_variable_defined_unconditionally): Delete.  Now
+       Automake::Variable::check_defined_unconditionally.
+       (variable_value): Delete.  Now Automake::Variable::variable_value.
+       (variable_value_as_list): Delete.  Now
+       Automake::Variable::variable_value_as_list.
+       (variable_value_as_list_recursive_worker): Adjust to use
+       Automake::Variable functions.
+       (variable_output): Delete.  Now Automake::Variable::output.
+       (define_pretty_variable, define_configure_variable, read_am_file)
+       (define_standard_variables, read_main_am_file): Adjust to use
+       Automake::Variable functions.
+       (handle_variables): Delete.  Now Automake::Variable::output_variables.
+       (file_contents_internal, am_primary_prefixes, am_install_var)
+       (require_file_with_macro, require_conf_file_with_macro)
+       (push_dist_common): : Adjust to use
+       Automake::Variable functions.
+       (require_variables): Delete.  Now
+       Automake::Variable::require_variables.
+       (require_variables_for_macro): Delete.  Now
+       Automake::Variable::require_variables_for_variable.
+       * tests/Makefile.am (XFAIL_TESTS): Add target.test.
+
+2003-05-25  Christian Cornelssen  <address@hidden>  (tiny change)
+
+       * tests/dejagnu7.test: Check if runtest supports --status.
+
+2003-05-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Location.pm (dump): Output 'INTERNAL' when position
+       is undefined.
+
+       * lib/Automake/DisjConditions.pm (human): Fix infinite loop when
+       $self contains only one Condition.
+
+       * automake.in: Use plain strict, including refs.
+       (macro_define, handle_single_transform_list): Use \&{'name'} to
+       build references to named subroutines.
+
+2003-05-22  Karl Berry  <address@hidden>
+
+       * automake.texi: Update @dircategory to match the Free Software
+       Directory.  End directory entries with dots.
+
+2003-05-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
+
+       * lib/elisp-comp: s/François/Franc,ois/.
+       Suggested by Paul Eggert.
+
+       * automake.in: Move the "main" code at the end.
+       (parse_arguments): Move near the end.
+       ($KNOWN_EXTENSIONS_PATTERN, @known_extensions_list,
+       accept_extensions, var_SUFFIXES_trigger): Move these definitions
+       before any call to register_language.
+       (am_file): Move the definition with all other global variables,
+       do not use local to define it.
+       * Makefile.am (maintainer-check): Expect no `local' in Automake.
+
+2003-05-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Wrap.pm, lib/Automake/tests/Wrap.pl: New files.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Wrap.pm.
+       * lib/Automake/tests/Makefile.am (TESTS): Add Wrap.pl.
+       * automake.in (handle_texinfo_helper, pretty_print_rule)
+       (variable_output): Adjust to use makefile_wrap instead of
+       pretty_print_internal.
+       (pretty_print_internal): Remove.  Renamed as Automake::Wrap::wrap
+       and augmented to accept the $eol and $max_len arguments.
+
+2003-05-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Autom4te/XFile.pm, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: New upstream versions.
+
+2003-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/install.am (install, install-exec, install-data, uninstall):
+       Declare conditionally using a if/else/endif block instead of
+       using ?SUBDIRS?-style conditions.  The latter fail when
+       %maybe_BUILT_SOURCES% is replaced by several lines.
+       This fixes a bug introduced on 2003-04-06.
+       * tests/bsource.test: New file.
+       * tests/Makefile.am (TESTS): Add bsource.test.
+       Reported by Bruno Haible.
+
+2003-05-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (renamed objects): New node.
+       (Program and Library Variables): Move maude_DEPENDENCIES closer
+       to maude_LDADD.  Define and use `per-target compilation flags' in the
+       explanation for maude_CFLAGS et al.  Link to the `renamed objects'
+       node.  Illustrate maude_SHORTNAME.
+
+2003-05-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/install-sh: Update copyright notice and license to that of
+       X11R6.  This removes an advertising clause reported as Debian bug
+       #191717.
+
+2003-05-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.in (ACLOCAL): Do not use -I, --acdir is enough.
+
+       * m4/make.m4: Rename the doit target as am__doit,
+       and make it phony.
+       Reported by Philip S Tellis.
+
+2003-05-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/configure.am (%MAKEFILE-IN%): Propagate automake's exit
+       status.
+       * tests/makej.test: New file (test Autom4te's cache locking,
+       new in CVS Autoconf).
+       * tests/Makefile.am (TESTS): Add makej.test.
+
+2003-05-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/General.pm (contents): New function.
+       * aclocal.in (greatest_mtime, force_output): New globals.
+       (scan_configure, add_file): Update $greatest_mtime.
+       (parse_arguments): Parse --force.
+       (write_aclocal): Do not overwrite $output_file unless needed.
+       * automake.texi (aclocal options): Document --force.
+       * tests/aclocal7.test: New file.
+       * tests/Makefile.am (TESTS): Add aclocal7.test.
+
+2003-05-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Optional): Document m4_include.
+       (Invoking aclocal): Shake a bit to introduce the various uses
+       of aclocal and explain that aclocal will use m4_include for
+       local files.
+       (Extending aclocal): Show how to install installable macros
+       in $(datadir)/aclocal, and make it clearer that writing installable
+       macros is not the only way to extend aclocal.
+       (Local Macros, Future of aclocal): New sections.
+
+2003-04-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (@common_files): Remove acinclude.m4 since
+       it will be m4_included by aclocal.m4 and files are always
+       distributed.
+       (scan_aclocal_m4): Do not bother about acinclude.m4 anymore.
+       We will get this dependency when tracing m4_includes.
+       * tests/aclocal6.test: Make sure acinclude.m4 is distributed
+       when used.
+       * tests/acinclude.test: Delete.
+       * tests/Makefile.am (TESTS): Remove acinclude.test.
+
+2003-04-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_configure): Don't add @configure_deps to
+       DIST_COMMON, we do this from lib/am/configure.am now.
+       Define the am__configure_deps variable instead of substituing
+       %CONFIGURE_DEPS%.
+       * lib/am/configure.am (%MAKEFILE-IN%, $(top_srcdir)/configure,
+       $(ACLOCAL_M4)): Use $(am__configure_deps) instead of %CONFIGURE_DEPS%.
+       (DIST_COMMON): Add $(am__configure_deps).
+
+       * tests/aclocal6.test: New file.
+       * lib/am/configure.am (am--refresh): New rule.
+       (%MAKEFILE-IN%, %MAKEFILE%, $(top_builddir)/config.status,
+       $(top_srcdir)/configure): Call the top-level am--refresh from
+       subdirectories.
+       ($(ACLOCAL_M4)): Depend upon %CONFIGURE_DEPS%.  Call the
+       top-level am--refresh when not in the top-level directory.
+       Fix jump directories for VPATH builds.
+       Suggested by Raja R. Harinath.
+
+2003-04-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
+       and glob for m4_files (We've got all local m4 files while
+       tracing m4_include's).  Diagnose ACLOCAL_M4_SOURCES as obsolete.
+       Distribute aclocal.m4 only at the top-level.
+       (my_glob): Remove.  This fixes PR automake/11.
+       (handle_dist): Strip leading `./' from directories.
+       * aclocal.in (add_file): Output 'm4_include([file.m4])' instead
+       of copying local files.
+       (write_aclocal, parse_arguments): Bump copyright date.
+       * configure.in: De not build m4/amversion.m4 from here ...
+       * m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here.
+       (nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead
+       of amversion.m4.
+       * tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test.
+       (TESTS): Remove aclocal2.test.  Do not test aclocal.test twice.
+       * tests/aclocal2.test: Delete (pointless).
+       * tests/aclocal5.test: Make sure configure's dependencies are
+       distributed.
+       * tests/acinclude.test: Adjust to search for m4_include.
+       * tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep
+       configure instead of aclocal.m4.
+
+       For PR automake/46:
+       * automake.in (scan_aclocal_m4): Work in all directories, not only
+       the top-level.  Prepend $(top_srcdir) in front of each aclocal.m4
+       dependency.
+       * lib/am/configure.am (config.status, configure, $(ACLOCAL_M4)):
+       Define rebuild rules in each directory.
+       * tests/subdir8.test: Augment to exercise aclocal.m4's dependencies
+       from the top-level directory.
+       * tests/aclocal5.test: New file.  Exercise aclocal.m4's dependencies
+       from a subdirectory.
+       * tests/Makefile.am (TESTS): Add aclocal5.test.
+       (XFAIL_TESTS): Replace subdir8.test by aclocal5.test.
+
+2003-04-24  Akim Demaille  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/46:
+       * lib/am/configure.am (%MAKEFILE-IN%): If Makefile.in is rebuilt
+       because of one of configure's dependencies, run automake without
+       argument to update the whole tree at once.  Depend upon
+       %CONFIGURE_DEPS%.
+       (%MAKEFILE%): If Makefile is rebuilt because config.status has
+       been updated, run config.status without arguments.
+       * automake.in (scan_autoconf_traces): Prepend $(top_srcdir)
+       before all files in @configure_deps.
+       * tests/subdir5.test: Modernize configure.in, make sure
+       maude/Makefile was actually created, and exercise %CONFIGURE_DEPS%.
+       * tests/subdir8.test: New file.
+       * tests/Makefile.am (TESTS): Add subdir8.test.
+       (XFAIL_TESTS): Replace subdir5.test by subdir8.test.
+
+2003-04-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Requirements): Typo in index
+       s/AC_CONFIG_FILE/AC_CONFIG_FILES/.
+
+       * lib/texinfo.tex: New upstream version.
+
+2003-04-21  Jim Meyering  <address@hidden>
+
+       * lib/mkinstalldirs: Remove each sequence of spaces before a
+       TAB character.
+       * lib/depcomp: Search for TAB-SPC, not SPC-TAB.
+
+2003-04-19  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/389:
+       * automake.in (handle_configure): Don't put $colon_infile in
+       CONFIG-MAKEFILE.
+       * tests/conff.test: New file.
+       * tests/Makefile.am (TESTS): Add conff.test.
+       Reported by Alexander Turbov.
+
+2003-04-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in: Handle required=etags to work around
+       Exuberant Ctags.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+       * tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test:
+       Distribute dejagnu test cases, so that distcheck actually runs them.
+
+2003-04-18  Richard Dawe  <address@hidden>
+
+       * lib/am/dejagnu.am (site.exp): Don't define tool in site.exp,
+       because we set that by invoking runtest with --tool.
+       * tests/Makefile.am (TESTS): Add dejagnu4.test, dejagnu5.test,
+       dejagnu6.test, dejagnu7.test.
+       * tests/dejagnu4.test: New test.
+       * tests/dejagnu5.test: New test.
+       * tests/dejagnu6.test: New test.
+       * tests/dejagnu7.test: New test.
+
+       * tests/dejagnu3.test: Make sure the DejaGnu test is actually run.
+
+2003-04-18  Jim Meyering  <address@hidden>
+
+       * automake.in (variable_output): Fix typo in comment s/is/if/.
+
+       * lib/am/yacc.am (?!GENERIC?%OBJ% aka .y.c): Don't redirect
+       directly to address@hidden  Instead, redirect to address@hidden and 
rename upon success.
+       Also, move the commands that update $@ so they are last.  Otherwise,
+       this rule could leave the user with an up to date target (.c file)
+       but with a missing or corrupted corresponding .h file.
+
+2003-04-17  Richard Dawe  <address@hidden>
+
+       * tests/defs.in: Handle required=runtest, to detect runtest
+       from DejaGnu.
+       * tests/Makefile.am (TESTS): Add dejagnu3.test.
+       * tests/dejagnu3.test: New test.
+
+2003-04-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (rule_define): If the user tries to override
+       an Automake which has a -local variant, suggest using the
+       -local variant in the -Woverride diagnostic.
+       (handle_factored_dependencies): Register factored
+       rules with rule_define, and define them only in undefined
+       conditions.
+       * tests/Makefile.am (TESTS): Add override.test.
+       * tests/overrid.test: New file.
+       * tests/phony.test: Count the number of .PHONY targets.
+
+2003-04-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distuninstallcheck, distcleancheck): Silence
+       these rules, so that we don't confuse users by echoing
+       "echo ERROR:" commands which are not run.
+
+2003-03-14  Richard Dawe  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (output_texinfo_build_rules, handle_texinfo_helper,
+       initialize_per_input):  Add infrastructure for generating HTML
+       documentation from texinfo source.
+       * lib/am/texinfos.am: Add rules for building HTML documentation
+       from texinfo source.
+       * lib/am/texibuild.am: Likewise.
+       * automake.texi (Texinfo): Document rules for building
+       HTML documentation from texinfo source.
+       * tests/txinfo21.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo21.test.
+       * tests/defs.in: Handle required=makeinfo-html.
+
+2003-04-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (%silent_variable_override): New variable.
+       (macro_define): Warn about variable definitions overriding
+       Automake variables.
+       (rule_define): Warn about target definitions overriding
+       Automake variables.  Fix $condmsg definition.
+       * automake.texi (Invoking Automake): Document the `override'
+       category.
+       * lib/Automake/ChannelDefs.pm (usage): Likewise.
+       * lib/am/texinfos.am [!%?CYGNUS] (MAKEINFO): Do not define,
+       this is already done in m4/init.m4.
+       * tests/dejagnu2.test: Run $MAKE, don't only grep.  Use
+       -Wno-override, and make sure we get a warning without.
+       * tests/exeext2.test, tests/substtarg.test: Use -Wno-override,
+       and make sure we get a warning without.
+       * tests/exeext3.test, tests/java2.test, tests/nolink.test,
+       tests/subpkg.test, tests/vartest.test: Use -Wno-override.
+       * tests/txinfo13.test: Use installcheck-local instead of overriding
+       installcheck.
+       * tests/txinfo2.test: Run $MAKE on the real Makefile (this test
+       used to succeed thanks to a failure...)
+       * tests/location.test: Adjust expected messages.
+       * tests/Makefile.am (XFAIL_TESTS): Add txinfo5.test.
+
+2003-04-12  Raja R Harinath  <address@hidden>
+
+       * lib/Automake/DisjConditions.pm (true): Don't cache answer.
+       (invert): Update comment.
+       (_simplify): Remove.
+       (simplify): Implement using invert().
+       * lib/Automake/tests/DisjConditions.pl (test_simplify):
+       Update to reflect changes.
+
+2003-04-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_files): Augment the error message
+       about AM_INIT_AUTOMAKE not found.
+       Suggested by Bruno Haible.
+
+       * lib/Automake/Version.pm: New file.
+       * lib/Automake/Makefile.am (dist_perllib_DATA): Add Version.pm.
+       * lib/Automake/tests/Version.pl: New file.
+       * lib/Automake/tests/Makefile.am (TESTS): Add Version.pl.
+       * tests/Makefile.am (TESTS): Remove version5.test.
+       * tests/version5.test: Delete.  Move the tests to Version.pl.
+       * automake.in (version_split, version_compare, version_check): Move ...
+       * lib/Automake/Version.pm (split, compare, check): ... here.
+
+2003-04-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/tests/Condition.pl (test_reduce_and)
+       (test_reduce_or): Cosmetics.
+       * lib/Automake/tests/DisjConditions.pl (test_sub_conditions):
+       Fix a comment.
+       * lib/Automake/DisjConditions.pm (sub_conditions): Add missing C<...>
+       in comment.
+       * tests/yacc8.test, configure.in: Update copyright year.
+
+2003-04-10  Richard Dawe  <address@hidden>
+
+       * configure.in: Get the build platform name.  Define
+       MODIFICATION_DELAY as the time to wait after modifying a file,
+       to cope with timestamp granularity issues, depending
+       on the platform.
+       * tests/defs.in: Define `sleep' using MODIFICATION_DELAY.
+
+2003-04-10  Eric Siegerman  <address@hidden>  (tiny change)
+
+       * automake.texi (Public macros): Clarify that the new
+       AM_INIT_AUTOMAKE variant is preferred, and the old one
+       deprecated.  Copy-edit the rest of the AM_INIT_AUTOMAKE item.
+       (Hello): Caution that the example uses the deprecated
+       AC_INIT/AM_INIT_AUTOMAKE syntax, and xref to the discussion.
+
+2003-04-10  Alexandre Duret-Lutz  <address@hidden>
+
+       Retain all variable definitions until the whole Makefile.am has
+       been processed, then output all variables in one step, at the top
+       of Makefile.in.  (Older revisions used to output user variables
+       before generating Automake targets, and to mix Automake variables
+       with Automake targets, preventing redefinitions of previously
+       output variables.)
+
+       * automake.in (%var_pretty): New variable.
+       (VAR_ASIS, VAR_PRETTY): New constants.
+       (@var_list): Rename as ...
+       (@var_order): ... this.
+       (initialize_per_input): Clear %var_pretty.
+       (handle_variables): New function, extracted from ...
+       (read_main_am_file): ... here.
+       (generate_makefile): Call handle_variable after everything else.
+       (handle_dist): Use define_pretty_variable, not pretty_print.
+       (pretty_print): Delete.
+       (macro_define): Augment with $COMMENT and $PRETTY parameters.
+       Update %var_comment, %var_pretty, and @var_order.  Adjust callers.
+       (variable_pretty_output): Merge with ...
+       (variable_output): ... this, and choose the prettiness on a
+       per-condition basis.
+       (append_comments): Delete.  This work is now done by macro_define.
+       (read_am_file, file_contents_internal): Don't call append_comments
+       nor update @var_list, adjust calls to macro_define.
+       (handle_subdirs): Don't explicitly output RECURSIVE_TARGETS,
+       just mark it as VAR_PRETTY.
+       * tests/exeext.test: Make sure bin_PROGRAMS is output only once.
+       Report from Jim Meyering.
+
+2003-04-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_installdirs): Rename as ...
+       (handle_install): ... this.  Define maybe_BUILT_SOURCES.
+       (generate_makefile): Adjust call to handle_install.
+       * lib/am/install.am (install): Use %maybe_BUILT_SOURCES%.
+       * automake.texi (Sources, Built sources example): BUILT_SOURCES
+       is honored by `make install' too.
+       * tests/check3.test: Make sure that `make install' also depends
+       upon BUILT_SOURCES.
+       Report from Alexander Turbov.
+
+       * lib/am/libs.am (ARFLAGS): Define.
+       * automake.in (handle_libraries): Use `$(ARFLAGS)' instead of
+       hard-coding `cru'.
+       * automake.texi (A Library): Explain how AR, ARFLAGS and RANLIB
+       are used, and how they can be overridden.
+       (Program and Library Variables): Adjust to show `$(ARFLAGS)'
+       instead of `cru'
+       * tests/ar.test: Rewrite to test for AR, ARFLAGS, and RANLIB.
+       * tests/ranlib.test: Delete, obsoleted by ar.test.
+       * tests/Makefile.am (TESTS): Remove ranlib.test.
+       Report from Paul Thomas.
+
+2003-04-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (check_trailing_slash): New function (variation on
+       a patch by Peter Muir).  Diagnose whitespaces following trailing
+       backslash.
+       (read_am_file): Use it.
+       * tests/backsl4.test: New file.
+       * tests/Makefile.am (TESTS): Add backsl4.test.
+       Reported by Peter Muir.
+
+2003-03-29  Raja R Harinath  <address@hidden>
+
+       Speedup Automake::DisjConditions::invert().
+       * lib/Automake/Condition.pm (multiply): New.
+       * lib/Automake/DisjConditions.pm (_multiply): Use it.
+       (sub_conditions): Likewise.
+
+       * lib/Automake/Condition.pm (reduce): Rename to ...
+       (reduce_and): ... this.
+       (reduce_or): New.
+       * lib/Automake/DisjConditions.pm (_multiply): Use reduce_or().
+       * lib/Automake/tests/Condition.pl (test_reduce): Rename to ...
+       (test_reduce_and): ... this.
+       (test_reduce_or): New.
+       * lib/Automake/tests/DisjConditions.pl
+       (test_invert): Update to reflect effect of reduce_or().
+       (test_simplify): Don't skip invert() on larger inputs.
+
+2003-03-29  Raja R Harinath  <address@hidden>
+
+       * tests/yacc8.test: Add a $sleep before modifying Makefile.am so
+       that timestamp will change.
+
+2003-03-23  Akim Demaille  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/tags.am (TAGS): Use --etags-include instead of --include,
+       when supported by etags (Exuberant Ctags).
+       * tests/tagsub.test: Rewrite to _run_ the `tags' rule.
+
+2003-03-20  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug #185388:
+       * automake.texi (Extending): Augment the install-exec-hook
+       discussion with an example how to symlink a versioned binary.
+       * tests/insthook.test: Rewrite to test the above example.
+       Report from James R. Van Zandt.
+
+2003-03-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Allow `automake:' tokens,
+       occuring in location.test.  Automake now has 5 legitimate
+       unsubstituted @address@hidden
+
+       * tests/aclocal4.test: Require GNU make.
+
+2003-03-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/aclocal4.test: New file.  Test for the ACLOCAL_M4 bug below.
+       * tests/Makefile.am (TESTS): Add aclocal4.test.
+
+2003-03-14  Jim Meyering  <address@hidden>
+
+       * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
+       subdirectories.  Makefile.in depends on that variable.
+
+2003-03-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/init.m4: Remove a leftover comment from the pre-1.7 era.
+
+       Fix for PR automake/386:
+       * m4/init.m4: Require Autoconf 2.55.
+       Reported by Owen Taylor.
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
+       (?GENERIC?%EXT%.lo): Use `mv -f' instead of `mv' in FASTDEP mode.
+       Suggested by Matthias Andree.
+
+       * tests/README: Typo.
+
+2003-03-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
+       (?GENERIC?%EXT%.lo): Hide the if/then/else machinery for FASTDEP.
+       Just echo the gcc command.
+       Suggested by Karl Berry.
+
+2003-03-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use
+       `test -f foo || echo $(srcdir)/` to emulate a VPATH search when
+       outputing suffix rules.  This follows 2003-02-25's change.
+       * lib/am/lex.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
+       * lib/am/yacc.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
+
+2003-03-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Requirements) <AC_CONFIG_FILES>: Files listed
+       with AC_CONFIG_FILES are cleaned by `make distclean'.  Don't
+       pretend otherwise.
+       Reported by Rafael Laboissiere.
+
+2003-03-04  Andreas Buening  <address@hidden>
+
+       * lib/mdate-sh: Find out which column of the ls -l output contains
+       the month. Do not assume it is at least the fifth column.
+
+2003-02-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Emacs Lisp): Mention that `dist_' can be used.
+
+       * automake.texi (Emacs Lisp): Instruct people to use lisp_DATA
+       instead of lisp_LISP when they don't want byte-compilation.
+       Don't mention ELCFILES anymore.
+       * automake.in (handle_data): Allow lisp_DATA.
+       * tests/lisp5.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp5.test.
+
+       * automake.in (handle_emacs_lisp): Don't build *.elc files
+       if ELCFILES was set empty.
+       * tests/lisp4.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp4.test.
+       Reported by Simon Josefsson.
+
+       * tests/lex3.test, tests/lex5.test: Require flex.
+       Reported by Leo Davis.
+
+2003-02-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
+       use the `test -f foo || echo $(srcdir)/` to emulate a VPATH search
+       when outputing suffix rules.
+       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.dvi)
+       (?GENERIC?%SOURCE_SUFFIX%.pdf): Likewise.
+       Suggested by Bruno Haible.
+
+       * automake.in (read_am_file): Catch trailing backslashes on last line.
+       * tests/backsl3.test: New file.
+       * tests/Makefile.am (TESTS): Add backsl3.test.
+       Reported by Akim Demaille.
+
+2003-02-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * ChangeLog: Move 2002's entries to ...
+       * ChangeLog.02: ... this new file.
+       * Makefile.am (EXTRA_DIST): Add ChangeLog.02.
+
+2003-02-24  Richard Dawe  <address@hidden>
+
+       * tests/version7.test: Use $sleep to sleep before updating
+       the version, to work around timestamp inconsistencies in Windows.
+
+2003-02-24  Bruno Haible  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texibuild.am: Don't remove the target info files. Instead,
+       back up and restore them if makeinfo fails.
+       * tests/txinfo20.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo20.test.
+
+2003-02-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
+       (distcleancheck): Fix typos and other errors reported by Karl
+       Berry.
+
+2003-02-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Use $(...)
+       instead of ${...}.
+
+       * tests/defs.in: Handle required=ro-dir.
+       * tests/destdir.test: Use this.
+
+2003-02-19  Richard Dawe  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Strip any leading DOS drive
+       from dc_install_base.
+
+2003-02-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texinfos.am (install-info-am, uninstall-info-am): Install
+       DJGPP-style *.iNN info files.
+       (maintainer-clean-aminfo): Rewrite using the same pattern
+       as in uninstall-info-am.
+       * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Erase
+       DJGPP-style *.iNN info files before running $(MAKEINFO).
+       * tests/txinfo19.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo19.test.
+
+2003-02-18  Richard Dawe  <address@hidden>
+
+       * lib/depcomp (dashmstdout): Cope with DOS filenames in
+       dependencies.
+
+2003-02-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/depcomp (makedepend): Don't pass $object to makedepend.
+       Reported by Stepan Kasal.
+
+2003-02-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in: Handle required=makedepend.
+
+       * Makefile.am (maintainer-check): Update the diff check
+       to account for the recent @SHELL@ substitution.
+
+2003-02-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/depcomp: Do not put comments on the `icc)' line.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+       Fix for PR automake/381:
+       * automake.in (handle_gettext): Do not print diagnostics
+       about po/ and intl/ missing from SUBDIRS if po/ does not
+       exist.  Warn if `SUBDIRS = intl' is used although libintl
+       is 'external'.
+       * tests/gettext.test: Make sure diagnostics are not output
+       when po/ does not exist.
+       * tests/gettext2.test: Test for unwanted intl/.
+       PR from Alexander Turbov, fix suggested by Bruno Haible.
+
+       * m4/depend.m4: Grep depcomp's stderr for icc warnings about
+       ignored options.
+       * lib/depcomp (icc): New mode.
+       * tests/depcomp5.test: New file.
+       * tests/defs.in: Handle required=icc.
+       * tests/Makefile.am (TESTS): Add it.
+
+       Temporary hack for PR automake/381:
+       * automake.in (handle_gettext): Turn missing po/ and intl/ errors
+       into -Wsyntax warnings.
+
+2003-02-10  Richard Dawe  <address@hidden>
+
+       * Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
+       This makes the setting of SHELL work for DJGPP.
+
+2003-02-10  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/385:
+       * lib/depcomp (makedepend): Strip any libtool call, before
+       running makedepends.
+       * tests/depcomp4.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Reported by Jeff Squyres.
+
+       Related to PR automake/385:
+       * lib/depcomp (dashmstdout): Do not use `-o /dev/null', or gcc will
+       write dependencies to /dev/null.  `-o /dev/null' was added
+       on 2002-06-13 just because I tried to replace `-o foo.o' by something
+       else and didn't thought about removing it entirely.
+       * tests/depcomp3.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+       * automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
+       SHELL for DJGPP.
+       Suggested by Richard Dawe.
+
+2003-02-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
+       (distcleancheck): New nodes.
+
+2003-02-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_files): Don't complain that
+       AM_INIT_AUTOMAKE comes from an old version if it was not found.
+
+2003-02-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (am_install_var): Simplify filtering of
+       variable_loc_and_value_as_list_recursive's output.
+
+2003-02-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Recompute
+       indexes of header files so we create stamp files with
+       the right numbers when config.status is run on some headers.
+       * tests/stamph2.test: Check for this.
+       Reported by Sander Niemeijer.
+
+2003-02-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (vars_scanned): Move near traverse_variable_recursively.
+       (traverse_variable_recursively,
+       traverse_variable_recursively_worker): Accept a $COND_FILTER argument
+       to filter out conditions during recursion.  Don't recurse into
+       undefined variables.  Don't pass empty results to &FUN_COLLECT.
+       (value_to_list): Remove, was used by
+       variable_value_as_list_recursive_worker only.
+       (variable_value_as_list_recursive_worker): Rewrite using
+       traverse_variable_recursively.  Remove the $parent argument.
+       (variable_value_as_list_recursive,
+       variable_loc_and_value_as_list_recursive): Adjust calls
+       to variable_value_as_list_recursive_worker.  Don't reset
+       %vars_scanned.
+       * tests/cond3.test: Don't expect empty helper variables,
+       we don't output them anymore.
+       * tests/cond30.test: Use an undefined variable.
+
+       * automake.in (handle_programs): Strip $(EXEEXT) before
+       calling &check_canonical_spelling.
+       * tests/exeext.test: Make sure we don't use a
+       maude3__EXEEXT__OBJECTS variable.
+
+2003-02-02  Jeremy Nimmer  <address@hidden>  (tiny change)
+
+       For Debian Bug #39542:
+       * automake.texi (Invoking Automake, Optional): Document how
+       AC_CONFIG_AUX_DIR interacts with missing files.
+
+2003-02-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/DisjConditions.pm (_permutations_worker)
+       (permutations): Remove, so that people aren't tempted to use it.
+       * lib/Automake/tests/DisjConditions.pl (tests_permutations): Remove.
+
+       * automake.in (variable_conditions_recursive): Remove.
+       (variable_conditionally_defined): Rewrite using
+       traverse_variable_recursively.
+
+       * automake.in (traverse_variable_recursively,
+       traverse_variable_recursively_worker): Pass one merged Condition
+       instead of a stack of conditions to &FUN_STORE and &FUN_COLLECT.
+       (transform_variable_recursively, define_objects_from_sources)
+       (handle_lib_objects, variable_conditions_recursive): Adjust usage.
+
+2003-02-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_lib_objects): Compute _DEPENDENCIES variables
+       using transform_variable_recursively instead of
+       variable_conditions_recursive and variable_value_as_list_recursive
+       to avoid combinatorial explosion.
+       (handle_lib_objects_cond): Merge into handle_lib_objects.
+       * tests/cond11.test: Don't grep internal details in Makefile.in,
+       run $MAKE to make sure the resulting Makefile runs as expected.
+       * tests/cond29.test: Also exercise conditional _LDADD.
+       * tests/cond31.test, tests/cond32.test: New files.
+       * tests/Makefile.am (TESTS): Add tests/cond31.test and
+       tests/cond32.test.
+
+2003-01-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_lib_objects_cond): Ignore -dlopen and
+       -dlpreopen in _LIBADD variables too.
+       (handle_LIBOBJS, handle_ALLOCA): New functions, extracted from
+       handle_lib_objects_cond.
+       * tests/libtool7.test: New file.
+       * tests/Makefile.am (TESTS): Add libtool7.test.
+
+       * automake.texi (Program and Library Variables): Clarify that
+       _LIBADD is for libraries and _LDADD for programs.
+
+       * automake.in (handle_source_transform): Correct typo from 2003-01-23.
+
+2003-01-28  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/352:
+       * automake.in (transform_variable_recursively): If the destination
+       and the source variables are the same, delete the source variable
+       before defining the destination variable.
+       (handle_programs): Strip any $(EXEEXT) suffix from $one_file,
+       or this will confuse handle_source_transform.
+       (append_exeext): Rewrite using transform_variable_recursively.
+       * tests/cond29.test, tests/cond30.test: New files.
+       * tests/exeext.test: Run ./configure and make, this uncovered
+       the above handle_programs issue.
+       * tests/Makefile.am (TESTS): Add cond29.test and cond20.test.
+
+       * automake.in (%subobjvar): Replace by ...
+       (%gen_varname): ... this.
+       (subobjname): Replace by ...
+       (gen_varname): ... this.
+       (initialize_per_input): Clean gen_varname instead of subobjname.
+       (transform_variable_recursively): New function, extracted
+       from define_objects_from_sources.
+       (define_objects_from_sources): Use transform_variable_recursively.
+       Remove the unused $parent argument.
+       (handle_source_transform): Adjust call to define_objects_from_sources.
+
+2003-01-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (@substfroms, @substtos): Move near
+       traverse_variable_recursively.
+       (traverse_variable_recursively, traverse_variable_recursively_worker):
+       New functions, extracted from define_objects_from_sources.
+       (define_objects_from_sources): Rewrite using
+       traverse_variable_recursively.
+       (handle_source_transform): Use variables_conditionally_defined
+       instead of calling variable_conditions_recursive directly.
+       Adjust the call to define_objects_from_sources; there is no need
+       to reset @substtos, @substfroms, and %vars_scanned now.
+       (variable_conditions_recursive): Rewrite using
+       traverse_variable_recursively.
+       (variable_conditions_recursive_sub): Remove.
+       (variable_conditionally_defined): Fix condition comparison (the
+       consequence was that DIST_SUBDIRS was always output).
+       * lib/Automake/Condition.pm (merge): Allow merging several
+       conditions at once.
+
+2003-01-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.texi (Python): Explain that directory variables start
+       with either ${prefix} or ${exec_prefix}, and point to the
+       `Installation Directory Variables' section of the Autoconf manual.
+
+2003-01-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (top_distdir, distdir): Define these
+       variables only in top level Makefile.  Redefine $(top_distdir)
+       as $(distdir).
+       (distdir): Fix passing of $(top_distdir) to sub-makes.
+       * automake.in (handle_dist): Do not define the DISTDIR and
+       TOP_DISTDIR transformations.  We don't need them anymore.
+       * automake.texi (Dist): Reorder the dist-hook section, and move
+       the DIST_SUBDIRS paragraph earlier.  Document distdir and
+       top_distdir.
+       * tests/subpkg.test: Update to check for $(distdir) and
+       $(top_distdir).
+
+2003-01-19  Alexandre Duret-Lutz  <address@hidden>
+
+       Rename more files to accomodate 8+3 file systems, and adjust the
+       vocabulary at the same time: AM_CONDITIONAL defines "conditionals",
+       and we call "condition" a conjunction of "conditionals".
+       * lib/am/Conditional.pm: Rename to lib/am/Condition.pm.
+       * lib/am/tests/Conditional.pl: Rename to lib/am/tests/Condition.pl.
+       * lib/am/ConditionalSet.pm: Rename to lib/am/DisjConditions.pm.
+       * lib/am/tests/ConditionalSet.pl: Rename to
+       lib/am/tests/DisjConditions.pl
+       * lib/am/Conditional.pm (condition_negate): Rename to ...
+       * lib/am/Condition.pm (conditional_negate): ... this.
+       * automake.in: Adjust references to Condition and DisjConditions.
+       (check_ambiguous_conditional, conditional_ambiguous_p): Rename to ...
+       (check_ambiguous_condition, condition_ambiguous_p): ... these.
+
+       * tests/README: New file.
+
+       * automake.texi (Conditional Programs): Show a sample Makefile.am.
+       Remind $(EXEEXT) must be appended to configure substitutions.
+       Show how Automake conditionals can be used instead.
+       * tests/exeext.test (check_PROGRAMS): Make sure EXEEXT is also
+       appended to conditionally defined programs.
+
+2003-01-16  Jim Meyering  <address@hidden>
+
+       Accept --help and --version, and lots of syntactic clean-up.
+       * lib/install-sh: Use consistent indentation, two spaces per level.
+       (scriptversion): New variable.
+       Change initializations like `variable=""' to `variable='.
+       (usage): New variable.
+       Use `test', not `['.
+       Use `test -z "$var"', not `[ x"$var" = x ]'.
+       Use `test -n "$var"', not `[ x"$var" != x ]'.
+       Alphabetize case entries.
+       Accept --help and --version options.
+       Remove unnecessary `else :' clauses.
+       Add a `Local variables' eval block to help emacs users update
+       the time-stamp variable added above.
+       Mostly from Karl Berry.
+
+2003-01-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (AM_PATH_PYTHON) <_AM_PYTHON_INTERPRETER_LIST>: Add
+       python2.3.
+
+       * m4/python.m4 (AM_PATH_PYTHON): Query distutils for `pythondir'
+       or `pyexecdir', for the sake of 64-bit distributions that usually
+       use lib64/ instead of lib/.  Fall back to the default directory
+       if it doesn't work.
+       Suggested by Gwenole Beauchesne.
+
+2003-01-14  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/382:
+       * automake.texi (Yacc and Lex): Document `AM_YFLAGS = -d'.
+       Explain BUILT_SOURCES is usually needed in this case.
+       Reported by William S Fulton.
+
+2003-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       Rename some files for the sake of 8+3 file systems.
+       * tests/aclocali.test:     Rename to tests/aclocal.test.
+       * tests/aclocali1.test:    Rename to tests/aclocal2.test.
+       * tests/aclocalii.test:    Rename to tests/aclocal3.test.
+       * tests/acoutput.test:     Rename to tests/acoutpt.test.
+       * tests/acoutput2.test:    Rename to tests/acoutpt2.test.
+       * tests/acouttbs.test:     Rename to tests/acoutbs.test.
+       * tests/acouttbs2.test:    Rename to tests/acoutbs2.test.
+       * tests/autoheader.test:   Rename to tests/autohdr.test.
+       * tests/autoheader2.test:  Rename to tests/autohdr2.test.
+       * tests/condincl.test:     Rename to tests/condinc.test.
+       * tests/condincl2.test:    Rename to tests/condinc2.test.
+       * tests/distcommon.test:   Rename to tests/distcom.test.
+       * tests/distcommon2.test:  Rename to tests/distcom2.test.
+       * tests/distcommon3.test:  Rename to tests/distcom3.test.
+       * tests/installsh.test:    Rename to tests/instsh.test.
+       * tests/installsh2.test:   Rename to tests/instsh2.test.
+       * tests/instdata.test:     Rename to tests/instdat.test.
+       * tests/instdata2.test:    Rename to tests/instdat2.test.
+       * tests/libobj12b.test:    Rename to tests/libobj13.test.
+       * tests/link_f_c.test:     Rename to tests/link_fc.test.
+       * tests/link_f_c_cxx.test: Rename to tests/link_fccxx.test.
+       * tests/link_f_cxx.test:   Rename to tests/link_fcxx.test.
+       * tests/nodefine.test:     Rename to tests/nodef.test.
+       * tests/nodefine2.test:    Rename to tests/nodef2.test.
+       * tests/required.test:     Rename to tests/reqd.test.
+       * tests/required2.test:    Rename to tests/reqd2.test.
+       * tests/sourcesub.test:    Rename to tests/srcsub.test.
+       * tests/sourcesub2.test:   Rename to tests/srcsub2.test.
+       * tests/specflags.test:    Rename to tests/specflg.test.
+       * tests/specflags2.test:   Rename to tests/specflg2.test.
+       * tests/specflags3.test:   Rename to tests/specflg3.test.
+       * tests/specflags6.test:   Rename to tests/specflg6.test.
+       * tests/specflags7.test:   Rename to tests/specflg7.test.
+       * tests/specflags8.test:   Rename to tests/specflg8.test.
+       * tests/specflags9.test:   Rename to tests/specflg9.test.
+       * tests/subdircond.test:   Rename to tests/subcond.test.
+       * tests/subdircond2.test:  Rename to tests/subcond2.test.
+       * tests/subdircond3.test:  Rename to tests/subcond3.test.
+       * tests/texinfo.test:      Rename to tests/txinfo.test.
+       * tests/texinfo2.test:     Rename to tests/txinfo2.test.
+       * tests/texinfo3.test:     Rename to tests/txinfo3.test.
+       * tests/texinfo4.test:     Rename to tests/txinfo4.test.
+       * tests/texinfo5.test:     Rename to tests/txinfo5.test.
+       * tests/texinfo6.test:     Rename to tests/txinfo6.test.
+       * tests/texinfo7.test:     Rename to tests/txinfo7.test.
+       * tests/texinfo8.test:     Rename to tests/txinfo8.test.
+       * tests/texinfo9.test:     Rename to tests/txinfo9.test.
+       * tests/texinfo10.test:    Rename to tests/txinfo10.test.
+       * tests/texinfo13.test:    Rename to tests/txinfo13.test.
+       * tests/texinfo16.test:    Rename to tests/txinfo16.test.
+       * tests/texinfo17.test:    Rename to tests/txinfo17.test.
+       * tests/texinfo18.test:    Rename to tests/txinfo18.test.
+       * tests/Makefile.am (TESTS): Adjust.
+       * ChangeLog.1996: Rename to ChangeLog.96.
+       * ChangeLog.1998: Rename to ChangeLog.98.
+       * ChangeLog.2000: Rename to ChangeLog.00.
+       * ChangeLog.2001: Rename to ChangeLog.01.
+       * Makefile.am (EXTRA_DIST): Adjust.
+       Reported by Richard Dawe.
+
+2003-01-13  Richard Dawe  <address@hidden>  (tiny change)
+
+       * lib/am/distdir.am (distcheck): '=' is not valid in DOS filenames.
+       Use '_build' and '_inst' instead of '=build' and '=inst'.
+       * tests/man2.test: Reflect change automake: check for files in
+       '_build' and '_inst' directories instead of '=build' and '=inst'.
+
+2003-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       Use `_dirstamp' when the file-system doesn't support `.dirstamp'.
+       * m4/lead-dot.m4: New file.
+       * m4/Makefile.am (dist_m4data_DATA): Add lead-dot.m4
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_LEADING_DOT.:
+       * m4/depend.m4 (AM_SET_DEPDIR): Require AM_SET_LEADING_DOT. Define
+       DEPDIR using am__leading_dot.
+       * automake.in (require_build_directory): Define am__dirstamp, a new
+       variable for the dirstamp basename, based on am__leading_dot.
+       * tests/subobj6.test: Move all `test -f' into Makefiles, so we can
+       use $(am__dirstamp).
+       Reported by Richard Dawe.
+
+       * tests/gnits2.test, tests/pr300-prog.test, tests/transform.test:
+       Move all `test -f' into Makefiles, so we can honor $(EXEEXT) when
+       testing for programs.
+       Reported by Richard Dawe.
+
+2003-01-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Suggest using $sleep instead of
+       sleep 2.
+       * tests/defs.in (sleep): New variable.
+       * tests/asm.test, tests/confsub.test, tests/lisp3.test,
+       tests/texinfo16.test, tests/warnopts.test, tests/yaccvpath.test:
+       Use $sleep instead of sleep 2, to work around timestamp
+       inconsistencies in Windows.
+       Reported by Richard Dawe.
+
+       * Makefile.am (maintainer-check): Do not require SHELL=/bin/sh
+       after $MAKE -e.
+       * tests/ansi3.test, tests/ansi5.test, tests/cond22.test,
+       tests/man2.test, tests/subobj3.test, tests/suffix8.test,
+       tests/suffix11.test: Do not set SHELL=/bin/sh after $MAKE -e.
+       $SHELL is overridden by tests/defs, so it won't hurt even
+       if $MAKE -e uses the $SHELL envvar.
+       * tests/ansi.test, tests/insh2.test, tests/texinfo.test,
+       tests/texinfo8.test: Use SHELL=$SHELL, not SHELL=/bin/sh.
+       Reported by Richard Dawe.
+
+       Build elisp files all at once instead of one by one.
+       * automake.in (handle_emacs_lisp): Define am__ELFILES.  Add
+       elc-stamp to all's dependencies.
+       * lib/am/lisp.am (elc-stamp): New rule, build all *.elc files.
+       (.el.elc): Rewrite to call elc-stamp if $@ doesn't exist.
+       (clean-lisp): Clean elc-stamp.
+       * lib/elisp-comp: Reindent.  Erase the temporatry directory
+       from a trap.  Propagate Emacs's exit status.
+       * tests/lisp3.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp3.test.
+       Reported by Ryan T. Sammartino.
+
+2003-01-09  Akim Demaille  <address@hidden>
+
+       * automake.texi: Prefer $(FOO) to @FOO@ in the documentation.
+
+2003-01-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
+       variables.  Suggested by Ryan T. Sammartino.
+
+2003-01-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (macro_define): Add missing `{$cond}' (typo from
+       2002-09-18).
+       ($gen_copyright): Append year 2003.
+       (version): Increase year.
+
+       * tests/defs.in: Substitute aclocaldir instead of running
+       the installed aclocal.  Otherwise Libtool and Gettext
+       tests get skipped when aclocal doesn't preexist.
+       Reported by Imacat.
+       * tests/listval.test, tests/suffix2.test: Remove pointless -I
+       argument to aclocal.
+
+-----
+
+Copyright (C) 2003-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.04 b/old/ChangeLog.04
new file mode 100644
index 0000000..111f87b
--- /dev/null
+++ b/old/ChangeLog.04
@@ -0,0 +1,1623 @@
+2004-12-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/man2.test, tests/transform.test: Specify --mandir, in order
+       not to fail when Autoconf changes its $mandir default.
+
+2004-12-30  Alexandre Duret-Lutz  <address@hidden>
+
+       Support for `install-dvi', `install-html', `install-ps', and
+       `install-pdf', as recently introduced into the GNU Coding
+       Standard.
+
+       * automake.in (handle_factored_dependencies): Reject
+       uninstall-dvi-local, uninstall-html-local, uninstall-info-local,
+       uninstall-ps-local, and uninstall-pdf-local.  Allow
+       install-info-local even when no-installinfo is not used.
+       (handle_data): Allow datarootdir, dvidir, htmldir, pdfdir, and psdir.
+       (%standard_prefix): Declare these new standard directory variables.
+       * doc/automake.texi (Texinfo, Third-Party Makefiles): Document
+       install-dvi, install-html, install-pdf, and install-ps.
+       (Extending): Document install-local-dvi, install-local-html,
+       install-local-info, install-local-pdf, and install-local-ps.
+       * lib/Automake/Rule.pm (%dependencies): Add new install rules,
+       and remove uninstall-info.
+       * /cvs/automake/automake/lib/am/texinfos.am (install-dvi,
+       install-dvi-am, install-dvi-recursive, install-html,
+       install-html-am, install-html-recursive, install-pdf,
+       install-pdf-am, install-pdf-recursive, install-ps, install-ps-am,
+       install-ps-recursive, uninstall-dvi-am, uninstall-html-am,
+       uninstall-pdf-am, uninstall-ps-am): New rules.
+       (uninstall-info): Delete.
+       * tests/txinfo21.test: Augment to check for these new rules.
+       * tests/exdir2.test: Do not use `htmldir' as example of
+       undefined directory.
+       * tests/overrid.test: Do not be fooled by install-ps and
+       install-html.
+       * tests/txinfo10.test: Do not grep for uninstall-info-recursive.
+
+2004-12-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (Preprocessed Fortran): Fix the definition of FCLINK.
+
+       * Makefile.am (maintainer-check): Refine check for @_ in scalar
+       context.  Check for correct use of PRE_INSTALL, NORMAL_INSTALL,
+       POST_INSTALL, PRE_UNINSTALL, NORMAL_UNINSTALL, and POST_UNINSTALL.
+       * lib/am/texinfos.am (uninstall-info-am): Hide the invocation of
+       $(PRE_UNINSTALL).
+2004-12-27  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/texinfos.am (uninstall-info-am): Show change of
+       directory while uninstalling DJGPP-style info files.
+
+2004-12-27  Alexandre Duret-Lutz  <address@hidden>
+
+       Declare recursive install targets as dependencies of `.MAKE', so
+       that `make -n install' works with BSD Make too.
+
+       * lib/Automake/Rule.pm (reset) <%dependencies>: Add `.MAKE'.
+       * automake.in (target_cmp): Move all `.XYZ' target last, not
+       only `.PHONY'.
+       (handle_factored_dependencies): Add target with hooks to `.MAKE'.
+       Do not let a user definition of .MAKE override ours.
+       * lib/am/install.am (install-am, install-strip): Mark as `.MAKE'.
+       * lib/am/multilib.am (all-multi, install-multi, mostlyclean-multi,
+       clean-multi, distclean-multi, maintainer-clean-multi): Likewise.
+       * lib/am/subdirs.am (mostlyclean-recursive, clean-recursive,
+       distclean-recursive, maintainer-clean-recursive): Likewise.
+
+2004-12-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config-ml.in, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: New upstream versions.
+
+       * doc/automake.texi (gettext): Move the paragraph about
+       dist_list_LISP...
+       (Emacs Lisp): ... here.
+       Report from Bruno Haible.
+
+       * doc/automake.texi: Bump GFDL version to 1.2, since that is
+       what we distribute.
+
+       * doc/automake.texi: Fix more misuses of @ref, @xref and @pxref,
+       including some of the "corrections" below.  Thanks to Karl Berry.
+
+       * doc/automake.texi: Correct several misuses of @xref and @pxref.
+
+2004-12-17  Jim Meyering  <address@hidden>
+
+       * install-sh: Use `(exit N); exit N', not `(exit N); exit'.
+       Otherwise, install-sh could exit with improper exit status when
+       exiting via a trapped interrupt.  Thanks to a report from Bob Proulx.
+
+2004-12-14  Akim Demaille  <address@hidden>
+
+       * doc/automake.texi (Options): Englishoes.
+       (Options): And another.
+
+2004-12-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * ChangeLog.03: New file, extracted from ChangeLog.
+       * Makefile.am (EXTRA_DIST): Add it.
+
+2004-12-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (check_user_variables): New function, extracted
+       from ...
+       (handle_languages): ... here.
+       (handle_languages, define_compiler_variable, define_link_variable):
+       Honore LIBTOOLFLAGS.
+       (handle_single_transform): Check _LIBTOOLFLAGS in
+       addition to other per-target flags for Libtool objects.
+       (handle_libtool): Warn if LIBTOOLFLAGS is defined.
+       * doc/automake.texi (Libtool Flags, Program and Library Variables,
+       Flag Variables Ordering): Document LIBTOOLFLAGS.
+       * tests/libtool7.test: Check basic support for LIBTOOLFLAGS.
+       * tests/libtool8.test: Make sure Automake warns about LIBTOOLFLAGS
+       definitions.
+       * tests/subobj9.test: Adjust.
+
+2004-12-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Per-Object Flags): New node.
+
+2004-12-09  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix PR automake/441:
+       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Do
+       not install *.class if "$(%DIR%_JAVA)" is empty.
+       * tests/java3.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Report from Johannes Nicolai.
+
+       * doc/automake.texi (Java): Mention dist_ and add an example.
+       * tests/java.test: Do actually compile java files and run distcheck.
+
+2004-12-08  Peter O'Gorman  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/FileUtils.pm (dir_has_case_matching_file,
+       reset_dir_cache): New functions.
+       * automake.in (handle_dist, require_file_internal): Use them, so
+       that CHANGELOG is not confused with ChangeLog on case-insensitive
+       case-preserving file systems.
+       * tests/hfs.test: New file.
+       * tests/Makefile.am (TESTS): Add hfs.test.
+
+2004-12-08  Paul Eggert  <address@hidden>
+
+       * lib/mdate-sh: Don't use "set - x`$ls_command /`", as zsh mishandles
+       the spaces inside $ls_command.  Problem reported by Loulou Pouchet in
+       <http://lists.gnu.org/archive/html/autoconf/2004-12/msg00074.html>.
+       Don't use "set - x"; plain "set x" is enough, and simplifies debugging.
+
+2004-12-05  Toshio Kuratomi  <address@hidden>
+
+       * lib/py-compile: Add --destdir switch to py-compile that takes a
+       path argument that is not compiled into the file when byte compiling.
+       * lib/am/python.am: Use the new py-compile arguments to not include
+       DESTDIR in the byte compiled files.
+       * tests/python12.test: Test that DESTDIR won't be byte compiled into
+       python files.
+
+2004-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Clean): Typo.
+
+       * doc/automake.texi: Use @acindex for Autoconf macros, and @vindex
+       for variables (@cvindex was previously used for both).  Separate
+       these two indices in the output.  Use @code, @file, and @command
+       in @cindex lines wherever appropriate so they render nicely.
+
+2004-12-05  Stepan Kasal  <address@hidden>
+
+       * doc/automake.texi (renamed objects, CVS): Typos.
+
+2004-12-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Flag Variables Ordering): New section.
+       (User Variables, Program and Library Variables): @xref it.
+
+2004-11-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Conditional Subdirectories): More comments
+       about non-distributed subdirectories.
+
+       * Makefile.am (maintainer-clean): Check for unescaped @ in manual.
+
+2004-11-24  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Built sources example): Fix typo.
+
+2004-11-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (parse_arguments): Diagnose abbreviation ambiguous with
+       --help or --version.
+       * automake.in (parse_arguments): Likewise.
+       * tests/aclocal.test, tests/automake.test: Check this.
+       Report from Eric Blake.
+
+2004-11-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (parse_arguments): Diagnose empty arguments, options
+       with missing argument, and support `--'.
+       * aclocal.in (parse_arguments): Diagnose options with missing
+       argument.
+       * tests/aclocal.test: More checks.
+       * tests/automake.test: New file.
+       * tests/postprog.test: Use `--' for fun.
+       * tests/Makefile.am (TESTS): Add automake.test.
+       Report from Eric Blake.
+
+       * lib/am/progs.am (installcheck-%DIR%PROGRAMS): Run programs with
+       /dev/null as input, so we do not hang on programs that read their
+       input without supporting --help and --version.
+       * lib/am/scripts.am (installcheck-%DIR%SCRIPTS): Likewise for scripts.
+       * tests/gnits2.test: Change scriptnok.sh to cat its input.
+       Report and fix from James Youngman.
+
+2004-11-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (%file_seen): Rename as ...
+       (%file_added): ... this, and move it close to add_file(), the only
+       function that uses it.
+
+       * aclocal.in (version): Remove initial blank line and reproduce
+       the layout of automake --version.  From Art Haas.
+
+       * aclocal.in (%file_type, FT_USER, FT_AUTOMAKE_SYSTEM): New variables.
+       (scan_m4_dirs): New function, extracted from ...
+       (scan_m4_files): ... here.  Call scan_m4_files three times, for each
+       FT_ constant.
+       (scan_file): Take a file type argument to update %file_type.
+       (write_aclocal): Do not m4_include files that are not of type FT_USER.
+       * tests/dirlist.test: Make sure m4_include is not used for --acdir
+       files.
+
+       * tests/defs.in (testaclocaldir): New variable.
+       * tests/aclocal.test: Use it to fix the test.  Report from
+       Patrick Welche.
+
+2004-11-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (AM_PATH_PYTHON): Fix the invocation of
+       AC_PATH_PROGS to correctly define PYTHON as `:' when no interpreter
+       is found (this worked correctly only when a minimal version was
+       passed to AM_PATH_PYTHON).  Report from Stepan Kasal.
+       (_AM_PYTHON_INTERPRETER_LIST): Define using m4_define_default,
+       so we can easily override the list from the test suite.
+       * tests/python11.test: New file.
+       * tests/Makefile.am (TESTS): Add python11.test.
+
+       * doc/automake.texi (Libtool Modules): Make clearer that -module
+       should appear explicitly in _LDFLAGS.
+
+2004-11-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (parse_arguments): Correctly recognize --print-ac-dir.
+       * tests/aclocal.test: Check --print-ac-dir and a unknown option.
+
+       * aclocal.in (parse_arguments): Fix detection of unexisting default
+       $(datadir)/aclocal.  Report from Akim.
+
+2004-11-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in ($acdir): Rename as ...
+       (@system_includes): ... this.
+       (@user_includes, @automake_includes): New variables.
+       ($default_acdir, $default_dirlist): Remove.
+       (parse_arguments): Populate @user_includes, @automake_includes, and
+       @system_includes instead of filling a unique @dirlist array.
+       ("MAIN"): Adjust to scan m4 files in @user_includes,
+       @automake_includes, and @system_includes.
+
+2004-11-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (parse_arguments): Correct comment.  From Akim.
+
+2004-11-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in: Use Automake::ChannelDefs, and adjust all output
+       to be done via `fatal', `msg', `verb', or `prog_error'.
+       (version): New function.
+       (parse_arguments): Rewrite using Getopt::Long, call &version, and
+       honor -W and --warning.
+       ($verbose): Remove.
+       (trace_used_macros): Do not trace the first arguments of macros
+       for which we do not need it.  This caused failures because of
+       unexpected newlines in the output.
+       * doc/automake.texi (aclocal options): Document -W and --warning.
+       * tests/defs.in (ACLOCAL): Always use -Werror, to catch Perl
+       warnings about uninitialized variables.
+
+2004-11-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in: Do not distinguish VERBOSE=x from
+       VERBOSE=anything_but_x, always turn on shell traces.
+
+       * aclocal.in (write_aclocal): Make sure $map_traced_defs{$m} exists
+       before using it.  Suppress a warning observable in test/acloca16.test.
+       Report from Ralf Wildenhues.
+
+2004-11-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/XFile.pm (lock): Make sure $ENV{'MAKEFLAGS'} exists
+       before inspecting it; this fixes "uninitialized value in
+       concatenation" diagnostics when flock fails.
+       Report from Gary V. Vaughan.
+
+       * aclocal.in: Use strict and -w.  Declare local variables with `my',
+       and get rid of `local'.
+       (scan_m4_files, add_macro): Reindent these functions while we are
+       at it.
+
+       * lib/config.guess, lib/texinfo.tex: New upstream versions.
+
+       * doc/automake.texi (LIBOBJS): Spelling and grammar corrections
+       from Ralf Wildenhues.
+
+2004-10-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (LIBOBJS): Augment with an example setup.
+       (LTLIBOBJ): Rename as ...
+       (LTLIBOBJS): ... this.  Link to LIBOBJS, and mention LTALLOCA.
+
+2004-10-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi: Untabify, tabs in the examples are poorly
+       rendered.
+       * Makefile.am (maintainer-check): Grep tabs in the manual.
+
+       * tests/comment8.test: Use $MAKE, not make.
+
+2004-10-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/distcom3.test: Typo.
+
+2004-10-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Libtool Convenience Libraries): Explain how
+       to force the linker selection.
+
+       * lib/install-sh: Fix the dirname emulation to ignore trailing
+       slashes, i.e., the direname of `a/b/' is `a', not `a/b/'.  This
+       caused `install-sh a/b/' to fail.
+       * tests/instsh2.test: Augment.
+       Report from Пухальский Юрий Андреевич.
+
+2004-10-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (get_object_extension): The extension to use is know
+       by the caller, and cannot be selected by looking only at the
+       target name.  Simplify this function to simply conditionally
+       prepend $U to the given extension.
+       (handle_programs, handle_libraries, handle_ltlibraries): Hard-code
+       the extension to use.  This way Automake won't mistake a program
+       named `foo.la' as a libtool library.
+       * tests/primary3.test: New file.
+       * tests/Makefile.am (TESTS): Add primary3.test.
+
+2004-10-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Install): Link to node Extending for examples.
+       (Extending): More comments about install-data-hook vs
+       install-exec-hook, and link to Install.
+
+       * configure.ac: Export @address@hidden
+       * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
+       so the test suite runs `autoconf' and not `missing --run autoconf'.
+       * tests/missing.test, tests/missing2.test: Arrange for missing
+       to be used in front of autoconf even if the user has exported
+       AUTOCONF.  This fixes two spurious failures reported by
+       Mark D. Baushke.
+
+       * lib/compile: Handle output.obj in addition to output.o.
+       * tests/compile.test: Check for this.
+
+2004-10-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Sources): Typo, reported by Karl Berry.
+
+2004-10-10  Kelley Cook  <address@hidden>  (tiny change)
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in ($ac_defun_rx): Match AC_DEFUN_ONCE.
+       (trace_used_macros): Trace AC_DEFUN_ONCE.
+       * tests/aclocal5.test: Use AC_DEFUN_ONCE.
+
+2004-10-10  Stepan Kasal  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Extending): Typo.
+
+2004-10-10  Martin Waitz  <address@hidden>  (tiny change)
+
+       * m4/as.m4 (AM_PROG_AS): Check dependency tracking mode for CCAS.
+       * automake.in (cppasm): Use the dependency tracking more for CCAS.
+       * doc/automake.texi (Assembly Support): Note that *.S are
+       preprocessed with CPPFLAGS.
+
+2004-10-10  Ralf Corsepius <address@hidden>
+
+       * automake.in (Languages): Split .s (asm) and .S (cppasm) into
+       separate languages.  Make cppasm (Preprocessed Assembler) aware
+       of CPPFLAGS, AM_CPPFLAGS.
+       (handle_languages): Fix typo.
+       (lang_cppasm_rewrite): New function.
+
+2004-09-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/subobj9.test: Adjust regexes after previous patch.
+
+2004-09-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages, define_compiler_variable): Output
+       Libtool's --tag= option before --mode=compile, because depcomp use
+       --mode=compile as end marker for libtool arguments.
+       (define_linker_variable): Likewise before --mode=link, for
+       uniformity.
+       * tests/pr307.test: Make sure dependency files are updated.  That
+       was not the case because depcomp thought `--tag=CC' was the
+       compiler to get dependencies from.
+       Report from Пухальский Юрий Андреевич.
+
+2004-09-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac: Require Perl 5.6.
+       * lib/Automake/Config.in: Require Perl 5.6 (not done in
+       lib/Automake/General.pm because it is shared with Autoconf),
+       and use `our' instead of `use vars'.
+       * aclocal.in (rel2abs): Remove.
+       (scan_configure_dep): Use File::Spec->rel2abs instead.
+
+       * tests/compile.test, tests/instsh2.test, tests/instspc.test: Use
+       two consecutive spaces in filename instead of one, to catch mistake
+       like `echo $val | ...`.
+       * tests/README: Suggest this.
+       Suggested by Ralf Wildenhues.
+
+2004-09-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Clean): Document -local targets.
+
+2004-09-25  Ralf Wildenhues <address@hidden>
+
+       * doc/automake.texi: Typos.
+
+2004-09-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Timeline): Typos and other English mistakes
+       reported by Jim and Gary.
+
+       * lib/Automake/VarDef.pm (append): Strip comments from augmented
+       variables.
+       * tests/comment8.test: New file.
+       * tests/Makefile.am (TESTS): Add comment8.test.
+       Report from Stepan Kasal.
+
+2004-09-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/compile.test: Fix rm usage.
+
+       * INSTALL, lib/INSTALL, lib/config.sub, lib/config.guess,
+       lib/texinfo.tex: New upstream versions.
+
+       * doc/automake.texi (Timeline): New node.  Thanks to Karl and Tom
+       for their comments on a preliminary version of this, Akim for
+       digging out some old mails, and Jason Molenda for sending the note
+       about Automake in Alias to Tom.
+       (Releases): Rename `ac' to `acl', suggested by Akim.
+
+2004-09-19  Akim Demaille  <address@hidden>
+
+       * AUTHORS, automake.in, aclocal.in: Add Alexandre Duret-Lutz as
+       author.
+
+2004-09-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Releases): New node.
+
+       * doc/automake.texi (Dependencies): Link to Dependency Tracking
+       Evolution.
+       (Dependency Tracking Evolution): Link to GNU make, Sources (for
+       BUILT_SOURCES), and update the paragraph about the "plan" to
+       inline dependency tracking with gcc3.
+
+       * doc/automake.texi (History): New node.
+       (Dependency Tracking Evolution): New node, filled with a Texinfo
+       version of Tom Tromey's ``Dependency Tracking in Automake''
+       document, initially published on the Automake homepage on
+       2001-06-29.
+
+2004-09-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/minuso.m4 (AM_PROG_CC_C_O): Make sure AC_PROG_CC is never
+       called after this macro.
+       * tests/distname.test, tests/subdir5.test, tests/subdir8.test,
+       tests/subobj.test, tests/subobj4.test, tests/subobj5.test,
+       tests/subobj6.test: Adjust.
+       Report from Ralf Wildenhues.
+
+       * lib/Automake/Channels.pm (_print_message): Handle uniq_part with
+       arbitrary string.
+       * automake.in (lang_c_rewrite): Set uniq_part so that the
+       AM_PROG_CC_C_O diagnostic is output only once for subdir objects
+       and only once for objects with per-target flags.
+
+       * automake.in (lang_c_rewrite): Print files and locations
+       for AM_PROG_CC_C_O errors.
+       (handle_single_transform): Pass $var to &$subr so it can
+       print locations.
+
+       * lib/compile, lib/elisp-comp, lib/install-sh, lib/ylwrap: Use $ret
+       instead of $status which is read-only in Zsh.
+
+2004-09-10  Ralf Wildenhues  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/compile: Preserve spaces in arguments (for example
+       -DPACKAGE_STRING="foo 0.1").
+       * tests/compile.test: New file.
+       * tests/Makefile.am (TESTS): Add compile.test.
+
+2004-09-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_clean): Sort rm commands output for
+       mostlyclean-generic, clean-generic, distclean-generic, and
+       maintainer-clean-generic.
+       Report from Bob Friesenhahn.
+
+       * automake.in (lang_c_rewrite): Do not require AM_PROG_CC_C_O for
+       libtool objects.
+       (handle_single_transform): Pass nonansi_obj to &$subr so
+       lang_c_rewrite can distinguish libtool objects.
+       * tests/libtool7.test: Use subdir-objects without using AM_PROG_CC_C_O.
+       Report from Gary V. Vaughan and Patrick Welche.
+
+2004-09-07  Andreas Schwab  <address@hidden>
+
+       * automake.in ($PATH_PATTERN): Add `+'.
+
+2004-09-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/missing3.test: New file (check for Paolo's change below).
+       * tests/Makefile.am (TESTS): Add missing3.test.
+
+2004-09-07  Paolo Bonzini  <address@hidden>
+
+       * missing: Handle all command line options together.  Add a
+       separate case statement to detect failed runs, and fail
+       silently there if --help or --version is passed to the program.
+
+2004-08-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess, lib/texinfo.tex: New upstream versions.
+
+       For PR automake/433:
+       * configure.ac (pkgvdatadir): Define using "$PACKAGE", not "automake".
+
+       Fix PR automake/432:
+       * lib/am/yacc.am [!%?MORE-THAN-ONE%]: Replace `#line's in y.tab.h too.
+       * tests/yacc7.test: Check this.
+
+2004-08-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/DisjConditions.pm (new): Precompute 'string' and 'conds'
+       in place instead of as a side-effect of calling ->string and ->conds.
+       This saves method-lookup time, simplify ->string and ->conds, and
+       allows to create the object only when necessary.
+       (string, conds): Simplify, now that the result is precomputed.
+
+       * automake.in (%am_file_cache): New hash.
+       (make_paragraphs): Cache .am files with comments stripped to save
+       some useless input and substitutions.
+
+       * lib/Automake/Variable.pm (%_primary_dict): New hash.
+       (_new, variable_delete): Update %_primary_dict.
+       (variables): Accept an optional $suffix argument.
+       * automake.in (check_typos, am_primary_prefixes): Use that
+       optional argument to restrict the loops over the variables we are
+       interested in.
+
+2004-08-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Item.pm (def): Rewrite more concisely, it's faster
+       this way.
+
+2004-08-05  Alexandre Duret-Lutz  <address@hidden>
+
+       Speed up make_paragraphs.
+       * automake.in (handle_languages): Always define SUBDIROBJ,
+       DERIVED-EXT, and DIST_SOURCE, because the new transform() will
+       abort on unknown tokens.
+       (transform): Rewrite with different semantics.
+       (make_paragraphs): Make a single pass over the paragraph to
+       transform all template tokens instead of doing as much passes as
+       possible token.
+
+       * automake.in ($libtool_new_api): New variable.
+       (handle_libtool): Do not libtool's aux files if $libtool_new_api.
+       (scan_autoconf_traces) <LT_SUPPORTED_TAG>: Set $libtool_new_api.
+       (scan_autoconf_traces) <AC_REQUIRE_AUX_FILE>: Remember only the
+       first location for required files.
+
+2004-08-04  Alexandre Duret-Lutz  <address@hidden>
+
+       Support AC_REQUIRE_AUX_FILE, and fix requirement of AM_PROG_CC_C_O.
+       * automake.in (%required_aux_file): New hash.
+       (handle_single_transform, lang_c_rewrite): Do not explicitly
+       require 'compile', this is now an internal detail of
+       AM_PROG_CC_C_O.
+       (scan_autoconf_traces): Trace AC_REQUIRE_AUX_FILE and fill
+       %required_aux_file.
+       (scan_autoconf_files): Require all %required_aux_file instead
+       of explicitly requiring install-sh and missing.
+       (generate_makefile): Do not require config.sub and config.guess.
+       (handle_single_transform): Pass $have_per_exec_flags to
+       &lang_c_rewrite.
+       * configure.ac, m4/init.m4: Require Autoconf 2.59a.
+       * doc/automake.texi (Optional): Document AC_REQUIRE_AUX_FILE.
+       (Program and Library Variables, Options, Public macros):
+       AM_PROG_CC_C_O is required when per-target flags or subdir-objects
+       are used with C sources.
+       * m4/minuso.m4: Require `compile' using AC_REQUIRE_AUX_FILE.
+       * m4/missing.m4: Require `missing' similarly.
+       * tests/acsubst2.test, tests/distcom2.test, tests/distcom6.test,
+       tests/specflg.test, tests/specflg2.test, tests/specflg3.test,
+       tests/specflg6.test, tests/specflg7.test, tests/specflg8.test,
+       tests/specflg9.test, tests/subobj7.test, tests/target-cflags.test,
+       tests/yacc6.test: Fix to use AM_PROG_CC_C_O.
+
+2004-08-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (yacc_lex_finish_helper): Fix definition of YLWRAP
+       when ylwrap is installed in a default aux dir found in a parent
+       package.
+       * tests/subpkg.test: Augment to check that YLWRAP is installed
+       properly.
+       * doc/automake.texi (Yacc and Lex): ylwrap is not sought is the
+       current directory.
+       Report from Norman Gray.
+
+2004-08-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Optional): Update documentation for
+       AC_CANONICAL_BUILD, AC_CANONICAL_HOST, and AC_CANONICAL_TARGET.
+
+       * automake.in (AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): Replace by ...
+       (AC_CANONICAL_BUILD, AC_CANONICAL_HOST, AC_CANONICAL_TARGET): ... these.
+       (scan_autoconf_traces): Scan for the latter three macros instead of
+       the former two.
+       (make_paragraphs): Adjust definitions of %BUILD%, %HOST%, and %TARGET%.
+       * tests/hosts.test: New file.
+       * tests/Makefile.am (TESTS): Add hosts.test.
+       Report and test case from Norman Gray.
+
+2004-08-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (scan_file): Update "#Extending%20aclocal" URL, makeinfo
+       4.7 now outputs "#Extending-aclocal".
+
+2004-08-01  Alexandre Duret-Lutz  <address@hidden>
+           Derek R. Price  <address@hidden>
+
+       Disable Lex and Yacc rules whenever possible if AM_MAINTAINER_MODE
+       is used and maintainer-mode disabled.
+       * automake.in (Automake::struct): Define nodist_specific.
+       Set it in languages yacc, yaccxx, lex, and lexxx.
+       (register_language): Default nodist_specific to 0.
+       (handle_single_transform): Honor nodist_specific.
+       * lib/am/yacc.am (am__skipyacc): Define this in maintainer mode.
+       (%EXT%%DERIVED-EXT%, %OBJ%): Use $(am__skipyacc) to disable these
+       rules when needed.
+       * lib/am/lex.am (am__skiplex): Define this in maintainer mode.
+       (%EXT%%DERIVED-EXT%, %OBJ%): Use $(am__skiplex) to disable these
+       rules when needed.
+       * tests/mmodely.test: New file.
+       * tests/pr204.test: Augment to check AM_MAINTAINER_MODE and nodist_
+       parsers.
+       * tests/Makefile.am (TESTS): ADd mmodely.test.
+       * doc/automake.texi (Yacc and Lex): Note dependence on maintainer mode.
+
+2004-07-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.9a.
+
+       * configure.ac, NEWS: Bump version to 1.9.
+
+       * automake.in (generate_makefile): Update misleading comment about
+       libtool scripts.
+
+       * lib/texinfo.tex: New upstream version.
+
+2004-07-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Remove `.' from the mkdir_p
+       definition, it causes `make install' to fails for user with no
+       right to write in the source-tree.
+       * automake.in (handle_configure): Do not use mkdir_p in the
+       definition for $(mkdir_p).
+       Report from Harlan Stenn.
+
+       * lib/am/texi-vers.am (%STAMPVTI%): Typo in comment.
+
+2004-07-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Libtool Modules): Typo in example.
+       Report from Ulrich Eckhardt.
+
+2004-07-21  Andreas Schwab  <address@hidden>  (tiny change)
+
+       * automake.in (check_directory): Quote $dir in regexp.
+
+2004-07-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.8e.
+
+       * configure.ac, NEWS: Bump version to 1.8d.
+
+       * lib/config-ml.in, lib/config.sub, lib/config.guess, lib/texinfo.tex:
+       New upstream versions.
+
+       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,
+       ?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}.
+
+       * tests/installdir.test: installdirs-local should appear three times,
+       since the change from 2004-07-11 will make it PHONY.
+
+       * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now
+       that it is always defined.  This is less confusing for users
+       reading the generated Makefiles.
+       * automake.in (handle_dist): Do not substitute DIST_SUBDIR_NAME.
+
+       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,
+       ?!GENERIC?%DEST_PREFIX%.html): Output .htp, and then rename to .html
+       on success.  In case the target is a directory, this ensures its
+       time stamp is updated and the no files are left over inside.
+       * tests/txinfo21.test: Augment to test missing timestamp update
+       reported by Akim Demaille.
+
+       * doc/automake.texi (Top level): Rename as ...
+       (Directories): ... this, and split into ...
+       (Subdirectories, Conditional Subdirectories): ... these.
+       (Subdirectories): Illustrate the use of `.'.
+       (Conditional Subdirectories): Describe SUBDIRS and DIST_SUBDIRS
+       before the example.  Append a discussion about non-configured
+       conditional directories.
+       (Alternative): Move as a child of Directories.
+       (Subpackages): New section.
+       (Dist): Adjust links to Subdirectories, a Subpackages.
+       (Third-Party Makefiles): Link to Conditional Subdirectories.
+
+2004-07-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (target_hook): Accept %transform as last argument.
+       (handle_single_transform): Pass %transform to target_hook.
+       (handle_source_transform): Define DIST_SOURCE to tell whether
+       a the source of a file is distributed or not.
+       (lang_yacc_target_hook): Check DIST_SOURCE, and do not distribute
+       the generated header if the .y source is not distributed.
+       * tests/pr204.test: Use AM_YFLAGS = -d and make sure generated
+       headers are not distributed.
+
+2004-07-12  Simon Josefsson  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Options): Improve ustar file name length
+       discussion.  Reference tar manual.
+
+2004-07-12  Ray Simard  <address@hidden>  (tiny change)
+
+       * lib/Automake/Variable.pm (define): Fix precondition check.
+
+2004-07-11  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/428:
+       Support for conditionally defined -hook and -local rules.
+       * automake.in (user_phony_rule): New function.
+       (handle_dist, handle_install, handle_all, do_check_merge_target,
+       handle_factored_dependencies): Use user_phony_rule before
+       adding a user -hook or -local rule as a dependency to ensure
+       it is always defined an phony.
+       * tests/cond37.test, tests/condhook.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+       Report from Simon Josefsson and Nik A. Melchior.
+
+2004-07-05  Paul Eggert  <address@hidden>
+
+       * doc/automake.texi (Install): Warn that you should create
+       /tmp/staging before installing into it, to avoid security problems.
+       * lib/install-sh: Remove support for -b= and -t= options; this
+       has been moribund for a decade.
+       Add support for -t and -T options (new in coreutils install).
+       -c option now does nothing (the default is to copy), for
+       compatibility with BSD and coreutils 'install'.
+       Fix usage message; it referred to nonexistent variables.
+       Don't assume 'lasterr' is unset in environment.
+       * tests/instsh2.test: Don't assume that install-sh without -c
+       moves (it now copies).  Add tests for new -t and -T options.
+
+2004-06-16  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug#254372:
+       * doc/automake.texi (Invoking aclocal): Rewrite the paragraph
+       explaining m4_include is used for relative files.
+
+2004-06-10  Alexandre Duret-Lutz  <address@hidden>
+
+       For Debian Bug #251820:
+       * aclocal.in (scan_file): Keep track of the location where each
+       file is included, and display it when reporting a missing file.
+       Pass this location to scan_file as a second argument.
+       (scan_m4_files): Adjust calls to scan_file.
+       * tests/acloca14.test: Add a test for this diagnostic.
+
+2004-06-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/tar.m4 (_AM_PROG_TAR): Split the definition of $_am_tools
+       so it works with Solaris and Tru64 /bin/sh.
+       Report from Nicolas Joly.
+
+2004-06-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/tar.m4 (_AM_PROG_TAR): Introduce $_am_tools to work around a
+       bug in NetBSD /bin/sh.
+       Report from Nicolas Joly.
+
+2004-06-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in (required=icc): Use `-V -help' instead of
+       `-V -dryrun'.  icc 8.0 fails on the latter.
+       * tests/depcomp5.test: Require depmode=icc for icc 7.x, and
+       depmod=gcc otherwise.
+       Report from Ralf Wildenhues.
+
+       * lib/am/clean.am (distclean-generic): Do no
+       `rm -f $(CONFIG_CLEAN_FILES)' if `$(CONFIG_CLEAN_FILES)' is empty.
+       Report from Nicolas Joly.
+
+2004-05-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS: Make clearer that we do not output partial Makefile.ins on
+       error.
+       Suggested by Akim Demaille.
+
+       * lib/depcomp (tru64) [libtool]: Use $dir$base.o.d instead
+       of $dir.libs/$base.o.d.  Libtool 1.5 causes both to be output,
+       and we will clean the second automatically during distclean.
+       Using the latter and leaving the former as we did before cause
+       "files left in build directory" failures during distcheck.
+       Suggested by Nicolas Joly.
+
+       * doc/automake.texi (Built sources example): Explain what
+       nodist_foo_SOURCES is (not) useful to, and use it in all the
+       examples.
+       (Tags): Mention nodist_noinst_HEADERS and nodist_prog_SOURCES.
+       Suggested by Akim Demaille.
+
+2004-05-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.8c.
+
+       * configure.ac, NEWS: Bump version to 1.8b.
+
+       * m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
+       by POSIX; and use option -d in am_untar.
+
+       * tests/defs.in (PATH): Export it.
+
+       * lib/am/multilib.am: Add $(MAKE) comments to multido and
+       multiclean lines, to enable parallel make.  Based on a patch
+       by Alexandre Oliva applied to newlib on 2003-10-15.
+
+2004-05-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): Trace for LT_SUPPORTED_TAG
+       instead of AC_LIBTOOL_TAGS, since that how CVS Libtool has been
+       changed.
+       * tests/libtool3.test: Do not grep for --tag=CC, since CVS
+       Libtool (unlike Libtool 1.5) does not has any CC tag.
+
+       * tests/tar2.test: Skip the test if no pax archiver were found.
+
+       * NEWS: Sync with branch-1-8, and reorganize current entry.
+
+       * automake.in (handle_libraries): Make the diagnostic about
+       non standard libraries a warning in foreign packages.  This
+       is already the case in handle_ltlibraries.
+       (handle_libraries, handle_ltlibraries): Suggest a standard
+       library name in the diagnostic, to help newcomers.
+       * tests/stdlib.test, tests/stdlib2.test: Check for these
+       suggestions.
+
+       Check directory names for unportable names.  Shaking the code
+       to check this also led to the removal of the no-"/"-in-SUBDIRS
+       restriction, and a fix to _do_recursive_traversal.
+
+       * automake.in (check_directory): New function extracted from
+       handle_subdirs, and augmented to check for reserved W32/DOS name.
+       (check_directories_in_var): New function.
+       (handle_subdirs): Call check_directories_in_var.  Doing so also
+       suppress the restriction that SUBDIRS should not contain slashes.
+       (scan_autoconf_traces) <AC_CONFIG_AUX_DIR>: Call check_directory
+       to ensure the argument exists and is safe.
+       * doc/automake.texi (Top level): Do not say that src/subdir
+       cannot be put in SUBDIRS.
+       (Dist): Mention that distdir and top_distdir can be absolute.
+       * lib/Automake/Variable.pm (_do_recursive_traversal) Support
+       undefined $fun_collect, and fix two bugs introduced with
+       skip_ac_subst on 2004-03-07.
+       * lib/am/distdir.am (distdir): Use absolute distdir and
+       top_distdir when recursing, because we can no longer prepend only
+       `..' in case of SUBDIRS with `/'.
+       * tests/auxdir4.test, tests/subdir9.test: New files.
+       * tests/Makefile.am (TESTS): Add auxdir4.test.
+       * tests/cond2.test, tests/subdir7.test: Augment to check location
+       in diagnostics.
+
+2004-05-21  Eric Blake  <address@hidden>  (tiny changes)
+
+       * tests/txinfo22.test (AC_CONFIG_AUX_DIR): Use aux1, not aux, for
+       cygwin compatibility.
+       * tests/yacc6.test (AC_CONFIG_AUX_DIR): Likewise.
+
+       * tests/conflnk3.test: Isolate checking for working `test -e' into
+       a subshell, to skip this test on broken /bin/sh of solaris.
+
+2004-05-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/cond.m4 (AM_CONDITIONAL): Double-quote diagnostic.
+       * tests/condd.test: Define a macro with the same name as a
+       conditional.
+       * tests/pr220.test: Modernize, and make sure the diagnostics
+       contains the macro name.
+       Report from Volker Boerchers.
+
+2004-05-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/texinfo.tex: New upstream version.
+
+2004-05-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_dist): Always define DIST_SUBDIRS, even when
+       the no-dist or cygnus options are used.
+       * tests/clean2.test: New file.
+       * tests/Makefile.am (TESTS): Add clean2.test.
+       Report from Daniel Jacobowitz.
+
+       * aclocal.in (add_macro): Do not error out on undefined required
+       macros.  We are not sure they are really used, and Autoconf
+       already diagnoses them.
+       (scan_configure_dep): Diagnose missing AM_ macros as warnings rather
+       than errors.
+       * tests/aclocal3.test, tests/ammissing.test: Adjust to expect a
+       warning instead of an error.
+       * tests/aclocal8.test: AC_REQUIRE an undefined macro in an unused
+       macro, and ensure aclocal works anyway.
+       * tests/acloca17.test: New file.
+       * tests/error.test: Delete, superseded by tests/acloca17.test.
+       * tests/Makefile.am (TESTS): Add acloca17.test and remove error.test.
+       Report from Jim Meyering.
+
+       * lib/am/texibuild.am (?!GENERIC_INFO?%DEST_INFO_PREFIX%%DEST_SUFFIX%):
+       Fold a few lines to reduce the output by 5 lines.
+       Suggested by Karl Berry.
+
+       * automake.in (parse_arguments, MAIN): Give more precise
+       diagnostics when no input file is found.
+       * tests/output5.test: Adjust.
+       Suggested by Jens Petersen.
+
+2004-05-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/libs.am (AR, ARFLAGS): Move these definition ...
+       * automake.in (handle_libraries): ... here, so that they are
+       output even for EXTRA_LIBRARIES.
+       * tests/ar2.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Report from Kevin Ryde.
+
+2004-05-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (generate_makefile): Do not output Makefile.in on
+       errors.
+       * tests/werror2.test: New file.
+       * tests/Makefile.am (TESTS): Add werror2.test.
+       * tests/substtarg.test, tests/cond36.test, tests/backsl4.test:
+       Adjust to run automake with -Wno-error when the output is expected
+       in spite of the error.
+       Report from Harlan Stenn.
+
+       * doc/automake.texi (Program and Library Variables): Remove
+       doubled word in footnote.
+
+       * automake.in (handle_source_transform): Also check for a
+       $(srcdir)/old_source rule when computing the default source name.
+       Propagate this $(srcdir) prefix in Automake variables.
+       * tests/ltlibsrc.test (noinst_LTLIBRARIES): Explicitly refer to
+       $(srcdir)/zoo_d_old2_la.c.  This fixes another failure with BSD Make.
+
+2004-05-13  Paul Eggert  <address@hidden>
+
+       * Makefile.am (fetch): Work even with FreeBSD "make", which
+       uses sh -e and thus errors-out if a simple-command fails.
+       * lib/am/check.am (check-TESTS): Likewise.
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Likewise.
+       * lib/am/tags.am (TAGS): Likewise.
+
+2004-05-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/lex3.test, tests/yacc6.test: Require GNU Make.
+       Fixing these for BSD Make requires invasive changes (lexers and
+       parsers must be built into $srcdir, and--most annoyingly--all
+       references to parse.h must be changed to $(srcdir)/parse.h).
+       Report from Mark D. Baushke.
+
+2004-05-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make.
+       Report from Mark D. Baushke.
+
+2004-04-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/texinfo.tex: New upstream version.
+
+       * lib/depcomp (tru64): Clarify comments.  Thanks to Nicolas Joly.
+
+       * doc/automake.texi (Headers): Revamp.
+
+2004-04-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (check_typos): Clarify the diagnostic.
+       * tests/warnopts.test: Adjust.
+
+       * lib/Automake/VarDef.pm (append): Turn VAR_ASIS variables into
+       VAR_PRETTY variables to work around make implementation with
+       limited line length, such as OSF1/Tru64 make.
+       * tests/longline.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * tests/pluseq3.test, tests/pluseq8.test: Adjust.
+       Report from Simon Josefsson.
+
+       * lib/am/tags.am (TAGS): Pass `.' to Exuberant Ctags if
+       --etags-include is used but no other files are supplied, so it
+       creates the TAGS file anyway.
+       Report from Akim Demaille.
+
+       * lib/depcomp (tru64) [libtool]: Nicolas Joly reported on
+       2002-06-12 that dependencies were output in $dir.libs/$base.lo.d.
+       Teun Burgers reported on 2004-03-30 they were in
+       $dir.libs/$base.o.d.  Try both.
+
+2004-04-23  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/414:
+       Introduce option filename-length-max=99.
+       * doc/automake.texi (Options): Document it.
+       * configure.ac (AM_INIT_AUTOMAKE): Use it.
+       * lib/Automake/Options.pm (_process_option_list): Recognize it.
+       * automake.in (handle_dist): Set FILENAME_FILTER.
+       * lib/am/distdir.am (distdir) [FILENAME_FILTER]: Diagnose long
+       filenames.
+       * tests/fn99.test: New file.
+       * tests/Makefile.am (TESTS): Add fn99.test.
+
+2004-04-20  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/414:
+       Introduce options tar-v7, tar-ustar, and tar-pax to select
+       tar format.
+       * doc/automake.texi (Options): Document them.
+       * lib/Automake/Options.pm (_process_option_list): Process
+       these new options.
+       * lib/am/distdir.am (dist-gzip, dist-bzip2, dist-tarZ, dist,
+       distcheck): Adjust to use am__tar and am__untar.
+       * m4/tar.m4: New file.
+       * m4/Makefile.am (dist_m4data_DATA): Add tar.m4.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Support the new options
+       and call _AM_PROG_TAR.
+       * tests/tar.test, tests/tar2.test, tests/tar3.test: New files.
+       * tests/Makefile.am (TESTS): Add them.
+
+2004-04-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/distdir.am (distcheck): Typo in shar decompression.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+2004-04-17  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix PR automake/49:
+       * automake.in (scan_autoconf_traces) <AC_CONFIG_AUX_DIR>: Diagnose
+       calls to AC_CONFIG_AUX_DIR followings calls to AM_INIT_AUTOMAKE.
+       * tests/auxdir.test, tests/auxdir2.test, tests/lex5.test,
+       tests/mdate3.test, tests/multlib.test, tests/reqd2.test,
+       tests/symlink.test, tests/txinfo8.test, tests/txinfo22.test,
+       tests/yacc6.test, tests/yacc8.test: Fix to call AC_CONFIG_AUX_DIR
+       before AM_INIT_AUTOMAKE.
+       * tests/auxdir3.test: New file (exercise this diagnostic).
+       * tests/Makefile.am (TESTS): Add auxdir3.test.
+
+2004-04-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (%map_traced_defs): New variable.
+       (scan_m4_files): Normalize filenames.
+       (trace_used_macros): Trace for AC_DEFUN and AU_DEFUN, also
+       ask for the filename and the first argument.  Populate
+       %map_traced_defs.
+       (write_aclocal): Use $map_traced_defs to filter out unused
+       definitions.
+       * tests/acloca16.test: New file.
+       * tests/Makefile.am (TESTS): Add acloca16.test.
+
+2004-04-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in ($automake_needs_to_reprocess_all_files): Remove.
+       ($automake_will_process_aux_dir): New variable.
+       (scan_autoconf_traces): Reorder @input_files so that the Makefile
+       that distributes aux files is processed last.  This way we do not
+       have to process all files twice using
+       $automake_will_process_aux_dir.
+       (require_file_internal): Suggest a full run of automake when
+       appropriate.
+       (MAIN): Remove the loop on $automake_needs_to_reprocess_all_files.
+       * tests/distcom7.test: New file.
+       * tests/reqd2.test: Do not check for the "running more than two"
+       message.
+       * tests/Makefile.am (TESTS): Add distcom7.test.
+
+       * automake.in (@config_aux_path, $config_aux_dir): Rename as ...
+       ($config_aux_dir, $am_config_aux_dir): ... these.
+       ($config_aux_dir_set_in_configure_in): Rename as ...
+       ($config_aux_dir_set_in_configure_ac): ... this.
+       (%require_file_found): Rename as ...
+       (%required_file_not_found): ... this.
+       (handle_languages, handle_texinfo_helper, handle_dist,
+       handle_configure, handle_emacs_lisp, handle_python,
+       scan_autoconf_traces, yacc_lex_finish_helper): Adjust to new names.
+       (scan_autoconf_traces): Call locate_aux_dir.
+       (locate_aux_dir): New function.
+       (@require_file_paths): Remove, not used anymore.
+       (require_file_internal): Look files in only one directory (instead
+       of @require_file_internal) passed in argument.
+       (require_file, require_conf_file): Pass the destination directory
+       to require_file_internal.
+
+       Fix for PR automake/416:
+       * m4/depend.m4 (_AM_DEPENDENCIES): Catch `not supported' ICC 8.0
+       remarks.
+       From Peter Seiderer.
+
+2004-04-10  Andreas Buening  <address@hidden>
+
+       * aclocal.in, automake.in, configure.ac, Makefile.am,
+       tests/aclocal.in, tests/automake.in, tests/defs.in:
+       Use PATH_SEPARATOR from autoconf instead of ':'.
+
+2004-04-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_lib_objects): Pass the condition of
+       the variable definition to handle_LIBOBJS and handle_ALLOCA,
+       not the aggregated conditions.
+       * tests/Makefile.am (TESTS): Add libobj14.test.
+       * tests/libobj14.test: New file.
+       Report from Bill Davidson.
+
+2004-04-02  Mike Nolta  <address@hidden>
+
+       Better support for Fortran 9x.
+       * automake.in: Add "fc" and "ppfc" languages for Fortran 9x.
+       * doc/automake.texi (Fortran 9x Support): New section.
+       * lib/Automake/Variable.pm (%_ac_macro_for_var): Add AC_PROG_FC.
+       * tests/compile_f90_c_cxx.test: New file.
+       * tests/ext.test: Add AC_PROG_FC.
+       * tests/f90only.test: New file.
+       * tests/link_f90_only.test: New file.
+       * tests/Makefile.am (TESTS): Add new tests.
+
+2004-04-01  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: If "mv -f" works, use it, and fall back to
+       the old "test -f" + "rm -f" + "mv" method only if "mv -f" does
+       not work.  This improves performance in the usual case where
+       "mv -f" works.  It also lets us install the "mv" command
+       without worrying about a small window where "mv" does not
+       exist (this problem was reported by Raul Nunez de Arenas
+       Coronado).
+
+2004-03-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (AM_PATH_PYTHON): Make sure am_display_PYTHON is
+       set when $PYTHON has been set by the user.
+       From Esben Haabendal Soerensen.
+
+2004-03-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Default _SOURCES): Typo.
+       (true): Correct _'s placement in example.
+       Report from Stepan Kasal.
+
+2004-03-19  Alexandre Duret-Lutz  <address@hidden>
+
+       Overriding JAVAROOT is legitimate, do not warn about it.
+       * lib/Automake/Variable.pm (%_silent_variable_override): Add JAVAROOT.
+       * tests/java2.test: Run automake without -Wno-override.
+       Report from Simon Josefsson.
+
+2004-03-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_texinfo_helper): Typos in comment.
+
+2004-03-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess: New upstream version.
+
+       Fix for PR automake/285:
+       * automake.in (handle_ltlibraries): Keep track of installation
+       directories for each condition, then define a $(am_TARGET_rpath)
+       variable to hold the -rpath flags of Libtool libraries conditionally
+       installed in different directories.
+       * lib/Automake/DisjConditions.pm (merge): New function.
+       * tests/libtool6.test: Adjust.
+       * tests/libtool8.test: New file.
+       * tests/Makefile.am (TEST): Add libtool8.test.
+
+       * lib/Automake/Variable.pm (traverse_recursively,
+       _do_recursive_traversal): Honor the skip_ac_subst option.
+       * automake.in (handle_dist): Use skip_ac_subst.
+
+2004-02-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (cvs-release): Upload to ~ftp/pub/automake, not
+       ~ftp/automake.
+       * lib/gnupload (Example): Update example.
+
+       * lib/config-ml.in, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: New upstream versions.
+
+       * m4/depend.m4 (_AM_DEPENDENCIES): Use `touch' rather than `: >'
+       to create numbered dependencies.  This fixes a portability issue
+       when CONFIG_SHELL is forced to /bin/sh on Solaris 8.
+       Reported by Mark Phillips.
+
+       * automake.in (lang_yacc_target_hook): Use Automake::Rule::define
+       so that rules for the same headers are not output twice.
+       * lib/Automake/Variable.pm (value_as_list_recursive): Do not
+       call `return' inside `map'.
+       * tests/cond30.test: Make sure `a.c' and `b.c' both appear
+       in the Makefile.in.
+       * tests/cond35.test, tests/cond36.test: New files.
+       * tests/Makefile.am (TESTS): Add cond35.test and cond36.test.
+       Report from Roman Fietze.
+
+       Fix for PR/413:
+       * lib/am/distdir.am (distcheck): Create $dc_destdir with `umask
+       077 && mkdir' instead of `$(mkdir_p)'.  This prevents possible
+       symlink attacks reported by Stefan Nordhausen.
+
+2004-02-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Multiple Outputs): More text, based on
+       comments from Eric Siegerman, Tim Van Holder, and Oren Ben-Kiki.
+
+2004-02-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/mkdirp.m4: Use `mkdir -p' only with GNU mkdir, because
+       Solaris 8's mkdir is not thread-safe.
+       * lib/mkinstalldirs: Likewise.
+       * lib/install-sh: Abort when mkdir fails to create a directory.
+       Report from Nathanael Nerode.
+
+2004-02-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (rel2abs): New function.
+       (scan_configure_dep): Use rel2abs instead of File::Spec->rel2abs,
+       the later does was introduced in Perl 5.6 so using it breaks with
+       Perl 5.005.
+       Report from Werner John.
+
+2004-02-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Future of aclocal): Make clearer that
+       it's ok to install macros into /usr/share/aclocal/.
+
+2004-02-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/lisp.test: Delete (pointless).
+       * tests/Makefile.am (TESTS): Remove lisp.test.
+
+       * lib/Automake/Variable.pm (transform_variable_recursively):
+       Define rewritten variables in all conditions not *covered* by user
+       definitions, not simply in conditions without a previous
+       definition.
+       * tests/cond34.test: New file.
+       * tests/Makefile.am (TESTS): Add cond34.test.
+       Report from Elena A. Vengerova
+
+       * doc/automake.texi (Multiple Outputs): Typo.
+
+       * doc/automake.texi (Emacs Lisp): Typos.
+
+       Support for conditional _LISP.
+       * automake.in (handle_emacs_lisp): Define $(ELCFILES) from LISP, not
+       from $(am__ELCFILES).
+       * lib/am/lisp.am (elc-stamp): Use $(LISP) instead of $(am__ELFILES).
+       * tests/lisp6.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+       * automake.in (handle_emacs_lisp): Define $(ELCFILES) as
+       $(am__ELCFILES), and always push it on @all.  Do not mention
+       elc-stamp.
+       * lib/am/lisp.am (.el.elc): Rewrite as ...
+       ($(am__ELCFILES)): ... this, and depend on elc-stamp.
+       (elc-stamp): Make sure elc-stamp is older that all .elc files, as
+       explained in the manual entry below.
+
+       * doc/automake.texi (Multiple Outputs): New node.
+
+2004-01-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/regex.m4: Do not AC_SUBST(LIBOBJS), and quote most arguments.
+       * tests/regex.test: New file.
+       * tests/Makefile.am (TESTS): Add regex.test.
+
+2004-01-28  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for unquoted $(DESTDIR) uses.
+       * lib/am/data.am, lib/am/distdir.am, lib/am/java.am, lib/am/libs.am,
+       lib/am/lisp.am, lib/am/ltlib.am, lib/am/mans.am, lib/am/progs.am,
+       lib/am/python.am, lib/am/scripts.am, lib/am/texinfos.am: Quote
+       installation paths in install, uninstall, and installcheck rules,
+       as well as in am__installdirs variables.  This is for the sake
+       of paths containing spaces.
+       * lib/am/install.am (installdirs-am, installdirs): Do not try
+       to create "" directories.
+       * test/instspc.test: New file.
+       * test/Makefile.am (TESTS): Add instspc.test.
+       Report from James Amundson.
+
+       * doc/automake.texi (Not Enough, Third-Party Makefiles): New nodes.
+       (Extending): Make it a subsection of Not Enough.
+
+       * lib/gnupload (GPG): Use an absolute path.  Suggestion from Gary
+       V. Vaughan.
+       (passphrase): Unset it this variable before using it, in case it
+       was exported.  Report from Scott James Remnant.
+
+2004-01-25  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/gnupload (usage): Fix example.
+       * Makefile.am (cvs-release): Fix call to gnupload.
+       From Jim Meyering.
+
+2004-01-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/gnupload: New script.
+       * lib/Makefile.am (EXTRA_DIST): Distribute gnupload.
+       * Makefile.am (cvs-release): New target.
+
+2004-01-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/python.am (uninstall-%DIR%PYTHON): Remove extra `;'s.
+       Fix python10.test.
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Use `s/xx//p'
+       instead of `/xx/ s///p'; the latter fails when GNU sed is run with
+       POSIXLY_CORRECT.  Also strip superfluous -e.
+       Report from Miloslav Trmac.
+
+2004-01-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/lex5.test: Sleep before calling AUTOMAKE the second time,
+       this fixes a spurious failure reported by Andreas Schwab.  Also
+       make sure ylwrap is not installed unless needed, and exercise
+       --no-force.
+
+2004-01-20  Ralf Wildenhues  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Dist): Document limitations of distcheck-hook
+       and DISTCHECK_CONFIGURE_FLAGS with regard to subdirs and
+       subpackages.
+
+2004-01-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Upgrading): New node.
+
+2004-01-20  Gary V. Vaughan  <address@hidden>
+
+       * automake.in (scan_autoconf_traces): AC_LIBTOOL_TAGS can be
+       correctly called without arguments as evidenced by the libtool
+       demo directories.
+
+2004-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/conflnk3.test: Skip if `test -e' does not work.
+       Report from Lars Hecking.
+
+2004-01-13  Jim Meyering  <address@hidden>
+
+       * lib/install-sh: Change `\n \t' to `\n\t ' in `defaultIFS'
+       assignment.  Remove spurious SPACEs before TABs.
+
+2004-01-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/py-compile: Check input files after option processing.
+       Ensure --basedir has an argument.
+       * lib/am/python.am (install-%DIR%PYTHON): Do not run py-compile
+       if nothing was installed.
+       * tests/python10.test: New file.
+       * tests/Makefile.am (TESTS): Add python10.test.
+       Suggested by Sander Niemeijer.
+
+       * tests/txinfo29.test: Remove autom4te.cache.
+       Report from Greg Schafer.
+
+       * lib/install-sh: Do not use "$@" in a context where it may be empty,
+       for the sake of OSF1/Tru64's shell.
+       Report from He Li.
+
+2004-01-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.sub, lib/config.guess, lib/texinfo.tex: New upstream
+       versions.
+
+       * m4/as.m4, m4/depend.m4, m4/maintainer.m4, m4/multi.m4: Update
+       copyright years and serial.
+
+       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.4.
+
+2004-01-10  Peter Eisentraut  <address@hidden>  (tiny change)
+
+       * m4/as.m4 (AM_PROG_AS): Format and align help string more
+       consistently.
+       * m4/depend.m4 (AM_DEP_TRACK): Likewise.
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
+       * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
+
+2004-01-10  Paul Eggert  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Don't use \? in sed regular
+       expressions; it doesn't conform to POSIX.
+
+2004-01-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (shadow_unconditionally): New function...
+       (handle_source_transform): ... extracted from here.
+       (am_install_var): Use shadow_unconditionally to define %DISTVAR%.
+       * lib/am/data.am, lib/am/java.am, lib/am/lisp.am, lib/am/python.am,
+       lib/am/script.am: Add %DISTVAR% to DIST_COMMON.
+       * tests/cond33.test: Make sure all conditional files are distributed.
+       Report from Ralf Corsepius.
+
+2004-01-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Append `.' to $(mkdir_p).
+       * lib/install-sh: Accept `install-sh -d' with 0..n arguments,
+       as well as `install-sh sources... dest' with multiple sources.
+       * tests/cond33.test: New file.
+       * tests/instsh2.test: Add more checks for install-sh.
+       * tests/transform.test: Test for installdirs.
+       * tests/Makefile.am (TESTS): Add cond33.test
+       Report from Ralf Corsepius.
+
+       * automake.in (handle_configure): Skip AC_CONFIG_LINKS items which
+       do not look like DEST:SRC.
+       * tests/conflnk3.test: Check for AC_CONFIG_LINKS($computed).
+
+2004-01-07  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/289:
+       * automake.in (Automake::Struct::libtool_tag): New attribute.  Define
+       it for the language that have a Libtool tag.
+       (%libtool_tags): New variable.
+       (handle_languages, define_compiler_variable)
+       (define_linker_variable): Pass --tag=XXX to libtool if supported.
+       (scan_autoconf_traces): Scan for _LT_AC_TAGCONFIG and AC_LIBTOOL_TAGS.
+       * tests/libtool3.test, tests/subobj9.test: Check that --tag=XXX is
+       output.
+
+2003-01-07  Eric Sunshine  <address@hidden>  (tiny change)
+
+       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): Add
+       config.status.lineno.
+
+2004-01-07  Ralf Wildenhues  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Rebuilding): Typo.
+
+2004-01-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/Makefile.am (dist_am_DATA): Really add inst-vars.am.
+
+2004-01-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * THANKS: Add Bruce Korb.
+
+2004-01-05  Alexandre Duret-Lutz  <address@hidden>
+
+       Mimic Paul Eggert's changes to Autoconf.
+       * Makefile.am (automake, aclocal): Use `chmod a-w', not `chmod -w'.
+       * lib/Automake/Makefile.am (Config.pm): Likewise.
+       * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Likewise.
+
+       * lib/am/inst-vars.am: New file, define am__vpath_adj_setup,
+       am__vpath_adj, and am__strip_dir.
+       * lib/am/Makefile.am (dist_am_DATA): Add inst-vars.am.
+       * lib/am/data.am, lib/am/lisp.am, lib/am/python.am,
+       lib/am/scripts.am: Include inst-vars.am, and use $(am__vpath_adj),
+       $(am__vpath_adj_setup), and $(am__strip_dir) in install and
+       uninstall rules.  This fixes installation of nobase_ files in
+       VPATH setups with Sun and OSF1/Tru64 Make.
+       * lib/am/libs.am, lib/am/ltlib.am: Include inst-vars.am, and use
+       $(am__strip_dir) to simplify install and uninstall rules.
+       * tests/nobase.test: Augment to check installation from VPATH builds.
+
+       * automake.in (%transformed_files): New variable.
+       (initialize_per_input): Reset it.
+       (make_paragraphs): Fill %transformed_files, and define %FIRST%
+       each time a file is transformed for the first time.
+       (handle_configure): Do not define %FIRST_CONFIG_HIN%.
+       (am_install_var): Do not define %FIRST%.
+       * lib/am/remake-hdr.am: Use %?FIRST% instead of %?FIRST_CONFIG_HIN%.
+
+2004-01-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/texinfo.tex: New upstream version.
+
+       * m4/mkdirp.m4: Do not use `-m 0755'.  This overrides special bits
+       and break setups where 775 directories are expected.  Just obey
+       umask as we did in the past.
+       Report from Harlan Stenn.
+
+2004-01-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Do not compare $outfile to ''
+       as $outfile might not be defined at all.
+
+       * lib/Automake/Variable.pm (define): Rework the way we check
+       Automake variable definition.  Ensure consistent :=/+=/=
+       definitions only for variables that have been and are defined by
+       Automake, and make it an internal error.  Ignore Automake
+       attempts to touch a user variable, even with += assignments.
+       * tests/txinfo29.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo29.test.
+       Reported by Bruce Korb.
+
+2004-01-02  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Don't generate dist
+       variables when no-dist is set.
+       (generate_makefile): Likewise.
+       * tests/nodist3.test: Ensure that DIST_SOURCES is not created,
+       and that dist target does not exist.
+       Reported by Tom Fitzsimmons.
+
+2004-01-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/libtool5.test, tests/ltcond.test, tests/ltcond2.test,
+       * tests/ltconv.test: Run automake with --add-missing, because
+       the CVS version of libtoolize no longer install config.sub and
+       config.guess by default.
+
+       Fix for PR automake/319:
+       * aclocal.in (scan_m4_files): Scan configure.ac.
+       (trace_used_macros, write_aclocal): Remove configure.ac from the
+       list of files to include.
+       * tests/Makefile.am (TESTS): Add acloca15.test.
+       * tests/acloca15.test: New file.
+
+       * aclocal.in (%file_includes): New variable.
+       (scan_configure_dep): Compile $m4_include_rx and $ac_require_rx once.
+       (scan_file): Scan for included files, and process these files
+       recursively.  Fill %file_includes and %file_contents.  Return the
+       list of included files, not the contents.
+       (scan_m4_files): Adjust calls to scan_files.
+       (strip_redundant_includes): New function.
+       (trace_used_macros): Call it.
+       (write_aclocal): Likewise.  Also check the mtime of included files.
+       * tests/Makefile.am (TESTS): Add acloca14.test.
+       * tests/acloca14.test: New file.
+       Report from Phil Edwards.
+
+2004-01-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_languages): Do not define DEP_FILES.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Extract included
+       files with $(DEPDIR) in their name instead of DEP_FILES.
+       * tests/depend.test, tests/depend4.test, tests/exsource.test:
+       Adjust.
+       Suggested by Tom Tromey.
+
+       Do not output .lo rules for programs and static libraries objects,
+       and do not output .o/.obj rules for libtool libraries.  This is
+       about explicit rules only, not inference rules.
+       * automake.in (handle_single_transform_list): Rename as ...
+       (handle_single_transform): ... this.  Take a single file
+       to transform (it was only called this way) and accept a new
+       %transform argument.  Fill %lang_specific_files with list
+       references instead of strings, and append %transform to each
+       of these lists.
+       (define_objects_from_sources, handle_source_transform):
+       Take a %transform argument, and forward it to &handle_single_transform.
+       (handle_languages): Adjust to the new format of
+       %lang_specific_files, and honor its %transform part.
+       (handle_programs, handle_libraries, handle_ltlibraries): Override
+       %NONLIBTOOL% and %LIBTOOL% while calling handle_source_transform.
+       (make_paragraphs): Define %NONLIBTOOL% by default.  Make sure
+       %transform settings override global settings.
+       * lib/am/depend2.am (%OBJ%, %OBJOBJ%): Define only if %NONLIBTOOL%.
+       * tests/libtool3.test: Augment to check Makefile.ins for unneeded
+       rules.
+       Suggested by Thomas Fitzsimmons.
+
+       * automake.in, aclocal.in: Bump copyright years.
+
+-----
+
+Copyright (C) 2004-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
+
+;; Variables:
+;; coding: utf-8
+;; End:
diff --git a/old/ChangeLog.09 b/old/ChangeLog.09
new file mode 100644
index 0000000..02a1e33
--- /dev/null
+++ b/old/ChangeLog.09
@@ -0,0 +1,5767 @@
+2009-12-29  Ralf Wildenhues  <address@hidden>
+
+       Fix and complete copyright notices in Makefile.am files.
+       * Makefile.am: Use single-`#' comment for copyright notice, so
+       that it also appears in the generated Makefile.in file.
+       * doc/Makefile.am: Likewise.
+       * doc/amhello/Makefile.am: Likewise.
+       * doc/amhello/src/Makefile.am: Likewise.
+       * lib/Automake/Makefile.am: Likewise.
+       * lib/Automake/tests/Makefile.am: Likewise.
+       * lib/Makefile.am: Likewise.
+       * lib/am/Makefile.am: Likewise.
+       * m4/Makefile.am: Likewise.
+       * tests/Makefile.am: Add copyright notice.
+       Report of missing copyright notice by Stefano Lattarini.
+
+2009-12-27  Stefano Lattarini  <address@hidden>
+
+       Fixed typo in Makefile.am (extra semicolon removed)
+       * Makefile.am (sc_diff_automake_in_automake): Removed an extra
+       semicolon in target's rules, which prevented a stdout redirection
+       from working.
+
+2009-12-21  Julien Danjou  <address@hidden>  (tiny change)
+
+       Add support for newer python version
+       * m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
+       _AM_PYTHON_INTERPRETER_LIST.
+
+2009-12-21  Karl Berry  <address@hidden>
+
+       mention ncftpput in gnupload --help
+       * lib/gnupload: Mention ncftpput in `--help' output.
+       Report by Bruce Korb.
+
+2009-12-06  Ralf Wildenhues  <address@hidden>
+
+       * NEWS: Update.
+
+2009-12-05  Antonio Diaz Diaz  <address@hidden>
+
+       Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
+       * lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
+       instead of the respective un$tool invocation, to avoid depending
+       on another tool.
+       * THANKS: Update.
+
+2009-12-05  Ralf Wildenhues  <address@hidden>
+
+       Use $DJDIR rather than $DJGPP to detect running on DJGPP.
+       * automake.in (Language): Use $ENV{'DJDIR'} for the
+       $ENV{'SHELL'} override.
+       * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
+       bootstrapping under MinGW when $DJGPP has been set.
+
+       Do not rely on Perl symlink status, for MSYS perl.
+       * automake.in (require_file_internal): Ensure presence of
+       symlink target file; MSYS perl symlink doesn't return an error
+       status when the file could not be created (copied, on this
+       system).  Fixes symlink.test failure.
+
+2009-12-04  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Avoid Solaris sh `set -e' bug in vala4.test.
+       * tests/vala4.test: New variable $cwd, holding the full path of the
+       current directory.  Use it instead of `pwd` command substitution,
+       to avoid Heirloom/Solaris Sh bug with `set -e'.
+
+2009-12-05  Ralf Wildenhues  <address@hidden>
+
+       Fix requirements of silent8.test.
+       * tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
+       dvips.
+
+2009-12-04  Stefano Lattarini  <address@hidden>
+
+       File `automake.in' is not meant to be executed (only to be
+       preprocessed into `automake'), so don't leave it executable.
+       * automake.in: Remove executable bit.
+
+2009-12-04  Stefano Lattarini  <address@hidden>
+
+       Don't make the generated Automake's Config.pm executable.
+       * lib/Automake/Makefile.am (Config.pm): Don't make the generated
+       `Config.pm' file executable.
+
+2009-11-28  Jim Meyering  <address@hidden>
+
+       do not put world-writable directories in distribution tarballs
+       * lib/am/distdir.am (distdir): Do not make all directories
+       group- or world-writable.  Instead, use 755.
+       * tests/subpkg4.test (test-distdir-is-readable): Check for new,
+       more restricted permissions.
+
+2009-11-29  Karl Berry  <address@hidden>
+
+       Rewrite `gnupload --help' examples.
+       * lib/gnupload: Use GNU style version numbers, a generic package
+       name, and more useful examples.
+
+2009-11-28  Jim Meyering  <address@hidden>
+
+       avoid a warning from perl-5.11
+       * lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
+       "/d" modifier.
+
+2009-11-14  Ralf Wildenhues  <address@hidden>
+
+       Distribute the Automake bootstrap script.
+       * Makefile.am (EXTRA_DIST): Add bootstrap.
+       Report by Jan Engelhardt.
+
+2009-11-14  Ralf Wildenhues  <address@hidden>
+
+       Coverage for corner cases in derive_suffix.
+       Ensure unrelatex SUFFIXES entries and unrelated inference rules
+       are ignored silently.
+       * tests/ext3.test: New test.
+       * tests/Makefile.am: Update.
+
+       Coverage for user-provided _LINK variables.
+       * tests/link_override.test: New test.
+       * tests/Makefile.am: Adjust.
+
+       Coverage: warn about substitutions that need EXTRA_PRIMARY.
+       * tests/extra9.test: New test.
+       * tests/Makefile.am: Adjust.
+
+       Coverage: warn about configure substitution in EXTRA_PRIMARY.
+       * tests/subst5.test: New test.
+       * tests/Makefile.am: Update.
+
+       Coverage for syntax errors with conditionals in included fragments.
+       * tests/condinc2.test: Amend test.
+
+       Coverage: diagnose variables with forbidden dist_ prefix.
+       * tests/candist.test: New test.
+       * tests/Makefile.am: Update.
+
+       Coverage for conditional `else' and `endif' arguments.
+       * tests/cond46.test: New test.
+       * tests/Makefile.am: Update.
+
+2009-10-31  Jim Meyering  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Don't let an envvar setting of "$fail" cause build failure.
+       Without this change, in a project using an automake-generated
+       Makefile, "make fail=anything" would fail inappropriately,
+       due to the `test -z "$$fail"' at the end of this emitted rule:
+       * lib/am/subdirs.am ($(RECURSIVE_TARGETS)): Initialize "fail=" to keep
+       an envvar setting of that variable from causing unwarranted failure.
+       ($(RECURSIVE_CLEAN_TARGETS)): Likewise.
+       * tests/subdir10.test: New test.
+       * tests/Makefile.am: Update.
+
+2009-10-18  Ralf Wildenhues  <address@hidden>
+
+       Simplify Variable::_check_ambiguous_condition.
+       * lib/Automake/Variable.pm (_check_ambiguous_condition): No need
+       to check for $def since ambiguous_p returns an empty $message if
+       there is no other condition which is ambiguous to $cond.
+
+       Coverage for DisjConditions.pm.
+       * lib/Automake/tests/DisjConditions.pl (test_basics): Increase
+       test coverage: test ->human, ->merge, ->simplify, ->multiply.
+       * lib/Automake/tests/DisjConditions-t.pl (test_basics): Likewise
+       changes, but including state copies across thread creation.
+       * lib/Automake/tests/DisjCon2.pl: New test.
+       * lib/Automake/tests/DisjCon3.pl: Likewise.
+       * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Adjust.
+
+       Coverage and fixes for Condition.pm.
+       * lib/Automake/Condition.pm (new): Catch common programming
+       errors better by checking type of passed argument before
+       munging them to all be strings through split.
+       * lib/Automake/tests/Condition.pl (test_basics): Also test
+       ->human.
+       (test_merge): New function, test ->merge, ->merge_conds,
+       ->strip.
+       * lib/Automake/tests/Condition-t.pl (test_basics, test_merge):
+       Likewise changes, but including state copies across thread
+       creation.
+       * lib/Automake/tests/Cond2.pl: New test for programming error.
+       * lib/Automake/tests/Cond3.pl: Likewise.
+       * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+       Coverage for Wrap.pm.
+       * lib/Automake/tests/Wrap.pl (@tests): Add test for word with
+       trailing space.
+       (test_makefile_wrap, @makefile_tests): New function, new list of
+       tests, to test makefile_wrap.
+
+       Coverage for Version.pm.
+       * lib/Automake/tests/Version.pl (test_version_compare): Also
+       try Automake::Version::check for the version pairs, taking into
+       account the special-case naming of code forks.
+       (@tests): Add more test cases.
+       (test_bad_versions, @bad_versions): New function, new test cases,
+       to ensure bad version strings are rejected.
+       * lib/Automake/tests/Version2.pl: New test.
+       * lib/Automake/tests/Version3.pl: Likewise.
+       * lib/Automake/tests/Makefile.am (TESTS): Add tests here ...
+       (XFAIL_TESTS): ... and here, new.
+
+       Pod coverage for Perl modules.
+       * lib/Automake/ChannelDefs.pm (parse_warnings): Fix
+       typo in Pod documentation.
+       * lib/Automake/Condition.pm: Add a couple of missing `=back'
+       lines.
+       (_has): Renamed from ...
+       (has): ... this, as this is an internal method.
+       (strip, false, true_when): Adjust callers.
+       * lib/Automake/Configure_ac.pm: Add Pod `Functions' section with
+       documentation for find_configure_ac and require_configure_ac.
+       * lib/Automake/Location.pm: Fix typo in Pod.  Add `Methods'
+       section, document methods.
+       * lib/Automake/RuleDef.pm: New `Methods' Pod section.
+       * lib/Automake/VarDef.pm: Document `raw_value'.
+       * lib/Automake/Wrap.pm (_tab_length): Rename from ...
+       (tab_length): ... this, as this is an internal method.
+       (wrap): Adjust callers.
+       * lib/Automake/XFile.pm: Reorganize Pod a bit, add `Methods'
+       section.
+
+2009-10-17  Ralf Wildenhues  <address@hidden>
+
+       Perl coverage support using Devel::Cover.
+       This introduces makefile rules to run the testsuite with Perl
+       coverage enabled.  It skips tests that use perl ithreads, by
+       unsetting AUTOMAKE_JOBS and setting WANT_NO_THREADS to make the
+       threaded tests skip.
+       * Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
+       (PERL_COVER): New variables.
+       (check-coverage, recheck-coverage, clean-coverage): New phony
+       targets.
+       (check-coverage-run, recheck-coverage-run): New phony helper
+       targets.
+       (clean-local): New, depend on clean-coverage.
+       * lib/Automake/tests/Condition-t.pl: Skip if WANT_NO_THREADS is
+       set.
+       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
+       * tests/defs.in: New required entry 'perl-threads'.
+       * tests/parallel-am.test: Use it to skip if WANT_NO_THREADS is
+       set.
+       * tests/parallel-am2.test: Likewise.
+       * tests/parallel-am3.test: Likewise.
+
+       Add convenience `recheck' target to our toplevel Makefile.am.
+       * Makefile.am (recheck): New convenience target.
+       * tests/README: Give examples for running only failed or
+       outdated or otherwise selected tests.
+
+       dist: allow running several compressors in parallel.
+       * lib/am/distdir.am (am__post_remove_distdir): New internal
+       variable.
+       (DIST_TARGETS): New variable, set to list of chosen distribution
+       formats.  Order formats by expected duration, slowest first, for
+       better parallelism.
+       (dist-gzip, dist-bzip2, dist-lzma, dist-xz, dist-tarZ)
+       (dist-shar, dist-zip): Use $(am__post_remove_distdir).
+       (dist, dist-all): Do not depend on distdir.  Instead of
+       replicating each compression command, use a recursive invocation
+       to allow running all $(DIST_TARGETS) in parallel.
+       * NEWS: Update.
+       Report by Peter Breitenlohner.
+
+       Fix license headers of cscope tests to be GPLv2+.
+       * tests/cscope.test: Revert to GPL version 2.
+       * tests/cscope2.test: Likewise.
+       * tests/cscope3.test: Likewise.
+
+       Sync auxiliary files from upstream.
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: Sync from upstream.
+
+       Doc and comment typos.
+       * automake.in (handle_ltlibraries): Fix typo in comment.
+       * tests/distcom7.test: Likewise.
+       * tests/lisp5.test: Likewise.
+       * doc/automake.texi (Usage of Conditionals): Fix typo.
+
+2009-10-11  Ralf Wildenhues  <address@hidden>
+
+       Fix race condition in werror2.test due to sanity sleep change.
+       * tests/werror2.test: Generate Makefile.in before configure so
+       that a Makefile.am update after configure has run is guaranteed
+       to be newer than Makefile.in.
+       * tests/subdir5.test: Document why this test does not need to be
+       fixed.
+       * tests/subdir8.test: Likewise.
+
+       Improve description of the various *LINK variables.
+       * doc/automake.texi (Program and Library Variables): _LINK also
+       receives libraries to link against.  _LINK may be generated.
+       (Program Variables): Document reasons when per-target _LINK is
+       used instead of LINK.
+       (How the Linker is Chosen): Document how a per-target _LINK
+       variable and per-target link flags override linker selection.
+       * THANKS: Update.
+       Report by Dave Korn against gcc/libstdc++-v3.
+
+       Allow variable override of, rather than by, silent variables.
+       When overriding variables, check the VAR_SILENT status of the
+       old condition, not the new one: we allow non-silent overrides
+       of silent variables (these do not hit ordering bugs in the
+       automake output), but there is no use case for doing so the
+       other way round.  Fixes conditional overrides of variables
+       annotated AM_SUBST_NOTMAKE in configure.ac.
+       * lib/Automake/Variable.pm (_check_ambiguous_condition): Check
+       for VAR_SILENT in $ambig_cond not $cond.
+       * tests/cond44.test, tests/cond45.test: New tests, analogous to
+       cond23.test and cond24.test.
+       * tests/Makefile.am: Update.
+       Spotted originally in binutils/bfd.
+
+       Fix `make clean check' for the Automake package.
+       * lib/Automake/Makefile.am (SUBDIRS): Add `.' before `tests',
+       so that Config.pm is built first.
+
+       Fix in-tree `recheck' after failed test that runs `check'.
+       If a test like pr401b-p.test fails for some reason, a `make
+       recheck' would cause another reason for failure because it sets
+       AM_MAKEFLAGS which gets propagated into the test and causes its
+       `make check' to fail.
+       * tests/defs.in: Also unset AM_MAKEFLAGS.
+
+2009-10-11  Stefano Lattarini  <address@hidden>
+
+       Updated code enabling Bourne-compatibility in test scripts.
+       * tests/defs.in: updated the code enabling Bourne-compatibility
+       mode in the shell (now it's copied from autoconf 2.64).
+
+       Avoid leaking TEST_LOG_COMPILER in environment of test scripts.
+       * tests/defs.in: Unset variable `TEST_LOG_COMPILER'.
+
+2009-10-07  Stefano Lattarini  <address@hidden>
+
+       Testsuite: do not use `chmod -R' when cleaning up.
+       * tests/Makefile.am (clean-local-check): Do not use `chmod -R' on
+       the test directories, as that may change or try to change the mode
+       of installed files: the test directory may contain symlinks to
+       ltmain.sh files from a Libtool installation, and Solaris `chmod -R'
+       touches symlink targets.  Instead, use the cleanup strategy used
+       in distdir.am (which is also employed in tests/defs.in).
+
+2009-10-06  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix 'compile' script to not call mv when target equals source.
+       * lib/compile: Don't attempt to move the generated file to its
+       target destination when it is already at the target destination.
+       Avoids an mv failure with subdir-objects.
+       * tests/ccnoco3.test: New test.
+       * tests/Makefile.am: Adjust.
+
+2009-10-01  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       Fix recommended way to run automake's test scripts with Zsh.
+       * tests/README (Supported shells): Changed the recommended way
+       to run automake's test scripts with Zsh.  Now we tell to use
+       the Zsh's command line option `-o no_function_argzero', not
+       `--no-function-argzero', since the latter does not work with
+       versions 3.x of Zsh.
+
+2009-09-26  Ralf Wildenhues  <address@hidden>
+
+       Fixups and tests for cscope functionality.
+       It seems cscope is not able to take into account relative
+       file names of included cscope.files files, but it is able to
+       canonicalize file names containing '../' sequences.
+       This patch makes the cscope references relative again, and
+       fixes some corner cases.
+       * NEWS: Reword a bit.
+       * THANKS: Update.
+       * automake.in (handle_tags): Use $(am__cd).  Provide default
+       empty rule for the `cscope' target, for empty sources.
+       * lib/am/tags.am (cscopelist): Construct relative path to files
+       in $(srcdir) if $(srcdir) is relative.
+       [TOPDIR_P] (cscope): Do not depend on cscope-clean.  Only invoke
+       $(CSCOPE) if cscope.files is nonemtpy.
+       (clean-cscope): Rename from ...
+       (cscopeclean): ... this.
+       (cscope.files): Depend on clean-cscope.
+       (distclean-tags) [!TOPDIR_P]: No need to remove cscope files
+       here.
+       * tests/cscope.test, tests/cscope2.test, tests/cscope3.test: New
+       tests.
+       * tests/Makefile.am: Adjust.
+
+2009-09-25  Debarshi Ray  <address@hidden>
+
+       New target to generate cscope database.
+       * automake.in (handle_tags): Handle cscope.
+       * doc/automake.texi (Tags): Document cscope.
+       * lib/am/tags.am (CSCOPE): New macro.
+       [TOPDIR_P] (AM_RECURSIVE_TARGETS): Add cscope.
+       (cscope): New target.
+       (cscopeclean): Likewise.
+       (cscope.files): Likewise.
+       (cscopelist): Likewise.
+       (distclean-tags): Remove `cscope.out', `cscope.in.out',
+       `cscope.po.out' and `cscope.files'.
+       * NEWS: Update.
+       Based upon earlier patch from Jesse Barnes.
+
+2009-09-25  Ralf Wildenhues  <address@hidden>
+
+       Use silent-rules for building the Automake package.
+       * configure.ac (AM_INIT_AUTOMAKE): Add silent-rules option.
+       * Makefile.am (automake, aclocal, INSTALL): Add silencing
+       variables to recipe.
+       * doc/Makefile.am (update_mans, $(srcdir)/aclocal.1)
+       ($(srcdir)/automake.1, $(srcdir)/amhello-1.0.tar.gz): Likewise.
+       * lib/Automake/Makefile.am (Config.pm): Likewise.
+       * tests/Makefile.am ($(srcdir)/parallel-tests.am)
+       ($(parallel_tests), defs-p): Likewise.
+
+2009-09-25  Jack Kelly  <address@hidden>
+
+       Add silent rules support for texinfo outputs.
+       * automake.in (define_verbose_texinfo): Define several new verbose
+       tagvars and verbose vars.
+       (define_verbose_tagvar): Increase spacing to 8 to accommodate
+       MAKEINFO, TEXI2DVI, TEXI2PDF.
+       (handle_texinfo): Additional substitution for silencing dvips.
+       (output_texinfo_build_rules): Additional substitutions for
+       silencing texi2dvi and texi2pdf.
+       * lib/am/texibuild.am: Add silencing to makeinfo, makeinfo --html,
+       texi2dvi and texi2pdf rules.
+       * lib/am/texinfos.am: Add silencing to .dvi.ps rule.
+       * tests/Makefile.am: Add silent8.test.
+       * tests/silent8.test: New test: tests that silent texinfo rules
+       produce quiet messages.
+       * NEWS: Update.
+
+2009-09-18  Peter Johansson  <address@hidden>  (tiny change)
+
+       Fix link to "Recursive Make Considered Harmful" paper.
+       * doc/automake.texi (Alternative): Fix broken URL.
+
+2009-09-11  Reuben Thomas <address@hidden>  (tiny patch)
+
+       Fix outdated reference to sh-utils in the manual.
+       * doc/automake.texi (Options): The reference to `sh-utils'
+       should be to `coreutils'.
+
+2009-09-06  Ralf Wildenhues  <address@hidden>
+
+       Avoid sleeping for one second most of the time in sanity check.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Try sanity check first without
+       sleeping for a second, and only if that failed, sleep and try
+       again, to avoid the delay in the common case of a configure
+       script that is older than a second, or a system with sub-second
+       time stamp granularity.
+       Report and different patch by Jim Meyering.
+
+2009-09-06  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       tests/README: warn about zsh incompatibilities.
+       * tests/README (User interface, Getting details from failures):
+       Explicitly state that every test is a "shell script", not just
+       a "script", and that it's run by `/bin/sh' by default.
+       * tests/README (User interface, Supported shells): New subsection,
+       telling about expected portability of the automake test scripts,
+       describing a zsh incompatibility (w.r.t. $0), and a workaround to
+       it (with the `--no-function-argzero' option).
+
+       testsuite: fix a minor glitch.
+       * tests/defs.in (exit trap): Use `$me', not `$as_me', as the
+       name of the current test (used in error messages).
+       * THANKS: Update.
+
+2009-07-08  Jim Meyering  <address@hidden>
+
+       manual: fix a trivial grammar error.
+       * doc/automake.texi (Invoking aclocal): Fix grammar.
+
+2009-06-07  Ralf Wildenhues  <address@hidden>
+
+       AM_PROG_GCJ: use AC_CHECK_TOOLS for gcj, for cross compilation.
+       * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_TOOLS, rather than
+       AC_CHECK_PROGS, when searching for `gcj'.
+       * NEWS: Update.
+       Report by Jack Kelly.
+
+2009-05-24  Jack Kelly  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
+       * tests/gcj6.test: New test.
+       * tests/Makefile.am: Update; mark gcj6.test as XFAIL.
+       * THANKS: Update.
+
+2009-05-24  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: avoid GNU make 3.80 substitution bug.
+       * lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
+       `.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
+       to work around GNU make 3.80 substitution reference issue with
+       trailing white space in the variable.
+       * tests/parallel-tests10.test: New test.
+       * tests/parallel-tests6.test: Update comment.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+
+2009-05-23  Ralf Wildenhues  <address@hidden>
+
+       testsuite: unset installation directory variables.
+       * tests/defs.in: Before test execution, be sure to unset all
+       installation directory variables, so they cannot have an effect
+       on a `make -e install' command within a test.
+       Report by Dagobert Michelsen.
+
+       testsuite: do not change the mode of installed Libtool files.
+       * tests/defs.in: Do not use `chmod -R' on the test directory, as
+       that may change or try to change the mode of installed files:
+       the test directory may contain symlinks to ltmain.sh files from
+       a Libtool installation, and Solaris `chmod -R' touches symlink
+       targets.  Instead, use the cleanup strategy used in distdir.am.
+       * NEWS: Update.
+       Report by Dagobert Michelsen.
+
+       testsuite: do not fail in cleanup code.
+       * tests/defs.in: Turn off errexit in the cleanup trap, to avoid
+       a test failure due to a nonzero command.
+       * THANKS: Update.
+       Report by Dagobert Michelsen.
+
+2009-05-23  Peter O'Gorman  <address@hidden>
+
+       python: do not install in system directories on Darwin 9.
+       On Darwin 9, get_python_lib returns a path below `/Library/Python'
+       regardless of the `prefix' argument it was passed, causing `make
+       install' to target the system directories regardless of `--prefix'
+       argument used.  Work around this Darwin bug by ignoring the result
+       of get_python_lib if it points outside of the passed prefix, and
+       the prefix was not a system directory.
+       * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
+       initial portion of the pythondir returned by get_python_lib, then
+       ignore it unless the configured prefix is `/usr' or starts with
+       `/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
+       * NEWS: Update.
+
+2009-05-23  Ralf Wildenhues  <address@hidden>
+
+       Clarify how to enable `silent-rules' and other global options.
+       * doc/automake.texi (Options): When introducing options, be more
+       careful to note that not all of them can be specified in
+       AUTOMAKE_OPTIONS statements, and that some do not make sense in
+       subdirectories.  Note more prominently that `silent-rules' can
+       only be specified in configure.ac.
+       * lib/Automake/Options.pm (_process_option_list): Improve error
+       message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
+       options specified in Makefile.am files.
+       Report by Bruno Haible.
+
+2009-05-21  Ralf Wildenhues  <address@hidden>
+
+       Skip specflg10.test without a C++ compiler.
+       * tests/specflg10.test: Require g++.
+       Report by Thien-Thi Nguyen.
+
+2009-05-19  Ralf Wildenhues  <address@hidden>
+
+       Revert last patch, IRIX has an editor named `jot'.
+       * tests/instmany-mans.test: Do not try `jot'.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       Report by Peter O'Gorman.
+
+2009-05-18  Ralf Wildenhues  <address@hidden>
+
+       testsuite: also try `jot' as `seq' replacement.
+       * tests/instmany-mans.test: Try BSD `jot' before resorting to a
+       slow but portable shell loop.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       Suggestion by Peter O'Gorman.
+
+       Fix test failure when pkg.m4 is not found, only pkg-config.
+       * tests/vala5.test: Update comment, this test is not expected to
+       fail any more.  Require valac version 0.7.0.  Skip if configure
+       fails, could be due to unexpanded PKG_CHECK_MODULES or too old
+       valac.
+       Report by Simon Josefsson.
+
+2009-05-17  Ralf Wildenhues  <address@hidden>
+
+       Post-release version bump.
+       * configure.ac, NEWS: Bump version to 1.11a.
+
+2009-05-17  Ralf Wildenhues  <address@hidden>
+
+       Automake 1.11.
+       * configure.ac: Bump version to 1.11.
+       * doc/automake.texi (Releases): Add line for 1.11.  Remove line
+       for 1.10b.
+
+       Fix maintainer-check failures.
+       * automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
+       of plain `cd'.
+       * tests/vala2.test: Use `rm -f' instead of `rm'.
+
+       Revert Automake license to GPLv2+.
+       Automake will move to GPLv3+ once the Exception statement has
+       been rewritten to use the new GPLv3 exception language.  This
+       change does not impact the COPYING file that may be installed
+       by `automake --add-missing'.
+       * COPYING: Revert to GPLv2.  All uses changed.
+       * NEWS: Update.
+
+       Rewrite NEWS for 1.11.
+       * NEWS: Rewrite, merging 1.10b and 1.10c entries.
+
+       Sync auxiliary files from upstream.
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
+       upstream.
+
+       Update release statistics, improve release-stats rule.
+       * Makefile.am (release-stats): Output stderr of pstops in
+       addition to catching it, for better debugging.
+       * doc/automake.texi (Releases): Add line for 1.10.2.
+
+       Cope with parallel BSD make -jN semantics.
+       When BSD `make -jN' is used without `-B' which enables backwards
+       compatible semantics, it may reuse the same shell for several
+       commands within a rule; so ensure we do not leave it in a
+       different directory, nor `exit 0' early in a multi-command rule.
+       * lib/am/distdir.am (distcheck): After running `distcleancheck',
+       change back to original working directory.
+       * lib/am/remake-hdr.am (%CONFIG_HIN%): Run autoheader in a
+       subshell.
+       * lib/am/mans.am (uninstall-man%SECTION%): Do not `exit 0' early
+       in a rule that consists of several shell invocations.  Parallel
+       NetBSD `make -jN' without `-B' will use only one shell for all
+       commands, but won't respawn one after `exit 0'.  Fixes
+       notrans.test failure.
+       * tests/makej2.test: New test.
+       * tests/Makefile.am: Update.
+
+       Fix typo in comment.
+       * lib/am/install.am: Fix typo.
+
+2009-05-17  Matthias Klose  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       Let AM_PATH_PYTHON honor python's idea about the site directory.
+       * m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and
+       pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix'
+       to get_python_lib, so python can determine the name of the site
+       directory depending on the install location.  Afterwards, replace
+       the directory names with the unexpanded values of $PYTHON_PREFIX
+       resp. $PYTHON_EXEC_PREFIX again, to allow override according to
+       the documentation.  Fixes site directory computation for Debian
+       and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local',
+       `site-packages' elsewhere).
+       * NEWS, THANKS: Update.
+
+2009-05-17  Ralf Wildenhues  <address@hidden>
+
+       Vala: for now, require GNU make.
+       * doc/automake.texi (Vala Support): GNU make is currently
+       required for Vala sources.
+       * tests/vala2.test, tests/vala3.test, tests/vala5.test: Require
+       GNU make.
+
+2009-05-17  Jürg Billeter  <address@hidden>
+
+       Vala: Use $(srcdir) in rebuild rules.
+       valac is always run in srcdir as the generated files are distributed.
+       So srcdir needs to be taken into account in the rebuild rules to not
+       wrongly trigger a rebuild in the wrong directory.
+       * automake.in (lang_vala_finish_target): Rebuild files in
+       $(srcdir).
+       * tests/vala2.test: Test rebuild rules from VPATH build.
+
+       Vala: Add and test rebuild rules for generated header and vapi files.
+       valac will generate additional files when using, for example, -H in
+       VALAFLAGS. We need to recognize these options and add appropriate
+       rebuild rules to fix parallel build.
+       * automake.in (lang_vala_finish_target): Recognize -H, -h,
+       --header, --internal-header, --vapi, --internal-api, --gir flags
+       to valac and rebuild rules for generated headers; distribute
+       and maintainer-clean them.
+       * tests/vala2.test: Test rebuild rules.
+
+2009-05-17  Jürg Billeter  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Vala: Fix build when using per-target VALAFLAGS.
+       This does not yet implement full per-target support for VALAFLAGS,
+       however, this change at least fixes building when there is only one
+       target per source file, which is the most common situation.
+       * automake.in: Remove `VALAFLAGS' from `flags' in language struct.
+       (lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually
+       here; check `VALAFLAGS' user variables.
+       * tests/Makefile.am (XFAIL_TESTS): Remove vala5.test.
+       * doc/automake.texi (Vala Support): Document per-target flag
+       limitations.
+
+2009-05-11  Ralf Wildenhues  <address@hidden>
+
+       For PR automake/540:
+       Document some formatting restrictions for Makefile.am files.
+       * doc/automake.texi (General Operation, Usage of Conditionals):
+       Variable assignments should not be indented by TABs, rule commands
+       should.  Conditional keyword statements should not be indented.
+       * THANKS: Update.
+       Report by Luo Yi.
+
+2009-05-03  Ralf Wildenhues  <address@hidden>
+
+       Fix copyright years in *.am files.
+       * lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
+       lib/am/program.am, lib/am/tags.am: Fix copyright years.
+
+       distdir: avoid duplicate `find' traversal with subpackages.
+       * lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
+       `am__skip_mode_fix'.
+       [%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
+       walk.
+       * tests/subpkg4.test: New test, to ensure that we still walk the
+       whole tree while fixing permissions.  We don't ensure it is
+       walked once only.
+       * tests/Makefile.am: Update.
+
+       Disable test cleanup trap with OSF1/Tru64 sh.
+       * configure.ac: Test whether /bin/sh has working 'set -e'
+       in conjunction with an exit trap.  Set $am_cv_sh_errexit_works
+       accordingly, substitute sh_errexit_works, and warn about
+       leftover test directories with broken shells like Tru64 /bin/sh.
+       * tests/defs.in: Do not install any traps with broken shells.
+
+2009-05-02  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Recommend *-local hooks without commands, for extensibility.
+       * doc/automake.texi (Clean): Show how to write the clean-local
+       extension with separate phony target.
+       * tests/Makefile.am (clean-local-check): Practice what we preach
+       by marking this phony.  For consistency, rename from ...
+       (check-clean-local): ... this.
+
+2009-04-28  Eric Blake  <address@hidden>
+
+       scripts: normalize all timestamps to UTC
+       * lib/compile (scriptversion): Update emacs hook.
+       * lib/depcomp (scriptversion): Likewise.
+       * lib/elisp-comp (scriptversion): Likewise.
+       * lib/gnupload (scriptversion): Likewise.
+       * lib/install-sh (scriptversion): Likewise.
+       * lib/mdate-sh (scriptversion): Likewise.
+       * lib/missing (scriptversion): Likewise.
+       * lib/mkinstalldirs (scriptversion): Likewise.
+       * lib/py-compile (scriptversion): Likewise.
+       * lib/ylwrap (scriptversion): Likewise.
+
+2009-04-27  Ralf Wildenhues  <address@hidden>
+
+       silent-rules: fix alignment of less verbose output.
+       * automake.in (define_verbose_var): Define `$silent_var' as
+       VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple
+       adjacent spaces.
+       * tests/silent.test: Amend test.
+       Report by Jan Engelhardt.
+
+2009-04-25  Ralf Wildenhues  <address@hidden>
+
+       manual: fix trivial grammar errors.
+       * doc/automake.texi (Subpackages, Vala Support, Java)
+       (Checking the Distribution, Timeline): Fix `a' vs. `an' errors
+       and duplicate `the'.
+       Report by Eric Blake.
+
+       Indent rule commands consistently with a TAB.
+       * lib/am/check.am ($(TEST_SUITE_LOG)): Consistently use TAB, not
+       spaces, for indentation of commands, even if indentation may not
+       be needed at all.
+       * lib/am/texinfos.am (install-info-am): Likewise.
+       * THANKS: Update.
+       Prompted by report from John Calcote.
+
+       parallel-tests: fix recheck* targets for non-GNU make.
+       * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
+       to portably transport the TEST_LOGS settings through the
+       recursive `make' invocations.  Fixes parallel-tests9.test
+       failure with Solaris make.
+       * tests/parallel-tests9.test: Also ensure that the test
+       summary is correct for `recheck'.
+       Suggestion by Akim Demaille.
+
+2009-04-22  Ralf Wildenhues  <address@hidden>
+
+       Avoid racy depmodes with universal builds.
+       * m4/depend.m4 (_AM_DEPENDENCIES): If universal builds are used,
+       avoid racy depmodes.
+       * lib/depcomp: Ignore `-arch' argument for makedepend depmode.
+       Report by Bruno Haible, analysis by Bruno Haible, Peter O'Gorman,
+       and Eric Blake.
+
+2009-04-21  Fabian Alenius  <address@hidden>  (tiny change)
+
+       Fix link to autotools tutorial.
+       * doc/automake.texi (Autotools Introduction): Fix broken link.
+       * THANKS: Update.
+
+2009-04-19  Ralf Wildenhues  <address@hidden>
+
+       testsuite: minor w32 fixes.
+       * tests/depend5.test: Don't fail if the system or file system
+       cannot handle weird characters, instead just try a few.
+       * tests/parallel-tests3.test: Really wait until the serial test
+       has finished, before letting the cleanup trap do its work.
+       Report by Bruno Haible.
+
+       Avoid nonportable `./FILE' instead of `FILE' in test.
+       * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la'
+       in *_LDADD entry if `$(top_builddir)' is `.'.  Fixes test failure
+       with parallel NetBSD make.
+
+       Detect make `include' style also with parallel non-GNU make.
+       Parallel NetBSD make outputs `--- $target ---' messages,
+       parallel HP-UX make outputs `Making target"$target"'.  Just
+       ignore all additional output for the include test.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Ignore additional output
+       produced by `make' to relax `include' style detection.
+
+       manual: add FAQ `Debugging Make Rules'.
+       * doc/automake.texi (Debugging Make Rules): New FAQ section.
+       (Top, FAQ): Adjust menus, and capitalization of the description
+       of the `Hard-Coded Install Paths' node.
+       (Multiple Outputs): Add comment to restore font-lock for vim.
+       Suggestion by Karl Berry.
+
+       Let XFile::lock warn and fail with parallel non-GNU make, too.
+       * lib/Automake/XFile.pm (lock): Also match `-j' for parallel BSD
+       make, and `-P' for parallel HP-UX make.
+
+       Fix AM_PROG_VALAC version requirement detection.
+       * m4/vala.m4 (AM_PROG_VALAC): Remove `Vala ' from valac
+       --version string before comparing versions.
+       * tests/vala2.test: Require version 0.7.0 for the test.
+       Fixes failures of vala2.test and vala3.test with older valac.
+
+       Correctly treat all assignments with bogus trailing comments.
+       Before this patch, automake would silently fail to diagnose and
+       to copy into the output those variable assignments which are
+       preceded by a comment, and end in backslash newline comment.
+       * automake.in (read_am_file): When determining whether an
+       escaped newline followed by a comment is an error, correctly use
+       the parser state, not the contents of a saved comment, which
+       could still be carried over from a comment before an assignment.
+       * NEWS: Update.
+       * tests/commen11.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Karl Berry.
+
+2009-04-14  Karl Berry  <address@hidden>
+
+       manual: improve markup: itemize list in `Extending'.
+       * doc/automake.texi (Extending): Use address@hidden's for user override
+       semantics.
+
+2009-04-13  Ralf Wildenhues  <address@hidden>
+
+       bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
+       * automake.in (am_install_var): For `PROGRAMS' primary, strip
+       `$(EXEEXT)' here already, so the name uniquifying works even
+       when we look at names repeatedly, with inconsistent executable
+       extension; through variable references, we might have added
+       the extension ourselves earlier.
+       (handle_programs): No need to strip `$(EXEEXT)' here any more.
+       * tests/extra8.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Report by Daniel Richard G.
+
+2009-04-10  Jim Meyering  <address@hidden>
+
+       Fix grammar in comments and documentation.
+       * doc/automake.texi (API versioning): Fix grammar.
+       * automake.in: Fix grammar in comment.
+       * lib/Automake/ChannelDefs.pm: Likewise.
+       * tests/ext2.test: Likewise.
+
+2009-04-19  Ralf Wildenhues  <address@hidden>
+
+       More minor fixups to vala support.
+       * automake.in (lang_vala_finish_target): Fix typo in comment.
+       * doc/automake.texi (Vala Support): Fix typo.  Declare vala
+       support as "initial".
+       * NEWS: Likewise, declare vala support as "initial".
+
+2009-04-05  Jürg Billeter  <address@hidden>
+
+       Improve Vala support.
+       * automake.in: Update to Vala 0.7.0 semantics, recover from removal
+       of built sources, support silent-rules, drop _PKGNAME variables
+       * doc/automake.texi, NEWS: Update.
+       * lib/am/vala.am: Bump copyright years.
+       * m4/vala.m4: Likewise.
+       * tests/vala.test: Remove obsolete grep tests.
+       * tests/vala1.test: Likewise.
+       * tests/vala2.test: Test full build, distcheck, and distclean.
+       * tests/vala3.test: Likewise, also test with subdir-objects.
+       * tests/vala4.test: Bump copyright years.
+       * tests/vala5.test: New test for per-target flags, expected to fail.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+
+2008-10-10  Ralf Wildenhues  <address@hidden>
+
+       Minor fixups for Vala support.
+       * automake.in: $(VALAFLAGS) comes after $(AM_VALAFLAGS).
+       * doc/automake.texi (Vala Support): Add some references,
+       document AM_VALAFLAGS, streamline a bit.
+       * lib/am/vala.am: Copyright blurb.
+       * m4/vala.m4 (AM_PROG_VALAC): Rewrite using AS_VERSION_COMPARE.
+       * tests/vala.test: Fix minor nits.
+       * tests/vala1.test: Likewise.
+       * tests/vala2.test: Likewise.
+       * tests/vala3.test: Likewise.
+       * tests/vala4.test: New test, for version argument of
+       AM_PROG_VALAC.
+       * tests/Makefile.am: Update.
+
+2008-10-09  Mathias Hasselmann  <address@hidden>
+
+       * automake.in: Support Vala in non-recursive builds. Make sure
+       foo_VALAFLAGS really use used. Inject --library switch when building
+       Vala libraries.
+       * doc/automake.texi, NEWS: Document Vala support.
+       * m4/vala.m4: Rename AC_PROG_VALAC to AM_PROG_VALAC.
+       * tests/Makefile.am: Additional Vala tests.
+       * tests/vala.test: Also test VALAFLAGS support.
+       * tests/vala1.test: Test non-recursive Vala support.
+       * tests/vala2.test: Test _PKGNAME variables.
+       * tests/vala3.test: Test compiling of C code generated by Vala.
+
+2008-10-09  Mathias Hasselmann  <address@hidden>
+
+       Initial support for the vala programming language.
+       * automake.in: Add %known_libraries, lang_vala_rewrite,
+       lang_vala_finish and lang_vala_target_hook to support the Vala
+       programming language. Register Vala language hooks.
+       * lib/am/vala.am: Empty rules file to prevent creation of depend2
+       based rules for Vala code.
+       * lib/am/Makefile.am (dist_am_DATA): Add vala.am.
+       * m4/vala.m4: Provide AC_PROG_VALAC for detecting the Vala compiler.
+       * m4/Makefile.am (dist_m4data_DATA): Add vala.m4.
+       * tests/vala.test: Test Vala support.
+       * tests/Makefile.am: Update.
+
+2009-04-14  Ralf Wildenhues  <address@hidden>
+
+       testsuite: do not fail on systems without read permissions.
+       * tests/instfail-info.test: Do not use the `non-root'
+       requirement for testing whether files may be made unreadable;
+       instead use `test -r' and skip the test if that still works.
+       * tests/instfail-java.test: Likewise.
+       * tests/instfail-libtool.test: Likewise.
+       * tests/instfail.test: Likewise.
+       * tests/instmany-mans.test: Likewise.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/parallel-tests9.test: Likewise.
+
+       testsuite: parallel make fixes.
+       This patch fixes a couple of testsuite bugs exposed with
+       `MAKE=make\ -jN make check'.
+       * tests/libtoo10.test: Do not run `clean' in same $MAKE
+       invocation as `all check'.  Fixes test failure with parallel
+       NetBSD `make -jN'.
+       * tests/nobase.test: Be sure to create a directory before
+       creating files in it.  Fixes test failure with MAKE=`make -jN'
+       for NetBSD make.  This issue is hidden with parallel GNU make
+       due to its parallel breadth first update order.
+       * tests/parallel-tests3.test: Skip if $MAKE contains `-j',
+       GNU make will use the environment variable $MAKE for recursion
+       and thus run in parallel even if `$MAKE -j1' was used on the
+       command line in the test.  Also, after running the test proper,
+       wait long enough so that background jobs have finished and there
+       are no open files left when the cleanup code runs.
+
+2009-04-13  Ralf Wildenhues  <address@hidden>
+
+       silent-rules reorganization, --enable-silent-rules switch.
+       This patch introduces a configure-time option to set the default
+       verbosity.  Since configure now needs to know whether the
+       `silent-rules' automake option was set, the latter can only be
+       set within AM_INIT_AUTOMAKE, or with a new AM_SILENT_RULES macro
+       but not any more through AUTOMAKE_OPTIONS or the automake
+       command line option `--silent-rules'.
+       * automake.in (define_verbose_var): Define the default verbose
+       variable in terms of `$(AM_DEFAULT_VERBOSITY)'.
+       (handle_configure): Do not pass `--silent-rules' to automake.
+       (scan_autoconf_traces): Trace `AM_SILENT_RULES'.  If seen,
+       enable global `silent-rules' option.
+       (usage): Do not document `--silent-rules'.
+       (parse_arguments): Do not accept `--silent-rules'.
+       * doc/automake.texi (Options): Overhaul.  Document
+       AM_SILENT_RULES, --enable-silent-rules, --disable-silent-rules,
+       AM_DEFAULT_VERBOSITY.  Show an example for user-added variables
+       for less verbose output.
+       (Invoking Automake): Remove documentation for `--silent-rules'.
+       (Public Macros): Document `AM_SILENT_RULES'.
+       * NEWS: Update.
+       * lib/Automake/Options.pm (_process_option_list): Accept
+       `silent-rules' only as option in configure.ac.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): If the `silent-rules' option
+       was enabled, require `AM_SILENT_RULES'; move AM_BACKSLASH
+       initialization to ...
+       * m4/silent.m4 (AM_SILENT_RULES): ... this new file, new macro.
+       Deal with `--enable-silent-rules' switch; define
+       AM_DEFAULT_VERBOSITY.
+       * m4/Makefile.am (dist_m4data_DATA): Add silent.m4.
+       * tests/dollarvar.test: Remove tests for `--silent-rules', use
+       `AM_SILENT_RULES'.
+       * tests/flavor.test: Remove test for `--silent-rules'.
+       * tests/silent.test: Use `AM_SILENT_RULES' instead of
+       `AUTOMAKE_OPTIONS = silent-rules'; use `--enable-silent-rules'.
+       * tests/silent2.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent6.test: Likewise. Test `AM_SILENT_RULES' as well
+       as `AM_INIT_AUTOMAKE([silent-rules])' instead of
+       `--silent-rules'.
+       * tests/silent7.test: Use `AM_SILENT_RULES' instead of
+       `AUTOMAKE_OPTIONS = silent-rules'; ensure the latter is rejected.
+       Test combinations of --enable-silent-rules and
+       --disable-silent-rules with `make V=0' and `make V=1'.
+       Suggestion for configure-time switch by Bob Friesenhahn.
+
+       manual: Add note about parallelism and tests ordering.
+       * doc/automake.texi (Simple Tests using parallel-tests):
+       Dependencies between test logs work for tests with known
+       extensions only.  Hint that tests should be prepared to be run
+       in parallel.
+
+       Fix maintainer-check failure.
+       * tests/suffix13.test: Use Exit not exit.
+
+2009-04-10  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: more testsuite exposure.
+       * tests/parallel-tests.test: Also test overriding TEST_LOGS and
+       TESTS.
+
+       parallel-tests: let VERBOSE=yes output appear before summary.
+       * lib/am/check.am ($(TEST_SUITE_LOG)): In `VERBOSE=yes' mode,
+       output contents of `$(TEST_SUITE_LOG)' before, rather than after
+       the test suite summary.  This ensures that the email address
+       appears near the end of the output; also, the log file already
+       starts with a result summary anyway.
+
+       parallel-tests: `clean recheck' should not rerun all tests.
+       * lib/am/check.am (recheck, recheck-html): Do not rerun all
+       tests if `$(TEST_SUITE_LOG)' does not exist.
+       * tests/parallel-tests2.test: Adjust recheck test.
+       * tests/parallel-tests9.test: Adjust recheck-html test.
+       * NEWS: Update.
+       Suggestion by Akim Demaille.
+
+2009-04-08  Ralf Wildenhues  <address@hidden>
+           Eric Blake <address@hidden>
+
+       parallel-tests: Fix driver for nonempty executable extension.
+       * automake.in (handle_tests): New substitution `%am__EXEEXT%',
+       defined as 'FALSE' for non-generic rules, or if no programs are
+       built at all.  Otherwise, define it as configure conditional.
+       * lib/am/check2.am [%am__EXEEXT%] (%EXT%$(EXEEXT).log): New
+       conditional generic rule.
+       * m4/init.m4: Hook an m4_provide of `_AM_COMPILER_EXEEXT' onto
+       Autoconf's `_AC_COMPILER_EXEEXT' macro.
+       (AM_INIT_AUTOMAKE): If `_AM_COMPILER_EXEEXT' has been provided
+       at `AC_CONFIG_COMMANDS_PRE' time, then introduce a conditional
+       `am__EXEEXT', defined to true iff `$EXEEXT' is nonempty.
+       * tests/check5.test: Only match `_EXEEXT_[1-9]' here, to avoid
+       false positives stemming from address@hidden@'.
+       * NEWS: Update.
+
+2009-04-08  Ralf Wildenhues  <address@hidden>
+
+       Fix a couple of $(EXEEXT)-related testsuite failure.
+       * tests/check8.test: Allow executable extensions in test suite
+       output.
+       * tests/check9.test: Add `$(EXEEXT)' manually to @substituted@
+       XFAIL_TESTS entries.
+
+       * NEWS: Update for last patch.
+
+2009-04-07  Florian Briegel  <address@hidden>  (tiny change)
+           Stepan Kasal  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix renamed objects with subdir-objects and other languages.
+       * automake.in: Fixed bug when building with renamed objects
+       and foreign languages.
+       * tests/suffix13.test: New test.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Reports by Florian Briegel and Stepan Kasal.
+
+2009-04-07  Ralf Wildenhues  <address@hidden>
+
+       Do not remove texinfo outputs upon mostlyclean.
+       * lib/am/texinfos.am: New substitutions %MOSTLYCLEAN%,
+       %MAINTCLEAN%.
+       (clean-aminfo): New target, remove %TEXICLEAN% if nonemtpy,
+       declare phony.  Hook this target to ...
+       (clean-am): ... this and ...
+       (?CYGNUS?clean-info): ... this.
+       (maintainer-clean-aminfo): Remove %MAINTCLEAN% if nonempty,
+       for later.
+       (mostlyclean-aminfo): Remove %MOSTLYCLEAN%.
+       * automake.in (handle_texinfo_helper): Return three arrays
+       $MOSTLYCLEAN, $TEXICLEAN, $MAINTCLEAN, instead of one array.
+       Only put LaTeX helper files in $MOSTLYCLEAN, the rest in
+       $TEXICLEAN for now.
+       (handle_texinfo): Accept these, chop off extra newline, and
+       substitute them in `texinfos.am'.
+       * NEWS: Update.
+       * tests/txinfo33.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Bruno Haible.
+
+2009-04-06  Ralf Wildenhues  <address@hidden>
+
+       testsuite: unset TESTS, TEST_LOGS, to avoid interference.
+       * tests/defs.in: Unset TESTS, TEST_LOGS.
+
+       testsuite: generate $(parallel_tests) just when needed.
+       * tests/Makefile.am (check_SCRIPTS): No need to list
+       $(parallel_tests) here, they can be generated as needed during
+       the test run, following our recommendation in the manual.
+
+       Remove superfluous line from recheck recheck-html.
+       * lib/am/check.am (recheck recheck-html): Remove superfluous
+       line, introduced bogusly in last commit.
+
+2009-04-06  Akim Demaille  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: redo check-html, recheck, recheck-html.
+       * lib/am/check.am (recheck, recheck-am): Remove.
+       (recheck-TESTS): Rename to ...
+       (recheck): ... this and rewrite, factored ...
+       (recheck-html): ... with this rule.  Pass TEST_LOGS rather than
+       RECHECK_LOGS to `check' and `check-html', respectively, to avoid
+       running outdated tests.  Invoking the public macros ensures
+       `check_SCRIPTS' etc. are created in time.  Do not output errors
+       for tests that were not run yet.  If the testsuite has not run
+       at all, run all tests.
+       (check-html): Run `check' target, not `check-TESTS', to ensure
+       `check_SCRIPTS' etc. are created in time.
+       (.PHONY, .MAKE, AM_RECURSIVE_TARGETS): Adjust contents.
+       * tests/parallel-tests2.test: Expose the check-html and
+       recheck-html issues.
+       * tests/parallel-tests9.test: Expose the recheck issues.
+       Bugs in previous version pointed out by Akim, who already had
+       them fixed in his original version.
+
+2009-04-04  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: LOG_COMPILER for tests without known extension.
+       * automake.in (handle_tests): If we don't match a known
+       extension, define `LOG_COMPILER' as `$(LOG_COMPILE)
+       $(AM_LOG_FLAGS) $(LOG_FLAGS)' and use it as %COMPILE% in check2.
+       * doc/automake.texi (Simple Tests using parallel-tests):
+       Document it.  In the examples, suggest using the AM_*LOG_FLAGS
+       flags in Makefile.am rather than the variables without `AM_'
+       prefix.
+       * lib/Automake/tests/Makefile.am (AM_PL_LOG_FLAGS): Renamed from
+       (PL_LOG_FLAGS): ... this variable, intended for the user.
+       * tests/parallel-tests7.test: Extend test.
+       * NEWS: Update.
+       Suggestion by Akim Demaille.
+
+       More node renaming in the manual.
+       * doc/automake.texi (Top): Adjust menu to ...
+       (API Versioning): ... this node being renamed from ...
+       (API versioning): ... this, and ...
+       (Wildcards): ... this being renamed from ...
+       (wildcards): ... this.
+       Report by Karl Berry.
+
+2009-04-03  Andreas Schwab  <address@hidden>
+
+       * tests/instdir-java.test: Don't require gcj.  Skip if javac is
+       not available.
+
+2009-04-01  Ralf Wildenhues  <address@hidden>
+
+       Fix testsuite failures due to nonexistent `dirlist' entries.
+       * tests/defs.in: When parsing `$aclocaldir/dirlist', only add
+       existing directories D to aclocal `-I D' flags, as aclocal
+       errors on nonexisting directories.
+       Report and analysis by Andreas Schwab.
+
+2009-03-31  Akim Demaille  <address@hidden>
+
+       Fix typo in manual.
+       * doc/automake.texi (Simple Tests using parallel-tests): Fix
+       typo.
+
+2009-03-31  Jim Meyering  <address@hidden>
+
+       Avoid test failure due to paranoid TAR_OPTIONS envvar setting.
+       * tests/txinfo18.test: Don't let a TAR_OPTIONS=--keep-old-files
+       environment variable setting cause test failure.  Fixed in
+       texi2dvi 4.13.
+
+       Use more common spelling in diagnostic: s/canonic/canonical/.
+       * automake.in (check_typos): s/canonic/canonical/.
+
+2009-03-31  Ralf Wildenhues  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.10c.
+
+2009-03-29  Ralf Wildenhues  <address@hidden>
+
+       * configure.ac, NEWS: Bump version to 1.10b.
+       * doc/automake.texi (Releases): Add statistics for 1.10b.
+
+       * NEWS: Minor update.
+
+       Reorganize nodes in the manual.
+       Avoid texinfo sectioning commands without nodes, by either
+       introducing new nodes along with menus, or using headings
+       commands.  Adjust all references.
+       * doc/automake.texi: Throughout the manual, adjust references to
+       new or changed node names.  Rename `non-configured' to
+       `unconfigured', capitalize headings and section names better.
+       (Top): List new menus and nodes introduced below.
+       (Length Limitations): Renamed from ...
+       (Length limitations): ... this.
+       (aclocal Options): Renamed from ...
+       (aclocal options): ... this.
+       (Macro Search Path): Renamed from ...
+       (Macro search path): ... this.  Rename subsubsections to
+       subsubheadings.
+       (Public Macros, Obsolete Macros, Private Macros): Renamed from
+       (Public macros, Obsolete macros, Private macros): ... these.
+       (Conditional Subdirectories): Introduce sub menu and split ...
+       (SUBDIRS vs DIST_SUBDIRS, Subdirectories with AM_CONDITIONAL)
+       (Subdirectories with AC_SUBST, Unconfigured Subdirectories):
+       ... into these new nodes.  Adjust subsection names to node
+       names.
+       (Conditional Sources): Rename subsubsections to subsubheadings.
+       (Conditional Programs): Likewise.
+       (Program Variables): Renamed from ...
+       (Program variables): ... this.
+       (Libtool Issues): Introduce sub menu and split into ...
+       (Required file ltmain.sh not found)
+       (Objects created both with libtool and without): ... these new
+       nodes.
+       (Other Objects, Built Sources): Renamed from ...
+       (Other objects, Built sources): ... these.
+       (Built Sources Example): Renamed from ...
+       (Built sources example): this.  Rename unnumberedsubsecs to
+       subsubheadings.
+       (Man Pages): Renamed from ...
+       (Man pages): ... this.
+       (Install): Introduce sub menu and split into ...
+       (Basics of Installation, The Two Parts of Install)
+       (Extending Installation, Staged Installs)
+       (Install Rules for the User): ... these new nodes.
+       (Dist): Introduce sub menu and split into ...
+       (Basics of Distribution, Fine-grained Distribution Control)
+       (The dist Hook, Checking the Distribution)
+       (The Types of Distributions): ... these new nodes.
+       (Tests): Introduce sub menu and split into ...
+       (Simple Tests, Simple Tests using parallel-tests, DejaGnu Tests)
+       (Install Tests): ... these new nodes.
+       (Conditionals): Move the portability paragraph up, introduce sub
+       menu and split into ...
+       (Usage of Conditionals, Limits of Conditionals): ... these new
+       nodes.  Link to several sections throughout the manual that deal
+       with specific usage of conditionals.
+       (CVS): Rename subsections to subheadings.
+       (maintainer-mode): Likewise.
+       (Limitations on File Names): Renamed from ...
+       (limitations on file names): ... this.
+       (Flag Variables Ordering): Rename subsections to subheadings.
+       (Renamed Objects): Renamed from ...
+       (Renamed objects): ... this.
+       (Dependency Tracking Evolution): Introduce sub menu and split
+       into ...
+       (First Take on Dependencies, Dependencies As Side Effects)
+       (Dependencies for the User, Techniques for Dependencies)
+       (Recommendations for Tool Writers)
+       (Future Directions for Dependencies): ... these new nodes.
+       Report by Karl Berry.
+
+2009-03-29  Ralf Wildenhues  <address@hidden>
+
+       Update AM_RECURSIVE_TARGETS for parallel-tests.
+       * lib/am/check.am [PARALLEL_TESTS] (AM_RECURSIVE_TARGETS):
+       Add check, recheck, check-html, recheck-html.
+
+2009-03-29  Ralf Wildenhues  <address@hidden>
+           Akim Demaille  <address@hidden>
+
+       parallel-tests: New target recheck-html.
+       * lib/am/check.am [PARALLEL_TESTS] (recheck-html): New phony,
+       recursive target.  Factor common implementation with
+       `check-html'.
+       * doc/automake.texi (Tests): Document recheck-html.
+       * tests/parallel-tests2.test: Test it.
+
+2009-03-28  Ralf Wildenhues  <address@hidden>
+           Akim Demaille  <address@hidden>
+
+       parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
+       Replace the LAZY_TEST_SUITE API with a simpler yet more powerful
+       one: RECHECK_LOGS specifies those tests which are to be removed
+       in any case before testing.  Provide a `recheck' convenience
+       target to set RECHECK_LOGS to all failed and unexpectedly passed
+       tests.  Document several ways to limit the set of tests run.
+       * lib/am/check.am [PARALLEL_TESTS] (RECHECK_LOGS): New variable,
+       default to $(TESTS_LOGS).
+       (check-TESTS): Remove $(RECHECK_LOGS) not $(TEST_LOGS).  Drop use
+       of LAZY_TEST_SUITE.
+       ($(TEST_SUITE_LOG)): Do not output note about lazy rerun, as
+       LAZY_TEST_SUITE is gone.
+       (recheck): New target.
+       (recheck-am, recheck-TESTS): New internal targets.
+       * doc/automake.texi (Tests): Update @vindex for TESTS and
+       TEST_LOGS.  Replace description of LAZY_TEST_SUITE with a list
+       of ways the set of tests to be run can be modified.  Document
+       RECHECK_LOGS and the recheck target.
+       * tests/defs.in: Unset RECHECK_LOGS not LAZY_TEST_SUITE.
+       * tests/parallel-tests.test: Adjust, replacing LAZY_TEST_SUITE
+       with corresponding RECHECK_LOGS settings.
+       * tests/parallel-tests9.test: New tests.
+       * tests/Makefile.am: Update.
+       Suggestion and different implementation by Akim Demaille.
+
+       parallel-tests: do not mark check-TESTS as `.MAKE'.
+       * lib/am/check.am [PARALLEL_TESTS] (.MAKE): Remove check-TESTS.
+       This rule removes files, which should not be executed with BSD
+       `make -n'.
+
+       parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
+       * automake.in (handle_tests): Warn about portability issue
+       concerning generated TESTS files listed with a `$(srcdir)/'
+       or `$(top_srcdir)/' prefix.
+       * doc/automake.texi (TESTS): Document this issue.  Mention that
+       the parallel-tests driver is still experimental.
+       * tests/parallel-tests8.test: New test.
+       * tests/Makefile.am: Update.
+
+       check-html: Always create HTML output, note conversion failure.
+       * lib/am/check.am (check-html): Create `$(TEST_SUITE_HTML)' in
+       any case.  Exit unsuccessfully if HTML creation failed.
+       * tests/parallel-tests2.test: Amend test to expose this.
+
+2009-03-24  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
+       For test files with extension <ext>, introduce the internal
+       variable <EXT>_LOG_COMPILE, which expands to
+       $(<EXT>_LOG_COMPILER) $(AM_<EXT>_LOG_FLAGS) $(<EXT>_LOG_FLAGS).
+       Turn also the lib/Automake/tests testsuite over to the new
+       test driver.
+       * doc/automake.texi (Tests): Document `EXT_LOG_COMPILER' and
+       `EXT_LOG_FLAGS'.
+       * lib/am/check2.am: Insert `%COMPILE%' right before test.
+       * automake.in (handle_tests): Substitute `COMPILE' for check2,
+       empty for tests without extension, and `$(ext_LOG_COMPILE)' for
+       extension `ext'.  In the latter case, define it from the public
+       components.
+       * configure.ac (AM_INIT_AUTOMAKE): Use `parallel-test' globally.
+       * tests/Makefile.am (AUTOMAKE_OPTIONS): Remove, not needed here
+       any more.
+       * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Split ...
+       (PL_LOG_COMPILER, PL_LOG_FLAGS): ... into these new variables.
+       (TESTS_EXTENSIONS): New variable, initialize to `.pl'.
+       * tests/parallel-tests7.test: New test.
+       * tests/Makefile.am: Update.
+       Suggestion by Akim Demaille.
+
+2009-03-22  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: also record logs of SKIPped tests.
+       * lib/am/check.am [PARALLEL_TESTS] ($(TEST_SUITE_LOG)): Record
+       SKIPs as well.
+       Suggested by Jim Meyering.
+
+       Minor optimization in parallel-tests text box creation.
+       * lib/am/check.am [PARALLEL-TESTS] (am__text_box): Use only one
+       awk invocation, rather than several tools, to create a text box.
+       Suggestion from Akim Demaille.
+
+2009-03-29  Ralf Wildenhues  <address@hidden>
+
+       Rewrite maintainer-check in separate tests, parallelizable.
+       * Makefile.am (sc_diff_automake_in_automake, sc_perl_syntax)
+       (sc_no_brace_variable_expansions, sc_rm_minus_f)
+       (sc_no_for_variable_in_macro, sc_mkinstalldirs)
+       (sc_pre_normal_post_install_uninstall, sc_perl_no_undef)
+       (sc_perl_no_split_regex_space, sc_cd_in_backquotes)
+       (sc_cd_relative_dir, sc_perl_at_uscore_in_scalar_context)
+       (sc_perl_local_no_parens, sc_perl_local)
+       (sc_AMDEP_TRUE_in_automake_in, sc_tests_make_without_am_makeflags)
+       (sc_tests_plain_make, sc_tests_plain_autoconf)
+       (sc_tests_plain_autoupdate, sc_tests_plain_automake)
+       (sc_tests_here_document_format, sc_tests_Exit_not_exit)
+       (sc_tests_automake_fails, sc_tests_plain_aclocal)
+       (sc_tests_plain_perl, sc_tests_required_after_defs)
+       (sc_tests_overriding_macros_on_cmdline, sc_tests_plain_sleep)
+       (sc_tests_plain_egrep_fgrep, sc_mkdir_p, sc_perl_at_substs)
+       (sc_unquoted_DESTDIR, sc_tabs_in_texi, sc_at_in_texi): New rules,
+       all phony, all listed in ...
+       (syntax_check_rules): ... this new variable and split out from ...
+       (maintainer-check): ... this rule.  Depend on $(syntax_check_rules).
+
+       * Makefile.am (maintainer-check): Do not complain if DESTDIR is
+       passed as argument to `make'.
+
+       * doc/automake.texi (Cross-Compilation): Fix underfull hbox.
+
+       Sync auxiliary files from upstream.
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: Sync from upstream.
+
+2009-03-28  Ralf Wildenhues  <address@hidden>
+
+       manual: minor cleanups.
+       * doc/automake.texi (Yacc and Lex): Adjust spacing in example.
+       (Mixing Fortran 77 With C and C++): Drop unneeded @page breaks.
+
+       Sane (un)install for empty directory variables.
+       This patch fixes all install and uninstall rules to behave
+       sanely when $(wheredir) is the empty string, but $(where_HOW) is
+       nonempty, for all kinds of values of `where' and `HOW'.
+       * lib/am/data.am (install-%DIR%%PRIMARY%, uninstall-%DIR%%PRIMARY%):
+       Do not touch the install tree if the corresponding directory variable
+       $(%NDIR%dir) is empty.
+       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Likewise.
+       * lib/am/libs.am (install-%DIR%LIBRARIES, uninstall-%DIR%LIBRARIES):
+       Likewise.
+       * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Likewise.
+       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES, 
uninstall-%DIR%LTLIBRARIES):
+       Likewise.
+       * lib/am/mans.am (install-man%SECTION%, uninstall-man%SECTION%):
+       Likewise.
+       * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS):
+       Likewise.
+       * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
+       Likewise.
+       * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS):
+       Likewise.
+       * lib/am/texinfos.am (install-dvi-am, install-html-am, install-pdf-am)
+       (install-ps-am, uninstall-dvi-am, uninstall-html-am, uninstall-pdf-am)
+       (uninstall-ps-am): Likewise.
+       * tests/instdir2.test, tests/instdir-java.test,
+       tests/instdir-lisp.test, tests/instdir-ltlib.test,
+       tests/instdir-prog.test, tests/instdir-python.test,
+       tests/instdir-texi.test: New tests.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+       Suggestion by Akim Demaille.
+
+       Ensure that empty directory variables work with empty content variables.
+       This test ensures that, if both $(wheredir) and $(where_HOW) are
+       the empty string, then the `install' and `uninstall' rules behave
+       sanely, for several directory variables `wheredir' and several
+       primaries `HOW'.
+       * tests/instdir.test: New test.
+       * tests/Makefile.am: Update.
+
+2009-03-23  Ralf Wildenhues  <address@hidden>
+
+       Use --tag=FC with libtool also for .f90 files.
+       * automake.in: Set 'libtool_tag' for language `fc'.
+       * tests/fort5.test: Grep for the tag.
+       * THANKS: Update.
+       Report by John R. Cary.
+
+2009-03-22  Peter Breitenlohner  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       For PR automake/533:
+       DISTFILES containing a directory and files in that directory.
+       When the source tree contains non-writable files or directories
+       (as happens during distcheck), and directories or entries
+       thereof are listed multiple times in variables to be
+       distributed, then the corresponding directories below $(distdir)
+       need to be made writable recursively.  Since file modes should
+       not change, they need to be copied recursively using `cp -f'.
+       * lib/am/distdir.am: Handle this situation.
+       * tests/distdir.test: Extend test to those cases.
+       * NEWS: Update.
+       Report by Peter Breitenlohner.
+
+2009-03-22  Jim Meyering  <address@hidden>
+
+       Fix a documentation typo.
+       * doc/automake.texi (Headers): Clarify the note telling when it's
+       better not to use noinst_HEADERS.
+
+2009-03-22  Ralf Wildenhues  <address@hidden>
+
+       Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile.
+       This new macro lists all public targets which invoke `make'
+       recursively, or depend on targets which do so.  It allows to
+       prevent parallelism selectively, when multiple targets are
+       passed on the `make' command line.
+       * lib/am/distdir.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS): New
+       macro.
+       * lib/am/subdirs.am (AM_RECURSIVE_TARGETS): Likewise.
+       * lib/am/tags.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS):
+       Likewise.
+
+2009-03-11  Ralf Wildenhues  <address@hidden>
+
+       Fix LAZY_TEST_SUITE handling and $(TEST_SUITE_LOG) recreation.
+       * lib/am/check.am (check-TESTS): Expand `$(TEST_LOGS)' only once
+       in the rule command, for systems with low command line limits.
+       Remove $(TEST_SUITE_LOG) even in LAZY_TEST_SUITE mode.
+       ($(TEST_SUITE_LOG)): Always recreate $(TEST_SUITE_LOG).  Mention
+       lazy mode in the summary output.
+       * tests/parallel-tests.test: Test LAZY_TEST_SUITE semantics.
+
+2009-03-10  Ralf Wildenhues  <address@hidden>
+
+       Fix parallel-tests with empty $(TESTS) for BSD make.
+       * lib/am/check.am [PARALLEL_TESTS] ($(TEST_SUITE_LOG)): Ignore
+       empty line stemming from empty $(TEST_LOGS), to avoid counting
+       zero tests as one.
+       (check-TESTS): If `$(TESTS)' is empty, override TEST_LOGS to be
+       empty, rather than `.log', for BSD make.
+       * tests/parallel-tests6.test: New test.
+       * tests/Makefile.am: Update.
+
+       Mark check-html and check-TESTS as recursive for BSD make.
+       * lib/am/check.am [PARALLEL_TESTS] (.MAKE): Add check-TESTS
+       and check-html prerequisites.
+
+       Match XFAIL_TESTS correctly with Solaris make.
+       * lib/am/check.am [PARALLEL_TESTS]: VPATH rewriting may have
+       changed test names, so srcdir needs to be taken into account
+       explicitly when checking against the list of tests expected
+       to fail.  Fixes spurious FAILures from XFAIL_TESTS.
+
+       Use append mode to capture parallel test output.
+       * tests/lisp8.test: Use append mode for output from `make -j',
+       to avoid dropped lines.
+       * tests/parallel-tests3.test: Likewise.
+
+       parallel-tests: Fix summary output.
+       * lib/am/check.am (am__text_box): Fix unportable sed script,
+       replacing `\n' in the right hand side of an `s' command with
+       a literal newline.  Kudos to Bruno Haible for the newline idea.
+       * tests/parallel-tests.test: Update test to expose this.
+
+2009-03-08  Ralf Wildenhues  <address@hidden>
+
+       Overhaul of tests/README.
+       * tests/README: General overhaul.  Mention parallel test suite
+       execution, the test-suite.log file; document `Exit' vs. `exit',
+       `defs' vs. `defs-p', the naming of `parallel-tests' tests.
+       * README: Simplify, point to tests/README.
+
+       Documentation for the parallel-tests driver.
+       * doc/automake.texi (Tests, Options): Document the `parallel-tests'
+       option, including new features of the test driver.
+       * NEWS: Update.
+
+       New tests for `parallel-tests'.
+       * tests/parallel-tests.test: New file, to expose a bunch of
+       features of `parallel-tests': VERBOSE, clean, TEST_SUITE_LOG,
+       test dependencies, DISABLE_HARD_ERRORS.
+       * tests/parallel-tests2.test: New file, test check-html.
+       * tests/parallel-tests3.test: New file, test concurrency.
+       * tests/parallel-tests4.test: New file, test suffix rules.
+       * tests/parallel-tests5.test: New file, demonstrate compile/test
+       concurrency.
+       * tests/defs.in: Add a `required' check for rst2html.
+       * tests/Makefile.am: Update.
+
+       parallel-tests: Ensure backward-compatible semantics.
+       For each test in Automake's test suite that uses TESTS, generate
+       an identical one that uses the `parallel-tests' option, for
+       coverage of backward-compatible functionality.
+       * tests/gen-parallel-tests: New file, generates distributed
+       Makefile.am snippet tests/parallel-tests.am to list all tests
+       that use the TESTS interface but not yet the `parallel-tests'
+       option, with names mangled to use suffix `-p.test', in ...
+       (parallel_tests): ... this new make macro.
+       * tests/Makefile.am ($(srcdir)/parallel-tests.am)
+       ($(parallel_tests), defs-p): New rules.
+       (TESTS): Add check11.test and $(parallel_tests).
+       (check_SCRIPTS): Add defs-p, $(parallel_tests).
+       (check-clean-local): Remove `defs-p'.
+       (EXTRA_DIST): Distribute gen-parallel-tests.
+       (MAINTAINERCLEANFILES): New variable, remove $(parallel_tests).
+       * bootstrap: Generate parallel-tests.am.
+       * tests/check8.test: Check for circular dependencies in rules.
+       * tests/check11.test: New test, check that SKIPs are not counted
+       as passed tests.
+       * tests/defs.in: Unset DISABLE_HARD_ERRORS, LAZY_TEST_SUITE,
+       VERBOSE, so the tests are not influenced by the way our test
+       suite is invoked.
+
+2009-03-08  Akim Demaille  <address@hidden>
+           Jim Meyering  <address@hidden>
+           Benoit Sigoure  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Parallel test execution: new option `parallel-tests'.
+       * automake.in (handle_tests): Set new conditional PARALLEL_TESTS
+       when reading check.am.  Handle option `parallel-tests' and all
+       its new semantics.  Define macros TEST_SUFFIXES, TEST_SUITE_LOG,
+       TEST_SUITE_HTML, TEST_LOGS, TEST_LOGS_TMP, suffix rules if
+       applicable, and per-target rules for other tests.  Add all log
+       files to %clean_files at the `MOSTLY_CLEAN' level.
+       * lib/Automake/Options.pm (_process_option_list): Accept
+       `parallel-tests'.
+       * lib/am/check.am [!PARALLEL_TESTS] (check-TESTS): Move existing
+       testsuite driver under this new conditional.
+       [PARALLEL_TESTS]
+       (am__rst_title, am__rst_section, am__text_box am__sh_e_setup)
+       (am__check_pre, am__check_post): New internal macros.
+       ($(TEST_SUITE_LOG), check-TESTS, .log.html, check-html): New
+       rules.
+       * lib/am/check2.am: New file.
+       * lib/am/Makefile.am (dist_am_DATA): Add check2.am.
+       * tests/Makefile.am (AUTOMAKE_OPTIONS): Use `parallel-tests'.
+       (clean-local): Renamed from distclean-local.
+       * tests/defs.in: Drop VERBOSE handling, not needed here any more.
+
+2009-03-12  Ralf Wildenhues  <address@hidden>
+
+       Rename `silent' mode to `silent-rules' mode.
+       * automake.in (define_verbose_var, verbose_flag)
+       (define_verbose_tagvar, handle_options, handle_languages)
+       (handle_configure, parse_arguments): Rename the `silent' option
+       to `silent-rules', so it coincides with the `--silent-rules'
+       command line option; adjust all code and comments.
+       * lib/Automake/Options.pm (_process_option_list): Likewise.
+       * doc/automake.texi (Invoking Automake, Libtool Flags, Options):
+       Likewise.
+       * NEWS: Adjust.
+       * tests/dollarvar.test, tests/silent.test, tests/silent2.test,
+       tests/silent3.test, tests/silent4.test, tests/silent5.test,
+       tests/silent6.test, tests/silent7.test: Likewise.
+       Suggestion by Jan Engelhardt.
+
+2009-03-11  Ralf Wildenhues  <address@hidden>
+
+       `silent' mode unconditionally overrides portability-recursive.
+       * automake.in (parse_arguments): Don't handle a global `silent'
+       option here; instead, ...
+       (handle_options): ... handle the "normal" `silent' option here.
+       Override `portability-recursive' here, at the last point we deal
+       with options, instead ...
+       * lib/Automake/Options.pm (_process_option_list): ... of here.
+       * tests/silent6.test: Replace unportable make snippet, remove
+       FIXME note, add more test cases of options passed in the various
+       locations.
+
+       Drop extra line from compile rules when `silent' is not used.
+       * lib/am/depend2.am [!%FASTDEP%]: Only use the `%VERBOSE%
+       @AM_BACKSLASH@' extra line if ?VERBOSE?.
+       Report by Ralf Corsepius.
+
+2009-03-10  Ralf Wildenhues  <address@hidden>
+
+       Keep `--silent-rules' across triggered automake reruns.
+       * automake.in (usage): Reformat to be a bit clearer.
+       (handle_configure): Remove substitutions %STRICTNESS% and
+       %USE-DEPS% in favor of a new substitution %AUTOMAKE-OPTIONS%
+       that carries over all needed flags.
+       * lib/am/configure.am (%MAKEFILE-IN%): Adjust rule.
+       * tests/flavor.test: New test, to ensure --$flavor (gnu,
+       gnits, foreign, cygnus), --ignore-deps, and --silent-rules are
+       preserved across automake reruns.
+       * tests/Makefile.am: Update.
+
+2009-03-09  Ralf Wildenhues  <address@hidden>
+
+       Provide variables for silencing of user rules.
+       * automake.in (handle_languages): Always define `AM_V_GEN' and
+       `AM_V_at'.
+       * doc/automake.texi (Options): Document these flags.
+       * tests/silent7.test: New test.
+       * tests/Makefile.am: Update.
+
+       Redo variable naming for `silent' machinery.
+       The public variables are named `AM_V_' plus the compiler
+       short-hand now, e.g.: AM_V_CC, AM_V_CXXLD, AM_V_GEN.  The
+       dispatch variables are internal details and begin with
+       `am__v_'.
+       * automake.in (verbose_var): Update comment.
+       (verbose_private_var): New function.  Order functions so that
+       ones not needed outside this section are listed first.
+       (verbose_dispatch): Remove, no need to factor this.
+       (define_verbose_var, define_verbose_libtool): Use
+       verbose_private_var.
+       (define_verbose_tagvar): Likewise; and simplify.
+       Report by Jan Engelhardt.
+
+       Let -Wportability turn on/off the portability-recursive channel.
+       * lib/Automake/ChannelDefs.pm (switch_warning): switch
+       `portability-recursive' channel as well if changing the
+       `portability' channel.
+       * tests/dollarvar2.test: New test.
+       * tests/Makefile.am: Update.
+
+2009-03-07  Ralf Wildenhues  <address@hidden>
+
+       New automake command line option `--silent-rules'.
+       * automake.in (parse_arguments): Accept `--silent-rules; let it
+       override command line warning settings.
+       (usage): Document it.
+       * doc/automake.texi (Invoking Automake): Document it.
+       * NEWS: Update.
+       * tests/dollarvar.test: Also test `--silent-rules'.
+       * tests/pr300-ltlib.test: Use `$MAKE V=1' to enable verbose
+       output, which is matched later in the test.
+       * tests/silent6.test: New test.
+       * tests/Makefile.am: Update.
+
+       Documentation and tests for the `silent' option.
+       * NEWS: Update.
+       * doc/automake.texi (Invoking Automake): `silent' turns off some
+       portability warnings.
+       (Libtool Flags): `silent' silences libtool.
+       (Options): Document the `silent' flag.
+       * tests/dollarvar.test, tests/silent.test, tests/silent2.test,
+       tests/silent3.test, tests/silent4.test, tests/silent5.test: New
+       tests.
+       * tests/Makefile.am: Update.
+       * Makefile.am (maintainer-check): Ignore `DESTDIR' and `V' when
+       checking for make variables that should not be overridden from
+       the command line.
+
+2009-03-07  Jan Engelhardt  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Implement `silent' build rules.
+       * automake.in (ccer): New field in the language structure.
+       Initialize it for all registered languages.
+       (verbose_var, verbose_flag, verbose_dispatch)
+       (silent_flag, define_verbose_var, define_verbose_tagvar)
+       (define_verbose_libtool): New functions.
+       (handle_languages, handle_programs, handle_libraries)
+       (handle_ltlibraries, handle_configure)
+       (define_compiler_variable, define_linker_variable)
+       (define_per_target_linker_variable): Use them where appropriate
+       to define variables to implement the silent output machinery.
+       * lib/Automake/Options.pm (_process_option_list): Accept
+       `silent', turning off `portability-recursive'.
+       * lib/am/depend2.am: Add %VERBOSE% and %SILENT% prefixes where
+       appropriate.
+       * lib/am/lex.am: Likewise.
+       * lib/am/library.am: Likewise.
+       * lib/am/ltlibrary.am: Likewise.
+       * lib/am/program.am: Likewise.
+       * lib/am/yacc.am: Likewise.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Substitute, but do not define,
+       AM_BACKSLASH.
+       * tests/defs.in: Unset `V', to avoid influencing inner tests.
+
+2009-03-07  Ralf Wildenhues  <address@hidden>
+
+       New channel `portability-recursive'.
+       Add new channel for portability warnings about recursive make
+       variable expansions `$(var1$(var2))'.  Enable it alongside
+       `-Wportability'.
+       * lib/Automake/ChannelDefs.pm (Automake::ChannelDefs): Register
+       channel `portability-recursive'.
+       * lib/Automake/Variable.pm (_VARIABLE_CHARACTERS)
+       (_VARIABLE_RECURSIVE_PATTERN): New variables.
+       (check_variable_expansions): Diagnose recursive variable
+       expansions through the new channel.
+
+2009-03-14  Ralf Wildenhues  <address@hidden>
+
+       * NEWS: Update.
+
+2009-03-12  Ralf Wildenhues  <address@hidden>
+
+       Ignore warnings from autom4te about Libtool macros.
+       * tests/ltinstloc.test: When testing for presence of warnings,
+       filter out any that are not interesting for this test, e.g.,
+       warnings about installed files or about bogusly named cache
+       variables in libtool.m4, emitted by recent Autoconf when older
+       Libtool is used.
+
+2009-03-09  Ralf Wildenhues  <address@hidden>
+
+       Relax depcomp test for MSVC to not require minuso.
+       * m4/depend.m4 (_AM_DEPENDENCIES): When checking the msvisualcpp
+       and msvcmsys depmodes, do not require `-c -o' to work just yet.
+       It is not needed by the depcomp script for these depmodes, and
+       works around the ordering issue between the tests.
+       Report by Peter Rosin.
+
+2009-03-09  Peter Rosin  <address@hidden>
+
+       * tests/compile2.test: Fix typo.
+
+2009-03-07  Ralf Wildenhues  <address@hidden>
+
+       Improve NetBSD 'make -n' output for many standard targets.
+       * automake.in (handle_tags): Let .MAKE depend on
+       `tags-recursive' and `ctags-recursive' if appropriate.
+       (handle_all): Likewise for `all'.
+       (do_check_merge_target): Likewise for `check-am' and `check'.
+       * lib/am/ansi2knr.am (.MAKE): Depend on %ANSI2KNR-DIR%/ansi2knr.
+       * lib/am/install.am [%?maybe_BUILT_SOURCES%] (.MAKE): Depend on
+       `install'.
+       * tests/maken3.test, tests/maken4.test: New tests.
+       * tests/Makefile.am: Update.
+
+       Improve `make -n dist' and `make -n distcheck' for GNU make.
+       Ensure that `make -n dist' and `make -n distcheck' do not change
+       files, due to GNU make executing rules containing `$(MAKE)'.
+       * lib/am/distdir.am (distdir): Separate the creation of
+       `$(distdir)/$$subdir' for `$(DIST_SUBDIRS)' and the recursion
+       into the `$(DIST_SUBDIRS)' in two separate rule commands.
+       (distcheck): Exit recursive rule early when run with `make -n',
+       as detected by a witness file.
+       * tests/maken.test, tests/maken2.test: New tests.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+2009-03-07  Ralf Wildenhues  <address@hidden>
+
+       Solaris make testsuite fixes.
+       * tests/check10.test: When a rule fails, Solaris make will
+       output the complete command that failed; in this case the test
+       suite driver.  Adjust the test to not bogusly match lines from
+       the driver, rather than its output.
+       * tests/distcleancheck.test: Avoid triggering VPATH rewriting,
+       not desirable in this test.
+       * tests/specflg10.test: Use BUILT_SOURCES to specify an
+       intermediate target, so Solaris make knows what to do.
+
+       testsuite: SKIP compile tests if configure found no compiler.
+       * tests/depend6.test: configure will exit 77 if AC_PROG_CC found
+       no working compiler.  Allow the test to be SKIPped in that case.
+       * tests/postproc.test: Likewise.
+       * tests/pr243.test: Likewise.
+       * tests/pr266.test: Likewise.
+
+       Fix maintainer-check fallout.
+       * tests/compile2.test: Use `Exit', not `exit'.
+
+2009-03-07  Peter Breitenlohner  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Extract correct man section from files in man_MANS.
+       * lib/am/mans.am: Extract correct man section in the presence of
+       multiple dots in the file base name and/or directory components.
+       * tests/man5.test: New test case.
+       * tests/Makefile.am: Update.
+
+2009-03-06  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (maintainer-mode): Fix logic in
+       AM_MAINTAINER_MODE description.
+       * THANKS: Update.
+       Report by Daniel Kahn Gillmor.
+
+2009-03-05  Ralf Wildenhues  <address@hidden>
+
+       * lib/gnupload: Change conffile name to `.gnuploadrc'.
+
+2009-03-04  William Pursell  <address@hidden>
+
+       Replace bare `automake' with address@hidden' or `Automake'.
+       * doc/automake.texi: Avoid bare `automake' in the manual,
+       replacing occurrences with address@hidden' when the command
+       is meant, and `Automake' when speaking about the software
+       package in general.
+
+2009-03-04  Ralf Wildenhues  <address@hidden>
+
+       * lib/depcomp: Various portability and quoting nits.
+
+       reformat gnupload script.
+       * lib/gnupload: Reformat and reindent.
+
+       gnupload touchups.
+       * lib/gnupload (conffile): New variable.  Use throughout.
+       (dry_run): Use `false' and `:' values.  Show, don't execute,
+       gpg signing commands upon --dry-run.
+       (usage): Typo and formatting fixes.  Mention that commands are
+       applied in order.
+       (argument loop): Factorize a bit, fix quoting.
+       (dprint, mkdirective, mksymlink, upload): Formatting and
+       portability fixes.
+
+2009-03-04  Sergey Poznyakoff  <address@hidden>
+
+       Various gnupload improvements.
+       Add support for uploading to download.gnu.org.ua.
+       Add support for a .gnupload configuration file.
+       Support creating and removing symlinks.
+       Allow for several operations in a single invocation.
+       Add debugging features.
+       * lib/gnupload: New options --delete, --symlink, --rmsymlink,
+       --symlink-regex, --dry-run; support `--' to separate options and
+       commands from files.  New target download.gnu.org.ua.  Expand
+       `.gnupload' file contents before command line arguments.
+       (usage): Expand.
+       (dprint, mkdirective, mksymlink, upload): New functions.
+       * THANKS: Update.
+
+2009-03-03  Peter Rosin  <address@hidden>
+
+       Add depmode=msvcmsys for Microsoft Visual C++ on MSYS.
+       * lib/depcomp [msvisualcpp]: Fork fewer processes. Filter out
+       libtool in the preprocessor invocation (as is done in
+       depmode=cpp). Silence compiler stderr.
+       [msvcmsys]: New depmode as a derivative of depmode=msvisualcpp.
+       msvcmsys transforms any backslashes into forward slashes to
+       make the grep in depend.m4 match, instead of the "cygpath -u"
+       that is used in msvisualcpp.
+
+2009-03-03  Ralf Wildenhues  <address@hidden>
+           Peter Rosin  <address@hidden>
+
+       Fix w32 path handling in the `compile' script.
+       * lib/compile: Handle colons and backslashes in win32 paths.
+       * tests/compile2.test: New test.
+       * tests/Makefile.am: Update.
+       Report and initial patch by Peter Rosin.
+
+2009-03-03  Ralf Wildenhues  <address@hidden>
+
+       Fix `use constant' usage for MSYS Perl 5.6.0.
+       * automake.in (QUEUE_MESSAGE, QUEUE_CONF_FILE, QUEUE_LOCATION)
+       (QUEUE_STRING): Define using one `use constant' each; as perl
+       5.6.0 (on MSYS) does not understand `use constant { ... }'.
+       * THANKS: Update.
+       Report by Peter Rosin.
+
+2009-03-01  Ralf Wildenhues  <address@hidden>
+
+       Fix recursive html and install-* doc rules for BSD make.
+       * automake.in (%required_targets): Add html-am,
+       install-html-am, install-dvi-am, install-pdf-am, install-ps-am,
+       install-info-am.
+       * tests/txinfo32.test: New test.
+       * tests/Makefile.am: Update.
+
+       Fix comment typo.
+       * lib/am/distdir.am (distcheck): Fix typo in comment.
+
+       Ignore generated files below doc/amhello for git.
+       * doc/amhello/.gitignore: New file.
+
+2009-02-17  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Program variables): Add cross reference to
+       `Flag Variables Ordering' node.
+       Report by Karl Berry.
+
+2009-01-31  Ralf Wildenhues  <address@hidden>
+
+       Fix mmodely.test to work on Solaris 10.
+       * tests/mmodely.test: Define yylex, to satisfy needed symbol in
+       libfl.  Return from main instead of using exit, undeclared.
+       * THANKS: Update.
+       Report by Chris Hoogendyk.
+
+2009-01-30  Karl Berry  <address@hidden>
+
+       * lib/gnupload: Add download URL to --help output.
+
+2009-01-23  Eric Blake  <address@hidden>
+
+       Use no-arg macros via AC_REQUIRE for consistency.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require, rather than directly
+       expand, AM_PROG_INSTALL_SH and AM_PROG_INSTALL_STRIP.
+       * configure: Regenerate.
+
+2009-01-20  Ralf Wildenhues  <address@hidden>
+
+       Bump copyright years.
+       * aclocal.in (write_aclocal, version): Bump copyright years.
+       * automake.in (gen_copyright, version): Likewise.
+       * doc/automake.texi: Likewise.
+
+2008-12-29  Chris Pickett  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (LIBOBJS): Clarify overriding of
+       `*_DEPENDENCIES'.
+       * THANKS: Update.
+
+2008-12-21  Ralf Wildenhues  <address@hidden>
+
+       Revamp semantics for `missing help2man' and manpage distribution.
+       Previously, `missing help2man' would create a missing man page
+       containing an error message, and exit 1.  This does not play
+       well with `make': the next run will see this particular man page
+       as being up to date, and will only error out on the next
+       generated man page, if any; repeat until all pages are done.
+       This patch changes `missing' to exit successfully in this case,
+       but `make dist' will ensure that no such man pages are packaged.
+       * lib/missing: Exit successfully even if we create a replacement
+       page due to missing help2man.
+       * automake.in (make_paragraphs): Define %HAVE-MANS% to be true
+       if this makefile deals with man pages.
+       * lib/am/distdir.am (distdir): If %INSTALL-MAN% and %HAVE-MANS%,
+       check that no man page in $(MANS) contains the replacement text
+       from `missing'.
+       * tests/man4.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Reorder a bit, update.
+       * THANKS: Update.
+       Report by Werner Lemberg and Karl Berry.
+
+       Do not use 'global' for makefile-wide settings.
+       * doc/automake.texi (Linking, Libtool Flags)
+       (Program and Library Variables, Flag Variables Ordering):
+       Reword instances of `global variables' that really mean
+       makefile-wide ones.
+       * THANKS: Update.
+       Report by Andreas Bergmeier.
+
+       Fix config.status depfiles failure.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Commands are
+       again a single shell brace group, so they are correctly skipped
+       when dependencies are turned off.  The failure is noisy with
+       ksh only.
+       * tests/depend6.test: New test.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Report and different suggested patch by Markus Duft.
+
+2008-12-21  Zoltan Rado  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (DESTDIR): Fix a couple of typos.
+       * THANKS: Update.
+
+2008-12-13  Ralf Wildenhues  <address@hidden>
+
+       Fix nonportable sed script in 'missing'.
+       * lib/missing: In sed script, do not use ';' after 't' commands.
+
+2008-12-07  Ralf Wildenhues  <address@hidden>
+
+       PR automake/531:
+       * doc/automake.texi (amhello Explained)
+       (Mixing Fortran 77 With C and C++): Fix broken links to
+       Autoconf manual.
+       Report by Michael Ploujnikov.
+
+2008-12-07  Michael Ploujnikov  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Optional, Future of aclocal): Various
+       spelling and grammar fixes.
+       * THANKS: Update.
+
+2008-12-03  William Pursell  <address@hidden>
+
+       Simple typographical and grammar errors in automake.texi.
+       * doc/automake.texi: Fix object/article consistency (eg "an
+       flag" becomes "a flag"), correct minor punctuation errors, etc.
+
+       * doc/automake.texi (Auxiliary Programs, Python, Rebuilding):
+       Replace 'configure' with '@command{configure}' as appropriate.
+
+2008-11-29  Ralf Wildenhues  <address@hidden>
+
+       Fixup release rules.
+       * Makefile.am (cvs-diff): Remove.
+       (git-dist): Do not use clcommit any more.  Use new-style tag
+       name.  Pass $(AM_MAKEFLAGS) to $(MAKE).
+       (git-diff): Adjust.
+       (git-release): Do not upload to sources.redhat.com.
+
+2008-11-27  Ralf Wildenhues  <address@hidden>
+
+       Fix portability issues in distcleancheck_listfiles doc example.
+       * doc/automake.texi (Dist): In the `distcleancheck_listfiles'
+       code example, add `.' path, for Solaris `find', also rewrite so
+       `{}' appears only once and as separate argument, for Posix.
+       * tests/distcleancheck.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Report by Jan Engelhardt and Andreas Schwab.
+
+2008-11-27  Ralf Wildenhues  <address@hidden>
+           Jim Meyering  <address@hidden>
+
+       Cope with whitespace in $MISSING and $install_sh.
+       * configure.ac (am_AUTOHEADER): New substitution, save the value
+       of $AUTOHEADER before AM_INIT_AUTOMAKE may add $MISSING.
+       * tests/defs.in: Use am_AUTOHEADER.
+       * lib/am/install.am: Fix typo.
+       * m4/install-sh.m4 (AM_PROG_INSTALL_SH): Add suitable
+       single-quote quoting to install_sh, but only if needed.
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Add suitable double-quote
+       quoting to MISSING, but only if needed.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Abort configure if `pwd` or
+       $srcdir contain shell meta-characters that cannot be handled;
+       space and tab are allowed in the former only.
+       * tests/sanity.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+       Reports by Jim Meyering and others.
+
+2008-11-24  Ralf Wildenhues  <address@hidden>
+
+       Let `missing' also work with versioned and prefixed programs.
+       * lib/missing: Ignore prefixes of `gnu-', `gnu', and `g' when
+       testing for known programs; also, ignore suffixes.
+       * tests/missing.test: Amend test.
+       * NEWS, THANKS: Update.
+       Report by Tim Rice.
+
+2008-11-23  William Pursell  <address@hidden>
+
+       * doc/automake.texi (Macro search path, Extending aclocal)
+       (Local Macros, Serials, Public macros, Directories)
+       (Conditional Subdirectories, Nesting Packages)
+       (Building a program, Libtool Modules)
+       (Program and Library Variables, Default _SOURCES, LIBOBJS):
+       Correct verb/object tense agreement, swap some words,
+       and general trivial cleanup.
+
+2008-11-22  William Pursell  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (VPATH Builds, Nested Packages)
+       (Length limitations, Auxiliary Programs, Invoking Automake)
+       (Requirements, Optional): Fix typos and grammaros, correct URL
+       to 'config' source repository.  Rewrite description of AC_SUBST.
+       (true): Cross-reference to `Default _SOURCES' node.
+
+2008-11-22  William Pursell  <address@hidden>
+
+       * configure.ac: Quote APIVERSION.
+
+2008-11-22  Jim Meyering  <address@hidden>
+
+       * tests/xz.test: Fix typo introduced by Ralf in last patch.
+
+       Add xz compression support.
+       * NEWS: Mention xz as well as lzma (xz will displace lzma).
+       * automake.in (handle_dist): Recognize dist-xz.
+       (make_paragraphs): Map XZ to dist-xz.
+       * doc/automake.texi (Dist): Add dist-xz.
+       (Options): Likewise.
+       * lib/Automake/Options.pm (_process_option_list): Accept
+       dist-xz.
+       * lib/am/distdir.am (dist-xz): New rule.
+       (dist dist-all): Add command to create an xz-compressed tarball.
+       (distcheck): Handle xz-compressed tarballs just like the others.
+       * tests/xz.test: New file, based on nogzip.test.
+       * tests/Makefile.am (TESTS): Add xz.test.
+
+2008-11-22  Ralf Wildenhues  <address@hidden>
+
+       When installing COPYING, recommend adding the file to VCS.
+       * automake.in (require_file_internal): If installing `COPYING',
+       mention that we install the GPLv3 file and recommend adding the
+       file to version control.
+       * doc/automake.texi (Invoking Automake): Point to `Gnits' node
+       for `--add-missing'.
+       (Gnits): Clarify semantics: that for strictness gnu or higher,
+       INSTALL is installed, and that COPYING is installed as GPLv3
+       if no COPYING file exists.
+       * tests/license2.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS, THANKS: Update.
+       Report by Brian Cameron.
+
+2008-11-20  William Pursell  <address@hidden>
+
+       * doc/automake.texi (Timeline): Fix typos and grammaros.
+
+2008-11-12  Karl Berry  <address@hidden>
+
+       New gnupload option --delete to remove archive files.
+       * lib/gnupload: Accept --delete to remove files from
+       alpha.gnu.org or ftp.gnu.org.
+
+2008-11-12  Ralf Wildenhues  <address@hidden>
+
+       Testsuite fixes for ksh.
+       * tests/check10.test: Add ':' as last command in subshell, for
+       zero exit status of the subshell.
+       * tests/parallel-am.test: Do not let failing 'unset' of
+       nonexistent variable exit the test.
+       * tests/parallel-am2.test: Likewise.
+       * tests/parallel-am3.test: Likewise.
+
+2008-11-11 Charles Wilson  <address@hidden>  (tiny change)
+          Ralf Wildenhues  <address@hidden>
+
+       Cleanup config.lt in case LT_OUTPUT is in use.
+       * lib/am/libtool.am [TOPDIR_P] (distclean-libtool): clean up
+       config.lt as well as libtool.
+       * tests/libtoo11.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+2008-11-11  Ralf Wildenhues  <address@hidden>
+
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: Sync from upstream.
+
+2008-11-10  Ralf Wildenhues  <address@hidden>
+
+       Update to GFDL 1.3.
+       * doc/fdl.texi: Update to GFDL 1.3.
+       * doc/automake.texi (GNU Free Documentation License): Adjust.
+       * NEWS: Update.
+
+       * NEWS: Fix typos.
+       * automake.in: Fix typos in comments.  Remove extraneous
+       whitespace.
+
+2008-11-06  Ralf Wildenhues  <address@hidden>
+
+       Cope with absent Perl modules threads and Thread::Queue.
+       * automake.in: Instead of `use threads', use `require threads;
+       import threads' inside a BEGIN section.  Likewise for
+       Thread::Queue.
+       * lib/Automake/ChannelDefs.pm (Automake::ChannelDefs): Likewise.
+       * lib/Automake/tests/Condition-t.pl: Likewise.
+       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
+       * configure.ac: Likewise, use `require' and `import'.
+       Report by Eric Blake, fix suggested by Ben Pfaff.
+
+2008-11-04  Ralf Wildenhues  <address@hidden>
+
+       Multiple 'make uninstall' should not fail even for TEXINFOS.
+       * lib/am/texinfos.am (uninstall-info-am): Do not fail due to
+       install-info if the installed file does not exist (any more).
+       * tests/txinfo26.test: Issue multiple `make uninstall'.
+       * tests/instmany-mans.test: Likewise.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/txinfo26.test: Likewise.
+       * NEWS: Update.
+
+2008-11-03  Ralf Wildenhues  <address@hidden>
+
+       New public macro AM_SUBST_NOTMAKE.
+       * m4/substnot.m4 (AM_SUBST_NOTMAKE): New public macro; invoke
+       _AM_SUBST_NOTMAKE with arguments.
+       * doc/automake.texi (Optional): Document it.
+       * NEWS: Update.
+       * tests/subst4.test: New test.
+       * tests/Makefile.am: Update.
+       Suggestion by Bruno Haible.
+
+       Fix regression introduced by AM_DEFAULT_SOURCE_EXT.
+       * automake.in (handle_source_transform): Use the right variable
+       when determining whether to apply the old rule for the libtool
+       library default source name.
+       Testsuite failure exposed by Bob Proulx' build daemon.
+
+2008-11-02  Ralf Wildenhues  <address@hidden>
+
+       New maintainer target release-stats.
+       * Makefile.am (release-stats): New target, to help computing the
+       entries in the statistics table in automake.texi.
+       * doc/automake.texi (Releases): Reformat a bit.  Add number of
+       generated files.  Add entry for 1.10.1.
+
+       Choose default source extension: AM_DEFAULT_SOURCE_EXT.
+       * automake.in (handle_source_transform): Accept unconditional
+       literal extension in AM_DEFAULT_SOURCE_EXT as override for the
+       default source extension `.c'.  If set, ignore the old default
+       source rule for libtool libraries.
+       * doc/automake.texi (Default _SOURCES): Document this.
+       * NEWS: Update.
+       * tests/specflg10.test: New test.
+       * tests/Makefile.am: Update.
+       Suggestion by Akim Demaille.
+
+       Fix maintainer-check failure.
+       * tests/parallel-am.test: Rename variable to not match pattern
+       used in maintainer-check.
+
+2008-10-27  Ralf Wildenhues  <address@hidden>
+
+       * NEWS: Fix typo.
+       Spotted by Jim Meyering.
+
+2008-10-26  Ralf Wildenhues  <address@hidden>
+
+       Parallel automake --add-missing: serialized file installs.
+       * automake.in (QUEUE_CONF_FILE, QUEUE_LOCATION, QUEUE_STRING):
+       New serialization keys.
+       ($required_conf_file_queue): New file global.
+       (queue_required_conf_file, require_queued_conf_file): New
+       functions, to queue and dequeue requirements for aux dir files.
+       (require_conf_file): Enqueue if needed.
+       (get_number_of_threads): Can do threads with --add-missing now.
+       (handle_makefiles_threaded): Let worker threads enqueue, let
+       master attend to queued requirements at the right time.
+       * tests/parallel-am.test: Explain the purpose of the include
+       chain used here.
+       * tests/parallel-am2.test: Also cope with --add-missing.
+       * tests/parallel-am3.test: New test, test absence of races with
+       concurrent same-file installs stemming from --add-missing.
+       * tests/Makefile.am: Adjust.
+
+       Implement serialization for Locations.
+       * lib/Automake/Location.pm (serialize, deserialize): New
+       functions.  They allows to serialize a Location in an array, and
+       to restore a Location from a thread queue.  The API is
+       unsymmetric (array vs. queue) because enqueuing data needs to
+       happen atomically.
+
+       Parallel automake: ordered output messages.
+       * lib/Automake/Channels.pm (%_default_options): New options
+       `ordered' default enabled, `queue', default zero (no queue),
+       `queue_key' default undefined.
+       (_merge_options): Ensure `ordered' channels cannot have fatal
+       messages or backtrace output.
+       (_enqueue, _dequeue): New functions, to push messages onto a
+       Thread::Queue, and output messages from such a queue, suitably
+       weeded for duplicates in the same manner as _print_message.
+       (_print_message): If the channel is ordered and has an
+       associated queue, then enqueue messages instead of printing
+       them.
+       (setup_channel_queue, pop_channel_queue): New functions,
+       to set a Thread::Queue for channels, and to flush a queue.
+       * lib/Automake/ChannelDefs.pm: Unset channel option `ordered'
+       for fatal, automake, and verb channels.
+       * automake.in (QUEUE_MESSAGE): New global constant, used as
+       serialization key.
+       (handle_makefiles_threaded): Create message queues for each
+       input file; workers queue messages, and the master outputs them
+       ordered, using the new Channels.pm functions.
+       * tests/parallel-am.test: Also check for ordered output (in the
+       absence of --add-missing races).
+       * tests/parallel-am2.test: New test; check for ordered output of
+       warning and (regular) error messages.
+       * tests/Makefile.am: Adjust.
+
+       Parallel automake execution: AUTOMAKE_JOBS.
+       * lib/Automake/Config.in (perl_threads): New global.
+       * automake.in: Use it.  If the perl supports interpreter-based
+       threading, then use `threads' and `Thread::Queue'.
+       (handle_makefile, handle_makefiles_serial): New functions,
+       factored out from main.
+       (get_number_of_threads): New function, compute number of threads
+       to use, based on environment variable `AUTOMAKE_JOBS' and number
+       of independent makefiles.
+       (handle_makefiles_threaded): New function.  Spawn threads, use
+       thread queue to distribute handling the different makefiles.
+       Collect $exit_code values from threads.
+       (main): Use new functions.
+       * aclocal.in: No threads here.
+       * configure.ac: Substitute PERL_THREADS; enabled with perl >=
+       5.7.2 and when ithreads are available.
+       * bootstrap (dosubst): Likewise.
+       * Makefile.am (do_subst): Likewise.
+       * lib/Automake/Makefile.am (do_subst): Likewise.
+       * lib/Automake/ChannelDefs.pm: Use `Automake::Config' and
+       `threads'.
+       (verb): Prepend thread ID (tid) to verbose messages.
+       * lib/Automake/Channels.pm (msg): Before exiting, flush stderr,
+       needed for worker threads.
+       * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Also
+       include the build tree path, so Config.pm is found.
+       * tests/parallel-am.test: New test.
+       * tests/Makefile.am: Update.
+       * doc/automake.texi (Invoking Automake): Document AUTOMAKE_JOBS.
+       * NEWS, THANKS: Update.
+       Report about long execution times by Joakim Tjernlund and others.
+
+2008-10-26  Ralf Wildenhues  <address@hidden>
+
+       Minor file checking optimization: set_dir_cache_file.
+       * lib/Automake/FileUtils.pm (set_dir_cache_file): New function.
+       * automake.in (require_file_internal): Instead of resetting the
+       cache when a file has been installed, simply correct the cache
+       using set_dir_cache_file.
+
+       No uniquifying for fatal, prog_error, and verbose messages.
+       There is no point in dropping critical messages, even if they
+       are duplicates (unlikely to happen unless they have been sent
+       as non-critical messages before), and verbose messages should
+       enable to show progress, even using duplicate statements.
+       * lib/Automake/ChannelDefs.pm (fatal, automake, verb): Set
+       `uniq_part' to `UP_NONE' when registering these channels.
+
+       Fix 'config.status --file=... depfiles' with new Autoconf.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Eval
+       $CONFIG_STATUS contents if we detect the quoting used by
+       Autoconf 2.62 and newer for --file=.
+       * tests/depend5.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS, THANKS: Update.
+       Report by Sam Steingold against gnulib.
+
+2008-10-26  Johan Dahlin  <address@hidden>
+
+       Support for Python 3.0, drop support for pre-2.0.
+       * lib/py-compile: Do not import string; use sys.stdout.write
+       instead of print, files.split instead of string.split.
+       * m4/python.m4 (AM_PATH_PYTHON): Also look for python3 and
+       phython3.0; do not look for python1.5.  Use sys.stdout.write.
+       (AM_PYTHON_CHECK_VERSION): Do not use string; adjust to xrange
+       removal in Python 3.0, and changed semantics of map.
+       * doc/automake.texi (Python, Hard-Coded Install Paths): Update
+       Python versions mentioned in the manual, using 2.5 everywhere.
+       * NEWS, THANKS: Update.
+
+2008-10-22  Ralf Wildenhues  <address@hidden>
+
+       * lib/Automake/Channels.pm (@chain): Drop unused variable.
+
+       Cleanup of per-input global variables in automake.in.
+       * automake.in ($output_vars, $output_all, $output_header)
+       ($output_rules, $output_trailer): Fix comment, and sort
+       declarations in the order they will appear in the output.
+       ($all_target): Unused variable, remove.
+       (Variables not reset by &initialize_per_input.): New section,
+       clarify that %am_file_cache is not reset.
+       (initialize_per_input): Reset $am_file_name, $am_relative_dir,
+       $in_file_name, $relative_dir, and $topsrcdir to `undef' rather
+       than the empty string; $topsrcdir was not reset at all.  Sort
+       remaining variables in the same order as in the section
+       `Variables reset by &initialize_per_input'.
+
+       Let stderr output end up on fd 2 in testsuite.
+       * tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
+       descriptor 2.
+       * tests/getopt.test: Fix erroneous multiple redirection,
+       uncovered by above change.
+
+2008-10-19  Ralf Wildenhues  <address@hidden>
+
+       Fix DisjConditions module to be thread-safe for perl >= 5.7.2.
+       Self-hashes of blessed references are not correctly transported
+       through thread creation.  This patch fixes that by recreating
+       the hashes upon thread creation with a CLONE special subroutine,
+       which is automatically invoked by new enough Perl versions.
+       * lib/Automake/DisjConditions.pm (CLONE): New special
+       subroutine to fix self hashes upon thread creation.
+       * lib/Automake/tests/Condition-t.pl: New, sister test to
+       Condition.pl, but spawns a new threads after each creation of a
+       new condition; skip test if perl is too old or ithreads are not
+       available.
+       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
+       * lib/Automake/tests/Makefile.am (TESTS): Add them.
+
+2008-10-18  Ralf Wildenhues  <address@hidden>
+
+       Fix comment typos.
+       * automake.in (require_file_internal): Fix typos in comments.
+       * m4/amversion.in: Likewise.
+       * lib/Automake/Variable.pm: Likewise.
+       * lib/Automake/XFile.pm: Likewise.
+
+       Diagnose unsupported uses of `backname' helper function.
+       * automake.in (backname): Error out if the path points outside
+       the directory it started in.
+
+2008-10-12  Ralf Wildenhues  <address@hidden>
+
+       Nicer 'make dist' output.
+       * lib/am/distdir.am (distdir): Hide the complex script
+       used for computing the relative subdirs; echo the sub-make
+       command.
+
+2008-10-12  William Pursell <address@hidden>  (tiny patch)
+
+       * tests/defs.in: Fix comment typo.
+
+2008-10-12  William Pursell <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix grammar w.r.t. plurals in test reports.
+       * lib/am/check.am: Fix singular/plural forms in test reports.
+       * tests/check10.test: New test.
+       * tests/Makefile.am: Update.
+
+2008-10-08  Ralf Wildenhues  <address@hidden>
+
+       Require texi2dvi in tests, makeinfo may not be enough.
+       * tests/txinfo16.test: RHEL 5.2 has makeinfo and texi2dvi in
+       separate packages, so also list the latter as required, as the
+       test generates DVI and/or PDF output (through distcheck).
+       * tests/txinfo18.test: Likewise.
+       * tests/txinfo21.test: Likewise.
+       * tests/txinfo22.test: Likewise.
+       * tests/txinfo3.test: Likewise.
+       * tests/version7.test: Likewise.
+       * THANKS: Update.
+       Report by Alexander Martens.
+
+       Fix bootstrap to remove read-only directories right.
+       * bootstrap: Remove automake-$APIVERSION correctly.
+
+2008-10-06  Ralf Wildenhues  <address@hidden>
+
+       Improve test coverage of current TESTS semantics.
+       * tests/check8.test: New test, for subdir tests and setting of
+       $srcdir.
+       * tests/check9.test: New test, check @substituted@ TESTS.
+       * tests/Makefile.am: Update.
+
+2008-10-05  Ralf Wildenhues  <address@hidden>
+
+       * m4/minuso.m4 (AM_PROG_CC_C_O): Work around shell quoting issue
+       with AIX sh; fixes depcomp6.test failure.
+       * NEWS, THANKS: Update.
+       Report by Rainer Tammer.
+
+       Print captured output before failing.
+       * tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
+       tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
+       tests/check4.test, tests/color.test, tests/fn99.test,
+       tests/fn99subdir.test, tests/help.test, tests/init.test,
+       tests/lisp8.test, tests/missing3.test, tests/pr220.test,
+       tests/python11.test, tests/python4.test, tests/python5.test,
+       tests/unused.test, tests/version8.test: When Exit is called
+       after a command that has stdout or stderr redirected to a file
+       for later inspection, output the file before failing the test.
+
+       Fix some comment typos.
+       * automake.in: Fix some comment typos.
+       * lib/Automake/Condition.pm: Likewise.
+       * lib/Automake/DisjConditions.pm: Likewise.
+       * lib/Automake/Variable.pm: Likewise.
+       * lib/Automake/tests/DisjConditions.pl: Likewise.
+
+2008-09-22  Ralf Wildenhues  <address@hidden>
+
+       * tests/aclibobj.test: Fix race condition.
+
+2008-09-21  Ralf Wildenhues  <address@hidden>
+
+       Fix man page creation without installed files.
+       * doc/Makefile.am (update_mans): Use wrappers in tests/
+       directory.
+       ($(srcdir)/aclocal-$(APIVERSION).1): Use versioned wrapper as
+       input program to help2man.
+       ($(srcdir)/automake-$(APIVERSION).1): Likewise.
+       Report by Eric Blake.
+
+2008-09-20  Ralf Wildenhues  <address@hidden>
+
+       Remove unneeded per-rule *INSTALL variables.
+       * NEWS: Update.
+       * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
+       (install-%DIR%%PRIMARY%): Adjust.
+       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
+       (install-%DIR%LIBRARIES): Adjust.
+       * lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
+       (install-%DIR%LTLIBRARIES): Adjust.
+       * lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
+       (install-%DIR%PROGRAMS): Adjust.
+       * lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
+       (install-%DIR%PYTHON): Adjust.
+       * lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
+       (install-%DIR%SCRIPTS): Adjust.
+
+       Compactify program rules using ternary operators.
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
+       using ternary operators `%KEY?TRUE:FALSE%'.
+       (uninstall-%DIR%PROGRAMS): Likewise.
+
+       New doc section about command line length limits.
+       * doc/automake.texi (Length limitations): New node.
+       (Alternative): `nobase_' is not always equivalent to several
+       base variables.
+       (Install): Mention multi-file install.
+       * NEWS: Expand on the issue, list some more user-visible
+       consequences.
+
+       Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.
+       * automake.in (generate_makefile): If nobase_lib_LTLIBRARIES are
+       used, add an ugly hack to install them before bin_PROGRAMS, just
+       like done with lib_LTLIBRARIES.
+       * tests/ltorder.test: Add program, to expose this.
+
+       Do not reorder nobase ltlib installation.
+       This patch changes back the order of installation of nobase
+       LTLIBRARIES to that in which files are listed in the variables.
+       It does not fix the issue of strict dependency ordering, as
+       implied by *_LIBADD, but as before allows to steer the order by
+       listing the libraries in nobase_*_LTLIBRARIES appropriately.
+       As an advantage over the state of 1.10, multiple consecutive
+       nobase libraries to be installed in the same directory are
+       passed to libtool in one invocation.
+       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES) [!%?BASE%]: Do not
+       reorder libraries upon installation.  Remove spurious empty
+       line.
+       * tests/ltorder.test: New test.
+       * tests/Makefile.am: Update.
+
+       Fix -rpath arguments for nobase_*_LTLIBRARIES.
+       * automake.in (handle_ltlibraries): New hash %instsubdirs to
+       track the dirname of nobase ltlibraries, and tack it onto the
+       end of the -rpath argument.  Also, fix the warning about ltlibs
+       installed in multiple locations to fit a bit better.
+       * tests/pr300-ltlib.test: Expose this bug here.
+       * tests/ltinstloc.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+       Man pages for automake and aclocal.
+       * configure.ac (HELP2MAN): New substitution.
+       * doc/Makefile.am (dist_man1_MANS, MAINTAINERCLEANFILES)
+       (update_mans): New macros.
+       ($(srcdir)/aclocal-$(APIVERSION).1)
+       ($(srcdir)/automake-$(APIVERSION).1): New rules, generate
+       man pages from the command line help with help2man.
+       ($(srcdir)/aclocal.1, $(srcdir)/automake.1): New rules, for
+       `.so' man page links to the versioned pages.
+       * NEWS: Update.
+
+2008-09-13  Ralf Wildenhues  <address@hidden>
+
+       Faster install for libtool outputs.
+       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Invoke `libtool
+       --mode=install' with multiple libraries at once.
+       (%DIR%LTLIBRARIES_INSTALL): No need to use install_sh any more.
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Likewise, remove much
+       of the libtool special-casing by invoking it for multiple
+       programs at once.
+
+2008-09-07  Ralf Wildenhues  <address@hidden>
+
+       Fast install and uninstall for SCRIPTS.
+       * lib/am/scripts.am [%?INSTALL%]: Include inst-vars.am
+       independent of `%?BASE%'.
+       (install-%DIR%SCRIPTS): Install multiple scripts at once,
+       using awk and a number of sed scripts.
+       (uninstall-%DIR%SCRIPTS): Compute the installed names, and
+       remove them, all at once.
+       (%DIR%SCRIPT_INSTALL) [!BASE]: No need to use install-sh any
+       more.
+
+       Multi-file install for PROGRAMS.
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Allow to install
+       several programs with one install invocation, when not using
+       libtool; employs some trickery to cater for nobase_, $(EXEEXT),
+       create needed directories, libtool, while only forking a
+       constant number of times in the fast path; uses awk and sed also
+       in the default path.
+       (%DIR%PROGRAMS_INSTALL) [!BASE]: No need to use install-sh any
+       more.
+
+       Enhance cleaning of programs in libtool mode.
+       * lib/am/progs.am (clean-%DIR%PROGRAMS) [?LIBTOOL?]: Fork less
+       often, avoid removing programs twice if $(EXEEXT) is empty.
+       * tests/nobase-libtool.test: Also test PROGRAMS, in order to
+       exercise the code path.
+       * THANKS: Update.
+       Report by Toralf Förster.
+
+2008-09-07  Ralf Wildenhues  <address@hidden>
+           Jim Meyering <address@hidden>
+
+       Reliable multi-file install for man pages.
+       * lib/am/mans.am: Include inst-vars.am.
+       (install-man%SECTION%): Gather lists of man pages to install,
+       and install up to 40 of those that do not have to be renamed
+       at once.  Fail if installation of any file fails.
+       (uninstall-man%SECTION%): Rewrite to use fewer sed invocations.
+       * doc/automake.texi (Man pages): Hint the user to the fast path.
+       Indentation fix.
+       * tests/instmany-mans.test: New test.
+       * tests/Makefile.am: Update.
+
+2008-09-07  Ralf Wildenhues  <address@hidden>
+
+       Faster `make uninstall'; fast install for JAVA.
+       * lib/am/inst-vars.am (am__nobase_strip_setup)
+       (am__nobase_strip): New macros.
+       (am__nobase_list): Factorize.
+       * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use them, for a
+       constant number of forks per uninstall.
+       * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
+       * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
+       * lib/am/progs.am (uninstall-%DIR%PROGRAMS): Fast uninstall.
+       * lib/am/python.am (uninstall-%DIR%PYTHON): Fast uninstall.
+       Echo all `rm' commands that are are executed.
+       * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA):
+       Fast install and uninstall.
+
+       AIX ranlib dislikes spaces in the argument.
+       * lib/am/libs.am (install-%DIR%LIBRARIES): Fix instsh.test
+       failure on AIX due to ranlib and whitespace in the directory.
+       * THANKS: Update.
+       Report by John F Trudeau.
+
+       Fail upon install or ranlib failure, part two.
+       * lib/am/java.am (install-%DIR%JAVA): Fail upon install failure.
+       * lib/am/lisp.am (install-%DIR%LISP): Likewise.
+       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Likewise.
+       * lib/am/libs.am (install-%DIR%LIBRARIES): Likewise, for
+       `install' as well as `ranlib'.
+       * lib/am/progs.am (install-%DIR%PROGRAMS): If `install' fails,
+       return its exit failure, not 1.
+       * tests/instfail.test: New test, for PROGRAMS (without libtool),
+       LIBRARIES, including nobase variants.
+       * tests/instfail-info.test: Likewise, for TEXINFOS.
+       * tests/instfail-java.test: Likewise, for JAVA.
+       * tests/instfail-libtool.test: Likewise, for PROGRAMS (with
+       libtool) and LTLIBRARIES.
+       * tests/Makefile.am: Adjust.
+
+       Exit upon `install' failure, part one.
+       * lib/am/data.am (install-%DIR%%PRIMARY%): Exit if any install
+       command fails.
+       * lib/am/python.am (install-%DIR%PYTHON): Likewise.
+       * lib/am/scripts.am (install-%DIR%SCRIPTS): Likewise.
+       * lib/am/texinfos.am (install-dvi-am, install-html-am)
+       (install-info-am:, install-pdf-am): Likewise.
+       * tests/instmany.test: New test, for SCRIPTS, DATA, and HEADERS.
+       * tests/instmany-python.test: New test, for PYTHON.
+       * tests/Makefile.am: Adjust.
+
+2008-09-06  Ralf Wildenhues  <address@hidden>
+
+       Fix multi-file installation for files in srcdir.
+       For files that can live in the build tree or the source tree,
+       we have to expect that prepending `$(srcdir)/' to each name
+       will let the install command line exceed length limitations.
+       Thus use a new macro, $(am__base_list), to install in chunks
+       of 40 files, similar to what we do for nobase_* files.  There,
+       lower the limit to 40, too.
+       * lib/am/inst-vars.am (am__install_max): Lower to 40.
+       (am__base_list): New macro.
+       * lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it.
+       * lib/am/texinfos.am (install-dvi-am, install-html-am)
+       (install-info-am, install-pdf-am, install-ps-am): Likewise.
+
+2008-09-06  Ralf Wildenhues  <address@hidden>
+
+       Use `Exit' instead of `exit' in test suite.
+       Cater to Bourne shells like Solaris sh that do not pass the
+       `exit' argument as status to the cleanup trap.
+       * Makefile.am (maintainer-check): Check that here-documents
+       use only `END' or `EOF' as delimiter in the test suite.
+       Check that, outside of here-documents, the tests do not use
+       `exit' with an argument, but use `Exit' instead.
+       * tests/defs.in (Exit): New function.  Use it throughout,
+       starting with the introduction of the exit trap.
+       * tests/aclibobj.test, tests/acloca10.test, tests/acloca11.test,
+       tests/acloca12.test, tests/acloca13.test, tests/acloca14.test,
+       tests/acloca15.test, tests/acloca16.test, tests/acloca17.test,
+       tests/acloca18.test, tests/acloca19.test, tests/acloca20.test,
+       tests/acloca21.test, tests/acloca22.test, tests/aclocal.test,
+       tests/aclocal3.test, tests/aclocal4.test, tests/aclocal5.test,
+       tests/aclocal6.test, tests/aclocal7.test, tests/aclocal8.test,
+       tests/aclocal9.test, tests/acoutbs.test, tests/acoutbs2.test,
+       tests/acoutnoq.test, tests/acoutpt.test, tests/acoutpt2.test,
+       tests/acoutqnl.test, tests/acsilent.test, tests/acsubst.test,
+       tests/acsubst2.test, tests/all.test, tests/alloca.test,
+       tests/alloca2.test, tests/alpha.test, tests/alpha2.test,
+       tests/amassign.test, tests/ammissing.test, tests/amopt.test,
+       tests/amsubst.test, tests/ansi.test, tests/ansi10.test,
+       tests/ansi2.test, tests/ansi3.test, tests/ansi3b.test,
+       tests/ansi4.test, tests/ansi5.test, tests/ansi6.test,
+       tests/ansi7.test, tests/ansi8.test, tests/ansi9.test (main),
+       tests/ar.test, tests/ar2.test, tests/asm.test, tests/asm2.test,
+       tests/asm3.test, tests/automake.test, tests/auxdir.test,
+       tests/auxdir2.test, tests/auxdir3.test, tests/auxdir4.test,
+       tests/backsl.test, tests/backsl2.test, tests/backsl3.test,
+       tests/backsl4.test, tests/badline.test, tests/badopt.test,
+       tests/badprog.test, tests/block.test, tests/bsource.test,
+       tests/canon-name.test, tests/canon.test, tests/canon2.test,
+       tests/canon3.test, tests/canon4.test, tests/canon5.test,
+       tests/ccnoco.test, tests/ccnoco2.test, tests/check.test,
+       tests/check2.test, tests/check3.test, tests/check4.test,
+       tests/check5.test, tests/check6.test, tests/check7.test,
+       tests/checkall.test, tests/clean.test, tests/clean2.test,
+       tests/colneq.test, tests/colneq2.test, tests/colon.test,
+       tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       tests/color.test (test_no_color), tests/commen10.test,
+       tests/comment.test, tests/comment2.test, tests/comment3.test,
+       tests/comment4.test, tests/comment5.test, tests/comment6.test,
+       tests/comment7.test, tests/comment8.test, tests/comment9.test,
+       tests/compile.test, tests/compile_f90_c_cxx.test,
+       tests/compile_f_c_cxx.test, tests/cond.test, tests/cond10.test,
+       tests/cond11.test, tests/cond13.test, tests/cond14.test,
+       tests/cond15.test, tests/cond16.test, tests/cond17.test,
+       tests/cond18.test, tests/cond19.test, tests/cond2.test,
+       tests/cond20.test, tests/cond21.test, tests/cond22.test,
+       tests/cond27.test, tests/cond3.test, tests/cond37.test,
+       tests/cond39.test, tests/cond4.test, tests/cond40.test,
+       tests/cond41.test, tests/cond5.test, tests/cond6.test,
+       tests/cond7.test (AC_INIT), tests/cond8.test, tests/cond9.test,
+       tests/condd.test, tests/condhook.test, tests/condinc.test,
+       tests/condinc2.test, tests/condlib.test, tests/condman.test,
+       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
+       tests/conff.test, tests/conff2.test, tests/confh.test,
+       tests/confh4.test, tests/confh5.test, tests/config.test,
+       tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
+       tests/conflnk3.test, tests/conflnk4.test, tests/confsub.test,
+       tests/confvar.test, tests/confvar2.test, tests/copy.test,
+       tests/ctarget1.test, tests/cxx.test, tests/cxx2.test,
+       tests/cxxansi.test, tests/cxxcpp.test, tests/cxxlibobj.test,
+       tests/cxxlink.test, tests/cxxnoc.test, tests/cxxo.test,
+       tests/cygwin32.test, tests/dash.test, tests/defs.in (else),
+       tests/defun.test, tests/defun2.test, tests/dejagnu.test,
+       tests/dejagnu2.test, tests/dejagnu3.test, tests/dejagnu4.test,
+       tests/dejagnu5.test, tests/dejagnu6.test, tests/dejagnu7.test,
+       tests/depacl2.test, tests/depcomp.test, tests/depcomp2.test,
+       tests/depcomp3.test, tests/depcomp4.test, tests/depcomp5.test,
+       tests/depcomp6.test, tests/depcomp7.test, tests/depdist.test,
+       tests/depend.test, tests/depend2.test, tests/depend3.test,
+       tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
+       tests/dirlist.test, tests/dirlist2.test, tests/discover.test,
+       tests/distcom2.test, tests/distcom3.test, tests/distcom4.test,
+       tests/distcom5.test, tests/distcom6.test, tests/distcom7.test,
+       tests/distdir.test, tests/distname.test, tests/dollar.test,
+       tests/double.test, tests/dup2.test, tests/else.test,
+       tests/empty.test, tests/empty2.test, tests/empty3.test,
+       tests/empty4.test, tests/exdir.test, tests/exdir2.test,
+       tests/exdir3.test, tests/exeext.test, tests/exeext2.test,
+       tests/exeext3.test, tests/exeext4.test, tests/exsource.test,
+       tests/ext.test, tests/extra.test, tests/extra2.test,
+       tests/extra3.test, tests/extra4.test, tests/extra5.test,
+       tests/extra6.test, tests/extra7.test, tests/f90only.test,
+       tests/flibs.test, tests/fn99.test, tests/fn99subdir.test,
+       tests/fnoc.test, tests/fo.test, tests/fonly.test,
+       tests/fort1.test, tests/fort2.test, tests/fort4.test,
+       tests/fort5.test, tests/fortdep.test, tests/fpinst2.test,
+       tests/fpinstall.test, tests/gcj.test, tests/gcj2.test,
+       tests/gcj3.test, tests/gcj4.test, tests/gcj5.test,
+       tests/getopt.test, tests/gettext.test, tests/gettext2.test,
+       tests/gettext3.test, tests/gnits.test, tests/gnits2.test (main),
+       tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
+       tests/gnuwarn2.test, tests/header.test, tests/help.test,
+       tests/hosts.test, tests/implicit.test, tests/include.test,
+       tests/include2.test, tests/info.test, tests/init.test,
+       tests/insh2.test, tests/install2.test, tests/installdir.test,
+       tests/instdat.test, tests/instdat2.test, tests/instexec.test,
+       tests/insthook.test, tests/instman.test, tests/instman2.test,
+       tests/instsh.test, tests/instsh2.test, tests/instsh3.test,
+       tests/instspc.test, tests/interp.test, tests/interp2.test,
+       tests/java.test, tests/java2.test, tests/java3.test,
+       tests/javaprim.test, tests/javasubst.test, tests/ldadd.test,
+       tests/ldflags.test, tests/lex.test, tests/lex2.test,
+       tests/lex3.test, tests/lex4.test, tests/lex5.test (main),
+       tests/libexec.test, tests/libobj10.test, tests/libobj11.test,
+       tests/libobj12.test, tests/libobj13.test, tests/libobj2.test,
+       tests/libobj3.test, tests/libobj4.test, tests/libobj5.test,
+       tests/libobj7.test, tests/libobj8.test, tests/library.test,
+       tests/library2.test, tests/library3.test, tests/libtoo10.test,
+       tests/libtool.test, tests/libtool2.test, tests/libtool3.test
+       (main), tests/libtool4.test, tests/libtool5.test,
+       tests/libtool6.test, tests/libtool7.test, tests/libtool8.test,
+       tests/libtool9.test (main), tests/license.test,
+       tests/link_c_cxx.test, tests/link_dist.test,
+       tests/link_f90_only.test, tests/link_f_only.test,
+       tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
+       tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
+       tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
+       tests/lisp8.test, tests/listval.test, tests/location.test,
+       tests/longlin2.test, tests/longline.test, tests/ltcond.test,
+       tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
+       tests/ltlibobjs.test, tests/ltlibsrc.test, tests/lzma.test,
+       tests/maintclean.test, tests/make.test, tests/makej.test,
+       tests/makevars.test, tests/man.test, tests/man2.test,
+       tests/man3.test, tests/mclean.test, tests/mdate.test,
+       tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
+       tests/mdate5.test, tests/missing.test, tests/missing2.test,
+       tests/missing3.test, tests/missing4.test, tests/missing5.test,
+       tests/missing6.test, tests/mkinst2.test, tests/mkinst3.test,
+       tests/mkinstall.test, tests/mmode.test, tests/mmodely.test,
+       tests/multlib.test, tests/nobase-libtool.test,
+       tests/nobase-python.test, tests/nobase.test, tests/nodef.test,
+       tests/nodef2.test, tests/nodep.test, tests/nodep2.test,
+       tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
+       tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
+       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
+       tests/nostdinc.test, tests/notrans.test, tests/number.test,
+       tests/objc.test, tests/objc2.test, tests/obsolete.test,
+       tests/order.test, tests/outdir.test, tests/output-order.test,
+       tests/output.test, tests/output10.test, tests/output11.test,
+       tests/output12.test, tests/output13.test, tests/output2.test,
+       tests/output3.test, tests/output4.test, tests/output5.test,
+       tests/output6.test, tests/output7.test, tests/output8.test,
+       tests/output9.test, tests/overrid.test, tests/parse.test,
+       tests/pluseq.test, tests/pluseq10.test, tests/pluseq2.test,
+       tests/pluseq3.test, tests/pluseq4.test, tests/pluseq5.test,
+       tests/pluseq6.test, tests/pluseq7.test, tests/pluseq8.test,
+       tests/pluseq9.test, tests/postproc.test, tests/ppf77.test,
+       tests/pr2.test, tests/pr204.test, tests/pr211.test,
+       tests/pr220.test, tests/pr224.test, tests/pr229.test,
+       tests/pr243.test, tests/pr266.test, tests/pr279-2.test,
+       tests/pr279.test, tests/pr287.test, tests/pr300-lib.test,
+       tests/pr300-ltlib.test, tests/pr300-prog.test, tests/pr307.test,
+       tests/pr401.test, tests/pr401b.test, tests/pr401c.test,
+       tests/pr72.test, tests/pr87.test, tests/pr9.test,
+       tests/prefix.test, tests/primary.test, tests/primary2.test,
+       tests/primary3.test, tests/proginst.test, tests/python.test,
+       tests/python10.test, tests/python11.test, tests/python12.test,
+       tests/python2.test, tests/python3.test, tests/python4.test,
+       tests/python5.test, tests/python6.test, tests/python7.test,
+       tests/python8.test, tests/python9.test, tests/recurs.test,
+       tests/recurs2.test, tests/regex.test, tests/remake.test,
+       tests/remake2.test, tests/remake3.test, tests/remake4.test,
+       tests/remake5.test, tests/remake6.test, tests/remake7.test,
+       tests/req.test, tests/reqd.test, tests/reqd2.test,
+       tests/rulepat.test, tests/scripts.test, tests/seenc.test,
+       tests/sinclude.test, tests/space.test, tests/specflg.test,
+       tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
+       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
+       tests/spell.test, tests/spell2.test, tests/spell3.test,
+       tests/spelling.test, tests/spy.test, tests/srcsub.test,
+       tests/srcsub2.test, tests/stamph2.test, tests/stdinc.test,
+       tests/stdlib.test, tests/stdlib2.test, tests/strip.test,
+       tests/subcond.test, tests/subcond2.test, tests/subcond3.test,
+       tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
+       tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
+       tests/subdir7.test, tests/subdir8.test, tests/subdir9.test,
+       tests/subdirbuiltsources.test, tests/subobj.test,
+       tests/subobj10.test, tests/subobj2.test, tests/subobj3.test,
+       tests/subobj4.test, tests/subobj5.test, tests/subobj6.test,
+       tests/subobj7.test, tests/subobj8.test, tests/subobj9.test,
+       tests/subobjname.test, tests/subpkg.test, tests/subpkg2.test,
+       tests/subpkg3.test, tests/subst.test, tests/subst2.test,
+       tests/subst3.test, tests/substre2.test, tests/substref.test,
+       tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
+       tests/suffix11.test, tests/suffix12.test, tests/suffix2.test,
+       tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
+       tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
+       tests/suffix9.test, tests/symlink.test, tests/symlink2.test,
+       tests/symlink3.test, tests/syntax.test, tests/tags.test,
+       tests/tagsub.test, tests/tar.test, tests/tar2.test,
+       tests/tar3.test, tests/target-cflags.test,
+       tests/targetclash.test, tests/transform.test, tests/txinfo.test,
+       tests/txinfo10.test, tests/txinfo13.test, tests/txinfo16.test,
+       tests/txinfo17.test, tests/txinfo18.test, tests/txinfo19.test,
+       tests/txinfo2.test, tests/txinfo20.test, tests/txinfo21.test,
+       tests/txinfo22.test, tests/txinfo23.test, tests/txinfo24.test,
+       tests/txinfo25.test, tests/txinfo26.test, tests/txinfo27.test,
+       tests/txinfo28.test, tests/txinfo29.test, tests/txinfo3.test,
+       tests/txinfo30.test, tests/txinfo31.test, tests/txinfo4.test,
+       tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
+       tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
+       tests/upc.test, tests/upc2.test, tests/upc3.test,
+       tests/vars.test, tests/vars3.test, tests/vartar.test,
+       tests/version.test, tests/version2.test, tests/version3.test,
+       tests/version4.test, tests/version6.test, tests/version7.test,
+       tests/version8.test, tests/vpath.test, tests/vtexi.test,
+       tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
+       tests/werror2.test, tests/whoami.test, tests/xsource.test,
+       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
+       tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
+       tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
+       tests/yaccvpath.test: Use `Exit $arg' instead of `exit $arg'
+       throughout, except inside created files.
+
+2008-09-04  Ralf Wildenhues  <address@hidden>
+
+       Avoid Heisenbug with verbose testing on HP-UX.
+       * tests/output-order.test: Remove spurious redirection line
+       from output for comparison.
+
+       For all possibly-relative subdirs, use $(am__cd).
+       Up to now, $(am__cd) was only used within backquotes, to avoid
+       extraneous output.  This patch also uses it for every `cd' to a
+       relative subdir, to prevent CDPATH from entering an unwanted
+       directory.
+       * Makefile.am (maintainer-check): Fix current check for
+       $(am__cd) within backquotes a bit.  Add new check for `cd' to a
+       relative subdir.
+       * automake.in (handle_tags, handle_configure):  Adjust rules.
+       * lib/am/ansi2knr.am: Likewise.
+       * lib/am/configure.am: Likewise.
+       * lib/am/distdir.am: Likewise.
+       * lib/am/remake-hdr.am: Likewise.
+       * lib/am/subdirs.am: Likewise.
+       * lib/am/tags.am: Likewise.
+       * lib/am/texibuild.am: Likewise.
+
+       Fix nobase-python.test for BSD make.
+       * tests/nobase-python.test: Listing a dependency to be found
+       via VPATH search explicitly, without the path, as a target,
+       will turn off VPATH search for FreeBSD make.  So move the
+       creation of the files outside of the Makefile.
+
+2008-09-01  Ralf Wildenhues  <address@hidden>
+
+       Implement AM_MAINTAINER_MODE([DEFAULT-MODE]).
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Allow for an optional
+       first argument of `enable' or `disable', setting the default.
+       * doc/automake.texi (Optional, maintainer-mode): Document.
+       * tests/mmode.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+       Suggestion by Vincent Lefevre.
+
+2008-08-31  Ralf Wildenhues  <address@hidden>
+
+       Copyright year updates.
+       * lib/am/header-vars.am: Update copyright years.
+       * lib/am/remake-hdr.am: Likewise.
+       * lib/am/tags.am: Likewise.
+
+2008-08-28  Ralf Wildenhues  <address@hidden>
+
+       * THANKS: Use Cyrillic name instead of ASCII transcription.
+
+2008-08-22  Ralf Wildenhues  <address@hidden>
+
+       Fix rebuilding of removed subdir/Makefile.in files.
+       * lib/am/configure.am (%MAKEFILE-IN%) [?!TOPDIR_P?]: If
+       subdir/Makefile.in was removed, am--refresh would not update
+       it.  Fix up for it by running the per-directory rebuild rule.
+       * tests/remake6.test, tests/remake7.test: New tests.
+       * tests/Makefile.am: Adjust.
+       * NEWS, THANKS: Update.
+       Report and initial patch by Ilya N. Golubev.
+
+2008-08-19  Ralf Wildenhues  <address@hidden>
+
+       * tests/notrans.test: Use multiple man files of each type.
+
+       Fix maintainer-check failures.
+       * doc/automake.texi (Conditionals): Drop TAB.
+       * tests/missing6.test: Use 'rm -f'.
+
+2008-08-19  Reuben Thomas <address@hidden>  (tiny patch)
+
+       * doc/automake.texi (Flag Variables Ordering, Per-Object Flags):
+       Fix grammaros.
+
+2008-08-02  Karl Berry  <address@hidden>
+
+       * lib/gnupload: Provide also a simple example.
+
+2008-06-25  Thien-Thi Nguyen  <address@hidden>
+
+       Small doc fix.
+       * doc/automake.texi (Public Macros): Close open paren.
+
+2008-06-18  Ralf Wildenhues  <address@hidden>
+
+       Introduce macro $(am__mv) to facilitate 'libtool --dry-run'.
+       * lib/am/depend.am (am__mv): New macro, set to 'mv -f'.
+       * lib/am/depend2.am: Use throughout to move the temporary
+       depfile *.Tpo to its final destination *.Po.
+
+2008-06-18  Rafael Espindola  <address@hidden>
+
+       * lib/config-ml.in: don't handle --enable-shared and --enable-static.
+
+2008-06-18  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/inst-vars.am (am__install_max): New variable.
+       (am__nobase_list): Use it.
+
+       Fix conditional rules competing with config.status rules.
+       * automake.in (handle_configure): Teach targets about the
+       conditional config.status rule.
+       * tests/cond39.test: Adjust test to expose this.
+
+       For AC_CONFIG_LINKS(X,X), do not clean X in a non-VPATH build.
+       * automake.in (rewrite_inputs_into_dependencies): Do distribute
+       inputs where input and output name are equal.  This relies on
+       the assumption that it only happens with AC_CONFIG_LINKS.
+       (handle_configure) <CONFIG_CLEAN_VPATH_FILES>: New variable, for
+       links where source and dest are equal.
+       * lib/am/clean.am (distclean-generic): Remove, if build tree not
+       equal source tree.
+       * tests/conflnk4.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+
+2008-06-06  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Extending): Fix ambivalent wording.
+       Report by Ben Pfaff.
+
+2008-06-04  Karl Berry  <address@hidden>
+
+       * doc/automake.texi (Install, Hard-Coded Install Paths):  Fix
+       punctuation and markup.
+       (Extending): Improve wording and clarify order semantics of
+       *-local and *-hook targets.
+
+2008-06-01  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Extending): Fix grammar.
+       Report by Karl Berry.
+
+2008-05-13  Stepan Kasal  <address@hidden>
+
+       Fix typos.
+       * doc/automake.texi (Timeline): Reported by Reuben Thomas.
+       * lib/am/remake-hdr.am: A few typos in comments.
+
+2008-04-10  Eric Blake  <address@hidden>
+
+       Prefer a released version of autoconf.
+       * NEWS: Bump requirement to autoconf 2.62.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
+       * configure.ac: Likewise.
+       (AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead.
+
+       AC_AUTOCONF_VERSION can inadvertently expand to a macro name.
+       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper
+       m4 quoting.
+       * aclocal.in (write_aclocal): Likewise.
+       * tests/missing6.test: New test.
+       * tests/Makefile.am (TESTS): Run it.
+       * tests/missing4.test: Adjust.
+
+2008-04-02  Eric Blake  <address@hidden>
+
+       Make gnupload friendlier for VPATH usage.
+       * lib/gnupload: Allow uploads from separate directory.
+
+2008-03-26  Ralf Wildenhues  <address@hidden>
+
+       Implement conditional AC_CONFIG_FILES: AM_COND_IF.
+       * automake.in (%ac_config_files_condition): New.
+       (scan_autoconf_config_files): Record condition if any.
+       (scan_autoconf_traces): Trace _AM_COND_IF, _AM_COND_ELSE,
+       _AM_COND_ENDIF, updating @cond_stack as appropriate.
+       (handle_configure): Prefix config.status rule with condition.
+       Check that m4 quotation is done consistently.
+       * m4/cond.m4 (AM_CONDITION): Define `_AM_COND_VALUE_name'
+       with `name' being the name of the condition, to its shell
+       condition.
+       * m4/cond-if.m4: New file.
+       (_AM_COND_IF, _AM_COND_ELSE, _AM_COND_ENDIF): New trace helpers.
+       (AM_COND_IF): New macro, implements conditionals.
+       * m4/Makefile.am: Adjust.
+       * doc/automake.texi (Requirements, Optional, Conditionals):
+       Document AM_COND_IF.
+       * NEWS: Update.
+       * tests/cond39.test, tests/cond40.test, tests/cond41.test,
+       tests/cond42.test, tests/cond43.test: New tests.
+       * tests/Makefile.am: Adjust.
+
+2008-03-24  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (@ovar): New macro, from autoconf.texi.
+       (Python): Use it.
+       Suggestion by Eric Blake.
+
+2008-03-20  Ralf Wildenhues  <address@hidden>
+
+       * lib/texinfo.tex: Sync from upstream.
+
+2008-03-17  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Requirements, Linking, Extending):
+       Fix underfull and overfull lines, fix wording a bit.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
+       upstream.
+
+       * Makefile.am (WGET_SV_GIT_CF): New.
+       (fetch): Pull config.guess and config.sub from git repo now.
+
+       * lib/Autom4te/FileUtils.pm (handle_exec_errors): New argument
+       $hint, show if the executing program does not exist.
+       (xsystem_hint): New function, like xsystem but allows to pass
+       a hint.
+
+2008-03-11  Peter Breitenlohner  <address@hidden>
+
+       Implement the `notrans_' prefix for untransformed manpages.
+       * automake.in (handle_man_pages), lib/am/mans.am: Implement
+       notrans_ prefix for MANS primary and rework dependencies for
+       install-man%SECTION%; use only vars defined in Makefile.am.
+       * doc/automake.texi (Renaming, Uniform, Man pages):
+       Document notrans_ prefix.
+       * NEWS: Update.
+       * tests/notrans.test: New test.
+       * tests/Makefile.am: Update.
+
+       * automake.in (handle_man_pages): Reindent, for next patch.
+
+2008-03-08  Ralf Wildenhues  <address@hidden>
+
+       Use `install' with multiple files at once for some primaries.
+       With nobase targets, at most 50 files are installed at once,
+       to avoid quadratic string concatenation and line length limits.
+       This isn't yet done with base targets.  One hope is that there,
+       the typical file name length is lower.  If this turns out to be
+       a problem, it should be revisited.
+
+       * lib/am/inst-vars.am (am__nobase_list): New helper macro for
+       installation of multiple nobase files at once: sorts and lists
+       files keyed by their target directory.
+       * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to
+       $(install_sh_DATA) any more, not even for nobase targets.
+       (install-%DIR%%PRIMARY%): Split base and nobase cases.
+       Rewrite to pass lists of files which all go in the same
+       directory to `install'.  In the nobase case, make use of
+       $(am__nobase_list) and $(MKDIR_P) each directory before
+       populating it.  Take care of files in source and build trees,
+       and avoid creating directories where no files are to be
+       installed.
+       * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise.
+       (install-%DIR%LIBRARIES): Likewise.
+       * lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise.
+       (install-%DIR%PYTHON): Likewise.  Also take care to keep note of
+       a list for byte compilation after installation.
+       * lib/am/texinfos.am (install-dvi-am, install-html-am)
+       (install-info-am, install-pdf-am, install-ps-am): Use file lists
+       to install multiple files at once.
+       * NEWS: Update.
+       Suggested by Akim Demaille.
+
+2008-03-08  Ralf Wildenhues  <address@hidden>
+
+       Require unreleased Autoconf for fixed AC_PROG_INSTALL.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Bump AC_PREREQ to 2.61-341,
+       regenerate files.
+       * configure.ac: Also require Autoconf 2.61-341, to catch
+       failure early and provide a sensible error message.
+
+       Drop usage of obsolete macros AC_EXEEXT and AC_OBJEXT.
+       * tests/ansi4.test: Drop AC_OBJEXT and AC_EXEEXT.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/condlib.test: Likewise.
+       * tests/cygwin32.test: Likewise.
+       * tests/exeext2.test: Likewise.
+       * tests/libobj11.test: Likewise.
+       * tests/library.test: Likewise.
+       * tests/txinfo5.test: Likewise.
+
+2008-03-03  Ralf Wildenhues  <address@hidden>
+
+       Skip instsh3.test if `touch -t' does not work.
+       * tests/instsh3.test: Test for `touch -t', fails with Solaris
+       /usr/ucb/touch.
+       * THANKS: Update.
+       Report by Younes Younes.
+
+2008-02-27  Reuben Thomas  <address@hidden>
+
+       * doc/automake.texi (wildcards): Improve "Why doesn't Automake
+       support wildcards" node's English and sense.
+
+2008-02-23  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/check.am (check-TESTS): In the case patterns for
+       XFAILed tests, add literal bracket expression for matching
+       whitespace, as NetBSD 4.99.54 ksh does not understand a
+       bracket expression resulting from variable expansion.
+       * README: Explain how to run the Automake test suite, including
+       setting MAKE to test gmake.
+       Report by Patrick Welche.
+
+2008-02-19  Ralf Wildenhues  <address@hidden>
+
+       PR automake/498
+       * m4/options.m4 (_AM_SET_OPTIONS): Use m4_foreach_w instead of
+       obsolete AC_FOREACH.
+       Report by NightStrike and address@hidden
+
+2008-02-17  Colin Watson  <address@hidden>  (tiny change)
+
+       * lib/am/tags.am (ID): Fix typo in workaround for old awk.
+
+2008-02-05  Ralf Wildenhues  <address@hidden>
+
+       * doc/.gitignore: Ignore files generated by `make ps pdf html'.
+
+2008-02-05  Reuben Thomas  <address@hidden>
+
+       * doc/automake.texi (CVS): configure.ac will appear newer, not
+       older, than configure.  Use `lexical' instead of `alphabetical'.
+
+2008-01-30  Ralf Wildenhues  <address@hidden>
+
+       * tests/man3.test: Avoid `make VAR=value'.
+
+       * tests/subst3.test: New test.
+       * tests/Makefile.am: Update.
+
+       * tests/instsh2.test: Split off testing of `install-sh -C' ...
+       * tests/instsh3.test: ... to this new test, requiring non-root.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Report by Theodoros V. Kalamatianos.
+
+2008-01-23  Ralf Wildenhues  <address@hidden>
+
+       * tests/nobase.test: Extend test to generated files.
+
+       * tests/nobase-python.test: New test, nobase for python files.
+       * tests/Makefile.am: Update.
+
+       * tests/nobase.test: Split off libtool part of nobase.test for
+       increased test exposure, to ...
+       * tests/nobase-libtool.test: ... this new test.
+       * tests/Makefile.am: Update.
+
+2008-01-23  Eric Blake  <address@hidden>
+
+       Fix color.test when using BSD grep.
+       * tests/color.test: Ensure that grep can handle non-printing
+       characters.
+
+2008-01-23  Ralf Wildenhues  <address@hidden>
+
+       * tests/lisp3.test: Fix typo.
+
+2008-01-22  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/mans.am (install-man%SECTION%): Prefer generated manpages
+       over distributed ones.
+       Report and patch by Peter Breitenlohner.
+       * tests/man3.test: New test.
+       * tests/Makefile.am: Update.
+
+2008-01-21  Ralf Wildenhues  <address@hidden>
+
+       * tests/tar.test: Skip if no appropriate tar was found.
+
+2008-01-19  NightStrike  <address@hidden>
+
+       * doc/automake.texi (Dependency Tracking): Fix typo.
+
+2008-01-19  Ralf Wildenhues  <address@hidden>
+
+       * lib/config-ml.in, lib/config.guess, lib/config.sub,
+       lib/symlink-tree: Sync from upstream.
+
+       * Makefile.am (WGET_SV_CVS): Renamed from WGETSGO.
+       (WGET_SV_GIT_AC, WGET_SV_GIT_GL, WGET_GCC): New.
+       (fetch): Update to match current upstream locations.
+
+2008-01-14  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (DESTDIR, Built sources example): Fix wording.
+       * THANKS: Update.
+       Reports and suggestions by William Pursell and address@hidden
+
+2008-01-13  Ralf Wildenhues  <address@hidden>
+
+       Do not fail if `autoupdate' is not present.
+       * tests/obsolete.test: Check for presence of autoupdate.  Apparently,
+       FreeBSD may install the other Autoconf programs without a version
+       suffix but not autoupdate.
+
+       Fix Heisenbug trying to unset a sometimes-not-set variable.
+       * tests/check5.test: Do not error out upon `unset TESTS' due to
+       `set -e', in case TESTS was not set.
+       * tests/color.test: Likewise.
+
+       * doc/automake.texi (amhello Explained): Fix odd sentence.
+       Report by address@hidden
+
+2008-01-12  Ralf Wildenhues  <address@hidden>
+
+       * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more
+       resistant to different quoting styles of $1.
+
+       Clarify texinfo.tex and TEXINFO_TEX semantics.
+       * doc/automake.texi (Texinfo): Clarify that by default,
+       texinfo.tex is searched in the same directory as the Makefile.am
+       that needs it.  Clarify that TEXINFO_TEX has precedence over
+       AC_CONFIG_AUX_DIR, and that it requires the user to install and
+       distribute it.
+       * tests/txinfo22.test: Ensure TEXINFO_TEX is not distributed.
+       * THANKS: Update.
+       Reports by Dilyan Palauzov and Roumen Petrov.
+
+2008-01-11  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * tests/output-order.test: New test, for the stable output fix.
+       * tests/Makefile.am: Update.
+
+2008-01-08  Ralf Wildenhues  <address@hidden>
+
+       * Makefile.am (dist-hook): New, ensure world-executable tests.
+       * THANKS: Update.
+       Report by Arto C. Nirkko.
+
+       * tests/acloca20.test: Use `--force' with the second $AUTOCONF,
+       to force update on fast machines where both autoconf invocations
+       happen within the same second.
+       Report by Greg Schafer.
+
+2008-01-07  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (scan_autoconf_files): Sort loop over
+       %required_aux_file, for stable verbose output.
+       Report by Bruno Haible.
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
+       upstream.
+
+       * tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
+       to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
+       * THANKS: Update.
+       Report and analysis by Carsten Lohrke and Mike Frysinger.
+
+2008-01-07  Stepan Kasal  <address@hidden>
+
+       * automake.in (handle_texinfo_helper, handle_lib_objects): Fix
+       typos in comments.
+
+2008-01-02  Ralf Wildenhues  <address@hidden>
+
+       Bump copyright years.
+       * aclocal.in (write_aclocal, version): Likewise.
+       * automake.in ($gen_copyright, version): Likewise.
+       * doc/automake.texi: Likewise.
+
+2007-12-18  Jim Meyering  <address@hidden>
+
+       * lib/gnupload (GPG): Don't use an absolute path.
+       This reverts part of the 2004-01-28 change.
+
+2007-12-08  Ralf Wildenhues  <address@hidden>
+
+       * lib/Automake/FileUtils.pm (open_quote): New function.
+       (update_file, contents): Use it.
+
+       Reword the copyright notices to match what's suggested in GPLv3.
+
+2007-12-08  Ralf Wildenhues  <address@hidden>
+
+       * tests/defs.in: Quote $srcdir, $PATH; skip libtool and gettext
+       tests if the absolute source or build tree name contain whitespace.
+
+       Modify some tests for absolute trees containing whitespace.
+       * tests/missing.test: Use "./missing" instead of "`pwd`/missing".
+       * tests/missing2.test: Likewise.
+       * tests/mmodely.test: Add `pwd` to $PATH instead of absolute
+       references to myyacc.sh and mylex.sh.
+       * tests/multlib.test: Likewise for mycc.
+       * tests/txinfo26.test: Skip if `pwd` contains whitespace, as
+       an absolute --srcdir does not work there.
+
+       * INSTALL, lib/INSTALL, lib/config-ml.in, lib/config.guess,
+       lib/config.sub, lib/texinfo.tex: Sync from upstream.
+
+       Fix the distdir target to cope with spaces in absolute file names.
+       * lib/am/distdir.am: Quote all instances of $(distdir) and
+       $(top_distdir).  They could contain white space, coming from
+       a toplevel package bootstrapped with an older Automake version.
+       (am__relativize): New macro, taken from gnulib code, written by
+       Bruno Haible.
+       (distdir): Use it to compute relative paths to distdir and
+       top_distdir for enclosed subpackages.
+       Also, quote $(distuninstallcheck_dir).
+       * lib/am/texinfos.am: Likewise, quote $(distdir).
+
+2007-11-26  Ralf Wildenhues  <address@hidden>
+
+       Quote file names in tests that can be absolute.
+       * tests/auxdir.test, tests/check3.test, tests/check4.test,
+       tests/compile.test, tests/cond33.test, tests/condhook.test,
+       tests/distdir.test, tests/dollar.test, tests/empty.test,
+       tests/gnits2.test, tests/gnits3.test, tests/include2.test,
+       tests/insthook.test, tests/java.test, tests/libtool7.test,
+       tests/lisp4.test, tests/lisp5.test, tests/lisp6.test,
+       tests/ltcond.test, tests/ltconv.test, tests/mkinst2.test,
+       tests/multlib.test, tests/nobase.test, tests/nodist2.test,
+       tests/obsolete.test, tests/pr287.test, tests/pr300-lib.test,
+       tests/pr300-ltlib.test, tests/pr300-prog.test, tests/python10.test,
+       tests/python3.test, tests/strip.test, tests/transform.test,
+       tests/txinfo13.test, tests/txinfo19.test, tests/txinfo22.test,
+       tests/txinfo23.test, tests/txinfo26.test, tests/txinfo27.test:
+       Likewise.
+
+       Quote @abs_top_builddir@ and @address@hidden
+       * tests/aclocal.in: Likewise.
+       * tests/automake.in: Likewise.
+
+       Fix TAGS and GTAGS rules to cope with whitespace in `pwd`.
+       * lib/am/tags.am (TAGS): Use positional parameters to avoid
+       the need to quote absolute file names.
+       (GTAGS): Quote absolute file name.
+       (CTAGS): Simplify, dropping unused variable `$tags'.
+
+2007-11-25  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/ltlib.am (uninstall-%DIR%LTLIBRARIES): Fix another instance
+       of am__strip_dir.  Fixes nobase and pr300-ltlib test failures.
+
+2007-11-25  Akim Demaille  <address@hidden>
+
+       Several *-local in a rule do not work.
+       * tests/all.test: Check this case.
+       Use set -e.
+       * tests/Makefile.am (XFAIL_TESTS): Add it.
+
+2007-11-25  Akim Demaille  <address@hidden>
+
+       Fix uses of am__strip_dir.
+       * lib/am/libs.am, lib/am/ltlib.am: Catch up with the change of
+       definition of am__strip_dir.
+
+2007-11-25  Akim Demaille  <address@hidden>
+
+       Define and use register_action.
+       * lib/Automake/Rule.pm: Fix a few typos in the doc.
+       (&rule): Use || to simplify the code.
+       (&register_action): New.
+       Export it.
+       * automake.in (&handle_factored_dependencies, &file_contents_internal):
+       Use it.
+
+2007-11-25  Akim Demaille  <address@hidden>
+
+       * bootstrap: Fix typos on redirections.
+
+2007-11-24  Akim Demaille  <address@hidden>
+
+       Skip comments and empty lines in dirlist in the tests.
+       * defs.in (extra_includes): Skip comments and empty lines in dirlist.
+
+2007-11-24  Akim Demaille  <address@hidden>
+
+       Ternary operator in lib/am files.
+       * automake.in (&transform_token): New.
+       (&transform): Use it.
+       Support %KEY?TRUE:FALSE%.
+       (&make_paragraphs): Adjust the regexp to call %transform.
+       * lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
+       * lib/am/progs.am, lib/am/python.am, lib/am/scripts.am:
+       Use %KEY?TRUE:FALSE%.
+       * lib/am/inst-vars.am (am__strip_dir): Assign the result to f
+       to be more alike am__vpath_adj.
+       Adjust dependencies.
+
+2007-11-24  Akim Demaille  <address@hidden>
+
+       * automake.in: Normalize white spaces.
+
+2007-11-24  Ralf Wildenhues  <address@hidden>
+
+       * configure.ac (ACLOCAL, AUTOMAKE): Fix quoting for rebuilding
+       rules, if the absolute build directory name contains white space.
+
+2007-11-22  Ralf Wildenhues  <address@hidden>
+
+       * aclocal.in (trace_used_macros): Quote input files.
+
+       * lib/ylwrap: Cope with white space in `PROGRAM' and `pwd`.
+
+       * lib/am/tags.am (ID, TAGS, CTAGS): Make awk scripts portable again.
+       (CTAGS): Drop unneeded variable `here'.
+
+2007-11-18  Ralf Wildenhues  <address@hidden>
+
+       * tests/output13.test: New test.
+       * tests/Makefile.am: Adjust.
+       Prompted by report from Bruno Haible in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2007-10/msg00479.html>.
+
+       Fix signal handling in aclocal.
+       * aclocal.in (unlink_tmp): If invoked by a signal, note so
+       in verbose mode.  Reinstall default signal handler and reraise,
+       to transport the interrupt information.
+
+2007-11-13  Bob Proulx  <address@hidden>
+
+       Fix color test failure on dumb (and other) terminals.
+       * tests/color.test: Set TERM to `ansi'.
+
+2007-11-12  Ralf Wildenhues  <address@hidden>
+
+       Avoid spurious test failure with `make check TESTS=check5.test'.
+       * tests/check5.test: unset TESTS.
+
+       Fix maintainer-check failure.
+       * tests/color.test: unset TESTS, use `make -e' rather than
+       `make MACRO=val'.
+
+2007-11-10  Ralf Wildenhues  <address@hidden>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Require version 1.10a.
+
+       * automake.in (handle_tests): Remove debugging leftover.
+
+       Run each test in a process-private subdirectory.
+       * tests/defs.in: Employ a trap to clean up at the end of the
+       test in case the test succeeded.  This needs to be revisited
+       because we would like to keep the output of XPASSing tests.
+       Also, note when we were interrupted by a signal.  Code taken
+       from Autoconf's _AC_INIT_PREPARE.
+       If $keep_testdirs is set, keep them even for successful tests.
+       * tests/Makefile.am (check-clean-local): New target.  Remove all
+       tests subdirs, but also make them writable first.  The latter
+       was already needed without per-test subdirs.
+       (distclean-local): Depend upon check-clean-local.
+       * tests/Makefile.in: Regenerate.
+       * tests/.cvsignore, tests/.gitignore: Adjust.
+
+       Fix default includes ordering to be `-I. -I$(srcdir) ...' again.
+       * automake.in (handle_compile): Put -I$(srcdir) before include
+       paths for config headers, as was done before Automake 1.10, but
+       keep uniquified list without multiple adjacent spaces.
+       * doc/automake.texi (Program variables): List include paths
+       in order.
+       * NEWS: Mention 1.10 regression.
+       * tests/stdinc.test: New test.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Report by Kent Boortz.
+
+2007-11-08  Akim Demaille  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+           Bob Proulx  <address@hidden>
+
+       Implement colorized test output.
+       * automake.in (handle_tests): Set COLOR depending on `color-tests'.
+       * configure.ac (AM_INIT_AUTOMAKE): Use `color-tests'.
+       * doc/automake.texi (Tests, Options): Document test results,
+       document new option, document AM_COLOR_TESTS.
+       * lib/Automake/Options.pm (_process_option_list): Handle it.
+       * lib/am/check.am (am__tty_colors): New variable.  Enable colored
+       output if TERM is not dumb and depending on AM_COLOR_TESTS and
+       whether stdout is connected to a terminal.
+       (check-TESTS): Use am__tty_colors.
+       * NEWS: Mention color-tests.
+       * tests/color.test: New test.
+       * tests/Makefile.am: Adjust.
+
+2007-11-08  NightStrike  <address@hidden>  (tiny change)
+
+       For PR automake/526:
+       * doc/automake.texi (Basic Installation): Fix typo.
+
+2007-10-29  Ralf Wildenhues  <address@hidden>
+
+       Accommodate for new macro AC_AUTOCONF_VERSION.
+       * aclocal.in (write_aclocal): Use AC_AUTOCONF_VERSION rather
+       than m4_PACKAGE_VERSION.  Define the former if not defined.
+       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Likewise.
+       * tests/missing4.test: Use AC_AUTOCONF_VERSION.
+
+2007-10-29  Bruno Haible  <address@hidden>
+
+       * doc/automake.texi (Program variables): Clarify that
+       Automake does not put DEFAULT_INCLUDES in AM_CPPFLAGS, but
+       passes it directly to compilation commands.
+
+2007-10-29  Ralf Wildenhues  <address@hidden>
+
+       Move to git as primary source repository.
+       * Makefile.am (git-dist, git-release): Renamed and adjusted from ...
+       (cvs-dist, cvs-release): ... these.
+       (git-diff): New target, taken and adjusted from cvs-diff.
+       * Makefile.in: Regenerate.
+       * bootstrap: Adjust.
+       * NEWS: Announce change.
+       * doc/automake.texi (General Operation): cvs-dist is git-dist now.
+       (Timeline): Mention change.
+
+2007-10-09  Ralf Wildenhues  <address@hidden>
+
+       * automake.in: Treat extension .sx also like preprocessed
+       assembler (.S), following GCC.
+       * NEWS: Update.
+       * doc/automake.texi (Assembly Support): Adjust.
+       * tests/asm3.test: New test.
+       * tests/Makefile.am: Update.
+
+2007-10-09  Jim Meyering  <address@hidden>
+
+       Add lzma compression support.
+       * NEWS: Mention it.
+       * automake.in (handle_dist): Recognize dist-lzma.
+       (make_paragraphs): Map LZMA to dist-lzma.
+       * doc/automake.texi (Dist): Add dist-lzma.
+       (Options): Likewise.
+       * lib/Automake/Options.pm (_process_option_list):
+       (dist dist-all): Add command to create an lzma-compressed tarball.
+       (distcheck): Handle lzma-compressed tarballs just like the others.
+       * tests/defs.in: Test for lzma, too.
+       * tests/lzma.test: New file, based on nogzip.test.
+       * tests/Makefile.am (TESTS): Add lzma.test.
+       Suggestion from Karl Berry.
+
+2007-09-30  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (TARGET_PATTERN): Allow leading digit.
+       * tests/exeext3.test: Adjust to expose this.
+       Report by Claudio Fontana and Laurence Finston.
+
+2007-08-23  Ralf Wildenhues  <address@hidden>
+
+       * tests/defs.in (required): For gcj, check whether `gcj -v'
+       works, to avoid broken installations without libgcj.spec.
+       Export $GCJ.
+       * tests/gcj4.test: Setting GCJ not needed any more.
+       * THANKS: Update.
+       Report by Jesse Chisholm.
+
+2007-08-20  Ralf Wildenhues  <address@hidden>
+
+       * lib/config-ml.in, lib/config.guess, lib/config.sub,
+       lib/symlink-tree, lib/texinfo.tex: New upstream versions.
+
+2007-08-19  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (gettext): Fix link to gettext manual.
+
+2007-08-18  Ralf Wildenhues  <address@hidden>
+
+       In ChangeLog files, use more-permissive notice rather than GPL,
+       as per usual GNU standards these days.
+
+2007-08-16  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_programs): Also clean .libs/_libs
+       directory for _PROGRAMS.
+       * tests/libtoo10.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Report by Guillermo Ontañón.
+
+2007-08-09  Ralf Wildenhues  <address@hidden>
+
+       * configure.ac: Actually require version 2.60 in the test for
+       Autoconf, and recommend it in the error messages.
+       * THANKS: Update.
+       Report by Robert Swafford.
+
+2007-07-22  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (VPATH Builds): Fix wording.
+       Report by Reuben Thomas.
+
+2007-07-22  Noah Misch  <address@hidden>
+
+       * tests/subst.test: Move the AC_SUBST into a macro definition.
+       Avoids an error from CVS Autoconf.
+       * THANKS: Update.
+       Report by Benoit Sigoure.
+
+2007-07-22  Ralf Wildenhues  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target
+       $(am__aclocal_m4_deps) without any dependencies, to avoid the
+       "deleted .m4 file" problem.
+       * tests/acloca22.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+2007-07-22  Francesco Salvestrini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * lib/am/ltlib.am (install-%DIR%LTLIBRARIES)
+       (uninstall-%DIR%LTLIBRARIES): Use $(AM_LIBTOOLFLAGS) and
+       $(LIBTOOLFLAGS).
+       * lib/am/progs.am (install-%DIR%PROGRAMS)
+       (uninstall-%DIR%PROGRAMS): Likewise.
+       * tests/libtool7.test: Update test for `install' and
+       `uninstall' cases.
+       * NEWS, THANKS: Update.
+
+2007-07-16  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi: Remove Front-Cover and Back-Cover Texts,
+       this manual is not printed by the FSF.
+
+2007-07-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS: Clarify that COPYING files are not updated.
+
+2007-07-11  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi: New Back-Cover Text.
+       Report by Karl Berry.
+
+2007-07-07  Ralf Wildenhues  <address@hidden>
+
+       * aclocal.in (version): Fix output to match GCS requirements.
+       * automake.in (version): Likewise.
+       Report by Eric Blake.
+
+       * COPYING, lib/COPYING: Update to GPLv3.  All uses changed.
+       * NEWS: Update.
+
+2007-06-30  Ralf Wildenhues  <address@hidden>
+
+       * lib/gnupload: Fix shell portability issues with for loops.
+       Report by Karl Berry.
+
+2007-06-23  Paul Eggert  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * aclocal.in (write_aclocal): Warn about autoconf
+       incompatibilities instead of making them fatal.
+       * tests/missing4.test: Adjust.
+       * NEWS: Update.
+       Problem reported by Bruno Haible in
+       <http://lists.gnu.org/archive/html/bug-automake/2007-06/msg00010.html>.
+
+2007-05-03  Stepan Kasal  <address@hidden>
+
+       * doc/automake.texi, lib/Automake/Rule.pm: Fix typos.
+       * automake.in: Likewise.
+       (am_primary_prefixes): Keep the intentional typo there.
+
+2007-04-25  Eric Blake  <address@hidden>
+
+       * doc/stamp-vti: Remove generated file from revision control.
+       * doc/version.texi: Likewise.
+
+2007-04-23  Reuben Thomas  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Python): Fix typo.
+
+2007-03-30  Eric Blake  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * lib/mdate-sh (ls_command): Use -n when available to avoid
+       problems with spaces in user/group names.
+       * tests/mdate5.test: New test.
+       * tests/Makefile.am: Adjust.
+
+2007-03-30  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_tests): Rewrite XFAIL_TESTS just like
+       TESTS, appending $(EXEEXT), so that matching continues to work
+       on w32.
+       * NEWS: Mention this.
+       * doc/automake.texi (EXEEXT, Extending): Update.
+       * tests/check7.test: New test.
+       * tests/Makefile.am: Adjust.
+       Bug report by Ed Hartnett.
+
+2007-03-30  Ralf Wildenhues  <address@hidden>
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Again search
+       the whole file, but use sed to reduce the line length.
+       Fixes 1.10 regression.  Report by David Byron.
+       * THANKS, NEWS: Update.
+
+2007-03-29  Ralf Wildenhues  <address@hidden>
+
+       * lib/depcomp (aix): Rewrite depmode in the spirit of the tru64
+       one.  Fixes failure to catch dependencies with libtool and xlc
+       in case of enable_static=no (which is the default on AIX without
+       runtimelinking).
+       * tests/depcomp7.test: Run test once with --disable-shared and
+       once with --disable-static, to expose failure systematically.
+       * NEWS: Update.
+
+2007-03-29  Stepan Kasal  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_LIBOBJS_or_ALLOCA): Fix the error message.
+       * tests/pr401.test: Update to expose the error.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+
+2007-03-28  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (scan_autoconf_config_files): Warn about leading
+       `./' in config file names.
+       * tests/canon-name.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Suggestion by Claudio Fontana.
+
+       * tests/yacc6.test: Add the generated headers to `BUILT_SOURCES'
+       as documented in the manual.  Fixes parallel make failure.
+       Report by Dieter Jurzitza.
+       * THANKS: Update.
+
+       * ChangeLog, TODO, tests/exdir3.test: Fix copyright notice.
+
+       * TODO: Kill a couple of outdated items.
+       * tests/exdir3.test: New test.
+       * tests/Makefile.am: Update.
+
+2007-01-27 Bruno Haible  <address@hidden>
+
+       * doc/automake.texi (Multiple Outputs): Fix the multiple outputs
+       with locking example.
+
+2007-01-27  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Subpackages): Fix ambiguous wording.
+       Report and suggestions by Reuben Thomas.
+       * THANKS: Update.
+
+2007-01-10  Ralf Wildenhues  <address@hidden>
+
+       * tests/defs.in (is_newest): Cope with multiple newer files.
+       * NEWS: mention `install-sh -C'.
+
+2006-12-25  Paul Eggert  <address@hidden>
+
+       * lib/install-sh (initialize_posix_glob): New var.
+       Use it instead of setting posix_glob inline.
+       (posix_glob): Use '?'/''/: instead of ''/yes/no, for convenience.
+       (cmpprog, CMPPROG): New vars, since we use cmp rather than the diff
+       of Akim's patch.
+       Use LC_ALL before invoking 'ls' when we depend on its output format.
+       Don't use awk; just use the shell's builtin features.
+       Clean up $dsttmp if -C detects no installation is needed.
+       * tests/defs.in (is_newest): Renamed from is_younger; the new
+       name is more accurate.  All uses changed.
+       (old_timestamp): New var.
+       * tests/instsh2.test: Rewrite to avoid the need for sleeping.
+
+2006-12-25  Akim Demaille  <address@hidden>
+
+       * lib/install-sh: Implement install-sh -C.
+       (This patch is the remaining part of the patch proposed in
+       
<http://lists.gnu.org/archive/html/automake-patches/2006-10/msg00077.html>.)
+       (usage): Document it.
+       (copy_on_change): New var.
+       * tests/defs.in (is_younger): New function.
+       * tests/instsh2.test: Check install-sh -C.
+
+2006-12-24  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: Fix typo in previous patch for handling --.
+       Use more-consistent style for ';;'.
+       Prefer || to if-then-else-:.
+       * tests/install2.test: Rework to avoid set -e problems.
+
+2006-12-24  Akim Demaille  <address@hidden>
+
+       Simplify install-sh and its test.  This shouldn't change any behavior.
+       (This patch is a subset of the patch proposed in
+       
<http://lists.gnu.org/archive/html/automake-patches/2006-10/msg00077.html>.)
+       * lib/install-sh (usage): Use usual GNU style.
+       (dstarg): Rename as...
+       (dst_arg): this for consistency.
+       Simplify quoting of assignments.
+       Sort them.
+       Don't use '\' to continue commands: && suffices.
+       Remove useless "continue" in the argument processing,
+       and factor the shifts.
+       * tests/defs.in: Some improvements to make it set -e clean.
+       Use the traditional ":" trick to protect loops from being empty.
+       Remove an empty straightforward piece of code prepared to define
+       additional variables.
+       Use test instead of [], for consistency.
+       * tests/install2.test: Use set -e, to simplify code.
+
+2006-12-20  Reuben Thomas  <address@hidden>  (tiny change)
+
+       * doc/automake.texi: Fix typo.
+
+2006-11-12  Ralf Wildenhues  <address@hidden>
+
+       * doc/Makefile.am: Use $(MAKE) $(AM_MAKEFLAGS) for building
+       amhello, to prevent gmake from invoking make with MAKEFLAGS
+       it does not understand.
+       Report by Patrick Welche.
+
+       * lib/gnupload: Revert last change.  Add pointer to upload
+       instructions of the GNU Maintenance Instructions.
+       Suggestion by Karl Berry.
+
+2006-11-08  Ralf Wildenhues  <address@hidden>
+
+       * lib/gnupload: Add missing 'gnu' to example URL.
+       Report by Karl Berry.
+
+2006-10-28  Bobby Jack <address@hidden>  (tiny change)
+
+       * doc/automake.texi (amhello Explained): autoconf creates
+       configure, not configure.ac.
+       * THANKS: Update.
+
+2006-10-20  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Dist, Dependency Tracking Evolution):
+       Fix some typos.
+       * lib/Automake/Condition.pm: Likewise.
+       * lib/Automake/DisjConditions.pm: Likewise.
+       * lib/Automake/ItemDef.pm: Likewise.
+       * lib/Automake/Options.pm: Likewise.
+       * lib/Automake/Rule.pm: Likewise.
+       * lib/Automake/VarDef.pm: Likewise.
+       * lib/Automake/Variable.pm: Likewise.
+       * lib/Automake/Wrap.pm: Likewise.
+       * lib/Automake/XFile.pm: Likewise.
+       * m4/substnot.m4: Likewise.
+
+2006-10-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/gnupload: Update to version 1.1 of directive file.
+
+2006-10-16  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/depend2.am (%SOURCEFLAG%): New substitution, goes
+       right before the expanded source file name.
+       * automake.in (%sourceflags): New global: per-extension flag
+       to denote that the next compiler argument is the source file.
+       (scan_autoconf_traces): Trace AC_FC_SRCEXT; initialize
+       %sourceflags accordingly.
+       (handle_single_transform): Store source file extension in...
+       (%lang_specific_files): ...this and...
+       (handle_languages): ...adjust here.  Pass flag in SOURCEFLAG.
+       * doc/automake.texi (Optional): Add AC_FC_SRCEXT.
+       (Fortran 9x Support): Update.
+       * tests/fort2.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS, THANKS: Update.
+       Suggested by Steven G. Johnson.
+
+       For PR automake/480.
+       * automake.in (lang_f77_rewrite, lang_fc_rewrite)
+       (lang_ppfc_rewrite, lang_ppf77_rewrite, lang_ratfor_rewrite):
+       return `lang_sub_obj' to support subdir-object mode for the
+       Fortran dialects.
+       * tests/fort4.test, tests/fort5.test: New tests.
+       * tests/Makefile.am: Update.
+       * NEWS, THANKS: Update.
+       Report by Davyd Madeley and Shannon L. Brown.
+
+       * lib/am/header-vars.am (pkglibexecdir): New variable.
+       * automake.in (%standard_prefix): Add it.
+       * doc/automake.texi (Uniform): Document it.
+       (Program Sources): Adjust.
+       * NEWS: Update.
+       * tests/libexec.test: New test.
+       * tests/Makefile.am: Update.
+       Suggested by Eric Blake.
+
+2006-10-15  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/gnupload: Update to version 1.1 of directive file.
+
+       * configure.ac, NEWS: Bump version to 1.10a.
+
+       * configure.ac, NEWS: Bump version to 1.10.
+       * doc/automake.texi (Releases): Update for 1.10.
+
+       * lib/config.sub, lib/texinfo.tex: New upstream versions.
+
+       * lib/am/depend2.am: Typo.
+       * lib/depcomp (scriptversion): Bump, to account for recent changes.
+
+       * doc/automake.texi (Examples): Introduce the example, and point
+       to Hello World.
+       (Hello): Remove this obsolete node.
+
+2006-10-15  Hans Ulrich Niedermann  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       For PR automake/507:
+       * lib/am/distdir.am (distdir): filename-length-max check is not
+       done in sub-packages.
+       * doc/automake.texi (Options): Document this.
+       * tests/fn99subdir.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+
+2006-10-14  Alfred M. Szmidt  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Third-Party Makefiles): Fix typo.
+       * THANKS: Update.
+
+2006-10-14  Ralf Wildenhues  <address@hidden>
+
+       * aclocal.in (write_aclocal): Improve warning for mismatched
+       Autoconf version.
+
+       * automake.in: For preprocessed assembler, add `$(DEFS)
+       $(DEFAULT_INCLUDES) $(INCLUDES)' to the compile rule.
+       * doc/automake.texi (Assembly Support): Update.
+       * NEWS: Update.
+       Suggested by Thomas Schwinge and Ralf Corsepius.
+
+       For PR automake/492.
+       * automake.in (output_flag): Set to `-o' for Assembler and
+       preprocessed Assembler, assuming that all understand `-c -o'.
+       * THANKS, NEWS: Update.
+       * tests/subobj10.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Thomas Schwinge.
+
+       * automake.in (%_macro_for_cond): New variable.
+       (cond_stack_if): Use it for better error message about
+       missing dependency tracking conditionals.
+       * tests/asm2.test: New test, modelled after asm.test.
+       * tests/Makefile.am: Adjust.
+       Report by Ralf Corsepius.
+
+       * doc/automake.texi (Options): `no-dependencies' is similar
+       to `--ignore-deps', not `--include-deps'.
+       * m4/as.m4 (AM_PROG_AS): If `no-dependencies', do not invoke
+       _AM_DEPENDENCIES.
+       * tests/nodep2.test: New test.
+       * tests/Makefile.am: Adjust.
+
+       * automake.in (handle_LIBOBJS_or_ALLOCA): If we are in the
+       LIBOBJDIR, then we should not add a DEPDIR prefix.
+       * tests/pr401.test: Update test.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       Report by Jim Meyering and Eric Blake.
+
+       * lib/depcomp (gcc3): Put dependency extraction flags before the
+       `-c' flag, so they appear at the same position as in %FASTDEP%
+       mode in depend2.am.  Fixes build failure for FreeBSD's c89,
+       which ignores unknown options only after the first non-option.
+       Bug report against M4 by Nelson H. F. Beebe.
+
+2006-10-14  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * automake.in ($seen_gettext_intl): New variable.
+       (handle_gettext): Consider it.
+       (scan_autoconf_traces): Add AM_GNU_GETTEXT_INTL_SUBDIR to the list.
+       Set $seen_gettext_intl when it is seen.
+       * doc/automake.texi (gettext, Optional): Update.
+       * tests/gettext3.test: New test.
+       * tests/Makefile.am: Update.
+
+2006-10-14  Paul Eggert  <address@hidden>
+
+       * lib/install-sh (posix_mkdir): Reject FreeBSD 6.1 mkdir -p -m,
+       which incorrectly sets the mode of an existing destination
+       directory.  In some cases the unpatched install-sh could do the
+       equivalent of "chmod 777 /" or "chmod 0 /" on a buggy FreeBSD
+       system.  We hope this is rare in practice, but it's clearly worth
+       fixing.  Problem reported by Alex Unleashed in
+       <http://lists.gnu.org/archive/html/bug-autoconf/2006-10/msg00012.html>.
+       Also, don't bother to check for -m bugs unless we're using -m;
+       suggested by Stepan Kasal.
+
+2006-10-14  Geoffrey Keating  <address@hidden> (tiny change)
+
+       * m4/multi.m4: Non-default multilibs may be cross compilation.
+
+2006-10-14  Ralf Wildenhues  <address@hidden>
+
+       * automake.in: Fix some typos in comments.
+       * lib/Automake/Variable.pm: Likewise.
+
+2006-10-10  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_compile): Use subst, for maintainer-check.
+
+2006-10-09  Andreas Köhler  <address@hidden>  (tiny change)
+
+       For PR automake/505:
+       * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES):
+       Fix typo: `config.status.lineno', not `configure.status.lineno'.
+
+2006-09-05  Ralf Wildenhues  <address@hidden>
+
+       * NEWS: Mention that `install-sh' needs executable permissions.
+       * tests/nobase.test: Adjust.
+       Report by Patrick Welche.
+
+2006-09-01  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/check.am (check-TESTS): Fix matching of XFAIL_TESTS
+       against currently running test for the first and last element
+       of $(TESTS): add spacing so Solaris make does VPATH expansion
+       on these words, too.
+       * tests/check6.test: Update.
+
+2006-08-30  Paul Eggert  <address@hidden>
+
+       For PR automake/501:
+       * lib/am/depend2.am (?GENERIC?%EXT%.o, ?!GENERIC?%OBJ%):
+       Abbreviate output a bit by not bothering to quote the .Po file
+       name (the quoting doesn't suffice in general anyway), and by not
+       bothering to remove junk .Tpo files (as they'll be removed later).
+       This also lets 'make' run faster by avoiding a subshell.
+
+2006-08-30  Ralf Wildenhues  <address@hidden>
+
+       * automake.in: Fortran 77 and Fortran should require variables
+       F77 resp. FC to be defined, and suggest the respective Autoconf
+       macros otherwise.
+       * tests/fort1.test: New test.
+       * tests/Makefile.am: Update.
+
+       * tests/ext.test: Add extensions f95, F90, F95.
+
+2006-08-30  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/500:
+       * automake.in (handle_compile) <$default_includes>: Do not output
+       the same -I twice.  Use @am__isrc@ instead of ` -I$(srcdir)'.
+       * m4/init.m4: Define am__isrc as ` -I$(srcdir)' only in
+       non-VPATH builds since we always have `-I.'.
+       * tests/subpkg.test: Make sure config headers are found in VPATH
+       and non-VPATH builds.
+
+2006-08-28  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi, lib/Automake/Rule.pm: Fix some typos.
+       * NEWS: Likewise.  Clarify that only one LIBOBJDIR is supported.
+
+2006-08-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/ChannelDefs.pm (usage): Mention that -Wportability
+       is enabled by default with gnu and gnits strictness.
+       Report from Bruno Haible.
+
+2006-08-22  Paul Eggert  <address@hidden>
+
+       * NEWS: Mark de-ANSI-fication as being obsolete.
+       * doc/automake.texi: Likewise.
+
+2006-08-21  Stepan Kasal  <address@hidden>
+
+       * Makefile.am, THANKS: Fix typos.
+
+2006-08-20  Alexandre Duret-Lutz  <address@hidden>
+
+       * NEWS, configure.ac: Bump version to 1.9c.
+
+       * NEWS, configure.ac: Bump version to 1.9b.
+
+       * Makefile.am (maintainer-check): Check for mkdir_p in automake.in
+       too.
+       * automake.in (require_build_directory): Use MKDIR_P, not mkdir_p.
+
+       * m4/mkdirp.m4: Typo in previous patch.
+
+       * Makefile.am (maintainer-check): Fine-tune the "Unescaped @"
+       check so it doesn't complain about the '@ 's in node "Standard
+       Directory Variables".
+
+       * INSTALL, lib/INSTALL, lib/texinfo.tex, lib/config.sub: New
+       upstream versions.
+
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Prefix mkdir_p with
+       $(top_builddir)/ if it is a relative directory.
+
+2006-08-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/lex.am, lib/am/yacc.am: Drop the inline rules, always use
+       ylwrap.  Suggested by Akim Demaille long ago, to ease maintenance.
+       * automake.in (handle_languages): Do not define MORE-THAN-ONE.
+       (yacc_lex_finish_helper, lang_yacc_finish, lang_lex_finish): Always
+       require ylwrap.
+       * doc/automake.texi (Auxiliary Programs, Yacc and Lex): Update the
+       documentation of ylwrap.
+       * tests/lex.test, tests/lex4.test, tests/mmodely.test,
+       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
+       tests/yaccpp.test: Adjust.
+
+       * doc/automake.texi (Releases): Update statistics until 1.9.6.
+
+       * Makefile.am (maintainer-check): Check for mkdir_p.
+       * automake.texi (Obsolete macros): Document AM_PROG_MKDIR_P.
+       * lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
+       lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
+       lib/am/mans.am, lib/am/progs.am, lib/am/python.am,
+       lib/am/scripts.am, lib/am/texinfos.am: Use MKDIR_P instead of mkdir_p.
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Define mkdir_p using $MKDIR_P, not
+       as '$(MKDIR_P)', otherwise it will break `Makefile.in's that use
+       mkdir_p without defining MKDIR_P.
+       * tests/distdir.test, tests/instman.test, tests/txinfo21.test:
+       Adjust.
+
+       * Makefile.am (SUBDIRS): Build lib first, for lib/Automake/Config.pm.
+       * configure.ac (ACLOCAL): Use --acdir=m4 in addition to
+       -I m4.  Running aclocal during the rebuild rules will fail
+       if the default acdir does not exist.
+
+       * NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4:
+       Require Autoconf 2.60 instead of some intermediate development
+       version.
+
+       * doc/automake.texi (Standard Directory Variables): Fix multitable
+       width.
+       (Autotools Introduction): Fix @uref usage.
+
+2006-08-19  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi: Fix some typos in the introduction,
+       adjust some spacing; spell `GNU Build System' consistently.
+       (menu): Unify node naming.
+       (Standard Directory Variables): Clarify that this list is not
+       exhaustive.
+       (DESTDIR): Fix example.
+
+2006-08-19  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Autotools Introduction) New chapter.
+       Thanks to Ben Pfaff and Ralf Wildenhues for comments.
+       (Auxiliary Programs, Install, Dist, Third-Party Makefiles)
+       (distcleancheck): More cross references.
+       * doc/amhello/configure.ac, doc/amhello/README,
+       doc/amhello/Makefile.am, doc/amhello/src/Makefile.am,
+       doc/amhello/src/main.c: New files.
+       * doc/Makefile.am (dist_noinst_DATA): Distribute them.
+       ($(srcdir)/amhello-1.0.tar.gz): New rule.
+       (dist_doc_DATA): Install amhello-1.0.tar.gz.
+       * Makefile.am (SUBDIRS): Update comment.
+
+2006-08-15  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi: Fix some typos.
+
+2006-08-14  Jonathan Higa <address@hidden>
+
+       * automake.in: Register "Unified Parallel C" as language.
+       (lang_upc_rewrite): New function.
+       (resolve_linker): Consider UPCLINK.
+       * lib/Automake/Variable.pm (%_ac_macro_for_var): Suggest
+       AM_PROG_UPC for UPC and UPCFLAGS.
+       * m4/upc.m4: New file.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Add UPC case.
+       * m4/Makefile.am (dist_m4data_DATA): Add upc.m4.
+       * doc/automake.texi (Unified Parallel C Support): New node.
+       (Public macros): Mention AM_PROG_UPC.
+       (Program and Library Variables, Flag Variables Ordering):
+       Mention UPCFLAGS.
+       * tests/upc.test, tests/upc2.test, tests/upc3.test: New file.
+       * tests/Makefile.am (TESTS): Add them.
+       * tests/ext.test: Also test upc files.
+
+2006-08-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Scripts): Fix some errors in previous patch.
+
+       * doc/automake.texi (Scripts): Revamp.  Show an example of script
+       built from configure.ac.  Discuss CLEANFILES and EXTRA_DIST for
+       other built scripts.
+
+       * m4/init.m4: Suggest fixing the call to AC_INIT when
+       AC_PACKAGE_NAME or AC_PACKAGE_VERSION is undefined.  This is for
+       newcomers who call AC_INIT and AM_INIT_AUTOMAKE without arguments.
+       * tests/init.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2006-08-04  Stepan Kasal  <address@hidden>
+
+       * automake.in (dist_dirs, fill_dist_dirs): Remove.
+       * lib/am/distdir.am (DISTDIRS): Remove.
+       * tests/distdir.test, tests/pr2.test: Do not grep, use
+       `make distdir' instead.
+
+2006-08-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Conditionals): Split in two sections, "Usage"
+       and "Portability", and add a third one, "Limits" to explain how
+       conditional definitions inside multi-lines definitions can be
+       handled.
+       * automake.in (handle_options): Do not assume that
+       AUTOMAKE_OPTIONS is defined in TRUE, but diagnose conditional
+       definitions of AUTOMAKE_OPTIONS.
+       Report from Bas Wijnen.
+       * tests/amopt.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+       * aclocal.in (install_file): Cannot use /dev/null while diffing
+       new files, because Tru64's diff do not handle /dev/null.  So
+       create an empty destination file before running diff on a new
+       file, and erase it afterward.  Fall back to using /dev/null only
+       if we cannot create this file.
+       Report and initial patch from Ralf Wildenhues.
+       (unlink_tmp): New function.
+       * test/acloca18.test: Make sure the empty file has been erased.
+
+2006-08-04  Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_LIBOBJS_or_ALLOCA): With subdir-objects,
+       do not prefix `$(top_builddir)/' aka `./' to nonempty LIBOBJDIR,
+       to help BSD Make find the files also in a VPATH build.
+       Also return the same path, possibly prefixed, for correct
+       depdir computation.
+       * tests/pr401.test: Update to expose wrong depdir computation.
+       Rewrite to not use the same file name for library object and
+       main program.
+       * tests/pr401b.test, tests/pr401c.test: Likewise.
+
+2006-07-09  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: Don't incorrectly claim that this implementation
+       can install only one file at a time.
+       (doit_exec): New var, for using 'exec' if possible, to save a process.
+       (test_mode, intermediate_mode): Remove.
+       (mode): Check for IFS or globbing characters in mode, since they might
+       cause weird behavior with the other changes below.  All later uses
+       of '"$mode"' changed to '$mode', since the ""s no longer matter.
+       Use octal modes if the invoker specifies an octal mode, and use
+       octal umask values if 'umask' outputs octal values; this is more
+       likely to work with older operating systems since Automake uses
+       octal modes, and also works around a bug with HP-UX 11.23
+       'mkdir -p -m u=rwx,g=rx,o=rx,u+wx' reported by Ralf Wildenhues in
+       <http://lists.gnu.org/archive/html/bug-automake/2006-06/msg00024.html>.
+       (cp_umask, mkdir_umask): New variables, to avoid
+       temporarily creating files or directories with too-permissive modes.
+       (mkdir_mode): Use the FreeBSD 'install' method for computing modes of
+       intermediate directories; this is safer.
+       (posix_mkdir): Also test mkdir -p -m ... by making a directory in
+       /tmp and checking the resulting mode with 'ls', to catch a bug in
+       HP-UX 11.23 and IRIX 6.5 mkdir reported by Ralf in the same message.
+       Use ':' for true, not 'true'; this is a bit faster on
+       traditional implementations.
+
+2006-07-09  Jim Meyering  <address@hidden>
+
+       * lib/depcomp: "in in" -> "in" in comment.
+
+2006-07-06  Ralf Wildenhues  <address@hidden>
+
+       * tests/defs.in (AUTOMAKE_run): Redirect stdout before stderr,
+       for consistency with the recommendation prompted by this report:
+       <http://lists.gnu.org/archive/html/bug-coreutils/2006-06/msg00225.html>.
+
+2006-06-24  Stepan Kasal  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Set `mkdir_p' to
+       `'$(MKDIR_P)'', so that it retains the per-directory value
+       computed by config.status.
+       * lib/am/distdir.am (distdir): do not use `$(mkdir_p)' from
+       a changed directory.  Bugs reported by Ralf Menzel.
+       * THANKS: Update.
+
+2006-06-24  Eric Dorland  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * automake.in (scan_texinfo_file): Fix matching file extension.
+       * tests/txinfo31.test: New test.
+       * tests/Makefile.am: Update.
+
+2006-06-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (handle_LIBOBJS): Don't rely on the caller defining $1.
+
+2006-06-07  Stepan Kasal  <address@hidden>
+
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Rewrite using AC_PROG_MKDIR_P.
+
+2006-06-06  Stepan Kasal  <address@hidden>
+           Ralf Wildenhues <address@hidden>
+
+       * lib/am/distdir.am: Do not call $(mkdir_p) for each
+       distributed file, collect them and create them in one run,
+       and strip $(srcdir) and $(top_srcdir) all at once.
+       Fix some comment typos.
+
+2006-06-06  Ralf Wildenhues  <address@hidden>
+
+       * m4/depend.m4 (_AM_DEPENDENCIES): The IRIX MIPSpro compiler
+       7.4.4m may omit the first included header dependency information
+       with `-MDupdate'.  Refine test to catch this.
+
+       * configure.ac (ACLOCAL): Use `-I m4' to match `./bootstrap'
+       procedure.
+
+       * tests/gettext.test: AM_PROG_GETTEXT of gettext >= 0.14.3
+       requires `config.rpath' to be present, and automake now enforces
+       this.  Test this, but only if the gettext installation works and
+       is recent enough to provide this diagnosis.
+       * tests/gettext.test: Provide a dummy `config.rpath' for all
+       subsequent checks.
+       * tests/gettext2.test, tests/subcond.test: Likewise.
+
+       * tests/pr401.test: Replace "perl -i" with sed and mv, for
+       MinGW perl.
+       * tests/pr401b.test, tests/pr401c.test, tests/python11.test,
+       * tests/yacc6.test, tests/yacc8.test: Likewise.
+
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Do not use
+       plain `grep' on the Makefile, as its line length may exceed that
+       for grep.  Bug report against coreutils by Sam Sirlin.
+       * THANKS: Update.
+
+2006-05-26  Sergey Poznyakoff  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Options): Add anchor `tar-formats'.
+
+2006-05-25  Noah Misch  <address@hidden>
+
+       * lib/Automake/XFile.pm (lock): Allow EOPNOTSUPP, besides
+       ENOLCK.  Only mention `make -j' when applicable.  Only raise
+       fatal errors when `make -j' is involved.  Improve error message.
+
+2006-05-17  Ralf Wildenhues  <address@hidden>
+
+       * lib/Automake/Configure_ac.pm (find_configure_ac): Use
+       `$configure_in' instead of `configure.in', to preserve
+       directory component.
+       * lib/Automake/Configure_ac.pm: Add note that Automake owns
+       this file.
+       * lib/Automake/Channels.pm: Likewise.
+       * lib/Automake/FileUtils.pm: Likewise.
+       * lib/Automake/Struct.pm: Likewise.
+
+2006-05-16  Ralf Wildenhues  <address@hidden>
+
+       * INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex:
+       New upstream versions.
+
+2006-05-15  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Auxiliary Programs): Fix URL to GCC
+       repository, they use SVN now.
+
+2006-05-13  Werner Lemberg  <address@hidden>
+
+       * lib/gnupload: Add support for savannah.gnu.org and
+       savannah.nongnu.org.
+
+2006-05-13  Ralf Wildenhues  <address@hidden>
+
+       * lib/Automake/Channels.pm, lib/Automake/Condition.pm,
+       lib/Automake/DisjConditions.pm, lib/Automake/Options.pm,
+       lib/Automake/VarDef.pm, lib/Automake/Wrap.pm: Fix some typos.
+
+2006-05-11  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: Sync from Autoconf, as follows:
+       Don't use 'path' to talk about file names,
+       as per GNU coding standards.  Close a race condition reported by Ralf
+       Wildenhues and Stepan Kasal.  There is still a race condition
+       on hosts that predate Posix 1003.1-1992, but we can't help this.
+       Don't mishandle weird characters like space on pre-Posix hosts.
+       Invoke mkdir at most once per dir arg on pre-Posix hosts.
+
+2006-05-11  Ralf Wildenhues  <address@hidden>
+
+       * tests/missing.test, tests/missing2.test: Do not require
+       GNUmake.
+       * Makefile.am (maintainer-check): Make sure `required=' does not
+       follow `. ./defs' in the tests.
+
+       * tests/ansi10.test: Use AC_PROG_CC_STDC.  Fix test that
+       ac_cv_prog_cc_stdc isn't just used by Automake code in
+       `configure'.
+       * tests/ansi6.test, tests/ansi7.test: Likewise.
+       * tests/ansi9.test: Likewise.  Do not override by setting
+       $U and $(ANSI2KNR) at `make' time; that will be fragile.
+       * tests/libobj8.test: Use AC_PROG_CC_STDC.
+       * tests/subobj3.test: Likewise.  Use `set -e'.
+
+       * lib/install-sh: Initialize IFS, so field splitting isn't
+       turned off later.
+       * lib/mkinstalldirs: Likewise.
+
+       * lib/am/java.am (class%DIR%.stamp): Do not assume `$?' has
+       the path of the prerequisite added; IRIX 6.5 make does not add
+       it, Solaris 2.6 make is inconsistent about adding it.  Fixes
+       java.test failure.
+
+       * tests/distdir.test: Do not use leading `./' in EXTRA_DIST for
+       files in the source tree.  Fixes failures with HP-UX and Tru64
+       make.
+
+       * lib/am/ansi2knr.am (ansi2knr): Rename target as...
+       (./ansi2knr): ...this, for BSD make.
+       (%ANSI2KNR-DIR%/ansi2knr): Adjust.
+
+2006-05-10  Ralf Wildenhues  <address@hidden>
+
+       * tests/depcomp6.test, tests/depcomp7.test: Cater for OpenBSD
+       /bin/sh -e issue with failing commands in if clauses.
+
+       * tests/defs.in (Be Bourne compatible): Update from current
+       Autoconf.
+
+       * configure.ac: Recommend perl-5.8.2.
+       * tests/automake.test: Do not fail because of buggy Getopt::Long
+       in perl < 5.8.2.
+
+       * tests/longlin2.test: Do not use `grep' on Makefile.am:
+       it has long lines and is thus not a text file; AIX 5.1 grep
+       fails to scan non-plain patterns from long lines.
+
+       * tests/overrid.test: Change all regexes for warning messages to
+       match after a colon, so that the prepended file names do not
+       cause false matches.  Tighten overrides regex.  Fix typo
+       `cleam-am-local' -> `clean-am-local'.
+
+       * tests/java.test: `configure' uses a trap, so use `(exit 77);
+       exit 77' to portably set the exit status similar to AS_EXIT.
+       * tests/fn99.test: propagate nonzero exit status from subshell.
+
+       * tests/mkinst3.test: Fix `mkdir' wrapper to not be confused
+       if ``pwd`' contains the string `-p'.  Create the wrapper in a
+       subdirectory so that `.' in $PATH does not lead to an endless
+       loop.
+
+       * lib/depcomp (ia64hp): Rename dependency style to..
+       (hp2): ..this, as it works with aCC on HPPA, too; adjust
+       comment.  Report by Olivier Fourdan (PR automake/481).
+       * THANKS: Update.
+
+       * tests/aclocal7.test: Add `$sleep's between file touching
+       and automake resp aclocal+automake invocations, to ensure
+       they complete with a time stamp strictly later than the touched
+       file.
+
+       * lib/missing: Remove superfluous quotes.  Replace all uses of
+       `[' by `test', for consistency, and for..
+       * tests/missing5.test: ..this new test.
+       * tests/Makefile.am: Update.
+
+       * lib/missing (sed_minuso, sed_output): New variables.
+       (autom4te, help2man, makeinfo): Use them.  Unifies detection of
+       `-o FILE', `--output FILE', `--output=FILE', stricter regex.
+       Fixes `missing' to detect `--output' for help2man.  Fixes
+       PR automake/483.  Report by Dennis J. Linse.
+       (autom4te): Document in `missing --help'.
+       * THANKS: Update.
+
+2006-04-26  Thien-Thi Nguyen  <address@hidden>  (tiny change)
+
+       * doc/automake.texi (Dependency Tracking Evolution): Fix typo.
+
+2006-04-25  Stepan Kasal  <address@hidden>
+
+       * lib/install-sh: Simplify the expr implementation of dirname.
+
+2006-04-24  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: Handle --, and diagnose unknown options.
+       * m4/mkdirp.m4 (AM_PROG_MKDIR_P): In the normal case, set
+       mkdir_p='mkdir -p', not to 'mkdir -p --', for consistency with
+       the other ways that mkdir_p might be set.
+
+2006-04-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/amversion.in (_AM_AUTOCONF_VERSION): New macro.
+       (AM_SET_CURRENT_AUTOMAKE_VERSION): Call it.
+       * aclocal.in (trace_used_macros): Trace _AM_AUTOCONF_VERSION.
+       (write_aclocal): Output a check for Autoconf's version in aclocal.m4.
+       Doing so ensures that users cannot build configure and Makefiles
+       with two different autoconf versions.  Report from Noah Misch.
+       * tests/missing4.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2006-04-20  Paul Lunau  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       * lib/am/dejagnu.am (check-DEJAGNU): Fail when at least one test
+       failed, instead of when the last one failed (PR automake/488).
+       Report from Paul Lunau.
+       * tests/dejagnu4.test: Update to expose this.
+       * THANKS: Update.
+
+2006-04-19  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/check.am (check-TESTS): Match XFAIL_TESTS delimited by
+       TABs as well as spaces.  Fixes PR automake/490.
+       * tests/check6.test: New test.
+       * tests/Makefile.am, THANKS: Update.
+       Report from Diab Jerius <address@hidden>.
+
+2006-04-17  Stepan Kasal  <address@hidden>
+
+       * lib/Autom4te/FileUtils.pm (find_file): Fix a typo in the
+       description; eliminate the duplicate error message.
+       * doc/automake.texi (@direntry): `Invoking Automake' is the name
+       of the usage node for `automake'
+       * lib/Automake/Variable.pm (%_gen_varname): Fix typos in the
+       comment.
+
+2006-04-17  Ralf Wildenhues  <address@hidden>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Require Autoconf 2.59c,
+       because it uses `datarootdir'.  Bump copyright year and serial.
+
+2006-04-10  Stepan Kasal  <address@hidden>
+
+       * NEWS: Fix typo.
+
+2006-04-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (_hash_varname, _hash_values): New functions.
+       (_gen_varname): Use _hash_values, and return a flag indicating whether
+       the variable name was generated or reused.
+       (transform_variable_recursively): Do not redefine variables that
+       are reused, and try to reuse the variable being transformed.
+       * tests/check2.test: Make sure TESTS hasn't been redefined.
+       * tests/check5.test, tests/exeext4.test: Make sure variables have
+       been reused.
+       * tests/subst2.test: Make sure bin_PROGRAMS gets rewritten.
+
+       * automake.in (%ignored_configure_vars): New variable.
+       (scan_autoconf_traces): Trace for _AM_SUBST_NOTMAKE and fill
+       %ignored_configure_vars.
+       (define_configure_variable): Declare ignored configure variables
+       as VAR_SILENT.  Do not special-case AMDEPBACKSLASH and ANSI2KNR
+       w.r.t. VAR_SILENT.
+       * m4/substign.m4: New file.
+       * m4/Makefile.am (dist_m4data_DATA): Add substign.m4.
+       * m4/cond.m4: _AM_SUBST_NOTMAKE $1_TRUE and $1_FALSE (PR automake/477).
+       * m4/depend.m4: _AM_SUBST_NOTMAKE AMDEPBACKSLASH.
+       * m4/protos.m4: _AM_SUBST_NOTMAKE ANSI2KNR.
+       * tests/cond.test: Make sure TEST_FALSE and TEST_TRUE are not defined.
+       * tests/amsubst.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2006-04-09  Stepan Kasal  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * automake.in (handle_single_transform): Preserve directories in
+       direct suffix rules.
+       * tests/suffix12.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       Report from John Ratliff.
+
+2006-03-25  Mike Frysinger  <address@hidden>  (tiny change)
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in ($m4_include_rx): Do not recognize `include', and
+       adjust scan_configure_dep and scan_file accordingly.
+       (scan_configure_dep): Do not search white lines.
+       (scan_file): Strip comments from current line after checking
+       for serial, so that aclocal does not trip on `m4_include' macros
+       in comments.  Report from Mike Frysinger.
+       * tests/acloca21.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
+2006-03-24  Stepan Kasal  <address@hidden>
+
+       * tests/mmodely.test: Fix the test on systems with no lex.
+
+2006-03-23  Stepan Kasal  <address@hidden>
+
+       * automake.in (libtool_new_api): Fix a typo in the comment.
+       * lib/Automake/Makefile.am (Config.pm): Likewise.
+       * lib/am/depend2.am: Likewise.
+       * tests/xsource.test: With `set -e', `|| exit 1' is no longer
+       needed.
+
+2006-03-23  Ralf Wildenhues  <address@hidden>
+
+       * tests/depcomp6.test, tests/depcomp7.test: Change back to
+       using `$MAKE && exit 1', but make sure the last command in the
+       test is successful.
+
+2006-03-21  Clifford Wolf  <address@hidden>  (tiny change)
+           Stepan Kasal  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * aclocal.in (parse_arguments): Added wildcard support to the
+       dirlist parser.
+       * doc/automake.texi (Macro search path): Document it.
+       * tests/dirlist2.test: New test.
+       * m4/dirlist, tests/Makefile.am: Adjust.
+
+2006-03-20  Ralf Wildenhues  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Add `_AM_DEPENDENCIES(OBJC)'
+       to `AC_PROG_OBJC' if provided, to fix Objective C depmode
+       handling.
+       * lib/Automake/Variable.pm (%_ac_macro_for_var): Add entries for
+       OBJC and OBJCFLAGS.
+       * tests/ext.test: Adjust.
+       * tests/objc.test, tests/objc2.test: New tests.
+       * tests/Makefile.am: Adjust.
+       * doc/automake.texi (Objective C Support): New node.
+       (Support for Other Languages): Adjust.
+
+2006-03-19  Ralf Wildenhues  <address@hidden>
+
+       * lib/Automake/RuleDef.pm (DESCRIPTION): Typo.
+
+       * tests/depcomp6.test, tests/depcomp7.test: Fix failure logic
+       to work with `set -e'.
+
+       * tests/depcomp6.test, tests/depcomp7.test: New tests,
+       for general `depcomp' functionality, with and without
+       `subdir-objects', with and without `libtool'.
+       * tests/Makefile.am: Adjust.
+
+       * aclocal.in (write_aclocal): Unlink `aclocal.m4' before
+       writing into it, to break a symlinked file.
+       * tests/acloca20.test: New test.
+       * tests/Makefile.am: Updated.
+
+2006-03-19  Ralf Wildenhues  <address@hidden>
+
+       Allow package trees (packages with subpackages) to share
+       common distributed auxiliary files (and directories) that
+       reside within a subpackage.
+
+       * lib/am/distdir.am (distdir %?TOPDIR_P%): Do not fail if
+       `$(distdir)' already exists.
+       (%?SUBDIRS%): Set `am__remove_distdir' to `:' to prevent
+       removal of subpackage trees for distribution.
+       * tests/subpkg3.test: New test.
+       * tests/Makefile.am: Update.
+
+2006-03-18  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/check5.test, tests/nobast.test: Fix $MAKE and rm
+       invocations to please maintainer-check.
+
+2006-03-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (lang_c_rewrite): Typo in previous change.
+       * tests/ccnoco2.test: New file.
+       * tests/Makefile.am (TESTS): Add ccnoco2.test.
+
+       * automake.in (lang_c_rewrite): Make the AM_PROG_CC_C_O requirement
+       a 'portability' warning, so that people can ignore it.  Suggested
+       by Ralf Wildenhues.
+
+       * lib/Automake/ChannelDefs.pm: Make -Wportability the default in
+       gnu and gnits modes.
+       * doc/automake.texi (Invoking Automake): Adjust.
+
+2006-02-21  Ralf Wildenhues  <address@hidden>
+
+       * doc/automake.texi (Yacc and Lex): Document that `.ypp' and
+       `.lpp' file extensions are recognized.
+
+2006-02-21  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Complete, Extending aclocal, Public macros)
+       (Python, Conditionals, API versioning): Always quote macro arguments.
+       Report from Stepan Kasal.
+
+2006-02-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Python): More examples.
+
+2006-02-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (distcleancheck): Fix bad wording.  Report
+       from Bob Rossi.
+       (Man pages): Show dist_man_MANS, not EXTRA_DIST = $(man_MANS).
+
+2006-01-29  Alexandre Duret-Lutz  <address@hidden>
+
+       Append $(EXEEXT) to programs that may be listed in TESTS.
+       Report from Simon Josefsson.
+
+       * automake.in (%known_programs): New global.
+       (initialize_per_input): Reset it.
+       (append_exeext): Take a predicate as first argument to select
+       the filename to rewrite.
+       (handle_programs): Fill %known_programs.
+       (handle_tests): Append $(EXEEXT) to all tests that are in
+       %known_programs.
+       (am_install_var): Update call to append_exeext.
+       * doc/automake.texi (EXEEXT): TESTS is also rewritten.
+       (Tests): More about the difference between check_PROGRAMS and TESTS.
+       Give an example of TEST_ENVIRONMENT.
+       * tests/cond32.test: Augment with a nested condition.
+       * tests/exeext4.test: Also check TESTS.
+       * tests/check5.test: New file.
+       * tests/Makefile.am (TESTS): Add check5.test.
+
+2006-01-12  Paul Eggert  <address@hidden>
+
+       * lib/install-sh (dstdir): Don't use semicolons inside { } in
+       sed scripts, as Posix says it's not portable.
+       * lib/missing (file): Likewise.
+       * lib/am/distdir.am (distcheck): Likewise.
+       * tests/comment7.test, tests/comment9.test, tests/confh.test: Likewise
+       * tests/distcom2.test, tests/distcom3.test: Likewise.
+       * tests/distcom4.test, tests/distcom5.test: Likewise.
+       * tests/distcom6.test, tests/include.test, tests/pluseq8.test: Likewise.
+
+2006-01-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * ChangeLog: Move 2004's entries to ...
+       * ChangeLog.04: ... this new file.
+       * Makefile.am (EXTRA_DIST): Add ChangeLog.04.
+
+       * tests/txinfo13.test: Test fix below.
+
+2006-01-12  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
+       extra files in distribution.  Reported by Vincent Lefevre.
+
+2006-01-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Linking, Program and Library Variables):
+       Mention the file extensions that usually appear in _DEPENDENCIES,
+       and point to BUILT_SOURCES and example of _DEPENDENCIES uses.  A
+       couple of people have been listing sources files in _DEPENDENCIES
+       lately.
+
+       * doc/automake.texi: Bump copyright year.
+       * automake.in ($gen_copyright, version): Likewise.
+       * aclocal.in (write_aclocal, version): Likewise.
+
+2006-01-05  Stepan Kasal  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (topsrcdir): New global.
+       (generate_makefile): Compute it.
+       (fill_dist_dirs): New function extracted from handle_dist.
+       (handle_dist, handle_configure): Use fill_dist_dirs.
+       * tests/distdir.test: Test for cases where $(top_srcdir) or
+       $(srcdir) appear in EXTRA_DIST.  Report from Sander Niemeijer.
+
+2006-01-05  Zack Weinberg  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * lib/depcomp: Add 'ia64hp' dependency style.
+       Zack's original patch was contributed to GCC on 2005-06-13.
+       (tru64): Typo.
+
+2005-11-01  Stepan Kasal  <address@hidden>
+
+       * lib/install-sh: Use "trap '' 0" instead of "trap - 0", so that
+       the code is portable to both POSIX and pre-POSIX shells.
+
+2005-10-17  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nobase.test: Use `chmod a-x' instead of `chmod -x',
+       suggested by Eric Blake.
+
+2005-10-17  Stepan Kasal  <address@hidden>
+
+       * doc/automake.texi (Program and Library Variables): Typo.
+       * lib/Automake/Variable.pm (transform_variable_recursively): Typo
+       in a comment.
+
+2005-10-03  Stepan Kasal  <address@hidden>
+
+       * ChangeLog.03, automake.in, tests/overrid.test: Typos.
+
+2005-10-03  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/nobase.test: Exercise previous patch.
+
+2005-10-03  Peter O'Gorman  <address@hidden>  (tiny change)
+
+       * lib/am/distdir.am: Remove $(SHELL) when calling install_sh
+       * m4/strip.m4: Ditto.
+       * m4/install-sh.m4: Add $(SHELL) to the definition of install_sh
+
+2005-09-13  Paul Eggert  <address@hidden>
+
+       * doc/automake.texi (limitations on file names): New section.
+       * lib/install-sh: Rewrite to support '*' in file names.
+       Also, tune so that we don't invoke so many commands in the usual case.
+       This has the side effect of fixing `install-sh -d' to not fail if it
+       loses the race in creating the last path component against another
+       process.
+       * tests/instspc.test: The "*" test is now fixed.
+
+2005-09-13  Stepan Kasal  <address@hidden>
+
+       * automake.in (Languages) <cppasm>: Fix typo in the comment.
+
+2005-09-13  Ralf Wildenhues  <address@hidden>
+
+       * lib/am/ltlib.am (uninstall-%DIR%LTLIBRARIES): Do not put
+       shell in verbose mode.
+
+2005-08-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (variable_value): Do not read the TRUE
+       value of a conditionally defined variable.
+       Report from Juergen Leising.
+
+       * automake.in (lang_yacc_target_hook): Use AM_MAKEFLAGS in recursive
+       $(MAKE) invocations.
+       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
+       Likewise.
+       * lib/am/texi-vers.am (%STAMPVTI%): Likewise.
+       * lib/am/remake-hdr.am (%CONFIG_H%): Likewise.
+       * Makefile.am (maintainer-check): Check for this.
+       Report from Stepan Kasal.
+
+       * m4/mkdirp.m4: Update misleading comment about `mkdir -p .'.
+       Prompted by Stepan Kasal.
+
+2005-08-07  Stepan Kasal  <address@hidden>
+
+       * lib/am/texinfos.am (uninstall-info-am): Call install-info only if
+       the $(infodir) exists.
+
+2005-07-31  Stepan Kasal  <address@hidden>
+
+       * tests/library3.test: Fix a typo which made the test fail.
+
+2005-07-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Linking, Program and Library Variables):
+       Suggest reserving -l for third-party libraries.
+
+       * lib/Automake/Variable.pm (require_variables): Mention aclocal's
+       search path when suggesting to add a macro in configure.ac.
+       People are confused when Automake suggests adding a macro (such as
+       AC_PROG_LIBTOOL) that is already in configure.ac.
+       * automake.in (require_file_internal): Suggest `automake --add-missing'
+       for missing files that can be installed.
+       * tests/library3.test: Adjust.
+
+2005-07-27  Stepan Kasal  <address@hidden>
+
+       * tests/defs.in: When required matches both `*libtool*' and
+       `*gettext*', check for both m4 files.
+
+       * doc/automake.texi (Auxiliary Programs): Fix a typo.
+       * tests/suffix11.test: Fix a typo.
+       * tests/colon3.test: s/EGREP/FGREP/.
+
+2005-07-19  Paul Eggert  <address@hidden>
+
+       * tests/instspc.test: Major rewrite to test for many other
+       problematic file names, e.g., '$', '"', '('.  Automake and
+       Autoconf can't handle many of them, so do not report a failure
+       if the usual candidates show up.
+
+2005-07-19  Stepan Kasal  <address@hidden>
+
+       * Makefile.am (automake, aclocal): Merge the rules.
+
+2005-07-10  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
+       versions.
+
+2005-07-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/install-sh: Use IFS=/ to split directories on /, don't translate
+       / into % as it prevents directory names using %...
+
+2005-07-09  Stepan Kasal  <address@hidden>
+
+       * doc/automake.texi (Public macros): Typo.
+       * aclocal.in: Typo in comment.
+
+2005-07-09  Zack Weinberg  <address@hidden>  (tiny change)
+
+       * lib/depcomp: Handle "#line" markers as well as "# " markers in
+       "cpp" style, so it can work with newer HP compilers (for their
+       ia64 systems).
+
+2005-07-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Public macros) <AM_WITH_DMALLOC>: Reword to
+       fix an underful hbox.
+       * lib/INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex:
+       New upstream versions.
+
+2005-07-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.5.
+
+2005-06-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (make_paragraphs): Do not define %TOPDIR%, now that
+       lib/am/header-vars.am no longer uses it.
+       * lib/am/libtool.am (distclean-am, distclean-libtool): Define
+       if TOPDIR_P is true, not TOPDIR.
+       Suggested by Stepan Kasal.
+
+       * automake.in (read_am_file): Correctly diagnose comments following
+       trailing backslash.
+       * tests/commen10.test: New file.
+       * tests/Makefile.am (TESTS): Add commen10.test.
+       Report from Harald Dunkel.
+
+       * automake.in (scan_autoconf_traces): Scan AC_SUBST_TRACE instead
+       of AC_SUBST.
+       * lib/am/header-vars.am (srcdir, top_srcdir, top_builddir, INSTALL):
+       Do not define, they are AC_SUBST_TRACEd by Autoconf.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.59c.
+       * tests/include.test: Call AC_OUTPUT.
+
+2005-06-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/mkinstalldirs: Fix support for directory name with spaces if
+       `mkdir -p' does not work.
+       * tests/Makefile.am (TESTS): Add mkinst3.test.
+       * tests/mkinst3.test: New file.
+       Report from Noah Friedman.
+
+       * doc/automake.texi (Include, Extending aclocal): Typos.
+       Report from Karl Berry.
+
+2005-06-28  Stepan Kasal  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/mdate-sh: Avoid infinite loop with GNU ls when TIME_STYLE is set.
+       * tests/txinfo28.test: Set TIME_STYLE.
+       Report from Vincent Lefevre and James Youngman.
+
+2005-06-24  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/Automake/Variable.pm (define, _new): Remember the helper
+       variable created for the last conditional += on each variable, and
+       only append further += in the same condition to this last helper
+       variable, not to older helper variables.  This way the order of
+       the items appended to the variable is preserved.
+       * tests/cond21.test: Adjust.
+       * tests/cond38.test: New file.
+       * tests/Makefile.am (TESTS): Add cond38.test.
+       Report from Ed Hartnett.
+
+2005-06-22  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/aclocal5.test: Adjust to recent CVS Autoconf changes.
+
+       * automake.in (handle_footer): Do not output an unformatted
+       definition of SOURCES, it is already done correctly in
+       generate_makefile.  This superfluous definition introduced long
+       lines in some Makefiles, hence breakages in tools with a limited
+       line length.  Report from Mathias Froehlich.
+
+2005-06-11  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
+       Fix redirections in previous patch.
+
+2005-06-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
+       Do not backup any file if makeinfo is not installed.
+       * lib/missing (makeinfo): Do not touch a missing info file.
+       * tests/txinfo30.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo30.test.
+       Report from Bob Proulx.
+
+       * doc/automake.texi (Extending aclocal): Typo.
+
+2005-05-24  Brian Gough  <address@hidden>  (tiny change)
+
+       * lib/am/texinfos.am (.dvi.ps): Add $(am__TEXINFO_TEX_DIR) to TEXINPUTS.
+
+2005-05-15  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix PR automake/461:
+       * automake.in (require_build_directory): Canonicalize directories
+       with different names, such as `foo/bar' and `./foo//bar'.
+       * tests/subobj9.test: Augment to test that.
+       Report from Tom Tromey.
+
+2005-05-14  Alexandre Duret-Lutz  <address@hidden>
+
+       * COPYING, ChangeLog, ChangeLog.00, ChangeLog.01, ChangeLog.02,
+       ChangeLog.03, ChangeLog.96, ChangeLog.98, HACKING, Makefile.am,
+       NEWS, README, TODO, aclocal.in, automake.in, bootstrap, configure,
+       configure.ac, doc/Makefile.am, doc/fdl.texi, lib/COPYING,
+       lib/Makefile.am, lib/acinstall, lib/compile, lib/config-ml.in,
+       lib/config.guess, lib/config.sub, lib/depcomp, lib/elisp-comp,
+       lib/gnupload, lib/mdate-sh, lib/missing, lib/py-compile,
+       lib/symlink-tree, lib/texinfo.tex, lib/ylwrap,
+       lib/Automake/ChannelDefs.pm, lib/Automake/Channels.pm,
+       lib/Automake/Condition.pm, lib/Automake/Config.in,
+       lib/Automake/Configure_ac.pm, lib/Automake/DisjConditions.pm,
+       lib/Automake/FileUtils.pm, lib/Automake/General.pm,
+       lib/Automake/Item.pm, lib/Automake/ItemDef.pm,
+       lib/Automake/Location.pm, lib/Automake/Makefile.am,
+       lib/Automake/Options.pm, lib/Automake/Rule.pm,
+       lib/Automake/RuleDef.pm, lib/Automake/Struct.pm,
+       lib/Automake/VarDef.pm, lib/Automake/Variable.pm,
+       lib/Automake/Version.pm, lib/Automake/Wrap.pm,
+       lib/Automake/XFile.pm, lib/Automake/tests/Condition.pl,
+       lib/Automake/tests/DisjConditions.pl,
+       lib/Automake/tests/Makefile.am, lib/Automake/tests/Version.pl,
+       lib/Automake/tests/Wrap.pl, lib/am/Makefile.am,
+       lib/am/ansi2knr.am, lib/am/check.am, lib/am/clean-hdr.am,
+       lib/am/clean.am, lib/am/compile.am, lib/am/configure.am,
+       lib/am/data.am, lib/am/dejagnu.am, lib/am/depend.am,
+       lib/am/depend2.am, lib/am/distdir.am, lib/am/footer.am,
+       lib/am/header-vars.am, lib/am/header.am, lib/am/inst-vars.am,
+       lib/am/install.am, lib/am/java.am, lib/am/lang-compile.am,
+       lib/am/lex.am, lib/am/library.am, lib/am/libs.am,
+       lib/am/libtool.am, lib/am/lisp.am, lib/am/ltlib.am,
+       lib/am/ltlibrary.am, lib/am/mans-vars.am, lib/am/mans.am,
+       lib/am/multilib.am, lib/am/program.am, lib/am/progs.am,
+       lib/am/python.am, lib/am/remake-hdr.am, lib/am/scripts.am,
+       lib/am/subdirs.am, lib/am/tags.am, lib/am/texi-vers.am,
+       lib/am/texibuild.am, lib/am/texinfos.am, lib/am/yacc.am,
+       m4/Makefile.am, tests/aclibobj.test, tests/acloca10.test,
+       tests/acloca11.test, tests/acloca12.test, tests/acloca13.test,
+       tests/acloca14.test, tests/acloca15.test, tests/acloca16.test,
+       tests/acloca17.test, tests/acloca18.test, tests/acloca19.test,
+       tests/aclocal.test, tests/aclocal3.test, tests/aclocal4.test,
+       tests/aclocal5.test, tests/aclocal6.test, tests/aclocal7.test,
+       tests/aclocal8.test, tests/aclocal9.test, tests/acoutbs.test,
+       tests/acoutbs2.test, tests/acoutnoq.test, tests/acoutpt.test,
+       tests/acoutpt2.test, tests/acoutqnl.test, tests/acsilent.test,
+       tests/acsubst.test, tests/acsubst2.test, tests/all.test,
+       tests/alloca.test, tests/alloca2.test, tests/alpha.test,
+       tests/alpha2.test, tests/amassign.test, tests/ammissing.test,
+       tests/ansi.test, tests/ansi10.test, tests/ansi2.test,
+       tests/ansi3.test, tests/ansi3b.test, tests/ansi4.test,
+       tests/ansi5.test, tests/ansi6.test, tests/ansi7.test,
+       tests/ansi8.test, tests/ansi9.test, tests/ar.test, tests/ar2.test,
+       tests/asm.test, tests/autohdr.test, tests/autohdr2.test,
+       tests/autohdr3.test, tests/autohdr4.test, tests/automake.test,
+       tests/auxdir.test, tests/auxdir2.test, tests/auxdir3.test,
+       tests/auxdir4.test, tests/backsl.test, tests/backsl2.test,
+       tests/backsl3.test, tests/backsl4.test, tests/badline.test,
+       tests/badopt.test, tests/badprog.test, tests/block.test,
+       tests/bsource.test, tests/canon.test, tests/canon2.test,
+       tests/canon3.test, tests/canon4.test, tests/canon5.test,
+       tests/ccnoco.test, tests/check.test, tests/check2.test,
+       tests/check3.test, tests/check4.test, tests/checkall.test,
+       tests/clean.test, tests/clean2.test, tests/colneq.test,
+       tests/colneq2.test, tests/colon.test, tests/colon2.test,
+       tests/colon3.test, tests/colon4.test, tests/colon5.test,
+       tests/colon6.test, tests/colon7.test, tests/comment.test,
+       tests/comment2.test, tests/comment3.test, tests/comment4.test,
+       tests/comment5.test, tests/comment6.test, tests/comment7.test,
+       tests/comment8.test, tests/comment9.test, tests/compile.test,
+       tests/compile_f90_c_cxx.test, tests/compile_f_c_cxx.test,
+       tests/cond.test, tests/cond10.test, tests/cond11.test,
+       tests/cond13.test, tests/cond14.test, tests/cond15.test,
+       tests/cond16.test, tests/cond17.test, tests/cond18.test,
+       tests/cond19.test, tests/cond2.test, tests/cond20.test,
+       tests/cond21.test, tests/cond22.test, tests/cond23.test,
+       tests/cond24.test, tests/cond25.test, tests/cond26.test,
+       tests/cond27.test, tests/cond28.test, tests/cond29.test,
+       tests/cond3.test, tests/cond30.test, tests/cond31.test,
+       tests/cond32.test, tests/cond33.test, tests/cond34.test,
+       tests/cond35.test, tests/cond36.test, tests/cond37.test,
+       tests/cond4.test, tests/cond5.test, tests/cond6.test,
+       tests/cond7.test, tests/cond8.test, tests/cond9.test,
+       tests/condd.test, tests/condhook.test, tests/condinc.test,
+       tests/condinc2.test, tests/condlib.test, tests/condman.test,
+       tests/condman2.test, tests/conf2.test, tests/confdeps.test,
+       tests/conff.test, tests/conff2.test, tests/confh.test,
+       tests/confh4.test, tests/confh5.test, tests/config.test,
+       tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
+       tests/conflnk3.test, tests/confsub.test, tests/confvar.test,
+       tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
+       tests/cxx.test, tests/cxx2.test, tests/cxxansi.test,
+       tests/cxxcpp.test, tests/cxxlibobj.test, tests/cxxlink.test,
+       tests/cxxnoc.test, tests/cxxo.test, tests/cygwin32.test,
+       tests/dash.test, tests/defs.in, tests/defun.test,
+       tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
+       tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
+       tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
+       tests/depcomp.test, tests/depcomp2.test, tests/depcomp3.test,
+       tests/depcomp4.test, tests/depcomp5.test, tests/depdist.test,
+       tests/depend.test, tests/depend2.test, tests/depend3.test,
+       tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
+       tests/dirlist.test, tests/discover.test, tests/distcom2.test,
+       tests/distcom3.test, tests/distcom4.test, tests/distcom5.test,
+       tests/distcom6.test, tests/distcom7.test, tests/distdir.test,
+       tests/distname.test, tests/dollar.test, tests/double.test,
+       tests/dup2.test, tests/else.test, tests/empty.test,
+       tests/empty2.test, tests/empty3.test, tests/empty4.test,
+       tests/exdir.test, tests/exdir2.test, tests/exeext.test,
+       tests/exeext2.test, tests/exeext3.test, tests/exeext4.test,
+       tests/exsource.test, tests/ext.test, tests/ext2.test,
+       tests/extra.test, tests/extra2.test, tests/extra3.test,
+       tests/extra4.test, tests/extra5.test, tests/extra6.test,
+       tests/extra7.test, tests/f90only.test, tests/flibs.test,
+       tests/fn99.test, tests/fnoc.test, tests/fo.test, tests/fonly.test,
+       tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
+       tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
+       tests/gcj5.test, tests/getopt.test, tests/gettext.test,
+       tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
+       tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
+       tests/gnuwarn2.test, tests/header.test, tests/help.test,
+       tests/hfs.test, tests/hosts.test, tests/implicit.test,
+       tests/include.test, tests/include2.test, tests/info.test,
+       tests/insh2.test, tests/install2.test, tests/installdir.test,
+       tests/instdat.test, tests/instdat2.test, tests/instexec.test,
+       tests/insthook.test, tests/instman.test, tests/instman2.test,
+       tests/instsh.test, tests/instsh2.test, tests/instspc.test,
+       tests/interp.test, tests/interp2.test, tests/java.test,
+       tests/java2.test, tests/java3.test, tests/javaprim.test,
+       tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
+       tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
+       tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
+       tests/libobj12.test, tests/libobj13.test, tests/libobj14.test,
+       tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
+       tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
+       tests/library.test, tests/library2.test, tests/library3.test,
+       tests/libtool.test, tests/libtool2.test, tests/libtool3.test,
+       tests/libtool4.test, tests/libtool5.test, tests/libtool6.test,
+       tests/libtool7.test, tests/libtool8.test, tests/libtool9.test,
+       tests/license.test, tests/link_c_cxx.test, tests/link_dist.test,
+       tests/link_f90_only.test, tests/link_f_only.test,
+       tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
+       tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
+       tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
+       tests/lisp8.test, tests/listval.test, tests/location.test,
+       tests/longlin2.test, tests/longline.test, tests/ltcond.test,
+       tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
+       tests/ltlibobjs.test, tests/ltlibsrc.test, tests/maintclean.test,
+       tests/make.test, tests/makej.test, tests/makevars.test,
+       tests/man.test, tests/man2.test, tests/mclean.test,
+       tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
+       tests/mdate4.test, tests/missing.test, tests/missing2.test,
+       tests/missing3.test, tests/mkinst2.test, tests/mkinstall.test,
+       tests/mmodely.test, tests/multlib.test, tests/nobase.test,
+       tests/nodef.test, tests/nodef2.test, tests/nodep.test,
+       tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
+       tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
+       tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
+       tests/nostdinc.test, tests/number.test, tests/obsolete.test,
+       tests/order.test, tests/outdir.test, tests/output.test,
+       tests/output10.test, tests/output11.test, tests/output12.test,
+       tests/output2.test, tests/output3.test, tests/output4.test,
+       tests/output5.test, tests/output6.test, tests/output7.test,
+       tests/output8.test, tests/output9.test, tests/overrid.test,
+       tests/parse.test, tests/percent.test, tests/percent2.test,
+       tests/phony.test, tests/pluseq.test, tests/pluseq10.test,
+       tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
+       tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
+       tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
+       tests/ppf77.test, tests/pr2.test, tests/pr204.test,
+       tests/pr211.test, tests/pr220.test, tests/pr224.test,
+       tests/pr229.test, tests/pr243.test, tests/pr266.test,
+       tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
+       tests/pr300-lib.test, tests/pr300-ltlib.test,
+       tests/pr300-prog.test, tests/pr307.test, tests/pr401.test,
+       tests/pr401b.test, tests/pr401c.test, tests/pr72.test,
+       tests/pr87.test, tests/pr9.test, tests/prefix.test,
+       tests/primary.test, tests/primary2.test, tests/primary3.test,
+       tests/proginst.test, tests/python.test, tests/python10.test,
+       tests/python11.test, tests/python12.test, tests/python2.test,
+       tests/python3.test, tests/python4.test, tests/python5.test,
+       tests/python6.test, tests/python7.test, tests/python8.test,
+       tests/python9.test, tests/recurs.test, tests/recurs2.test,
+       tests/regex.test, tests/remake.test, tests/remake2.test,
+       tests/remake3.test, tests/remake4.test, tests/remake5.test,
+       tests/req.test, tests/reqd.test, tests/reqd2.test,
+       tests/rulepat.test, tests/scripts.test, tests/seenc.test,
+       tests/sinclude.test, tests/space.test, tests/specflg.test,
+       tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
+       tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
+       tests/spell.test, tests/spell2.test, tests/spell3.test,
+       tests/spelling.test, tests/spy.test, tests/srcsub.test,
+       tests/srcsub2.test, tests/stamph2.test, tests/stdlib.test,
+       tests/stdlib2.test, tests/strip.test, tests/subcond.test,
+       tests/subcond2.test, tests/subcond3.test, tests/subdir.test,
+       tests/subdir2.test, tests/subdir3.test, tests/subdir4.test,
+       tests/subdir5.test, tests/subdir6.test, tests/subdir7.test,
+       tests/subdir8.test, tests/subdir9.test,
+       tests/subdirbuiltsources.test, tests/subobj.test,
+       tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
+       tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
+       tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
+       tests/subpkg.test, tests/subpkg2.test, tests/subst.test,
+       tests/subst2.test, tests/substre2.test, tests/substref.test,
+       tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
+       tests/suffix11.test, tests/suffix2.test, tests/suffix3.test,
+       tests/suffix4.test, tests/suffix5.test, tests/suffix6.test,
+       tests/suffix7.test, tests/suffix8.test, tests/suffix9.test,
+       tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
+       tests/syntax.test, tests/tags.test, tests/tagsub.test,
+       tests/tar.test, tests/tar2.test, tests/tar3.test,
+       tests/target-cflags.test, tests/targetclash.test,
+       tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
+       tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
+       tests/txinfo18.test, tests/txinfo19.test, tests/txinfo2.test,
+       tests/txinfo20.test, tests/txinfo21.test, tests/txinfo22.test,
+       tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test,
+       tests/txinfo26.test, tests/txinfo27.test, tests/txinfo28.test,
+       tests/txinfo29.test, tests/txinfo3.test, tests/txinfo4.test,
+       tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
+       tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
+       tests/vars.test, tests/vars3.test, tests/vartar.test,
+       tests/version.test, tests/version2.test, tests/version3.test,
+       tests/version4.test, tests/version6.test, tests/version7.test,
+       tests/version8.test, tests/vpath.test, tests/vtexi.test,
+       tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
+       tests/werror2.test, tests/whoami.test, tests/xsource.test,
+       tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
+       tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
+       tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
+       tests/yaccvpath.test: Update FSF postal mail address.
+
+       * tests/cxxnoc.test: Adjust grep pattern for CC, because CVS
+       Autoconf currently defines a CCC variable.
+
+       * tests/output11.test, tests/output12.test: Use rm -f.
+
+2005-04-25  Gary V. Vaughan  <address@hidden>
+           Alexandre Duret-Lutz  <address@hidden>
+
+       Support for remote LIBOBJS (and friends) with subdir-objects.
+       Fixes PR automake/401.
+
+       * automake.in (config_libobj_dir): New variable.
+       (scan_autoconf_traces): Set config_libobj_dir from AC_CONFIG_LIBOBJ_DIR.
+       (handle_LIBOBJS_or_ALLOCA, require_libsource_with_macro): New functions.
+       (handle_LIBOBJS, handle_ALLOCA): Use them.  Adjust location of
+       dependency files, possibly in a subdirectory.
+       * tests/pr401.test, tests/pr401b.test, tests/pr401c.test: New tests.
+       * tests/Makefile.am (TESTS): Add them.
+       * doc/automake.texi (Optional) <AC_CONFIG_LIBOBJ_DIR>: Document.
+       (LIBOBJS): Document changes in behaviour of
+       LIBOBJS, ALLOCA, LTLIBOBJS & LTALLOCA in the presence of
+       subdir-objects and an invocation of AC_CONFIG_LIBOBJ_DIR.
+
+2005-04-18  Jim Meyering  <address@hidden>
+
+       * doc/automake.texi (Dist): Correct English.
+
+2005-03-31  Stepan Kasal  <address@hidden>
+
+       * doc/automake.texi: When the phrase "for instance" introduces a
+       sentence, it should be delimited by a comma.
+
+       * doc/automake.texi: Fix a few typos.
+
+2005-03-30  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Uniform): Use xmldir instead of htmldir as
+       example, since the GCS now define htmldir.
+       (Auxiliary Programs): Mention config-ml.in and symlink-tree.
+       Give a URL for texinfo.tex.
+       (Public macros): Sort alphabetically, and move obsolete macros...
+       (Obsolete macros): ... here.
+       Prompted by Karl Berry.
+
+2005-03-29  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Multiple Outputs): Fix mistakes reported by
+       Jim Meyering.
+
+       * lib/am/lisp.am ($(am__ELCFILES)): Prevent races if the recover
+       rule is run with `make -j'.
+       * doc/automake.texi (Multiple Outputs): Adjust.
+       * tests/lisp6.test: Augment it.
+       * tests/lisp8.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp8.test.
+       Suggested by Bruno Haible.
+
+2005-03-27  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi: Use @:, @., @!, and @tie{} where appropriate.
+
+2005-03-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/lisp.am ($(am__ELCFILES)): Do not attempt to recover
+       a missing *.elc file if it cannot be created because emacs does
+       not exist.
+       * tests/lisp7.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp7.test.
+       Report from Greg Schafer.
+
+2005-03-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi: Replace wicked whiches by thats.
+
+2005-03-04  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (scan_configure_dep, scan_file): Include file names
+       are relative to the directory of configure.ac, not to the
+       directory of the file doing the include.  Remove code for this
+       latter case.
+       * tests/acloca13.test: Run distcheck and make sure all macros are
+       actually distributed.
+
+2005-03-03  Alexandre Duret-Lutz  <address@hidden>
+
+       For PR automake/450:
+       * aclocal.in (scan_file, scan_configure_dep): Skip missing sincluded
+       files.
+       * automake.in (scan_autoconf_traces): Likewise.
+       * tests/sinclude.test: Augment.
+       Report from Peter Breitenlohner.
+
+       For PR automake/450:
+       * aclocal.in (write_aclocal, trace_used_macros): Do not add/remove
+       acinclude.m4 and configure.ac to the include map in these two
+       places ...
+       (strip_redundant_includes): ... do it here.  This completes the
+       previous change from 2005-03-01, that did not update
+       write_aclocal.
+       * tests/acloca19.test: Augment.
+       Report from Peter Breitenlohner.
+
+2005-03-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/comment9.test: Typo.
+
+2005-03-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * automake.in (read_am_file): Preserve backslashes preceding ##-lines.
+       * tests/comment9.test: New file.
+       * tests/Makefile.am (TESTS): Add comment9.test.
+       Report from Julien Sopena.
+
+       For PR automake/450:
+       * aclocal.in (trace_used_macros): Do not explicitly trace files
+       included by configure.ac.
+       * tests/acloca19.test: New file.
+       * tests/Makefile.am (TESTS): Add acloca19.test.
+       Report from Peter Breitenlohner.
+
+2005-02-27  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/448:
+       * automake.in (handle_factored_dependencies): Flag install-hook as
+       an error.
+       * tests/insthook.test: Exercise this.
+
+       * m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
+       * doc/automake.texi (Hard-Coded Install Paths): Adjust.
+
+       * doc/automake.texi: Replace many uses of @samp by @code, and
+       vice versa.  Use @command, @option, and @env where appropriate.
+
+2005-02-26  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi: "filename" -> "file name", for consistency
+       with GNU Coding Standards.  See also Paul's change on 2004-08-20
+       in Autoconf.
+
+       * doc/automake.texi (A Library, Libtool Libraries): Show how to link
+       a program with a static or libtool library.
+       (Program and Library Variables): Make clearer that _LDADD and
+       _LIBADD may also list libraries.
+       Prompted by a mail from Bruce Korb.
+
+       * doc/automake.texi (Alternative): Show how to rewrite nobase_
+       variables using custom directory variables, and link to node
+       Uniform.  Suggested by Leonardo Boiko.
+
+       * doc/automake.texi (Flag Variables Ordering, User Variables):
+       Make clearer who the maintainer is, and that he can AC_SUBST AM_
+       variables in configure.ac.  Suggested by Norman Gray.
+       (Uniform, Public macros, Libtool Issues, Java Support,
+       Conditionals): Use `---' for em dash, and stick them to the
+       enclosing text.
+
+       * doc/automake.texi: Reword a few sentences to fix all underflow
+       and overflow warnings during `make dvi'.
+       (Auxiliary Programs) <configure.guess, config.sub>: Update URL.
+       (Public macros) <AM_WITH_DMALLOC>: Likewise.
+
+2005-02-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/INSTALL, lib/config-ml.in, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: New upstream versions.
+
+       * doc/automake.texi (Hard-Coded Install Paths): New node.
+       (Extending, Extending aclocal, Python): Link to it.
+       (Extending): Don't show how to install a file in /etc/ directly,
+       this is insane.
+
+       * automake.in (read_am_file): Define variables containing long
+       lines as VAR_PRETTY to work around tools with limited input width.
+       * tests/longlin2.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       Report from Albert Chin.
+
+2005-02-09  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix for PR automake/447:
+       * lib/depcomp (tru64) [libtool]: Also check for $dir.libs/$base.o.d.
+       Report from Mathias Doreille.  Add some old comments from
+       Nicolas Joly for reference.
+
+2005-02-08  Stepan Kasal  <address@hidden>
+
+       * lib/mdate-sh: Check the size of the word following the month to
+       catch Darwin.  This way the filename can contain spaces.
+
+       * doc/automake.texi (Requirements, Options): Typos.
+
+2005-02-08  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/missing (makeinfo): Compute the output file if neither -o
+       nor @setfilename is used.
+       Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.
+
+2005-02-07  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Requirements): Show one example of
+       AC_CONFIG_FILES with multiple outputs, and correct a few typos.
+
+       * aclocal.in ($serial_line_rx): Expect at least one space between
+       `serial' and the following number.
+       Report from Jim Meyering.
+
+       * lib/mdate-sh: Cope with Darwin's Day/Month/Year output.
+       Report from Peter O'Gorman.
+
+2005-02-06  Alexandre Duret-Lutz  <address@hidden>
+
+       * aclocal.in (usage, parse_arguments): New --dry-run and --diff
+       options.
+       (install_file, write_aclocal): Honor --dry-run and --diff.
+       * doc/automake.texi (aclocal options): Document --dry-run and --diff.
+       (Serials): Mention --diff.
+       * lib/Automake/FileUtils.pm (handle_exec_errors): Accept an
+       $expected_exit_code argument.
+       (xsystem): Take a list of arguments, not a string.
+       * tests/acloca18.test: Use --dry-run and --diff.
+       Suggested by Paul Eggert.
+
+       * doc/automake.texi (aclocal options, Macro search path,
+       Extending aclocal, Local Macros, Serials, Future of aclocal): Make
+       these subsection of ...
+       (Invoking aclocal): ... this.
+
+       * aclocal.in ($serial_line_rx): Allow trailing garbage after the
+       serial number.
+       (scan_file): Explicitly mark the "ill-formed serial" message
+       as a warning.
+       * doc/automake.texi (aclocal options, Local Macros): Link to...
+       (Serials): ... this new section.
+
+2005-02-02  Paul Eggert  <address@hidden>
+
+       * lib/compile: Likewise.
+
+2005-02-02  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/elisp-comp: Use `(exit N); exit N', not `(exit N); exit';
+       see 2004-12-17.
+       * lib/mdate-sh, lib/py-compile, lib/ylwrap: Exit with nonzero
+       status if a write failure occurs with --help or --version option,
+       as below.
+
+2005-02-02  Paul Eggert  <address@hidden>
+
+       * lib/depcomp: Exit with nonzero status if a write failure occurs
+       with --help or --version option.
+       * lib/elisp-comp: Likewise.
+       * lib/gnupload: Likewise.
+       * lib/install-sh: Likewise.
+       * lib/missing: Likewise.
+       * lib/mkinstalldirs: Likewise.
+
+2005-02-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (aclocal options): Typo.
+
+       * aclocal.in (list_compare): New functions.
+       (scan_file): Honor #serial lines.
+       * tests/acloca18.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * doc/automake.texi (aclocal options, Local Macros): Document
+       #serial.
+
+2005-01-30  Alexandre Duret-Lutz  <address@hidden>
+
+       Preliminary support for `aclocal --install'.
+       This still lacks #serial support.
+       * aclocal.in (reset_maps, install_file): New functions.
+       (write_aclocal): Copy files if --install.
+       (usage, parse_arguments): Recognize --install.
+       ("MAIN"): Start aclocal again if some file were installed.
+       * tests/acloca10.test: Augment to test --install.
+       * tests/aclocal.in, tests/defs.in: Add support for
+       ACLOCAL_TESTSUITE_FLAGS, used by acloca10.test.
+       * doc/automake.texi (aclocal options, Local Macros): Document
+       --install.
+       (Future of aclocal): Adjust.
+
+       * doc/automake.texi (Macro search path): Using --acdir is not
+       obvious, it's erroneous.
+
+       * doc/automake.texi (direntry): Let `info Automake' point to the
+       manual, and `info automake' to the `Invoking automake' node.  Like
+       in Autoconf.
+
+2005-01-27  Akim Demaille  <address@hidden>
+
+       * lib/Automake/Configure_ac.pm: s/filename/file_name/g.
+       From Paul Eggert.
+
+2005-01-24  Akim Demaille  <address@hidden>
+
+       * lib/Automake/FileUtils.pm: Rename filename as file_name to be
+       consistent with the terminology of the GNU coding standards.
+       From Paul Eggert.
+       (update_file): Accept a $force argument, so that --force always
+       updates the time stamps.
+
+2005-01-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (How the Linker is Chosen): Explain how the
+       linker is chosen without diagram, and update to match the code.
+       Suggestion from Adrian Bunk.
+
+2005-01-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/subdirs.am ($(RECURSIVE_TARGETS), $(RECURSIVE_CLEAN_TARGETS)):
+       Process all words of $MAKEFLAGS when checking for -k.
+       * tests/check4.test: New file.
+       * tests/Makefile.am (TESTS): Add check4.test.
+       Report from Eric Blake.
+
+2005-01-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Point users to
+       AM_INIT_AUTOMAKE if the version passed is incorrect.
+       * tests/version8.test: New file.
+       * tests/Makefile.am (TESTS): Add version8.test.
+
+2005-01-09  Alexandre Duret-Lutz  <address@hidden>
+
+       * m4/amversion.in, m4/as.m4, m4/auxdir.m4, m4/ccstdc.m4,
+       m4/cond.m4, m4/depend.m4, m4/depout.m4, m4/dmalloc.m4, m4/gcj.m4,
+       m4/header.m4, m4/init.m4, m4/install-sh.m4, m4/lead-dot.m4,
+       m4/lex.m4, m4/lispdir.m4, m4/maintainer.m4, m4/make.m4,
+       m4/minuso.m4, m4/missing.m4, m4/mkdirp.m4, m4/multi.m4,
+       m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4, m4/options.m4,
+       m4/protos.m4, m4/python.m4, m4/regex.m4, m4/runlog.m4,
+       m4/sanity.m4, m4/strip.m4, m4/tar.m4: Use the same all-permissive
+       license that is used in aclocal.m4.  Relicensing backed by RMS.
+
+       * doc/automake.texi (A Library, LIBOBJS): Mention that empty
+       libraries are not portable.
+
+2005-01-05  Akim Demaille  <address@hidden>
+
+       * aclocal.in ($ac_defun_rx): Match AU_ALIAS.
+       * tests/aclocal5.test (MORE_DEFS): Rename as...
+       (AM_TEST): this so that undefined macros are caught.
+       And make it an alias of AC_SUBST.
+       Test AU_ALIAS.
+       Reported by Martin Bravenboer.
+
+2005-01-03  Alexandre Duret-Lutz  <address@hidden>
+
+       Fix handling of per-target flags in link rules.
+       * automake.in (define_per_target_linker_variable): New function.
+       (handle_programs, handle_ltlibraries): Use it.
+       (%link_languages): New map.
+       (register_language): Fill it.
+       * lib/am/ltlibrary.am (%LTLIBRARY%): Do not append
+       $(%XLTLIBRARY%_LDFLAGS) to the command, this is now done by
+       define_per_target_linker_variable if needed.
+       * lib/am/program.am (%PROGRAM%%EXEEXT%): Likewise with
+       $(%XPROGRAM%_LDFLAGS).
+       * doc/automake.texi (Program and Library Variables): Mention
+       AM_LDFLAGS and AM_LIBTOOLFLAGS in the definition of maude_LDFLAGS
+       and maude_LIBTOOLFLAGS.
+       * tests/libtool9.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Explain the backward incompatibility.
+       Report from Akim Demaille.
+
+2005-01-01  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/automake.texi (Requirements) <AC_CONFIG_FILES>: Discuss
+       specifications with shell variables.
+       (Optional) <AC_CONFIG_HEADERS, AC_CONFIG_LINKS>: Point to
+       AC_CONFIG_FILES for this explanation.
+       * automake.in (substitute_ac_subst_variables_worker,
+       substitute_ac_subst_variables): Mew functions.
+       (rewrite_inputs_into_dependencies): Use substitute_ac_subst_variables
+       to ignore dependencies that contain unAC_SUBSTed shell variables.
+       (handle_configure): Likewise, do not output rules for
+       AC_CONFIG_HEADERS, AC_CONFIG_FILES, and AC_CONFIG_LINKS targets that
+       unAC_SUBSTed contain shell variables.
+       * tests/autohdr4.test: Use an AC_SUBST variable in a specification.
+       * tests/output11.test, tests/output12.test: New files.
+       * tests/Makefile.am (TESTS): Add output11.test and output12.test.
+
+       * aclocal.in (parse_arguments, write_aclocal): Bump copyright year.
+       * automake.in ($gen_copyright, version): Likewise.
+
+-----
+
+Copyright (C) 2005-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
+
+;; Variables:
+;; coding: utf-8
+;; End:
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
new file mode 100644
index 0000000..ce9d2b8
--- /dev/null
+++ b/old/ChangeLog.11
@@ -0,0 +1,13107 @@
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       tests: drop unnecessary requirement in 'subpkg.test'
+       * tests/subpkg.test ($required): Drop "bison", it is not required
+       anymore since commit `v1.11-502-g7e5ae80'.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       gitlog-to-changelog: new auxiliary script, synced from gnulib
+
+       We have plans to stop maintaining a version-controlled ChangeLog
+       file in the Automake repository, and instead begin to generate it
+       automatically from the git log messages.  To do so, we will use
+       the `gitlog-to-changelog' script from gnulib.
+
+       * lib/gitlog-to-changelog: New, synced from gnulib.
+       * Makefile.am (fetch): Fetch and sync it.
+       * lib/Makefile.am (EXTRA_DIST): Distribute it.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       regex: remove obsolete macro AM_WITH_REGEX
+       Today, practically nobody uses the GNU rx library, which, according
+       to its own website <http://www.gnu.org/software/rx/rx.html>, has
+       been "decommissioned".  Consequently, the automake-provided macro
+       AM_WITH_REGEX is not used nor required anymore.
+       * m4/regex.m4: Delete.
+       * m4/Makefile.am (dist_automake_ac_DATA): Do not list it anymore.
+       * doc/automake.texi (Obsolete Macros): Remove description, and in
+       fact any mention, of `AM_WITH_REGEX'.
+       * tests/regex.test: Delete.
+       * tests/help-regex.test: Likewise.
+       * tests/regex-obsolete.test: Likewise.
+       * tests/list-of-tests.mk: Do not list them anymore.
+       * NEWS: Update.
+       See also commits `v1.11-587-g5f335be' and `v1.11-433-g37b0aee',
+       where that macro had been deprecated.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       cosmetics: be more consistent in copyright notices in tests
+       * tests/cond39.test: Update the heading copyright notice, to be
+       consistent with the formulation used in the other files.
+       * tests/cond40.test: Likewise.
+       * tests/cond41.test: Likewise.
+       * tests/cond42.test: Likewise.
+       * tests/cond43.test: Likewise.
+       * tests/conflnk4.test: Likewise.
+       * tests/extra8.test: Likewise.
+       * tests/extra9.test: Likewise.
+       * tests/suffix13.test: Likewise.
+       * tests/vala.test: Likewise.
+       * tests/vala1.test: Likewise.
+       * tests/vala2.test: Likewise.
+       * tests/vala3.test: Likewise.
+       * tests/vala4.test: Likewise.
+       * tests/vala5.test: Likewise.
+       * lib/Automake/tests/Condition.pl: Likewise.
+       * lib/Automake/tests/Condition-t.pl: Likewise.
+       * lib/Automake/tests/DisjConditions.pl: Likewise.
+       * lib/Automake/tests/DisjConditions-t.pl: Likewise.
+       * lib/Automake/tests/Version.pl: Likewise.
+       * lib/Automake/tests/Wrap.pl: Likewise.
+       * lib/Automake/tests/Cond2.pl: Add copyright notice.
+       * lib/Automake/tests/Cond3.pl: Likewise.
+       * lib/Automake/tests/DisjCon2.pl: Likewise.
+       * lib/Automake/tests/DisjCon3.pl: Likewise.
+       * lib/Automake/tests/Version2.pl: Likewise.
+       * lib/Automake/tests/Version3.pl: Likewise.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       tap/awk: "Bail out!" recognized also after leading whitespace
+       Newer versions of TAP::Harness (e.g., 3.23 on Perl 5.14.1)
+       recognize a "Bail out!" directive also when it is prepended by
+       leading whitespace; this was not the case for older TAP:Harness
+       versions, (e.g., for version 3.17 on Perl 5.12.4), and for our
+       TAP driver implemented in awk.
+       * lib/tap-driver.sh: Handle the "Bail out!" directive also when
+       it is preceded by leading whitespace.
+       * tests/tap-spurious.test: Remove the tests checking that a
+       "Bail out!" string coming right after leading whitespace does
+       not trigger a bailout action.
+       * tests/tap-bailout-leading-space.test: New test.
+       * tests/list-of-tests.mk: Add it.
+       Problem reported by Jim Meyering in automake bug#10374.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure of cond29.test
+       * tests/cond29.test: Limit the amount of virtual memory available
+       to the automake process to ~ 150 MB, rather than only ~ 20 MB, to
+       account for higher (but still acceptable) memory usages on some
+       systems (in this case, a Fedora 16 distro on ppc64).  To be
+       sure not to reduce coverage, increase the number of potential
+       combinations of automake conditionals from 2**22 = 4194304 to
+       2**24 = 16777216.
+       We have actually verified that the new version of the test case
+       catches the Automake 1.7 it is intended to check against, using
+       the Automake 1.7.9 tarball downloaded from:
+         <http://ftp.gnu.org/gnu/automake/automake-1.7.9.tar.gz>
+       Reported by Jim Meyering in automake bug#10374.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       docs: "aclocal --install -I /abs/dir" actually copies files
+
+       This change is for automake bug#8407.
+
+       In the past, there had been some debate and confusion about
+       whether "aclocal --install" should copy third-party .m4 files
+       in the first directory passed to the `-I' option even when
+       such directory was given as an absolute path, or whether it
+       was better to do so only for directories specified with a
+       relative path.
+
+       The rationale for this latter behaviour was that, before the
+       existence of the `ACLOCAL_PATH' variable, the only way (a poor
+       way, I might add) for a common user to extend the search path
+       of a system-wide installation of aclocal was to export something
+       like ACLOCAL="aclocal -I /my/extra/macros" in the environment.
+       Today, the correct way to proceed is undoubtedly through the
+       use of ACLOCAL_PATH, so we can settle the question once and for
+       all, and start verifying the correct behaviour of `-I' with a
+       new test.
+
+       * tests/aclocal-install-absdir.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * doc/automake.texi (aclocal Options): Be more explicit about
+       this part of `--install' semantics.
+
+2011-12-26  Stefano Lattarini  <address@hidden>
+
+       docs: fix node names for automake and aclocal invocations
+
+       With the older node names, an "info automake" command issued
+       from the command line would have opened the node about the
+       invocation of the automake program, rather than the Top node
+       of the automake documentation.  To invoke the Top node, one
+       had to issue the command "info Automake" instead (note the
+       different capitalization).  This was suboptimal, and certainly
+       confusing.
+
+       With this change, "info automake" will open the Top node of the
+       automake documentation; to access the nodes about the invocation
+       of the automake and aclocal program, one has now to issue "info
+       automake-invocation" and "info aclocal-invocation" respectively.
+
+       This change fixes automake bug#8071.
+
+       See also commits `v2.61a-22-ge9215d1' and `v2.61a-72-g8c07b48' in
+       the autoconf git repository, which tackled a similar issue.
+
+       * doc/automake.texi (@direntry): Rename nodes `aclocal' and
+       `automake' to `aclocal-invocation' and `automake-invocation'
+       respectively.
+       * NEWS: Update.
+
+2011-12-26  Stefano Lattarini  <address@hidden>
+
+       tests: tweak tests on silent-rules for makes without nested vars
+       * tests/silent-nested-vars.test: Define $MAKE to `./mymake' in
+       the environment, so that it will be automatically picked up by
+       configure.  Related tweaks and simplifications.
+       Remove the checks verifying that silent rules are respected also
+       when the 'subdir-objects' option is set, the checks testing the
+       old syntax for user-defined silent rules, and the tests using
+       the default $MAKE programs: they are redundant w.r.t. other test
+       cases.  Related simplifications.
+       Remove the temporary files used in a sanity check as soon as they
+       are not needed anymore.
+       Do not capture also the standard error of configure: we only want
+       to grep its standard output.
+       Consistently use `stdout' for the name of files where to save the
+       standard output captured from make and configure, for consistency
+       with other tests.
+       Make grepping of configure output and of the generated Makefile
+       stricter.
+       Improve and tweak the `mymake' script a little.
+       * tests/silent6.test: Make grepping of make stdout slightly
+       stricter.  After having configured with silent rules disabled,
+       try to force the use silent rules with `make V=1'.
+
+2011-12-25  Paul Eggert  <address@hidden>
+
+       silent-rules: fallback for makes without nested vars
+
+       This fixes two problems reported for Automake (Bug#9928, Bug#10237)
+       and is in response to a bug report for building coreutils on HP
+       NonStop OS (Bug#10234).  The problem is that HP NonStop 'make'
+       treats a line like "AM_V_CC = $(am__v_CC_$(V))" as one that
+       expands a macro with the funny name am__v_CC_$(V instead of the
+       desired name am__v_CC_1 or am__v_CC_0, and since the funny macro
+       is not defined the line is equivalent to "AM_V_CC = )"; this
+       inserts a stray ")" when $(AM_V_CC) is used, which eventually
+       causes 'make' to fail.
+
+       The basic idea is that instead of generating Makefile.in lines like
+       "AM_V_CC = $(am__v_CC_$(V))", we generate
+       "AM_V_CC = $(address@hidden@)".  We then AC_SUBST $(V) for @AM_V@
+       in the usual case where `make' supports nested variables,
+       and substitute 1 (or 0) otherwise.  Similarly for usages like
+       $(am__v_CC_$(AM_DEFAULT_VERBOSITY)).
+
+       With this change, make implementations that doesn't grasp nested
+       variable expansions will still be able to run Makefiles generated
+       using the silent-rules option.  They won't allow the user to
+       override the make verbosity at runtime through redefinition of
+       $(V) (as in "make V=0"); but this is still an improvement over not
+       being able to work at all.
+
+       * NEWS: Document this.
+       * automake.in (define_verbose_var): When defining the variables,
+       use @AM_V@ rather than $(V), and use @AM_DEFAULT_V@ rather than
+       $(AM_DEFAULT_VERBOSITY).
+       * doc/automake.texi (Automake silent-rules Option): Explain new system.
+       * m4/silent.m4 (AM_SILENT_RULES): Check whether `make' supports
+       nested variables, and substitute AM_V and AM_DEFAULT_V accordingly.
+       * tests/silent-nested-vars.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       gitignore: use only one .gitignore file, in the top-level directory
+       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
+       lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their
+       contents merged into ...
+       * .gitignore: ... this top-level file.  Since we are at it, improve
+       it by anchoring files where it makes sense.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       tests: one more fixlet for gettext macros requirement
+       * tests/gettext-macros.test (configure.in): Add calls to
+       AC_INIT and AC_PROG_CC, to avoid a spurious failure in the
+       later aclocal invocation.
+       Luckily, this wart wasn't causing any spurious SKIP or FAIL,
+       but only the redundant addition to the `-Wno-syntax' option
+       to some aclocal invocations in the gettext tests.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix handling of gettext macros requirement
+
+       The code introduced in the earlier change `v1.11-581-gb7d67d5'
+       and aimed at automatically fetching all the .m4 files provided by
+       gettext has proven inadequate, since it hasn't managed to truly
+       and always get *all* the required .m4 files.  For example, it has
+       failed to fetch the file `intldir.m4' (present in gettext 0.18.1,
+       and where the macro `AM_GNU_GETTEXT_INTL_SUBDIR' is defined),
+       which in turn has caused spurious SKIPs of at least the test
+       `gettext3.test'.
+
+       The reason for this debacle is that autopoint looks at the version
+       specified in AM_GNU_GETTEXT_VERSION to decide which version of the
+       gettext infrastructure to bring in; since we were unconditionally
+       specifying the older 0.10.35 version, the newer `.m4' files weren't
+       brought in.
+
+       * tests/gettext-macros.test: In AM_GNU_GETTEXT_VERSION, instead
+       of unconditionally specifying the older 0.10.35 version, specify
+       the version of the available `gettextize' or `autopoint' program,
+       dynamically extracted with the help of ...
+       (extract_program_version):... this new function, and saved ...
+       ($autopoint_version): ... in this new variable.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: automatically handle deps also for generated tests
+       * tests/gen-testsuite-part: The test scripts are now scanned for
+       automatic dependency generation *after* the auto-generated tests
+       have been created, so they too will be scanned.  It is a little
+       tricky to ensure that the freshly-generated tests are correctly
+       scanned, and we do that with the help of ...
+       (@generated_tests): ... this new variable.
+       Other related minor changes and refactorings.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: auto-generate deps for tests requiring libtool/gettext
+       * tests/gen-testsuite-part: Tests requiring libtool (or related
+       programs) will need libtool-provided m4 macros, so they should
+       be run after `libtool-macros.test'.  Similarly for gettext tests.
+       So, generate proper declarations of such dependencies.
+       * tests/Makefile.am: Remove now-unneeded hand-written declaration
+       of those dependencies.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: remove FIXME comments from tricks to pacify syntax checks
+       Originally, I myself had insisted on adding those "FIXME" comments
+       near every unusual construct or use of "creative quoting" whose
+       only purpose was to avoid false positive from out syntax checks.
+       I did that with the expectation that we could have easily and soon
+       added a whitelisting capability to our maintainer-specific syntax
+       checks.  This hasn't been the case unfortunately, and now those
+       "FIXME" in the comments are just distracting noise, making it more
+       difficult to grep the test cases for stuff that could really use a
+       fix or an improvement.  So just get rid of them.
+       * tests/instdir-ltlib.test: Remove that extra "FIXME".
+       * tests/instdir-prog.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests-dry-run.test: Likewise.
+       * tests/parallel-tests-console-output.test: Likewise.
+       * tests/parallel-tests-no-color-in-log.test: Likewise.
+       * tests/tap-realtime.test: Likewise.
+       * tests/test-trs-recover.test: Likewise.
+       * tests/tap-deps.test: Likewise.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: few minor fixlets, improvements and tweakings
+       * tests/defs-static.in ($top_testbuilddir): New, for consistency
+       and completeness.
+       * tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
+       as well.
+       * tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
+       over TESTS_ENVIRONMENT, now that the former has become available.
+       * tests/java-compile-run-flat.test: Correct a botched "FIXME"
+       comment.
+       * tests/tap-realtime.test: Remove extra whitespace in comments.
+       * tests/missing-tar.test: Use `get_shell_script' to bring in the
+       `missing' script, to increase coverage.  Remove redundant call to
+       `set -e'.  Fix a typo in comments.
+       * tests/get-sysconf.test: Remove redundant definitions of
+       `$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant uses of `set -e'
+       * tests/deleted-am.test: Do not set the `errexit' shell flag, as
+       it is already set by `tests/defs'.
+       * tests/deleted-m4.test: Likewise.
+       * tests/dist-missing-am.test: Likewise.
+       * tests/dist-missing-am.test: Likewise.
+       * tests/dist-missing-m4.test: Likewise.
+       * tests/dist-missing-included-m4.test: Likewise.
+       * tests/get-sysconf.test: Likewise.
+       * tests/makefile-deps.test: Likewise.
+       * tests/remake-m4-pr10111.test: Likewise.
+       * tests/remake-am-pr10111.test: Likewise.
+       * tests/remake-deleted-am.test: Likewise.
+       * tests/remake-deleted-am2.test: Likewise.
+       * tests/remake-deleted-am-subdir.test: Likewise.
+       * tests/remake-renamed-am.test: Likewise.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix failure due to debugging code forgotten into a test
+       * tests/missing-tar.test: Don't ever call the `missing' script
+       with `sh -x'; this was used for debugging, but an instance of
+       it slipped into the committed test case.  Bug revealed by a
+       failure on a Solaris 10 system with GNU tar installed as `gtar'.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'master' into testsuite-work
+       * tests/gettext-macros.test: In the generated `get.sh' file,
+       use `skip_all_', not `skip_'.
+       * tests/libtool-macros.test: Likewise.
+       * tests/list-of-tests.mk: Update.
+
+2011-12-23  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of libtool and gettext tests
+
+       On Solaris 10 (and presumably earlier), /bin/sh trips up on
+       here-documents that contains a command substitution *and* are
+       fed to a shell function:
+
+         # All as expected.
+         $ cat <<END
+         `pwd`
+         END
+         /home/stefano
+         $ echo status = $?
+         status = 0
+
+         # An apparently innocuous function ...
+         $ kitty () { cat; }
+         # ... but hilarity ensues!
+         $ kitty <<END
+         `pwd`
+         END
+         /tmp/sh137723: cannot open
+         $ echo status = $?
+         status = 1
+
+       We need to work around this misbehaviour in a couple of our
+       tests (whose failures where causing cascading failures in a
+       lot of other tests).
+
+       * tests/gettext-macros.test: Avoid the use of command substitution
+       in a here-document passed to the `indent' function, by using the
+       `echo' builtin instead.
+       * tests/libtool-macros.test: Likewise.
+
+       See also:
+       <http://lists.gnu.org/archive/html/bug-autoconf/2011-12/msg00001.html>
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'maint' into master.
+       * m4/regex.m4: Bump serial number by some notches, for good
+       measure.  Prefer the deprecation message from maint over that
+       from master.
+       * m4/python.m4: Bump serial number.
+       * tests/Makefile.am (canon6.log): Depend on `libtool-macros.log'.
+       (canon7.log): Likewise.
+       (extradep2.log): Likewise.
+       (ar-lib4.log): Likewise.
+       (ar-lib6a.log): Likewise.
+       (ar-lib6b.log): Likewise.
+       (vartypo2): Likewise.
+       (posixsubst-ltlibraries.log): Likewise.
+       * tests/defs: Adjust the path of the included `get.sh' scripts
+       generated by `libtool-macros.test' and `gettext-macros.test'.
+       * aclocal.m4: Delete, it's auto-generated now.
+       * configure: Likewise.
+       * Makefile.in: Likewise.
+       * doc/Makefile.in: Likewise.
+       * m4/Makefile.in: Likewise.
+       * tests/Makefile.in: Likewise.
+       * lib/Makefile.in: Likewise.
+       * lib/am/Makefile.in: Likewise.
+       * lib/Automake/Makefile.in: Likewise.
+       * lib/Automake/tests/Makefile.in: Likewise.
+       * .gitignore: Correctly ignored the autogenerated files
+       that are not committed anymore.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       hacking: distribute it, and mention it in the ChangeLog
+       Not distributing the HACKING file might make it more difficult,
+       for some random curious user, to get informed about or interested
+       in the Automake development process, or to send us patches.
+       * Makefile.am (EXTRA_DIST): Add HACKING.
+       * HACKING: It's OK to distribute this file, and to mention it in
+       the ChangeLog.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       regex: deprecate the obsolete macro AM_WITH_REGEX
+       This is a backport of commit v1.11-433-g37b0aee.
+       Today, practically nobody uses the GNU rx library, which, according
+       to its own website <http://www.gnu.org/software/rx/rx.html>, has
+       been "decommissioned".  Consequently, the automake-provided macro
+       AM_WITH_REGEX is not used nor required anymore.  Deprecate it, so
+       that it will be possible to safely remove it in the next major
+       automake version.
+       * m4/regex.m4 (AM_WITH_REGEX): Give a warning of the class
+       `obsolete' when this macro is used.
+       * doc/automake.texi (Public Macros): Move description of
+       `AM_WITH_REGEX' from here ...
+       (Obsolete Macros): ... to here, and declare it as obsolete
+       and "to be removed in a future version".
+       * tests/regex-obsolete.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+       See also:
+       
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00131.html>
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       maint: distribute .xz tarballs, not .bz2 ones
+       Many GNU packages are moving towards xz-compressed tarballs, so
+       let's follow suit, by dropping the creation and distribution of
+       a bzip2-compressed tarball and switching to xz instead.
+       For compatibility and safeness, we will continue to create and
+       distribute a gzip-compressed tarball as well.
+       * configure.ac (AM_INIT_AUTOMAKE): Drop `dist-bzip2', add
+       `dist-xz'.
+       * NEWS: Update
+       Suggested by Jim Meyering.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       include: avoid "deleted .am file" problem
+       * automake.in (handle_configure): When processing `configure.am',
+       also expand `HAVE-MAKEFILE-IN-DEPS' to a boolean telling whether
+       `MAKEFILE-IN-DEPS' is empty or not.
+       * lib/am/configure.am [?HAVE-MAKEFILE-IN-DEPS?]
+       (%MAKEFILE-IN-DEPS%): New target without dependencies, to
+       avoid the "deleted .am file" problem.  Emit this only when
+       `?HAVE-MAKEFILE-IN-DEPS?' is true, to avoid generating an
+       "empty" dependency declaration.
+       * tests/deleted-am.test: Make grepping of error message stricter.
+       * tests/dist-missing-am.test: Likewise.
+       * tests/remake-deleted-am.test: New test.
+       * tests/remake-deleted-am-2.test: Likewise.
+       * tests/remake-deleted-am-subdir.test: Likewise.
+       * tests/remake-renamed-am.test: Likewise.
+       * tests/makefile-deps.test: Likewise.
+       * tests/Makefile.am (TESTS): Add the new tests.
+       * NEWS: Update.
+       Fixes automake bug#9768.
+       Report by Peter Johansson.
+       See also commit `Release-1-10-40-gd0ebf71', which fixed a similar
+       problem for .m4 files included by configure.ac.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       maint: better use of autoconf 2.68 features
+       * configure.ac: Now that Automake requires autoconf 2.68 for its
+       own bootstrapping and build system, we can assume that PACKAGE_URL
+       gets automatically AC_SUBT'd.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       cosmetics: use proper m4 quoting in configure.ac
+       * configure.ac (AC_CONFIG_SRCDIR): Use proper m4 quoting
+       for its arguments.
+       (AC_CONFIG_AUX_DIR): Likewise.
+       (AC_PROG_PATH): Likewise.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       tests: better handling of gettext and libtool requirements
+
+       This change fixes automake bug#9807.
+
+       Before this change, the automake testsuite only looked for the
+       `.m4' files containing libtool and gettext macros definitions in
+       the directory `${prefix}/share/aclocal' (and in the directories
+       specified by the `dirlist' file in there, if any), where ${prefix}
+       was the configure-time automake installation prefix (defaulting
+       to `/usr/local').
+
+       This approach had various shortcomings and disadvantages.  Let's
+       briefly describe the three major ones.
+
+       First, on most GNU/Linux systems, a libtool or gettext installed
+       from distro-provided packages (e.g., by dpkg on Debian/Ubuntu, or
+       by rmp on RedHat/Fedora) would have `/usr', not `/usr/local', as
+       its ${prefix}; so, trying to run the automake testsuite with a
+       simple "./configure && make && make check" would have failed to
+       execute the libtool and gettext tests on most GNU/Linux distros.
+       It's true that it was quite easy to work around this issue, by
+       creating a proper `/usr/local/share/aclocal/dirlist' file with
+       an entry pointing to `/usr/share/aclocal' (a workaround in fact
+       used by most automake developers); but the typical user wasn't
+       aware of the necessity of this trick, so the libtool and gettext
+       tests was usually skipped on testsuite runs "in the wild", thus
+       needlessly reducing coverage.
+
+       Second, the older testsuite behaviour made more difficult for
+       the developers to run the testsuite with non-default libtool or
+       gettext.  For example, assume the developer is working on a system
+       that has a default libtool version 1.5 installed in the /usr/local
+       hierarchy; to improve coverage, the developer installs also a more
+       modern libtool version, say 2.4, in its home directory, let's say
+       in ~/libtool-2.4; he then tries to run the automake testsuite with
+       this more modern libtool by doing an (apparently) simple:
+         $ PATH=$HOME/libtool-2.4:$PATH make check
+       But the automake testsuite would still look for libtool macros in
+       /usr/local/share/aclocal, not in ~/libtool-2.4/share/aclocal, so
+       the wrong version of the macros would be picked up, and the tests
+       would either fail spuriously or (which would be worse) pass without
+       truly covering the libtool version the developers was thinking to
+       be testing with.
+       Worse again, the automake testsuite would *unconditionally* look
+       for libtool macros in /usr/local/share/aclocal, so even something
+       like:
+         $ export ACLOCAL_PATH=$HOME/libtool-2.4/share/aclocal
+         $ PATH=$HOME/libtool-2.4:$PATH make check
+       wouldn't work.
+
+       Third and last, during a "make distcheck", automake is configured
+       with a ${prefix} pointing to a proper subdirectory of the build
+       directory (usually `pwd`/_inst), which gets created on-the-fly;
+       in this case, with the old approach, the automake testsuite never
+       found the libtool and gettext macro files, ans so the libtool and
+       gettext tests was *always* skipped in a "make distcheck".
+
+       * tests/libtool-macros.test: New helper test, looking (with the
+       help of the `libtoolize' script) for libtool macro files required
+       by most libtool tests, and making them easily accessible.
+       * tests/gettext-macros.test: New helper test, looking (with the
+       help of the `libtoolize' script) for libtool macro files required
+       by most libtool tests, and making them easily accessible.
+       * tests/defs.in: Update to make it rely on the results and setups
+       of `libtool-macros.test' and `gettext-macros.test'.
+       * tests/Makefile.am: Declare dependency of all the logs of libtool
+       tests from `libtool-macros.log', and all the logs of gettext tests
+       from `gettext-macros.log'.
+       (TESTS): Add the new tests.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       fix: typos and grammaros in comments of the new test
+       * tests/get-sysconf.test: Fix few typos, grammaros and botched
+       wording.  Reported by Eric Blake.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       tests: report useful system information in 'test-suite.log'
+       It has already happened various times that a user has run the
+       automake testsuite, experienced a failure, read the messages
+       telling him "See tests/test-suite.log" and "Please report to
+       address@hidden", and done exactly that -- sending us only
+       the contents of `tests/test-suite.log', which are usually not
+       enough to start debugging the reported failure.  So we have to
+       ask him for more details, and usually also for the `config.log'
+       file generated by configure.  It's time to fix this recurring
+       feedback inefficiency.  We do so by creating a dummy test case
+       that takes care of copying the contents of `config.log', plus
+       other useful system information, in the final `test-suite.log'.
+       * tests/get-sysconf.test: New test, gathering system information
+       and then always terminating with a SKIP, so that its output gets
+       copied in `test-suite.log'.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-12-07  Reuben Thomas  <address@hidden>  (tiny change)
+
+       python: remove relics for Python 1.5 support
+       * m4/python.m4: The comments in here claim to support only
+       Python >= 2.0, yet this file still has specific support for
+       Python 1.5.  Just remove it, python 1.5 is 12 years old now,
+       and practically defunct.
+       * NEWS: Update.
+       See also commit `Release-1-10-205-gd5bec12', "Support for
+       Python 3.0, drop support for pre-2.0."
+
+2011-12-21  Stefano Lattarini  <address@hidden>
+
+       configure: remove extraneous 'eval's from AM_RUN_LOG invocations
+       * configure.ac: Remove extra 'eval's from AM_RUN_LOG invocations;
+       for example, instead of "AM_RUN_LOG([eval $PERL --version])",
+       simply use "AM_RUN_LOG([$PERL --version])"
+
+2011-12-21  Stefano Lattarini  <address@hidden>
+
+       configure: report TeX version in config.log
+       * configure.ac: If possible, report the version of the selected
+       TeX program; this should render the logs more informative.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       maint: snapshots from `maint' are still development snapshots
+       The maintenance-oriented development line in the `maint' branch,
+       while being usually pretty stable and 99% backward-compatible,
+       is not always right off production-quality; but until now, the
+       Automake package version declared in configure.ac hid this fact,
+       since it appeared to be the version of a stable release (e.g.,
+       11.1).  Fix this.
+       * configure.ac (AC_INIT): Bump version to "1.11.0a".
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       configure: print proper message for test releases
+       * configure.ac: If the current release is detected to be a test
+       release or a development snapshot, print a proper warning for
+       the user.
+       * README-alpha: Delete, it's obsolete now (and in fact this file
+       hasn't been touched in eleven years, since release 1.4b or so).
+       * HACKING (Release procedure): Don't say to update README-alpha.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       devel: help in comparing Makefile.in from different commits
+       Now that the generated Makefile.in, configure and aclocal.m4 files
+       are no longer committed in Automake's git repository, a simple
+       "git diff" or "git log" no longer shows if and how a change in
+       Automake results in changes to the Makefile.in files and/or
+       configure script of its own build system.  Still, the ability to
+       peek so easily at such differences has proved itself quite useful
+       in the past, often revealing inconsistencies and blunders, and
+       sometimes even bugs; so it would be a pity to lose that altogether.
+       With this change, we add a new maintainer recipe that re-introduces
+       much of that capability, by generating and comparing on the fly the
+       Makefile.in, configure and aclocal.m4 derived from two arbitrary
+       commits of the Automake repository.
+       * Makefile.am (autodiffs, compare-autodiffs): New phony targets.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       repo: don't commit generated files in the git repository anymore
+       It has been quite some time since autoconf and libtool have stopped
+       committing the generated autotools files in their git repositories,
+       with no significant ill effects we're aware of.  It's true that the
+       autoconf bootstrap process has now the minor annoyance that a
+       pre-installed autoconf is required to complete it; but luckily
+       automake will not have a similar annoyance, since our bootstrap
+       script take care, through some hoops, to use the very automake and
+       aclocal versions from the current git checkout to generate the
+       required aclocal.m4 and Makefile.in files.  In fact, this has been
+       a necessity also in the past, because automake has been known to
+       use in its own build system new development features that hadn't
+       been present in any previously released automake distribution.
+       * .gitignore: Ignore configure, aclocal.m4, and all the
+       Makefile.in files.
+       * configure.ac (AC_PREREQ): New macro call, to require the
+       latest autoconf (2.68 for the moment).
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       missing: don't try to re-run tar with a munged command line
+       * lib/missing: If the default `tar' program fails with the given
+       arguments, and GNU tar is not available, don't try to re-run the
+       default `tar' with a munged command line (e.g., ditching possibly
+       unportable options), as that could be subtly alter the intended
+       semantics (and maybe even create a somewhat corrupted tarball).
+       Also, it's worth noting that the main purpose of the `missing'
+       script is to allow a non-developer to build the package in the
+       face of slightly-skewed timestamps, not to provide wrappers for
+       all the maintainer tools -- so we don't have to try too hard
+       when `missing' is just called to wrap `tar'.
+       * tests/missing-tar.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       missing: inform the user if GNU tar is called
+       * lib/missing: If the code trying to run GNU tar is reached, it
+       means that the previous attempt to run the default tar program
+       has failed, very likely producing some error message.  At this
+       point, just running GNU tar without further comments might be
+       confusing.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       missing: if GNU tar exists but fails when called, give up
+       * lib/missing: If the code trying to run GNU tar is reached,
+       don't continue if the invoked GNU tar program fails, as there
+       is little point in doing so (and can even be confusing and
+       counter-productive).
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       missing: miscellaneous fixlets
+       * lib/missing: Some shells, such as Solaris or FreeBSD /bin/sh,
+       warn about missing programs before performing redirections.
+       Therefore, where we have to silently check whether a program
+       exists, perform redirections on a subshell.
+       Remove redundant uses of double-quotes in variable definitions.
+       Delete an extra blank line.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       maint: remove executable bit from automake.in
+       * automake.in: This file is not meant to be executed, only to
+       be preprocessed to create the `automake' script; so don't leave
+       it executable.
+
+2011-12-20  Peter Rosin  <address@hidden>
+
+       tests: fix spurious failure on systems lacking unistd.h
+       This is for automake bug#10324.
+       * tests/silent-lex-generic.test (foo.l): Add a dummy #define of
+       YY_NO_UNISTD_H, so that the generated foo.c file won't require
+       unistd.h to be present (it is not present when compiling with,
+       e.g., MSVC 9).
+
+2011-12-20  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure on MSYS/MinGW and Cygwin
+       * tests/primary-prefix-couples-force-valid.test (Makefile.am):
+       Correctly append $(EXEEXT) to the path of built binaries.
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       test defs: hack to support autoconf-wrapper programs
+       * tests/defs-static.in ($AUTOCONF): Add a dummy `-B' option to the
+       autoconf invocation, so that, when the Debian autoconf wrapper is
+       involved, it will correctly dispatch an autoconf >= 2.50 instead of
+       defaulting to autoconf 2.13.
+       ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
+       autoreconf respectively.
+       Reported by Bruno Haible:
+       <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: fix a minor spurious failure with FreeBSD make
+       * tests/remake-am-pr10111.test: Avoid using `#' comments in
+       makefile recipes, as these have been confusing FreeBSD make.
+       The failure was masked by the fact that this test is currently
+       expected to fail.
+       Suggested by a report from Bruno Haible.
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: make two test scripts executable
+       * tests/remake-am-pr10111.test: Make executable.
+       * tests/remake-m4-pr10111.test: Likewise.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       yacc/lex tests: remove an unneeded workaround for bug#8485
+
+       * tests/yacc-d-cxx.test: Remove the workaround previously required
+       to avoid spurious failures due to automake bug#8485: that bug has
+       been solved with commit `v1.11-512-g40c3432'.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       yacc/lex tests: avoid too much failures with FreeBSD make
+
+       In various Yacc/Lex tests, we used to run "make distcheck" commands
+       whose value was mostly dubious, and, even when it was there, was
+       very, very little.  The presence of these extra distchecks had two
+       disadvantages: it slowed down our already-too-slow testsuite even
+       more, and, much worse, caused a lot of extra failures with FreeBSD,
+       all due to automake bug#7884, which is already exposed by the test
+       case `yacc-dist-nobuild.test'.
+
+       We can improve this situation by simply removing "make distcheck"
+       calls from a few testcases, or making them conditional to the use
+       of GNU make.
+
+       * tests/lex-clean-cxx.test: Do not call "make distcheck".
+       * tests/lex-clean.test: Likewise.
+       * tests/yacc-clean-cxx.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yflags-force-override.test: Likewise.
+       * tests/yacc-nodist.test: Only run "make distcheck" if make
+       is GNU make.
+
+2011-12-15  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'maint' into 'yacc-work'
+       * tests/silent-lex.test: Provide a dummy `yywrap()' function, to
+       avoid link errors on systems that doesn't provide a "lex library".
+       See also commit `v1.11-546-gca0ba5d'.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: reference webpages for automake mailing lists
+       * README: Rationalize and reorganize the (brief) description of
+       the automake mailing lists.   In particular, instead of suggesting
+       the reader to write to the `-request' addresses to subscribe to
+       mailing lists, point him to the relevant webpages, where he can
+       also subscribe via a web form.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: update advice about testsuite execution
+       * README: Now that the automake testsuite uses the parallel-tests
+       driver, there is no need for the user to capture the stdout of
+       "make check" to determine which tests have failed: a detailed log
+       is automatically saved into the `tests/test-suite.log' file.
+       Since we are at it, improve the wording by dropping an extra
+       "please".
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: don't reference the old homepage at sources.redhat.com
+       * README: Don't reference the old homepage at sources.redhat.com,
+       which is no longer active; reference the homepage on www.gnu.org
+       instead.  See also automake bug#10157 and bug#10248.
+       * tests/README: Likewise, and remove related extra-pedantic advice
+       about copyright papers for test cases (we'll ask for those papers
+       explicitly when we think they are warranted).
+
+2011-12-12  Stefano Lattarini  <address@hidden>
+
+       hacking: some more fixlets
+       * HACKING (Release Procedure): Place the list of pre-release
+       bootstrap-and-test commands on a line of its own, so it's easy to
+       select and then paste it into a terminal window.
+       Fix the explanation of "make git-release", as, since the previous
+       change, "make git-release" would simply run "make dist" rather
+       than "make distcheck".
+       Suggestion from Jim Meyering.
+
+2011-12-12  Peter Rosin  <address@hidden>
+
+       * NEWS: Fix typo in 'make dist-bzip2' description.
+
+2011-12-10  Stefano Lattarini  <address@hidden>
+
+       release: don't run "make distcheck" automatically
+       * Makefile.am (git-dist): The developers should test extensively
+       before finally creating the release tarball; so don't run "make
+       distcheck" on their behalf here; instead ...
+       * HACKING (Release procedure): ... state here that "make check"
+       and "make distcheck" should be run before calling "make git-dist".
+
+2011-12-15  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'color2.test'
+       * tests/color2.test: (expect-make): Add an "expect eof" directive,
+       so that the collected output from the spawned make program will be
+       displayed on stdout, as desired.
+       Since we are at it, also correctly remove a temporary file which
+       we was trying to delete using a wrong filename.
+       Problem introduced in merge `v1.11-1579-g8d3466c', probably by a
+       botched edit or conflict resolution.
+
+2011-12-15  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'lex3.test'
+       * tests/lex3.test (foo.l): Remove duplicated definition of
+       `yywrap'.  Problem introduced in merge `v1.11-1579-g8d3466c'.
+
+2011-12-09  Jim Meyering  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings
+       Before the present change, automake-generated `dist-xz' rule used
+       a hard-coded `xz -9'.  That was a problem because on this front,
+       xz differs from gzip and bzip2.  While the latter two don't incur
+       any run-time decompression penalty for using a higher compression
+       level, specifying -9 with xz imposes a potentially fatal virtual
+       memory requirement on any client that wants to decompress your
+       tar.xz file.
+       People have complained that a tarball compressed with -9 cannot
+       be uncompressed in a low-memory environment (wrt-based embedded).
+       Hence, instead of defaulting to -9, which is useful only for very
+       large tarballs, it defaults to -e (equivalent to -6e).  This
+       limits the default memory requirements imposed on decompressors,
+       yet still gives very good compression ratios.
+       * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that made
+       it impossible to override.  Actually don't default to -9, either,
+       since that induced inordinately large virtual memory usage when
+       merely decompressing.  Instead, use its XZ_OPT envvar, defaulting
+       to -e if not defined.  Suggested by Lasse Collin.
+       (dist-bzip2): Similarly, do not hard-code -9, but do continue to
+       use -9 by default.  Honor the BZIP2 envvar.
+       * NEWS: Update.
+       * doc/automake.texi (The Types of Distributions): Describe the
+       newly enabled environment variables.
+
+2011-12-09  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typos, grammaros and suboptimal wording.
+       Reported by Jim Meyering.
+
+2011-12-07  Stefano Lattarini  <address@hidden>
+
+       maint: sync auxiliary files from upstream
+       * lib/texinfo.tex: Synced from upstream, by "make fetch".
+       * lib/config.guess: Likewise.
+       * lib/config.sub: Likewise.
+
+2011-12-04  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures due to missing 'yywrap()' function
+
+       The AC_PROG_LEX Autoconf macro does not diagnose a failure to find
+       the "lex library" expected to provide a `yywrap' function (function
+       which is required to link most lex-generated programs).  On the
+       contrary, when all the link attempts (i.e., with `-ll' and `-lfl')
+       fail, configure declares that no lex library is needed, and simply
+       proceeds with the configuration process -- only for the build to
+       possibly fail later, at make time.
+
+       This behaviour is intended; the Autoconf manual reads:
+        ``You are encouraged to use Flex in your sources, since it is
+          both more pleasant to use than plain Lex and the C source it
+          produces is portable.  In order to ensure portability, however,
+          you must either provide a function `yywrap' or, if you don't use
+          it (e.g., your scanner has no `#include'-like feature), simply
+          include a `%noyywrap' statement in the scanner's source.''
+
+       This AC_PROG_LEX behaviour is causing some spurious failures of
+       the Automake testsuite in environments which lack a proper library
+       providing `yywrap' (this happens for example on Fedora-based
+       systems).   The proper workaround is to simply provide a fall-back
+       implementation of `yywrap' in our lexers.
+
+       See also partially-overlapping commit `v1.11-871-geb147a1' (from
+       the 'testsuite-work' branch), which was motivated by similar
+       spurious failures experienced when cross-compiling.
+
+       From a report by Jim Meyering:
+       
<http://lists.gnu.org/archive/html/automake-patches/2011-10/msg00092.html>
+
+       * tests/cond35.test: Provide a dummy `yywrap' function.
+       * tests/lex3.test: Likewise.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/silent-lex-gcc.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+
+2011-12-04  Paul Eggert  <address@hidden>
+
+       depcomp: spelling fix
+       * lib/depcomp (-h): Fix misspelling in usage diagnostic.
+
+2011-11-28  Peter Rosin  <address@hidden>
+
+       tests: fix 'distcheck-override-infodir.test' on Cygwin
+       * tests/distcheck-override-infodir.test (Makefile.am): Do not add
+       any `/' between $(DESTDIR) and the following paths.  Otherwise,
+       when $(DESTDIR) is empty, the recipes will try to access files
+       with a leading double slash, which have an implementation-defined
+       interpretation (e.g., for Cygwin, they mean UNC paths).
+
+2011-11-24  Stefano Lattarini  <address@hidden>
+
+       cosmetics: typofix in comments
+       * tests/remake-am-pr10111.test (Makefile.am): Fix typo in comments.
+       * THANKS: Update.
+       Reported by Krzysztof Żelechowski.
+
+2011-11-22  Stefano Lattarini  <address@hidden>
+
+       coverage: undistributed '.am' and '.m4' files are diagnosed
+       The stub rules emitted to work around the "deleted header problem"
+       for `.m4' files (included by autoconf in e.g., configure.ac) and
+       for `.am' files (included by automake in e.g., Makefile.am) should
+       not prevent "make" from correctly complaining when such a required
+       file is missing from a distribution tarball.
+       * tests/dist-missing-am.test: New test.
+       * tests/dist-missing-m4.test: Likewise.
+       * tests/dist-missing-included-m4.test: Likewise.
+       * tests/Makefile.am (TESTS): Add them.
+       Suggestion by Ralf Wildenhues.
+
+2011-11-22  Stefano Lattarini  <address@hidden>
+
+       coverage: required but missing '.am' and '.m4' files are diagnosed
+       The stub rules emitted to work around the "deleted header problem"
+       for `.m4' files (included by autoconf in e.g., configure.ac) and
+       for `.am' files (included by automake in e.g., Makefile.am) should
+       not prevent the remake rules from correctly erroring out when a
+       still-required file is missing.
+       * tests/deleted-am.test: New test.
+       * tests/deleted-m4.test: Likewise.
+       * tests/Makefile.am (TESTS): Add them.
+
+2011-11-22  Stefano Lattarini  <address@hidden>
+
+       coverage: expose automake bug#10111 in the testsuite
+       * tests/remake-am-pr10111.test: New test, xfailing.
+       * tests/remake-m4-pr10111.test: Likewise.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
+
+2011-11-19  Stefano Lattarini  <address@hidden>
+
+       texinfo: work around Solaris 10 xpg4 shell bug in install rules
+       * lib/am/texinfos.am (install-html-am): Use an extra variable
+       indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
+       Bug revealed by a failure of `txinfo21.test'.  See also:
+       <http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
+       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
+
+2011-11-17  Stefano Lattarini  <address@hidden>
+
+       configure: report perl version in config.log
+       * configure.ac: Report the version of the selected perl interpreter
+       in config.log; this should render the logs more informative.
+
+2011-11-13  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with older install-info
+       * tests/install-info-dir.test (foo.texi): Also add proper
+       address@hidden', address@hidden' and address@hidden' directive, 
otherwise
+       older versions of `install-info' (e.g., 4.8) will fail to create
+       the `dir' index file in ${infodir}.
+       Problem revealed by a failure on NetBSD 5.1.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failure in 'color2.test'
+       * tests/color2.test: Avoid creative quoting to avoid a spurious
+       failure of the `sc_tests_Exit_not_exit' maintainer check.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious error in 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add
+       a line number before the `:' in the error messages issued by shell
+       builtins.  Account for that in our grepping of make output.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo in 'uninstall-fail.test'
+       * tests/uninstall-fail.test: Always use `$rm_f_is_silent_on_error'
+       instead of the bogus `$rm_f_is_silent_on_failure'.
+
+2011-11-19  Paul Eggert  <address@hidden>
+
+       * lib/install-sh: Spelling fix in comment.
+
+2011-11-10  Stefano Lattarini  <address@hidden>
+
+       tests: avoid a spurious failure of 'ltinit.test' MinGW
+       * tests/ltinit.test: Be laxer in grepping configure output, to
+       avoid spurious failures on systems which lack POSIX dynamic
+       linking (e.g., MinGW), or when cross-compiling for such systems.
+       See also commit `v1.11-855-ge9e5d4a'.
+       Report and suggestion from Peter Rosin.
+
+2011-11-08  Stefano Lattarini  <address@hidden>
+
+       tests: testsuite is now safe to run with dmake in parallel mode
+       * tests/defs.in: Unset variables DMAKE_CHILD, DMAKE_DEF_PRINTED
+       and DMAKE_MAX_JOBS, which are exported by Solaris dmake when run
+       in parallel mode, and which might confuse make processes spawned
+       by our testsuite.
+
+2011-11-08  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures w.r.t. parallel make and colorization
+       * tests/color2.test: Skip the test if the $MAKE program fails to
+       consider the standard output as a tty when spawned by `expect'.
+       This is required for make implementations, like FreeBSD make and
+       Solaris dmake, that redirect the output of recipes to temporary
+       files or pipes when run in parallel mode.  Since we are at it,
+       simplify the detection of a working `expect' program, and throw
+       in other minor simplifications.
+
+2011-11-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'distcheck-override-infodir.test'
+       * tests/distcheck-override-infodir.test ($required): Add
+       'install-info'.
+
+2011-11-07  Stefano Lattarini  <address@hidden>
+
+       tests: avoid another failure of 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: On Solaris 10, if `/bin/rm' is run
+       with the `-f' option, it doesn't print any error message when
+       failing to remove a file (due to e.g., "Permission denied").
+       Yikes.  Cater to this incompatibility, by relaxing the test when
+       a faulty `rm' is detected.
+
+2011-11-10  Stefano Lattarini  <address@hidden>
+
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca2.test: Ensure we don't experience a spurious failure
+       due to a missing `AM_PROG_AR' macro or a missing `ar-lib' auxiliary
+       script.
+       * tests/libtool4.test: Likewise.
+       * tests/ldadd.test: Likewise.  Since we are at it, make grepping of
+       automake stderr stricter.
+       * tests/reqd2.test: Likewise.
+       * tests/pr211.test: Ensure automake fails also with `-Wnone', since
+       the error we are testing for is an hard error, not a mere warning.
+       * tests/syntax.test: Likewise, and ensure we don't fail to other
+       errors by removing use of `lib_LTLIBRARIES' in Makefile.am.  Since
+       we are at it, make grepping of automake stderr stricter.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       ar-lib: fix configure output for "unrecognized archiver interface"
+       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
+       to determine the archiver interface kind, the "checking archiver
+       interface" message from configure is properly terminated before
+       an error message is printed, to avoid slightly garbled output.
+       * tests/ar4.test: Enhance.
+       * tests/ar5.test: Likewise.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       warnings: fix buglets for portability warnings
+       * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
+       correct implications and inter-dependencies between warnings
+       in the categories `portability', `extra-portability' and
+       `recursive-portability' are respected.  Also add detailed
+       explicative comments, and references to the relevant tests.
+       * tests/dollarvar2.test: Update and extend.  Also, remove
+       some unnecessary uses of `--force' option in automake calls.
+       * tests/extra-portability3.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       tests: extend tests on 'extra-portability' warning category
+       * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
+       have complete control over the automake options.  Extend by using
+       also a setup where no `portability' warning is present (only an
+       `extra-portability' warning is).  Other minor extensions.  Remove
+       some redundant, verbose comments about the expected diagnostic.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/discover.test: Likewise.
+       * tests/libobj3.test: Likewise.
+       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
+       expected error message stricter.
+       * tests/stdlib.test: Likewise, and extend the test a bit.
+       * tests/parse.test (configure.in): Remove redundant call to
+       AC_PROG_RANLIB.
+       * tests/library2.test: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.  Also ...
+       (configure.in): ... add call to AC_PROG_CC, to ensure automake
+       really fails for the expected reason.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       ar-lib: fix configure output for "unrecognized archiver interface"
+       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
+       to determine the archiver interface kind, the "checking archiver
+       interface" message from configure is properly terminated before
+       an error message is printed, to avoid slightly garbled output.
+       * tests/ar4.test: Enhance.
+       * tests/ar5.test: Likewise.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       tests: more faithful 'installcheck' support in few tests
+       * tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
+       of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
+       faithfully under "make installcheck".
+       * tests/ar-lib5a.test: Likewise.
+       * tests/libobj-basic.test: Likewise.
+       * tests/libobj19.test: Likewise.
+       * tests/suffix5.test: Likewise.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/aclocal-path-install-serial.test: Do not set the
+       `errexit' shell flag, as it is already set by `tests/defs'.
+       * tests/ar-lib2.test: Likewise.
+       * tests/ar-lib3.test: Likewise.
+       * tests/ar-lib4.test: Likewise.
+       * tests/ar-lib5a.test: Likewise.
+       * tests/ar-lib5b.test: Likewise.
+       * tests/ar-lib6a.test: Likewise.
+       * tests/ar-lib6b.test: Likewise.
+       * tests/ar-lib7.test: Likewise.
+       * tests/ar3.test: Likewise.
+       * tests/ar4.test: Likewise.
+       * tests/ar5.test: Likewise.
+       * tests/extra-portability.test: Likewise.
+       * tests/extra-portability2.test: Likewise.
+       * tests/extra-portability3.test: Likewise.
+       * tests/install-info-dir.test: Likewise.
+       * tests/maintmode-configure-msg.test: Likewise.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       generated tests: avoid extra "FIXME" comments
+       * tests/gen-testsuite-part: Avoid putting too much "FIXME"
+       comments in the generated test scripts, since they end up
+       being just counter-productive noise when one has to grep
+       the test scripts looking for real "FIXME" items.
+
+2011-09-12  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix typo in 'prove-runner' script
+       * tests/prove-runner: Remove erroneously-repeated word.
+       * THANKS: Update.
+       Reported by Dave Hart.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'master' into testsuite-work
+       * tests/extra-portability.test: Use `$am_original_AUTOMAKE'
+       instead of the obsolete `$original_AUTOMAKE'.
+       * tests/extra-portability3.test: Likewise.
+       * tests/list-of-tests.mk: Update.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'msvc' into master
+       * tests/extra-portability3.test: Use `$original_AUTOMAKE' instead
+       of hackishly extracting the first component of `$AUTOMAKE'.
+       * tests/extra-portability.test: Likewise.  Also, since we are at
+       it, throw in a couple of small extensions and tweakings (suggested
+       by the minor merge conflicts).
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       warnings: fix buglets for portability warnings
+       * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
+       correct implications and inter-dependencies between warnings
+       in the categories `portability', `extra-portability' and
+       `recursive-portability' are respected.  Also add detailed
+       explicative comments, and references to the relevant tests.
+       * tests/dollarvar2.test: Update and extend.  Also, remove
+       some unnecessary uses of `--force' option in automake calls.
+       * tests/extra-portability3.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       tests: extend tests on 'extra-portability' warning category
+       * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
+       have complete control over the automake options.  Extend by using
+       also a setup where no `portability' warning is present (only an
+       `extra-portability' warning is).  Other minor extensions.  Remove
+       some redundant, verbose comments about the expected diagnostic.
+
+2011-11-04  Stefano Lattarini  <address@hidden>
+
+       test defs: new functions to analyze configure help screen
+       * tests/defs (extract_configure_help, grep_configure_help): New
+       functions.
+       * tests/maintmode-configure-msg.test: Use them, reducing code
+       duplication and test brittleness.
+       * tests/help-depend.test: Likewise.
+       * tests/help-depend2.test: Likewise.
+       * tests/help-dmalloc.test: Likewise.
+       * tests/help-lispdir.test: Likewise.
+       * tests/help-multilib.test: Likewise.
+       * tests/help-python.test: Likewise.
+       * tests/help-regex.test: Likewise.
+       * tests/help-silent.test: Likewise.
+       * tests/help-upc.test: Likewise.
+       * tests/help-init.test: Make grepping of configure help screen
+       slightly stricter.
+       * tests/self-check-configure-help.test: New self test.
+       * tests/Makefile.am (TESTS): Add it.
+       From a report by Jim Meyering.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'master' into testsuite-work
+
+       * tests/instspc.tap: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.
+       * tests/lex-lib.test: Likewise.
+       * tests/extra-portability2.test: Use `$am_original_AUTOMAKE'
+       instead of the obsolete `$original_AUTOMAKE'.
+       * tests/list-of-tests.mk: Update.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/discover.test: Likewise.
+       * tests/libobj3.test: Likewise.
+       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
+       expected error message stricter.
+       * tests/stdlib.test: Likewise, and extend the test a bit.
+       * tests/parse.test (configure.in): Remove redundant call to
+       AC_PROG_RANLIB.
+       * tests/library2.test: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.  Also ...
+       (configure.in): ... add call to AC_PROG_CC, to ensure automake
+       really fails for the expected reason.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
+       Merge branch 'msvc' into master
+
+       * tests/instspc-tests.sh: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.
+       * tests/libobj-basic.test: Likewise.
+       * tests/libobj2.test: Likewise.
+       * tests/libobj15a.test: Likewise.
+       * tests/libobj15b.test: Likewise.
+       * tests/libobj15c.test: Likewise.
+       * tests/libobj16a.test: Likewise.
+       * tests/libobj16b.test: Likewise.
+       * tests/libobj17.test: Likewise.
+       * tests/libobj18.test: Likewise.
+       * tests/libobj19.test: Likewise.
+       * tests/libobj20a.test: Likewise.
+       * tests/libobj20b.test: Likewise.
+       * tests/libobj20c.test: Likewise.
+       * tests/canon6.test: Likewise.
+       * tests/canon6.test: Likewise.
+       * tests/canon7.tests: Likewise.
+       * tests/extra9.test: Likewise.
+       * tests/extradep.test: Likewise.
+       * tests/extradep2.test: Likewise.
+       * tests/posixsubst-ldadd.test: Likewise.
+       * tests/posixsubst-libraries.test: Likewise.
+       * tests/posixsubst-ltlibraries.test: Likewise.
+       * tests/python-virtualenv.test: Likewise.
+       * tests/vartypos.test: Likewise.
+       * tests/vartypo2.test: Likewise.
+       * tests/suffix.test: Update to take into account previous
+       master-only changes.
+       * tests/suffix2.test: Likewise.
+       * tests/libobj7.test: Call automake with the `--add-missing'
+       option, instead of creating a dummy `ar-lib' file, since this
+       test now also runs "./configure" and "make".
+       * tests/suffix5.test: Copy the real `ar-lib' script file,
+       instead of creating a dummy one, since this test now also
+       runs "./configure" and "make".
+       * tests/extra-portability2.test: Fix this test not to rely
+       on the older, faulty semantics of "strictness specification
+       always reset warning level", which has been fixed in commit
+       v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547).
+       Since we are at it, throw inf few other minor unrelated
+       improvements.
+       * tests/extra-portability.test: Explicitly pass `-Wall' to
+       automake calls, for clarity.
+
+2011-10-21  Peter Rosin  <address@hidden>
+
+       warnings: new 'extra-portability' category, for AM_PROG_AR
+       * lib/Automake/ChannelDefs.pm: Register new extra-portability
+       warning channel.
+       (switch_warning): Turn off extra-portability if portability is
+       turned off, and turn on portability if extra-portability is
+       turned on.
+       (set_strictness): Silence extra-portability for --gnits, --gnu
+       and --foreign.
+       * tests/extra-portability2.test: New test, checking that the
+       extra-portability channel is silenced by --gnits, --gnu and
+       --foreign.
+       * doc/automake.texi (Invoking Automake): Document the new warning
+       category and its interaction with the portability category.
+       * tests/extra-portability.test: New test, checking the interaction
+       between the portability and extra-portability warning categories.
+       * automake.in (handle_libraries, handle_ltlibraries): Move the
+       AM_PROG_AR warnings to the new extra-portability channel.
+       * tests/ar2.test: Adjust to the new warning channel.
+       * tests/pr300-lib.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise.
+       * tests/pr307.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/pr72.test: Likewise.
+       * NEWS: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-10-21  Peter Rosin  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       Add new 'AM_PROG_AR' macro, triggering the 'ar-lib' script.
+       * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an
+       archiver and triggers the auxiliary 'ar-lib' script if needed.
+       * m4/Makefile.am (dist_m4data_DATA): Update.
+       * automake.in ($seen_ar): New variable.
+       (scan_autoconf_traces): Set it.
+       (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for
+       portability.
+       * doc/automake.texi (Public Macros): Mention the new
+       'AM_PROG_AR' macro.
+       (Subpackages): Add AM_PROG_AR to the example.
+       (A Library): Adjust recommendations for AR given the new
+       AM_PROG_AR macro.
+       * All relevant tests: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers
+       install of ar-lib.
+       * tests/ar-lib3.test: New test, checking that lib_LIBRARIES
+       requires AM_PROG_AR.
+       * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES
+       requires AM_PROG_AR.
+       * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers
+       use of ar-lib when the archiver is Microsoft lib.
+       * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers
+       use of ar-lib when the archiver is a faked lib.
+       * tests/ar-lib6a.test: New test, checking the ordering of
+       AM_PROG_AR and LT_INIT.
+       * tests/ar-lib6b.test: New test, checking the ordering of
+       AM_PROG_AR and AC_PROG_LIBTOOL.
+       * tests/ar-lib7.test: New test, checking that automake warns
+       if ar-lib is missing.
+       * tests/ar3.test: New test, checking that AR and ARFLAGS may
+       be overridden by the user even if AM_PROG_AR is used.
+       * tests/ar4.test: New test, checking that AM_PROG_AR bails out
+       if it cannot determine the archiver interface.
+       * tests/ar5.test: New test, checking that AM_PROG_AR runs its
+       optional argument if it cannot determine the archiver interface.
+       * tests/defs.in: New required entry 'lib'.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-11-03  Zack Weinberg <address@hidden>  (tiny change)
+           Stefano Lattarini  <address@hidden>
+
+       maint-mode: fix botched configure messages
+       This change fixes automake bug#9890.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..."
+       configure message related to the enabling/disabling of maintainer
+       mode.
+       * tests/help-maintainer.test: Renamed ...
+       * tests/maintmode-configure-msg.test: ... to this, and extended
+       to cover the fixed bug.  Also, since we are at it, make grepping
+       of configure help screens stricter, and throw in some few other
+       changes to reduce code duplication and enhance readability.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update with Zack's new e-mail address.
+       Report and initial patch by Zack Weinberg, test cases added by
+       Stefano Lattarini.
+
+2011-10-23  Stefano Lattarini  <address@hidden>
+
+       info: allow user to inhibit creation/update of '${infodir}/dir'
+       With this change, we allow the user to request the install-info
+       rules not to update the `${infodir}/dir' file, by setting the
+       environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+       This is especially useful to distro packagers, and is a definite
+       improvement over our previous hack of looking whether the
+       `install-info' program was the Debian or GNU version -- hack
+       which had been silently broken with recent versions of debian
+       install-info BTW (probably since dpkg 1.15.4, 2009-09-06).
+       This change fixes automake bug#9773.  See also Debian Bug#543992.
+       * lib/am/texinfos.am: Don't look anymore at the output of
+       `install-info --version' to decide whether to use it to update
+       the `${infodir}/dir' or not; instead, honour the environment
+       variable `AM_UPDATE_INFO_DIR'.
+       * tests/install-info-dir.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
+       interferences from the environment.
+       * doc/automake.texi (Texinfo): Update.
+       * NEWS: Likewise.
+       * THANKS: Likewise.
+       Report by Jonathan Nieder.
+
+2011-10-25  Stefano Lattarini  <address@hidden>
+
+       test defs: new function 'am_keeping_testdirs', for better APIs
+
+       This change is meant to make it easier for TAP-based test scripts
+       to remove files left over by completed (sub)tests, while still
+       honoring the user-provided `$keep_testdirs' setting.
+
+       * tests/defs (am_keeping_testdirs): New function, telling whether
+       we should keep the test directories around, even in case of
+       success (by default, we don't).
+       (exit trap): Use it.
+       * tests/depmod.tap: Likewise.
+       * tests/instspc.tap: Likewise.  Also, fix some pre-existing
+       "copy & paste" bugs, and a typo in comments.
+
+2011-10-25  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant `set -e', and other minor improvements
+       * tests/dejagnu-absolute-builddir.test: Do not set the `errexit'
+       shell flag, as it is already set by `tests/defs'.
+       * tests/dejagnu-relative-srcdir.test: Likewise.
+       * tests/dejagnu-siteexp-append.test: Likewise.
+       * tests/dejagnu-siteexp-useredit.test: Likewise, and fix a typo
+       in comments.
+       * tests/dejagnu-siteexp-extend.test: Likewise, and prefer the
+       use of `$distdir' over hard-coded `$me-1.0'.  Also ...
+       (write_check_for): ... use `unindent' when writing from an
+       here-doc, for better code indentation.
+
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       deps: partially revert commit `v1.11-512-geeee551'
+       This change partly reverts commit "Create subdirs for generated
+       sources even when not dep tracking", of 2011-04-02.
+       That commit had caused the bugs #8485 and #8526.  Since we are
+       nearing the bug-fixing automake release 1.11.2, the safest policy
+       at the moment is to just revert the problematic hunks: an older,
+       known bug is better than a regression.
+       * automake.in (handle_single_transform): Don't add a dirstamp
+       dependency, even when $object is derived and lands in a subdir.
+       * tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test,
+       remove yacc-dist-nobuild-subdir.test.
+
+2011-10-25  Stefano Lattarini  <address@hidden>
+
+       tests: few improvements to some `ar-lib' related tests
+
+       * tests/ar-lib5a.test (Makefile.am): Also check that the target
+       library has truly been created.
+       (ar-lib): Use the real `ar-lib' script (mildly patched) rather
+       than a dummy one, to ensure better "real-life coverage".  Fix
+       botched shebang line.
+       * tests/ar-lib5b.test: Extend the PATH variable to make the dummy
+       `lib' script accessible, instead of explicitly calling it by its
+       relative/absolute path.
+       (ar-lib): Fix botched shebang line.
+       (bin/lib): Likewise.  Also, add explicative comments, and make
+       slightly stricter.
+
+2011-10-24  Peter Rosin  <address@hidden>
+
+       Merge branch 'maint' into msvc
+
+       * tests/subpkg-yacc.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+
+2011-10-19  Stefano Lattarini  <address@hidden>
+
+       dejagnu: allow the package developer to extend site.exp
+       Fixes automake bug#7873.
+       * lib/am/dejagnu.am (site.exp): Depend from the files listed in
+       $(EXTRA_DEJAGNU_SITE_CONFIG), if any.  Append their contents to
+       the generated site.exp (still preserving user edits).
+       * doc/automake.texi (Dejagnu Tests): Update.
+       * tests/dejagnu-siteexp-append.test: New test.
+       * tests/dejagnu-siteexp-extend.test: Likewise.
+       * tests/dejagnu-siteexp-useredit.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       Suggestion by Rainer Orth.
+
+2011-10-19  Stefano Lattarini  <address@hidden>
+
+       dejagnu: ensure 'srcdir' is defined as a relative directory
+       This change fixes automake bug#7833.
+       * lib/am/dejagnu.am (check-DEJAGNU): Prefer using plain $(srcdir)
+       over calculating and using the absolute path of $(srcdir).
+       * tests/dejagnu-relative-srcdir.test: New test.
+       * tests/dejagnu-absolute-builddir.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       Report by Ian Lance Taylor.  Suggestions by Ralf Wildenhues.
+
+2010-12-13  Ralf Wildenhues  <address@hidden>
+
+       Fix testsuite failure of check12.test without DejaGNU.
+       * tests/check12.test: Require runtest.
+
+2010-12-10  Stefano Lattarini  <address@hidden>
+
+       Extend and improve tests on DejaGnu support.
+       * tests/dejagnu.test: Do not create useless dummy test script.
+       Add trailing `:' command.  In heading comments, add reference
+       to ...
+       * tests/check12.test: ... this new "semantic" test, covering
+       concurrent use of dejagnu tests, simple tests and `check-local'
+       target.
+       * tests/dejagnu2.test: Make test more reliable, by avoid weak
+       grepping of make output.  Prefer `cat' over `echo' to append
+       to configure.in.  Quote literal dots in grep regexps.  Prefer
+       `grep -c ...' over `grep ... | wc -l'.  Make grepping of
+       automake stderr slightly stricter.  Add trailing `:' command.
+       * tests/dejagnu3.test: Prefer `cat' over `echo' to append to
+       configure.in.  Check stderr of expected-to-fail "make" call.
+       Remove extra blank lines from Makefile.am.
+       * tests/dejagnu4.test: Prefer `cat' over `echo' to append to
+       configure.in.  Prefer `mv -f' over plain `mv' when the target
+       file already exists.  Avoid extra mkdir calls by creating more
+       directories at once.  Better use of blank lines.  Check that
+       the `*.log' and `*.sum' files are created by runtest also when
+       "make check" fails.
+       * tests/dejagnu7.test: Prefer `cat' over `echo' to append to
+       configure.in.  Better use of blank lines.  Add a trailing `:'
+       command.
+       * tests/dejagnu6.test: Likewise, and give the dejagnu test a
+       more descriptive name.
+       * tests/dejagnu5.test: Likewise.  Also, simply define package
+       name to `$me' rather than using a non-obvious sed script to
+       extract it from `AC_INIT', and write the Makefile.am with only
+       one command.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-10-21  Peter Rosin  <address@hidden>
+
+       * THANKS: Fix whitespace issue.
+
+2011-10-25  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures due to missing 'yywrap()' function
+
+       The AC_PROG_LEX Autoconf macro does not diagnose a failure to find
+       the "lex library" expected to provide a `yywrap' function (function
+       which is required to link most lex-generated programs).  On the
+       contrary, when all the link attempts (i.e., with `-ll' and `-lfl')
+       fail, configure declares that no lex library is needed, and simply
+       proceeds with the configuration process -- only for the build to
+       possibly fail later, at make time.
+
+       This behaviour is intended; the Autoconf manual reads:
+        ``You are encouraged to use Flex in your sources, since it is
+          both more pleasant to use than plain Lex and the C source it
+          produces is portable.  In order to ensure portability, however,
+          you must either provide a function `yywrap' or, if you don't use
+          it (e.g., your scanner has no `#include'-like feature), simply
+          include a `%noyywrap' statement in the scanner's source.''
+
+       This AC_PROG_LEX behaviour is causing some spurious failures of
+       the Automake testsuite in environments which lack a proper library
+       providing `yywrap' (this happens for example on Fedora-based
+       systems).   The proper workaround is to simply provide a fall-back
+       implementation of `yywrap' in our lexers.
+
+       See also partially-overlapping commit `v1.11-871-geb147a1' (from
+       the 'testsuite-work' branch), which was motivated by similar
+       spurious failures experienced when cross-compiling.
+
+       Reported by Jim Meyering:
+       
<http://lists.gnu.org/archive/html/automake-patches/2011-10/msg00092.html>
+
+       * tests/cond35.test: Provide a dummy `yywrap' function.
+       * tests/lex3.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/silent-lex-gcc.test: Likewise.
+
+2011-10-21  Stefano Lattarini  <address@hidden>
+
+       tests: more faithful 'installcheck' support in few tests
+       * tests/test-driver-acsubst.test: Use the `$am_scriptdir'
+       variable instead of `$testsrcdir/../lib', to test more
+       faithfully under "make installcheck".
+       * tests/test-driver-cond.test: Likewise.
+       * tests/dist-auxfile.test: Likewise, and add one more use
+       of `fatal_' to report hard errors.
+       * tests/tests/dist-auxdir-many-subdirs.test: Likewise.
+
+2011-10-21  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/aclocal-path-install-serial.test: Do not set the
+       `errexit' shell flag, as it is already set by `tests/defs'.
+       * tests/aclocal-path-install.test: Likewise.
+       * tests/aclocal-path-nonexistent.test: Likewise.
+       * tests/aclocal-path-precedence.test: Likewise.
+       * tests/aclocal-path.test: Likewise.
+       * tests/dist-auxfile-2.test: Likewise.
+       * tests/dist-auxfile.test: Likewise.
+       * tests/distcheck-pr9579.test: Likewise.
+       * tests/javadir-undefined.test: Likewise.
+       * tests/subpkg-yacc.test: Likewise.
+       * tests/test-extensions-cond.test: Likewise.
+       * tests/test-extensions.test: Likewise.
+       * tests/uninstall-fail.test: Likewise.
+       * tests/uninstall-pr9578.test: Likewise.
+       * tests/distcheck-override-infodir.test: Likewise.  Also,
+       fix typo in heading comments since we are at it.
+
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       fixup: add forgotten test scripts to $(TESTS)
+       * tests/list-of-tests.mk: Add various test scripts that are in
+       the git repository but weren't correctly listed in $(TESTS).
+       The inconsistency had been caused by botched/incomplete merges,
+       and revealed by the "maintainer-check-list-of-tests" target.
+
+2011-10-18  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with FreeBSD make and Yacc in VPATH
+       * tests/subpkg.test: Some cosmetic adjustments.  Move the tests
+       checking that $(YLWRAP) is defined and installed properly when
+       ylwrap is in a default auxdir found in a parent package ...
+       * tests/subpkg-yacc.test: ... into this new test, which carefully
+       avoids to trigger the known bug#7884 (combo FreeBSD make plus Yacc
+       plus VPATH build).
+       * tests/Makefile.am (TESTS): Update.
+
+2011-10-18  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure in 'parallel-tests3.test'
+       This fixes automake bug#8788.
+       * tests/parallel-tests3.test: To ensure that the serial run of
+       the dummy testsuite is still ongoing when the parallel run has
+       terminated, use `kill -0', not a bare `kill'.  This will prevent
+       a testsuite crash on NetBSD 5.1, and a testsuite hang on FreeBSD
+       8.2.  Also, since we are at it, try harder to avoid possible
+       hangs of the script in other unusual situations.
+
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures with "chatty" make implementations
+       * tests/distcheck-missing-m4.test: On failure, some make
+       implementations (such as Solaris make) print the whole failed
+       recipe on standard output.  This was causing a spurious failure
+       in the checks grepping the output from make.  Work around this.
+       * tests/distcheck-outdated-m4.test: Likewise.
+
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure on fast machines
+       * tests/aclocal-path-precedence.test: Also remove the `configure'
+       script between different test runs, to ensure it is always remade
+       by autoconf.  Add proper explicative comments.
+
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
+       /bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
+       directory with the `cd' builtin, print a message like:
+         "sh: /root: permission denied"
+       which doesn't report the `cd' builtin anywhere.  Relax the grepping
+       of the error message accordingly.
+
+2011-10-20  Jim Meyering  <address@hidden>
+
+       tests: fix aclocal-print-acdir.test
+       * tests/aclocal-print-acdir.test: Adjust to pass.
+
+2011-10-19  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
+       * tests/uninstall-fail.test: Be sure to really skip this test
+       on systems that allows files to be removed from unwritable
+       directories.  Motivated by a spurious failure on Cygwin 1.5.
+
+2011-10-17  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with autoconf 2.62
+       * tests/aclocal-path-precedence.test: Rewrite configure.in,
+       rather than appending to it, to avoid spurious failures (at
+       least with autoconf 2.62) due to repeated calls to AC_INIT.
+       Also, add package name and version arguments to AC_INIT, to
+       avoid spurious errors from automake.
+
+2011-10-16  Stefano Lattarini  <address@hidden>
+
+       docs: avoid using colon character inside arguments of @pxref
+       Fixes automake bug#9753
+       * doc/automake.texi (VPATH Builds): Avoid using colon character
+       `:' inside arguments of @pxref, as this can cause problems in
+       the generated `.info' files, and such an usage will be explicitly
+       forbidden by future texinfo documentation.
+       * THANKS: Update.
+       Reported by Дилян Палаузов.
+
+2011-10-17  Stefano Lattarini  <address@hidden>
+
+       refactor: improve signature of 'check_directory' sub in automake
+       * automake.in (check_directory): Take the relative directory
+       the directory to be checked is expected to be found into as
+       an optional parameter, rather than reading it from the global
+       variable `$relative_dir'.
+       (scan_autoconf_traces, check_directories_in_var): Adjust.
+
+2011-10-17  Stefano Lattarini  <address@hidden>
+
+       cosmetics: remove obsolete comment
+       * automake.in (push_required_file): Remove "FIXME" comment stating
+       that the special handling of `$config_aux_dir' breaks threaded
+       automake: this is not true anymore after the recent commits (see
+       in particular commit `v1.11-1225-gf672944').
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with Solaris /bin/sh
+       * tests/dist-auxfile.test: Don't use redirected `:' in a loop,
+       it hits a bug in Solaris 10 /bin/sh.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       threaded-am: better serialization for required config files
+       With this change, we make serialization/de-serialization of
+       required config files installs more granular, and in the process
+       fix the bug introduced by commit `v1.11-1219-g326ecba'.
+       * automake.in ($required_conf_file_queue): Move its declaration
+       earlier.
+       (require_file_internal): Add a new argument telling whether the
+       function should act immediately or queue its action for the master
+       thread to handle.
+       (queue_required_conf_file): Renamed ...
+       (queue_required_file_check_or_copy): ... to this.
+       (require_queued_conf_file): Renamed ...
+       (require_queued_file_check_or_copy): ... to this, and make it call
+       `required_file_check_or_copy' instead of `require_file_internal'.
+       (require_conf_file, handle_makefiles_threaded): Adjust and simplify
+       accordingly.
+       * tests/Makefile.am (XFAIL_TESTS): Remove `parallel-am.test'.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       automake: refactor, break up 'require_file_internal'
+       This refactoring is only required in view of future changes.
+       * automake.in (require_file_internal): Move the guts of this
+       function ...
+       (required_file_check_or_copy): ... into this new function.  This
+       ensures that calls to `push_required_file' and code that copies
+       required files are placed in separate functions; this will be
+       very useful for reorganizing de-serialization of file installs
+       in future changes.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       dist: separate auxiliary file instantiation from DIST_COMMON update
+       This change simplifies the automake internals dealing with the
+       checking, copying and distributing of required auxiliary files.
+       With this change, a required auxiliary file is *unconditionally*
+       added to the contents of the DIST_COMMON variable in the generated
+       Makefile.in, before checking whether it exists, or trying to copy
+       it (if `--add-missing' is in use).  This shouldn't be a problem,
+       since if the checking or copying of the file fails, automake will
+       bail out, the Makefile.in won't be created, and thus its content
+       will not matter.  OK, this is not completely true when threaded
+       automake is in use, but then, such a situation was also possible
+       before this patch, so no regression here, which is enough for us.
+       This change is the first of a series of steps aimed at fixing
+       the regression introduced in threaded automake usage by commit
+       `v1.11-1219-g326ecba'.
+       * automake.in (require_file_internal): Add the required file to
+       DIST_COMMON unconditionally.
+       * tests/missing-auxfile-stops-makefiles-creation.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       refactor: rename a subroutine to a more proper name
+       * automake.in (maybe_push_require_file): Renamed ...
+       (push_required_file): ... to this.
+       All callers adjusted.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       dist: truly always distribute files in AC_REQUIRE_AUX_FILE
+       This change fixes automake bug#9651.
+       * automake.in (handle_dist): Files whose distribution is required
+       by configure.ac are now correctly distributed even if the build-aux
+       directory coincides with the top-level directory.
+       * tests/Makefile.am (XFAIL_TESTS): Remove `dist-auxfile.test'.
+       * NEWS: Update.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       dist: simplify automake code accordingly to the previous changes
+       After the previous change `v1.11-1219-g326ecba', every Makefile.am
+       requiring a file in the "config auxdir" will cause it to be listed
+       in the DIST_COMMON variable of the corresponding generated
+       Makefile.in, not only of the top-level Makefile.in.  Thus we don't
+       need to worry anymore about trying to distribute files in the
+       config auxdir from the top-level Makefile or the Makefile in
+       config auxdir (if any).  This allows us to carry out some useful
+       simplifications in the automake script.
+       This will however cause some changes in the generated Makefile;
+       for example, if the `PROGRAMS' primary is used only in a subdir
+       Makefile.am, the `depcomp' script will be distributed only by
+       `subdir/Makefile', not by the top-level Makefile.  This change
+       can be seen as an internal detail though, and definitely warranted
+       by the nice simplifications the current commit provides.
+       * automake.in ($automake_will_process_aux_dir): Variable removed.
+       (scan_autoconf_files): Adjust and simplify.
+       (handle_makefiles_threaded): Likewise.
+       (get_number_of_threads): Likewise.
+       (require_file_internal): Likewise.
+       (maybe_push_required_file): Its return value is not used anymore,
+       so return nothing.  Add special handling for distributed files from
+       `$config_libobj_dir'.  Also, catch "this can't happen" situations,
+       and abort accordingly.  Fix function description to better fit its
+       new role.
+       * tests/libobj19.test: Extend to also check situations where the
+       Makefile.am using $(LIBOBJS) is not the top-level one.
+       * tests/distcom6.test: Delete, merged into ...
+       * tests/distcom2.test: ... this test, which has been update to
+       account for the changed automake semantics.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-10-08  Stefano Lattarini  <address@hidden>
+
+       dist: auxiliary files can be distributed from subdir Makefiles
+       With this change, we make it possible for a subdir Makefile.am
+       to distribute files in the config auxdir; while this means that
+       some files might be copied multiple times, it simplify some logic
+       in the automake script, and fix at least one important bug.  In
+       fact, before this change, the auxiliary script `test-driver' was
+       not being distributed as expected when TESTS was defined only in
+       a subdir Makefile (which is a pretty common setup indeed).  Now
+       this does not happen anymore: so the present change fixes automake
+       bug#9546.
+       Another welcome collateral effect is that `dist-auxfile-2.test'
+       now passes.
+       OTOH, the present changes *breaks threaded automake*.  The reason
+       is that automake needs to serialize file installations spawned
+       by `--add-missing' (this isn't for cosmetic reasons, but is
+       really needed to avoid possible race conditions and botched output
+       files).  Currently the code that installs required files is
+       intertwined with the code that declares the DIST_COMMON variables;
+       so, upon de-serialization, the definition of DIST_COMMON might get
+       emitted in the wrong Makefile.in.
+       Some follow-up refactoring in automake will soon take care of
+       remedying this situation.  For the moment, we just declare some
+       "parallel-am" tests as xfailing.
+       * automake.in (maybe_push_required_file): Add ad-hoc handling for
+       the case where the directory part of the required file is different
+       from the subdir where the current Makefile.am resides, but is equal
+       to the "config-aux directory" ($config_auxdir).  This is needed to
+       allow a construct in a non-top-level Makefile.am to require a file
+       in the config-aux directory.
+       * tests/test-driver-is-distributed.test: Extend and adjust.  This
+       test now passes.
+       * tests/java-compile-run-nested.test: Call automake with the `-a'
+       option to ensure that the `test-driver' auxiliary script gets
+       correctly installed.  This test now passes.
+       * tests/distcom-subdir.test: New test.
+       * tests/dist-readonly.test: Likewise.
+       * tests/dist-repeated.test: Likewise.
+       * tests/dist-auxdir-many-subdirs.test: Likewise.
+       * tests/distcom7.test: Removed, it's obsolete now.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-10-11  Stefano Lattarini  <address@hidden>
+
+       coverage: conditional contents in LOG_DRIVER variables
+       * tests/test-driver-cond.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-10-11  Stefano Lattarini  <address@hidden>
+
+       coverage: LOG_DRIVER variables can be defined through AC_SUBST
+       * tests/test-driver-acsubst.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-10-07  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: warn on conditional TEST_EXTENSIONS definition
+       Before this change, automake would have still bailed out, but
+       with a confusing error message (about an invalid redefinition
+       of TEST_EXTENSIONS).
+       * automake.in (handle_tests): Warn explicitly if TEST_EXTENSIONS
+       has conditional contents.
+       * tests/test-extensions-con.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS
+       Even after the last commit `v1.11-476-g90bea64', the checks
+       performed by automake on entries in $(TEST_EXTENSIONS) tried to
+       allow for @substitited@ stuff.  This however ends up allowing
+       quite brittle setups, which, most importantly, are of no real
+       practical usefulness anyway.  So it's better to just disallow
+       @substitutions@ in TEST_EXTENSIONS altogether, offering a clear
+       error message, instead of risking weird bugs and unexpected
+       behaviors in the generated Makefile.in.
+       * automake.in ($TEST_EXTENSION_PATTERN): Turned from a regular
+       expression ...
+       (is_valid_test_extension): ... into this subroutine.  Don't allow
+       generic @substitutions@ anymore (possibly making an exception for
+       address@hidden@' under the proper circumstances).
+       * tests/test-extensions.test: Adjust and extend.  This test does
+       not cause any internal error in automake anymore now.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'insthook.test'
+       * tests/insthook.test (Makefile.am): Add a proper `uninstall-hook'
+       target to remove the symlink created by the `install-exec-hook'
+       target; this prevents "make distcheck" from failing spuriously.
+       Since we are at it, delete an extra blank line, and add a trailing
+       `:' command.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failure
+       * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid
+       complaints from the `sc_no_brace_variable_expansions' maintainer
+       check.
+
+2011-10-18  Stefano Lattarini  <address@hidden>
+
+       * tests/yacc-dist-nobuild.test: Add reference to relevant bug#7884.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious error in 'test-extensions.test'
+       * tests/test-extensions.test: Call automake with the option
+       `--add-missing', to ensure the required script `test-driver'
+       gets installed.  Note that the test still fails due to an
+       internal error in automake, though.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       tests: avoid few useless uses of the `-e' make option
+       * tests/python12.test: Using `make -e' is not required to override
+       the DESTDIR variable, since this variable shouldn't be defined in
+       any automake-generated Makefile.in file.
+       * tests/man2.test: Likewise.
+       * tests/man5.test: Likewise.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       fix: make a test script executable
+       * tests/nobase-nodist.test: Make executable.
+
+2011-10-06  Stefano Lattarini  <address@hidden>
+
+       coverage: expose automake bug#9651
+       * tests/dist-auxfile.test: New test, xfailing.
+       * tests/dist-auxfile-2.test: Likewise.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
+
+2011-10-01  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: automake error our on invalid TEST_EXTENSIONS
+       This change fixes automake bug#9400.
+       * automake.in (handle_tests): Bail out if a suffix specified in
+       TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER'
+       variable or an invalid suffix rule.  Before this change, automake
+       would have issued a confusing error messages (about invalid or
+       non-POSIX variables being defined), and in some situations would
+       have even produced a broken `Makefile.in' file.
+       ($TEST_EXTENSION_PATTERN): New helper variable.
+       * doc/automake.texi (Simple Tests using parallel-tests): Document
+       the limitations on TEST_EXTENSIONS explicitly.
+       * NEWS: Update.
+       * tests/test-extensions.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       docs: don't suggest installing `.m4' files in hard-coded location
+       This change fixes automake bug#7988.
+       * doc/automake.texi (aclocal Options): State that the use of
+       the `--print-ac-dir' option to determine the directory where
+       third-party packages can install their `.m4' files is discouraged
+       now.
+       (Extending aclocal): Suggest telling the user about ACLOCAL_PATH.
+       * THANKS: Update.
+       Report by Peter Johansson.
+
+2011-09-26  Stefano Lattarini  <address@hidden>
+
+       distuninstallcheck: fail also when only one file is left installed
+       This change fixes automake bug#9579.
+       * lib/am/distdir.am (distuninstallcheck): Be stricter in ignoring
+       a potential `dir' file created by install-info and left installed.
+       Also, be more careful about "this can't happen" kind of errors.
+       (am__distuninstallcheck_listfiles): New internal helper macro.
+       * tests/distcheck-pr9579.test: New test.
+       * tests/distcheck-override-infodir.test: Likewise.
+       * tests/Makefile.am (TESTS): Add them.
+       * NEWS, THANKS: Update.
+       Report by Nick Bowler.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tap/awk: improve comments about Korn shell signal handling issues
+       * lib/tap-driver.sh: Link an Austin Group discussion about how
+       shells are allowed, and even encouraged, to set the special
+       variable `$?' to values greater than 256 to report termination
+       of a child by a signal.  Improve and extend comments about our
+       workarounds for unusual korn shell signals' propagation.
+       Thanks to Eric Blake for the pointers.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix usage of `cd' instead of `$(am__cd)'
+       * lib/am/inst-vars.am (am__uninstall_files_from_dir): Use
+       `$(am__cd)', not plain `cd'.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tap/awk: account for unusual korn shell signal handling behaviour
+       This change has been motivated by a testsuite failure on Debian
+       with the AT&T Korn Shell version 93u-1.
+       * lib/tap-driver.sh: Temporarily ignore some common signals when
+       waiting for the test command to complete, to avoid premature exit
+       in Korn shells that propagate to themselves signals that have
+       killed a child process.
+       See also related commit `v1.11-1342-g6321ad3'.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tap/awk: handle exit statuses > 256 (seen on few korn shells)
+       Some Korn shells, when a child process die due to signal number
+       n, can leave in $? an exit status of 256+n instead of the more
+       standard 128+n.  Apparently, both behaviours are allowed by
+       POSIX, so be prepared to handle them both.
+       This change has been motivated by a testsuite failure on Debian
+       with the AT&T Korn Shell version 93u-1.
+       * lib/tap-driver.sh (get_test_exit_message): Handle the described
+       Korn Shell behaviour too.
+       ($scriptversion): Update.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant workaround for Solaris /bin/sh
+       After previous commit `v1.11-1424-g27a399a', some workarounds for
+       Solaris 10 /bin/sh are no more required, and in fact they have
+       started causing XPASS results on Solaris.
+       * tests/tap-signal.tap: Remove unneeded workarounds for Solaris 10
+       /bin/sh.  Some related minor code reorganizations.
+
+2011-09-24  Stefano Lattarini  <address@hidden>
+
+       uninstall: "make uninstall" before "make install" works
+       This change fixes automake bug#9578.
+       * lib/am/inst-vars.am (am__uninstall_files_from_dir): New internal
+       macro, that defines a shell code fragment to uninstall files from
+       a given directory.
+       * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use it, to reduce code
+       duplication and improve consistency and correctness.
+       * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
+       * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
+       * lib/am/mans.am (uninstall-man%SECTION%): Likewise.
+       * lib/am/python.am (uninstall-%DIR%LIBRARIES): Likewise.
+       * lib/am/scripts.am (uninstall-%DIR%SCRIPTS): Likewise.
+       * tests/uninstall-pr9578.test: New test.
+       * tests/uninstall-fail.test: New test.
+       * tests/Makefile.am (TESTS): Add them.
+       * NEWS, THANKS: Update.
+       Report by Nick Bowler.
+
+2011-09-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix tests on aclocal search path precedences
+       * tests/aclocal-path-precedence.test: Call `$ACLOCAL' with the
+       proper overridden system acdir.
+
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in tests on TAP + signals
+       * tests/tap-signal.tap: Write the dummy test scripts as perl
+       scripts, not as shell scripts, to work around unportabilities
+       in the handling of signals.  In fact, even with bash, the older
+       script were unable to properly deliver a SIGQUIT to themselves
+       consistently.
+
+2011-09-26  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in test on ACLOCAL_PATH precedences
+       * tests/aclocal-path-precedence.test: Do not merely append to
+       `configure.in', it should be created from scratch.  Pass package
+       name and version to AC_INIT as arguments, otherwise autoconf will
+       complain.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
+       docs: remove mention of deprecated option `--acdir'
+       * doc/automake.texi (aclocal Options): Remove mention of
+       deprecated `--acdir' option.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Cleanup after botched merges.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typo.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
+       docs: document planned precedence changes in aclocal search path
+       * doc/automake.texi (Macro Search Path): Explicitly state that the
+       lookup order for extra directories of `.m4' files will be changed
+       in the next major release.
+       * NEWS: Likewise.
+
+2011-09-19  Paolo Bonzini  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       aclocal: handle ACLOCAL_PATH environment variable
+       * aclocal.in (parse_ACLOCAL_PATH): New function, parse ACLOCAL_PATH
+       as a colon-separated list of directories to be included in the
+       search path.
+       * doc/automake.texi (Macro Search Path): Document new behavior and
+       the precedence rules for various elements of the search path.
+       * tests/aclocal-path.test: New test.
+       * tests/aclocal-path-install.test: Likewise.
+       * tests/aclocal-path-install-serial.test: Likewise.
+       * tests/aclocal-path-precedence.test: Likewise.
+       * tests/aclocal-path-nonexistent.test: Likewise.
+       * tests/Makefile.am (TESTS): Add them.
+       * NEWS: Update.
+       * tests/distcheck-missing-m4.test: Extend by also checking
+       interactions with ACLOCAL_PATH.
+       * tests/distcheck-outdated-m4.test: Likewise, and fix a couple
+       of botched comments since we are at it.
+
+2011-09-19  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'primary-prefix-valid-couples.test'
+       * tests/primary-prefix-valid-couples.test: After commit
+       v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
+       combination by default anymore: one has to explicitly define
+       $(javadir) to make it so.  So just drop `java_JAVA' from our
+       Makefile.am  Also, since we are at it, ...
+       (configure.in): ... remove AM_PROG_GCJ from here, as it's not
+       really required.
+
+2011-09-19  Stefano Lattarini  <address@hidden>
+
+       docs: deprecate JAVA primary
+       * doc/automake.texi (Java): Deprecate the JAVA primary, stating
+       that it will become obsolete in automake 1.12 and probably removed
+       altogether in automake 1.13.  Reflect this in the section title,
+       by appending the string "(deprecated feature)".
+       (@menu, @detailmenu): Update.
+       (Java Support with gcj): The cross-referenced support for bytecode
+       compilation with the JAVA primary is rudimentary and deprecated.
+       State that explicitly.
+
+2011-09-19  Stefano Lattarini  <address@hidden>
+
+       docs: clearer distinction between `.java' with javac and with gcj
+       * doc/automake.texi (Java support): Rename this node ...
+       (Java support with gcj): ... to this, and change its title from
+       "Compiling Java sources" to "Compiling Java sources using gcj".
+       (@detailmenu, @menu, @cindex): Update and make more precise.
+       (Java): Change the title of this node from simply "Java" to
+       "Java bytecode compilation".
+       (@detailmenu, @menu, @cindex): Update and make more precise.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       java: complain if java_JAVA is used but $(javadir) is undefined
+       Fixes automake bug#8461.
+       * automake.in (handle_java): Remove inappropriate "java" argument
+       from the calls to `&am_install_var' and `&am_primary_prefixes'.
+       * tests/instdir-java.test (Makefile.am): Define `$(javadir)'.
+       * tests/javadir-undefined.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: expose automake bug#9546
+       * tests/test-driver-is-distributed.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add it.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       py-compile tests: more faithful 'installcheck' support
+       * tests/py-compile-basedir.test: Use the `$am_scriptsdir' variable
+       instead of `$testsrcdir/../lib', to test more faithfully under
+       "make installcheck".  More uses of the `fatal_' subroutine to
+       diagnose hard errors.
+       * tests/py-compile-basic.test: Likewise.
+       * tests/py-compile-basic2.test: Likewise.
+       * tests/py-compile-destdir.test: Likewise.
+       * tests/py-compile-env.test: Likewise.
+       * tests/py-compile-option-terminate.test: Likewise.
+       * tests/py-compile-usage.test: Likewise.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/aclocal-acdir.test: Do not set the `errexit' shell
+       flag, as it is already set by `tests/defs'.
+       * tests/aclocal-print-acdir.test: Likewise.
+       * tests/distcheck-missing-m4.test: Likewise.
+       * tests/distcheck-outdated-m4.test: Likewise.
+       * tests/java-clean.test: Likewise.
+       * tests/java-compile-install.test: Likewise.
+       * tests/java-compile-run-flat.test: Likewise.
+       * tests/java-compile-run-nested.test: Likewise.
+       * tests/java-mix.test: Likewise.
+       * tests/java-no-duplicate.test: Likewise.
+       * tests/java-nobase.test: Likewise.
+       * tests/java-rebuild.test: Likewise.
+       * tests/java-sources.test: Likewise.
+       * tests/java-uninstall.test: Likewise.
+       * tests/javaflags.test: Likewise.
+       * tests/nobase-nodist.test: Likewise.
+       * tests/py-compile-basedir.test: Likewise.
+       * tests/py-compile-basic.test: Likewise.
+       * tests/py-compile-basic2.test: Likewise.
+       * tests/py-compile-destdir.test: Likewise.
+       * tests/py-compile-env.test: Likewise.
+       * tests/py-compile-option-terminate.test: Likewise.
+       * tests/py-compile-usage.test: Likewise.  Since we are at it,
+       add an extra blank line, for clarity.
+
+2011-09-16  Stefano Lattarini  <address@hidden>
+
+       automake: remove special handling of `ANSI2KNR' make variable
+       * automake.in (define_configure_variable): Remove special-cased
+       handling of `ANSI2KNR' variable.  Related minor simplifications.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       coverage: test interactions of `nobase_' and `nodist_'
+       * tests/nobase-nodist.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       java: fix various blunders in test 'java-mix.test'
+       * tests/java-mix.test: Add missing call to `set -e'.  Fix inverted
+       semantics (`.java' files are expected *not* to be distributed by
+       default, not the other way round).  Fix various typos in the name
+       of the `.java' files.  Correct other minor blunders.  Improve some
+       comments.
+
+2011-09-15  Stefano Lattarini  <address@hidden>
+
+       automake: remove code duplication in 'handle_tests'
+       * automake.in (handle_tests): Factor out some code dealing with
+       test extensions and rules for generation of `.log' files into ...
+       (handle_per_suffix_test): ... this new subroutine.
+       * tests/parallel-tests-exeext.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-09-13  Peter Rosin  <address@hidden>
+
+       * tests/defs [$sh_errexit_works = yes]: Output 'SIGINT' for signal 2.
+
+2011-09-13  Stefano Lattarini  <address@hidden>
+
+       self tests: work around 'unset' spurious non-zero return value
+       * tests/self-check-exit.tap ($init): Unset the possibly already
+       unset variable `am_explicit_skips' when the `errexit' shell flag
+       is not yet active, for the benefit of shell that return a non-zero
+       status when unsetting an already-unset variable.
+
+2011-09-13  Stefano Lattarini  <address@hidden>
+
+       tests: an explicative comment on signal-related woes
+       * tests/self-check-exit.tap: Add pointer to a bug-autoconf
+       discussion explaining why this test needs to temporarily block
+       SIGINT.
+
+2011-09-13  Stefano Lattarini  <address@hidden>
+
+       tests: also trap SIGQUIT; other fixes
+       Some shells seems to just ignore SIGQUIT under some circumstances,
+       even when it is not blocked; however, if the signal it trapped,
+       the trap gets correctly executed.
+       * tests/defs [$sh_errexit_works = yes]: Also trap SIGQUIT. Add
+       extensive explanation of why we do so.
+       * tests/self-check-cleanup.tap: Improve and fix to ensure that an
+       earlier failure does not prevent the rest of the test to execute.
+       Problem revealed by a failure in `self-check-cleanup.tap'.
+
+2011-09-13  Stefano Lattarini  <address@hidden>
+
+       test defs: work around weird ksh behaviour w.r.t. signal handling
+       * tests/defs (is_blocked_signal): Use perl to determine whether a
+       signal is trapped, since trying to do it portably within the shell
+       means opening a nasty can of worms.
+       For more information and background, see:
+        <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+        
<http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
+        <http://www.cons.org/cracauer/sigint.html>
+
+2011-09-12  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix various typos and grammaros
+       * NEWS: Fix typos.
+       * tests/py-compile-basic.test: Likewise.
+       * tests/py-compile-basedir.test: Fix botched wording in comments.
+       * tests/py-compile-option-terminate.test: Fix typo and incomplete
+       comment.
+       Suggestions by Peter Rosin.
+
+2011-09-12  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant line from a test script
+       * tests/test-log.test (fail.test): Remove extra `echo' command,
+       probably due to a past copy&paste blunder.
+
+2011-09-11  Stefano Lattarini  <address@hidden>
+
+       tests: convert another test to TAP
+       * tests/primary-prefix-invalid-couples.test: Renamed ...
+       * tests/primary-prefix-invalid-couples.tap: ... to this, and
+       converted to the use of the TAP protocols (this requires only
+       very minimal changes this time).
+       * tests/list-of-tests.mk: Update.
+
+2011-09-11  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure on fast machines
+       * tests/aclocal-acdir.test: Avoid spurious failures due to caching
+       issues, by cleaning the autom4te cache between all the aclocal
+       invocations, and by always calling autoconf with the `--force'
+       flag.
+
+2011-09-10  Stefano Lattarini  <address@hidden>
+
+       tests: minor optimizations/simplifications in some aclocal tests
+       * acloca11.test: Instead of running ./configure and then grepping
+       the file it has produced, directly grep configure.  Add trailing
+       `:' command.
+       * acloca12.test: Likewise.
+       * acloca10.test: Likewise.  Also, remove the autom4te caches
+       by hand, instead of sleeping to ensure they get outdated and
+       ignored.
+       * aclocal9.test: Likewise.
+       * acloca18.test: Likewise.  Also, do not remove file `foo',
+       which is not being created anymore.
+       * acloca20.test: The test makes sense only if the system support
+       real symlinks, so skip it if this is not the case.  This allows
+       for various simplifications.
+
+2011-09-10  Stefano Lattarini  <address@hidden>
+
+       prove: avoid weird signal-related bug
+       * tests/defs (trap): In the trap code dealing with SIGPIPE
+       signal, ignore further signals of the same kind.
+       See also Test::Harness issue [rt.cpan.org #70855], archived at
+       <https://rt.cpan.org/Ticket/Display.html?id=70855>
+
+2011-09-10  Stefano Lattarini  <address@hidden>
+
+       tests: allow use of `prove' to run automake testsuite
+       * tests/prove-runner: New helper script; mostly it wraps
+       our `*.test' test scripts to make them runnable by the
+       `prove' utility.
+       * tests/Makefile.am (EXTRA_DIST): Distribute it.
+       (PROVE, AM_PROVEFLAGS, AM_PROVECMD): New variables.
+       (prove, installprove): New targets, used run the automake
+       testsuite through the `prove' utility.
+       * tests/gen-testsuite-part: For any considered dependency,
+       generate a variables that groups all the tests depending on
+       it.  This is especially useful for use in the new `prove'
+       and `installprove' targets, which cannot rely on make for
+       inter-test dependencies, and have to handle them "by hand".
+
+2011-09-10  Stefano Lattarini  <address@hidden>
+
+       tests defs: more namespace-safeness
+       ($using_tap): Renamed ...
+       ($am_using_tap): ... to this.
+       ($parallel_tests): Renamed ...
+       ($am_parallel_tests): ... to this.
+       ($test_prefer_config_shell): Renamed ...
+       ($am_test_prefer_config_shell): ... to this.
+       ($original_AUTOMAKE): Renamed ...
+       ($am_original_AUTOMAKE): ... to this.
+       ($original_ACLOCAL): Renamed ...
+       ($am_original_ACLOCAL): ... to this.
+       * tests/defs, tests/defs-static.in, tests/gen-testsuite-part,
+       tests/README, and all callers: Adjusted.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Adjust, and rewrite
+       to make future adjustments easier.
+       * tests/defs (funcs_file_): Renamed ...
+       (am_funcs_file): ... to this.
+       * Makefile.am (sc_tests_obsolete_variables): New maintainer
+       check.
+       (syntax_check_rules): Add it.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       aclocal: better URL reference in error message
+       * aclocal.in (scan_file): In the error message about underquoted
+       definitions, reference the automake page at `www.gnu.org', not
+       at `sources.redhat.com'.
+
+2011-09-10  Stefano Lattarini  <address@hidden>
+
+       tests: avoid creating useless files in some test directories
+       * tests/aclocal.test: Define `$am_create_testdir' to "empty"
+       before sourcing ./defs, to avoid bringing in unused auxiliary
+       files.  Related adjustments.
+       * tests/aclocal3.test: Likewise.
+       * tests/aclocal8.test: Likewise.
+       * tests/aclocal9.test: Likewise.
+       * tests/acloca10.test: Likewise.
+       * tests/acloca11.test: Likewise.
+       * tests/acloca12.test: Likewise.
+       * tests/acloca15.test: Likewise.
+       * tests/acloca16.test: Likewise.
+       * tests/acloca17.test: Likewise.
+       * tests/acloca18.test: Likewise.
+       * tests/acloca20.test: Likewise.
+       * tests/acloca21.test: Likewise.
+       * tests/acloca23.test: Likewise.
+       * tests/aclocal-print-acdir.test: Likewise.
+       * tests/ar-lib.test: Likewise.
+       * tests/compile.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/compile3.test: Likewise.
+       * tests/compile6.test: Likewise.
+       * tests/instsh2.test: Likewise.
+       * tests/instsh3.test: Likewise.
+       * tests/mdate5.test: Likewise.
+       * tests/mdate6.test: Likewise.
+       * tests/missing3.test: Likewise.
+       * tests/missing5.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/self-check-explicit-skips.test: Likewise.
+       * tests/self-check-report.test: Likewise.
+       * tests/self-check-sanity.test: Likewise.
+       * tests/tap-driver-stderr.test: Likewise.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       test defs: more environment cleanup
+       * tests/defs: Also unset the XFAIL_TESTS, and various
+       LOG_DRIVER, LOG_COMPILER variables (and corresponding
+       flags variable).
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       tests: allow depmod.tap to only run a subset of its tests
+       * tests/depmod.tap: If command-line arguments are passed to the
+       tests, they are now taken as the list of test names for which the
+       checks are to be run.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       tests: allow instspc.tap to only run a subset of its tests
+       * tests/instspc.tap: If command-line arguments are passed to the
+       tests, they are now taken as the list of test names for which the
+       checks are to be run.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       coverage: distcheck-hook to catch missing/outdated *.m4 files
+       Related to automake bug#9037.
+       * tests/distcheck-missing-m4.test: New test.
+       * tests/distcheck-outdated-m4.test: Likewise.
+       * tests/distcheck-hook-m4.am: New data file, used by the new
+       tests.
+       * tests/Makefile.am (distcheck-m4-missing.log,
+       distcheck-m4-outdated.log): Depend on it.
+       (EXTRA_DIST): Distribute it.
+       (TESTS): Add the new tests.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       tests: more granularity in variables for tools overriding
+       Among the other things, this change makes it possible to use, at
+       the same time, an autoconf version in the automake testsuite and
+       another one in the automake build system; even more importantly, it
+       makes it possible to use, say, a non-GNU make implementation in the
+       test scripts, while at the same time using GNU make to drive the
+       execution of the automake's test suite.
+       * tests/defs-static.in (TEX, EGREP, FGREP, SHELL, PERL, MAKE,
+       AUTOCONF, AUTOM4TE, AUTORECONF, AUTOHEADER, AUTOUPDATE,
+       original_AUTOMAKE, original_ACLOCAL): Allow and prefer overriding
+       through corresponding `AM_TESTSUITE_..' variables; for example,
+       $GREP can now be overridden by an exported `$AM_TESTSUITE_GREP'
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix `skip_row_' subroutine in tap-functions.sh
+       * tests/tap-functions.sh (skip_row_): Use `seq_', not `seq', to
+       be portable to non-GNU systems.
+       Bug revealed by a testsuite error on Solaris.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       installcheck: support it in our own testsuite
+       * NEWS: Update.
+       * tests/defs-static.in ($am_running_installcheck): New variable.
+       Initialize it to a default of "no", and sanity-check its value.
+       ($am_datadir, $am_docdir, $am_automake_acdir, $am_system_acdir,
+       $am_bindir, $am_scriptdir, $am_pkgvdir): New variables,
+       initialized from AC_SUBST'ed values which are adaptively chosen
+       depending on whether the testsuite is running in "simple" mode
+       or in "installcheck" mode.
+       ($MISSING): Remove, it's not really required by the testsuite.
+       ($PATH): Update using `$am_bindir', not `$testbuilddir'.
+       * Makefile.am (installcheck-local): New target.
+       * lib/Automake/tests/Makefile.am (installcheck-local): New target.
+       (AM_TESTS_ENVIRONMENT, AM_PL_LOG_FLAGS): Adaptively choose the
+       `-I' flags for perl based on whether the tests are being run by
+       "make check" or "make installcheck".
+       * tests/Makefile.am (installcheck-local): New target.
+       (defs-static): Generate it at make time, not at configure time,
+       in order to correctly resolve all the indirections in the
+       AC_SUBST'd variables; done with the help of ...
+       (do_subst): ... this new macro.
+       (EXTRA_DIST): Explicitly distribute `defs-static.in'.
+       (CLEANFILES): Remove `defs-static'.
+       * configure.ac (AC_CONFIG_FILES): Remove `tests/defs-static'.
+       (AC_SUBST): Substitute also `automake_acdir', `system_acdir',
+       `scriptdir' and `amdir' to proper values.
+       * lib/Makefile.am (scriptdir):  Don't explicitly define anymore.
+       * lib/am/Makefile.am (amdir): Likewise.
+       * m4/acdir/dirlist: Remove, it's not needed anymore.  Instead
+       use ...
+       * m4/acdir/.placeholder: ... this file.
+       * m4/Makefile.am (EXTRA_DIST): Update.
+       (automake_acdir, system_acdir): Don't explicitly define anymore.
+       * tests/aclocal-print-acdir.test: Use new `$am_...dir' variables,
+       instead of hard-coding values with $testsrcdir and $testbuilddir,
+       to test more faithfully under "make installcheck".
+       * tests/amhello-binpkg.test: Likewise.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+       * tests/ansi2knr-no-more.test: Likewise.
+       * tests/autodist-stamp-vti.test: Likewise.
+       * tests/auxdir.test: Likewise.
+       * tests/check2.test: Likewise.
+       * tests/copy.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/obsolete.test: Likewise.
+       * tests/parallel-tests-interrupt.test: Likewise.
+       * tests/repeated-options.test: Likewise.
+       * tests/suffix5.test: Likewise.
+       * tests/tap-doc2.test: Likewise.
+       * tests/txinfo22.test: Likewise.
+       * tests/vtexi3.test: Likewise.
+       * tests/defs: Likewise.  Also, print the values of `$using_tap'
+       and `$am_running_installcheck', to simplify debugging, and do
+       some related code movings and tweakings.
+       * tests/aclocal3.test: Update to avoid possible spurious failures
+       when running under "make installcheck".
+       * tests/warnings-unknown.test: Likewise.
+       * tests/location.test: Likewise, and improve debugging input since
+       we are at it.
+       * tests/acloca10.test: Adapt and tweak to work also during a
+       "make installcheck", and not to require a pre-populated `dirlist'
+       file.
+       * tests/acloca18.test: Likewise.
+       * tests/dirlist2.test: Likewise.
+       * tests/dirlist.test: Likewise, and remove an obsolete comment.
+       * tests/README: Update.
+       * tests/dirlist-abspath.test: New test.
+       * tests/list-of-tests.mk: Update.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failures
+       * tests/gen-testsuite-part (write_wrapper_script): More uses of
+       creative quoting in the generated tests, to avoid triggering
+       failures in the `sc_tests_Exit_not_exit' maintcheck.
+       * Makefile.am (sc_tests_tap_plan): It's OK for auto-generated
+       TAP tests that sources an hand-written one not to declare a TAP
+       plan: the sourced test will do so.
+       * tests/Makefile.am (checked_test_extensions): Don't define
+       anymore, the default value `$(TEST_EXTENSIONS)' is correct now.
+       (expected_list_of_tests): Don't define anymore, the default
+       value `$(TESTS)' is correct now.
+
+2011-09-06  Stefano Lattarini  <address@hidden>
+
+       aclocal: more granularity in acdir overriding
+       Before this change, using the `--acdir' option caused aclocal to
+       redefine both the directory of automake-provided m4 macros and the
+       directory of third-party system-wide m4 macros.  With this change,
+       we deprecate the `--acdir' aclocal option, and introduce two new
+       options `--automake-acdir' and `--system-acdir', to allow for more
+       granularity.
+       * aclocal.in (@automake_includes, @system_includes,
+       @user_includes): Fix and extend comments.
+       (usage): Update.
+       (handle_acdir_option): New function.
+       (parse_arguments): Recognize new options `--system-acdir' and
+       `automake-acdir', and handle `--acdir' using the new function
+       above.  Simplify logic by assuming that the directory of
+       third-party system-wide m4 files always exists.
+       * tests/aclocal.in: Update to use the new options, instead of
+       the deprecated. `--acdir'.
+       * m4/dirlist: Move ...
+       * m4/acdir/dirlist: ... here.
+       * m4/Makefile.am (EXTRA_DIST): Update.
+       (m4datadir): Rename ...
+       (automake_acdir): ... to this.  Accordingly, ...
+       (dist_m4data_DATA): ... rename this ...
+       (dist_automake_ac_DATA): ... to this.
+       (system_acdir): New, directory.
+       (dist_system_ac_DATA): New, defined to an empty value; this will
+       ensure that the $(system_acdir) directory will be created by
+       "make install".
+       * tests/aclocal.test: Remove check about the `--print-ac-dir'
+       option of aclocal, it has been moved into ...
+       * tests/aclocal-print-acdir.test: ... this new test, and quite
+       extended.
+       * tests/aclocal-acdir.test: New test.
+       * tests/Makefile.am (TESTS): Add the new tests.
+       * NEWS, bootstrap: Update.
+       * doc/automake.texi (aclocal Options, Macro Search Path): Update.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       cosmetic: rename gen-tests-deps -> gen-testsuite-part
+       * tests/gen-tests-deps: Renamed ...
+       * tests/gen-testsuite-part: ... to this.
+       * bootstrap: Update.
+       * tests/Makefile.am ($(srcdir)/tests-deps.am): Don't generate
+       nor include this ...
+       ($(srcdir)/testsuite-part.am): ... do with this instead.
+       * tests/.gitignore (tests-deps.am): Don't ignore this ...
+       (testsuite-part.am): ... ignore this instead.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: revamp generation of autogenerated tests
+       With this change, we make generated tests be real scripts again
+       -- albeit only thin layers around the tests they wrap.  It turned
+       out that the apparently clever tricks we played by having lots
+       of custom (and auto-generated) `..._LOG_COMPILER' variables and
+       by having the tests in $(wrap_TESTS) not being real on-file-system
+       scripts caused more pain and confusion than expected, for only
+       marginal gains.  Also, that previous setup didn't interact very
+       well with "make check RECHECK_LOGS=", since the log files for
+       the "wrappee" tests were always considered out-of-date (which in
+       hindsight is natural, since these log files depended on wrappee
+       tests that didn't exist -- and weren't created).  And finally, it
+       wasn't possible to easily and naturally run the wrappee tests
+       from the command line -- definitely harmful for debugging and
+       sanity checking.
+       * tests/gen-wrap-tests: Deleted, its role subsumed into ...
+       * tests/gen-tests-deps: ... this script, with the help of
+       (unindent, atomic_write, build_matcher, write_wrapper_script,
+       %test_generators): ... these new functions and variables.
+       Other few minor fixlets and improvements.
+       * tests/wrap-tests.sh: Delete, not needed anymore.
+       * tests/Makefile.am ($(srcdir)/wrap-tests.am): Don't generate
+       nor include anymore.
+       (EXTRA_DIST): Update.
+       (wrap_TESTS): Renamed to ...
+       (generated_TESTS): ... this.
+       ($(generated_TESTS)): Must have the same dependencies of
+       `$(srcdir)/tests-deps.am'.
+       Other minor related reordering and adjustments.
+       * bootstrap: Do not generate `wrap-tests.am' anymore.
+       * tests/.gitignore (wrap-tests.am): Don't ignore anymore.
+       (*-w.test, *-w.tap): Ignore.
+       * tests/README: Update paragraph on automatically-generated
+       tests.
+
+2011-09-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: automatize generation of dependencies for tests
+       * tests/gen-test-deps: New script, automatically generates
+       dependencies for the tests.
+       * tests/Makefile.am (EXTRA_DIST): Distribute it.
+       ($(srcdir)/tests-deps.am): New rule.
+       (include $(srcdir)/tests-deps.am): New inclusion.
+       Remove hand-written dependencies for tests.  Other related
+       updates.
+       * tests/list-of-tests (tap_with_common_setup_TESTS,
+       tap_other_TESTS): Delete, their content merged back into ...
+       (handwritten_TESTS): ... this.
+       * tests/.gitignore (tests-deps.am): New ignored file.
+       * bootstrap: Generate `tests/tests-deps.am'.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failure due to bug in older TAP::Parser
+       Older TAP::Parser versions (e.g., 3.10) erroneously convert a test
+       number `0' into `1'; do not let this bug cause a spurious failure
+       in our testsuite.
+       * tests/tap-test-number-0.test: Skip if the aforementioned
+       TAP::Parser bug is detected.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tap/perl: be more portable to older perl versions
+       * lib/tap-driver.pl (trap_perl_warnings_and_errors): Do not use
+       the three-args version of the `open' builtin, it is not well
+       supported by older perl versions (at least perl 5.6.2).
+       (start): Add a no-op statement to pacify a "possible typo ... used
+       only once" perl warning.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tap/perl: be more portable to older TAP::Parser versions
+       * lib/tap-driver.pl (start): Do not call the `ignore_exit' method
+       on our TAP parser: it is not supported in older TAP::Parser
+       versions (e.g., 3.10), and is not really required by our usage of
+       the parser object.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious Cygwin failure of a test on TAP support
+       * tests/tap-bad-prog.tap (noexec.test): Add forgotten `echo'.
+       When trying to run it, redirect its output to /dev/null, to
+       avoid confusing automake's testsuite own TAP driver.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       test defs: fix glitch in TAP version of `warn_' function
+       * tests/tap-functions.sh (warn_): Do not display the warning
+       message two times.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix another spurious failure due to ignored signals
+       * tests/tap-signal.test: Renamed ...
+       * tests/tap-signal.tap: ... to this, converted to the use of the
+       TAP protocol, and improved not to try to use/trap signals that
+       are ignored by the parent shell (they will be forcibly ignored
+       by all the child processes too).  Extend the test a bit since we
+       are at it.
+       * tests/list-of-tests.mk: Update.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix a spurious failure due to lacking Fortran compilers
+       * tests/silent-many-generic.test (configure.in): Cause the test
+       to be skipped if `configure' fails to find working C++, Fortran
+       and Fortran 77 compilers.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       self tests: more use of TAP
+       * tests/self-check-reexec.test: Renamed ...
+       * tests/self-check-reexec.tap: ... to this, converted to the
+       use of TAP protocol, and extended a bit.
+       * tests/self-check-seq.test: Renamed ...
+       * tests/self-check-seq.tap: ... to this, and converted to the
+       use of TAP protocol.
+       * tests/list-of-tests.mk: Update.
+
+2011-09-07  Stefano Lattarini  <address@hidden>
+
+       self tests: fix spurious failures when /bin/ksh do not exists
+       * tests/self-check-reexec.test: Ensure that the non-bash shells
+       we look do really exists.  Since we are at it, also try the name
+       `ash', non `dash', for the Almquist Shell, for Cygwin 1.5.
+
+2011-09-06  Stefano Lattarini  <address@hidden>
+
+       tests: more use of TAP in our own testsuite
+       * tests/parallel-tests-interrupt.test: Renamed ...
+       * tests/parallel-tests-interrupt.tap: ... to this, and converted
+       to the use of TAP protocol.
+       * tests/self-check-cleanup.test: Renamed ...
+       * tests/self-check-cleanup.tap: ... to this, and converted to the
+       use of TAP protocol.
+       * tests/self-check-dir.test: Renamed ...
+       * tests/self-check-dir.tap: ... to this, and converted to the use
+       of TAP protocol.
+       * tests/self-check-is_newest.test: Renamed ...
+       * tests/self-check-is_newest.tap: ... to this, and converted to
+       the use of TAP protocol.
+       * tests/self-check-unindent.test: Renamed ...
+       * tests/self-check-unindent.tap: ... to this, and converted to
+       the use of TAP protocol.
+       * tests/list-of-tests.mk: Update.
+
+2011-09-06  Stefano Lattarini  <address@hidden>
+
+       self tests: sanity check on 'is_blocked_signal' function
+       * tests/self-check-is-blocked-signal.tap: New test.
+       * tests/list-of-tests.mk: Update.
+
+2011-09-06  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures due to ignored signals
+       * tests/defs (is_blocked_signal): New function.
+       * tests/parallel-tests-interrupt.test: Do not try to use/trap
+       signals that are ignored by the parent shell: they will be
+       ignored by all the child processes too.
+       * tests/self-check-exit.test: Likewise.
+       * tests/self-check-cleanup.test: Likewise, and do few minor
+       improvements and extensions since we are at it.
+
+2011-09-05  Peter Rosin  <address@hidden>
+
+       * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
+
+2011-09-04  Stefano Lattarini  <address@hidden>
+
+       fix: list test 'vala-vpath.test' in XFAIL_TESTS
+       * tests/Makefile.am (XFAIL_TESTS): Update.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
+       tests: simplify wrapper for aclocal
+       * tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
+       extra `-I' flags; they are not really required, since the file
+       `m4/amversion.m4' is generated in the srcdir anyway.
+       * tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
+       * tests/acloca18.test: Likewise.
+       * tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
+       not export it.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * doc-parsing-buglets-colneq-subst.test: Do not set the
+       `errexit' shell flag, as it is already set by `tests/defs'.
+       * doc-parsing-buglets-tabs.test: Likewise.
+       * java-empty-classpath.test: Likewise.
+       * vala-vpath.test: Likewise.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
+       tests: more uses of `$top_testsrcdir', in the `amhello' tests
+       * tests/amhello-binpkg.test: Use `$top_testsrcdir' instead
+       of `$testsrcdir/..'.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
+       tests: avoid creating useless files in the `amhello' tests
+       * tests/amhello-binpkg.test: Define `$am_create_testdir' to
+       "empty" before sourcing ./defs, to avoid bringing in unused
+       auxiliary files.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
+       coverage: vala support failing for VPATH from-scratch builds
+       * tests/vala-vpath.test: New test, xfailing.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update.
+       From a report by Zbigniew Jędrzejewski-Szmek.
+       Related to automake bug#8753.
+
+2011-09-01  Stefano Lattarini  <address@hidden>
+
+       docs: report few more automake parsing limitations
+       Partly motivated by automake bug#8360.
+       * doc/automake.texi (General Operation): Report few more automake
+       limitations w.r.t. parsing of unusual makefile constructs.  Related
+       minor reorderings.
+       * tests/doc-parsing-buglets-colneq-subst.test: New test.
+       * tests/doc-parsing-buglets-tabs.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-09-01  Stefano Lattarini  <address@hidden>
+
+       automake: fix regression due to de-ansification support removal
+       The last change `v1.11-947-g136b489' removed code that automake
+       was using to decide whether binary objects were built by the
+       generated Makefile.in, so that it could avoid to emit unneeded
+       code when this was not the case.  Re-introduce such code in a
+       less-obfuscated form, and add a test to ensure we don't regress
+       again.
+       * automake.in ($must_handle_compiled_objects): New global
+       variable, telling whether the generated Makefile has to build
+       compiled objects.
+       (initialize_per_input): Reset it.
+       (handle_programs, handle_libraries, handle_ltlibraries): Set
+       it to a true value when required.
+       (handle_compile): Don't generate any code if the variable
+       `$must_handle_compiled_objects' is not set to a true value.
+       * tests/no-extra-makefile-code.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       automake: cleanups after de-ansification support removal (2)
+       * automake.in ($get_object_extension_was_run): Remove, it's not
+       really needed anymore.
+       (&get_object_extension): Remove, it's a no-op now.
+       All callers adjusted.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       automake: cleanups after de-ansification support removal (1)
+       * automake.in (lang_c_rewrite, handle_single_transform): Rename
+       variable `$nonansi_obj' to `$obj'.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       ansi: remove obsolete code/files for de-ANSI-fication support
+       * lib/ansi2knr.1, lib/ansi2knr.c: Deleted.
+       * lib/Makefile.am (dist_pkgvdata_DATA): Do not list them anymore.
+       * lib/am/ansi2knr.am: Delete.
+       * lib/am/Makefile.am (dist_am_DATA): Do not list it anymore.
+       * lib/Automake/Variable.pm (%_am_macro_for_var): Remove entries for
+       `ANSI2KNR' and `U'.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Don't care anymore
+       about possible definition of the `$U' variable.
+       * automake.in (@common_files): Drop `ansi2knr.1' and `ansi2knr.c'.
+       (struct): Remove scalar field `ansi'.
+       All callers adjusted.
+       (&lang_c_finish, %de_ansi_files): Remove, they're not required
+       anymore.
+       All callers adjusted.
+       ($get_object_extension_was_run): Fix typo in comment.
+       (&get_object_extension): Drop code dealing with de-ansification;
+       this function basically a no-op now, but is required to properly
+       initialize `$get_object_extension_was_run' variable.
+       (&handle_languages, &handle_compile, &lang_c_rewrite): Drop code
+       dealing with de-ansification.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       ansi: reject attempts to use automatic de-ANSI-fication support
+       * tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called.
+       * lib/Automake/Options.pm (_process_option_list ): Error out
+       with a proper error message when the `ansi2knr' option is used.
+       Related updates to comments.
+       * tests/depacl2.test: Update.
+       * tests/ansi2knr-no-more.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       tests: remove tests about obsolete de-ANSI-fication support
+       * tests/ansi.test: Delete.
+       * tests/ansi10.test: Likewise.
+       * tests/ansi2.test: Likewise.
+       * tests/ansi2knr-deprecation.test: Likewise.
+       * tests/ansi3.test: Likewise.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi4.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi8.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/cxxansi.test: Likewise.
+       * tests/libobj8.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       docs: remove description of de-ANSI-fication support from manual
+       * doc/automake.texi (Auxiliary Programs): Remove mention of
+       `ansi2knr.c' and `ansi2knr.1'.
+       (Obsolete Macros): Remove mention of `AM_C_PROTOTYPES'.  Do not
+       index it nor variables `ANSI2KNR' and `U' anymore.
+       (List of Automake options): Remove mention of `ansi2knr' option,
+       and obsolete entries for concept and option indexes.
+       (Optional): Remove entry about `AM_C_PROTOTYPES'.
+       (@c LocalWords): Remove `ansi' and `knr'.
+       (@menu, @detailmenu): Remove entries about de-ANSI-fication
+       support.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: better respect of TAP usage in wrapped tests
+       * tests/gen-wrap-tests: Partial rewrite to take into account the
+       possibility that the wrapped test uses the TAP protocol.  This
+       complicates the code quite a bit, but is essential to ensure real
+       correctness in all the wrapped scripts.
+       * tests/wrap-tests.sh: Update, and add few more sanity checks.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: use both perl and awk implementations for tests on TAP
+       * tests/gen-wrap-tests (get_list_for_pltap): New function, gets
+       the list of tests that check the Automake TAP support.
+       ($defines_for_pltap): New variable.
+       ($wrapper_type_list): Add "pltap".
+       * tests/defs-static.in: Check that `$am_tap_implementation' is
+       not exported in the environment.
+       * tests/self-check-env-sanitize.tap: Update.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: two single auxiliary scripts to run/generate wrapped tests
+       * tests/config-shell-tests.sh, tests/parallel-tests.sh,
+       tests/gen-config-shell-tests, tests/gen-parallel-tests: Deleted,
+       their roles taken over by ...
+       * tests/wrap-tests.sh, tests/gen-wrap-tests: ... these new more
+       general scripts.
+       * tests/Makefile.am (EXTRA_DIST): Distribute the new scripts, and
+       do not distribute the obsolete ones anymore.
+       ($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am): Do
+       not include nor generate anymore, they have been superseded by ...
+       ($(srcdir)/wrap-tests.am): ... this new fragment, automatically
+       generated by `gen-wrap-tests'.
+       (PTEST_LOG_COMPILER, SHTST_LOG_COMPILER): Delete, they are now
+       defined in the new `wrap-tests.am' makefile fragment.
+       (TEST_EXTENSIONS): Do not append to it anymore, that is now done
+       by the new `wrap-tests.am' makefile fragment above.
+       ($(parallel_tests:.ptest=.log), $(config_shell_tests:.shtst=.log),
+       $(parallel_tests), $(config_shell_tests): Remove this dependencies,
+       superseded by ...
+       ($(wrap_TESTS), $(wrap_LOGS)): ... these ones.
+       (MAINTAINERCLEANFILES): Delete, it's not used anymore.
+       (TESTS): Do not contain anymore `$(config_shell_tests)' nor
+       `$(parallel_tests)', contain `$(wrap_TESTS)' instead, as defined
+       by `$(srcdir)/wrap-tests.am'.
+       Other related minor edits and reorderings.
+       * bootstrap, tests/.gitignore, tests/README: Update.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: list of tests placed in a separate Makefile fragment
+       This change allows us to easily use make instead of by-hand (and
+       more fragile) grepping to extract the list of hand-written tests
+       from our Makefiles.
+       * bootstrap (BOOTSTRAP_MAKE): New variable.
+       Use it to run make in order to extract the list of hand-written
+       tests from ...
+       * tests/list-of-tests.mk: ... this new file, where they are
+       listed in ...
+       (handwritten_TESTS, tap_with_common_setup_TESTS, tap_other_TESTS):
+       ... these variables, extracted respectively from ...
+       * tests/Makefile.am (handwritten_tests, tap_other_tests,
+       tap_with_common_setup_tests): ... these older variables, now
+       removed.
+       (EXTRA_DIST, expected_list_of_tests): Update w.r.t. the variable
+       names' changes.
+       (include $(srcdir)/list-of-tests.mk): New inclusion.
+       Remove an overkill indirection, and with it ...
+       (tap_with_common_setup_logs): ... this variable.
+       ($(srcdir)/parallel-tests.am, $(srcdir)/config-shell-tests.am):
+       Update to match the new interface of ...
+       (gen-parallel-tests, gen-config-shell-tests): ... these scripts,
+       that now read the list of tests from the standard input.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: prefer AM_... variables to user-reserved ones in Makefile
+       * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
+       (AM_TAP_LOG_DRIVER_FLAGS): ... to this.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: some minor fixlets w.r.t. TAP-based tests
+       The variable that is used by our test scripts to decide whether
+       they are "plain" or TAP-based is `using_tap'; however, some
+       peripheral sanity checks and sanitization code in our testsuite
+       were erroneously using the `use_tap' variable instead.  Fix that.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Nullify `using_tap',
+       not `use_tap'.
+       * tests/defs-static.in: Check that `using_tap', not `use_tap',
+       is not exported.
+       * tests/self-check-env-sanitize.test: Update.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: avoid re-running a test with the 'parallel-tests' option
+       * tests/backcompat5.test (parallel_tests): Define to "no", to
+       prevent the generation of a sibling test script that uses the
+       'parallel-tests' driver.  That would be useless anyway, since
+       we manually override the contents of configure.in, thus clobbering
+       the `parallel-tests' option in AM_INIT_AUTOMAKE.
+       Fix a typo in comments since we are at it.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: defaults to awk+shell driver in tests on TAP support
+       * tests/defs ($am_tap_implementation): Default to "shell", not
+       to "perl".
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tests: list "forgotten" test script in TESTS
+       * tests/Makefile.am (TESTS): Also list ...
+       * tests/java-empty-classpath.test: ... this test.  Since we are
+       at it, remove trailing whitespace from a couple of lines.
+
+2011-08-25  Eric Blake  <address@hidden>
+
+       ylwrap: fix unusual indentation whitespace
+       * lib/ylwrap: Convert tabs to spaces.
+       Reported by Karl Berry.
+
+2011-08-28  Stefano Lattarini  <address@hidden>
+
+       testsuite: different test scripts cannot share the same basename
+       If two test scripts have the same basename, they will end up
+       sharing the same log file, leading to all sort of undefined and
+       undesired behaviours.  Add a Makefile check verifying that this
+       is not the case.
+       * tests/test-logs-repeated.test: New test, verifying previously
+       unspecified semantics (in the definition of $(TEST_LOGS) from
+       $(TESTS)) that we use in our new check.
+       * tests/Makefile.am (TESTS): Update.
+       (check-no-repeated-test-name): New .PHONY check.
+       (check-local): Depend on it.
+
+2011-08-26  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure for awk implementation of TAP driver
+       * tests/tap-realtime.test: The awk+shell implementation of the TAP
+       driver must "read ahead" of one line in order to catch the exit
+       status of the test script it runs.  So, in the TAP-producer script
+       here, be sure to echo one "dummy" line after each TAP result line
+       in order not to cause false positives.
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tap/awk: allow escaping of TAP directives
+       * lib/tap-driver.sh (setup_result_obj): Handle escaping of TAP
+       directives in a way tat is (mostly) compatible by what is done
+       by the TAP::Parser module.
+       With this change, the tests `tap-escape-directive.test' and
+       `tap-escape-directive-2.test' now also pass with the shell/awk
+       implementation of the TAP driver.
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       coverage: more about escaping of TAP directives
+       * tests/tap-escape-directive.test: Make grepping of testsuite
+       progress output slightly stricter.
+       * tests/tap-escape-directive-2.test: New test (failing with the
+       awk implementation of the TAP driver).
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tap: improve syncing between awk+shell and perl implementations
+       * lib/tap-driver.pl (stringify_test_result): Renamed ...
+       (stringify_result_obj): ... to this.  Break up a clause in the
+       long "if/elsif/.../else" construct to avoid unaesthetic line
+       breaks and to be more synced with the sibling function in
+       `tap-driver.sh'.  Rename the `$result', `$PASS' and `$FAIL'
+       variables to respectively `$result_obj', `$COOKED_PASS' and
+       `$COOKED_FAIL', for clarity and better syncing.
+       (handle_tap_test): Renamed  ...
+       (handle_tap_result): ... to this, and change the name of the
+       `$test' local variable to `$result_obj'.
+       (extract_comment): Reimplement using the simpler `index' and
+       `substr' builtins, rather than with more advanced uses of
+       regular expressions.
+       (%test_results, @test_results): Renamed respectively ...
+       (%test_results_seen, @test_results_list): ... to these, and
+       related adjustments throughout the `TEST_RESULTS' block.
+       (main, get_global_test_result): Refactor and do some cosmetic
+       changes to make these functions clearer and better synced with
+       sibling code in `tap-driver.sh'.
+       Other minor cosmetic and typo fixes.
+       * lib/tap-driver.sh (extract_tap_comment): Remove outdated
+       "FIXME" comments.
+       (get_global_test_result): Small reordering to make it better
+       synced with its sibling function in `tap-driver.pl'.
+       (stringify_result_obj): Consistently use `result_obj' as the
+       parameter name.
+       Other minor cosmetic and typo fixes.
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tap/perl: don't redirect perl warnings/errors to log files
+       With this change, the test `tap-driver-stderr.test' also passes
+       with the perl implementation of the TAP driver.
+       * lib/tap-driver.pl (start): Save the original stderr into the
+       `OLDERR' file handle, and call ...
+       (trap_perl_warnings_and_errors): ... this new function, trapping
+       the `__WARN__' and `__DIE__' "pseudo-signals" to ensure that the
+       warning and error messages goes to that original stderr stream.
+       Since we are at it, be sure to prepend all possible "die" message
+       with the name of the script as given by the `$ME' variable.
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tap/perl: add copyright notice, version string, and emacs stuff
+       * lib/tap-driver.pl: Add proper copyright notice and bug reporting
+       address.  Remove obsolete heading comments.  Add trailing comments
+       for emacs w.r.t. code-formatting rules and automatic updating of
+       the date-based script version saved into the `$VERSION' variable.
+       ($VERSION): Define to the current UTC date.
+
+2011-08-24  Stefano Lattarini  <address@hidden>
+
+       tap/awk: don't redirect awk stderr to log files
+       * lib/tap-driver.sh: Handle the file descriptors redirections
+       more smartly, to avoid sending error messages from awk (about
+       e.g. syntax or I/O errors) to the log files instead that to the
+       console.
+       * tests/tap-driver-stderr.test: New test, verifying the improved
+       driver behaviour.  Notice that this test still fails when using
+       the perl implementation of the TAP driver.
+       * tests/Makefile.am (tap_other_tests): Update.
+
+2011-08-24  Stefano Lattarini  <address@hidden>
+
+       tap/awk: remove obsolete "FIXME" comment
+       * lib/tap-driver.sh: Remove obsolete "FIXME" comment about our
+       driver losing the exit status of the tested program; this issue
+       has been solved in precedent commit `v1.11-1052-gd630a0d'.  Fix
+       an unrelated typo in comments since we are at it.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure on Solaris
+       * tests/tap-signal.test (signal_caught): Fix a regression from
+       commit `v1.11-1052-gd630a0d' that was causing this test to fail
+       spuriously on Solaris (due to an already worked-around Solaris
+       /bin/sh bug, see commit `v1.11-981-g0ef3ef5').
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       testsuite: use the new awk+shell TAP driver in our own testsuite
+       * tests/Makefile.am (TAP_LOG_DRIVER): Redefine to use the new
+       awk+shell tap driver, which should be complete enough for use in
+       a "controlled" production environment.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: handle non-zero exit status from the test command
+       * lib/tap-driver.sh (get_test_exit_message): New function in the
+       awk script, used to extract the exit status of the test program,
+       or at least a good guess of it.
+       (write_test_results): Use it, reporting an ERROR result if it
+       detects that the test program exited with a non-zero status.
+       * tests/tap-signal.test: Account for the differences in the
+       error messages generated by the awk and perl TAP drivers.  Fix
+       an unrelated typo in comments since we are at it.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: prepare to fetch the exit status of the test command
+       * lib/tap-driver.sh: Rewrite some logic in the main parsing loop,
+       to make it possible to read the exit status of the test command
+       from the last line of the input stream.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: refactor for future changes
+       * lib/tap-driver.sh: Rewrite the awk script so that the parsing
+       of the input stream is implemented as a hand-rolled loop in the
+       BEGIN block, using the `getline' builtin.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure if rst2html program is missing
+       * tests/tap-html.test ($required): Require `rst2html'.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: support Solaris /usr/xpg4/bin/awk
+       * lib/tap-driver.sh: Use `\t', not `\\t', to represent tabulation
+       character in regexps, even when inside double-quoted strings; that
+       seems to be more portable to Solaris 10 XPG4 awk.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: support Solaris /usr/bin/nawk
+       * lib/tap-driver.sh (close_or_die): Remove, the use of the `close'
+       builtin in there was confusing /usr/bin/nawk from Solaris 10 into
+       a syntax error.
+       (write_test_results): Simply use `close' on the `*.trs' file, that
+       should be enough.
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       tap/awk: correctly extract message from SKIP plans
+       * lib/tap-driver.sh (/^1\.\.0+[ \t]*#/): Add a forgotten `?' to
+       the regex used to extract the skip message from a "1..0" TAP plan.
+       * tests/planskip.test: Check for the just-fixed bug.
+       * tests/tap-planskip-unplanned-corner.test: Don't be too strict
+       w.r.t. the formatting of the "skip whole test" message, to avoid
+       failing due to bugs irrelevant for this test (like the one just
+       fixed).
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       tap/awk: support colorized output
+       * lib/tap-driver.sh: Pass definition of colors to the BEGIN block
+       of the awk script, using ...
+       ($init_colors): ... this new variable, which supersedes ...
+       ($red, $grn, $lgn, $blu, $mgn, $std): ... these variables, which
+       have been consequently removed.
+       ($color_tests): We don't have to pass this anymore to the awk
+       script, so do not convert it to a numeric boolean.
+       (decorate_result): Implement for real.
+       With this change, the test 'tap-color.test' now passes.
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       tap: real (but still incomplete) awk implementation of TAP driver
+       * lib/tap-driver.sh: Add an incomplete, but mostly working,
+       implementation of a TAP parser and driver in awk.  It doesn't yet
+       support colorized output, fetching of exit status from test
+       programs, nor a way to escape TAP directives in TAP result lines,
+       but passes all the tests of TAP support in the automake testsuite,
+       apart from the following ones:
+         - tap-color.test
+         - tap-escape-directive.test
+         - tap-exit.test
+         - tap-missing-plan-and-bad-exit.test
+         - tap-passthrough-exit.test
+         - tap-planskip-badexit.test
+         - tap-planskip-unplanned-corner.test
+         - tap-signal.test
+       Tested on Debian GNU/Linux with GNU awk 3.1.7 and 3.0.2, "original
+       awk" 2010-05-23-1, and mawk 1.3.3-15 (with which also the test
+       `tap-realtime.test' fails, in addition to those listed above).
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix spurious failure due to Solaris 'wc' incompatibility
+       * tests/tap-number-wordboundary.test ($planned): Strip any extra
+       whitespace from the output of `wc', to cater to Solaris 10.
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       coverage: keyword "SKIP" in TAP plan is case-insensitive
+       * tests/tap-planskip-case-insensitive.test: New test.
+       * tests/tap-planskip.test: Remove now-duplicated checks.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       coverage: ambiguous use of TAP "TODO"/"SKIP" directives
+       * tests/tap-ambiguous-directive.test: New test.
+       * tests/tap-todo-skip-together.test: Reference it in heading
+       comments.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-21  Stefano Lattarini  <address@hidden>
+
+       coverage: non-directive comments in TAP results are preserved
+       * tests/tap-result-comment.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-20  Stefano Lattarini  <address@hidden>
+
+       coverage: TAP result number followed by non-whitespace word boundary
+       * tests/tap-number-wordboundary.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-20  Stefano Lattarini  <address@hidden>
+
+       coverage: a TAP result numbered "0" is always out-of-order
+       * tests/tap-test-number-0.test: New, checks that a test result
+       numbered as 0 is to be considered out-of-order; this is
+       consistent with the behaviour of the `prove' utility.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-20  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix botched indentation in perl TAP driver
+       * lib/tap-driver.pl (main, Getopt::Long::GetOptions): Fix
+       improper or botched indentation.
+
+2011-08-20  Stefano Lattarini  <address@hidden>
+
+       coverage: some more tests on corner cases of TAP support
+       * tests/tap-no-spurious.test: Extend checks verifying that a line
+       matching, say, the regex "^ok[a-zA-Z0-9_]" is *not* considered a
+       TAP result.
+       * tests/tap-no-spurious-numbers.test: New test, checking that our
+       TAP driver doesn't spuriously recognize as TAP result numbers what
+       is not (even if it seems pretty close).
+       * tests/tap-negative-numbers.test: New test, checking that our
+       TAP driver doesn't spuriously recognize negative TAP result
+       numbers, but correctly interprets them as test descriptions
+       instead.
+       * tests/tap-plan-leading-zero.test, tap-numbers-leading-zero.test:
+       New tests, checking how our driver fares in recognizing numbers
+       with leading zeroes in TAP results or TAP plans.
+       * tests/tap-planskip-malformed.test: New test, checking that a
+       malformed TAP plan is not recognized as a valid plan.
+       * tests/tap-plan-whitespace.test: New test, checking that a TAP
+       plan line with trailing whitespace is recognized and handled
+       correctly.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-19  Stefano Lattarini  <address@hidden>
+
+       testsuite: various fixlets and tweakings
+       * tests/seenc.test: Make grepping of automake stderr stricter.
+       Add a trailing `:' command.
+       * tests/symlink.test: Likewise.  Also, define `$am_create_testdir'
+       to "empty" to avoid bringing in unused auxiliary files (only to
+       have to remove them right away), and use proper m4 quoting in
+       `configure.in'.
+       * tests/vpath.test: Make grepping of generated `Makefile.in'
+       slightly stricter.  Prefer trailing `:' over trailing `Exit 0'.
+       * tests/suffix6c.test: Unset OBJEXT to avoid interferences from
+       the environment.
+       * tests/suffix12.test: Do not whitespace-indent `##' comments
+       when they are embedded in a makefile rule: having them indented
+       is not part of the Automake API, and might cause failures with
+       e.g., Tru64 make.
+       * tests/syntax.test: Simplify the `Makefile.am' to ensure that
+       automake doesn't fail for the wrong reasons.  Make grepping of
+       automake stderr slightly stricter.
+       * tests/test-harness-vpath-rewrite.test: Remove useless variable
+       definition from `Makefile.am'.
+       * tests/test-driver-custom-multitest.test: Fix typo in comments.
+       * tests/self-check-me.tap: Fix minor typo in test description.
+       * tests/vars3.test: Make grepping of automake stderr stricter
+       and safer.
+       * tests/version6.test: Add sanity check, verifying that the
+       version number extracted from `automake --version' output seems
+       legit.
+       * tests/auxdir2.test: Renamed ...
+       * tests/auxdir-compauted.tap: ... to this, and converted to the
+       use of TAP.
+       * tests/auxdir4.test: Renamed ...
+       * tests/auxdir-unportable.tap: ... to this, and converted to the
+       use of TAP.
+       * tests/auxdir3.test: Renamed ...
+       * tests/auxdir-misplaced.test: ... to this.
+       * tests/auxdir5.test: Renamed ...
+       * tests/auxdir-nonexistent.test: ... to this.
+       * tests/auxdir9.test: Renamed ...
+       * tests/auxdir-autodetect.test: ... to this.
+       * tests/Makefile.am (TESTS): Update.
+       (XFAIL_TESTS): Remove `auxdir2.test'.
+
+2011-08-19  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix some redundant autotools calls in tests on TAP
+       * tests/tap-deps.test: Do not call autotools and configure; there
+       is no need to, since this script sources `tap-setup.sh'.
+       * tests/tap-empty-diagnostic.test: Likewise.
+       * tests/tap-escape-directive.test: Likewise.
+       * tests/tap-fancy2.test: Likewise.
+       * tests/tap-no-spurious.test: Likewise.
+       * tests/tap-out-of-order.test: Likewise.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       * THANKS (Daniel Richard G.): Update e-mail address.
+
+2011-08-16  Daniel Richard G. <address@hidden>  (tiny change)
+           Stefano Lattarini  <address@hidden>
+
+       java: avoid compilation errors when CLASSPATH is empty
+       * lib/am/java.am (CLASSPATH_ENV): When redefining `$CLASSPATH',
+       do not append an empty component in case the previous value of
+       CLASSPATH is empty or unset.
+       * tests/java-empty-classpath.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       Fixes automake bug#9306.
+
+2011-08-16  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: no more spurious successes for FreeBSD make
+       Work around a bug of FreeBSD make bug that was causing the
+       automake-generated "check" target to complete with success
+       even if some tests failed; this happened only when FreeBSD
+       make was run in concurrent mode (as in, e.g., "make -j2
+       check").  The bug is not present in NetBSD make.
+       This change fixes automake bug#9245:
+        <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>
+       See also FreeBSD PR bin/159730:
+        <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>
+       * lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a
+       more "safe" (and apparently redundant) idiom to exit with error,
+       so that the non-zero exit status is picked up also by FreeBSD
+       make when it's running in concurrent mode.
+       * NEWS: Update.
+       * tests/check-concurrency-bug9245.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-11  Stefano Lattarini  <address@hidden>
+
+       hacking: we now require autoconf 2.68
+       * HACKING ("Working in git"): Use autoconf and autom4te 2.68,
+       not 2.67, in the examples.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       tap: improve granularity for tests on problematic TAP messages
+       * tests/tap-message-0.test: Break up into ...
+       * tests/tap-msg0-result.test, tests/tap-msg0-directive.test,
+       tests/tap-msg0-planskip.test, tests/tap-msg0-misc.test,
+       tests/tap-msg0-bailout.test: ... these new tests, and extend
+       a little.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       tap: correctly handle string "0" in TAP messages
+       * lib/tap-driver.pl (is_null_string): New function, can be used
+       to determine whether a given string variable is empty or undefined.
+       Useful to avoid pitfalls like:
+         if ($message) { print "$message\n"; }
+       which wouldn't print anything if $message is the literal "0".
+       (handle_tap_test, handle_tap_plan, handle_tap_bailout): Use it,
+       to avoid missing messages composed only by a literal "0" in TAP
+       result descriptions and in skip, todo and bailout explanations.
+       * tests/tap-message-0.test: Enhance.
+       * tests/Makefile.am (XFAIL_TESTS): Remove it, it passes now.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       tap: a minor simplification in the perl TAP driver
+       * lib/tap-driver.pl: The `--disable-hard-errors' option is a
+       no-op, so just ignore it and its argument.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: fix help screen for test driver scripts
+       * lib/tap-driver.pl ($USAGE): The `--trs-file' option is mandatory
+       too.
+       * lib/tap-driver.sh (print_usage): Likewise.
+       * lib/test-driver (print_usage): Likewise.
+       ($scriptversion): Update.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       tap: add a dummy TAP driver script implemented in shell + awk
+       The user can also now decide which implementation of the TAP driver
+       to use in the testsuite by defining the `$am_tap_implementation'
+       variable to either "perl" or "shell".  Future enhancements will
+       allow the testsuite to automatically run the test scripts on TAP
+       support with both the TAP driver implementations, to improve
+       coverage.
+       * tests/defs (fetch_tap_driver): Honor the `$am_tap_implementation'
+       variable to decide which implementation of the TAP driver to fetch.
+       ($am_tap_implementation): Default to "perl".
+       * tests/tap-common-setup.test: Do not fetch the TAP driver, the
+       code in tap-setup.sh does that already (and respecting runtime
+       overriding of `$am_tap_implementation').
+       * lib/tap-driver: Renamed ...
+       * lib/tap-driver.pl: ... to this, and ...
+       ($ME): ... adjusted this.
+       * doc/automake.texi: Adjust to the renaming.
+       * tests/Makefile.am (TAP_LOG_DRIVER): Likewise.
+       * tests/tap-doc2.test: Likewise.
+       * lib/tap-driver.sh: New script, still mostly dummy.
+       * lib/Makefile.am (dist_script_DATA): Update, and since we are at
+       it, rewrite it to make it easier to add new entries in the future.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       testsuite: refactor tests on TAP support in view of future changes
+       * tests/defs (fetch_tap_driver): New subroutine; it fetches the
+       automake-provided TAP driver from the `lib/' directory into the
+       current directory, and edits its shebang line so that it will be
+       run with the perl interpreter determined at configure time.
+       * tests/tap-setup.sh: Use it.
+       * tests/tap-common-setup.test: There's no need to AC_SUBST `PERL'
+       anymore, nor to use it in the Makefile to run the TAP driver.
+       Also, use the `fetch_tap_driver' function instead of copying the
+       `tap-driver' auxiliary script directly.
+       * tests/tap-bad-prog.tap: Likewise.
+       * tests/tap-diagnostic-custom.test: Likewise.
+       * tests/tap-doc.test: Likewise.
+       * tests/tap-merge-stdout-stderr.test: Likewise.
+       * tests/tap-more.test: Likewise.
+       * tests/tap-more2.test: Likewise.
+       * tests/tap-recheck.test: Likewise.
+       * tests/tap-summary-aux.sh: Likewise.
+       * tests/tap-basic.test: Likewise, and fix a grammaro in comments
+       since we are at it.
+
+2011-08-17  Stefano Lattarini  <address@hidden>
+
+       test defs: fix typo in comments
+       * tests/defs (get_shell_script): Fix typo in the function
+       description.
+
+2011-08-14  Stefano Lattarini  <address@hidden>
+
+       coverage: missing tap plan and non-zero exit status
+       * tests/tap-missing-plan-and-bad-exit.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix an unportable use of sed
+       * tests/tap-todo-skip-whitespace.test: Alternation with "\|" in
+       sed regular expressions is not portable to (at least) FreeBSD
+       sed; do not use it.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure if rst2html program is missing
+       * tests/test-driver-custom-no-html.test: Account for the
+       possibility of a lacking `rst2html' program in our final
+       grepping of make output.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       tap: improve diagnosing and reporting of plan mismatches
+       Problem exposed by a failure in the test 'tap-plan-errors.test'.
+       * lib/tap-driver (NO_PLAN, EARLY_PLAN, LATE_PLAN): New constants.
+       (Throughout the file): Use more complex semantics for `$plan_seen',
+       which now also remember whether the plan that has been seen is an
+       "early" or "late" plan; in turn, this makes ...
+       ($tap_stopped): ... this variable redundant; remove it.
+       (handle_tap_plan): Adjust to avoid producing spurious or confusing
+       error messages about extra or mismatched "late" TAP plans.
+       * tests/tap-plan-corned.test: Adjust and extend.
+       * tests/tap-color.test: Likewise.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       tap: log all TAP stream, even after a "Bail out!"
+       * lib/tap-driver ($bailed_out): New global boolean variable,
+       telling whether a "Bail out!" directive has been seen or not.
+       (handle_tap_bailout): This function does not anymore stop the
+       reading from TAP stream; instead, it sets `$bailed_out' to a
+       true value, so that only the subsequent parsing of the input
+       TAP stream is stopped.
+       (finish): Remove, no more needed, its contents inlined into ...
+       (main): ... this function, with related adjustments in the code
+       flow.
+       (get_test_exit_message): Do not "flush" the input TAP stream
+       to fetch the exit status of test script, it is not anymore
+       required.  Add a sanity check.
+       * tests/tap-bailout-and-logging.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       coverage: TAP diagnostics after "Bail out!" aren't reported
+       This is compatible with the behaviour of the `prove' utility.
+       * tests/tap-bailout-suppress-later-diagnostic.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       coverage: TAP errors after a "Bail out!" directive aren't reported
+       This is compatible with the behaviour of the `prove' utility.
+       * tests/tap-bailout-suppress-later-errors.test: New test.
+       * tests/tap-bailout-badexit.test: Renamed ...
+       * tests/tap-bailout-suppress-badexit.test: ... to this, for
+       consistency.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       testsuite: reorganize tests on TAP plans
+       * tests/tap-skip-whole.test: Rename ...
+       * tests/tap-planskip.test: ... to this
+       * tests/tap-skip-whole-badexit.test: Rename ...
+       * tests/tap-planskip-badexit.test: ... to this.
+       * tests/tap-skip-whole-bailout.test: Rename ...
+       * tests/tap-planskip-bailout.test: ... to this.
+       * tests/tap-skip-whole-bailout.test: Rename ...
+       * tests/tap-planskip-later-errors.test: ... to this.
+       * tests/tap-skip-whole-unplanned.test: Rename ...
+       * tests/tap-planskip-unplanned.test: ... to this.
+       * tests/tap-skip-whole-whitespace.test: Rename ...
+       * tests/tap-planskip-whitespace.test: ... to this.
+       * tests/tap-skip-whole-continue.test: Rename ...
+       * tests/tap-planskip-and-logging.test: ... to this, extend to try
+       more cases, and fix heading comments.
+       * tests/tap-skip-whole-lastline.test: Rename ...
+       * tests/tap-planskip-late.test: ... to this, fix heading comments,
+       and remove some checks that are just a duplication of those already
+       performed in the previous script.
+       * tests/tap-results-with-planskip.test: Rename to ...
+       * tests/tap-planskip-unplanned-corner.test: ... this, and improve
+       hading comments.
+       * tests/tap-planskip-later-errors.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       coverage: more TAP driver consistency w.r.t. 'prove'
+       * tests/skip-results-with-planskip.test: New test, verifies that
+       test results seen in a TAP stream that has a "plan with SKIP" are
+       flagged as errors.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       tap: improve some comments in the TAP driver
+       * lib/tap-driver (handle_tap_plan): Improve comments describing
+       possible errors in a "plan with SKIP" directive.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       tap: non-zero exit status after "Bail out!" should not be reported
+       This new behaviour is more consistent with that of the `prove'
+       utility.  Also, experience with the use of TAP in the Automake's
+       own test suite has shown that reporting non-zero exit status from
+       a script after it has issued a "Bail out!" directive is mostly
+       redundant, more introducing noise rather than conveying useful
+       information.
+       * lib/tap-driver (finish): Inline the part of it that was getting
+       the script exit status ...
+       (main): ... in here.
+       * tests/tap-bailout-badexit.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-11  Stefano Lattarini  <address@hidden>
+
+       tap: a "plan with SKIP" after test results is an error
+       This new behaviour is both more natural and more consistent with
+       that of the `prove' utility.
+       * lib/tap-driver (handle_tap_plan): Do not stop TAP parsing when
+       a "plan with SKIP" line (e.g., "1..0 # SKIP") is encountered, and
+       do not print a "SKIP" line if some TAP result has already been
+       seen.
+       * tests/tap-skip-whole.test: Adapt.
+       * tests/tap-skip-whole-lastline.test: Likewise.
+       * tests/tap-global-result.test: Adapt and extend.
+       * tests/tap-skip-plan-errors.test: Likewise, and fix an obsolete
+       small part of a comment.
+       * tests/tap-skip-whole-bailout.test: New test.
+       * tests/tap-skip-whole-unplanned.test: Likewise.
+       * tests/tap-skip-whole-continue.test: Likewise.
+       * tests/Makefile.am (tap_with_common_setup_tests): Update.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test harness: avoid possible fork bomb
+       This fixes a regression w.r.t. the master branch, exposed by
+       test 'parallel-tests-fork-bomb.test'.
+       * lib/am/check.am (am--redo-logs): Detect possible infinite
+       recursion due to a test log in $(TEST_LOGS) being the same
+       as $(TEST_SUITE_LOG).
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       coverage: enhance test against infinite recursion in test harness
+       * tests/parallel-tests-fork-bomb.test: Enhance and extend a
+       little now, for soon-to-be-implemented more explicit and safer
+       semantics.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       coverage: possible infinite recursion in the test harness
+       Motivated by a regression in the 'test-protocols' branch.
+       * tests/parallel-tests-fork-bomb.test: New test, checking that
+       if $(TEST_SUITE_LOG) is in $(TEST_LOGS), we obtain a diagnosed
+       error rather than a make hang or a fork bomb.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test defs: yet more environment cleanup
+       * tests/defs: Also unset the TEST_SUITE_LOG variable.
+
+2011-08-14  Stefano Lattarini  <address@hidden>
+
+       self tests: some minor refactoring
+       * tests/self-check-exit.tap: Disable the `errexit' shell flag;
+       this allow to remove some boilerplate idioms and to make some
+       code slightly less cumbersome.
+       * tests/self-check-me.tap: Likewise.
+
+2011-08-14  Stefano Lattarini  <address@hidden>
+
+       maintcheck: look for TAP-based tests without TAP plan
+       * Makefile.am (sc_tests_tap_plan): New maintainer check.
+       (syntax_check_rules): Add it.
+       * tests/suffix10.tap: Declare a TAP plan.
+       * tests/add-missing.tap: Likewise.
+
+2011-08-14  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid confusing SKIP messages for errored tests
+       * tests/defs [$use_tap] (exit trap): Don't print the test plan
+       in case the client script exited with a non-zero status.  This
+       avoids the display of redundant "SKIP" messages for tests with
+       lazy plans that error out before any test is run.
+
+2011-08-13  Stefano Lattarini  <address@hidden>
+
+       testsuite: keep more debugging info around in 'add-missing.tap'
+       * tests/add-missing.tap: Use a different directory for each test,
+       so that in case of failure more information is kept around.
+       Since we are at it, remove redundant TAP diagnostic, and define
+       `$am_create_testdir' to "empty" to avoid bringing in unused
+       auxiliary files.
+
+2011-08-13  Stefano Lattarini  <address@hidden>
+
+       testsuite: more granular count of test results in our TAP library
+       * tests/tap-functions.sh ($tap_bad_count_): Removed, superseded
+       by ...
+       ($tap_fail_count_, $tap_xpass_count_): ... these new variables,
+       which keep more granular counts.
+       ($tap_pass_count_: New variable.
+       * tests/defs (exit trap): Adjust and simplify accordingly.
+
+2011-08-13  Stefano Lattarini  <address@hidden>
+
+       testsuite: fixlets and improvements in two long TAP-based tests
+       * tests/depmod.tap: Clean up the subdirectories used by tests that
+       passed, to avoid ending up with a too big test directory.  This is
+       especially important since, on each and every system, at least some
+       tests in this script are expected to be skipped (which ones exactly
+       depends on the system), thus causing the test directory not to be
+       removed when the script terminates.
+       * tests/instspc.tap: Likewise (with the difference that tests here
+       are not expected to be skipped, but to xfail).  Give more explicit
+       error message in case of setup failure.  Skip the proper number of
+       tests when required, to avoid spurious errors due to mismatched
+       plan.  Also, really avoid to run the unsupported test cases when
+       the need to skip them is detected.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test harness: recursive make invocations must use $(AM_MAKEFLAGS)
+       * lib/am/check.am ($(TEST_SUITE_LOG)): Pass $(AM_MAKEFLAGS)
+       to $(MAKE) when issuing a recursive make call.
+       Problem detected by the `sc_tests_make_without_am_makeflags'
+       maintainer check.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'suffix-chain.tap'
+       * tests/suffix-chain.test: Use more uncommon suffixes that
+       don't trigger built-in recipes with FreeBSD make.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       testsuite: improvements to our shell TAP library and APIs
+       These improvements impact only the Automake's own testsuite.
+       * tests/tap-functions.sh (plan_): Allow new special arguments
+       "unknown" a.k.a. "later" and "lazy" a.k.a. "now".  Perform
+       sanity check the given arguments.  Adjust incorrect comments.
+       (lazy_plan_): Removed, superseded by the new version of `plan_'.
+       (not): New function, run a command and inverts its exit status.
+       (ok_, not_ok_, skip_): These are just shorthands for common
+       `result_' usages.
+       (xfail_, xpass_, reset_test_count_): Removed, they are not used,
+       nor does a legitimate use for them seem in sight.
+       (not): New function, to run a command inverting its exit status.
+       (command_not_ok_): Removed, superseded by `command_ok_' + `not'.
+       (command_ok_): Extended to accept TAP directives.
+       * tests/defs (trap): Don't use `late_plan_' anymore, use
+       `plan_ "now"' instead.
+       * tests/ac-output-old.tap: Update to take advantage of the new
+       APIs.
+       * tests/self-check-env-sanitize.tap: Likewise.
+       * tests/suffix-chain.tap: Likewise.
+       * tests/suffix10.tap: Likewise.
+       * tests/suffix11.tap: Likewise.
+       * tests/suffix3.tap: Likewise.
+       * tests/suffix8.tap: Likewise.
+       * tests/tap-bad-prog.tap: Likewise.
+       * tests/self-check-exit.tap: Likewise, plus a small improvement
+       in the name of a variable.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       testsuite: convert some `suffix*' tests to TAP
+       This will allow us to explicitly declare some expected failures
+       involving Solaris make as such, instead of partly papering over
+       them with skips and partly letting them fail too loudly.
+       * tests/suffix-chain.test: Rename ...
+       * tests/suffix-chain.tap: ... to this, and convert to the use of
+       TAP.  Also, fix some bugs since we are at it, and ...
+       ($required): ... require `cc'.
+       * tests/suffix3.test: Rename ...
+       * tests/suffix3.tap: ... to this, and convert to the use of TAP.
+       Also, since we are at it, throw in some formatting fixes.
+       * tests/suffix8.test: Rename ...
+       * tests/suffix8.tap: ... to this, and convert to the use of TAP.
+       Also, since we are at it, throw in some formatting fixes.
+       * tests/suffix10.test: Rename ...
+       * tests/suffix10.tap: ... to this, and convert to the use of TAP.
+       * tests/suffix11.test: Rename ...
+       * tests/suffix11.tap: ... to this, and convert to the use of TAP.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       tests: don't let a known Solaris make bug poison too many tests
+       See automake bug#7670 and bug#7824.
+       * tests/defs (make_can_chain_suffix_rules): New function, tell
+       whether the make implementation in use can chain suffix rules
+       automatically or not.
+       * tests/suffix3.test: Use it to avoid issuing calls to make that
+       are unportable to make implementations that are not smart enough
+       to chain suffix rules automatically.
+       * tests/suffix8.test: Use it to avoid issuing calls to make that
+       * tests/suffix10.test: Use it to avoid issuing calls to make that
+       * tests/suffix11.test: Use it to avoid issuing calls to make that
+       * tests/suffix-chain.test: New test, exposes the limitation that
+       we have papered over in the tests above.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       gitignore: more use of anchors
+       * .gitignore: Anchor files that are intended to be ignored only
+       if found in the same directory of the `.gitignore' file, not also
+       in its subdirectories.
+       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
+       lib/Automake/tests/.gitignore, tests/.gitignore: Likewise.  Also,
+       where needed, add new entries that were once implied by the
+       non-anchored entries in the upper-level `.gitignore' files.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       self tests: avoid spurious output on console, and related fixlets
+       * tests/self-check-cleanup.test: Set `$stderr_fileno_' to `2'
+       in the self tests, to avoid spurious diagnostic on console.
+       * tests/self-check-exit.tap: Only unset `am_explicit_skips' and
+       `$stderr_fileno_' in the self tests, not at the global level, it
+       is more correct.
+       ($init): New variable, to reduce code duplication.
+       Some refactoring and adjustments to the name of the tests.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test defs: few more sanity checks
+       * tests/defs: Catch some more (very unlikely) set-up or internal
+       errors, and diagnose them explicitly.  This is intended mostly
+       to be a theoretic-only improvement.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test defs: really make them "set -e" clean
+       Motivated by a spurious failure of test `instsh3-w.shtst' on
+       Solaris 10.
+       * tests/defs: Make really "set -e" clean, to avoid spurious
+       failures in case this file is sourced by a test script that has
+       already set the `errexit' flag.  To be sure we don't regress,
+       move the `set -e' call much earlier, and make the comment telling
+       about the expected "set -e" cleanliness more loud and outstanding.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       self tests: register an expected failures with Solaris /bin/sh
+       Solaris 10 /bin/sh erroneously exit with success right away when
+       the following three conditions are met at the same time:
+        1. the `errexit' flag is active,
+        2. an exit trap is installed, and
+        3. a non-existing command is issued.
+       * tests/self-exit.tap: When that bug is detected, issue an XFAIL
+       rather than a FAIL.  Since we are at it, improve by avoiding
+       creation of stray temporary files when testing for non-executable
+       commands.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       gitignore: update and improve for the testsuite files
+       * tests/.gitignore: Don't ignore temporary partial log files,
+       autogenerated tests and makefile fragments that are not used
+       anymore.  Anchor all the remaining patterns.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       self tests: some new uses of TAP, few extensions
+       * tests/self-check-me.test: Renamed ...
+       * tests/self-check-me.tap: .. to this, and converted to use TAP.
+       * tests/self-check-exit.test: Renamed ...
+       * tests/self-check-exit.tap: .. to this, and converted to use TAP.
+       Set `$stderr_fileno_' to `2', to avoid spurious messages on the
+       console.  Add a new test, and relax another one.
+       * tests/self-check-env-sanitize.test: Renamed ...
+       * tests/self-check-env-sanitize.tap: .. to this, and converted to
+       the use TAP.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       test defs: test directory creation more configurable
+       After this change, the individual tests will be able to tell
+       `./defs' whether or not to create a temporary test directory
+       for them, and if yes, whether or not to pre-populate it.
+       * tests/defs: Only create the temporary test directory if the
+       variable `$am_create_testdir' is not set to "no".  In this
+       case, only pre-populate it if that variable is not set to
+       `$empty'.
+       * tests/defs-static.in: Check that `$am_create_testdir' is not
+       exported in the environment.
+       * tests/self-check-env-sanitize.test: Update.
+       * tests/self-check-dir.test: Extend, and make deeper and more
+       robust.
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Update.
+       * tests/autodist.test: Set `$am_create_testdir' instead of
+       removing by hand files created by ./defs.
+       * tests/tap-doc2.test: Likewise.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: more uses of the `seq_' function
+       * tests/parallel-tests-exit-statuses.test: Use the `seq_' function
+       from `tests/defs', instead of duplicating its semantics.
+       * tests/testsuite-summary-count.test: Likewise.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: drop redundant environment sanitization
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Don't remove `planned'
+       from the environment.
+       * tests/defs-static.in: Don't complain if `planned' is set in
+       the environment.
+       * tests/self-check-env-sanitize.test: Update.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test defs: fix bug in plain version of `skip_all_'
+       * tests/plain-functions.sh (skip_all_): Call `skip_', not `skip'.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test defs: small cleanups and tweakings
+       * tests/defs: Where possible, prefer `framework_failure_' or
+       `fatal_' to `Exit 99'.  Try to catch more possible hard errors
+       and setup failures.  Do not hide expected error messages.  Avoid
+       a couple of forks when copying files from `$(top_srcdir)/lib'.
+       ($signal): Remove, no more needed.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: improve interface for giving early TAP plan
+       Since commit `v1.11-976-g4740f56', an early TAP plan can also be
+       specified after input lines have already been seen, as long as
+       no one of them is a TAP result line.  We can now take advantage
+       of this in our own testsuite, allowing the TAP-based scripts to
+       specify their earlier plan after having included `./defs'.  In
+       particular, this offers the benefit of allowing those scripts to
+       issue a "skip all" plan (e.g., "1..0 # SKIP reason ...") after
+       the inclusion of `./defs', which wasn't possible with the older
+       interface (introduced in commit `v1.11-1114-g0286308').
+       * tests/defs: Don't try to call `plan_' if `$planned' is defined,
+       the calling scripts can do that directly now.
+       * tests/ac-output-old.tap: Use `plan_' directly instead of
+       setting `$planned' before including `./defs'.
+       * tests/automake-cmdline.tap: Likewise.
+       * tests/depmod.tap: Likewise.
+       * tests/instspc.tap: Likewise.
+       * tests/tap-bad-prog.tap: Likewise.
+       * tests/add-missing.tap: Don't set `$planned'.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test defs: fix bug in TAP version of `skip_all_'
+       * tests/tap-functions (skip_all_): Set `$have_tap_plan_' to "yes"
+       when called, so that the exit trap won't write another TAP plan.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test defs: fix skip directives to work also with TAP-based tests
+       * test/defs: Use `skip_all_', not `skip_', to issue a skip of the
+       whole calling test script.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test defs: more environment cleanup
+       * tests/defs: Also unset variables AM_COLOR_TESTS and
+       AM_TESTS_ENVIRONMENT.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test harness: more minor VPATH-rewrite issues
+       * tests/am/check.am (am__set_TESTS_bases, $(TEST_SUITE_LOGS),
+       am--redo-logs, recheck, recheck-html): Cosmetic fixlets to
+       minimize the risk of unwanted VPATH rewrites.
+       (check-TESTS): Likewise, and normalize trailing whitespace
+       since we are at it.
+       Bugs exposed by test cases `check6-p.test' and `check7-p.test'.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test harness: "make -n check" works correctly with Solaris make
+       To avoid some recipes being executed with "make -n", we used the
+       trick of issuing recursive make calls not directly with $(MAKE),
+       but with a simple indirection instead:
+         ...
+         am__stealth_MAKE = $(MAKE)
+         ...
+         target:
+             ... $(am__stealth_MAKE) ...
+         ...
+       This hack worked with GNU make, but, unfortunately, not with
+       Solaris make.  The present change removes the hack, and uses more
+       proper idioms to avoid unwanted recipe executions with "make -n".
+       Bug exposed by test case `parallel-tests-dry-run.test'.
+       * lib/am/check.am (am__stealth_MAKE): Remove, no more used.
+       (.log.trs): Break recipe in multiple shell invocations.
+       ($(TEST_SUITE_LOG)): Likewise, and move some corner-case parts of
+       the recipe to ...
+       (am--redo-logs): ... this new internal helper .PHONY target.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with Solaris make
+       * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
+       liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
+       so introduced, in conjunction with single quotes, might confuse
+       Solaris make.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test harness: fixlet in workaround for VPATH rewrite issue
+       Fixes a minor in previous commit `v1.11-983-gfda3de5'.
+       * lib/am/check.am (am__set_TESTS_bases): Add forgotten end-of-line
+       anchor to sed expression.  In comments, add reference to ...
+       * tests/test-trs-basic.test: ... this test, which has been adapted
+       and tightened (and tweaked).
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test harness: work around a VPATH rewrite issue
+       * lib/am/check.am (am__TEST_BASES): Removed, it's role taken
+       over by ...
+       (am__set_TESTS_bases): ... these new variable.
+       ($(TEST_SUITE_LOG): Use it, to avoid VPATH rewrite issues.
+       * automake.in (handle_tests): Update the code for the cleanup
+       of the `.trs' file to use `$(TEST_LOGS)' instead of
+       `$(am__TEST_BASES)'.
+       * tests/test-harness-vpath-rewrite.test: New test, better
+       exposing the problem fixed by this change
+       * tests/Makefile.am (TESTS): Add it.
+       * tests/test-trs-basic.test: Update and extend.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: work around Solaris XPG4 make segfault
+       Issue exposed by test `posixsubst-tests-p.test', and similar to
+       the problem solved by commit `v1.11-159-ge7aa360'.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Trim trailing
+       whitespace from $list, to avoid triggering a nasty bug (potential
+       segfault) on Solaris XPG4 make and Heirloom make.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix weird spurious failure with Solaris /bin/sh
+       Solaris /bin/sh, when killed with a SIGTERM or SIGINT signal, can
+       apparently end up exiting with exit status 208, instead of leaving
+       the correct wide exit status to the parent.  See:
+        <http://dbaspot.com/shell/396118-bourne-shell-exit-code-term.html>
+       Work around this incompatibility.
+       * tap-signal.test: Look for the above Solaris bug.
+       (signal_caught): Adapt to handle it.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix another spurious failure on Solaris make
+       * tests/parallel-tests-log-override-recheck.test: Filter make
+       output before grepping it, for make implementations that, like
+       Solaris' one, print the whole of the failed recipe on failure.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix two spurious failures on Solaris make
+       * tests/tests-environment-and-log-compiler.test: Do not fail if
+       "make -n check" fails, as that is issued only for debugging, its
+       semantics being tested in other test scripts.
+       * tests/test-driver-strip-vpath.test: Likewise.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       tap driver: refactor and remove dead code
+       * lib/tap-driver (get_tap_line): Removed, ...
+       (all callers): ... updated to use $parser->next directly instead.
+       (peek_tap_line, unget_tap_line, @tap_lines): Remove, they're not
+       used anymore.
+       (TAP_PEEKING): Block deleted, all its subroutines and variables
+       having been removed.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix spurious failure in a test on TAP support
+       * tests/tap-passthrough-exit.test: When the `--ignore-exit' flag
+       of the TAP driver is used, don't look for a message reporting the
+       non-zero exit statuses of tests in the log files; such message is
+       not expected to be there anymore.  Related simplifications.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       tap: plan location is more liberal w.r.t. non-TAP lines
+       With this change, only lines that are TAP results will matter
+       w.r.t. the position of the TAP plan in the input; for example,
+       this input:
+         this is a non-TAP line
+         # and this a TAP diagnostic line
+         1..1
+         ok 1
+       was considered to be an error, diagnosed with a message "test
+       plan in middle of output"; as effect of the current change, such
+       input is now valid.  This is more consistent with the behaviour
+       of the `prove' utility.
+       * lib/tap-driver ($lineno): Removed, no more needed.
+       ($tap_stopped): New global variable.
+       (stringify_test_result): Return "ERROR" if a TAP result is found
+       when `$tap_stopped' is set to true.
+       (handle_tap_test): Diagnose TAP results that comes after a late
+       plan.  Add a couple of blank lines, for clarity.
+       (handle_tap_plan): Set `$tap_stopped' to true after a late plan
+       is encountered.  Do not complain anymore for extra non-TAP lines
+       preceding or following the plan.  Adjust comments.
+       (main): Don't increment $lineno anymore.
+       * tests/tap-plan.test: Extend a bit, and remove stale comment.
+       * tests/tap-color.test: Adjust.
+       * tests/tap-passthrough.test: Likewise.
+       * tests/tap-plan-corner.test: Adjust and extend.
+       * tests/tap-plan-errors.test: Likewise.
+       * tests/tap-plan-middle.test: New test.
+       * tests/tap-plan-corner2.test: Delete, it's obsolete now.
+       * tests/Makefile.am (XFAIL_TESTS): Remove it.
+       (tap_with_common_setup_tests): Likewise, and add
+       `tap-plan-corner.test'.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: remove now-passing test from XFAIL_TESTS
+       * tests/Makefile.am (XFAIL_TESTS): Remove `tap-signal.test',
+       which is passing since previous commit `v1.11-974-gc7fa872'.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       test defs: get name of TAP-using tests correctly
+       This change fixes the names of the temporary directories used
+       by the TAP-based tests (e.g., test `foo.tap' now uses `foo.dir'
+       rather than `foo.tap.dir'); more importantly, this make the
+       variable `$destdir' defined in `tests/defs' usable also in the
+       TAP tests.
+       ($me): Also strip the any `.tap' suffix from the name of the
+       test.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: TAP tests properly decide when to remove tempdirs
+       Before this change, the TAP tests in the Automake testsuite were
+       removing the temporary test directory even when they failed or
+       were skipped, thus making debugging more difficult.
+       * tests/tap-functions.sh (incr_tap_count): Removed, superseded
+       by ...
+       (incr_): ... this function, which can increment the value of any
+       variable passed to it.
+       (result_):  Updated to use `incr_' instead of the now-removed
+       `incr_tap_count_'.  Keep count of failures, xfailures, xpasses,
+       and skips, using ...
+       ($tap_skip_count_, $tap_bad_count, _$tap_xfail_count_): ...
+       these new variables.
+       * tests/defs (trap): Try to use their values to decide whether
+       the temporary directory being used by the test script should be
+       removed or not.  Other code reorganizations.  And move the code
+       for the removal of the temporary directory out to ...
+       (rm_rf_): ... this new subroutine.
+       (Main code): Use that instead of duplicating the code.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: improve and refactor our custom TAP shell library
+       This change is mostly done in preparation for the next one.
+       * tests/tap-functions.sh (result_with_directive_): Merge into ...
+       (result_): ... this function, which has been greatly extended and
+       improved in various ways.
+       (ok_, not_ok_, skip_, xfail_, xpass_): Adjust.
+       Adjust comments.  Remove an extra empty line.
+       * tests/instspc.tap: Use the new improved interface of `result_'.
+       * tests/tap-bad-prog.tap: Likewise.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: update "user interface" description in tests/README
+       * tests/README (Subsection "Interpretation"): Mention the "ERROR"
+       outcome.
+       (Subsection "Getting details from failures"): Don't tell that the
+       test scripts can be run directly, this is not 100% true; anymore;
+       instead ...
+       (Subsection "About the tests"): ... use this new subsection to
+       explain how to run the tests (either simple or TAP-based) by hand.
+       (Subsection "Supported shells"): Extend to refer to TAP tests too.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: TAP tests can have early plan now
+       * tests/defs: When using TAP, allow the user to specify the number
+       of tests through the `$planned' variable.
+       (trap): Do not print the auto-generated plan if an explicit one
+       has already been printed.
+       * tests/defs-static.in: Complain and bail out if the `$planned'
+       variable is exported in the environment.  Reformat the code to
+       facilitate future additions.
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Neutralize `$planned'.
+       * tests/self-check-env-sanitize.test: Update.
+       * tests/ac-output-old.tap: Give an explicit TAP plan, by defining
+       `$planned' just before including `./defs'.
+       * tests/depmode.tap: Likewise.
+       * tests/automake-cmdline.tap: Likewise.
+       * tests/tap-bad-prog.tap: Likewise.
+       * tests/instspc.tap: Likewise, and related adjustments.
+       * tests/add-missing.tap: Make it explicit that we have no a-priori
+       plan, and tell why.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: run autogenerated tests with $(LOG_COMPILER) too
+       This change enhances consistency in the testsuite.
+       * tests/Makefile.am: Some cosmetic reordering, to keep the
+       definition of FOO_LOG_COMPILER near to the place where `.foo'
+       is added to $(TEST_EXTENSIONS).
+       (PTEST_LOG_COMPILER): Run `$(srcdir)/parallel-tests.sh' with
+       `$(LOG_COMPILER)', not with `$(SHELL)'.
+       (SHTST_LOG_COMPILER): Likewise.
+
+2011-08-07  Stefano Lattarini  <address@hidden>
+
+       testsuite: run TAP and "plain" tests with the same $(LOG_COMPILER)
+       With this change, it will be easier to override, at make time, the
+       shell used to run the tests.
+       * tests/Makefile.am (LOG_COMPILER): Define to `$(SHELL)'.
+       (TEST_LOG_COMPILER): Re-define to `$(LOG_COMPILER)'.
+       (TAP_LOG_COMPILER): Likewise.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       testsuite: run TAP-based tests explicitly with $(SHELL)
+       * tests/Makefile.am (TAP_LOG_COMPILER): Define to `$(SHELL)'.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       tap driver: handle signals received by the tests being run
+       * lib/tap-driver (get_test_exit_message): Also deal with signals,
+       by using the `wait' method of the TAP::Parser object instead of
+       the `exit' method.  This required the use of the standard perl
+       module `POSIX'.
+       * doc/automake.texi (Use TAP with the Automake test harness):
+       Document that `--ignore-exit' has effect also on terminating
+       signals.  Add a "synchronizing" comment that references the tests
+       'tap-exit.test' and 'tap-signal.test'.
+       * tests/tap-signal.test: Extend and adjust.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       test driver: a preparatory refactoring (2)
+       * lib/tap-driver (finish): Move code to fetch the message about
+       the exit status of the test being run to ...
+       (get_test_exit_message): ... this new subroutine.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       tap driver: a preparatory refactoring (1)
+       * lib/tap-driver (finish): Do not flush the TAP stream nor
+       fetch the exit status of the TAP producer if running with
+       the `--ignore-exit' option.  Obviously, don't try to write
+       such exit status in the test log anymore.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       cosmetics: typofix in the name of a function in the TAP driver
+       * lib/tap-driver (testuite_error): Renamed ...
+       (testsuite_error): ... to this, and minor related reformatting.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       tap: scripts with a SKIP plan but with exit status != 0 must error
+       This change has been motivated by Automake's own testsuite.  Some
+       TAP tests there were erroring out (due to unexpected, unhandled
+       failures) before having encountered TAP result, so that the
+       simple-minded shell library implementing TAP generation ended up
+       printing a "1..0" trailing test plan; this caused the script to be
+       reported as a SKIP rather than an ERROR -- a nasty false negative.
+       * lib/tap-driver: Add prototypes for each subroutine, to free up
+       the order in which they can be defined and called.
+       (main): Move the code checking for a bad exit status of the TAP
+       producer ...
+       (finish): ... here, and flush the TAP stream to ensure that the
+       parser always obtains the producer's exit status.
+       * tests/tap-skip-whole-badexit.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Add it.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       tap: fix whitespace munging of diagnostic messages
+       * lib/tap-driver (extract_tap_comment): Pass the `g' flag to the
+       substitution operator, to strip also trailing whitespaces.  Fixes
+       a failure in test `tap-whitespace-normalization.test'.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       testsuite: refactor and cleanup 'instspc.tap'
+       * tests/instspc.tap (is_in_list): New helper subroutine.
+       (expected_to_fail): Re-implement using it.
+       (define_problematic_string): Likewise.  Also, rename the special
+       arguments `build-fail' and 'install-fail' to respectively
+       `builddir-fail' and `destdir-fail', and other related changes.
+       (Test data definition): Adapt.
+       ($instspc_xfail_builds_list): Renamed ...
+       ($builddir_xfails): ... to this.
+       ($instspc_xfail_installs_list): Renamed ...
+       ($destdir_xfails): ... to this.
+       ($instspc_names_list): Renamed ...
+       ($test_names_list): ... to this.
+       ($instspc_test_string): Renamed ...
+       ($test_string): ... to this.
+       Add some explicative and "FIXME" comments.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       testsuite: use TAP for `depmod*' tests, related simplifications
+       * tests/depmod-tests.sh: Delete this complex and multifarious
+       script, moving all it checks it used to perform into ...
+       * tests/depmod.tap: ... this TAP-based test script.  And extend
+       it quite a bit, since the new form of the test was papering over
+       some pre-existing failures (this was due to the fact that the
+       values used for the VPATH were shorter in the new test script).
+       * tests/depmod-data.test: Deleted.
+       * tests/Makefile.am ($(srcdir)/depmod-tests.am): Don't include
+       nor generate it anymore.
+       (EXTRA_DIST): Don't distribute depmod-tests.sh anymore.
+       (TEST_EXTENSIONS): Remove '.depmod'.
+       (DEPMOD_LOG_COMPILER): Deleted.
+       (depmod-data.log, $(depmod_tests:.depmod=.log)): Delete
+       dependencies for these files, which are not used anymore.
+       ($(depmod_tests)): Delete this dummy dependency declaration.
+       (TESTS): Remove $(depmod_tests).
+       (handwritten_tests): Remove depmod-data.test, add depmod.tap.
+       * bootstrap: Don't generate tests/depmod-tests.am anymore.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       testsuite: use TAP for `instspc*' tests, related simplifications
+       * tests/instspc-tests.sh: Delete this complex and multifarious
+       script, moving all it checks it used to perform into ...
+       * tests/instspc.tap: ... this TAP-based test script.
+       * tests/instspc-data.test: Deleted.
+       * tests/Makefile.am ($(srcdir)/instspc-tests.am): Don't include
+       nor generate it anymore.
+       (EXTRA_DIST): Don't distribute instspc-tests.sh anymore.
+       (TEST_EXTENSIONS): Remove '.instspc'.
+       (INSTSPC_LOG_COMPILER): Deleted.
+       (XFAIL_TESTS): Remove $(instspc_xfail_tests).
+       (instspc-data.log, $(instspc_tests:.instspc=.log)): Delete
+       dependencies for these files, which are not used anymore.
+       ($(instspc_tests)): Delete this dummy dependency declaration.
+       (TESTS): Remove $(instspc_tests).
+       (handwritten_tests): Remove instspc-data.test, add instspc.tap.
+       * bootstrap: Don't generate tests/instspc-tests.am anymore.
+
+2011-08-06  Stefano Lattarini  <address@hidden>
+
+       testsuite: do fd redirections with $(AM_TESTS_FD_REDIRECT)
+       * tests/Makefile.am: The redirections of file descriptors needed
+       by our test scripts is now done using the $(AM_TESTS_FD_REDIRECT)
+       variable (the new blessed way since commit `v1.11-906-gb9e9d54'),
+       not using an hack involving $(AM_TESTS_ENVIRONMENT).  This has
+       the further benefit of allowing the use of $(TESTS_ENVIRONMENT)
+       again on part of the users.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Remove redirection of
+       file descriptors.
+       (AM_TESTS_FD_REDIRECT): Redirect file descriptor 9 to original
+       stderr.
+       Comments adjusted.
+       * tests/plain-functions.sh ($stderr_fileno_): Update comment.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       testsuite: use custom TAP diagnostic in our own tests
+       This change allow us to easily and transparently avoid spurious
+       TAP diagnostic in our own testsuite, with the help of the new
+       `--diagnostic-string' option of our TAP test driver.
+       * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Also pass option
+       `--diagnostic-string' with value `#%#' (necessarily obtained
+       through some shell indirections).
+       * tests/tap-functions.sh (diag_): Assume that the string denoting
+       TAP diagnostic is stored in the `$diag_string_' variable.  Update
+       comments.
+       ($diag_string_): Initialize to "#".
+       * tests/defs ($diag_string_): Re-define to "#%#".
+       (show_): Remove, it's obsolete now.
+       * add-missing.tap: Don't use `show_' anymore to avoid spurious
+       TAP diagnostic; `cat' should suffice now.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       tap: fix typo in TAP driver version message
+       * lib/tap-driver (anonymous subroutine printing the script version
+       message): Add missing trailing newline to the version message.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       tap docs: we don't support pragma or version directives (yet)
+       * doc/automake.texi (Incompatibilities with other TAP parsers
+       and drivers): Document that limitation.  Normalize an unrelated
+       "TODO" item.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       tap: new option to change the string designating TAP diagnostic
+       Here we introduce a new option `--diagnostic-string' in our TAP
+       test driver, that allows the user to specify which string should
+       denote the beginning of a TAP diagnostic line.  This change is
+       not gratuitous, nor result if over-engineering: it is motivated
+       by real issues that have emerged during the use of TAP in the
+       Automake's own testsuite (see the commit `v1.11-1082-g9b967c2'
+       "testsuite: yet more use of TAP, and related extensions").
+       * doc/automake.texi (Use TAP with Automake test harness): Document
+       the new option.
+       (Incompatibilities with other TAP parsers and drivers): Report it
+       as a potential source of incompatibility.
+       * lib/tap-driver ($diag_string): New global variable, defaulting
+       to "#", and whose value can be changed ...
+       (Getopt::Long::GetOptions): ... by the newly recognized option
+       `--diagnostic-string'.
+       (handle_tap_comment): Subroutine removed, some of its simple logic
+       inlined ...
+       (main): ... in here, where now ...
+       (extract_tap_comment): ... this new subroutine is used.
+       ($USAGE): Adjust.
+       * tests/tap-diagnostic.test: Make one check slightly stricter.
+       * tests/tap-diag-custom.test: New test.
+       * tests/Makefile.am (tap_other_tests): Add it.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       check: add small "synchronization" comment to `test-driver'
+       * lib/test-driver: Add comment to the code initializing ANSI color
+       escapes, telling to keep it in sync with the similar initialization
+       in `lib/am/check.am'.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failure w.r.t. use of bare "exit"
+       * tests/check12.test: Cosmetic changes to avoid triggering a
+       spurious failure of the `sc_tests_Exit_not_exit' maintainer
+       check.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       check: update comments to reflect recent heavy changes
+       * lib/am/check.am [%?PARALLEL_TESTS%]: Update the comments to
+       reflect the recent changes.  Remove quite many comments that
+       were merely duplicating excerpts from the Automake manual.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       check: small cleanups and refactorings in test harness and drivers
+       * lib/tap-driver (yn): New subroutine, converts a boolean value to
+       a "yes" or "no" string.
+       (write_test_results): Use it, and related reformatting.
+       * lib/test-driver (trap): Also remove the `.trs' file on signals,
+       for extra safety.
+       (fatal): Remove this function, it's never used.
+       ($logfile, $trsfile): Renamed ...
+       ($log_file, $trs_file): ... to these, for clarity, and in order to
+       be more consistent with the `tap-driver' script.
+       Improve a couple of comments.
+       * automake.in (handle_tests): Don't define anymore the now-obsolete
+       make macro `$(TEST_LOGS_TMP)', nor add it to the list of files to
+       be removed upon "make mostlyclean".
+       * lib/am/check.am ($(TEST_SUITE_LOG)): New shell function `f_ok',
+       tells whether a path refers to an existing, regular, readable file.
+       Use it throughout.
+       (recheck): Be safer w.r.t. make implementation that run recipes
+       with `errexit' shell flag active.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       testsuite: use AM_TESTS_FD_REDIRECT where appropriate
+       * parallel-tests-interrupt.test: Use AM_TESTS_FD_REDIRECT, not
+       AM_TESTS_ENVIRONMENT, to define file descriptors' redirection
+       for "make check".  Fix botched comment.
+
+2011-08-05  Stefano Lattarini  <address@hidden>
+
+       docs: some fixlets in documentation on testsuites support
+       * doc/automake.texi (Script-based Testsuites): Rename node ...
+       (Scripts-based Testsuites): ... to this.  Break overly long lines
+       in an example (were causing problems with PDF output).
+       (Parallel Test Harness): Don't intend paragraphs that come after
+       examples or bulleted list.
+       (Overview of Custom Test Drivers Support): Fix typo s/the the/the/.
+       (Declaring Custom Test Drivers): When giving an aside, prefer comma
+       to parentheses, as it disrupts the reading flow less.
+       (API for Custom Test Drivers): Remove a sentence that was basically
+       duplicated from the previous subsection.
+       (Command-line arguments for test drivers): Don't intend paragraph
+       coming after an itemized list.  Clarify wording and fix grammaros.
+       Add a couple of cross-references to earlier explanations of `.log'
+       and `.trs' files.
+       (Links and external resources): Node renamed ...
+       (Links and external resources on TAP): ... to this, for clarity.
+       Slightly extend and clarify introductory sentence.
+
+2011-08-04  Stefano Lattarini  <address@hidden>
+
+       test harness: be aware of more metadata, simplify test drivers
+       * lib/am/check.am ($(TEST_SUITE_LOG)):  When producing the
+       global test log, take into account the new metadata field
+       `:global-test-result:, to write nicely formatted RST section
+       titles, instead of leaving this chore to the individual test
+       drivers.
+       (am_rst_section): Re-introduce this variable, as removed in
+       commit `v1.11-870-ga27c9c4'.
+       * lib/test-driver, lib/tap-driver: Write the global test result
+       as metadata in the `.trs' file, not as (part of) a formatted RST
+       subsection title in the `.log' file.  Related simplifications;
+       in particular, get rid of temporary files usage.
+       * doc/automake.texi (Log files generation and test results
+       recording): Document the new metadata.
+       * tests/check12.test: Update.
+       * tests/parallel-tests-harderror.test: Likewise.
+       * tests/parallel-tests-interrupt.test: Likewise.
+       * tests/parallel-tests-log-override-2.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/parallel-tests-unreadable.test: Likewise.
+       * tests/tap-global-result.test: Likewise.
+       * tests/test-metadata-results.test: Likewise.
+       * tests/test-log.test: Likewise, and another minor unrelated fix.
+       * tests/test-metadata-global-result.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       tap: check that also a trailing TAP plan can hold a skip directive
+       * tests/tap-skip-whole-lastline.test: New test.
+       * tests/Makefile.am (tap_with_common_setup_tests): Add it.
+
+2011-08-04  Stefano Lattarini  <address@hidden>
+
+       testsuite: more correct names for a couple of tests
+       * tests/parallel-tests-ext-driver.test: Rename ...
+       * tests/parallel-tests-log-compiler-1.test: ... to this, and
+       adjust heading comments.
+       * tests/parallel-tests-ext-driver-prog.test: Rename ...
+       * tests/parallel-tests-log-compiler-2.test: ... to this, and
+       adjust heading comments.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-04  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix another spurious failure
+       * tests/parallel-tests-ext-driver.test: Name out custom/dummy
+       log compilers as `foo-compiler' rather `foo-driver'; not only
+       this is less confusing, it also avoids errors due to the dummy
+       log compiler `test-driver' overriding the `test-driver' helper
+       script installed by Automake.
+       * tests/parallel-tests-ext-driver-prog.test: Adjust heading
+       comments.
+
+2011-08-04  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix a spurious failure
+       * tests/parallel-tests-ext-driver.test: Exporting of environment
+       variables directly from $(LOG_COMPILER) variables is not allowed
+       anymore.  Adjust to this.
+
+2011-08-04  Stefano Lattarini  <address@hidden>
+
+       testsuite: yet more use of TAP, and related extensions
+       * tests/defs (show_): New function, display the contents of one or
+       more files on stdout, with bells & whistles (both for cosmetic and
+       practical reasons, the latter aimed at avoiding spurious TAP
+       diagnostic).
+       (AUTOMAKE_run): Extend and adapt to make it compatible with TAP
+       based tests.  Since we are at it, make its implementation more
+       namespace-safe, and improve its command-line interface.
+       (AUTOMAKE_fails): Adapt to the new command-line interface of
+       `AUTOMAKE_run'.
+       * tests/add-missing.test: Renamed ...
+       * tests/add-missing.tap: ... to this, and converted to the use
+       of the TAP protocol, and of the new `show_' function.
+       * tests/automake.test: Renamed ...
+       * tests/automake-cmdline.tap: ... to this, and converted to the
+       use of the TAP protocol.
+       * tests/getopt.test:  Adapt to the new command-line interface
+       of `AUTOMAKE_run'.
+       * tests/cond44.test: Likewise.
+       * tests/cond45.test: Likewise.
+       * tests/configure.test: Likewise.
+       * tests/license2.test: Likewise.
+       * tests/parallel-am.test: Likewise.
+       * tests/parallel-am3.test: Likewise.
+       * tests/tags2.test: Likewise.
+       * tests/werror3.test: Likewise.
+       * tests/werror4.test: Likewise.
+       * tests/amopts-variable-expansion.test: Likewise.
+       * tests/warnings-win-over-strictness.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       (TAP_LOG_DRIVER_FLAGS): Add `--merge', so that TAP diagnostic is
+       reported in the testsuite progress output.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix more maintainer-check failures
+       * tests/test-driver-custom-no-html.test (no-rst): Use `EOF',
+       not `EoL', as the here-document delimiter.
+       * tests/test-trs-basic.test: Use `cat + here-doc' rather
+       than `echo' when creating the dummy test scripts, to please
+       maintainer-check.
+       * tests/test-trs-recover.test: Use creative quoting where
+       needed, to please maintainer-check.
+       * tests/parallel-tests-no-color-in-log.test: Likewise.
+       * tests/parallel-tests-dry-run.test: Likewise.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix maintainer-check failures, both real and spurious
+       * tests/amhello-binpkg.test: Use "$MAKE", not bare "make".
+       * Makefile.am (sc_perl_local): Also allow perl special variable
+       `$~' to be localized.  And be slightly laxer in the regexp, to
+       allow for usages like "local $_ = $foo;".
+       (sc_tests_overriding_macros_on_cmdline): Also allow for command
+       line overriding of the `DISABLE_HARD_ERRORS' make variable.  Try
+       to avoid false positives for usages like "$MAKE || st=$?".
+
+2011-08-03  Bruno Haible  <address@hidden>
+
+       docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
+       * doc/automake.texi (Program Variables): Recommend -I options to
+       both the build directory and the source directory when needed.
+
+2011-07-23  Stefano Lattarini  <address@hidden>
+
+       tests: relax a test on amhello examples to cater to Solaris tar
+       * tests/amhello-binpkg.test: When the tar implementation in use
+       is not GNU tar, relax the tests on tar output, to avoid spurious
+       failures.  For example, "tar cvf ..." with GNU tar can output
+       lines like "./usr/bin/hello" on the standard output, while with
+       Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
+       standard output, and with Heirloom tar it can output lines like
+       "a ./usr/bin/hello 15 tape blocks" on standard error.
+
+2011-07-23  Stefano Lattarini  <address@hidden>
+
+       test defs: function 'is_newest' now works also with directories
+       * tests/defs (is_newest): Call `find' with the `-prune' option,
+       so that it won't descend in the directories (which could cause
+       spurious results).
+       * tests/self-check-is_newest: Extend accordingly.
+       From a report by Jim Meyering, see automake bug#9147.
+
+2011-07-15  Benoit Sigoure  <address@hidden>
+
+       docs: add references between the 2 sections on java support
+       * doc/automake.texi (Java Support, Java): Add cross-references.
+
+2011-07-20  Ralf Wildenhues  <address@hidden>
+
+       Sync auxiliary files from upstream.
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
+       lib/texinfo.tex: Sync from upstream.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests: fix weakness in 'tests-environment-backcompat.test'
+       * tests/tests-environment-backcompat.test: Do not override the
+       content of xfailing test `baz.test' with a "weaker" version that
+       fails unconditionally: the test must fail only when the 'strict'
+       pragma is in use, in order not to reduce coverage.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       docs, tests: synchronize examples on silent-rules from config.site
+       * doc/automake.texi (Automake silent-rules Option): Reference test
+       'silent-configsite.test' in comments.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests: portability fixes in tests on amhello examples
+       * tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
+       extract a gzip-compressed tarball, that's unportable to some
+       tar implementations; use the "gzip -dc fo.tar.gz | tar xf -"
+       idiom instead.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+       Suggestion from Ralf Wildenhues.
+
+2011-07-04  Stefano Lattarini  <address@hidden>
+
+       remake: add test ensuring that slower remakes don't hang
+       * tests/remake-subdir-long-time.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       Suggestion by Ralf Wildenhues.
+
+2011-07-04  Stefano Lattarini  <address@hidden>
+
+       remake: fix outdated comment in configure.am
+       * lib/am/configure.am: Fix comment falsified by changes in
+       commit `v1.11-366-gbee9871'.
+       Suggestion by Ralf Wildenhues.
+
+2011-07-01  Stefano Lattarini  <address@hidden>
+
+       docs, tests: synchronize examples from docs to tests
+       * tests/README (Writing test cases): Give suggestions on how to
+       keep test cases and examples in the documentation synchronized.
+       * doc/automake.texi: Improve or fix existing testcase-referencing
+       comments, and add many new ones.
+       * HACKING (Administrivia): Suggest to test complex examples and
+       idioms from the manual.
+       * tests/specflg8.test: Improve synchronization with the example
+       in the manual.
+       * tests/output11.test:Likewise.
+       * tests/txinfo21.test:Likewise.
+       * tests/interp.test: Likewise.
+       * tests/amhello-cflags.test: New test.
+       * tests/amhello-cross-compile.test: Likewise.
+       * tests/amhello-binpkg.test: Likewise.
+       * tests/tests-environment-backcompat.test: Likewise.
+       * tests/parallel-tests-log-compiler-example.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-30   Stefano Lattarini  <address@hidden>
+
+       coverage: new test on parallel-tests TESTS runtime overriding
+       * tests/parallel-tests-cmdline-override.test: New test, check that
+       we can use indirections when overriding TESTS and TEST_LOGS from
+       the command line.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       gitignore: ignore `*.trs' files in lib/Automake/tests
+       * lib/Automake/tests/.gitignore: Add `*.trs' pattern.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       testsuite: list another "forgotten" test script in Makefile.am
+       * tests/Makefile.am (TESTS): Also list test script
+       `test-driver-trs-suffix-registered.test'; it had been introduced
+       in commit `v1.11-910-g0c81b43', but by mistake it wasn't added
+       to the list of tests in the Makefile back then.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       testsuite: list "forgotten" test script in Makefile.am
+       * tests/Makefile.am (TESTS): Also list the test script
+       `parallel-tests-no-color-in-log.test'; it had been introduced in
+       commit `v1.11-899-geaac33f', but by mistake it wasn't added to
+       the list of tests in the Makefile back then.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       testsuite: remove duplicated mention of a test in Makefile.am
+       * tests/Makefile.am (tap_other_tests): Remove `tap-empty.test',
+       it is already listed in `$(tap_with_common_setup_tests)'.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       testsuite: one more use of TAP in our own tests
+       * tests/tap-bad-prog.test, tests/tap-bad-prog2.test: Merged
+       into ...
+       * tests/tap-bad-prog.tap: ... this TAP-generating test.
+       * tests/Makefile.am (tap_other_tests): Remove plan-bad-prog.test
+       and plan-bad-prog2.test.
+       (XFAIL_TESTS): Remove plan-bad-prog2.test.
+       (plan-bad-prog2.log): Remove.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       testsuite: scaffolding to allow use of TAP in our own tests
+       Now that Automake has initial support for the TAP test protocol,
+       we can start "eating our own dog food" and rewrite some tests to
+       use TAP; this should allow for better granularity, especially in
+       the control of skips and expected failures.  With this change, we
+       set up the initial scaffolding required by the planned TAP tests,
+       and convert few older tests to use TAP, mostly in order to verify
+       that there are no obvious errors.  The tests in our testsuite that
+       use the TAP protocol will be marked by the new `.tap' extension.
+       * tests/plain-functions.sh: New file containing definition of
+       helper shell functions used by the "protocol-less" tests of the
+       Automake testsuite.
+       * tests/tap-functions.sh:  New file containing definition of
+       helper shell functions used by the TAP-producing tests of the
+       Automake testsuite.
+       * tests/defs: Remove definitions of some functions that are
+       now defined in `plain-functions.sh'.  Instead, source one of
+       `plain-functions.sh' or `tap-functions.sh', depending on whether
+       `$use_tap' is set to "no" or "yes".
+       (exit trap): Call `late_plan_' if `$use_tap' is true.  Also,
+       unset shell traces before issuing the latest commands, to avoid
+       confusing the tap driver with spurious output.
+       * tests/defs-static.in ($use_tap): New variable, by default set
+       to "yes" if the calling test script has a `.tap' suffix, and to
+       "no" otherwise.  The individual scripts can override it though.
+       In code sanity-checking the environment, verify that `$use_tap'
+       is not exported.
+       * tests/self-check-env-sanitize.test: Update, and small related
+       reformatting.
+       * tests/self-check-tap.test: New very minimal self test.
+       * tests/acoutbs.test, tests/acoutbs2.test, tests/acoutnoq.test,
+       tests/acoutpt.test, tests/acoutpt2.test, tests/acoutqnl.test:
+       Removed, merged into ...
+       * tests/ac-output-old.tap: ... this new test, that uses TAP.
+       * tests/Makefile.am (TAP_LOG_DRIVER): Define to invoke our own
+       `tap-driver' script.
+       (TAP_LOG_DRIVER_FLAGS): Define to `--merge', so that the stdout
+       and stderr of the test scripts remains synced.
+       (TEST_EXTENSIONS): Define, to add the `.tap' suffix; also list
+       the `.test' suffix explicitly.
+       (EXTRA_DIST): Distribute the new files `plain-functions.sh' and
+       `tap-functions.sh'.
+       ($(TEST_LOGS)): Depends on them.
+       (AM_TESTS_ENVIRONMENT): Ensure that `use_tap' is not exported in
+       the environment of the tests.
+       (TESTS): Update.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typo, and related reformatting.
+
+2011-08-03  Stefano Lattarini  <address@hidden>
+
+       * NEWS: add mention of new experimental TAP support
+
+2011-08-02  Stefano Lattarini  <address@hidden>
+
+       testsuite: rename some test scripts
+       * tests/parallel-tests-am_tests_environment.test: Renamed ...
+       * tests/am-tests-environment.test: ... to this.
+       * tests/check-tests_environment.test: Renamed ...
+       * tests/tests-environment.test: ... to this.
+       * tests/parallel-test-driver-install.test: Renamed ...
+       * tests/parallel-tests-driver-install.test: ... to this.
+       * tests/parallel-tests-make-n.test: Renamed ...
+       * tests/parallel-tests-dry-run.test: ... to this.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-08-02  Stefano Lattarini  <address@hidden>
+
+       coverage: parallel-tests and lazy dependencies on EXTRA_PROGRAMS
+       * tests/parallel-tests-extra-programs.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * doc/automake.texi (Parallel Test Harness): Add a comment
+       pointing to the new test.
+
+2011-08-02  Stefano Lattarini  <address@hidden>
+
+       docs: improve, extend and fix documentation on TAP support
+       * doc/automake.texi ("Using the TAP test protocol"): Divide this
+       section into ...
+       ("Introduction to TAP", "Use TAP with the Automake test harness",
+       "Incompatibilities with other TAP parsers and drivers", "Links
+       and external resources"): ... these subsections, extend them by
+       adding more information and examples, and improve them by removing
+       incomplete and/or temporary wordings and TODO items.
+       ("Script-based Testsuites", "Parallel Test Harness"): Add a couple
+       of anchors to improve the granularity of cross-references.
+       * tests/tap-doc2.test: New test, verifying the correctness of the
+       new examples given in the manual.
+       * tests/Makefile.am (tap_other_tests): Add the new test.
+
+2011-08-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: separate the only failing check of an xfailing test
+       * tests/plan-bad-prog.test: Move the only failing check of this
+       test (i.e., the one about the total number of "ERROR" outcomes)
+       into ...
+       * tests/plan-bad-prog2.test: ... this new test.
+       * tests/Makefile.am (XFAIL_TESTS): Remove `plan-bad-prog.test',
+       add `plan-bad-prog2.test'.
+       (tap_other_tests): Add `plan-bad-prog2.test'.
+       (plan-bad-prog2.log): Depend on `plan-bad-prog.test'.
+
+2011-08-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix spurious errors in an xfailing test on TAP support
+       * tests/plan-bad-prog.test: Fix typo in the name of the test
+       being made unreadable.  Correct the wording of the potential
+       skip message, and simplify the condition under which the test
+       is to be skipped.  Escape literal dots in grep regexps.
+
+2011-08-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: better granularity in a couple of tests on TAP support
+       * tests/tap-summary-aux.sh: New auxiliary script, filled with code
+       moved out from ...
+       * tests/tap-summary.test: ... this test, from which the checks on
+       colored testsuite have further been moved into ...
+       * tests/tap-summary-color.test: ... this new test, which in turn
+       * tests/Makefile.am (tap_other_tests): Add `tap-summary-color.test'.
+       (EXTRA_DIST): Distribute `tap-summary-aux.sh'
+       (tap-summary.log): Depend on `tap-summary-aux.sh'.
+       (tap-summary-color.log): Likewise.
+
+2011-08-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: optimize tests on TAP for speed and against duplication
+       The creation and configuration of common files and data used by
+       many tests on TAP is, with this change, factored out into a new
+       dedicated auxiliary test, from which those tests will depend upon.
+       This reduces code duplication in tests and, more importantly,
+       offers a noticeable speedup in the involved tests (30-40%).
+       * tests/tap-common-setup.test: New test, setting up the common
+       files and data used by various tests on TAP support.
+       * tests/tap-setup.sh: New file, to be sourced by tests wanting to
+       bring in data generated by `tap-common-setup.test'.
+       * tests/tap-autonumber.test: Update to use the pre-computed data
+       files.
+       * tests/tap-bailout.test: Likewise.
+       * tests/tap-color.test: Likewise.
+       * tests/tap-deps.test: Likewise.
+       * tests/tap-diagnostic.test: Likewise.
+       * tests/tap-empty-diagnostic.test: Likewise.
+       * tests/tap-empty.test: Likewise.
+       * tests/tap-escape-directive.test: Likewise.
+       * tests/tap-exit.test: Likewise.
+       * tests/tap-signal.test: Likewise.
+       * tests/tap-fancy.test: Likewise.
+       * tests/tap-fancy2.test: Likewise.
+       * tests/tap-global-log.test: Likewise.
+       * tests/tap-global-result.test: Likewise.
+       * tests/tap-html.test: Likewise.
+       * tests/tap-log.test: Likewise.
+       * tests/tap-merge-stdout-stderr.test: Likewise.
+       * tests/tap-no-merge-stdout-stderr.test: Likewise.
+       * tests/tap-message-0.test: Likewise.
+       * tests/tap-no-disable-hard-error.test: Likewise.
+       * tests/tap-no-spurious-summary.test: Likewise.
+       * tests/tap-no-spurious.test: Likewise.
+       * tests/tap-not-ok-skip.test: Likewise.
+       * tests/tap-numeric-description.test: Likewise.
+       * tests/tap-out-of-order.test: Likewise.
+       * tests/tap-passthrough.test: Likewise.
+       * tests/tap-passthrough-exit.test: Likewise.
+       * tests/tap-plan.test: Likewise.
+       * tests/tap-plan-corner.test: Likewise.
+       * tests/tap-plan-corner2.test: Likewise.
+       * tests/tap-plan-errors.test: Likewise.
+       * tests/tap-realtime.test: Likewise.
+       * tests/tap-recheck-logs.test: Likewise.
+       * tests/tap-skip-whole.test: Likewise.
+       * tests/tap-todo-skip-together.test: Likewise.
+       * tests/tap-todo-skip-whitespace.test: Likewise.
+       * tests/tap-todo-skip.test: Likewise.
+       * tests/tap-unplanned.test: Likewise.
+       * tests/tap-with-and-without-number.test: Likewise.
+       * tests/tap-xfail-tests.test: Likewise.
+       * tests/tap-skip-whole-whitespace.test: Likewise, and remove
+       redundant definitions of `$sp' and `$tab' (they are already
+       defined in `tests/defs').
+       * tests/tap-whitespace-normalization.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       (EXTRA_DIST): Distribute `tap-setup.sh'.
+       (tap_with_common_setup_tests, tap_with_common_setup_logs)): New
+       variables, holding respectively the list of tests using the files
+       pre-computed by `tap-common-setup.test', and the list of their
+       corresponding log files.
+       (tap_other_tests): New variable, holding the list of other tests
+       on TAP support.
+       ($(tap_with_common_setup_logs)): Depend on `tap-common-setup.log'
+       and `tap-setup.sh'.
+
+2011-08-01  Stefano Lattarini  <address@hidden>
+
+       test harness: use new `.trs' files to hold test metadata
+       With this change, the test harness will keep test metadata in
+       dedicated `.trs' files, instead of having them embedded into the
+       `.log' files.  This allows for easier forward-compatibility and
+       extension of test metadata, and for more flexibility in the
+       format of the `.log' files.  Note that this change makes the
+       `:end-metadata:' field obsolete.
+       * doc/automake.texi (Parallel Test Harness, Log files generation
+       and test results recording): Document the new APIs and behaviour;
+       some related minor rewordings and fixlets.
+       * NEWS: Update.
+       * automake.in (handle_tests): When bringing in the content of
+       `check2.am', substitute %BASE% with the basename of the `.log'
+       file being created by a rule.  Add the generated `.trs' files
+       to the list of files to be cleaned by "make mostlyclean".
+       * lib/am/check.am (am__test_driver_flags): Rename ...
+       (am__common_driver_flags): ... to this, and remove the flags
+       `--test-name' and `--log-file' from it: they are now define in
+       the proper rules in `check2.am'.
+       (am__TEST_BASES): New internal variable, holding the names of
+       the tests, with any registered extension removed.
+       (am__stealth_MAKE): New internal variable, can be used instead of
+       $(MAKE) in recipes requiring a recursive call to make, but which
+       are not intended to be executed by "make -n".
+       (.log.trs): New suffix rule, to recover from deletion of `.trs'
+       files.
+       ($(TEST_SUITE_LOG)): Almost completely rewritten to follow the
+       new API of "test logs in `.log' files, test metadata in `.trs'
+       files".  It goes to some length to work correctly in face of
+       unreadable or missing `.log' and `.trs' files, and to error out
+       with proper error messages when this is not possible.
+       [%?PARALLEL_TESTS%] (check-TESTS): Also remove relevant "stale"
+       `.trs' files (in addition to `.log files) before remaking the
+       $(TEST_SUITE_LOG).
+       (recheck, recheck-html): Look for the `:recheck:' field in the
+       `.trs' files, not in the `.log' files.
+       * lib/am/check2.am (?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Adjust
+       the call to the test driver, in particularly passing the new
+       option `--trs-file'.
+       [%am__EXEEXT%] (?GENERIC?%EXT%$(EXEEXT).log): Likewise.
+       * lib/tap-driver ($USAGE): Adjust the help screen.
+       (Getopt::Long::GetOptions): Handle the `--trs-file' option,
+       through the use of ...
+       ($trs_file): ... this new global variable.
+       (finish): Write metadata for the test run to `$trs_file' rather
+       then to `$log_file', through the use of ...
+       (write_test_results): ... this new function.
+       * lib/test-driver (print_usage): Update the help screen.
+       (Option parsing): Handle the `--trs-file' option, through the
+       use of ...
+       ($resfile): ... this new global variable.
+       (Main code): Write metadata for the test run to `$trsfile' rather
+       than to `$logfile'.
+       Minor related adjustments to comments.
+       * tests/.gitignore: Ignore `*.trs' files.
+       * tests/parallel-tests-unreadable-log.test: Moved ...
+       * tests/parallel-tests-unreadable.test: ... to this, and extended
+       to also check the semantics for unreadable `.trs' files.
+       * tests/test-driver-end-metadata.test: Deleted as obsolete.
+       * tests/test-driver-metadata-no-leading-space.test: Likewise.
+       * tests/test-driver-global-log.test: Renamed ...
+       * tests/test-metadata-global-log.test: ... to this, and modified
+       as to verify the new APIs and semantics.
+       * tests/test-driver-recheck: Renamed ...
+       * tests/test-metadata-recheck.test: ... to this, and modified
+       likewise.
+       * tests/parallel-tests-once.test: New test.
+       * tests/parallel-tests-make-n.test: Likewise.
+       * test-metadata-results.test: Likewise.
+       * test-missing.test: Likewise.
+       * test-missing2.test: Likewise.
+       * test-trs-basic.test: Likewise.
+       * test-trs-recover.test: Likewise.
+       * test-trs-recover2.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-27  Stefano Lattarini  <address@hidden>
+
+       test harness: allow more metadata in log files
+       This change reworks and improves the parallel test harness to use
+       more specialized reStructuredText fields in the log files (instead
+       of relying on specially-placed of "magic lines" and more indirect
+       semantical formatting); the new fields are the following:
+        - ":recheck:": tell whether the associated test will have to be
+          re-run by "make recheck";
+        - ":copy-in-global-log:": tell whether the content of the log
+          file should be copied in the "global log" `test-suite.log';
+        - ":end-metadata:", which inhibits the scanning of the rest of
+          the log file (for what concerns test metadata).
+       Also, the special `:test-result:' value "END" has been removed,
+       superseded by the new `:end-metadata:' field.
+       * doc/automake.texi (Log files generation and test results
+       recording): Document the new API and semantics.  Remove or fix
+       some obsolete comments.
+       * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
+       Adjust comments and code.
+       * lib/tap-driver (finish): Adjust, with the help of ...
+       (must_recheck, copy_in_global_log): ... these new functions.
+       * lib/test-driver (Main code): Adjust, with the help of ...
+       ($recheck, $gcopy): ... these new variables.
+       * tests/trivial-test-driver: Update to obey the new APIs.
+       * tests/test-driver-recheck.test: Likewise.
+       * tests/test-driver-global-log.test: Likewise.
+       * tests/tap-passthrough.test: Relax the test, avoiding to check
+       what is written in `test-suite.log'; such check has been moved ...
+       * tests/tap-global-log.test: ... in this new test, and extended.
+       * tests/test-driver-metadata-no-leading-space.test: New test.
+       * tests/test-driver-end-test-results.test: Removed, it checked
+       the old APIs; superseded by ...
+       * tests/test-driver-end-metadata.test: ... this new test.
+       * tests/tap-log.test: Improve syncing with ...
+       * tests/test-log.test: ... this new test.
+       * tests/parallel-tests.test: Remove some duplication w.r.t. this
+       last new test.  Updated heading comments.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-27  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix a spurious failure with non-bash shells
+       * tests/tap-fancy2.test: Remove an unportable use of backslashes
+       with the `echo' builtin, which was causing some shells (among them
+       bash and Debian /bin/ksh) to print a `\\' string, while other
+       shells (among them zsh, dash, and Solaris /bin/sh and /bin/ksh)
+       were unexpectedly printing a single `\' character.  Since we are
+       at it, add a sanity check to ensure that this issue does not
+       resurface.
+
+2011-07-27  Stefano Lattarini  <address@hidden>
+
+       testsuite: fix spurious failures with Solaris /bin/sh
+       * tests/tap-more.test: Use `echo > file', not `: > file', to
+       create empty files in the "for" loops; this is required since,
+       as documented in the autoconf manual, Solaris 10 /bin/sh
+       "optimizes" away the `:' command after the first iteration,
+       even if it is redirected.
+       * tests/test-driver-custom-multitest-recheck2.test: Likewise.
+       * tests/tap-numeric-description.test: Partial rewrite to avoid
+       using positional parameters from the 10th onward, which are
+       unportable to Solaris /bin/sh (using `${10}' causes the shell
+       to die with "bad substitution").
+
+2011-07-31  Stefano Lattarini  <address@hidden>
+
+       simple tests: support developer-defined fd redirections
+       Motivated by coreutils bug#8846, and related discussions:
+        <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
+        <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
+       In those threads it has been shown how problematic it can be to do
+       portable file descriptor redirections in the testsuite when using
+       the Automake testsuite harness.  This change should remedy to that
+       situation.
+       * lib/am/check2.am (?GENERIC?%EXT%$(EXEEXT).log,
+       ?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Append redirection defined
+       in $(AM_TESTS_FD_REDIRECT) to the command-line invocations of the
+       test scripts.
+       * lib/am/check.am [!%?PARALLEL_TESTS%] $(check-TESTS): Likewise.
+       * NEWS: Update.
+       * doc/automake.texi (Script-based Testsuites): Document the new
+       feature.
+       * tests/check-fd-redirect.test: New test.
+       * tests/parallel-tests-fd-redirect.test: Likewise.
+       * tests/parallel-tests-am_tests_environment.test: Remove checks
+       about the use of redirections in AM_TESTS_ENVIRONMENT: they would
+       check deprecated (if not undefined) behaviour now.  Strengthen a
+       couple of still valid checks, to keep the test more in sync with
+       the documentation.  Improve debugging information.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-22  Stefano Lattarini  <address@hidden>
+
+       docs: rework and extend documentation on testsuites support
+       * doc/automake.texi (Generalities about Testing): New section.
+       (Simple Tests using parallel-tests): Section removed, merged
+       into ...
+       (Simple Tests): ... this one, which on the other hand has been
+       subdivided into ...
+       (Script-based Testsuites, Serial Test Harness, Parallel Test
+       Harness): ... these new subsection.
+       (DejaGnu Tests): Minor adjustments.
+       Other related typofixes and rewordings throughout the manual;
+       in particular, avoid to use the term "test driver" for three
+       different concepts (and use instead "test harness" and "test
+       runner" where appropriate).
+       * tests/tap-doc.test: New test.
+       * tests/tap-no-disable-hard-error.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-18  Stefano Lattarini  <address@hidden>
+
+       tap: support colorization of testsuite progress output
+       * lib/tap-driver (%COLORS): New variable (definition extracted
+       from `lib/am/check.am:$(am__tty_colors)', with some obvious
+       adjustments.
+       (report): Adjust to colorize console output when required,
+       using ...
+       (decorate_result): ... this new function.
+       (colored): New function, used by the one above.
+       * tests/tap-summary.test: Also run the checks when `color-tests'
+       is in use.
+       * tests/Makefile.am (XFAIL_TESTS): Remove `tap-color.test'.
+
+2011-07-18  Stefano Lattarini  <address@hidden>
+
+       tap: some preparatory refactoring (2)
+       This is a follow-up simplification.
+       * lib/tap-driver (console_output): Renamed ...
+       (report): ... to this, and extended to appropriately register
+       the test results when needed.
+       (testsuite_error, handle_tap_comment, handle_tap_test,
+       handle_tap_plan): Adjusted accordingly.
+
+2011-07-18  Stefano Lattarini  <address@hidden>
+
+       tap: some preparatory refactoring (1)
+       This refactoring is aimed at simplifying the introduction of
+       colored console output for the TAP driver.
+       * lib/tap-driver (console_output): Now accept two arguments, the
+       first one indicating which kind of thing is to be displayed (for
+       now only a test result or a diagnostic comment), and the second
+       one (if present) the message associated to it.
+       (handle_tap_test, handle_tap_comment, handle_tap_plan,
+       testsuite_error): Adapt to the new `console_output' interface.
+
+2011-07-18  Stefano Lattarini  <address@hidden>
+
+       tap: add experimental TAP-aware driver
+       * doc/automake.texi (Using the TAP test protocol): New section.
+       (Overview of Custom Test Drivers Support): Minor updates.
+       * lib/tap-driver: New script, TAP-aware test driver for Automake;
+       implemented in perl and based on TAP::Parser.
+       * lib/Makefile.am (dist_script_DATA): Add it.
+       * tests/tap-autonumber.test: New test.
+       * tests/tap-bailout.test: Likewise.
+       * tests/tap-basic.test: Likewise.
+       * tests/tap-deps.test: Likewise.
+       * tests/tap-diagnostic.test: Likewise.
+       * tests/tap-empty.test: Likewise.
+       * tests/tap-empty-diagnostic.test: Likewise.
+       * tests/tap-escape-directive.test: Likewise.
+       * tests/tap-exit.test: Likewise.
+       * tests/tap-fancy.test: Likewise.
+       * tests/tap-fancy2.test: Likewise.
+       * tests/tap-global-result.test: Likewise.
+       * tests/tap-html.test: Likewise.
+       * tests/tap-log.test: Likewise.
+       * tests/tap-merge-stdout-stderr.test: Likewise.
+       * tests/tap-more.test: Likewise.
+       * tests/tap-more2.test: Likewise.
+       * tests/tap-no-merge-stdout-stderr.test: Likewise.
+       * tests/tap-no-spurious-summary.test: Likewise.
+       * tests/tap-no-spurious.test: Likewise.
+       * tests/tap-not-ok-skip.test: Likewise.
+       * tests/tap-numeric-description.test: Likewise.
+       * tests/tap-out-of-order.test: Likewise.
+       * tests/tap-passthrough.test: Likewise.
+       * tests/tap-plan.test: Likewise.
+       * tests/tap-plan-errors.test: Likewise.
+       * tests/tap-plan-corner.test: Likewise.
+       * tests/tap-realtime.test: Likewise.
+       * tests/tap-recheck-logs.test: Likewise.
+       * tests/tap-recheck.test: Likewise.
+       * tests/tap-skip-whole.test: Likewise.
+       * tests/tap-summary.test: Likewise.
+       * tests/tap-todo-skip.test: Likewise.
+       * tests/tap-todo-skip-together.test: Likewise.
+       * tests/tap-todo-skip-whitespace.test: Likewise.
+       * tests/tap-skipall-whitespace.test: Likewise.
+       * tests/tap-unplanned.test: Likewise.
+       * tests/tap-whitespace-normalization.test: Likewise.
+       * tests/tap-with-and-without-number.test: Likewise.
+       * tests/tap-xfail-tests.test: Likewise.
+       * tests/tap-bad-prog.test: New xfailing test.
+       * tests/tap-color.test: Likewise.
+       * tests/tap-plan-corner2.test: Likewise.
+       * tests/tap-message-0.test: Likewise.
+       * tests/tap-signal.test: Likewise.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-07-07  Stefano Lattarini  <address@hidden>
+
+       test defs: new auxiliary function 'count_test_results'
+       * tests/defs (count_test_results): New function.
+       * tests/check11.test: Use it.
+       * tests/test-driver-custom-multitest.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck2.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/parallel-tests-no-spurious-summary.test: Likewise, and
+       slightly improve debugging output.
+       * tests/parallel-tests.test: Make use of `count_test_results'.
+       Also, make grepping of "make check" output slightly stricter
+       * tests/parallel-tests9.test: Likewise.
+       * tests/parallel-tests-log-override-2.test: Likewise, and throw
+       in a small optimization.
+
+2011-07-07  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: simplify testsuite summary
+       Prefer a more deterministic, "tabular" format for the testsuite
+       summary, always listing the numbers of passed, failed, xfailed,
+       xpassed, skipped and errored tests, even when these numbers are
+       zero.  This simplify the logic of testsuite summary creation,
+       makes it more easily machine-parseable, and will probably allow
+       for easier addition of new kinds of test results in the future.
+       * lib/am/check.am (am__tty_colors_dummy): New make variable, to
+       reduce code duplication.  Extracted from previous versions of
+       $(am__tty_colors), and extended by defining two new variables
+       `$mgn' and `$brg'.
+       [%?COLOR%, %!?COLOR%] (am__tty_colors): Use that new variable.
+       (am__text_box): Delete, is not needed anymore.
+       ($(TEST_SUITE_LOG)): Rewrite associated rules to implement the
+       new testsuite summary format.
+       * NEWS: Update.
+       * tests/check10.test: Don't run with the parallel-tests harness
+       too, that makes no sense anymore.
+       * tests/color.test: Update and adjust.
+       * tests/color2.test: Likewise.
+       * tests/parallel-tests.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests6.test: Likewise.
+       * tests/parallel-tests9.test: Likewise.
+       * tests/parallel-tests-unreadable-log.test: Likewise.
+       * tests/parallel-tests-empty-testlogs.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/parallel-tests-no-spurious-summary.test: Likewise.
+       * tests/test-driver-custom-multitest.test: Likewise.
+       * tests/test-driver-end-test-results.test: Likewise.
+       * tests/parallel-tests-no-color-in-log.test: New test.
+       * tests/testsuite-summary-color.test: Likewise.
+       * tests/testsuite-summary-count.test: Likewise.
+       * tests/testsuite-summary-count-many.test: Likewise.
+       * tests/testsuite-summary-reference-log.test: Likewise.
+       * tests/testsuite-summary-checks.sh: New auxiliary script, used
+       by the new tests above.
+       * tests/extract-testsuite-summary: Likewise.
+       * tests/trivial-test-driver: Optimize for speed when there are
+       lots of of tests.
+       * tests/Makefile.am (EXTRA_DIST): Distribute them.
+       (testsuite-summary-color.log, testsuite-summary-count.log): Depend
+       on them.
+       (testsuite-summary-count-many.log): Depend on the auxiliary scripts
+       'trivial-test-driver' and 'extract-testsuite-summary'.
+       (TESTS): Update.
+
+2011-07-07  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: new recognized test result 'ERROR'
+       * lib/am/check.am ($(TEST_SUITE_LOG)): Recognize a new test result
+       `ERROR'.  Use it when encountering unreadable test logs (previously
+       a simple `FAIL' was used in this situations).
+       * lib/test-driver: Set the global test result to `ERROR' when the
+       test exit status is 99.  When doing colorized output, color `ERROR'
+       results in magenta.
+       * doc/automake.texi (Log files generation and test results
+       recording): Update by listing `ERROR' too among the list of valid
+       `:test-results:' arguments.
+       * NEWS: Update.
+       * tests/trivial-test-driver: Update.
+       * tests/parallel-tests.test: Likewise.
+       * tests/parallel-tests-harderror.test: Likewise.
+       * tests/parallel-tests-no-spurious-summary.test: Likewise.
+       * tests/test-driver-global-log.test: Likewise.
+       * tests/test-driver-recheck.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck2.test: Likewise.
+       * tests/test-driver-custom-multitest.test: Likewise.
+       * tests/test-driver-custom-no-html.test: Likewise.
+       * tests/test-driver-end-test-results.test: Likewise.
+       * tests/color.test: Likewise.  Also, make stricter, and also test
+       from VPATH.
+       * tests/color2.test: Likewise, and improve syncing with color.test.
+       * tests/parallel-tests-exit-statuses.test: New test.
+       * tests/parallel-tests-console-output.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-07  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: make parsing of test results safer
+       The new code for parsing the testsuite-generated `.log' files,
+       as introduced in commit `v1.11-872-gc96b881', considers each
+       `:test-result:' field anywhere in a `.log' file as a declaration
+       of a test result, and accounts for it as such in the testsuite
+       summary.  Unfortunately this could easily cause spurious test
+       failures being reported in the testsuite summary.  This happened
+       in practice with the Automake's own testsuite; for example:
+         $ make check TESTS='check12-p.test'; echo exit: $?
+         ...
+         PASS: check12-p.test
+         =====================================
+         4 of 5 tests failed
+         See tests/test-suite.log
+         Please report to address@hidden
+         =====================================
+         make[2]: *** [test-suite.log] Error 1
+         make: *** [check-am] Error 2
+         exit: 2
+       This change introduces a new special `:test-result:' "END", that,
+       when seen, prevents the rest of the log file from being parsed.
+       For more information, refer to the thread:
+       
<http://lists.gnu.org/archive/html/automake-patches/2011-06/msg00199.html>
+       * lib/am/check.am ($(TEST_SUITE_LOG)): Stop the parsing of a log
+       file as soon as the special ":test-result:END" directive is seen.
+       Related changes and enhancements.
+       * lib/test-driver: Protect the rest of the log after the result
+       lined with a ":test-result:END" directive.
+       * doc/automake.texi (Log files generation and test results
+       recording): Update, and related improvements.
+       * tests/parallel-tests-no-spurious-summary.test: New test.
+       * tests/test-driver-end-test-results.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-29  Stefano Lattarini  <address@hidden>
+
+       docs: document custom test drivers and protocols
+       * doc/automake.texi (Simple Tests): Note that the TESTS_ENVIRONMENT
+       use suggested here is not portable to 'parallel-tests'.
+       (Simple Tests using parallel-tests): Document new restrictions on
+       the uses of TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT.
+       (Custom Test Drivers): New section and node.
+       (Overview of Custom Test Drivers Support): New subsection.
+       (Declaring Custom Test Drivers in @file{Makefile.am}): Likewise.
+       (APIs for Custom Test Drivers): Likewise.
+       (Options): Update description of color-tests.
+       * lib/am/check ($(TEST_SUITE_LOG)): Remove comments that have been
+       moved into the manual.
+       (recheck, recheck-html): Minor adjustments to better conform to the
+       documentation (this should cause no semantic changes w.r.t. the
+       former behaviour); minor improvements and extensions to existing
+       comments.
+       * tests/test-driver-create-log-dir.test: New test.
+       * tests/test-driver-strip-vpath.test: Likewise.
+       * tests/test-driver-global-log.test: Likewise.
+       * tests/test-driver-recheck.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-24  Stefano Lattarini  <address@hidden>
+
+       tests: small enhancement to 'primary3.test'
+       * tests/primary3.test: Also test that the program named `foo.la'
+       has been effectively created.
+
+2011-07-24  Stefano Lattarini  <address@hidden>
+
+       tests: a small simplification in 'pr8365-remake-timing.test'
+       * tests/pr8365-remake-timing.test: Avoid redundant definition
+       and use of `$save_AUTOCONF' variable.
+
+2011-07-24  Stefano Lattarini  <address@hidden>
+
+       tests: remove an extra leading blank line
+       * tests/override-conditional-1.test: Remove extra blank line
+       placed before the shebang line.
+
+2011-07-18  Stefano Lattarini  <address@hidden>
+
+       tests: fix typos, grammaros and other blunders in comments
+       All affected files changed.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       test defs: new subroutine 'seq_', simulating GNU seq(1)
+       * tests/defs (seq_): New subroutine.
+       * tests/instmany.test: Use it.
+       * tests/instmany-mans.test: Likewise.
+       * tests/instmany-python.test: Likewise.
+       * tests/self-check-seq.test: New self test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       tests: remove duplication about testing of config.* aux files
+       * tests/add-missing.test: Also check that the `AC_CANONICAL_SYSTEM'
+       autoconf macro causes the `config.sub' and `config.guess' scripts
+       to be installed by `automake --add-missing'.  Since we are at it,
+       fix minor buglets and cosmetic issues in the `check_' function.
+       * tests/hosts.test: Removed, completely subsumed by the previous
+       test now.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       tests: more uses of the 'unindent' subroutine
+       * tests/backcompat.test: Prefer `unindent' over plain `cat' for
+       here documents created from within a loop of if/else body.
+       * tests/backcompat2.test: Likewise.
+       * tests/backcompat4.test: Likewise.
+       * tests/init.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/instmany-mans.test: Likewise.
+       * tests/instmany-python.test: Likewise.
+       * tests/missing5.test: Likewise.
+       * tests/parallel-am2.test : Likewise.
+       * tests/parallel-am3.test : Likewise.
+       * tests/pr307.test: Likewise.
+       * tests/depend4.test: Likewise.  Since we are at it, normalize
+       other code formatting.
+       * tests/instfail-java.test: Prefer `echo' over `cat' + here-doc
+       inside a for loop.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       tests: avoid '##'-style comments inside recipe commands
+       * tests/autodist.test: Do not whitespace-indent `##' comments when
+       they are embedded in a makefile rule: having them indented is not
+       part of the Automake API, and might cause failures with e.g., Tru64
+       make.
+       * tests/autodist-subdir.test: Likewise.
+       * tests/backcompat.test: Likewise.
+       * tests/backcompat6.test: Likewise.
+       * tests/colon7.test: Likewise.
+       * tests/posixsubst-scripts.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       tests: tweak, improve and extend tests on lisp support
+       * tests/lisp2.test: Prettify, and improve debugging output.  Make
+       grepping of automake stderr stricter.
+       * tests/lisp7.test: Ensure verbose printing of captured make
+       output.  Add trailing `:' command.
+       * tests/lisp8.test: Likewise.
+       * tests/lisp3.test: Likewise.  Also, check that `.el' files and
+       compiled `.elc' files get installed by "make install", and
+       uninstalled by "make uninstall".
+       * tests/lisp4.test: Ensure installed `.el' files gets removed by
+       "make uninstall".  Related changes.  Add trailing `:' command.
+       * tests/lisp5.test: Likewise.
+       * tests/lisp6.test: Use proper m4 quoting in configure.in.  Fix
+       use of blank lines, to improve clarity and symmetry.  Fix typo in
+       comment.  Add trailing `:' command.
+
+2011-07-16  Stefano Lattarini  <address@hidden>
+
+       tests: drop useless requirement in 'license.test'
+       * tests/license.test: Drop  useless requirement "makeinfo".  Add
+       an extra blank line, for clarity.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests defs: more uses of $top_testsrcdir
+       * tests/autodist-stamp-vti.test: Use `$top_testsrcdir' instead
+       of `$testsrcdir/..'.
+       * tests/repeated-options.test: Likewise.
+       * tests/suffix5.test: Likewise.
+       * tests/vtexi3.test: Likewise.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       self tests: fix typo in comment
+       * tests/self-check-exit.test: Fix typo in heading comments.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/amhello-binpkg.test: Do not set the `errexit' shell
+       flag, as it is already set by `tests/defs'.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+       * tests/ansi2knr-deprecation.test: Likewise.
+       * tests/autodist-no-duplicate.test: Likewise.
+       * tests/distcheck-configure-flags-am.test: Likewise.
+       * tests/distcheck-configure-flags-subpkg.test: Likewise.
+       * tests/distcheck-configure-flags.test: Likewise.
+       * tests/distcheck-hook.test: Likewise.
+       * tests/distcheck-hook2.test: Likewise.
+       * tests/parallel-tests-am_tests_environment.test: Likewise.
+       * tests/parallel-tests-harderror.test: Likewise.
+       * tests/parallel-tests-log-compiler-example.test: Likewise.
+       * tests/parallel-tests-log-override-1.test: Likewise.
+       * tests/parallel-tests-log-override-2.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/primary-prefix-couples-documented-valid.test: Likewise.
+       * tests/primary-prefix-couples-force-valid.test: Likewise.
+       * tests/primary-prefix-invalid-couples.test: Likewise.
+       * tests/primary-prefix-valid-couples.test: Likewise.
+       * tests/remake-subdir-from-subdir.test: Likewise.
+       * tests/remake-subdir-gnu.test: Likewise.
+       * tests/remake-subdir-long-time.test: Likewise.
+       * tests/remake-subdir.test: Likewise.
+       * tests/remake-subdir2.test: Likewise.
+       * tests/silent-configsite.test: Likewise.
+       * tests/tests-environment-backcompat.test: Likewise.
+
+2011-06-29   Stefano Lattarini  <address@hidden>
+
+       docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
+       * doc/automake.texi (Simple Tests using parallel-tests): Ditto, and
+       related adjustments.
+       Suggestion by Ralf Wildenhues.
+
+2011-06-29  Stefano Lattarini  <address@hidden>
+
+       docs: fix unportable example of AM_TESTS_ENVIRONMENT usage
+       * doc/automake.texi (Simple Tests using parallel-tests): The
+       old example on AM_TESTS_ENVIRONMENT relied on unportable shell
+       features, and in particular didn't work with various Korn
+       Shells (see also commit `v1.11-925-g29ca903').  Give another
+       example, simpler this time, but still inspired to real-world
+       usage (the GNU coreutils testsuite).
+
+2011-06-28   Stefano Lattarini  <address@hidden>
+
+       yacc tests: fix bug in 'yacc-cxx.test'
+       * tests/yacc-cxx.test: Enable `errexit' shell flag (the lack of
+       which was masking the bug).
+       (bar.cxx): Rename to ...
+       (bar2.cxx): ... this, otherwise automake will (correctly) complain
+       that object `bar.o' is created by both `bar.cxx' and `bar.c++'.
+       (Makefile.am): Adjust.
+
+2011-06-28   Stefano Lattarini  <address@hidden>
+
+       lex tests: fix spurious link errors on Solaris
+       On Solaris 10, linking of lex-generated programs was failing in a
+       couple of lex tests with errors like this:
+         g++ -g -O2 -o joe joe.o -ll
+         Undefined symbol     first referenced in file
+         yywrap()             joe.o
+         ld: fatal: Symbol referencing errors. No output written to joe
+         collect2: ld returned 1 exit status
+       This change fixes it, also fixing at once potential problems for
+       systems that don't have a "lex library" (this happens for example
+       when cross-compiling from GNU/Linux to MinGW).
+       * tests/lex-depend-cxx.test (joe.ll, moe.l++): Define a dummy
+       `yywrap()' function.
+       * tests/lex-clean-cxx.test (mainfoo.cc, mainbar.cpp, mainbaz.c++,
+       mainqux.cxx): Likewise.
+
+2011-06-23  Stefano Lattarini  <address@hidden>
+
+       docs: avoid a footnote, some related rewordings and improvements
+       * doc/automake.texi (Dist): Reword the part about automatically
+       distributed files to avoid a footnote.  Since we are at it, extend
+       a bit, and add an example and a reference to a relevant test case.
+
+2011-06-23  Stefano Lattarini  <address@hidden>
+
+       docs: minor cosmetic fixes
+       * doc/automake.texi: Break few overly long lines, throughout the
+       file.
+       ("Simple Tests"): Move @vindex for XFAIL_TESTS to the correct
+       position, i.e., before and not after the paragraph where it is
+       introduced.
+       ("Options" @item ansi2knr): Use @pxref instead of @xref.  This
+       fixes a texinfo warning.
+       ("Other things Automake recognizes" @item AM_C_PROTOTYPES): Use
+       @pxref instead of @ref.
+
+2011-06-23  Stefano Lattarini  <address@hidden>
+
+       help: improve text about automatically-distributed files
+       This change fixes automake bug#7819.
+       * automake.in (usage): Distinguish between files that are always
+       automatically distributed when found, and those which are only
+       "under certain conditions".
+       * doc/automake.texi (Basics of Distribution): Update accordingly.
+       * tests/autodist-subdir.test: Update.
+       * tests/autodist-no-duplicate.test: Likewise.
+       * tests/autodist.test: Likewise.
+       (configure.in): Remove useless call to AM_MAINTAINER_MODE.
+
+2011-06-23  Stefano Lattarini  <address@hidden>
+
+       refactor: split 'usage' subroutine in automake
+       This change is related to automake bug#7819.
+       * automake.in (print_autodist_files): New subroutine,
+       extracted from ...
+       (usage): ... this, which now uses it.
+       * tests/autodist-no-duplicate.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-23  Stefano Lattarini  <address@hidden>
+
+       tests: fix bug in 'autodist.test'
+       * tests/autodist.test: Avoid spurious failure due to no
+       `defs-static' file being found in the parent directory.
+
+2011-06-21  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: allow each test to have multiple results
+       With this change, we improve the code creating the `test-suite.log'
+       global log and the console testsuite summary to make it able to
+       grasp multiple results per test script.  This is required in order
+       to introduce the planned support for test protocols, like TAP and
+       SubUnit, which can indeed run multiple tests per test script, each
+       with its individual result.
+       The implementation makes use of a custom reStructuredText field
+       `:test-result:'.
+       Note that no new documentation is added by this change; that is
+       be left for follow-up changes.
+       * lib/check.am ($(TEST_SUITE_LOG)): When processing .log files,
+       recognize a report of a test's result only if it is declared with
+       the custom `:test-result:' reStructuredText field placed at the
+       beginning of a line.  Extend and add explanatory comments.
+       (recheck, recheck-html): Add explanatory comments.
+       * lib/test-driver: Write an appropriate reStructuredText field
+       `:test-result:' in the generated log file.  Use a reStructuredText
+       transition to better separate the test outcome report from the
+       test script's registered output.  Improve comments.
+       * tests/test-driver-custom-xfail-tests.test: Adjust.
+       * tests/parallel-tests7.test: Adjust.
+       * tests/parallel-tests-empty-testlogs.test: New test.
+       * tests/parallel-tests-recheck-override.test: Likewise.
+       * tests/parallel-tests2.test: Extend and keep more in-sync with ...
+       * tests/test-driver-custom-html.test: ... this new related test.
+       * tests/test-driver-custom-no-html.test: New test.
+       * tests/test-driver-custom-multitest.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck.test: Likewise.
+       * tests/test-driver-custom-multitest-recheck2.test: Likewise.
+       * tests/trivial-test-driver: New file, used by the last four tests
+       above.
+       * tests/Makefile.am (TESTS): Update.
+       (EXTRA_DIST): Distribute `trivial-test-driver'.
+       (test-driver-custom-multitest.log): Depend on `trivial-test-driver'.
+       (test-driver-custom-multitest-recheck.log): Likewise.
+       (test-driver-custom-multitest-recheck2.log): Likewise.
+       (test-driver-custom-html.log): Likewise.
+
+2011-06-21  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: allow custom driver scripts
+       Allow suffix-based definition of custom "driver script" for the
+       test scripts.  These driver scripts will be responsible of
+       launching the tests (or their corresponding $(LOG_COMPILER), if
+       they have an associated one), interpreting and displaying the
+       test results, and writing the `.log' files.
+       This new API should allow easy and flexible use of different
+       test protocols in the future; in particular, we plan to use it
+       to implement TAP and SubUnit harnesses.
+       Note that no new documentation is added by this change; that is
+       be left for follow-up changes.
+       * automake.in (handle_tests): Define default for $(LOG_DRIVER),
+       and, for any registered test extension `<ext>', define defaults
+       for $(<ext>_LOG_DRIVER).  Substitute %DRIVER% using these new
+       variables, instead of the old internal $(am__test_driver).  When
+       processing check2.am, also substitute %DRIVER_FLAGS%.
+       Require auxiliary script `test-driver' only if no driver has been
+       explicitly defined for the test script kinds.
+       * am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log,
+       ?!GENERIC?%OBJ%): Pass the %DRIVER_FLAGS% to the %DRIVER% call.
+       * tests/parallel-tests-no-extra-driver.test: New test.
+       * tests/test-driver-custom.test: Likewise.
+       * tests/test-driver-custom-xfail-tests.test: Likewise.
+       * tests/test-driver-fail.test: Likewise.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+2011-06-21  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: add auxiliary script 'test-driver', refactor
+       This refactoring should cause no API of functionality change,
+       and is meant only to simplify the future implementation of TAP
+       and SubUnit testsuite drivers.  More precisely, our roadmap is
+       to move most of the "testsuite driving" features out of the
+       Automake-generated Makefiles, and into external scripts with
+       well-defined interfaces.  This will allow the user to define
+       its own personalized testsuite drivers, and will also offer us
+       a framework upon which to implement our new TAP and SubUnit
+       drivers, all in a very unobtrusive way and retaining an high
+       degree of code reuse and backward-compatibility.
+       * lib/test-driver: New auxiliary script.
+       * lib/Makefile.am (dist_SCRIPT_DATA): Add it.
+       * automake.in (handle_tests): Require the new auxiliary script
+       `test-driver', and define a new internal makefile variable
+       `$(am__test_driver)', used to call it.  Perform new substitution
+       on `DRIVER' when processing the `check2.am' file.
+       * lib/check.am (am__tty_colors): Define new shell variable
+       `$am__color_tests'.
+       (am__rst_section): Removed, its role taken over by the new
+       `test-driver' script.
+       (am__test_driver_flags): New variable, contains the command
+       line options passed to `test-driver'.
+       (am__check_pre): Do not deal with temporary files and exit
+       traps anymore, as the `test-driver' script takes care of that
+       now.  Define shell variable `$am__enable_hard_errors', used by
+       `$(am__test_driver_flags)'.  Reorder so that we don't need to
+       save and restore the value of the `TERM' environment variable
+       anymore.
+       Other related adjustments.
+       (am__check_post): Remove, as its role has been completely taken
+       over by the `test-driver' script.
+       * am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log,
+       ?!GENERIC?%OBJ%): Call the test script through the Automake
+       substituted `%DRIVER%', and honor the command-line options
+       in `$(am__test_driver_flags)'.  Do not call the obsoleted
+       `$(am__check_post)' anymore.
+       * doc/automake.texi (Auxiliary Programs): Mention the new
+       `test-driver' script.
+       (Optional): Mention `test-driver' in AC_CONFIG_AUX_DIR.
+       Since we are at it, break the list of auxiliary scripts by
+       placing one per line, to simplify potential future additions
+       of new scripts.
+       * tests/check.test: Adjust.
+       * tests/check2.test : Likewise.
+       * tests/check3.test : Likewise.
+       * tests/check4.test : Likewise.
+       * tests/check10.test: Likewise.
+       * tests/color.test: Likewise.
+       * tests/color2.test: Likewise.
+       * tests/comment9.test: Likewise.
+       * tests/dejagnu.test: Likewise.
+       * tests/exeext4.test: Likewise.
+       * tests/maken3.test: Likewise.
+       * tests/maken4.test: Likewise.
+       * tests/parallel-tests-interrupt.test: Likewise.
+       * tests/posixsubst-tests.test: Likewise.
+       * tests/repeated-options.test: Likewise.
+       * tests/check-no-test-driver.test: New test.
+       * tests/parallel-test-driver-install.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-06-21  Stefano Lattarini  <address@hidden>
+
+       maintcheck: extend 'sc_tests_plain_*' checks
+       * Makefile.am (sc_tests_plain_autom4te): New check.
+       (sc_tests_plain_autoreconf): Likewise.
+       (sc_tests_plain_autoheader): Likewise.
+       (syntax_check_rules): Update.
+
+2011-06-21  Stefano Lattarini  <address@hidden>
+
+       tests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER
+       * tests/tests-environment-and-log-compiler.test: New test,
+       checking that we can use variables and functions set by
+       TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER
+       and LOG_FLAGS (for tests both with and without registered
+       extensions).
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-24  Stefano Lattarini  <address@hidden>
+
+       tests: make 'subst-no-trailing-empty-line.test' more robust
+       * tests/subst-no-trailing-empty-line.test: Strengthen existing
+       checks, to try more scenarios and be slightly stricter in some
+       grepping checks.
+
+2011-06-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix an incomplete comment
+       * tests/subst-no-trailing-empty-line.test: Fix an incomplete
+       comment, and move it to a more proper place.  Minor cosmetic
+       fixes to other comments.
+
+2011-06-20  Stefano Lattarini  <address@hidden>
+
+       maintcheck: avoid few more spurious failures
+       * tests/depmod-data.test: Use creative quoting to avoid
+       spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+       check.  Commit `v1.11-900-g3453b8e' attempted to fix it, but
+       succeeded only partially.
+       * tests/cond33.test: Fix header comments, not to reference
+       obsolescent make variable `$(mkdir_p)'.
+       * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e",
+       to please `sc_tests_overriding_macros_on_cmdline'
+       * tests/cond19.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/add-missing.test: Use "AUTOMAKE_fails" instead of
+       "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'.
+
+2011-06-20  Stefano Lattarini  <address@hidden>
+
+       maintcheck: avoid few spurious failures
+       * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl,
+       sc_tests_plain_autoconf, sc_tests_plain_automake,
+       sc_tests_plain_autoupate): Be stricter in matching an erroneous
+       literal command, i.e., `aclocal', `automake', `perl', etc.
+
+2011-06-20  Bert Wesarg <address@hidden>  (tiny change)
+
+       check: don't use multi-line coloring for the report
+       "less -R" can't handle multi-line coloring as it is done for the
+       check reports of the serial and parallel testsuite, because of
+       performance reasons.  Thus, color each line of the check report
+       by its own.
+       * lib/am/check.am (am__text_box): Accept colors for lines, and
+       color each line by its own.
+       [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Let am__text_box handle
+       the line coloring.
+       [!%?PARALLEL_TESTS%] $(check-TESTS): Color each report line by
+       its own.
+       * THANKS: Update.
+
+2011-06-18  Stefano Lattarini  <address@hidden>
+
+       docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
+       * doc/automake.texi (Checking the Distribution): Explain that the
+       developers should take care of making their code buildable without
+       requiring any special configure options, so that in general
+       AM_DISTCHECK_CONFIGURE_FLAGS shouldn't be used.  Give an example
+       of where its use is legitimate.
+       Suggestions from Ralf Wildenhues and Eric Blake.
+
+2011-06-14  Stefano Lattarini  <address@hidden>
+
+       ansi2knr: deprecate, it will go away in the next major release
+       * doc/automake.texi: Loudly and repeatedly state that the old
+       de-ANSI-fication features are now deprecated and will be removed
+       in the next major Automake release.  Other related adjustments.
+       * lib/Automake/Options.pm (_process_option_list ): Give a warning
+       in the `obsolete' category when the `ansi2knr' option is used.
+       * m4/protos.m4 (AM_C_PROTOTYPES): Deprecate this macro: a warning
+       in the `obsolete' category will be emitted it if is used.
+       * tests/ansi2knr-deprecation.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * tests/ansi.test: Adjust, by calling autoconf and/or automake
+       with the `-Wno-obsolete' flag.
+       * tests/ansi10.test: Likewise.
+       * tests/ansi2.test: Likewise.
+       * tests/ansi3.test: Likewise.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi4.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi8.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/cxxansi.test: Likewise.
+       * tests/libobj8.test: Likewise.
+       * NEWS: Update about the future planned backward-incompatibility
+       due to the removal of de-ANSI-fication feature.
+
+2011-06-19  Stefano Lattarini  <address@hidden>
+
+       docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
+       * doc/automake.texi (Program Sources): pkglib_PROGRAMS is not a
+       valid combination anymore, so don't document it.  Inconsistency
+       introduced in commit `v1.11-373-g9ca6326'.
+
+2011-06-19  Jim Meyering  <address@hidden>
+
+       docs: replace obsolete @vindex entry with a useful one
+       * doc/automake.texi (Program Sources): Do not index obsolete
+       pkglib_PROGRAMS here.  Do index pkglibexec_PROGRAMS.
+
+2011-06-18  Stefano Lattarini  <address@hidden>
+
+       tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
+       * tests/tests-environment-fd-redirect.test: Extend by also using
+       a perl script among the tests.  Run the test shell script with
+       the `errexit' flag active.  Export `VERBOSE' to yes when running
+       "make check", to give more debugging information in case of
+       failures.  Look for a Korn Shell also in `/usr/bin', not on only
+       in `/bin'.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: optimize tests on primary/prefix mismatch for speed
+       * tests/primary-prefix-invalid-couples.test: Partial rewrite, in
+       order to use just a single automake invocation rather than one
+       invocation for each invalid primary/prefix couple.  This improves
+       the test script execution time by an order of magnitude.
+       Since we are at it, throw in some other improvements to avoid
+       unrelated automake warnings and failures that could potentially
+       cause false positives w.r.t. the automake exit status.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
+       * NEWS (Miscellaneous changes): Update.
+
+2011-06-10  Stefano Lattarini  <address@hidden>
+
+       maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
+       * Makefile.am (sc_tests_overriding_macros_on_cmdline): It's now
+       acceptable that the test scripts override DISTCHECK_CONFIGURE_FLAGS
+       on the make command line.  Update comments accordingly.  Since we
+       are at it, make the relevant grepping rules slightly tighter.
+
+2011-06-10  Stefano Lattarini  <address@hidden>
+
+       distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
+       * doc/automake.texi (Checking the Distribution): Suggest to use
+       AM_DISTCHECK_CONFIGURE_FLAGS, not DISTCHECK_CONFIGURE_FLAGS, to
+       define (in the top-level Makefile.am) extra flags to be passed
+       to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS
+       should be reserved for the user.  Add proper address@hidden' directive.
+       Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a
+       subpackage Makefile.am, but the flags in it are passed down to
+       the configure script of the subpackage.
+       * lib/am/distdir.am (distcheck): Also pass the flags in
+       $(AM_DISTCHECK_CONFIGURE_FLAGS) to the configure invocation.
+       Update comments.
+       * tests/defs.in.test (AM_DISTCHECK_CONFIGURE_FLAGS,
+       DISTCHECK_CONFIGURE_FLAGS): Unset in case they are exported in
+       the environment, they might improperly influence our testsuite.
+       * tests/distcheck-configure-flags.test: New test.
+       * tests/distcheck-configure-flags-am.test: Likewise.
+       * tests/distcheck-configure-flags-subpkg.test: Likewise.
+       * distcheck-hook.test: Likewise.
+       * distcheck-hook2.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       Closes automake bug#8784.
+
+2010-06-09  Stefano Lattarini  <address@hidden>
+
+       docs: better documentation for silent make rules
+       * doc/automake.texi (Options): Detailed description of the
+       automake option `silent-rules' moved from here ...
+       (Silent Make): ... into this new chapter, expanded, improved,
+       and subdivided into ...
+       (Make verbosity, Tricks For Silencing Make,
+       Automake silent-rules Option): ... these new sections.
+       (@menu, @detailmenu): Update.
+       * tests/silent-configsite.test: New test, checking that the
+       user can control default mode of silent-rules from config.site,
+       as is documented in the manual.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-06-11  Stefano Lattarini  <address@hidden>
+
+       Warnings about primary/prefix mismatch fixed and extended.
+       * automake.in (%standard_prefix): Add `doc' and `locale'.
+       Rename `pkgdatadir' to `pkgdata'.  Similarly for`pkglibdir',
+       `pkgincludedir' and `pkglibexecdir'.
+       (handle_programs): List `pkglibexec', not `pkglib', among the
+       prefixes valid for the `PROGRAMS' primary.
+       (handle_data): List also `doc' among the prefixes valid for
+       the `DATA' primary.  This is required by automake's own build
+       system.
+       * tests/dirforbid.test: Test removed, superseded by ...
+       * tests/primary-prefix-invalid-couples.test: ... this new test.
+       * tests/primary-prefix-valid-couples.test: New test.
+       * tests/primary-prefix-couples-documented-valid.test: Likewise.
+       * tests/primary-prefix-couples-force-valid.test: Likewise.
+       * tests/java3.test: Adjusted, and extended a bit.
+       * tests/Makefile.am (TESTS): Updated.
+       * NEWS: Updated.
+       From a report by Eric Blake.
+
+2011-06-14  Stefano Lattarini  <address@hidden>
+
+       tests: check portable fd redirection in TESTS_ENVIRONMENT
+       * tests/tests-environment-fd-redirect.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       Motivated by coreutils bug#8846:
+        <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
+       See also following CC:ed thread on bug-autoconf list:
+        <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
+
+2011-06-16  Stefano Lattarini  <address@hidden>
+
+       tests: make test 'self-check-reexec.test' more portable
+       * tests/self-check-reexec.test: Rewrite not to require a Korn
+       Shell able to grok variable expansions such as `${.sh.version}';
+       Solaris 10 /bin/ksh fails on this for example.  Instead, just
+       require bash and a shell that is not bash.
+
+2011-06-14  Stefano Lattarini  <address@hidden>
+           Jim Meyering  <address@hidden>
+
+       test defs: fix ksh-related portability bug in warning messages
+       Running "make check" normally prints a diagnostic to the outermost
+       stderr (usually a tty) to explain why a test is skipped, thus
+       giving better and faster feedback to the user.  It used to do
+       so by redirecting file descriptor 9 to stderr (via "exec 9>&2")
+       before invoking the test scripts, which then would write any skip
+       explanation to file descriptor 9 via the `skip_' function defined
+       in `tests/defs'.
+       However, various Korn Shells (at least Solaris 10's /bin/ksh and
+       Debian GNU/Linux's /bin/ksh) and the HP-UX's /bin/sh close open
+       file descriptors > 2 upon an `exec' system call; thus the effects
+       of "exec 9>&2" are cancelled upon fork-and-exec, so we would get
+       a "Bad file number" diagnostic and no skip explanation with those
+       shells.
+       The present change remedies this situation.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Redirect more portably,
+       via a trailing "9>&2", rather than the prior "exec 9>&2; ...".  Add
+       explanatory comments.
+       * tests/defs (stderr_fileno_): Update the advice in comments.
+       Based on commit v8.12-82-g6b68745 "tests: accommodate HP-UX and
+       ksh-derived shells" in GNU coreutils.
+       Further references, with lots of discussion:
+        <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
+        <http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/22488>
+        <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: remove 'test_prefer_config_shell' from the environment
+       Since commit `v1.11-910-g7df1a9b', the once user-overridable
+       variable `$test_prefer_config_shell' has become an internal
+       detail, and the test scripts now complain and bail out if it is
+       set in the environment.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Unset the variable
+       `test_prefer_config_shell' if it is set in the environment.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: autogenerate list of wrapped tests for `lib/' shell scripts
+       * tests/gen-config-shell-tests: New script, generates distributed
+       makefile snippet `tests/config-shell-tests.am' to list all tests
+       that use the `get_shell_script' function, with names mangled to
+       use suffix `-w.shtst', in ...
+       * tests/Makefile.am (config_shell_tests): ... this macro, whose
+       definition has been consequently removed from Makefile.am.
+       (EXTRA_DIST): Distribute the new script.
+       ($(srcdir)/config-shell-tests.am): Generate using the new script.
+       (include): Include the `config-shell-tests.am' fragment.
+       * bootstrap: Invoke `tests/gen-config-shell-tests' to generate
+       `tests/config-shell-tests.am'.
+       * tests/.gitignore: Ignore `config-shell-tests.am'.
+       * tests/gen-parallel-tests: Fixlet in heading comments.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: test mdate-sh with /bin/sh too
+       * tests/mdate5.test: Fetch the `mdate-sh' script using the
+       `get_shell_script' function, and run it directly instead of
+       using `$SHELL'.
+       * tests/mdate6.test: Likewise.  Since we are at it, make checks
+       on the `mdate-sh' output stricter, remove now unneeded calls to
+       aclocal and automake and creation/extension of `configure.in',
+       `Makefile.am' and `textutils.tex' files, and add a trailing `:'
+       command.
+       * tests/Makefile.am (config_shell_tests): Add `mdate5-w.shtst'
+       and `mdate6-w.shtst'.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: extend tests on `--add-missing' and `--copy' a bit
+       * tests/add-missing.test: Fix typo in heading comments.  Try with
+       another testcase that install many (but not all) the auxiliary
+       scripts at once, and uses non-standard (but valid and documented)
+       setups (e.g., defining YACC in Makefile.am instead of calling
+       AC_PROG_YACC from configure.in).
+       * tests/copy.test: Reference `add-missing.test' in heading
+       comments.  Try few more test scenarios.
+
+2011-06-16  Stefano Lattarini  <address@hidden>
+
+       tests: few fixlets and improvements
+       * tests/cond31.test ($required): Remove `cc', it's not really
+       needed.
+       * tests/confh.test: Call autoheader too.  The lack of this call
+       wasn't causing spurious failures because the automatic remake
+       rules were somehow invoking it on our behalf (at make time).
+       * tests/fn99subdir.test: Use $subdirname throughout, instead of
+       ${subdirname}, for consistency with the rest of the testsuite.
+       Avoid an unnecessary subshell, which could also cause spurious
+       passes, being guarded by a trailing `|| Exit 1', which neutralize
+       the `errexit' flag.  Remove an unnecessary `|| Exit 1' guard.
+       * tests/insh2.test: Rewrite to avoid hackish Makefile.in munging,
+       and to also run configure and make.
+
+2011-06-13  Stefano Lattarini  <address@hidden>
+
+       tests: don't hard-code test name in txinfo21.test
+       * tests/txinfo21.test: Use `$me' instead of hard-coding the
+       current testcase name "txinfo21".  Add a trailing `:' command
+       since we are at it.
+
+2011-06-10  Stefano Lattarini  <address@hidden>
+
+       tests: new test dedicated to `--add-missing' and `--copy'
+       * tests/add-missing.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       Suggested by Peter Rosin.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       testsuite: use 'fatal_' and 'framework_failure_' for hard errors
+       * tests/defs (require_xsi): Use `fatal_', not `framework_failure',
+       to report an invalid usage.
+       * tests/remake-gnulib-remove-header.test: Prefer using `fatal_'
+       with a proper error message over a direct call to `Exit 99'.
+       * tests/pr8365-remake-timing.test: Likewise.
+       * tests/cygnus-imply-foreign.test: Likewise.
+       * tests/missing6.test: Likewise.
+       * tests/cond8.test: Likewise.
+       * tests/cond33.test: Likewise.
+       * tests/python-virtualenv.test: Prefer using `framework_failure_'
+       with a proper error message over a direct call to `Exit 99'.
+       * tests/instspc-tests.sh: Prefer using `framework_failure_' and
+       `fatal_' over direct calls to `Exit 99'.
+       (fatal_): Define this (which is a simplified version of the one
+       in `tests/defs') for early uses (i.e., before `tests/defs'
+       gets sourced).
+       * tests/depmode-tests.sh: Likewise.  Also, simplify the
+       'get_depmodes' function and calls to it accordingly.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       self tests: check new 'fatal_' function
+       * tests/self-check-exit.test: Also check the new 'fatal_'
+       function.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       test defs: new function 'fatal_', for hard errors
+       Before this patch, the only way offered by tests/defs to
+       properly signal a hard error was the `framework_failure_'
+       function.  But the error message issued by that function,
+       as its name would suggest, refers to a set-up failure in the
+       testsuite, while hard errors can obviously also be due to
+       other reasons.  The best way to fix this inconsistency is to
+       introduce a new function with a more general error message.
+       Inspired by a recent similar change to Gnulib's tests/init.sh.
+       * tests/defs (fatal_): New function.
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Suggest the use of `fatal_', not of `framework_failure_', for
+       generic hard errors.  The latter should be reserved for "real"
+       set-up failures.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       py-compile: '--' and non-option arguments terminate the option list
+       * lib/py-compile: Any non-option argument, or the special `--'
+       argument, now explicitly terminates the list of options.
+       * tests/py-compile-option-terminate.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       py-compile: complain on unrecognized options
+       * lib/py-compile: Complain on unrecognized options.  Don't be too
+       lax in matching `--help' and `--version' options.
+       * tests/py-compile-usage.test: Extend accordingly.
+       * NEWS: Update.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       py-compile: normalize error and help messages
+       * lib/py-compile: Now error messages do not begin with a capital
+       letter, nor end with a period, as per GNU standards.  Prepend the
+       error messages with the name of the script, not with its path.
+       When an invalid usage is recognized, always display the customary
+       message "Try `py-compile --help' ..." on a line of its own.
+       ($me): New variable, containing the name of the
+       program, i.e., `py-compile'.  Use it throughout.
+       (usage_error): New function, used to display error messages about
+       invalid usage.
+       * tests/py-compile-usage.test: Extend and tighten accordingly.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       python tests: add "unit tests" on py-compile
+       * tests/py-compile-basic.test: New test.
+       * tests/py-compile-basic2.test: New test.
+       * tests/py-compile-basedir.test: Likewise.
+       * tests/py-compile-destdir.test: Likewise.
+       * tests/py-compile-env.test: Likewise.
+       * tests/py-compile-usage.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       Tested with python 2.0.1, 2.4.6, 2.6.6, 2.7.1, and 3.1.3.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       py-compile: the '--destdir' option now accepts a blank argument
+       * lib/py-compile (Option parsing): Do not count an empty argument
+       to `--destdir' or `--basedir' as a missing argument.
+       * lib/python.am: Simplify accordingly, passing the `--destdir'
+       option to py-compile unconditionally, even if `$(DESTDIR)' is
+       empty.
+       * NEWS: Update.
+
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       python: run the 'py-compile' script with $(SHELL)
+       * lib/python.am (install-%DIR%PYTHON): Run each instance of
+       py-compile using $(SHELL).  Since we are at it, break overly
+       long lines.
+       (am__py_compile): New variable, to reduce code duplication.
+
+
+2011-06-07  Stefano Lattarini  <address@hidden>
+
+       tests: `lib/' shell scripts transparently tested also with $SHELL
+       With the previous commit, the user could prefer the use of $SHELL
+       over /bin/sh in some tests checking the Automake-provided shell
+       scripts by manually exporting `test_prefer_config_shell' to "yes"
+       in the environment.  With this commit, we ensure that such tests
+       *always* and *transparently* run using both $SHELL and /bin/sh
+       to execute the checked scripts.  The `test_prefer_config_shell'
+       variable becomes an internal detail, and is no more meant to be
+       manually defined or overridden.
+       * tests/defs-static.in: Check that `test_prefer_config_shell' is
+       not exported in the environment.  Error out if this is the case.
+       * tests/config-shell-tests.sh: New file, driver script to run
+       checks on the shell scripts in `lib/' using the $SHELL determined
+       at configure time instead of the default system shell /bin/sh.
+       * Makefile.am (TESTS_EXTENSIONS): Add `.shtst'.
+       (SHTST_LOG_COMPILER): Define, it calls `config-shell-tests.sh'.
+       (config_shell_tests): Define to a list of tests that wraps other
+       `*.test' tests using `config-shell-tests.sh'.
+       ($(config_shell_tests)): Dummy dependency declaration required
+       in order to have make actually produce expected log files from
+       the `.shtst.log' suffix rule.
+       (EXTRA_DIST): Distribute `config-shell-tests.sh'.
+       (TESTS): Add `$(config_shell_tests)'.
+       * tests/self-check-env-sanitize.test: Update, by checking that
+       `test_prefer_config_shell' isn't exported in the environment.
+
+2011-06-07  Stefano Lattarini  <address@hidden>
+
+       tests: can use also $SHELL to check shell scripts from `lib/'
+       * tests/ar-lib.test: If the variable `$test_prefer_config_shell'
+       is set to "yes", run the script under test with configure-time
+       determined $SHELL, rather than with /bin/sh.
+       The `$test_prefer_config_shell' variable defaults to empty, but
+       can be overridden at runtime by the user, thus allowing more
+       coverage.
+       * tests/compile.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/compile3.test: Likewise.
+       * tests/compile4.test: Likewise.
+       * tests/compile5.test: Likewise.
+       * tests/compile6.test: Likewise.
+       * tests/instsh2.test: Likewise.
+       * tests/instsh3.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/missing.test: Likewise.
+       * tests/missing2.test: Likewise.
+       * tests/missing3.test: Likewise.
+       * tests/missing5.test: Likewise.
+       * tests/defs (get_shell_script): New subroutine, factoring out
+       code common to the tests above.
+       (xsi-lib-shell): If `$test_prefer_config_shell' is set to "yes",
+       check that $SHELL, not /bin/sh, supports XSI constructs, as we
+       expect the test will use $SHELL and not /bin/sh to run the
+       script being tested.
+
+2011-06-07  Stefano Lattarini  <address@hidden>
+
+       tests defs: better requirements for XSI shells
+       This change avoids potential spurious failures with tests using
+       the requirement 'xsi-shell' to mean that they want */bin/sh* (not
+       $SHELL) to be XSI-conforming.  This idiom used to work before
+       commit `v1.11-874-g1321be7' (as back then the test scripts were
+       unconditionally run with /bin/sh), but has become inconsistent
+       now that the test scripts re-execute themselves with configure
+       determined $SHELL.
+       The described spurious failures have already occurred in practice,
+       for examples on Solaris systems which also had GNU Bash installed.
+       From a suggestion by Peter Rosin.  See discussion at:
+       
<http://lists.gnu.org/archive/html/automake-patches/2011-06/msg00016.html>
+       * tests/defs (xsi-shell): Now check that $SHELL, rather than the
+       shell currently running the test script, is an XSI shell.
+       (xsi-bin-sh): New requirement, checking that /bin/sh (which can
+       differ from $SHELL) is an XSI shell.
+       (xsi-lib-shell): New requirement, checking that the shell that
+       should be used to test the Automake-provided scripts from `lib/'
+       is an XSI shell.  For the moment, this is just an alias for
+       `xsi-bin-sh'.
+       (require_xsi): New subroutine, used to factor out code common to
+       the requirements above.
+       ($xsi_shell_code): New variable, contains shell code supposed to
+       work only with XSI shells.  Used by the new subroutine above.
+       * tests/ar-lib.test ($required): Require 'xsi-lib-shell' instead
+       of 'xsi-shell', since the script we test here is run with /bin/sh,
+       not with $SHELL.
+       * tests/compile3.test: Likewise.
+       * tests/compile6.test: Likewise.
+
+2011-06-05  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo-related error in auxdir2.test
+       * tests/auxdir2.test (configure.in):  Close m4 quoting in the
+       argument to AC_CONFIG_AUX_DIR.  Without this, aclocal fails with
+       "ERROR: end of file in string".  This problem hasn't been exposed
+       by the testsuite before because this test is in XFAIL_TESTS, so
+       its failure went unnoticed, even if it was due to a wrong cause.
+       Bug introduced in commit v1.11-249-g49ac3de.
+
+2011-06-05  Stefano Lattarini  <address@hidden>
+
+       self tests: check that `$me' can be overridden
+       * tests/self-check-me.test: Check that `$me' can be overridden
+       before sourcing ./defs, with or without sourcing ./defs-static
+       beforehand, and that this override is honored.  Update heading
+       comments.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       self tests: fix another spurious failure
+       Our ad-hoc usage of `tests/defs' in the testsuite's self tests
+       stopped working properly when we made the test scripts re-execute
+       themselves with the configure-time $SHELL.  Fix this.
+       Fixes a regression introduced by commit 'v1.11-874-g1321be7'.
+       * tests/self-check-exit.test: Export `AM_TESTS_REEXEC' to "no"
+       before running the self tests.  This fixes a spurious failure
+       present only when the test was run by hand.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       silent-rules tests: fix spurious failures with Sun Studio C++
+       * tests/silentcxx.test: The C++ compiler from Sun Studio is named
+       `CC'.  Account for this in our grepping checks on the make output.
+       Since we are at it, throw in a couple of improvements to comments
+       and formatting.
+       * tests/silent-many-generic.test: The C++ compiler from Sun Studio
+       is named `CC', and this can cause spurious failures in our grepping
+       of the make output.  Work around this by using a wrapper script
+       around the C++ compiler (generated on the fly), since filtering the
+       make output proved to be too fragile.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in backcompat2.test on NetBSD
+       * tests/backcompat2.test: Add trailing `:' in the body of a `for'
+       loop, in case the last command there might have an exit status
+       different 0.  This work around `set -e' issues in some BSD shells,
+       e.g., NetBSD /bin/ksh.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in autohdr3.test
+       * tests/autohder3.test (Makefile.am): Let `test' depend on `all',
+       so that config.h header is truly remade.
+       Remove now useless call to `$MAKE' when non-GNU make is in use.
+       Failure introduced by commit `v1.11-895-g5e62b96'.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure of cond29.test on NetBSD
+       * tests/cond29.test: Skip if we cannot safely limit the maximal
+       size of used virtual memory to 20K.  This fixes a spurious failure
+       on NetBSD.
+       Bug introduced in commit `v1.11-885-g908d335'.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix again few more failures
+       * tests/cond29.test: To please the `sc_tests_Exit_not_exit'
+       maintainer check, avoid using `sh -c "exit 0"' where a simple
+       `sh -c :' will do.
+       * tests/depmod-data.test: Use creative quoting to avoid
+       spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+       check.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix some more failures
+       * tests/instdir-ltlib.test: Use creative quoting to avoid
+       spuriously triggering the `sc_rm_minus_f' maintainer check.
+       * tests/instdir-prog.test: Likewise.
+       * tests/instspc-data.test: Use creative quoting to avoid
+       spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+       check.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix some failures, extend some checks
+       * Makefile.am (sc_diff_automake_in_automake): Update, as we
+       now expect 9 lines, not 8, to be changed from `automake.in'
+       to `automake'.
+       (sc_diff_aclocal_in_aclocal): New maintainer check, similar to
+       the above, and checking that only 10 lines are changed from
+       `aclocal.in' to `aclocal'.
+       (syntax_check_rules): Update.
+       (sc_tests_Exit_not_exit): Exempt self tests `self-check-*.test'
+       from this check, as they can legitimately use the bare `exit'
+       builtin in various places.
+       * doc/automake.texi (Python): Remove stray `@' from the end of
+       a line.  Typo introduced in commit `v1.11-312-g5bf7af6'.
+       * tests/depcomp8a.test: Pass DISTCHECK_CONFIGURE_FLAGS to make
+       from the environment rather than from the command line, to
+       pacify the `sc_tests_overriding_macros_on_cmdline' maintainer
+       check.
+       * tests/depcomp8b.test: Likewise.
+
+2011-06-02  Stefano Lattarini  <address@hidden>
+
+       tests: don't require GNU make where it's not strictly needed
+       * tests/autohdr3.test: Rewrite to be stricter when make is GNU
+       make.  Drop the requirement of GNU make.
+       * tests/aclocal5.test: Drop GNU make requirement, it's not truly
+       needed.  Add reference to similar tests `remake-subdir*.test'.
+       * remake-subdir-gnu.test, remake-subdir-from-subdir.test,
+       remake-subdir.test, remake-subdir2.test: Add reference to
+       each other, and to related test `aclocal5.test'.
+       * tests/aclocal6.test: Drop GNU make requirement, it's not
+       truly needed.
+       * tests/confh6.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/remake11.test: Likewise.
+       * tests/subdir5.test: Likewise.
+       * tests/subdir8.test: Likewise.
+       * tests/werror2.test: Likewise.
+       * tests/conff.test: Likewise, and ensure verbose printing of
+       captured make output.
+       * tests/lex5.test: Tweak so that GNU make is no more required.
+       * tests/version7.test: Likewise.
+       * tests/maken2.test: Add explicative comment for why this test
+       requires GNU make.
+       * tests/maken4.test: Let it run also with BSD makes supporting
+       the `.MAKE' special target.
+       * tests/output6.test: Use proper m4 quoting in configure.in.
+       Expand make macros with one-character name using `$(x)', not
+       `$x', for portability.  Move checks in the makefiles, rather
+       than relying on grepping the output from make.  Drop the now
+       unneeded GNU make requirement.
+
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       remake: behave better with non-GNU make in subdirectories
+       Currently, with every decent make program, it is possible to
+       rebuild out-of-date autotools-generated files with a simple
+       "make Makefile" -- but for this to work reliably with non-GNU
+       make implementations, the command must be issued from the
+       top-level directory.  This patch removes such limitation.
+       * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
+       * tests/remake-subdir.test: New test.
+       * tests/remake-subdir2.test: Likewise.
+       * tests/remake-subdir-gnu.test: Likewise.
+       * tests/remake-subdir-from-subdir.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       lex tests: fix spurious failures with Solaris lex
+       * tests/lex-lib.test (foo.l): Avoid empty "rules section", which
+       can confuse Solaris lex.
+       * tests/lex-libobj.test (foo.l): Likewise.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       lex tests: do not force the use of flex unconditionally
+       * tests/defs (lex): Act more similarly to what the `yacc'
+       requirement does, i.e., only force the use of flex if the
+       $LEX variable is left unset by the user.
+       (flex): Use `skip_' to skip the test if flex is not found.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       lex tests: avoid possible hang; fix and extend
+       * tests/lex3.test (foo.l:yywrap): Return 1, not 0, to avoid hangs.
+       Bug introduced in commit 'v1.11-871-geb147a1'.
+       (Makefile.am): Do not add address@hidden@' to `$(LDADD)', as we define
+       our own `yywrap' function.
+       * tests/lex.test (tscan.l): In `yywrap', return 1, not 0, for
+       consistency with the default flex implementation.
+       * tests/lex-libobj.test (yywrap.c): Likewise.
+       * tests/lex-subobj-nodep.test (s1.l): Likewise.
+       * tests/lexvpath.test (foo.c): Likewise.
+       * tests/silent-lex-gcc (foo.l): Likewise.
+       * tests/silent-lex-generic (foo.l): Likewise.
+       * tests/silent-many-gcc (foo5.l): Likewise.
+       * tests/silent-many-generic (foo5.l): Likewise.
+       * tests/lex-lib.test (mu.c): Likewise.
+       Update heading comments, to refer to ...
+       * tests/lex-lib-external.test: ... this new test, which checks
+       that we can get use the `yywrap' function from a system-wide
+       library, if that's available.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       tests: prefer `skip_' over `echo ...; Exit 77'
+       * tests/self-check-cleanup.test: When the test must be skipped,
+       use `skip_ REASON' instead of `echo REASON; Exit 77'.  Also,
+       make the skip message shorter and clearer.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in self tests
+       Our ad-hoc usage of `tests/defs' in the testsuite's self tests
+       stopped working properly when we made the test scripts re-execute
+       themselves with the configure-time $SHELL.  Fix this.
+       Fixes a bug introduced by commit 'v1.11-874-g1321be7'.
+       * tests/defs: Only check that we can find the client test script
+       when we must re-execute it.
+       * tests/self-check-cleanup.test: Export `AM_TESTS_REEXEC' to "no"
+       before running the self tests.
+       * tests/self-check-dir.test: Likewise.
+       * tests/self-check-explicit-skips.test: Likewise.
+       * tests/self-check-me.test: Likewise.
+       * tests/self-check-sanity.test: Likewise.
+       * tests/self-check-reexec.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       tests: prefer ulimit over timeout in test on a memory-hogging bug
+       * tests/cond29.test: Use 'ulimit' instead of 'timeout' to ensure
+       that automake does not uses up too much resources.  This is really
+       and improvement because the bug tested by this script wasn't just
+       a "it hangs" or "it runs too slow" bug, but rather a memory-hogging
+       bug (due to combinatorial explosion when many Automake conditionals
+       had to be handled) which could easily crash the whole system, which
+       is unacceptable.  The requirement of a proper and working 'ulimit'
+       builtin might cause the test to be skipped on more systems, but
+       that shouldn't be a problem since the bug isn't about a portability
+       issue, but is rather an automake internal implementation problem.
+       I've verified that the test as updated by this patch still passes
+       with automake 1.8.5, automake 1.10.2, and obviously the development
+       version of automake, and that it fails with automake 1.7.9.
+
+2011-06-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid generating `*-p.test' tests, use a wrapper script
+       The generated `*-p.test' tests had already become just thin layers
+       around the corresponding test scripts.  This change makes the final
+       step, converting to the use of a generic wrapper script and thus
+       avoiding the extra test generation (similarly to what is done for
+       the `*.instspc' and `*.depmod' tests).
+       * tests/parallel-tests.sh: New file, driver script to run checks
+       the on the `parallel-tests' semantics by wrapping tests that use
+       the generic "Simple Tests" driver.
+       * tests/gen-parallel-tests: Update, mostly to reflect the new
+       `.ptest' extensions used for tests in $(parallel_tests).
+       * Makefile.am (TESTS_EXTENSIONS): Add `.ptest'.
+       (PTEST_LOG_COMPILER): Define, it calls `parallel-tests.sh'.
+       ($(parallel_tests)): Do not really generate `*-p.test' tests
+       anymore; this is now just a dummy dependency declaration required
+       in order to have make actually produce expected log files from
+       the `.ptest.log' suffix rule.
+       (EXTRA_DIST): Distribute `parallel-tests.sh'.
+       (MAINTAINERCLEANFILES): Don't remove the `$(parallel_tests)', it
+       is not necessary anymore.
+       (generated_tests): Variable definition removed.
+       (TESTS): Update, by listing `$(parallel_tests)' directly instead
+       of `$(generated_tests)'
+       (expected_list_of_tests): Remove `$(generated_tests)'.
+       (maintainer-check-list-of-tests): No need to explicitly depend on
+       `$(expected_list_of_tests)' anymore.
+
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
+       Currently, the Automake's own configure script allow definition
+       of AUTOCONF and AUTOM4TE, expected to point respectively to an
+       autoconf and autom4te programs.  But while these definitions are
+       honoured in the Automake's build systems and test suite, they
+       were *not* honoured in the generated `automake' and `aclocal'
+       scripts.  This behaviour, apart from being wrong in that it does
+       not allow the user enough freedom in choosing his tools, also
+       caused inconsistencies in the test suite, brining to spurious
+       failures.
+       Problem reported by Graham Reitz on the automake list; see thread:
+       <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>
+       * automake.in ($traces): Use address@hidden', not simply `autoconf'.
+       * aclocal.in ($traces): Use address@hidden', not simply `autom4te'.
+       * Makefile.am (do_subst): Substitute also address@hidden' and
+       address@hidden'.
+       * NEWS: Update.
+       * THANKS: Update.
+
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
+       Our build system allows the user to override AUTOCONF and AUTOHEADER
+       at configure time, and honours these overrides in our testsuite.
+       But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
+       This change fixes that inconsistency.
+       * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
+       AC_SUBSTitutions.  Update comments.
+       * tests/defs.in ($AUTOUPDATE): Default to address@hidden@' now.
+       ($AUTOM4TE): New variable, defaulting to address@hidden@'.
+       ($AUTORECONF): New variable, defaulting to address@hidden@'.
+       * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
+
+2011-05-22  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
+       * tests/parallel-tests-harderror.test: New test, doing more
+       in-depth checks on DISABLE_HARD_ERRORS.
+       * tests/parallel-tests.test: Remove tests on DISABLE_HARD_ERRORS,
+       now redundant.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-22  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       tests/README: fix example about `make -e' usage
+       * tests/README (Section "Writing test cases" subsection "Do"): When
+       some variable is never initialized in the Makefile, `-e' is not
+       necessary in order to override it.  DESTDIR is such a variable: we
+       ensure that we do not ever initialize it.  And as such, it is quite
+       portable to use:
+         $ make DESTDIR=/foo/bar install
+       and in fact, quite widely used.
+       So our example about when `make -e' is required, which references
+       the `DESTDIR' variable, is poorly chosen, if not downright wrong.
+       Rewrite it to use `prefix' as the overridden variable instead.
+
+2011-05-29  Stefano Lattarini  <address@hidden>
+
+       tests: don't require gfortran if any fortran compiler is enough
+       * tests/silentf90.test ($required): Require `fortran', not
+       `gfortran'.
+       * tests/silentf77.test ($required): Require `fortran77', not
+       `gfortran'.
+       * tests/silent-many-generic.test ($required): Require `fortran'
+       and `fortran77' rather than `gfortran'.
+
+2011-05-27  Stefano Lattarini  <address@hidden>
+
+       tests: improve `ccnoco*.test', better cross-compiling support
+       * tests/ccnoco3.test (Mycomp): Use the `$CC' chosen by `tests/defs'
+       instead of forcing `gcc' unconditionally.  This ensures better
+       coverage in case of cross-compiling, when GCC can be named e.g.,
+       `i586-mingw32msvc-gcc', instead of simply `gcc'.
+       * tests/ccnoco.test: Likewise.  Remove redundant checks.  Modernize
+       the created `configure.in'.  Run tests both in-tree and in VPATH.
+       Export `CC' to the overridden value only once.
+       * tests/ccnoco2.test: Slightly stricter grepping of automake
+       stderr.  Add trailing `:' command.
+
+2011-05-27  Stefano Lattarini  <address@hidden>
+
+       testsuite: each test case depends on `defs-static'
+       * tests/Makefile.am ($(TEST_LOGS)): Depends on `defs-static' too.
+       Simplify comments.
+
+2011-05-27  Stefano Lattarini  <address@hidden>
+
+       testsuite: use $SHELL to run tests which are shell scripts
+       * tests/Makefile.am (TEST_LOG_COMPILER): Define so that the
+       configure-time $SHELL is used to run the tests.
+       * tests/defs: Add code to re-execute by default the running
+       test script with configure-time $SHELL.  Updated comments.
+       * configure.ac: Check that `set -e' is working for $SHELL,
+       not for /bin/sh.
+       * tests/defs-static.in: Update comments.
+       * tests/README (Supported shells): Updated.
+       (Getting details from failures): Don't tell that tests are
+       run by /bin/sh by default.
+
+2011-05-26  Stefano Lattarini  <address@hidden>
+
+       tests: split 'subst2.test' to improve modularity and coverage
+       * tests/subst2.test: Test removed, split into ...
+       * tests/programs-primary-rewritten.test: ... this test ...
+       * tests/subst-no-trailing-empty-line.test: ... and this one ...
+       * tests/extra-programs-empty.test: ... and this one.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-26  Stefano Lattarini  <address@hidden>
+
+       tests: tweak and improve tests on Automake conditionals
+       The "avoid the requirement of a working compiler" we refer about
+       below is obtained by disabling automatic dependency tracking and
+       defining `CC' (and `EXEEXT', `OBJEXT', `CXX', etc., if needed) to
+       dummy values, either directly in the `Makefile.am', or by AC_SUBST
+       in `configure.in'.
+       The "cosmetic changes" we refer about below consists in, e.g.,
+       adding a trailing `:' command to a script, using proper m4 quoting
+       in `configure.in' files, adding commands that offer more debugging
+       output, explicitly declaring phony targets as such in Makefiles,
+       making use of idioms more consistent with those employed in other
+       tests, following the GNU formatting standards more closely, etc.
+       * tests/cond.test: Cosmetic changes.
+       * tests/cond3.test: Likewise.
+       * tests/cond10.test: Likewise.
+       * tests/cond14.test: Likewise.
+       * tests/cond15.test: Likewise.
+       * tests/cond17.test: Likewise.
+       * tests/cond40.test: Likewise.
+       * tests/cond13.test: Likewise, and make grepping of the generated
+       `Makefile.in' slightly stricter.
+       * tests/cond6.test: Extend by also running ./configure, make and
+       "make install".  Few cosmetic changes.
+       * tests/cond8.test: Likewise.
+       * tests/cond2.test: Do few cosmetic changes.  Make grepping of
+       automake stderr stricter.
+       * tests/cond20.test: Likewise.
+       * tests/cond23.test: Likewise.
+       * tests/cond24.test: Likewise.
+       * tests/cond42.test: Likewise.
+       * tests/cond46.test: Likewise.
+       * tests/cond9.test: Move more checks in the `Makefile.am' instead
+       of grepping make's output.
+       * tests/cond38.test: Likewise.
+       * tests/cond11.test: Likewise.  Avoid the requirement of a working
+       C compiler.
+       * tests/cond16.test: Likewise.
+       * tests/cond22.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond4.test: Likewise, and drop the now-useless GNU make
+       requirement as well.
+       * tests/cond18.test: Likewise.
+       * tests/cond19.test: Likewise.
+       * tests/cond22.test: Likewise.
+       * tests/cond25.test: Add trailing `:' command.
+       * tests/cond26.test: Likewise.
+       * tests/cond27.test: Likewise.
+       * tests/cond28.test: Likewise.
+       * tests/cond29.test: Use `unindent' function for better formatting.
+       Other minor cosmetic changes.  Use a `timeout' program (if it's
+       available) to determine whether the script takes too long, instead
+       of just hoping that the user will notice an abnormally long test
+       execution time.
+       * tests/cond33.test: Extend a bit.  Fix heading comments.  Few more
+       cosmetic changes.
+       * tests/cond37.test: Ensure verbose printing of captured make
+       output.  Minor cosmetic changes.
+       * tests/cond34.test: Likewise.  Avoid the requirement of a working
+       C compiler.  Make grepping of make output slightly stricter.
+       * tests/cond35.test: Quote literal dots in grep regexp.  Add extra
+       debugging output.  Minor cosmetic changes.
+       * tests/cond36.test: Likewise.
+       * tests/cond41.test: Do not simply check that aclocal fails, but
+       also grep its stderr for the expected error message.
+       * tests/cond43.test: Likewise (but the program being automake).
+       Few cosmetic changes.
+       * tests/condd.test: Avoid the requirement of a working C compiler.
+       * tests/condman3.test: Extend by using more man pages and more
+       manpage sections.
+       * tests/condman.test: Removed, it's completely superseded by
+       `condman3.test'.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-25  Stefano Lattarini  <address@hidden>
+
+       lex tests: avoid spurious failures when LEXLIB isn't found
+       The AC_PROG_LEX Autoconf macro does not diagnose a failure to find
+       the "lex library" expected to provide a `yywrap' function (function
+       which is required to link most lex-generated programs).  On the
+       contrary, when all the link attempts (i.e., with `-ll' and `-lfl')
+       fail, configure declares that no lex library is needed, and simply
+       proceeds with the configuration process -- only for the build to
+       possibly fail later, at make time.
+       This behaviour might be (partly) intended; the Autoconf manual
+       reads:
+        ``You are encouraged to use Flex in your sources, since it is
+          both more pleasant to use than plain Lex and the C source
+          it produces is portable.  In order to ensure portability,
+          however, you must either provide a function `yywrap' or, if
+          you don't use it (e.g., your scanner has no `#include'-like
+          feature), simply include a `%noyywrap' statement in the
+          scanner's source.''
+       This AC_PROG_LEX behaviour is causing some spurious failures of the
+       Automake testsuite in environments which lack a proper library
+       providing `yywrap' (this happens for example in Linux->MinGW cross
+       compilations).  But at this point is clear that a proper workaround
+       is to simply provide a fall-back implementation of `yywrap' in our
+       lexers.
+       * tests/cond35.test: Provide a dummy `yywrap' function.
+       * tests/lex3.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-lex-gcc.test: Likewise, and a dummy `main' too.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/lex-lib.test: New test.
+       * tests/lex-libobj.test: New test.
+       * tests/lex-nowrap.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update.
+       Thanks to Russ Allbery for the suggestion.
+
+2011-05-25  Stefano Lattarini  <address@hidden>
+
+       testsuite: require C++ compiler explicitly in tests needing it
+       The list of the test scripts which needed a C++ compiler but
+       failed to require it explicitly has been found by running:
+         $ tests=`grep -lE 'CXX|\.c(c|\+\+|xx|pp)' *.test | tr '\n' ' '`
+         $ am_explicit_skips=yes CXX=false make check TESTS="$tests"
+       and looking for tests that reported FAIL instead of SKIP.
+       After the present change, all those previously failing tests
+       either pass or get correctly skipped.
+       * tests/subobj9.test: Require `c++', instead of explicitly
+       skipping on configure failure.  Add excerpts and/or details from
+       the original bug report that prompted this tests to be written.
+       * tests/silentcxx-gcc.test: Require g++.
+       * tests/silentcxx.test: Require c++.
+       * tests/suffix3.test: Likewise.
+
+2011-05-25  Stefano Lattarini  <address@hidden>
+
+       testsuite: don't require g++ where any C++ compiler is enough
+       * tests/specflg10.test ($required): Use `c++', not g++.
+       * tests/silent-many-generic.test: Likewise.
+
+2011-05-25  Stefano Lattarini  <address@hidden>
+
+       testsuite: require C compiler explicitly in tests needing it
+       The list of the test scripts which needed a C compiler but
+       failed to require it explicitly has been found by running:
+         $ am_explicit_skips=yes CC=false make check
+       and looking for tests that reported FAIL instead of SKIP.
+       After the present change, all those previously failing tests
+       either pass or get correctly skipped.
+       * tests/aclocal4.test ($required): Add `cc'.
+       * tests/ansi.test: Likewise.
+       * tests/ansi10.test: Likewise.
+       * tests/ansi3.test: Likewise.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/backcompat6.test: Likewise.
+       * tests/canon7.test: Likewise.
+       * tests/check5.test: Likewise.
+       * tests/check7.test: Likewise.
+       * tests/check8.test: Likewise.
+       * tests/cond4.test: Likewise.
+       * tests/cond11.test: Likewise.
+       * tests/cond16.test: Likewise.
+       * tests/cond18.test: Likewise.
+       * tests/cond19.test: Likewise.
+       * tests/cond22.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/cond34.test: Likewise.
+       * tests/cond35.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/condd.test: Likewise.
+       * tests/cygnus-dependency-tracking.test: Likewise.
+       * tests/depcomp2.test: Likewise.
+       * tests/depcomp6.test: Likewise.
+       * tests/depcomp7.test: Likewise.
+       * tests/depcomp8a.test: Likewise.
+       * tests/depcomp8b.test: Likewise.
+       * tests/depdist.test: Likewise.
+       * tests/depend2.test: Likewise.
+       * tests/depend5.test: Likewise.
+       * tests/distcleancheck.test: Likewise.
+       * tests/distname.test: Likewise.
+       * tests/exeext.test: Likewise.
+       * tests/exeext4.test: Likewise.
+       * tests/extradep.test: Likewise.
+       * tests/extradep2.test: Likewise.
+       * tests/gnits2.test: Likewise.
+       * tests/gnits3.test: Likewise.
+       * tests/instdir-ltlib.test: Likewise.
+       * tests/instdir-prog.test: Likewise.
+       * tests/instfail.test: Likewise.
+       * tests/instfail-libtool.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/lex5.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/lex-subobj-nodep.test: Likewise.
+       * tests/lflags.test: Likewise.
+       * tests/libobj-basic.test: Likewise.
+       * tests/libobj2.test: Likewise.
+       * tests/libobj7.test: Likewise.
+       * tests/libobj10.test: Likewise.
+       * tests/libobj16a.test: Likewise.
+       * tests/libobj16b.test: Likewise.
+       * tests/libobj17.test: Likewise.
+       * tests/libobj19.test: Likewise.
+       * tests/libtool2.test: Likewise.
+       * tests/libtool3.test: Likewise.
+       * tests/libtool7.test: Likewise.
+       * tests/libtool9.test: Likewise.
+       * tests/libtoo10.test: Likewise.
+       * tests/libtoo11.test: Likewise.
+       * tests/ltcond.test: Likewise.
+       * tests/ltcond2.test: Likewise.
+       * tests/ltconv.test: Likewise.
+       * tests/ltinit.test: Likewise.
+       * tests/ltlibsrc.test: Likewise.
+       * tests/ltorder.test: Likewise.
+       * tests/nobase.test: Likewise.
+       * tests/nobase-libtool.test: Likewise.
+       * tests/mmodely.test: Likewise.
+       * tests/parallel-tests5.test: Likewise.
+       * tests/parallel-tests-suffix-prog.test: Likewise.
+       * tests/parallel-tests-ext-driver-prog.test: Likewise.
+       * tests/posixsubst-ldadd.test: Likewise.
+       * tests/posixsubst-libraries.test: Likewise.
+       * tests/posixsubst-ltlibraries.test: Likewise.
+       * tests/posixsubst-programs.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+       * tests/pr87.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/pr224.test: Likewise.
+       * tests/pr300-lib.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise.
+       * tests/pr300-prog.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/remake-gnulib-add-acsubst.test: Likewise.
+       * tests/remake-gnulib-add-header.test: Likewise.
+       * tests/regex.test: Likewise.
+       * tests/repeated-options.test: Likewise.
+       * tests/silent.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-yacc-generic.test: Likewise.
+       * tests/specflg7.test: Likewise.
+       * tests/specflg9.test: Likewise.
+       * tests/specflg10.test: Likewise.
+       * tests/stdinc.test: Likewise.
+       * tests/strip.test: Likewise.
+       * tests/strip2.test: Likewise.
+       * tests/strip3.test: Likewise.
+       * tests/subdirbuiltsources.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/subobj6.test: Likewise.
+       * tests/subobj11a.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/subst2.test: Likewise.
+       * tests/subst3.test: Likewise.
+       * tests/substref.test: Likewise.
+       * tests/substre2.test: Likewise.
+       * tests/suffix5.test: Likewise.
+       * tests/suffix8.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/suffix11.test: Likewise.
+       * tests/suffix12.test: Likewise.
+       * tests/suffix13.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+       * tests/transform.test: Likewise.
+       * tests/transform2.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/yacc-nodist.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc7.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yflags-cmdline-override.test: Likewise.
+       * tests/yflags-force-override.test: Likewise.
+       * tests/python-virtualenv.test: Likewise.  Also, improve skip
+       messages.
+       * tests/subobj5.test ($required): Add `cc'.
+       (Makefile.am): Set `AUTOMAKE_OPTIONS' to `subdir-objects', and
+       add new checking rules `test-build' and `test-distdir'.
+       Extend the test by building and examining the distdir, the
+       program, and the object files.
+       * tests/postproc.test ($required): Add `cc'.
+       Avoid the explicit `|| Exit $?' after call to configure, which
+       is now either redundant (e.g., when `am_explicit_skips' is
+       unset), or counter-productive (e.g., when `am_explicit_skips'
+       is set to "yes").
+       * tests/pr243.test: Likewise.
+       * tests/pr266.test: Likewise.
+       * tests/pr220.test: Simplify so that it doesn't require a
+       C compiler anymore.
+       * tests/subdir5.test: Likewise.
+       * tests/subdir8.test: Likewise.
+       * tests/lflags.test: Likewise.
+       * tests/yflags.test: Likewise.
+       * tests/yflags-force-conditional.test: Likewise.
+       * tests/lflags2.test: Simplify so that it doesn't require a
+       C++ compiler anymore.
+       * tests/yflags2.test: Likewise.
+       * tests/autohdrdry.test (configure.in): Remove unneeded call
+       to `AC_PROG_CC'.
+       * tests/pr287.test: Likewise.
+       * tests/check6.test: Likewise.
+       * tests/cond21.test: Likewise, plus some cosmetic adjustments.
+       * tests/upc.test: Skip if configure fails with status `77'.
+       * tests/upc3.test: Likewise.
+       * tests/vala4.test: Likewise.
+       * tests/nostdinc.test: Likewise.  Also, make grepping checks
+       on `Makefile.in'.  Update heading comments.
+       * tests/compile5.test: When we must skip, skip explicitly,
+       and with a meaningful message.
+       * tests/instspc-tests.sh: When running in "test-build" or
+       "test-install" mode (as determined by the value of variable
+       `$instspc_action'), require `cc'.  Adjust comments.
+       * tests/depmod-tests.sh: Likewise.
+
+2011-05-24  Stefano Lattarini  <address@hidden>
+
+       testsuite: allow user to ask for stricter skip semantics
+       Given how the Automake testsuite is currently structured, if a
+       command in a test script fails with status `77', the global test
+       outcome is considered a SKIP, because the value of `77' for `$?'
+       is passed to the exit trap.  Indeed, this happens in practice, as
+       an autoconf-generated configure script can exit with status `77'
+       if it fails to find, e.g., a required compiler.
+       While this behaviour is quite useful for avoiding spurious test
+       failures in the wild, it can also sometimes prevent the Automake
+       developers to easily see and declare the requirements of their
+       tests.
+       This change introduces a new variable `am_explicit_skips', meant to
+       be user-overridable, and which, when set to a "true" value (i.e.,
+       `yes' or `1'), require a direct call to `Exit 77' in order to make
+       the test outcome be considered a SKIP.
+       * tests/defs.in ($am__test_skipped): New variable, initialized
+       to `no'.
+       (Exit): Set `$am__test_skipped' to `yes' if passed an exit status
+       of 77.
+       (trap '...' 0): When `$am_explicit_skips' is set to a "true" value,
+       reset an exit status of `77' to `78' if $am__test_skipped is not
+       set to `yes'.
+       * tests/self-check-exit.test: Adjust: unset `am_explicit_skips'.
+       * tests/self-check-explicit-skips.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-24  Stefano Lattarini  <address@hidden>
+
+       testsuite: user can force skipping of compiler-requiring tests
+       * tests/defs (cc, c++, fortran, fortran77): Skip the test if
+       the relevant compiler is disabled by having the corresponding
+       variable (CC, CXX, FC and F77, respectively) set to "false".
+       (yacc): For consistency, skip the test when the YACC variable
+       is set to "false", not when it's set to "no".  Since we are at
+       it, fix the skip message to be shorter and more consistent.
+
+2011-05-23  Stefano Lattarini  <address@hidden>
+
+       tests: tweak and improve tests on "Simple Tests" driver
+       * tests/check.test: Make grepping of generated Makefile.in
+       slightly stricter.  Add trailing `:' command.
+       * tests/check2.test: Ensure verbose printing of captured make
+       output.  Make grepping of generated Makefile.in and of make
+       output stricter.  Add trailing `:' command.
+       * tests/check3.test: Likewise.  Also, fix minor error in a
+       comment.
+       * tests/check4.test: Stricter grepping of make output.  Use
+       `using_gmake' subroutine instead of copy&paste from defs.in
+       to determine whether $MAKE is GNU make.  Add a trailing `:'
+       command.
+       * tests/check6.test: Add trailing `:' command.
+       * tests/check10.test: Prefer redirection `>' over `>>' when
+       creating new files.  Ensure verbose printing of captured make
+       output.
+       * tests/check11.test: Likewise.
+       * tests/check7.test: Likewise.  Make grepping of make output
+       stricter.  Prefer "make distcheck" over a simple "make check"
+       in a VPATH build. Add trailing `:' command.
+       (a.c): Format following GNU coding standards.
+       (Makefile.am): Explicitly declare target `print-xfail-tests'
+       as PHONY.  Distribute $(check_SCRIPTS), for distcheck.
+       * tests/parallel-tests.test: Prefer redirection `>' over `>>'
+       when creating new files.
+       * tests/parallel-tests2.test: Likewise.
+       * tests/parallel-tests9.test: Likewise.
+       * tests/parallel-tests8.test: Likewise.  Make grepping of
+       automake stderr stricter.
+       * tests/check8.test: Likewise.  Make formatting of created
+       *.c files more consistent with GNU Coding Standards.
+       * tests/check-subst-prog.test (configure.in): Break overly
+       long lines.
+       (pass-prog.c, xfail-prog.c): Format them more consistently
+       with GNU Coding Standards.
+       * tests/parallel-tests3.test: Use a shorter and clearer skip
+       message.  Use the `unindent' subroutine to improve readability
+       of indented loop bodies.  Simplify the hack used to please
+       maintainer-check.
+       * tests/parallel-tests5.test: Make formatting of created *.c
+       files more consistent with GNU Coding Standards.  Use the
+       `unindent' subroutine to improve readability of indented loop
+       bodies.
+       * tests/parallel-tests10.test: Add blank line, for clarity.
+       Prefer trailing `:' over trailing `Exit 0', for consistency
+       with other tests.
+
+2011-05-21  Stefano Lattarini  <address@hidden>
+
+       tests/README: small consistency improvement
+       * tests/README (Section "User interface" subsection "Running the
+       tests"): In examples, be more consistent w.r.t. the differences
+       between GNU and non-GNU make.
+
+2011-05-21  Stefano Lattarini  <address@hidden>
+
+       tests/README: suggest how to run tests in cross-compile mode
+       * tests/README (Section "User interface" subsection "Running the
+       tests"): Briefly explain how to override 'host_alias' at runtime
+       to force the use of cross-compilers by the testsuite.  Give an
+       example.
+
+2011-05-21  Stefano Lattarini  <address@hidden>
+
+       test defs: better detection of cross-compile mode
+       * configure.ac (AC_CANONICAL_HOST): New, probably not strictly
+       necessary, but useful to complements AC_CANONICAL_BUILD.
+       * tests/defs-static.in ($host_alias, $build_alias): New variables,
+       exported, user-overridable, defaults AC_SUBST'd by configure.
+       * tests/defs (cross_compiling): Consider cross-compilation mode
+       active only if `$host_alias' is not empty *and* it differs from
+       `$build_alias'.  This is more faithful to the way configure
+       determines whether it is cross-compiling, but still allows the
+       user to easily force cross-compilation by overriding `host_alias'
+       and `build_alias' at runtime.
+       From a report by Ralf Wildenhues.
+
+2011-05-20  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid re-running few tests with 'parallel-tests' option
+       Some tests in our testsuite use the 'simple-tests' driver only
+       marginally, or simply as a mean to conveniently check unrelated
+       invariants.  It makes little sense to force these tests to also
+       run with the 'parallel-tests' Automake option active, as doing so
+       offers no real gain in coverage, while often causing a measurable
+       overhead in execution time (for an already too-slow testsuite).
+       * tests/pr401.test (parallel_tests): Define to "no", to prevent
+       the generation of a sibling test script using the 'parallel-tests'
+       driver.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/java-flat.test: Likewise, and properly update heading
+       comments.
+       * tests/java-nested.test: Likewise, but defining `parallel_tests'
+       to "yes" instead, for improved coverage in conjunction with the
+       sister test `java-flat.test'.
+
+2011-05-20  Stefano Lattarini  <address@hidden>
+
+       testsuite: allow tests to avoid the use of 'parallel-tests' option
+       * tests/gen-parallel-tests: Do not generate "siblings" for tests
+       that explicitly define the `parallel_tests', whether to "yes" or
+       to any other value.  Extend heading comments to give a rationale
+       for this behaviour.
+       * tests/README: Update.
+
+2011-05-20  Stefano Lattarini  <address@hidden>
+
+       tests/README: update obsoleted advice
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Do not suggest to use the `*-p.test' pattern for the names of
+       hand-written tests which use the `parallel-tests' Automake option.
+       Not only is this not respected by the existing tests, but it is
+       more likely to cause conflicts with auto-generated tests.
+       So, suggest to *avoid* using the `*-p.test' pattern in names
+       of hand-written tests instead.
+       (Section "Writing test cases" subsection "Do not"):  When
+       suggesting not to override Makefile variables using command
+       line arguments, do not use the badly outdated variables `U'
+       and 'ANSI2KNR' in the example; instead, use the more common
+       and typical `DESTDIR'.
+
+2011-05-18  Stefano Lattarini  <address@hidden>
+
+       tests: avoid spurious failures in cross-compile mode
+       * tests/depcomp2.test: Ensure verbose printing of captured stderr
+       from configure.
+       * tests/ansi3.test ($required): Add 'native', as the ansi2knr
+       functionality is not meant to work with a cross-compiler.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi8.test: Likewise.
+       * tests/ansi10.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/check8.test ($required): Add 'native', as this test is
+       not meant to work with a cross-compiler.
+       * tests/gnits2.test: Likewise.
+       * tests/ltconv.test: Likewise.
+       * tests/ltcond2.test: Likewise.
+       * tests/parallel-tests5.test: Likewise.
+       * tests/specflg7.test: Likewise.
+       * tests/specflg8.test: Likewise.
+       * tests/check5.test: Likewise.  Also, ensure verbose printing of
+       captured make output, and thrown in few cosmetic and consistency
+       improvements.
+       * tests/ltinit.test: Be laxer in grepping configure output, to
+       avoid spurious failures on systems which lack POSIX dynamic
+       linking (e.g., MinGW), or when cross-compiling for such systems.
+       * tests/ansi9.test: Skip parts of the test that would require a
+       native compiler.
+       * tests/backcompat6.test: Likewise.
+       * tests/depcomp8a.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/autohdr4.test: Likewise.  Also, extend the test to ensure
+       more coverage in cross-compile mode.
+       * tests/canon7.test: Likewise.
+       * tests/check9.test: Removed, split into two new tests ...
+       * tests/check-subst-prog.test: ... this one, which requires a
+       native C compiler ...
+       * tests/check-subst.test: ... and this one, which doesn't require
+       any compiler.
+       * tests/parallel-tests4.test: Removed, split into two new tests ...
+       * tests/parallel-tests-suffix-prog.test: ... this one, which
+       requires a native C compiler ...
+       * tests/parallel-tests-suffix.test: ... and this one, which
+       doesn't require any compiler.
+       * tests/parallel-tests7.test: Removed, split into two new tests ...
+       * tests/parallel-tests-ext-driver-prog.test: ... this one, which
+       requires a native C compiler ...
+       * tests/parallel-tests-ext-driver.test: ... and this one, which
+       doesn't require any compiler.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-19  Stefano Lattarini  <address@hidden>
+
+       test defs: rename requirement 'non-cross' -> 'native'
+       * tests/defs.in (non-cross): Rename requirement ...
+       (native): ... to this, which is clearer and fits the
+       existing lingo better.
+       Suggestion by Ralf Wildenhues.
+
+2011-05-15  Stefano Lattarini  <address@hidden>
+
+       testsuite: be more cross-compile friendly
+       * tests/defs.in (cross_compiling): New subroutine.
+       (am__tool_prefix): New internal variable.
+       (gcc, g++, gcj): Force the use of the correct "tool prefix"
+       when cross compiling.
+       (gfortran, g77, non-cross): New requirements.
+
+2011-05-15  Stefano Lattarini  <address@hidden>
+
+       tests: fix portability issues in 'repeated-options.test'
+       * tests/repeated-options.test: Do not assume that object files
+       have `.o' suffix and executables have no default suffix; instead,
+       use `$(OBJEXT)' and `$(EXEEXT)'.
+
+2011-05-11  Stefano Lattarini  <address@hidden>
+
+       check: document and test $(TEST_SUITE_LOG) overriding
+       * doc/automake.texi (Simple Tests using parallel-tests): Explain
+       how and why TEST_SUITE_LOG can be overridden at runtime.
+       * tests/parallel-tests-log-override-1.test: New test, check that
+       the newly documented idiom and similar usages are truly supported.
+       * tests/parallel-tests-log-override-2.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure of extradep.test on FreeBSD
+       * tests/extradep.test: When using `ls -t' to determine whether a
+       file has been updated, make sure to use as reference a file whose
+       timestamp is expected to be *strictly* older that that of the file
+       being checked.  This is required because at least FreeBSD `ls' do
+       not sort files with the same timestamp in alphabetical order when
+       using the `-t' option.
+       * tests/extradep2.test: Likewise.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure of txinfo21.test on FreeBSD
+       * tests/txinfo21.test: Use the `is_newest' subroutine instead of
+       the `ls -t' hack to to determine whether a file has been updated.
+       This is required because at least FreeBSD `ls' do not sort files
+       with the same timestamp in alphabetical order when using the `-t'
+       option.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix syntax error in 'silentcxx-gcc.test'
+       * tests/silentcxx-gcc.test (for config_args in ...): Remove extra
+       trailing backslash from the list of looped-on items.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       depmod tests: fix bug in depmodes list extraction
+       * tests/depmod-tests.sh (get_depmodes): Use `echo $all_depmodes'
+       instead of `... | tr "$nl" "$sp"' to strip extra whitespaces and
+       newlines from `$all_depmodes'.  The latter idiom with `tr' is
+       wrong since it gets run before `./defs' is sourced, and thus `$nl'
+       and `$sp' are undefined.
+       Bug revealad by FreeBSD tr(1) implementation, which doesn't accept
+       empty strings as arguments.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests defs: use `skip_' for skipping java-related tests
+       * tests/defs.in (java, javac): Use `skip_' to signal test
+       skipping.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: add excerpts from few original bug reports, for clarity.
+       * tests/comment6.test: Add excerpts and/or details from the
+       original bug report that prompted this tests to be added and/or
+       extended.
+       * tests/dejagnu4.test: Likewise.
+       * tests/installdir.test: Likewise.
+
+2011-05-13   Stefano Lattarini  <address@hidden>
+
+       lex: "make clean" removes .c files from non-distributed .l
+       Previously, while automake did *not* distribute C source and header
+       files derived from non-distributed Lex sources, it still caused
+       them to be removed only by "make maintainer-clean" only, and not by
+       simply "make clean" or "make distclean".
+       This caused "make distcheck" to fail, unless the developer put
+       those generated .c files in CLEANFILES or in DISTCLEANFILES by
+       hand.
+       This change fixes this issue, by making non-distributed `.c' files
+       generated by non-distributed Lex sources cleaned by "make clean".
+       A similar problem for Yacc support had been fixed with the commit
+       v1.11-263-ged2c8bc.
+       * tests/automake.in (lang_lex_target_hook): Make C source files
+       derived from non-distributed Lex files cleaned by "make clean",
+       not only by "make maintainer-clean".
+       * tests/lex-clean.test: New test.
+       * tests/lex-clean-cxx.test: Likewise.
+       * tests/lex-nodist.test: Likewise.
+       * tests/lex-pr204.test: Likewise.
+       * tests/pr204.test: For consistency, renamed ...
+       * tests/yacc-pr204.test: ... to this, and updated to keep it
+       more in sync with 'lex-pr204.test'.
+       * tests/yacc-nodist.test: Updated to keep it more in sync with
+       'lex-nodist.test'.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-05-13  Stefano Lattarini  <address@hidden>
+
+       lex tests: make test on Lex dependency tracking more "semantic"
+       * tests/lex4.test: Renamed ...
+       * tests/lex-depend-grep.test: ... to this, and extended.
+       * tests/lex-depend.test, tests/lex-depend-cxx.test: ... these
+       new tests.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-13  Stefano Lattarini  <address@hidden>
+
+       lex tests: remove erroneous check about ylwrap distribution
+       * tests/lex5.test: Do not check that the ylwrap script is *not*
+       distributed when there is only one lexer, as ylwrap is in fact
+       expected to distributed unconditionally (at least starting from
+       commit `Release-1-9-323-gc5881cc' of 19-08-2006).  Note that this
+       bogus check wasn't triggering any failure because it was done at
+       the wrong time (i.e. from the VPATH build directory), so that it
+       could never fail anyway.
+       Instead, check that ylwrap is distributed even when there is only
+       one lexer.
+       Since we are at it, add a couple of `ls -l' calls, to get better
+       debugging info.
+
+2011-05-13  Stefano Lattarini  <address@hidden>
+
+       yacc tests: "make clean" removes C++ files from non-distributed .y
+       * tests/yacc-clean-cxx.test: New test, sister of `yacc-clean.test'.
+       * tests/yacc-clean.test: Update heading comment to reference the
+       new sister test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-06  Stefano Lattarini  <address@hidden>
+
+       tests: add a workaround for automake bug#8485
+       * tests/yacc-d-cxx.test (Makefile.am): Add temporary workaround
+       for automake bug#8485.  The bug is still exposed by the testcase
+       'yacc-dist-nobuild-subdir.test'.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: add a couple of inter-tests reference
+       * tests/yacc-nodist.test, tests/pr204.test: These tests are
+       related, so add references to each other in heading comments.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       lex tests: require just `lex' instead of `flex'
+       * tests/lex-subobj-nodep.test ($required): Require `lex',
+       not `flex', as this test is expected to work with any lex
+       implementation.
+       * tests/silent-lex.test: Likewise.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests defs: use `skip_' for skipping yacc/lex related tests
+       * tests/defs.in (lex, bison): Use `skip_' to signal test skipping.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests defs: merge cleanup
+       * tests/defs.in (flex, bison): Requirements removed, we have real
+       `lex' and `yacc' requirements now.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests defs: allow requirements for compilers (mostly dummy)
+       Most of the new requirements that are now accepted in `$required'
+       as consequence of this patch are still dummy.  They are planned
+       to be implemented only in master (or in some derived branch), but
+       having them here (even just as no-op) will allow for an easier
+       integration/backporting of potential new testcases.
+       * tests/defs.in (cc, c++, fortran, fortran77): New requirements,
+       still dummy.
+       (flex): New requirement, picking LEX for configure.
+       (lex): New requirement, alias for `flex'.  A more appropriate
+       implementation, looking for a generic `lex' program, will follow
+       in the future.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: 'silent-many-gcc.test' improved and made more robust
+       * tests/silent-many-gcc.test:  Also force "fast" gcc depmode
+       for C++ compilations.  Add sanity checks verifying that the
+       cache variables we force are really used by configure.  Fix
+       typo in comments.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: drop useless requirements of 'g++'
+       * tests/lflags2.test ($required): Remove 'g++', as any working
+       C++ compiler should be enough, and ./configure will cause the
+       test to skip if no working C++ compiler is found.
+       * tests/yflags2.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/silentcxx.test: Likewise.  Also, do not force depmodes
+       that could cause non-GNU C++ compilers to fail.
+       * tests/silentcxx-gcc.test: New test, like `silentcxx.test',
+       but forcing "fast" gcc depmode (and thus requiring the GNU C++
+       compiler).
+       * tests/specflg10.test: Add proper "fixme" comment telling that
+       we should make this test work with a generic C++ compiler.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests defs: one more environment sanitization (corner case)
+       * tests/defs (am__using_gmake): Initialize.  The `using_gmake'
+       subroutine was using this variable for caching, but wasn't
+       initializing it, which could cause problems in the (admittedly
+       very unlikely) case in which it was pre-existent in the
+       environment.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: add forgotten test scripts to $(TESTS)
+       * tests/Makefile.am (TESTS): Added test scripts  man[678].test,
+       which have been present on the filesystem and in the repository,
+       but which had erroneously been left out from $(TESTS).
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: ensure verbose printing of captured make output
+       * tests/libtool7.test: Ensure verbose printing of captured
+       make output.
+       * tests/libtool9.test: Likewise.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       maintcheck: consistency of list of test scripts
+       * CheckListOfTests.am: New file.
+       (maintainer-check-list-of-tests): New target,
+       check for consistency between list of tests defined in the
+       including Makefile and list of tests on the filesystem.
+       (clean-maintcheck-testslist-tmp): New rule, to clean up the
+       temporary files that might be left around by the rules associated
+       with the previous target.
+       (clean-local): Depend on it.
+       * lib/Automake/tests/Makefile.am: Include `CheckListOfTests.am'.
+       (maintainer-check): Added dependency from the new target
+       `maintainer-check-list-of-tests'.
+       * tests/Makefile.am: Likewise.  Also ...
+       (checked_test_extensions): Define to `.test'.
+       (expected_test_list): Define properly.
+       * Makefile.am (maintainer-check-list-of-test): New target,
+       calling recursively into `tests/' and `lib/Automake/tests/',
+       using ...
+       (TEST_SUBDIRS): ... this new variable.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: drop useless requirements of gcc (plus testsuite tweakings)
+       * tests/libobj14.test ($required): Remove 'gcc', as we never run
+       the C compiler.
+       * tests/targetclash.test: Likewise.
+       * tests/ansi6.test ($required): Remove 'gcc', as any working
+       C compiler should be enough.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/ansi10.test: Likewise.
+       * tests/lex5.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/mmodely.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/pr300-lib.test: Likewise.
+       * tests/pr300-prog.test: Likewise.
+       * tests/primary3.test: Likewise.
+       * tests/specflg7.test: Likewise.
+       * tests/specflg8.test: Likewise.
+       * tests/subdir5.test: Likewise.
+       * tests/subdir8.test: Likewise.
+       * tests/subobj6.test: Likewise.
+       * tests/subst3.test: Likewise.
+       * tests/substre2.test: Likewise.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/depcomp2.test: Likewise.  Also, avoid clobbering user-set
+       CFLAGS.
+       * tests/lex3.test: Likewise.
+       * tests/ansi3.test: Likewise.  Also, avoid 'CC=gcc' in configure.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/autohdr4.test ($required): Remove 'gcc', as any working
+       C compiler should be enough.
+       Also, do not reject slow dependency extractors (which we might
+       be forced to use now that $CC is not necessarily gcc anymore).
+       * tests/cond16.test ($required): Remove 'gcc', as any working
+       C compiler should be enough.
+       Since we are at it, throw in few minor tweakings (mostly cosmetic,
+       stylistic, or consistency-related).
+       * tests/cond18.test: Likewise.
+       * tests/cond35.test: Likewise.
+       * tests/gnits2.test: Likewise.
+       * tests/libtool3.test: Likewise.
+       * tests/libtool7.test: Likewise.
+       * tests/libtool9.test: Likewise.
+       * tests/ltcond.test: Likewise.
+       * tests/ltcond2.test: Likewise.
+       * tests/ltconv.test: Likewise.
+       * tests/ltlibsrc.test: Likewise.
+       * tests/nobase.test: Likewise.
+       * tests/nobase-libtool.test: Likewise.
+       * tests/pr220.test: Likewise.
+       * tests/pr224.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+       * tests/transform.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/cond19.test: Likewise.  Also, avoid clobbering user-set
+       CFLAGS.
+       * tests/cond4.test: Likewise.
+       * tests/depend2.test: Likewise.
+       * tests/pr87.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/substref.test: Likewise.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       test defs: increase coverage w.r.t. GNU make
+       * tests/defs (GNUmake): Instead of just skipping the tests
+       requiring GNU make if $MAKE is not GNU make, try to look for
+       it and, if found, redefine $MAKE accordingly.  This will help
+       to transparently increase coverage on non-GNU systems which
+       have GNU make available in PATH.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: improve few inter-tests references
+       * tests/acloca22.test: Improve and extend the heading comments.
+       Add reference to related tests 'remake-deleted-m4-file.test' and
+       'remake-renamed-m4-macro-and-file.test'.  Since we are at it,
+       add trailing `:' command, and few blank lines for readability.
+       * tests/remake-renamed-m4-macro-and-file.test: In the heading
+       comments, add reference to the related test 'acloca22.test'.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'color2.test'
+       * tests/color2.test: If $MAKE contains command-line arguments (as
+       in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails
+       spuriously, because it tries to run "$MAKE" as a single command.
+       Fix this with proper uses of the TCL `eval' builtin.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: few more checks on automatic remake support
+       * tests/remake-all-1.test: New test, check that the "all" target
+       triggers rebuilt of outdated Makefiles.
+       * tests/remake-all-2.test: Likewise, but for when the makefiles
+       are not named `Makefile'.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: check some remake features with non-GNU make too
+       * tests/acloca14.test ($required): Drop "GNUmake".  This test
+       works as-is with non-GNU make implementations.
+       * tests/remake1a.test: Likewise.
+       * tests/aclocal4.test ($required): Drop "GNUmake".
+       Modify the test to have it work also with non-GNU make.
+       * tests/remake5.test: Likewise.
+       * tests/remake8a.test: Likewise.
+       * tests/remake8b.test: Likewise.
+       * tests/remake9a.test: Likewise.
+       * tests/remake9b.test: Likewise.
+       * tests/remake9c.test: Likewise.
+       * tests/remake9d.test: Likewise.
+       * tests/remake10a.test: Likewise.
+       * tests/remake10b.test: Likewise.
+       * tests/remake10c.test: Likewise.
+       * tests/remake12.test: ($required): Drop "GNUmake".
+       Adapt the test to make it work also with non-GNU make (if
+       it supports an "include" directive).
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       tests: extend tests on dependency tracking with VPATH
+       * tests/depmod-tests.sh: New script, fulfilling a threefold role:
+       1. it is called to generate a Makefile.am snippet, containing the
+          definition of proper lists of tests;
+       2. it is called to set up a directory containing some common data
+          files and autotools-generated files used by the aforementioned
+          tests (this is done for speed reasons only); and
+       3. it is called to properly run those tests, one at a time.
+       * tests/depcomp9.test: Delete, it's obsolete now.
+       * tests/depcomp10.test: Likewise.
+       * tests/Makefile.am ($(srcdir)/depmod-tests.am): Include this
+       snippet, which defines ...
+       (depmode_tests): ... this new macro, containing the list of the
+       newly generated `*.depmod' tests.
+       (TESTS_EXTENSIONS): Add `.depmod'.
+       (DEPMOD_LOG_COMPILER): Define.  It calls `depmod-tests.sh', so that
+       the "depmode tests" will be executed by passing that driver script
+       a proper parameter.
+       ($(depmod_tests)): New dependency declaration (dummy, but required
+       in order to have make actually produce expected log files from the
+       `.depmod.log' suffix rule).
+       (TESTS): Add $(depmod_tests).
+       (EXTRA_DIST): Distribute depmod-tests.sh.
+       Other minor cosmetic changes and reorderings.
+       * bootstrap: Generate depmod-tests.am.
+       * tests/.gitignore: Updated.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       tests: avoid extra test generation (for `instspc' tests)
+       We don't really need to generate tons and tons of wrapper test
+       scripts (presently, ~ 90) just to run what is basically a single
+       test (specifically, `instspc-tests.sh') with different parameters.
+       In fact, the possibility of running a single driver script with
+       multiple files/configurations/parameters is one of the major
+       selling points of the 'parallel-tests' testsuite driver of
+       automake.  So why not use ourselves more extensively the best
+       features we provide?
+       * tests/instspc-tests.sh: Update heading comments.  Expect
+       to be executed, not sourced.  Update handling of command-line
+       arguments.  Adjust to reflect the renaming of "instspc tests"
+       from `instspc-*.test' to `*.instspc'.
+       * tests/instspc-data.test: Update heading comments.  Execute
+       driver script `instspc-tests.sh', instead of sourcing it.
+       Give more informative messages in case of internal errors.
+       * tests/Makefile.am (TESTS_EXTENSIONS): Define explicitly (to
+       `.test' and `.instspc').
+       (TESTS): Add `$(instspc_tests)'.
+       (generated_tests): Remove `$(instspc_tests)'.
+       (INSTSPC_LOG_COMPILER): Define.  Calls `instspc-tests.sh', so
+       that the "instspc tests" will be now executed by passing that
+       driver script a proper parameter.
+       ($(instspc_tests)): Remove, we don't need anymore to generate
+       this tests.
+       ($(instspc_tests:.test=.log)): Remove, substituted by ...
+       ($(instspc_tests:.instspc=.log)): ... this.
+       ($(instspc_tests)): New dependency declaration (dummy, but
+       required in order to have make actually produce expected log
+       files from the `.instspc.log' suffix rule).
+       (MAINTAINERCLEANFILES, generated_tests): Don't extend with
+       $(instspc_tests) anymore.
+       Update comments.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       build: improve the definition of the list of testcases
+       * tests/Makefile.am (handwritten_tests): New variable.
+       (generated_tests): Likewise.
+       (TESTS): Redefine as the union of the above.
+       (EXTRA_DIST): Extend using $(handwritten_tests) and
+       $(generated_tests) rather than $(TESTS).
+       * tests/gen-parallel-tests: Update accordingly, and
+       make more robust.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       tests skips: shorter and clearer messages
+       * tests/defs: Use shorter messages when giving reasons for test
+       skipping; it turns out these shorter messages are also clearer.
+       If more info might be useful, send them to the log file only.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       tests: fix self check spurious failure with older bash versions
+       * tests/self-check-cleanup.test: Add trailing `:' to the test code
+       passed to $SHELL, otherwise older versions of bash (at least 2.05
+       and 3.2.39) fail to correctly remove the temporary directory in
+       the exit trap.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       tests: add sanity check to 'self-check-cleanup.test'
+       * tests/self-check-cleanup.test: Check that the "hacked" file
+       `defs-static' used by the test differs from the "vanilla" one
+       in builddir.  This also offers a little more debugging output.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: display reasons for skips to the console
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Open file descriptor
+       `9' to the original stderr; define `stderr_fileno_' to `9', and
+       export it.
+       * tests/self-check-report.test: Prevent new spurious failures by
+       removing from the environment any definition of `stderr_fileno_'.
+
+2011-05-01  Stefano Lattarini  <address@hidden>
+
+       testsuite: use `skip_' for skipping of tests
+       * tests/defs: Use the `skip_' subroutine for test skipping.  Also
+       give sometimes more detailed messages about the reasons for the
+       skipping.
+       * tests/canon7.test: Likewise.
+       * tests/color.test: Likewise.
+       * tests/color2.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/dejagnu7.test: Likewise.
+       * tests/depcomp6.test: Likewise.
+       * tests/depcomp9.test: Likewise.
+       * tests/depcomp10.test: Likewise.
+       * tests/distlinks.test: Likewise.
+       * tests/distlinksbrk.test: Likewise.
+       * tests/fn99.test: Likewise.
+       * tests/fn99subdir.test: Likewise.
+       * tests/forcemiss2.test: Likewise.
+       * tests/fort5.test: Likewise.
+       * tests/gettext3.test: Likewise.
+       * tests/install2.test: Likewise.
+       * tests/instfail-info.test: Likewise.
+       * tests/instfail-java.test: Likewise.
+       * tests/instfail-libtool.test: Likewise.
+       * tests/instfail.test: Likewise.
+       * tests/instmany-mans.test: Likewise.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/instsh3.test: Likewise.
+       * tests/ltinit.test: Likewise.
+       * tests/makej2.test: Likewise.
+       * tests/mdate6.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests-reset-term.test: Likewise.
+       * tests/parallel-tests-unreadable-log.test: Likewise,
+       * tests/python-virtualenv.test: Likewise.
+       * tests/remake-gnulib-remove-header.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/symlink2.test: Likewise.
+       * tests/tar.test: Likewise.
+       * tests/tar2.test: Likewise.
+       * tests/txinfo26.test: Likewise.
+       * tests/vala2.test: Likewise.
+       * tests/vala3.test: Likewise.
+       * tests/vala5.test: Likewise.
+       * tests/vtexi4.test: Likewise.
+       * tests/instdir-texi.test: Likewise.
+       * tests/txinfo21.test: Likewise.
+
+2011-04-29  Stefano Lattarini  <address@hidden>
+
+       testsuite: more environment sanitization
+       * tests/defs: Move the checks verifying that the variables `me',
+       `parallel_tests' and `required' aren't set in the environment ...
+       * tests/defs-static.in: ... in here, with some optimizations to
+       avoid useless forks.  Also, do the same checks for the variables
+       `original_AUTOMAKE' and `original_ACLOCAL' too.
+       * tests/self-check-env-sanitize.test: Update.
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Unset also variables
+       `original_AUTOMAKE' and `original_ACLOCAL'.
+
+2011-04-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage)
+       * tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT
+       instead of AM_TESTS_SETUP (which has been removed in commit
+       v1.11-349-g12f48fa).
+       Fix spurious failure introduced by merge `v1.11-781-gfeed175'.
+
+2011-04-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in a test on TESTS (VPATH-related)
+       * tests/check-tests-in-builddir.test: When not using the
+       parallel-tests option, do not check that VPATH components are
+       not present in the displayed test name, since the simple-tests
+       driver do not try to strip them.
+
+2011-04-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in self-check-env-sanitize.test
+       * tests/self-check-env-sanitize.test: Open file descriptor `5'
+       to stdout.
+       Fix spurious failure introduced by merge `v1.11-788-g3b0c8d5'.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       test: self check subroutines for skipping/failing of tests
+       * tests/self-check-report.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-23  Jim Meyering  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       test defs: new subroutines for test skipping/failing
+       * tests/defs.in (Exit): Move definition of this function earlier.
+       (warn_, skip_, fail_, framework_failure_): New functions, inspired
+       to the homonyms in gnulib's tests/init.sh.
+       ($stderr_fileno_): New global variable, used by the new functions
+       above.
+       * tests/README: Updated.
+       From a suggestion by Ralf Wildenhues.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo (copy & paste blunder) in heading comment
+       * tests/maintclean-vpath.test: Correctly refer to the sister test
+       as `maintclean.test', not as `maintclean-vpath.test'.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant test `mclean.test'
+       * tests/mclean.test: Remove, it's a weak grepping test completely
+       superseded by the much more complete `maintclean.test'.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       java tests: use $PATH_SEPARATOR where appropriate
+       * tests/java-compile-run-nested.test: Use `$PATH_SEPARATOR', not
+       `:', to separate entries of extended PATH and CLASSPATH variables.
+       * tests/java-compile-run-flat.test: Likewise.
+
+2011-04-26  Stefano Lattarini  <address@hidden>
+
+       java coverage: test JAVACFLAGS and AM_JAVACFLAGS
+       * tests/javaflags.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-26  Stefano Lattarini  <address@hidden>
+
+       java coverage: test rebuild rules for java
+       * tests/java-rebuild.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-26  Stefano Lattarini  <address@hidden>
+
+       java coverage: try to build and run a java program
+       * tests/java-compile-run-flat.test: New test, try to build and run
+       a "UNIX-style" java program (complete with wrapper shell script
+       and the like) with a "flat" source-tree setup (i.e., everything in
+       the top-level directory).
+       * tests/java-compile-nested.test: Likewise, but using a more
+       typical "nested" source-tree setup.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       test defs: new requirement for the default java interpreter
+       * tests/defs.in (for tool in $required): New requirement 'java'.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       java tests: tweak and make stricter a couple of tests
+       * tests/javasubst.test: Use proper m4 quoting.  Add trailing `:'
+       command.  Enable `errexit' shell flag, and related changes.
+       Prefer cat + here-doc over echo to append to configure.in.
+       Make grepping of Makefile.in stricter.  Add debugging output.
+       Improve heading comments.
+       * tests/javaprim.test: Likewise.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       java coverage: add test on uninstall with JAVA primary
+       * tests/java-uninstall.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       java tests: require java compiler more properly
+       * tests/java-extra.test: Use "required=javac" instead of ad-hoc
+       configure check.
+       * tests/java-noinst.test: Likewise.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       java: allow both JAVA and nobase_JAVA in the same Makefile.am
+       * automake.in (handle_java): Also strip `nobase_' from the given
+       prefix, when needed.
+       * tests/java-clean.test: Update and extend.
+       * tests/java-compile-install.test: Likewise.
+       * tests/java-no-duplicate.test: Likewise.
+       * tests/java-sources.test: Likewise.
+       * tests/java-noinst.test: Likewise.
+       * tests/java-mix-dist-nodist.test: Renamed to ...
+       * tests/java-mix.test: ... this, and extended.
+       * tests/java-nobase.test: New test, still xfailing due to
+       unrelated issues.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-04-22  Stefano Lattarini  <address@hidden>
+
+       testsuite: more environment sanitization
+       * tests/defs.in: Sanity check: abort if any of `parallel_tests'
+       or `required' is in the environment.
+       ($sed_unindent_prog): Initialize to empty, to avoid interferences
+       from the environment.
+       * tests/self-check-me-in-env.test: Renamed to ...
+       * tests/self-check-env-sanitize.test: ... this, and extended.
+       * tests/Makefile.am (TESTS): Update.
+       (TESTS_ENVIRONMENT): Unset variables `parallel_tests' and
+       `required'.  Adjust comments.
+
+2011-04-19  Stefano Lattarini  <address@hidden>
+
+       tests: in self-checks, use $SHELL, not /bin/sh
+       * tests/self-check-me-in-env.test: Include `./defs-static' to get
+       the definition of `$SHELL'.  Use `$SHELL' instead of `/bin/sh' to
+       execute the tests.
+
+2011-04-19  Stefano Lattarini  <address@hidden>
+
+       tests: prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Renamed to ...
+       (AM_TESTS_ENVIRONMENT): ... this.
+
+2011-04-18  Stefano Lattarini  <address@hidden>
+
+       tests: don't allow `$me' to be overridden from the environment
+       * tests/defs.in: Sanity check: abort if $me is in the environment.
+       * tests/self-check-me-in-env.test: New test.
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'.
+       (TESTS): Update.
+       Suggestion by Ralf Wildenhues.
+
+2011-04-18  Stefano Lattarini  <address@hidden>
+
+       check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT
+       The AM_TESTS_SETUP naming was not a good one after all.  It may
+       be technically more correct than AM_TESTS_ENVIRONMENT, but the
+       latter is a better one simply because it is easier to remember,
+       and even if you've never heard of it and only know the semantics
+       of TESTS_ENVIRONMENT, you can have a straightforward way to
+       figure out how AM_TESTS_ENVIRONMENT would work.
+       * tests/check.am (am__check_pre): Update.
+       * doc/automake.in (Simple Tests using parallel-tests): Update.
+       * tests/parallel-tests-am_tests_setup.test: Renamed ...
+       * tests/parallel-tests-am_tests_environment.test: ... to this,
+       and updated.
+       * tests/Makefile.am (TESTS): Update.
+       Suggestion and motivation by Ralf Wildenhues.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       test defs: allow overriding of `$me'
+       * tests/defs.in ($me): Allow overriding by the including test
+       script.  Add some explicative comments.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       coverage: more tests on the parallel-tests driver
+       * tests/parallel-tests-interrupt.test: New test.
+       * tests/parallel-tests-reset-term.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       check: new developer-reserved AM_TESTS_SETUP variable
+       For reference, see the discussion at:
+       
<http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html>
+       * lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also
+       $(AM_TESTS_SETUP).  Comments updated, and some typos fixed.
+       * doc/automake.texi (Simple Tests using parallel-tests): Document
+       AM_TESTS_SETUP.  Reorder some of the existing documentation a bit.
+       * tests/parallel-tests-am_tests_setup.test: New test.
+       From a suggestion by Ralf Wildenhues.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       depcomp tests: don't reject slower dependency extractors
+       * tests/depcomp8b.test: Add the `--enable-dependency-tracking'
+       option to `configure' invocations, so that slower dependency
+       extractors are not rejected.
+       * tests/depcomp8a.test: Likewise.  Also ...
+       (foo.c): ... since we are at it, fix spacing to be consistent
+       with GNU coding standards.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       m4: add missing serial numbers to a few files
+       Fixes automake bug#8483.
+       * m4/amversion.in: Add serial number.
+       * m4/auxdir.m4: Likewise.
+       * m4/gcj.m4: Likewise.
+       * m4/install-sh.m4: Likewise.
+       * m4/mkdirp.m4: Likewise.
+       * m4/python.m4: Likewise.
+       * m4/runlog.m4: Likewise.
+       * m4/strip.m4: Likewise.
+       * m4/upc.m4: Likewise.
+
+2011-04-16  Stefano Lattarini  <address@hidden>
+
+       tests: fix few bugs in self checks
+       Related to automake bug#8508.
+       * tests/self-check-cleanup.test: Be laxer when grepping output
+       from `ls -l', to account for ACLs and SELinux-only files.
+       * tests/self-check-dir.test: Source `defs-static' to read in the
+       correct definition for $SHELL.
+       * tests/self-check-me.test: Likewise, and extend a bit.
+       Report from Jim Meyering.
+
+2011-04-16  Jim Meyering  <address@hidden>
+
+       depcomp: correct invalid sed invocation
+       * lib/depcomp: Insert missing -e before '/:$/d'.
+       Otherwise, that use of sed would treat '/:$/d' as a file name.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       maintainer check: quote literal `$' in Makefile rule
+       * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
+       character in double-quoted string.  Fix a bug in which the rule
+       emitted an erroneously empty substring in its error message.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo in python5b.test
+       * tests/python5b.test: Remove extra `:' from $PATH redefinition.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       lex/yacc tests: remove redundant $distdir definition
+       * tests/lex3.test ($distdir): Remove definition, that's already
+       done in `tests/defs'.
+       * tests/lexvpath.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-cxx.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-cxx.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild-subdir.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/yacc-mix-c-cxx.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/autodist-acconfig.test: Do not set the `errexit'
+       shell flag, as it is already set by `tests/defs'.
+       * tests/autodist-acconfig-no-subdir.test: Likewise.
+       * tests/autodist-aclocal-m4.test: Likewise.
+       * tests/autodist-config-headers.test: Likewise.
+       * tests/autodist-configure-no-subdir.test: Likewise.
+       * tests/autodist-stamp-vti.test: Likewise.
+       * tests/autodist-subdir.test: Likewise.
+       * tests/autodist.test: Likewise.
+       * tests/check-exported-srcdir.test: Likewise.
+       * tests/check-tests-in-builddir.test: Likewise.
+       * tests/check-tests_environment.test: Likewise.
+       * tests/help-python.test: Likewise.
+       * tests/java-check.test: Likewise.
+       * tests/java-extra.test: Likewise.
+       * tests/java-noinst.test: Likewise.
+       * tests/lex-subobj-nodep.test: Likewise.
+       * tests/ltinit.test: Likewise.
+       * tests/m4-inclusion.test: Likewise.
+       * tests/maintclean-vpath.test: Likewise.
+       * tests/parallel-tests-subdir.test: Likewise.
+       * tests/pr8365-remake-timing.test: Likewise.
+       * tests/python-dist.test: Likewise.
+       * tests/python-vars.test: Likewise.
+       * tests/python-virtualenv.test: Likewise.
+       * tests/python5b.test: Likewise.
+       * tests/specflg-dummy.test: Likewise.
+       * tests/yacc-dist-nobuild-subdir.test: Likewise.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       test defs: define default $distdir (help reducing duplication)
+       * tests/defs ($distdir): New variable, might be used in
+       testcases checking distribution-related features.
+       * tests/pr9.test: Use it.
+       * tests/subdir9.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/remake-moved-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-macro-and-file.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/vtexi3.test: Add comment explaining why we redefine
+       $distdir in this test.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       coverage: test lex-generated "#line" directives postprocessing
+       * tests/yacc-line.test: In heading comments, add reference to new
+       sister test `lex-line.test'.
+       * tests/lex-line.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-14  Stefano Lattarini  <address@hidden>
+
+       tests: minor improvements to a couple of yacc tests
+       * tests/yacc-auxdir.test: Avoid running autoconf, it's not
+       needed.
+       * tests/yacc-line.test: Also check that the yacc-generated C
+       and header files do not contain "#line" directives referencing
+       `y.tab.c' or `y.tab.h'.  Add a couple of explicative comments.
+
+2011-04-11  Stefano Lattarini  <address@hidden>
+
+       tests: split yacc6.test, for better separation and coverage
+       * tests/yacc6.test: Test removed, its content extended and split
+       into ...
+       * tests/yacc-auxdir.test, tests/yacc-depend.test,
+       tests/yacc-line.test: ... these new tests.
+       * tests/yacc-depend2.test: New test, exposes the failure that
+       FreeBSD used to encounter in yacc6.test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-11  Stefano Lattarini  <address@hidden>
+
+       tests: do not uselessly require GNU make or gcc in a few tests
+       * tests/lex3.test: Remove gcc from requirements, as any working C
+       compiler should be ok.  Consequently, do not clobber user CFLAGS.
+       Also, remove GNUmake from requirements; it was added (see commit
+       `Release-1-8-103-g0d2f592') because this test fails with FreeBSD
+       make due to VPATH issues -- but so do many other yacc-related and
+       lex-related tests currently, and requiring GNU make in all of
+       them would unacceptably reduce coverage.
+       * tests/lexvpath.test: Remove gcc from requirements, as any
+       working C compiler should be ok.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/lex5.test: Likewise.  Also, do not require anymore GNU
+       make; to compensate, explicitly call "$MAKE Makefile" to update
+       the out-of-date Makefile if $MAKE is not GNU make.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in test 'yacc-d-cxx.test'
+       * tests/yacc-d-cxx.test: Create ylwrap script before calling
+       automake for the first time, so that the script gets correctly
+       distributed.  Add checks verifying it indeed is.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       tests cosmetics: remove redundant definitions of variable $tab
+       * tests/yacc-d-basic.test ($tab): Remove definition: it's already
+       defined in `tests/defs'.
+       * tests/yacc-d-cxx.test: Likewise.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       yacc: add some tests on bison support (still xfailing)
+       Related to automake bug#7648 and PR automake/491.
+       * tests/bison-skeleton-cxx.test: New test.
+       * tests/bison-skeleton.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Updated.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       coverage: test for automake bug#8485 (known regression)
+       * tests/yacc-dist-nobuild-subdir.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       coverage: test mixed C/C++ yacc-generated parsers in the same dir
+       * tests/yacc-mix-c-cxx.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix typos and wording in some yacc tests
+       * tests/yacc-cxx.test (foo.cc): Clarify comment about the content
+       of this file being valid C++ but invalid C.
+       (parse1.yy): Likewise.  Also, remove redundant parentheses in a
+       `return' statement.
+       * tests/yacc-d-cxx.test (write_parse): Clarify comment about the
+       content of the generated files being valid C++ but invalid C.
+       (write_main): Likewise.
+       * tests/yacc-basic.test: Remove redundant parentheses in a
+       `return' statement.
+       * tests/yacc-d-vpath.test: Adjust spacing around curly brackets.
+       * tests/yaccvpath.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       Suggested by Ralf Wildenhues.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       yacc: update NEWS and docs about yacc-generated headers extensions
+       * doc/automake.texi (Yacc and Lex): Document explicitly that
+       extensions of yacc-generated headers are modelled after the
+       extension of the corresponding sources.
+       * NEWS: Update.
+
+2011-01-28   Stefano Lattarini  <address@hidden>
+
+       yacc: extension of headers modelled after extension of sources
+       With this change, if '-d' is in *YFLAGS, a yacc input file named
+       foo.y++ will cause a foo.h++ header to be generated, instead of a
+       foo.h header.  Similarly for foo.ypp, foo.yxx and foo.yy.
+       This way, the name of the files generated by an automake-created
+       `ylwrap' invocation should be consistent with those generated by
+       a `bison -o' call.
+       Related to automake bug#7648 and PR automake/491.
+       * lib/am/yacc.am (am__yacc_c2h): New internal variable.
+       (?GENERIC?%EXT%%DERIVED-EXT%, ?!GENERIC?%OBJ%): Get the name of
+       the header dynamically at make runtime, so that its extension is
+       modelled after the extension of the source.
+       * automake.in (lang_yacc_target_hook): Adjust the calculation of
+       `$header' accordingly.
+       * tests/yacc-cxx.test: New test.
+       * tests/yacc-d-cxx.test: Likewise.
+       * tests/yacc-weirdnames.test: Likewise.
+       * tests/yacc-basic.test: Update comments.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yaccpp.test: Updated and extended.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-29  Stefano Lattarini  <address@hidden>
+
+       tests: don't define YACC and LEX in the Makefiles
+       We don't want YACC and LEX defined as make variables, otherwise
+       the values determined at configure time will override those from
+       the environment, even in the make-spawned testcases.  For example,
+       before this change, with the following usage:
+         $ ./configure YACC=yacc
+         $ export YACC='bison -y'
+         $ make check
+       the testsuite would have ended up, very counterintuitively, with
+       YACC defined to 'yacc' in the testcases' environment.
+       * configure.ac: Call `AM_SUBST_NOTMAKE' on YACC and LEX.
+
+2011-01-29  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in lflags*.test
+       * tests/lflags.test: Remove 'LEX' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/lflags2.test: Likewise.
+
+2011-01-29   Stefano Lattarini  <address@hidden>
+
+       coverage: more on 'yacc -d' and recovery from deleted headers
+       * tests/yacc-deleted-headers.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-29   Stefano Lattarini  <address@hidden>
+
+       tests: remove redundancy from silent lex/yacc tests
+       * tests/silent-yacc-gcc.test, tests/silent-yacc-generic.test: Merge
+       these two testcases into ...
+       * tests/silent-yacc.test: ... this new one, which doesn't fiddle
+       which dependency tracking, as that shouldn't impact on generation
+       of yacc-derived C source and header files (and, for what concerns
+       compilation of C files, is already tested in other testcases).
+       * tests/silent-lex-gcc.test, tests/silent-lex-generic.test: Merge
+       these two testcases into ...
+       * tests/silent-lex.test: ... this new test, for similar reasons.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-29  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       tests init: better messages for 'yacc' and 'lex' requirements
+       * tests/defs.in: Give better diagnostic messages when a test must
+       be skipped to the unavailability of yacc or lex program.  Also,
+       improve syncing between code for requiring yacc and lex.
+
+2011-01-28  Stefano Lattarini  <address@hidden>
+
+       configure: look for a lex program to be used by the testsuite
+       This will allow the testcases requiring a 'lex' program to run also
+       with vendor/legacy lex implementations, not only with 'flex'.
+       * configure.ac: Look for a lex program, using AC_CHECK_PROGS.
+       * tests/defs.in: New required entry 'lex'.
+       ($LEX): Let the user override the lex program to be used by the
+       testsuite.
+       * tests/cond35.test ($required): Require 'lex', not 'flex'.
+       * tests/cond36.test: Likewise.
+       * tests/lexv3.test: Likewise.
+       * tests/lexv3.test: Likewise.
+       * tests/silent-lex-gcc.test: Likewise.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+       * tests/silent-many-generic.test:likewise.
+       * tests/lexvpath.test: Likewise, and fix typo in comments.
+
+2011-01-22   Stefano Lattarini  <address@hidden>
+
+       configure: look for a yacc program to be used by the testsuite
+       Instead of forcing the user to manually export 'YACC' in the
+       testsuite to use a non-bison yacc, we now look for a yacc program
+       at configure time, and use that as the default in the testsuite.
+       * configure.ac: Look for a yacc program, using AC_CHECK_PROGS.
+       * tests/defs.in: Updated to use the value of $YACC precomputed by
+       configure, unless the user overrides that in the environment.
+
+2011-01-22   Stefano Lattarini  <address@hidden>
+
+       tests: more coverage on yacc/lex silent-rules, plus minor cleanups
+       * tests/silent-yacc-gcc.test: Add sanity checks verifying that the
+       generated Makefile.in files really contains the non-generic rules
+       we expect.  Do not redundantly manually remove files we know to be
+       already removed "make maintainer-clean".
+       (Makefile.am): Ensure we cover also non-generic yacc rules, by
+       setting target-specific YFLAGS.
+       (sub/Makefile.am): Likewise.
+       * tests/silent-yacc-generic.test: Likewise.
+       * tests/silent-lex-gcc.test: Likewise, but with LFLAGS instead of
+       YFLAGS.
+       * tests/silent-lex-generic.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise, but with both LFLAGS and
+       YFLAGS.  Also ...
+       (do_and_check_verbose_build): Remove redundant blank line.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-yacc-headers.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in yflags*.test
+       * tests/yflags.test: Remove 'YACC' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/yflags2.test: Likewise.
+
+2011-01-22   Stefano Lattarini  <address@hidden>
+
+       tests: cover yacc target-specific flags, and `-v' flag handling
+       * tests/yacc-basic.test: Also try to build a parser having `-v'
+       as target-specific flags.  Add a couple of `ls -l' commands, for
+       debugging.  Update and extend comments.  Escape literal dots in
+       grep regular expressions.
+
+2011-01-12   Stefano Lattarini  <address@hidden>
+
+       docs: clustered '-d' not recognized in YFLAGS
+       This change fixes automake bug#7828.
+       * doc/automake.texi (Yacc and Lex): Document that automake
+       recognizes '-d' in AM_YFLAGS only if it's not clustered with
+       other options.
+       From a report by Юрий Пухальский.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: do not force yacc-requiring tests to use bison
+       * tests/defs.in: New required entry 'yacc'.  Remove old
+       required entry 'bison'.
+       * tests/cond35.test ($required): Require yacc, not bison.
+       * tests/cond36.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-yacc-gcc.test: Likewise.
+       * tests/silent-yacc-generic.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/yacc-nodist.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc7.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+
+2011-01-10   Stefano Lattarini  <address@hidden>
+
+       yacc: warn about conditional content in *YFLAGS variables
+       This change fixes automake bug#7804.
+       * automake.in (lang_yacc_target_hook): Warn if any of the relevant
+       *YFLAGS variables has conditional contents (not only a conditional
+       definition).  Related refactoring.
+       * NEWS: Updated.
+       * tests/yflags-conditional.test: Updated and extended.
+       * tests/yflags-conditional-force.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-01-08   Stefano Lattarini  <address@hidden>
+
+       yacc: support variable expansions in *YFLAGS definition.
+       This change fixes automake bug#7800.
+       * automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
+       instead of 'variable_value' to get the value of *YFLAGS variables.
+       Related changes.
+       ($DASH_D_PATTERN): Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
+       * tests/yacc-clean.test: Remove workaround for now-fixed bug.
+       * NEWS: Update.
+
+2011-01-08   Stefano Lattarini  <address@hidden>
+
+       yacc: more tests on *YFLAGS support
+       * tests/yflags-var-expand.test: New test, still xfailing.  It
+       exposes automake bug#7800 -- "automake fails to honor `-d' in
+       AM_YFLAGS when variable expansions are involved".
+       * tests/yflags-d-false-positive.test: New test, checking that
+       automake do not spuriously see `-d' in *YFLAGS when that isn't
+       really there.
+       * tests/yflags-force-override.test: New test, checking that
+       automake can cope with definition of the YFLAGS variable in
+       Makefile.am (even if that is an extremely bad practice, as that
+       variable is user-reserved).
+       * tests/yflags-cmdline-override.test: New test, checking that
+       automake can cope with user-redefinition of YFLAGS at configure
+       time and/or at make time.
+       * tests/yflags-conditional.test: New test, checks that automake
+       warns on conditionally-defined *YFLAGS variables.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-01-08   Stefano Lattarini  <address@hidden>
+
+       yacc: extend and improve tests
+       * tests/yacc-basic.test: Also check that the intermediate C file
+       is mentioned in the generated Makefile.in, and that it is created
+       by the first make invocation.
+       * tests/yacc3.test: Test removed, superseded by ...
+       * tests/yacc-d-basic.test: ... this new test.
+       * tests/yacc2.test: Add reference to that new test in the heading
+       comments.
+       * tests/yacc-d-vpath.test: New test.
+       * tests/yaccvpath.test: Updated heading comments.  Do not require
+       gcc anymore, as any working C compiler should be enough.  Remove
+       redundant comments.
+       * tests/yacc-nodist.test: New test.
+       * tests/yacc-dist-nobuild.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-12-13  Stefano Lattarini  <address@hidden>
+
+       Extend, fix and improve tests on Lex and Yacc support.
+       * tests/lexcpp.test: New test script, on support for Lex + C++.
+       * tests/lexvpath.test: New test script, test build and rebuild
+       rules for lexers in VPATH setup.
+       * tests/yacc-basic.test: New test script, run simple "semantic"
+       checks on basic Yacc support (similarly to what lex3.test does
+       for Lex support).
+       * tests/lex.test: Don't create useless dummy source file joe.l.
+       Remove extra blank lines.
+       * tests/lex4.test: Add trailing `:' command.  Do not create dummy
+       useless lex source file.
+       * tests/lex2.test: Likewise.  Call automake with the `-a' option,
+       so that it doesn't fail for the absence of `ylwrap' script.  Make
+       grepping of automake stderr stricter.
+       * tests/yacc7.test: Add trailing `:' command.  Enable `errexit'
+       shell flag earlier (just after having sourced ./defs).
+       * tests/yacc4.test: Likewise.  Also ...
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       Other minor cosmetic changes.
+       * tests/yacc5.test: Likewise.
+       * tests/yaccvpath.test: Likewise. Also ...
+       ($distdir): New variable.
+       Use it throughout.
+       * tests/lex5.test: Likewise.
+       * tests/lex3.test: Likewise.  Check the distdir, rather than
+       grepping the distribution tarball.  Extend the test on the
+       created binary, and be sure to avoid hangs.  Add some comments.
+       * tests/yacc.test: Use stricter grepping.  Add trailing `:'.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc3.test: Likewise.  Do not create the unused file
+       `Makefile.sed'.  Remove useless rules from Makefile.am.  Other
+       minor cosmetic changes.
+       * tests/yacc2.test: Make grepping of generated `Makefile.in' and
+       of automake error messages stricter.  Do not redirect output of
+       grep to /dev/null.  Move call to aclocal earlier.  Reduce the
+       number of empty blank lines.  Fix a typo in comments.
+       * tests/yacc8.test: Fixed bugs that reduced the completeness of
+       the tests.  Added trailing `:' command.
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
+       `.yxx', rather than only `.yy'.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-07   Stefano Lattarini  <address@hidden>
+
+       yacc: "make clean" removes .c and .h files from non-distributed .y
+       Previously, while automake did *not* distribute C source and header
+       files derived from non-distributed Yacc sources, it still caused
+       them to be removed only by "make maintainer-clean" only, and not by
+       simply "make clean" or "make distclean".
+       This caused "make distcheck" to fail, unless the developer put
+       those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
+       by hand.
+       This change fixes this issue, by making non-distributed `.c' and
+       `.h' files generated by non-distributed Yacc sources cleaned by
+       "make clean".
+       * tests/automake.in (lang_yacc_target_hook): Make C source and
+       header files derived from non-distributed Yacc files cleaned by
+       "make clean", not only by "make maintainer-clean".
+       * tests/yacc-clean.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-04-11  Stefano Lattarini  <address@hidden>
+
+       depcomp: fix bugs in tests and in the depcomp script
+       * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation.
+       * tests/depcomp10.test: Make it executable.  Fix a blunder that
+       has left part of an intended comment not prefixed by `#', thus
+       causing shell syntax errors.  In this same comment, break a
+       too-long reported error message on multiple lines, for clarity.
+       Add reference to the relevant bug report.  Add a comment which
+       explains why the test result 'skipped' if the first "make" call
+       fails.  Add other useful comments.
+       * tests/depcomp9.test: Slightly improve comments.
+
+2011-04-11  Ralf Wildenhues  <address@hidden>
+
+       Fix hp depmode for VPATH builds with GNU make.
+       * lib/depcomp: Be sure to remove VPATH-prefixed object from
+       dependency output when creating stub rule.
+       * tests/depcomp10.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       Report by Bruno Haible.
+
+2011-04-18  Stefano Lattarini  <address@hidden>
+
+       java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
+       Fixes automake bug#8434.
+       * automake.in (handle_java): Strip `dist_' and `nodist_' from
+       the given prefix.  Define a new internal Makefile variable
+       `am__java_sources'.  Related adjustments.
+       * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
+       first time this am file is processed.
+       (class%DIR%.stamp): Stamp file renamed ...
+       (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
+       prefixes are stripped from the name of the stampfile.  Adjust
+       declaration of dependencies by using the new automake-generated
+       internal variable `$(am__java_sources)'.  In the rule, use `$@'
+       as the name of the target, rather than hard-coding it.
+       * tests/java.test: Update and extend.
+       * tests/java-no-duplicate.test: New test.
+       * tests/java-mix-dist-nodist.test: Likewise.
+       * tests/java-compile-and-install.test: Likewise.
+       * tests/java-clean.test: Likewise.
+       * tests/java-sources.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-06  Stefano Lattarini  <address@hidden>
+
+       coverage: more on java support EXTRA_ and noinst_ prefixes
+       * tests/java-extra.test: New test, checking support for the
+       prefix `EXTRA_' with the JAVA primary.
+       * tests/java-noinst.test: New test, checking support for the
+       prefix `noinst_' with the JAVA primary.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       test defs: fix 'javac' requirement for older JDK versions
+       The Java compiler from JDK 1.5 (and presumably earlier versions)
+       cannot handle the `-version' option by itself; and while it does
+       print the version number, it then errors out with an usage error:
+         $ javac -version
+         javac 1.5.0_22
+         javac: no source files
+         Usage: javac <options> <source files>
+         ...
+       Luckily, adding the `-help' option to the `javac' invocation
+       seems to fix this problem.
+       * tests/defs.in (javac): Pass also the `-help' option to the
+       `javac' program.  Add a comment explaining why it is needed.
+       Report from Ralf Wildenhues.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       test defs: new requirement for the default java compiler
+       * tests/defs.in (for tool in $required): New requirement 'javac'.
+       * tests/java.test: Use it instead of ad-hoc configure check.
+       * tests/java-check.test: Likewise.
+       * tests/java-extra.test: Likewise.
+       * tests/java-noinst.test: Likewise.
+       * tests/instfail-java.test: Likewise.
+       * tests/instdir-java.test: Likewise.
+
+2011-04-09  Stefano Lattarini  <address@hidden>
+
+       java: check_JAVA does not cause compilation by "make all" anymore
+       Fixes automake bug#8234.
+       * automake.in (handle_java): Make stamp of class files built from
+       java sources in $(check_JAVA) a dependency of `check' target, not
+       `all' target.
+       * tests/java-check.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       * THANKS: Update.
+       Report from Petteri Räty.
+
+2011-04-09  Stefano Lattarini  <address@hidden>
+           Bruno Haible  <address@hidden>
+
+       coverage: add tests on remake rules in more complex situations
+       * tests/defs (using_gmake): New function.
+       (for tool in $required): Use it when $tool is 'GNUmake'.
+       * tests/remake-moved-m4-file.test: New test.
+       * tests/remake-deleted-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-macro-and-file.test: Likewise.
+       * tests/remake-renamed-m4-macro.test: Likewise.
+       * tests/remake-add-acsubst-gnulib.test: Likewise.
+       * tests/remake-add-header-gnulib.test: Likewise.
+       * tests/remake-remove-header-gnulib.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-04-09  Stefano Lattarini  <address@hidden>
+
+       typofix in 'tests/defs'
+       * tests/defs: Fix typo (`itslef' instead of `itself') in
+       comments.
+
+2011-04-09  Ralf Wildenhues  <address@hidden>
+
+       Clarify regex code in depcomp.
+       * lib/depcomp: Add comment why we don't need regex-escaping here.
+       Suggested by Stefano Lattarini.
+
+2011-04-08  Ralf Wildenhues  <address@hidden>
+
+       Fix makedepend depmode for VPATH builds.
+       * lib/depcomp [makedepend]: Remove any VPATH prefix from the
+       object file name, so a rebuild doesn't attempt to update the
+       .Po files in the source tree.
+       * tests/depcomp9.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-04-02  Stefano Lattarini  <address@hidden>
+
+       tests: fix timestamp-related failures
+       Fixes automake bug#8365.
+       * tests/aclocal6.test: Sleep before modifying m4 files that should
+       trigger remake rules.  Remove incorrect/obsoleted comments.
+       * tests/subdir5.test: Likewise, and extend a bit.
+       * tests/subdir8.test: Likewise.
+       * tests/pr8365-remake-timing.test: New xfailing test.
+       * tests/Makefile.am (TESTS): Update.
+       Report from Sam Steingold.
+
+2011-04-02  Ralf Wildenhues  <address@hidden>
+
+       Create subdirs for generated sources even when not dep tracking.
+       * automake.in (handle_single_transform): If $object is derived
+       and lands in subdir, be sure to output a dirstamp dependency.
+       * tests/yacc5.test: Avoid falsely matching the dirstamp
+       dependency when grepping for a rule.
+       * tests/lex-subobj-nodep.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update.
+       Report by Ignacy Gawedzki.
+
+       Fix locale issue in check-exported-srcdir.test.
+       * tests/check-exported-srcdir.test: Reformulate glob to not fail
+       in a locale that ignores or interleaves character case.
+
+2011-04-01  Stefano Lattarini  <address@hidden>
+
+       docs: better visibility for aclocal in the index
+       * doc/automake.texi (@menu): Rename title for entry 'configure'
+       from "Scanning configure.ac or configure.in" to the more precise
+       "Scanning configure.ac, using aclocal".
+       (@detailmenu): Adjust.
+       (@node configure): Adjust, and extend @cindex calls accordingly.
+       * THANKS: Update.
+       From a report by Maynard Johnson.
+
+2011-03-30  Stefano Lattarini  <address@hidden>
+
+       tests: improve tests on "maintainer-clean" target
+       * tests/aclocal6.test: Move checks related to "maintainer-clean"
+       functionalities into ...
+       * tests/maintclean-vpath.test: ... this new test.
+       * tests/maintclean.test: Update heading comments.  Extend to also
+       test subdirs.  Remove useless disabling of YACC.  Fix m4 quoting
+       in configure.in.  Add a trailing `:' command.  Remove extra blank
+       lines.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-03-21  Ralf Wildenhues  <address@hidden>
+
+       tests: fix unindent to use printf not echo for script.
+       * tests/defs.in: Use printf rather than echo, as the latter may
+       interpret the backslashes in the sed script.  Fixes test
+       failures with dash as /bin/sh.
+
+2011-03-17  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       maintcheck: look for problematic names of testcases
+       The configure.in stub created by default by `tests/defs' obtains
+       the first argument of AC_INIT from the test name, and this can
+       cause some supported autoconf versions to fail with a spurious
+       error if that test name contains the name of an m4 or m4sugar
+       builtin or macro (e.g., `defn' or `m4_undefine').
+       See for example the bug fixed by commit v1.11-287-g1325a8a.
+       This change add a maintainer check that warns about test names
+       which are possibly problematic in this regard.
+       * Makefile.am (sc_test_names): New maintainer-check target.
+       (syntax_check_rules): Add it.
+       (m4_builtins): New helper variable.
+       (TESTS): Updated according to the following renamings.
+       * tests/include.test: Renamed ...
+       * tests/hdr-vars-defined-once.test: ... to this.
+       * tests/sinclude.test: Renamed ...
+       * tests/m4-inclusion.test: ... to this, and simplified
+       accordingly.
+       * tests/include2.test: Renamed ...
+       * tests/dist-included-parent-dir.test: ... to this, for
+       consistency.
+
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       tests: fix bug in alloca*.test
+       * tests/alloca.test: Make grepping of automake stderr stricter,
+       add a trailing `:' command; also, add AC_PROG_CC to configure.in,
+       and create a dummy alloca.c file, to ensure that we fail for the
+       proper reason.
+       * tests/alloca2.test: Likewise.  Also, look for LT_INIT, not
+       AC_PROG_LIBTOOL, in the error message (bug introduced with commit
+       v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
+       primary is used").
+       From a report by Patrick Welche.
+
+2011-03-17  Stefano Lattarini  <address@hidden>
+
+       cosmetics: better use of m4 quoting and m4sugar macros
+       * m4/dmalloc.m4: Better use of m4 quoting.  Bump serial number.
+       * m4/gcj.m4: Likewise.
+       * m4/init.m4: Likewise.
+       * m4/install-sh.m4: Likewise.
+       * m4/lex.m4: Likewise.
+       * m4/multi.m4: Likewise.
+       * m4/option.m4: Likewise.
+       * m4/python.m4: Likewise.
+       * m4/sanity.m4: Likewise.
+       * m4/cond.m4: Likewise.  Also, prefer the m4sugar macro 'm4_if'
+       over the plain m4 macro 'ifelse'.
+       * m4/depend.m4: Likewise.
+
+2011-03-17  Stefano Lattarini  <address@hidden>
+
+       tests: add test about deprecated use of AC_INIT
+       * tests/deprecated-acinit.test: New test, check that automake
+       and autoconf complain about an old-style AC_INIT call used with
+       a new-style AM_AUTOMAKE_INIT call.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
+       * tests/comments-in-var-defn.test: The configure.in stub created
+       by default, which has the AC_INIT first argument obtained by the
+       test name, causes autoconf 2.62 to fail with a spurious error
+       message like: "configure.in:1: error: defn: undefined macro:".
+       Thus, to prevent this, the test is renamed to ...
+       * tests/comments-in-var-def.test: ... this.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       cosmetics: convert encoding from ISO-8859 to UTF-8
+       * ChangeLog.03: Convert encoding to UTF-8.
+       * ChangeLog.96: Likewise.
+       * ChangeLog.98: Likewise.
+       * NEWS: Likewise.
+       * TODO: Likewise.
+
+2011-03-01  Stefano Lattarini  <address@hidden>
+
+       tests: extend checks on the 'unindent' shell function
+       * tests/self-check-unindent.test: Also check that multiple
+       instances of 'unindent' can run in parallel (this was not
+       the case when that function used temporary files).
+
+2011-03-01  Peter Rosin  <address@hidden>
+
+       test defs: unindent without temporary file
+       * tests/defs.in (commented_sed_unindent_prog): Commented Sed program
+       that strips the "proper" amount of leading whitespace.
+       (unindent): Lazily strip comments from the above program and use it
+       to unindent without using a temporary file.
+
+2011-02-26  Stefano Lattarini  <address@hidden>
+
+       libtool: suggest LT_INIT if LTLIBRARIES primary is used
+       When the LTLIBRARIES primary was used, but $(LIBTOOL) wasn't
+       defined, automake suggested to add a call to AC_PROG_LIBTOOL
+       in configure.ac.  But that macro is deprecated since Libtool
+       version 1.9b (2004-08-29), in favor of the newer LT_INIT.  So
+       suggest the use of this latter macro instead.
+       * lib/Automake/Variable.pm (%_am_macro_for_var): Pair 'LIBTOOL'
+       with 'LT_INIT', not with 'AC_PROG_LIBTOOL'.
+       * tests/libtool4.test: Adjust and extend.  Also, add a call to
+       macro AC_PROG_CC in configure.in, to help ensuring that automake
+       does not fail for the wrong reasons.
+       * tests/ltinit.test: New test, ensure that automake's libtool
+       support works with LT_INIT-based interface.
+       Thanks to Jack Kelly for the suggestion.
+
+2011-02-25  Stefano Lattarini  <address@hidden>
+
+       tests: add testcases sanity-checking the testsuite
+       Helper subroutines, variables and other pieces of code defined
+       in the `tests/defs' and used by many testcases are non-obvious,
+       and tricky to get to work portably; but until now, they weren't
+       tested at all in a clear and self-contained way.
+       This change should remedy to the situation.
+       * tests/self-check-cleanup.test: New test, check removal of
+       temporary test working directory by `./defs'.
+       * tests/self-check-dir.test: New test, check that tests using
+       `./defs' create a proper temporary directory, and run in it.
+       * tests/self-check-exit.test: New test, check that, in case of
+       failing commands, the correct exit status is passed to the exit
+       trap installed by the `./defs' script.
+       * tests/self-check-is_newest.test: New test, checking the
+       `is_newest' subroutine.
+       * tests/self-check-me.test: New test, checking that $me gets
+       defined automatically by `tests/defs' if not set, and that it
+       can be overridden from either the shell or the environment.
+       * tests/self-check-sanity.test: New test, check that the sanity
+       checks performed by the `tests/defs' script works correctly.
+       * tests/self-check-unindent.test: New test, checking the
+       `unindent' subroutine.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-02-20  Stefano Lattarini  <address@hidden>
+
+       tests: tempdirs with restrictive permissions are cleaned correctly
+       Before this change, the removal of a temporary test directory
+       containing subdirectories with restrictive permissions (such as
+       'r--r--r--') could fail.
+       * tests/defs: Ensure that all the subdirectories of a temporary
+       test directory have the 'read', 'write' and 'execute' bits set,
+       before trying to remove it with `rm -rf'.
+       * tests/Makefile.am (clean-local-check): Likewise.
+
+2011-02-16  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       test defs: add subroutine for input unindenting
+       * tests/defs.in (unindent): New subroutine.
+       * tests/instspc-tests.sh: Use it.
+
+2011-02-15  Stefano Lattarini  <address@hidden>
+
+       python: report the 'PYTHON' influential environment variable
+       * m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
+       * doc/automake.texi (Python): Update and extend.
+       * tests/help-python.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS (Jack Kelly): Update e-mail address.
+       Suggestion by Jack Kelly.
+
+2011-02-10  Stefano Lattarini  <address@hidden>
+
+       tests defs: clear TESTS_ENVIRONMENT variable
+       * tests/defs.in (TESTS_ENVIRONMENT): Unset it, so that values
+       from environment won't interfere with the testcases.
+       Suggestion by Ralf Wildenhues.
+
+2011-02-15  Stefano Lattarini  <address@hidden>
+
+       tests: `instspc-*.test': do not create useless source file
+       * tests/instspc-tests.sh (create_input_data): Do not create
+       unused source file `source2.c'.
+
+2011-02-15  Stefano Lattarini  <address@hidden>
+
+       tests: optimize `instspc-*.test' for speed
+       After the split of `instspc.test' into various generated tests,
+       the running time of the testsuite has noticeably increased, since
+       all these new generated tests must run aclocal, autoconf and
+       automake, whereas previously they were run only once (at the
+       beginning of `instspc.test').  But luckily, since the new tests
+       share the same input files for the autotools, this situation can
+       be easily worked around (at the expenses of a slight increase of
+       complexity for the testsuite scaffolding).
+       * tests/instspc-data.test: New helper test, properly calling
+       the `instspc-tests.sh' script to generate input data for the
+       others `instspc-*.test' tests.
+       * tests/Makefile.am (TESTS): Add `instspc-data.test'.
+       ($(instspc_tests:.test=.log)): Depend on its log file.
+       (instspc-data.log): Depend on `instspc-tests.sh'.
+       * tests/instspc-tests.sh: Recognize new action `generate-data',
+       and use it to create hand-written and autotools-generated static
+       files shared by all the `instspc-*.test' tests.
+       When sourced by the `instspc-*.test' tests, use those previously
+       created files instead of recreating them from scratch.
+       (unindent, create_input_data): New subroutines.
+       Some other related changes and refactorings.
+       From a suggestion by Ralf Wildenhues.
+
+2011-02-14  Stefano Lattarini  <address@hidden>
+
+       python: fix spurious failure in tests
+       * tests/python-vars.test: Ignore cached values from config.site
+       by exporting CONFIG_SITE=/dev/null.  Be laxer in matching the
+       expected values of output variables `pythondir' and `pyexecdir',
+       since they can change quite unpredictably among different python
+       installations.  Also, avoid "hyping" debugging output, thus
+       offering smaller trace output and more informative diff.
+       Report and suggestions by Ralf Wildenhues.
+       * tests/python-virtualenv.test: Require python, since we call it
+       even after the virtualenv has been deactivated.  Ignore cached
+       values from config.site by exporting CONFIG_SITE=/dev/null.
+
+2011-02-06  Stefano Lattarini  <address@hidden>
+
+       tests: tweak few tests on simple and parallel test drivers
+       * tests/check-exported-srcdir.test: Improve heading comments.
+       * tests/check-tests-in-builddir.test: Likewise.  Also, unset the
+       `FOO_EXIT_STATUS' variable, so that any pre-existing value in the
+       environment won't risk to interfere with the test.
+       Suggestions by Ralf Wildenhues.
+
+2011-02-06  Stefano Lattarini  <address@hidden>
+
+       python: extend and improve tests, fix minor glitches
+       * m4/python.m4 (AM_PATH_PYTHON): Ensure the "checking ..." messages
+       from configure are always complete, even in case of failure.  Tiny
+       cosmetic improvement in info/error messages.
+       * tests/python.test: Also check that automake complains if the
+       PYTHON primary is used but the `py-compile' script is not present.
+       Make grepping of generated Makefile.in laxer w.r.t. whitespace.
+       Add trailing `:' command.
+       * tests/python2.test: Remove repeated calls aclocal: they are
+       useless because configure.in is never modified.  Make grepping
+       of automake stderr more comprehensive.  Remove the pre-existing
+       `py-compile' file before trying to install it with `--add-missing'.
+       Add trailing `:' command.
+       * tests/python3.test: Add trailing `:' command.
+       * tests/python11.test: Likewise.
+       * tests/python4.test: Likewise.  Also, try to pass PYTHON config
+       variable to configure from the environment, rather than only from
+       the command line.
+       * tests/python5.test: Ensure that the "checking ..." messages from
+       configure are always complete.  Use proper m4 quoting.  Add a
+       trailing `:' command.
+       * tests/python6.test: Simplify test logic, by checking for files
+       created by configure rather then grepping its output.
+       * tests/python7.test: Likewise.
+       * tests/python8.test: Also check that `$PYTHON' is meaningfully
+       set in the ACTION-IF-TRUE argument of AM_PATH_PYTHON.
+       * tests/python9.test: Likewise.
+       * tests/python10.test: Add trailing `:' command.
+       (Makefile.am): Declare `disttest' target as `.PHONY', and add
+       an `ls -l' to its recipe, for debugging.
+       * tests/nobase-python.test: In testing "make uninstall" and
+       "make install" results, prefer idioms that make verbose logs
+       more helpful.  Remove a couple of lines of dead code.  Add a
+       trailing `:' command.
+       * tests/python5b.test: New test, checking that configure performs
+       the check on the python version even when the choice of the python
+       interpreter is forced by the user.
+       * tests/python-dist.test: New test, checking the distribution of
+       *_PYTHON files.
+       * tests/python-vars.test: New test, checking that AM_PATH_PYTHON
+       correctly set all the output variables advertised in the manual.
+       * tests/python-virtualenv.test: New test, checking that python
+       support offered by automake works well with "virtual python
+       environments" created by the `virtualenv' program.
+       * tests/instdir-prog.test: Also check `$(pyexecdir)'.  Existing
+       checks made slightly stricter.
+       * tests/instdir-prog.test: Also check `$(pyexecdir)'.  Existing
+       * tests/instdir-ltlib.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-02-01  Stefano Lattarini  <address@hidden>
+
+       coverage: more tests on simple and parallel test drivers
+       * tests/parallel-tests-subdir.test: New test.
+       * tests/check-exported-srcdir.test: Likewise.
+       * tests/check-tests-in-builddir.test: Likewise.
+       * tests/check-tests_environment.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-29  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in lflags*.test
+       * tests/lflags.test: Remove 'LEX' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/lflags2.test: Likewise.
+
+2011-01-24  Stefano Lattarini  <address@hidden>
+
+       docs: color-tests issues with parallel make
+       * doc/automake.texi (Simple Tests): Document that automatic
+       recognition of a capable terminal attached to stdout can fail
+       with some make implementation when running in parallel mode,
+       thus causing colored test output not to be automatically
+       activated when it should.
+
+2011-01-23  Stefano Lattarini  <address@hidden>
+
+       coverage: test semantics of "dummy" per-target flags
+       * tests/specflg-dummy.test: New test, ensuring that even "dummy"
+       per-target flags triggers the use of renamed objects.
+       * tests/Makefile.am (TESTS): Update.
+       Suggestion by Ralf Wildenhues.
+
+2011-01-23  Stefano Lattarini  <address@hidden>
+
+       tests defs: sanitize IFS
+       * tests/defs ($IFS): Define to <space>, <tab>, <newline>.
+       ($sp): New variable, holding a single whitespace character.
+       ($tab): New variable, holding a tabulation character.
+       ($nl): New variable, holding a newline character.
+
+2011-01-23  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid instspc* failures due to make's whitespace trimming
+       * tests/instspc-tests.sh: Prepend './' when passing the test
+       characters, to avoid leading whitespace characters to be trimmed
+       from macros set from environment variables.  Fixes testsuite
+       failures with HP-UX and Tru64/OSF make.
+
+2011-01-22  Ralf Wildenhues  <address@hidden>
+
+       tests: fix VPATH auto-expansion workarounds.
+       * tests/suffix10.test, tests/suffix11.test, tests/suffix12.test,
+       tests/suffix3.test, tests/suffix5.test, tests/suffix8.test:
+       Ensure $< is not surrounded by white space, to prevent Solaris
+       make from applying automatic VPATH text expansion.
+
+       tests: fix VPATH auto-expansion workarounds.
+       * tests/parallel-tests8.test, tests/suffix13.test:
+       Ensure $< is not surrounded by white space, to prevent Solaris
+       make from applying automatic VPATH text expansion.
+
+2011-01-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in yflags*.test
+       * tests/yflags.test: Remove 'YACC' from the environment, so
+       that it won't be erroneously picked up by `make -e'.
+       * tests/yflags2.test: Likewise.
+
+2011-01-22  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid fn99*.test failures due to buggy AIX 5.3 cp -R.
+       * tests/fn99.test, tests/fn99subdir.test: Skip if an initial
+       `cp -R' of the subdir tree already fails; AIX 5.3 cp messes
+       up its internal memory when copying this tree.
+
+2011-01-22  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       Add comment to check-TESTS rule working around make 3.80 bug.
+       * lib/am/check.am (check-TESTS): Update comment.
+
+2011-01-20  Ralf Wildenhues  <address@hidden>
+
+       tests: less strict double-colon spy.test again.
+       * tests/spy.test: We know BSD make doesn't invoke more than one
+       double-colon rule, so no need to expose that failure.
+
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       install-sh: avoid Tru64 sh `test' operator precedence issues.
+       * lib/install-sh: Protect file names and directory components
+       that consist of `=', `(', `)', or `!'.  Move protection as early
+       as possible, to avoid errors such as with Tru64 sh `test -z ='.
+       * tests/instsh2.test: Extend test to cover more possibilities.
+       Fixes 1.12 instspc-equal-install.test failure on Tru64/OSF 5.1.
+
+2011-01-19  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       docs: automake testsuite doesn't use TESTS_ENVIRONMENT anymore
+       * doc/automake.texi (Simple Tests): Do not claim Automake uses
+       TESTS_ENVIRONMENT for the perl driver.  Instead, point to the
+       parallel-tests driver.
+
+2011-01-21  Ralf Wildenhues  <address@hidden>
+
+       tests: check for presence of cscope with redirected input.
+       * tests/defs: Add required test for cscope.
+       Fixes cscope3.test hang with Sun C 5.9 cscope.
+
+       tests: avoid false failure in cygnus-dependency-tracking.test.
+       * tests/cygnus-dependency-tracking.test: Be less restrictive
+       when grepping the compiler error message, GCC 3.4.6 on FreeBSD
+       does not mention an undefined symbol.
+
+2011-01-20  Ralf Wildenhues  <address@hidden>
+
+       tests: revert not turning off errexit in instspc-test.sh
+       * tests/instspc-tests.sh: Turn off errexit while sourcing defs,
+       the scripts might still not be clean.
+
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       tests: work around Tru64 sh -e issues for instspc*.test.
+       Apparently, Tru64 sh does not like turning off errexit mode,
+       and gets confused.
+       * tests/defs: Document 'errexit' cleanliness requirement.
+       * tests/defs-static.in: Likewise.  Avoid error from command
+       substitution to abort instspc*.test with Tru64/OSF 5.1 sh.
+       * tests/instspc-tests.sh: Drop now-unneeded temporary errexit
+       dropping.  Add strategic '|| Exit' to let tests work on Tru64.
+
+2011-01-19  Ralf Wildenhues  <address@hidden>
+
+       Allow _AM_DEPENDENCIES to be used later in configure.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing
+       conftest.dir before recreating it.
+       Fixes bug#7864.
+       Report by Eric Blake, from report by Scott McCreary against M4.
+
+2011-01-18  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid failure on w32 file systems.
+       * tests/parallel-tests-unreadable-log.test: SKIP if file cannot
+       be turned unreadable.
+
+2011-01-17  Ralf Wildenhues  <address@hidden>
+
+       tests: allow double-colon spy.test to work with HP-UX make.
+       * tests/spy.test: Fix comment typos.  Ensure prerequisites we
+       do not want to depend on are strictly older than the target.
+       Also test with a target out of date wrt. more than one rule.
+
+2011-01-17  Ralf Wildenhues  <address@hidden>
+
+       Avoid local $_ perl variable, for Perl before 5.9.1.
+       * lib/Automake/Options.pm (_process_option_list): Do not
+       lexically localize $_.  Fixes bootstrap on AIX 5.1.
+       Bug introduced in commit `v1.11-622-gf90a06c'.
+
+2011-01-16  Stefano Lattarini  <address@hidden>
+
+       tests: remove useless requirements from cond36.test
+       * tests/cond36.test ($required): Remove.
+       Since we are at it, add a trailing `:' command.
+
+2011-01-16  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid failing command substitution in errexit mode.
+       * tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
+       a command substitution with a nonzero exit status, that causes
+       IRIX and Tru64/OSF sh to fail the whole test.
+
+2011-01-16  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
+       * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
+       Test file readability before redirecting input from it, to avoid
+       exiting Tru64/OSF 5.1 sh which treats read as special builtin.
+       * tests/parallel-tests-unreadable-log.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-01-16  Ralf Wildenhues  <address@hidden>
+
+       * NEWS, README: Update copyright years.
+
+2011-01-15  Stefano Lattarini  <address@hidden>
+
+       tests: hard error in case of internal failures or signal caught
+       * tests/defs: Exit with status 99 (hard error) rather than
+       1 (failure) on unexpected/internal errors, or when a signal
+       is caught by the client script.
+
+       Tests defs: don't let useless variables leak in test scripts.
+       * tests/defs ($priv_check_temp, $overwrite_status, $ro_dir_temp,
+       $create_status, $r2h, $libtool_found, $gettext_found, $aclocaldir,
+       $extra_includes): Unset once they've served their purpose.
+
+2011-01-16  Ralf Wildenhues  <address@hidden>
+
+       Fix parallel-tests.test failure with HP-UX make.
+       * tests/parallel-tests.test: Sleep inside inner tests, so logs
+       are newer than logs of tests they depend on, for HP-UX make.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       docs: ensure example are separated with empty lines in the input
+       * doc/automake.texi (Extending aclocal, Emacs Lisp, Rebuilding)
+       (API Versioning, Renamed Objects, Multiple Outputs): Add empty
+       lines before address@hidden' and after address@hidden example' lines, 
so info
+       output is rendered correctly, and a following @noindent honored.
+       Report by Stefano Lattarini.
+
+2011-01-15  Jim Meyering <address@hidden>
+
+       tests: fix comment typo
+       * tests/substref.test: Fix grammar in a comment.
+
+2011-01-13  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in two texinfo tests
+       * tests/txinfo.test ($required): Add 'makeinfo'.
+       * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
+       that make won't try to run makeinfo (which could be unavailable)
+       to build it.
+       Found by NixOS Hydra, reported by Ralf Wildenhues.
+
+2011-01-15  Stefano Lattarini  <address@hidden>
+
+       Update docs w.r.t. warning and strictness options.
+       * doc/automake.texi (Strictness): Document that some warnings are
+       turned off by default in `foreign' strictness.
+       (Options): Divide into new sections "Options generalities" and
+       "List of Automake options".  Fix typo (colon instead of full
+       stop).  Document option precedence (AUTOMAKE_OPTIONS wins over
+       AM_INIT_AUTOMAKE which wins over command line).  Also document
+       interactions between options specifying strictness and those
+       specifying warnings.
+
+       More tests on warnings/strictness precedence.
+       * tests/warning-groups-win-over-strictness.test: New test, similar
+       to `warnings-win-over-strictness.test', but checking the explicit
+       catch-all warning flags (like `-Wall' and `-Wnone').
+       * tests/Makefile.am (TESTS): Update.
+
+       Update NEWS about the warnings-over-strictness precedence.
+       * NEWS: Automake explicit warning levels always take precedence
+       over the implicit warning levels implied by Automake strictness.
+
+       For PR automake/547:
+       Warnings win over strictness in AUTOMAKE_OPTIONS.
+       Ensure that, for what concerns the options specified in
+       AUTOMAKE_OPTIONS, explicitly-defined warnings always take
+       precedence over implicit strictness-implied warnings.
+       This finally fixes Automake bug#7669 a.k.a. PR/547.
+       * automake.in (handle_options): Call 'process_option_list'
+       only once per set of options.
+       * lib/Automake/Options.pm (process_global_option_list,
+       process_option_list): Add sanity checks.
+       ($_options_processed, $_global_options_processed): New
+       internal variables, used by the sanity checks above.
+       * tests/warnings-win-over-strictness.test: Extend.
+
+       For PR automake/547:
+       Change signature of 'Automake::Options::_process_option_list()'.
+       This only modifies internal details in the automake implementation,
+       bearing no externally visible effect, but preparing the way for the
+       final fix of Automake bug#7669 a.k.a. PR/547.
+       * lib/Automake/Options.pm (_process_option_list): Accept as
+       arguments a list of hash references with keys 'option' and 'where',
+       where 'option' is an option as might occur in AUTOMAKE_OPTIONS or
+       AM_INIT_AUTOMAKE, and 'where' is the location where it occurred.
+       (process_option_list, process_global_option_list): Updated.
+       * automake.in (handle_options, scan_autoconf_traces): Update.
+
+       Add more tests about AUTOMAKE_OPTIONS.
+       In view of soon-to-follow refactorings (still in the pursuit of a
+       fix for Automake bug#7669 a.k.a. PR/547), add some more tests on
+       AUTOMAKE_OPTIONS support, to prevent obvious regressions.
+       * tests/amopts-variable-expansion.test: New test.
+       * tests/amopts-location.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+       For PR automake/547:
+       Warnings win over strictness in AM_INIT_AUTOMAKE.
+       This change ensures that, for what concerns the options specified
+       in AM_INIT_AUTOMAKE,  explicitly-defined warnings always take
+       precedence over implicit strictness-implied warnings.  Related to
+       Automake bug#7669 a.k.a. PR/547.
+       * lib/Automake/Options.pm (_process_option_list): Parse explicit
+       warnings only after the strictness level has been set.  Fix POD
+       documentation.
+       * tests/warnings-win-over-strictness.test: Extend.
+
+       For PR automake/547:
+       Warnings win over strictness on command line.
+       Ensure that, on the command line at least, explicitly defined
+       warnings always take precedence over implicit strictness-implied
+       warnings.  Related to Automake bug#7669 a.k.a. PR/547.
+       * automake.in (parse_arguments): Parse warnings only after the
+       strictness level has been processed.
+       * tests/gnuwarn.test: Update, plus miscellaneous improvements.
+       * tests/warnings-win-over-strictness.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+       More tests on warnings and strictness.
+       * tests/warnings-strictness-interactions.test: New test.
+       * tests/warnings-unknown.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+       New test on silent-rules mode and portability warnings.
+       * tests/silent-nowarn.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+       Add new tests on strictness and warnings precedence and overriding.
+       * tests/strictness-override.test: New test.
+       * tests/strictness-precedence.test: New test.
+       * tests/warnings-override.test: New test.
+       * tests/warnings-precedence.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix remake rule-induced test failures with HP-UX make.
+       * tests/remake1a.test: Require GNU make.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix remake rule-induced test failures with HP-UX make.
+       * tests/colon6.test: Update timestamp of subdir Makefile, so we
+       do not spuriously invoke the nonexistent toplevel am--refresh
+       rule.
+
+       tests: fix typos in colon6.test
+       * tests/colon6.test: Fix typos.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       tests: explain MSYS setup failure issue, improve test.
+       * tests/defs: Add comment and failure message, improve fail
+       logic.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix libobj2.test failure with non-GNU make: define $(AR).
+       * tests/libobj2.test: Ensure $(AR) is suitably defined.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid spurious failures due to fork failure in test setup
+       * tests/defs: Ensure $me is always nonempty, to avoid spurious
+       failures on MinGW/MSYS in case the preceding sed command could
+       not be spawned.
+
+       Avoid configure warnings from wait about reused PIDs.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Hide wait stderr output.
+       Fixes spurious failure of depcomp2.test.
+
+2011-01-13  Ralf Wildenhues  <address@hidden>
+
+       Avoid testsuite failures due to Autoconf Fortran change.
+       Autoconf v2.68-21-g727ce95 causes AC_F77_LIBRARY_LDFLAGS to
+       require computing the canonical host name.  Ensure config.guess
+       and config.sub files are present for respective checks.
+       * tests/compile_f_c_cxx.test: Add stub files.
+       * tests/flibs.test: Likewise.
+       * tests/fort4.test: Use $AUTOMAKE -a for installing files.
+
+2011-01-12  Stefano Lattarini  <address@hidden>
+
+       docs: clustered '-d' not recognized in YFLAGS
+       This change fixes automake bug#7828.
+       * doc/automake.texi (Yacc and Lex): Document that automake
+       recognizes '-d' in AM_YFLAGS only if it's not clustered with
+       other options.
+       From a report by Юрий Пухальский.
+
+2011-01-10  Stefano Lattarini  <address@hidden>
+
+       tests: add checks on automatically-distributed files
+       Related to automake bug#7819.
+       * tests/autodist.test: New test.
+       * tests/autodist-subdir.test: Likewise.
+       * tests/autodist-acconfig.test: Likewise.
+       * tests/autodist-acconfig-no-subdir.test: Likewise.
+       * tests/autodist-aclocal-m4.test: Likewise.
+       * tests/autodist-config-headers.test: Likewise.
+       * tests/autodist-configure-no-subdir.test: Likewise.
+       * tests/autodist-stamp-vti.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: do not force yacc-requiring tests to use bison
+       * tests/defs.in: New required entry 'yacc'.  Remove old
+       required entry 'bison'.
+       * tests/cond35.test ($required): Require yacc, not bison.
+       * tests/cond36.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-yacc-gcc.test: Likewise.
+       * tests/silent-yacc-generic.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/yacc-nodist.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc7.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: more consistent checks about invalid options
+       * tests/aclocal.test: Grepping of automake stderr for messages
+       reporting invalid options made stricter.
+       * tests/no-outdir-option.test: Likewise.  Also, create a dummy
+       `Makefile.am', to ensure that the automake failures are really
+       caused only by unrecognized options.
+       * tests/automake.test: Added trailing `:' command.  Removed
+       redundant checks on `--help' and `--version' option (already
+       performed in the test `help*.test').
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: enable 'errexit' shell flag by default.
+       * tests/defs: Enable `errexit' shell flag (near the end).
+       Removed redundant comment about the enabling of shell traces.
+       * tests/README (Writing test cases): Update, and use nicer
+       formatting in a couple of places.
+       * All tests: Adjusted by removing now-redundant calls to
+       'set -e'.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: work around a texi+cygnus bug causing a spurious XFAIL
+       * tests/txinfo5b.test: New test, like txinfo5.test but calling
+       automake with the `-Wno-override' option to work around a bug
+       in the texinfo + cygnus interaction.
+       * tests/txinfo5.test: Update heading comments.
+       * tests/Makefile.am (TEST): Updated.
+
+2011-01-09  Dave Hart  <address@hidden>  (tiny change)
+
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+
+2011-01-09  Peter Rosin  <address@hidden>
+
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: texinfo unrecognized extensions
+       * tests/txinfo-unrecognized-extension.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+       Improve, extend and tweak tests on Texinfo support.
+       * tests/instdir-texi.test: Add a call to `ls -l' after that to
+       `make', for debugging.  When looking for required tools, do not
+       redirect the output of "$tool --help" to /dev/null, and do not
+       uselessly run it in a subshell.
+       * tests/txinfo.test: Rewritten to run autoconf, ./configure and
+       make.  All checks moved into Makefile.am.
+       * tests/txinfo8.test: Likewise, and modernize the generated
+       configure.in.
+       * tests/txinfo2.test: Moved checks into Makefile.am, and other
+       minor improvements.
+       * tests/txinfo5.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.
+       * tests/txinfo6.test: Likewise, and make grepping of generated
+       Makefile.in stricter.
+       * tests/txinfo7.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Do not add unnecessary stuff
+       to Makefile.am.
+       * tests/txinfo9.test: Verify that more targets which are expected
+       to be generated only once really are.  Make grepping less strict,
+       to avoid exposing too much internal details.  More minor changes.
+       * tests/txinfo16.test: Add trailing `:'.  Prefer cat over echo
+       for appending to configure.in.  Updated/fixed heading comments.
+       * tests/txinfo23.test: Likewise, and extended a little by making
+       it check that no info file is created in the $(srcdir).
+       * tests/txinfo24.test: Likewise.
+       * tests/txinfo25.test: Likewise.
+       * tests/txinfo18.test: Add trailing `:'.  Prefer cat over echo
+       for appending to configure.in.  Also, check that index files are
+       cleaned also by "make clean", not only by "make distclean".
+       * tests/txinfo22.test: Prefer `$me' over hard-coded test name,
+       and added trailing `:' command.  This testcase also used to check
+       that automake ignores in-line comments when using variables, but
+       preserves them in the output; these checks (added in commit
+       "Release-1-7f-4-g9177ef8") do not really pertain to this test,
+       so they have been moved ...
+       * tests/comments-in-var-defn.test: ... into this new test.
+       * tests/txinfo4.test: Escape literal dots in grep regexps.  Add
+       trailing `:' command.
+       * tests/txinfo29.test: Likewise.  Relax grepping of generated
+       Makefile.in w.r.t. whitespaces.  Prefer `cat' over `echo' to
+       append to configure.in.
+       * tests/txinfo3.test: Likewise.
+       * tests/vtexi.test: Improve grepping of Makefile.in (sometimes
+       make it stricter, sometimes laxer).  Move `set -e' setting just
+       after the inclusion of ./defs.  De-uglify a sed command.  Other
+       minor cosmetic improvements.
+       * tests/vtexi2.test: Make grepping of Makefile.in stricter.  Add
+       trailing `:' command.
+       * tests/vtexi3.test: New test on version.texi support.
+       * tests/vtexi4.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure in 'tests/yflags-conditional.test'
+       * tests/yflags-conditional.test: Filter out message "warnings are
+       treated as errors" from automake stderr, to avoid a false positive
+       when grepping for extraneous warning messages.
+
+2011-01-10  Stefano Lattarini  <address@hidden>
+
+       yacc: warn about conditional content in *YFLAGS variables
+       This change fixes automake bug#7804.
+       * automake.in (lang_yacc_target_hook): Warn if any of the relevant
+       *YFLAGS variables has conditional contents (not only a conditional
+       definition).  Related refactoring.
+       * NEWS: Updated.
+       * tests/yflags-conditional.test: Updated and extended.
+       * tests/yflags-conditional-force.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+
+2011-01-08  Stefano Lattarini  <address@hidden>
+
+       yacc: support variable expansions in *YFLAGS definition.
+       This change fixes automake bug#7800.
+       * automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
+       instead of 'variable_value' to get the value of *YFLAGS variables.
+       Related changes.
+       ($DASH_D_PATTERN): Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
+       * tests/yacc-clean.test: Remove workaround for now-fixed bug.
+       * NEWS: Update.
+
+2011-01-08  Stefano Lattarini  <address@hidden>
+
+       yacc: more tests on *YFLAGS support
+       * tests/yflags-var-expand.test: New test, still xfailing.  It
+       exposes automake bug#7800 -- "automake fails to honor `-d' in
+       AM_YFLAGS when variable expansions are involved".
+       * tests/yflags-d-false-positive.test: New test, checking that
+       automake do not spuriously see `-d' in *YFLAGS when that isn't
+       really there.
+       * tests/yflags-force-override.test: New test, checking that
+       automake can cope with definition of the YFLAGS variable in
+       Makefile.am (even if that is an extremely bad practice, as that
+       variable is user-reserved).
+       * tests/yflags-cmdline-override.test: New test, checking that
+       automake can cope with user-redefinition of YFLAGS at configure
+       time and/or at make time.
+       * tests/yflags-conditional.test: New test, checks that automake
+       warns on conditionally-defined *YFLAGS variables.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+
+2011-01-08  Stefano Lattarini  <address@hidden>
+
+       yacc: extend and improve tests
+       * tests/yacc-basic.test: Also check that the intermediate C file
+       is mentioned in the generated Makefile.in, and that it is created
+       by the first make invocation.
+       * tests/yacc3.test: Test removed, superseded by ...
+       * tests/yacc-d-basic.test: ... this new test.
+       * tests/yacc2.test: Add reference to that new test in the heading
+       comments.
+       * tests/yacc-d-vpath.test: New test.
+       * tests/yaccvpath.test: Updated heading comments.  Do not require
+       gcc anymore, as any working C compiler should be enough.  Remove
+       redundant comments.
+       * tests/yacc-nodist.test: New test.
+       * tests/yacc-dist-nobuild.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-12-13  Stefano Lattarini  <address@hidden>
+
+       Extend, fix and improve tests on Lex and Yacc support.
+       * tests/lexcpp.test: New test script, on support for Lex + C++.
+       * tests/lexvpath.test: New test script, test build and rebuild
+       rules for lexers in VPATH setup.
+       * tests/yacc-basic.test: New test script, run simple "semantic"
+       checks on basic Yacc support (similarly to what lex3.test does
+       for Lex support).
+       * tests/lex.test: Don't create useless dummy source file joe.l.
+       Remove extra blank lines.
+       * tests/lex4.test: Add trailing `:' command.  Do not create dummy
+       useless lex source file.
+       * tests/lex2.test: Likewise.  Call automake with the `-a' option,
+       so that it doesn't fail for the absence of `ylwrap' script.  Make
+       grepping of automake stderr stricter.
+       * tests/yacc7.test: Add trailing `:' command.  Enable `errexit'
+       shell flag earlier (just after having sourced ./defs).
+       * tests/yacc4.test: Likewise.  Also ...
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       Other minor cosmetic changes.
+       * tests/yacc5.test: Likewise.
+       * tests/yaccvpath.test: Likewise. Also ...
+       ($distdir): New variable.
+       Use it throughout.
+       * tests/lex5.test: Likewise.
+       * tests/lex3.test: Likewise.  Check the distdir, rather than
+       grepping the distribution tarball.  Extend the test on the
+       created binary, and be sure to avoid hangs.  Add some comments.
+       * tests/yacc.test: Use stricter grepping.  Add trailing `:'.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc3.test: Likewise.  Do not create the unused file
+       `Makefile.sed'.  Remove useless rules from Makefile.am.  Other
+       minor cosmetic changes.
+       * tests/yacc2.test: Make grepping of generated `Makefile.in' and
+       of automake error messages stricter.  Do not redirect output of
+       grep to /dev/null.  Move call to aclocal earlier.  Reduce the
+       number of empty blank lines.  Fix a typo in comments.
+       * tests/yacc8.test: Fixed bugs that reduced the completeness of
+       the tests.  Added trailing `:' command.
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
+       `.yxx', rather than only `.yy'.
+       * tests/Makefile.am (TESTS): Update.
+
+2011-01-09  Stefano Lattarini  <address@hidden>
+
+       cosmetics: remove trailing whitespaces
+       * doc/automake.texi: Remove trailing whitespaces.
+       * tests/cond13.test: Likewise.
+       * tests/cond14.test: Likewise.
+       * tests/fort4.test: Likewise.
+       * tests/fort5.test: Likewise.
+       * tests/libobj17.test: Likewise.
+       * tests/suffix7.test: Likewise.
+       * tests/vtexi2.test: Likewise.
+
+       automake: minor fixes in comments
+       * automake.in: Some minor fixes and enhancements in comments.
+
+2011-01-09  Ralf Wildenhues  <address@hidden>
+
+       Add test coverage for deleted header files.
+       * tests/depcomp6.test, tests/depcomp7.test: Update tests to
+       also check for the deleted header bug.  If no dependency
+       tracking mechanism could be found, SKIP rather than exit
+       successfully.  Use GNU style spacing and ANSI C prototypes.
+
+       Fix typos in Rule.pm comments.
+       * lib/Automake/Rule.pm: Fix typos in comments.
+
+       docs: split 'amhello Explained' node.
+       * doc/automake.texi (amhello Explained): Split node ...
+       (amhello's configure.ac Setup Explained)
+       (amhello's Makefile.am Setup Explained) : ... into these two.
+       (Top, Hello World): Adjust, and add @anchor for stable URL links.
+       Suggestion by Karl Berry in automake bug#7766.
+
+2011-01-08  Karl Berry  <address@hidden>
+           Eric Blake  <address@hidden>
+
+       docs: reference defining directories in amhello node.
+       * doc/automake.texi (amhello Explained): Point to Autoconf
+       manual for how to convert directory values into macros.
+       (Optional): Fix grammar nit.
+
+2011-01-07  Stefano Lattarini  <address@hidden>
+
+       yacc: "make clean" removes .c and .h files from non-distributed .y
+       Previously, while automake did *not* distribute C source and header
+       files derived from non-distributed Yacc sources, it still caused
+       them to be removed only by "make maintainer-clean" only, and not by
+       simply "make clean" or "make distclean".
+       This caused "make distcheck" to fail, unless the developer put
+       those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
+       by hand.
+       This change fixes this issue, by making non-distributed `.c' and
+       `.h' files generated by non-distributed Yacc sources cleaned by
+       "make clean".
+       * tests/automake.in (lang_yacc_target_hook): Make C source and
+       header files derived from non-distributed Yacc files cleaned by
+       "make clean", not only by "make maintainer-clean".
+       * tests/yacc-clean.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+
+2011-01-02  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typo (forgotten word).
+
+2011-01-02  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       docs: how to work around checks on invalid primary/directory couples
+       * doc/automake.texi (Uniform): Document the blessed idiom which can
+       be used to work around automake checks on invalid primary/directory
+       couples (such as `lib_PROGRAMS' or `doc_LIBRARIES').
+
+2010-01-03  Stefano Lattarini  <address@hidden>
+
+       Tests: normalize use of the 'errexit' shell flag.
+       * tests/maken3.test (check_targets): Remove redundant call to
+       'set -e'.
+       * tests/maken4.test: Likewise.
+       * tests/ansi5.test: Call 'set -e' just after './defs' has been
+       sourced.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/cond16.test: Likewise.
+       * tests/cond17.test: Likewise.
+       * tests/cond18.test: Likewise.
+       * tests/cond19.test: Likewise.
+       * tests/cond20.test: Likewise.
+       * tests/cond21.test: Likewise.
+       * tests/instdat2.test: Likewise.
+       * tests/instdir-texi.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/remake1a.test: Likewise.
+       * tests/ccnoco.test: Likewise, and add trailing `:' command.
+       * tests/comment4.test: Likewise.
+       * tests/gcj4.test: Likewise.
+       * tests/nodist2.test: Likewise.
+       * tests/nodist3.test: Enable 'errexit' shell flag (this should
+       have been done in commit v1.11-248-g317e17b, but the relevant
+       hunk has been forgotten somehow).
+       * tests/output.test: Likewise.
+       * tests/gnits2.test: Likewise, and display captured stderr to
+       script's stderr, not to script's stdout.
+       * tests/gnits3.test: Likewise.  Also, prefer 'cat' over 'echo'
+       to append to Makefile.am, and really check that the exit status
+       of "make installcheck" indicates failure.
+
+2011-01-02  Ralf Wildenhues  <address@hidden>
+
+       Sync auxiliary files from upstream.
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex:
+       Sync from upstream.
+
+       Avoid caching bug in cygnus mode test.
+       * tests/cygnus-requires-maintainer-mode.test: Remove
+       autom4te.cache directory before rerunning aclocal, to
+       remove trace caches.
+
+       Fix maintainer-check regression.
+       * tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
+       environment.
+
+       Bump copyright years.
+       * aclocal.in (write_aclocal, version): Bump copyright years.
+       * automake.in (gen_copyright, version): Likewise.
+       * doc/automake.texi: Likewise.
+
+2010-12-23  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Add missing blank line between two entries.
+
+2010-12-23  Stefano Lattarini  <address@hidden>
+
+       Improve and extend tests `suffix*.test'.
+       * tests/suffix.test: Check that suffix rules for C compilation are
+       only included once.  Try also with a static library.
+       * tests/suffix2.test: Add a new grep to help potential debugging.
+       Do not run automake with the `--add-missing' options, since we
+       already create all the needed auxiliary files.  Try also *without*
+       the `no-dependencies' automake option.
+       * tests/suffix4.test: Make grepping of Makefile.in stricter.
+       * tests/suffix3.test: Rewritten to run also autoconf, ./configure
+       and make.
+       * tests/suffix5.test: Likewise.
+       * tests/suffix6.test: Fix botched recipe indentation (eight spaces
+       were used instead of a tabulation character).  Extend to check
+       that `.obj' is handled like `.$(OBJEXT)' (as is done for `.o').
+       Improved parsing & grepping of generated Makefile.in.  Other minor
+       fixes and improvements.
+       * tests/suffix10.test: Move some checks in Makefile.am.  Also run
+       "make all".
+       * tests/suffix12.test: Likewise, and account for VPATH issues in
+       weaker make implementations.
+       * tests/suffix11.test: Likewise.  Also, run "make distcheck", for
+       completeness, and related changes.
+       * tests/suffix8.test: Likewise.  Also, do not put `gcc' anymore
+       in $required.
+       * tests/suffix13.test: Do not use the `--force-missing' automake
+       option unnecessarily.
+       * tests/suffix6b.test: New test, semantic sister of `suffix6.test'.
+       * tests/suffix6c.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-12-23  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       Work around a bug in file-inclusion mechanism of Solaris make.
+       * automake.in (handle_single_transform): In the name of the
+       dependency file: collapse multiple slash characters into a single
+       one.
+       * tests/subobj11a.test: New test.
+       * tests/subobj11b.test: Likewise.
+       * tests/subobj11c.test: Likewise.
+       * tests/depcomp8a.test: Likewise.
+       * tests/depcomp8b.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+       * NEWS: Updated.
+       Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
+       patch and tests by Stefano Lattarini.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       Fix two spurious testsuite failures on IRIX 6.5.
+       * tests/suffix13.test (Makefile.am): Account for VPATH issues on
+       weaker make implementations (e.g. IRIX 6.5).
+       * tests/parallel-tests8.test: Likewise, plus a required related
+       change.
+       Reported by Ralf Wildenhues.  The bugs have been there from the
+       first versions of the affected test scripts.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       docs: cygnus mode doesn't require AM_CYGWIN32 macro.
+       * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
+       the AM_CYGWIN32 macro (and indeed hasn't required it since at
+       least commit Release-1-2-31-g3038064 "merged changes from
+       Cygnus" of 1997-08-25).
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       Add some tests on 'cygnus' mode.
+       * tests/clean2.test: Extend.
+       * tests/cygnus-check-without-all.test: New test.
+       * tests/cygnus-dependency-tracking.test: Likewise.
+       * tests/cygnus-distclean.test: Likewise.
+       * tests/cygnus-imply-foreign.test: Likewise.
+       * tests/cygnus-no-dist.test: Likewise.
+       * tests/cygnus-no-installinfo.test: Likewise.
+       * tests/cygnus-requires-maintainer-mode.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       Fix parallel testsuite run with Zsh.
+       This change deals with a Zsh incompatibility in the handling
+       of the special shell variable `$0' in sourced files; this
+       incompatibility used to cause utter breakage when the
+       Automake testsuite was run in parallel mode with Zsh as
+       the $(TEST_LOG_COMPILER).
+       For more information, please refer to the thread "Fix parallel
+       testsuite run with zsh" on automake-patches, dated 2010-12-22:
+        
<http://lists.gnu.org/archive/html/automake-patches/2010-12/msg00135.html>
+       This change works around the problems described above for Zsh 4.3
+       or later, and offers better error messages (instead of random
+       failures) for earlier Zsh version.
+       * tests/README (Supported shells): When describing the manual
+       workaround about the Zsh incompatibility in the handling of `$0',
+       tell that it is now needed only with Zsh versions preceding 4.3.
+       Done also some minor rewordings.
+       * tests/defs-static.in ($argv0): New variable, offers a workaround
+       for the Zsh incompatibility in the handling of `$0'.
+       Abort if that variable cannot be correctly set (can happen only
+       in older Zsh version).
+       * tests/defs ($me): Define using `$argv0', not `$0'.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       Tests defs: keep track of original $AUTOMAKE and $ACLOCAL values.
+       This is especially useful for tests which might want to run
+       automake and aclocal without additional flags and warnings.
+       * tests/defs-static.in ($original_ACLOCAL): New variable.
+       ($original_AUTOMAKE): Likewise.
+       * tests/help.test: Use them.
+       * tests/help2.test: Likewise.
+       * tests/help3.test: Likewise.
+       * tests/help4.test: Likewise.
+       From a suggestion by Ralf Wildenhues.
+
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       distlinksbrk.test: Work around botched "make -k".
+       * tests/distlinksbrk.test: Run "make" multiple times and grep
+       its output each time for a single error message, rather than
+       running "make -k" one single time and grepping its output for
+       all the expected error messages.  This should work around make
+       implementations with limited (broken?) `-k' support; for more
+       information, see these subthreads on the automake-patches list:
+         - 2010-11-15, "Testsuite failures on HP-UX 11.23",
+           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
+         - 2010-11-15, "Testsuite failures on IRIX 6.5",
+           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
+       Minor improvements to test 'amopts.test'.
+       * tests/amopts.test: Remove botched comment.  Make grepping of
+       automake stderr slighty stricter.  Add trailing `:' command.
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
+       backcompat6.test: avoid comments inside recipe commands.
+       * tests/backcompat6.test: Remove shell comments from makefile rule
+       commands, as they are not portable to (at least) Tru64 make.
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
+       man8.test: avoid comments inside recipe commands.
+       * tests/man8.test: Remove shell comments from makefile rule
+       commands, as they are not portable to (at least) Tru64 make.
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
+       Fix sed-related buglet in test "subdir5.test"
+       * tests/subdir5.test: Always terminate text passed to the
+       `i' sed command with a newline, to work around limitations
+       in e.g. older OpenBSD sed.
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures in tests on AC_CONFIG_AUX_DIR.
+       * tests/auxdir7.test: Do not try to needlessly overwrite the files
+       `install-sh' and `missing'.  This avoid spurious failures in "make
+       distcheck", when those files might be copied as read-only from the
+       `lib' directory.
+       * tests/auxdir8.test: Likewise.
+
+2010-12-18  Stefano Lattarini  <address@hidden>
+
+       Make test 'posixsubst-script' portable to MinGW/MSYS.
+       * tests/posixsubst-script.test: Ensure that the generated dummy
+       scripts really start with a shebang line, to work around a
+       limitation of 'test -x' on MinGW/MSYS.
+       Reported by Ralf Wildenhues.
+
+       Improve comments in tests `posixsubst*.test'.
+       * tests/posixsubst-data.test: Improve comment explaining why we
+       try also empty match suffix.
+       * tests/posixsubst-extradist.test: Likewise.
+       * tests/posixsubst-ldadd.test: Likewise.
+       * tests/posixsubst-libraries.test: Likewise.
+       * tests/posixsubst-ltlibraries.test: Likewise.
+       * tests/posixsubst-programs.test: Likewise.
+       * tests/posixsubst-scripts.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+       * tests/posixsubst-tests.test: Likewise.
+       Suggested by Ralf Wildenhues.
+
+2010-12-18  Stefano Lattarini  <address@hidden>
+
+       docs: fix blunder in example about python extension modules
+       * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
+       not `quaternion_SOURCES', to declare the sources of python
+       extension module `quaternion.la'.
+
+2010-12-16  Stefano Lattarini  <address@hidden>
+
+       docs: list LTLIBRARIES among Automake primaries
+       * doc/automake.texi (Uniform): List `LTLIBRARIES' among
+       the Automake primaries.
+
+2010-12-13  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Tests defs: requirement 'xsi-shell' must be synced with libtool.
+       * tests/defs (xsi-shell): Add comment telling to keep the
+       XSI-conformance checks in sync with libtool.
+
+2010-12-17  Stefano Lattarini  <address@hidden>
+
+       Minor cleanups in canon7.test.
+       * tests/canon7.test (_foo_bar_SOURCES): Remove libs.c.
+       (configure.in): Remove AC_PROG_CXX.
+
+2010-12-16  Ralf Wildenhues  <address@hidden>
+
+       Avoid false positive in sc_tests_plain_make maintainer-check.
+       * Makefile.am (sc_tests_plain_make): Ensure to only match full
+       `make' words.  Avoid false positive with remake11.test.
+
+2010-12-16  Ralf Wildenhues  <address@hidden>
+
+       Fix canon7.test failure.
+       * tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
+       (lib.h, libd.c, libs.c): Use const for constant strings.
+
+2010-12-16  Ralf Wildenhues  <address@hidden>
+
+       Fix typos in test comments.
+       * tests/posixsubst-data.test, tests/posixsubst-extradist.test,
+       tests/posixsubst-ldadd.test, tests/posixsubst-libraries.test,
+       tests/posixsubst-ltlibraries.test, tests/posixsubst-programs.test,
+       tests/posixsubst-scripts.test, tests/posixsubst-sources.test,
+       tests/posixsubst-tests.test: Fix typos.
+
+2010-12-14  Stefano Lattarini  <address@hidden>
+
+       More uses of AS_HELP_STRING in automake macros.
+       * m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
+       the help message added to the generated configure.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
+       * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
+       Also, bumped all serial numbers of the modified m4 files.
+
+2010-12-14  Stefano Lattarini  <address@hidden>
+
+       Improve tests on generated portions of configure help screen.
+       * tests/help-depend.test: Grepping of configure help screen
+       relaxed to cater for possible line wrapping, and tightened in
+       other respects.
+       * tests/help-depend2.test: Likewise.
+       * tests/help-dmalloc.test: Likewise.
+       * tests/help-lispdir.test: Likewise.
+       * tests/help-maintainer.test: Likewise.
+       * tests/help-multilib.test: Likewise.
+       * tests/help-silent.test: Likewise.
+       * tests/help-upc.test: Likewise.
+       * tests/help-init.test: Grepping of configure help screen
+       tightened.
+
+2010-12-15  Stefano Lattarini  <address@hidden>
+
+       Extended tests on AC_CONFIG_AUX_DIR.
+       * tests/auxdir.test: Enable `errexit' shell flag.  Prefer `$me'
+       over hard-coded test name.  Use proper m4 quoting.  Add trailing
+       `:' command.
+       * tests/auxdir2.test: Likewise.  Try to call automake also with
+       the `-a' option, so that it will not fail for spurious reasons.
+       * tests/auxdir3.test: Add an explanatory comment and a trailing
+       `:' command.
+       * tests/auxdir4.test: Prefer `$me' over hard-coded test name.
+       Make grepping of automake stderr slightly stricter.  Also, now
+       this test just checks about Automake's reaction to unportable
+       auxiliary directory names (and it has been extended in this
+       respect).  Moved the checks about non-existent auxiliary
+       directories to ...
+       * tests/auxdir5.test: ... this new test.
+       * tests/auxdir6.test: New test.
+       * tests/auxdir7.test: Likewise.
+       * tests/auxdir8.test: Likewise.
+       * tests/auxdir9.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-12-06  Stefano Lattarini  <address@hidden>
+
+       Tests: extend checks on remake rules.
+       This adds proper semantical tests (i.e. run make to check the
+       rebuild rules are correctly triggered) in addition to tentative
+       grepping of the generated Makefile.in(s).
+       * tests/remake.test: Enable `errexit' shell flag, and related
+       changes.  Modernize `configure.in'.  Add trailing `:' command.
+       Improve heading comments, and add a reference to new sister test
+       remake1a.test.
+       * tests/remake3.test: Likewise (but with sister test being
+       remake3a.test).
+       * tests/remake2.test: Improve heading comments.  Enable `errexit'
+       shell flag, and related changes.  Modernize `configure.in'.  Make
+       grepping of `Makefile.in' slightly stricter.  Add trailing `:'
+       command.
+       * tests/remake5.test: Also run the `distcheck' target.  Add
+       trailing `:' command.  Use proper m4 quoting in configure.in.
+       * tests/remake4.test: Prefer `$me' over hard-coded test name.
+       * tests/remake7.test: Use the `configure.in' stub created by
+       ./defs, rather than writing it from scratch.
+       * tests/remake6.test: Likewise.  Also, add trailing `:' command,
+       and ensure verbose printing of captured make output.
+       * tests/remake1a.test: New test, sister of remake.test.
+       * tests/remake3a.test: New test, sister of remake3.test.
+       * tests/remake8a.test: New test.
+       * tests/remake8b.test: Likewise.
+       * tests/remake9a.test: Likewise.
+       * tests/remake9b.test: Likewise.
+       * tests/remake9c.test: Likewise.
+       * tests/remake9d.test: Likewise.
+       * tests/remake10a.test: Likewise.
+       * tests/remake10b.test: Likewise.
+       * tests/remake10c.test: Likewise.
+       * tests/remake11.test: Likewise.
+       * tests/remake12.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-12-11  Stefano Lattarini  <address@hidden>
+
+       Improve and extend tests on canonicalization.
+       * tests/canon-name.test: Add trailing `:' command.  When writing
+       configure.in, prefer to use $me instead of hard-coding the test
+       name.
+       * tests/canon3.test: Prefer trailing `:' over trailing `Exit 0'.
+       * tests/canon4.test: Likewise.  Make grepping of Makefile.in
+       stricter.  Improve heading comment, and add reference to ...
+       * tests/canon6.test: ... this new test (sister test of the
+       previous one).
+       * tests/canon.test: Prefer cat + here-doc over echo to append
+       text to configure.in.  Extend grepping of Automake stderr.  Add
+       trailing `:' command.
+       * tests/canon5.test: Likewise.
+       * tests/canon7.test: New file, stress test on canonicalization.
+       * tests/canon8.test: New test, for better coverage (check that
+       the `@' character is not transliterated in canonicalizations).
+       * tests/Makefile.am: Updated.
+
+2010-12-13  Stefano Lattarini  <address@hidden>
+
+       Libobj tests: refer to automake bug tracker for limitations.
+       * tests/libobj15b.test (configure.in): In the comment explaining
+       why an apparently redundant AC_OUTPUT is indeed needed, refer
+       to the relevant entry in the Automake bug tracker rather than
+       describing the bug in detail with a FIXME-style comment.
+       * tests/libobj15c.test: Likewise.
+       * tests/libobj20b.test: Likewise.
+
+       Libobj tests: do not use `##' automake comments in-line.
+       * tests/libobj19.test (Makefile.am): Do not use inline `##'
+       comments in the definition of AUTOMAKE_OPTIONS.
+       * tests/libobj20c.test: Likewise.
+       Report by Ralf Wildenhues.
+
+2010-12-12  Stefano Lattarini  <address@hidden>
+
+       Tests defs: more uses of $top_testsrcdir.
+       * tests/compile6.test: Use `$top_testsrcdir' instead of
+       `$testsrcdir/..'.
+
+2010-11-12  Stefano Lattarini  <address@hidden>
+
+       Tests required tools: also try `-v' option for GNU compilers.
+       * tests/defs.in: In the loop on "$required" tools, for gcc
+       and g++, also run "gcc -v" (resp. "g++ -v"), to get more
+       information, and for consistency with gcj.
+
+2010-11-12  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Tests defs: avoid some useless subshells.
+       * tests/defs: In the loop on "$required" tools: avoid subshells
+       where not needed.
+
+2010-12-09  Stefano Lattarini  <address@hidden>
+
+       Extend tests on AC_LIBOBJ and friends.
+       * tests/aclibobj.test: Removed, superseded by ...
+       * tests/libobj-basic.test: ... this new test, which runs autoconf,
+       ./configure and make, to ensure everything really works.
+       * tests/libobj3.test: Add trailing `:' command.  Escape literal
+       dot in grep regexp.
+       * tests/libobj4.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Use proper m4 quoting.
+       * tests/ltlibobjs.test: Likewise.
+       * tests/libobj5.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Make more robust by using
+       longer filenames to be grepped.
+       * tests/libobj8.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Use the configure.in
+       stub provided by ./defs, rather than writing it from scratch.
+       * tests/libobj2.test: Likewise.  Also, add calls to autoconf,
+       ./configure and make, to ensure everything really works.
+       * tests/libobj7.test: Likewise, and ensure that at least one
+       function listed in AC_REPLACE_FUNCTIONS is truly replaced.
+       * tests/libobj13.test: Make grepping of Automake stderr slightly
+       stricter.  Add trailing `:' command.
+       * tests/libobj12.test: Likewise.  Also, prefer "cat + here-doc"
+       over "echo" to append to Makefile.am, and some cosmetic changes
+       in spacing.
+       * tests/libobj14.test: Call `Exit 1' if sourcing of ./defs fails.
+       Slighty improve m4 quoting.  Add trailing `:' command.
+       * tests/libobj10.test: Add calls to autoconf, ./configure and
+       make, to ensure everything really works.  Also, remove tests that
+       nonexistent source for AC_LIBOBJ cause an Automake failure: this
+       is already checked by ...
+       * tests/libobj15a.test: ... this new test.
+       * tests/libobj15b.test: New test, sister test of libobj15a.test,
+       checks AC_LIBSOURCE instead of AC_LIBOBJ.
+       * tests/libobj15c.test: New test, sister test of libobj15a.test,
+       checks AC_LIBSOURCES instead of AC_LIBOBJ.
+       * tests/libobj11.test: Removed, superseded by ...
+       * tests/libobj16a.test: ... this new test.
+       * tests/libobj16b.test: New test, sister test of libobj16a.test,
+       but using oldish/deprecated idioms.
+       * tests/libobj17.test: New test.
+       * tests/libobj18.test: Likewise.
+       * tests/libobj19.test: Likewise.
+       * tests/libobj20a.test: Likewise.
+       * tests/libobj20b.test: Likewise.
+       * tests/libobj20c.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-12-08  Stefano Lattarini  <address@hidden>
+
+       Test `$(var:suf=rpl)' expansion in special automake variables.
+       * tests/posixsubst-data.test: New test.
+       * tests/posixsubst-extradist.test: Likewise.
+       * tests/posixsubst-ldadd.test: Likewise.
+       * tests/posixsubst-libraries.test: Likewise.
+       * tests/posixsubst-ltlibraries.test: Likewise.
+       * tests/posixsubst-programs.test: Likewise.
+       * tests/posixsubst-scripts.test: Likewise.
+       * tests/posixsubst-sources.test: Likewise.
+       * tests/posixsubst-tests.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-12-07  Stefano Lattarini  <address@hidden>
+
+       Make tests `colon*.test' more "semantic".
+       Prefer running configure and make over grepping the generated
+       files; this is both more correct and less fragile.
+       * tests/colon.test: Made more "semantic", as described above.
+       * tests/colon5.test: Likewise.
+       * tests/colon6.test: Likewise.
+       * tests/colon7.test: Likewise.
+       * tests/colon2.test: Likewise, and improve syncing with sister
+       test `colon3.test'.
+       * tests/colon3.test: Likewise (but with the sister test being
+       `colon2.test' here).
+
+2010-12-10  Ralf Wildenhues  <address@hidden>
+
+       Avoid running installed automake from 'libtool --help'.
+       * tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
+       Together with fixed Libtool, this fixes check-coverage to not
+       invoke installed automake.
+
+2010-12-06  Stefano Lattarini  <address@hidden>
+
+       Separate checks on target overriding into multiple test scripts.
+       * tests/overrid.test: Deleted, its contents separated into ...
+       * tests/override-suggest-local.test: ... this new test ...
+       * tests/override-html.test: ... and this new test ...
+       * tests/override-conditional-1.test: ... and this new test ...
+       * tests/override-conditional-2.test: ... and this new test (still
+       xfailing).
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Updated.
+
+       Enable `set -e' in more tests (plus some tweakings).
+       * tests/implicit.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.
+       * tests/insh2.test: Likewise.
+       * tests/instman2.test: Likewise.
+       * tests/interp.test: Likewise.
+       * tests/interp2.test: Likewise.
+       * tests/library.test: Likewise.
+       * tests/mclean.test: Likewise.
+       * tests/info.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Remove useless chaff from
+       generated Makefile.am.  Add a "FIXME" comment.
+       * tests/include.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Prefer cat + here-doc over
+       echo to append to configure.in.  Make tests more robust by using
+       longer and less common names to grep.  Remove an useless call to
+       echo.  Remove an useless subshell.
+       * tests/header.test: Enable `errexit' shell flag, and related
+       changes.  Use proper m4 quoting.  Add excerpts from the original
+       report of the bug tested for by this script.
+       * tests/gcj.test: Enable `errexit' shell flag, and related
+       changes.  Use proper m4 quoting.  Add trailing `:' command.
+       * tests/gcj3.test: Likewise.
+       * tests/ldflags.test: Likewise.
+       * tests/libtool.test: Likewise.
+       * tests/listval.test: Likewise.
+       * tests/javaprim.test: Likewise, and prefer cat + here-doc over
+       echo to append to configure.in.
+       * tests/javasubst.test: Likewise.
+       * tests/discorver.test: Enable `errexit' shell flag.  Prefer
+       trailing `:' over trailing `Exit 0'.
+       * tests/instdat.test: Enable `errexit' shell flag, and related
+       changes.  Use proper m4 quoting.  Avoid useless subshell.  Prefer
+       cat + here-doc over echo to append to configure.in.
+       * tests/libtool2.test: Enable `errexit' shell flag, and related
+       changes.  Add trailing `:' command.  Use the configure.in
+       stub provided by ./defs, rather than writing it from scratch.
+
+       Modernize, improve and/or tweak some test scripts.
+       * tests/maintclean.test: Use proper m4 quoting.  Add trailing `:'
+       command.
+       * tests/sinclude.test: Likewise, and add a couple of blank lines,
+       for clarity.
+       * tests/make.test: Move setting of `errexit' shell flag earlier in
+       the script (just after inclusion of ./defs).  Use the configure.in
+       stub created by ./defs, rather than writing it from scratch.  Some
+       cosmetic changes in spacing.  Ensure we wait enough time before
+       touching configure.in to trigger the rebuild rules.
+       * tests/makej.test: Use `$me' instead of hard-coding the test
+       name.  Add trailing `:' command.
+       * tests/version7.test: Likewise.
+       * tests/space.test: Enable `errexit' shell flag, and related
+       changes.
+       * tests/makevars.test: Likewise.  Also, prefer trailing `:' over
+       trailing `Exit 0', and be more tolerant of white spaces when
+       grepping Makefile.in.
+
+2010-12-02  Stefano Lattarini  <address@hidden>
+
+       * tests/silent8.test: Use "|| Exit 1" after ". ./defs".
+
+       Enable `set -e' in more tests (plus some tweakings).
+       * tests/mkinstall.test: Enable `errexit' shell flag, and related
+       changes.  Add a trailing `:' command, if needed.
+       * tests/mdate2.test: Likewise.
+       * tests/objc.test: Likewise.
+       * tests/noinst.test: Likewise.
+       * tests/outdir.test: Likewise.
+       * tests/number.test: Likewise.
+       * tests/pluseq.test: Likewise.
+       * tests/req.test: Likewise.
+       * tests/rulepat.test: Likewise.
+       * tests/specflg6.test: Likewise.
+       * tests/spell3.test: Likewise.
+       * tests/parse.test: Likewise, and ...
+       (configure.in): Use the stub created by ./defs, rather than
+       writing it from scratch.  Remove useless calls to AC_PROG_RANLIB
+       and AC_OUTPUT.
+       * tests/mdate4.test: Likewise.
+       * tests/mkinstall.test: Likewise, and ...
+       (configure.in): ... drop useless call to `AC_OUTPUT'.
+       * tests/output.test: Enable `errexit' shell flag, and related
+       changes.  Add a trailing `:' command.
+       (configure.in): Modernize.
+       * tests/output2.test: Likewise.
+       * tests/output3.test: Likewise.
+       * tests/output4.test: Likewise.
+       * tests/mdate3.test: Enable `errexit' shell flag, and related
+       changes.  Prefer `$me' over hard-coded test name.  Do not move
+       non-existent or useless files in the build auxiliary directory.
+       * tests/nodistdir.test: Enable `errexit' shell flag, and related
+       changes.  Prefer trailing `:' over trailing `Exit 0'.
+       * tests/nodist.test: Likewise.  Also, prefer cat + here-doc over
+       echo to create input test files, and do not create useless dummy
+       C source files.
+       * tests/nodist2.test: Likewise.
+       * tests/ppf77.test: Enable `errexit' shell flag, with related
+       changes.  Add a trailing `:' command.  Do not create useless
+       dummy source files.
+       * tests/spelling.test: Enable `errexit' shell flag, with related
+       changes.  Add a trailing `:' command.  Also, grep Automake error
+       message.
+       * tests/specflg3.test: Enable `errexit' shell flag, with related
+       changes.  Avoid unportable use of `-e' option of fgrep.  Prefer
+       trailing `:' over trailing `Exit 0'.  Remove extra empty lines,
+       and cosmetic changes to whitespaces.
+       * tests/obsolete.test: Enable `errexit' shell flag, with related
+       changes.  Improve verbosity.  Other miscellaneous changes.
+
+2010-11-30  Stefano Lattarini  <address@hidden>
+
+       Improve and extend tests on `:=' variable assignments.
+       * tests/colneq.test: Avoid redundant use of variable assignments
+       in Makefile.am.  Use command-line automake options instead of
+       editing AUTOMAKE_OPTIONS in Makefile.am.  Make grepping of the
+       generated Makefile.in slightly stricter.  Add a trailing `:'
+       command.
+       * tests/colneq2.test: Do not create unneeded dummy files.  Run
+       also autoconf, ./configure and make.  Add trailing `:' command.
+       * tests/colneq3.test: New test, similar to colneq.test, but
+       running also autoconf, ./configure and make.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-11-26  Stefano Lattarini  <address@hidden>
+
+       Remove long-deprecated options --Werror and --Wno-error.
+       These options has been deprecated at least since commit
+       "Release-1-6-1b-35-gc037f20", dated 2002-07-06.
+       * automake.in (parse_arguments): Do not recognize anymore options
+       `--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
+       and `-Wno-error'.
+       * tests/werror.test: Update: use `-Werror' instead of `--Werror'.
+       * NEWS: Update.
+
+2010-11-25  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures in `silent*.test' for $CC != gcc
+       In some tests on automake-produced silent rules, we forced the
+       use of gcc depmode to improve testsuite coverage; but this has
+       unsurprisingly led to spurious failures when some non-GNU C
+       compilers were used.  So we are now careful to require GCC in
+       tests that force gcc depmode.
+       From reports by Ralf Wildenhues.
+       * tests/silent5.test: Test removed, its content split into ...
+       * tests/silent-many-generic.test, tests/silent-many-gcc.test: ...
+       these new sister tests, the latter of which forces gcc depmode
+       and lists "gcc" in $required.
+       * tests/silentlex.test: Test removed, its content split into ...
+       * tests/silent-lex-generic.test, tests/silent-lex-gcc.test: ...
+       these new sister tests, the latter of which forces gcc depmode
+       and lists "gcc" in $required.
+       * tests/silentyacc.test: Test removed, its content split into ...
+       * tests/silent-yacc-generic.test, tests/silent-yacc-gcc.test: ...
+       these new sister tests, the latter of which forces gcc depmode and
+       lists "gcc" in $required.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-11-21  Stefano Lattarini  <address@hidden>
+
+       Tests: consistently use "|| Exit 1" after ". ./defs".
+       * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
+       `. ./defs', for consistency with other tests.
+       * tests/autohdr2.test: Likewise.
+       * tests/autohdr3.test: Likewise.
+       * tests/autohdr4.test: Likewise.
+       * tests/cond23.test: Likewise.
+       * tests/cond24.test: Likewise.
+       * tests/cond25.test: Likewise.
+       * tests/cond26.test: Likewise.
+       * tests/cond27.test: Likewise.
+       * tests/cond28.test: Likewise.
+       * tests/cond29.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/cond33.test: Likewise.
+       * tests/cond34.test: Likewise.
+       * tests/cond35.test: Likewise.
+       * tests/cond36.test: Likewise.
+       * tests/cond37.test: Likewise.
+       * tests/cond38.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/cond40.test: Likewise.
+       * tests/cond41.test: Likewise.
+       * tests/cond42.test: Likewise.
+       * tests/cond43.test: Likewise.
+       * tests/cond44.test: Likewise.
+       * tests/cond45.test: Likewise.
+       * tests/dollarvar.test: Likewise.
+       * tests/dollarvar2.test: Likewise.
+       * tests/hfs.test: Likewise.
+       * tests/libobj14.test: Likewise.
+       * tests/percent.test: Likewise.
+       * tests/percent2.test: Likewise.
+       * tests/phony.test: Likewise.
+       * tests/silent.test: Likewise.
+       * tests/silent2.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent6.test: Likewise.
+       * tests/silent7.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/silentcxx.test: Likewise.
+       * tests/silentf77.test: Likewise.
+       * tests/silentf90.test: Likewise.
+       * tests/silentlex.test: Likewise.
+       * tests/silentyacc.test: Likewise.
+
+       Avoid useless cleaning in some `silent*.test' tests.
+       * tests/silentf77.test: Removed useless calls to "make clean"
+       and "make maintainer-clean".
+       * tests/silentf90.test: Likewise.
+       * tests/silent3.test: Removed useless call to "make distclean".
+       * tests/silent4.test: Likewise.
+       * tests/silent9.test: Likewise.
+
+2010-11-19  Ian Lance Taylor  <address@hidden>
+
+       Sync config-ml.in from GCC.
+       * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
+       compiler/flag environment variables.
+
+2010-11-20  Stefano Lattarini  <address@hidden>
+
+       release-stats: account for more generated tests.
+       * Makefile.am (release-stats): Be sure to take into account all
+       the generated tests, by grepping the test scripts to decide which
+       ones of them are automatically generated.
+
+2010-11-20  Stefano Lattarini  <address@hidden>
+
+       Code cleanup after removal of option `--output-directory'.
+       * automake.in ($output_directory): Remove, it's unconditionally
+       defined to `.' and used only ...
+       (generate_makefile): ... in this subroutine, which now has been
+       edited and simplified accordingly.
+
+       Remove obsolete automake option `--output-directory'.
+       This option has been deprecated since version 1.7 (2002/2003).
+       * automake.in ($output_directory): Define to `.' unconditionally.
+       (parse_arguments): Remove handling of equivalent options `-o' and
+       `--output-directory'.
+       * tests/outdir.test: Removed.
+       * tests/no-outdir-option.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+       * NEWS: Updated.
+
+2010-11-19  Stefano Lattarini  <address@hidden>
+
+       Automake::Config: remove extra trailing semicolon.
+       * lib/Automake/Config.in: Remove extra trailing semicolon.
+
+       help4.test: fix botched heading comment.
+       * tests/help4.test: Fixed the heading comment, since it
+       didn't correctly describe what checks the testcase was
+       supposed to perform.
+
+       help2.test: add checks on aclocal too.
+       * tests/help2.test: Check that also `aclocal --version' and
+       `aclocal --help' work with configure.in and acinclude.m4 both
+       broken.
+
+2010-11-19  Stefano Lattarini  <address@hidden>
+
+       New test on repeated automake options.
+       * tests/repeated-options.test: New test, check that automake
+       does not complain on repeated options, nor generate broken or
+       incorrect makefiles.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-11-17  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures of silent-rules tests with Sun Fortran.
+       * tests/silentf77.test: Strip from the make output some verbose
+       messages possibly printed by the SunStudio fortran compilers, to
+       avoid spurious failures.  Add a trailing `:' command.
+       * tests/silentf90.test: Likewise.
+
+2010-11-17  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures of silent5.test with Sun Fortran.
+       * tests/silent5.test: Strip from the make output some verbose
+       messages possibly printed by the SunStudio fortran compilers,
+       to avoid spurious failures.  This bug has been there from the
+       very first version of this test script.
+
+2010-11-16  Stefano Lattarini  <address@hidden>
+
+       Fix regression in colon{5,6}.test (failures on AIX 5.3).
+       * tests/colon5.test: Also substitute address@hidden@' with `$SHELL' when
+       post-processing the generated Makefile.in, to work around a bug
+       of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
+       on the commend line.  Calls to `$MAKE' adjusted accordingly.
+       * tests/colon6.test: Likewise.
+       Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
+       improve and/or extend tests `colon*.test", and reported by Ralf
+       Wildenhues.
+
+2010-11-16  Stefano Lattarini  <address@hidden>
+
+       Fix regression in ansi.test (failure on AIX 5.3).
+       * tests/ansi.test: Remove redundant hackish check done using a
+       hand-postprocessed Makefile.in.  This check worked by setting
+       the `$(SHELL)' macro on the command line of make, but this is
+       not supported by the AIX 5.3 make implementation.
+       This bug has been lurking for a long time, and was activated by
+       commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
+       tests".  Report by Ralf Wildenhues.
+
+2010-11-16  Ralf Wildenhues  <address@hidden>
+
+       backcompat5.test: avoid '##'-style comments inside recipe commands.
+       * tests/backcompat5.test: Remove double-hash comments
+       from makefile rule commands, they are not part of the
+       Automake API.  Fixes testsuite failure with Tru64 make.
+
+       tests: avoid '##'-style comments inside recipe commands.
+       * tests/confh.test, tests/confh8.test: Remove
+       double-hash comments from makefile rule commands, they
+       are not part of the Automake API.
+
+2010-11-14  Ralf Wildenhues  <address@hidden>
+
+       tests: work around dash quoting issue in case statements.
+       * tests/color.test, tests/color2.test: Quote variable in case
+       pattern, to avoid skipping tests with dash 0.5.5.1.
+
+2010-11-16  Peter Rosin  <address@hidden>
+
+       Skip MSVC oriented tests if the shell is not capable.
+       * tests/defs: New required entry 'xsi-shell'.
+       * tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
+       Require a XSI capable shell.
+       Reported by Ralf Wildenhues.
+
+2010-11-15  Peter Rosin  <address@hidden>
+
+       compile: clear the `eat' variable earlier.
+       * lib/compile: Clear the `eat' variable earlier.
+       ($scriptversion): Update.
+       * tests/compile3.test: Prevent regressions.
+
+2010-11-14  Ralf Wildenhues  <address@hidden>
+
+       More stable configure output from sanity check.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Always print check line
+       about ensuring newer files, even if we don't actually need
+       to wait any more.
+
+2010-11-14  Ralf Wildenhues  <address@hidden>
+
+       Rebuild menus in the manual.
+       * doc/automake.texi: Rebuild menus (using ^C ^U ^A in emacs).
+       Thanks to Ian Lance Taylor for the suggestion.
+
+       Fix install-strip when $(STRIP) contains several words.
+       * lib/am/install.am (install-strip): Update comment.  Use
+       separate sub-make invocations for empty and nonempty $(STRIP),
+       to fix quoting issues.
+       * tests/strip2.test, tests/strip3.test: New tests.
+       * tests/Makefile.am (TESTS): Adjust.
+
+2010-11-10  Ralf Wildenhues  <address@hidden>
+
+       Fix yaccdry.test failure: require bison.
+       * tests/yaccdry.test: Require bison.
+       Found by NixOS Hydra.
+
+2010-11-12  Stefano Lattarini  <address@hidden>
+
+       Fix bug in test `backcompat6.test' (MSYS portability).
+       * tests/backcompat6.test (Makefile.am): Grep the output from the
+       test program, rather than diffing it, to avoid spurious failures
+       on MinGW/MSYS due to LF vs. CRLF line endings.
+       Reported by Ralf Wildenhues.
+
+2010-11-13  Stefano Lattarini  <address@hidden>
+
+       Deprecate obsolete macro AM_WITH_REGEX.
+       * m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsolete,
+       and state that it should be removed two years from now.
+       (AM_WITH_REGEX): Raise an m4-time warning of the "obsolete"
+       category when this macro is used.
+       * doc/automake.texi (Public Macros): Move description of
+       `AM_WITH_REGEX' from here ...
+       (Obsolete Macros): ... to here, and declare it as obsolete
+       and "to be removed in a future version".
+       * tests/regex-obsolete.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-11-08  Stefano Lattarini  <address@hidden>
+
+       Improve and extend tests on man pages support.
+       * tests/man.test: Enable `errexit' shell flag, and related changes.
+       Make grepping of generated Makefile.in slightly stricter.
+       * tests/man3.test:  Add trailing `:' command.
+       * tests/man5.test: Prefer cat + here-doc over echo to append to
+       configure.in.
+       * tests/man2.test: Likewise, and add trailing `:' command.
+       * tests/man4.test: More thorough and consistent checking of make
+       error messages.  Place fake `help2man' program in a new `bin'
+       directory rather than in `.'.  Move the checks using the real
+       `help2man' program to ...
+       * tests/man6.test: ... this new test, and extend them.  This test
+       passes with GNU make and Solaris make, still fails with BSD make.
+       * tests/man7.test: New test, extracted from old man4.test, which
+       checks for a bug in maintainer-clean w.r.t. generated manpages.
+       * tests/man8.test: New test, extracted from old man4.test, which
+       checks for a bug in distcheck w.r.t. generated manpages.  Passes
+       with GNU make and Solaris make, still fails with BSD make.
+
+2010-11-08  Stefano Lattarini  <address@hidden>
+
+       Minor improvements and extensions to various tests.
+       * tests/defun.test: Also run autoconf and grep the generated
+       configure to make sure that aclocal truly picks up all the
+       required macros.
+       * tests/compile_f_c_cxx.test: Prefer trailing `:' over trailing
+       `Exit 0'.  Do not create useless dummy source files.  Do not set
+       useless `$(foo_LDADD)' variable in `Makefile.am'.  Do not call
+       useless macro `AC_F77_LIBRARY_LDFLAGS' in `configure.in'.
+       * tests/compile_f90_c_cxx.test: Likewise.
+       * tests/suffix10.test: Slightly stricter grepping of make output.
+       * tests/compile.test: Add trailing `:' command.
+       * tests/defun2.test: Likewise.
+       * tests/vars3.test: Likewise.
+       * tests/vartar.test: Likewise.
+       * tests/vars.test: Likewise.  Also, extend test by checking
+       that the definition of `MY_FLAGS*' variables is preserved in
+       the generated `Makefile.in'.
+       * tests/stamph2.test: Prefer trailing `:' over trailing `Exit 0'.
+       Use proper m4 quoting in `configure.in'.
+
+2010-11-11  Stefano Lattarini  <address@hidden>
+
+       Tests defs: improve messages for skipped tests.
+       * tests/defs: Give meaningful messages about the reasons of a
+       test skip; this is especially useful as this file is run without
+       verbose xtraces on.  Related reorderings in the code and new
+       comments.
+
+2010-11-10  Stefano Lattarini  <address@hidden>
+
+       Tests defs: move static definitions in a new file `defs-static'.
+       The new file is meant to be idempotent w.r.t. multiple inclusions.
+       * tests/defs.in: Removed, its contents split among ...
+       * tests/defs-static.in: ... this new file ...
+       * tests/defs: ... and this new file, including the former.
+       * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add
+       `tests/defs-static'.
+       (AC_CONFIG_LINKS): Add `tests/defs'.
+       * tests/Makefile.am ($(parallel_tests)): Update.
+       ($(instspc_tests)): Likewise.
+       * tests/.gitignore: Update.
+
+       Tests defs: $testsbuilddir is now AC_SUBST'ed.
+       * tests/defs.in ($testsbuilddir): Substitute from @address@hidden
+       Add sanity check on $testsbuilddir, similar to those on
+       $testsrcdir and $top_testsrcdir.
+
+       Tests defs: do not print message "Running test $0" anymore.
+       * tests/defs.in: Printing the message "=== Running test $0" at
+       the beginning of each tests made sense when Automake used the old
+       test-driver, which sent all the output directly to stdout/stderr.
+       Now that the parallel test-driver is used, which saves output of
+       each test in its corresponding log file, that old message is just
+       useless noise.
+
+       Tests defs: rename $curdir -> $testbuilddir
+       * tests/defs.in: Rename $curdir to $testbuildir, for clarity and
+       consistency with $testsrcdir and $top_testsrcdir.
+
+       Tests defs: prefer "$curdir" over "`pwd`".
+       * tests/defs.in: We already save the value of `pwd` in $curdir
+       early in the file, so there no need to recalculate it later, when
+       the current working directory is not changed.
+
+       Tests defs: use `$me' in more error messages.
+       * tests/defs.in: Also use `$me' in error messages referring to
+       missing `defs' or `defs.in', since that variable is now defined
+       before those checks.
+
+       Tests defs: do not use `Exit' where plain `exit' suffices.
+       * tests/defs.in: Use "exit 77" rather than "Exit 77" to skip the
+       test when required libtool/gettext macros are not found, since
+       such skips would take place before the exit trap is installed.
+
+       Tests defs: improve and extends comments.
+       * tests/defs.in: Improve and extends some comments, especially in
+       relation with the changes introduced by the previous reordering.
+
+       Tests defs: various reorderings.
+       * tests/defs.in: Reordered various snippets of code in a
+       clearer way.
+
+2010-11-09  Stefano Lattarini  <address@hidden>
+
+       Fix bug in test `backcompat4.test' (stale autom4te cache).
+       * tests/backcompat4.test: Remove stale autom4te cache directory
+       before re-running aclocal and automake.  Also, since we are at
+       it, be more verbose in displaying contents of generated files,
+       to ease debuggability.
+       Reported by Ralf Wildenhues.
+
+2010-11-07  Stefano Lattarini  <address@hidden>
+
+       Fix a bug in variable concatenation with `+='.
+       * lib/Automake/VarDef.pm (append): Since the content of the
+       "appended-to" variable is going to be unconditionally normalized
+       later, simply separate the appended value with a single whitespace
+       character, instead of trying to be uselessly smarter by using
+       escaped newlines.  This fixes a bug in which extra backslashes
+       where erroneously inserted in the variable's final value.
+       * tests/pluseq11.test: New test, exposing the bug.
+       * tests/Makefile.am (TESTS): Update.
+       Reported by Andy Wingo.
+
+2010-11-07  Stefano Lattarini  <address@hidden>
+
+       Modernize, improve and/or tweak various test scripts.
+       * tests/stamph2.test: Improve m4 quoting in `configure.in', and
+       prefer trailing `:' over trailing `Exit 0'.
+       * tests/syntax.test: Escape literal dots in grep regexps.
+       * tests/copy.test: Enable `errexit' shell flag.  Extend test by
+       checking with `test' utility that the script `install-sh' is
+       copied, but not symlinked.
+       * tests/depdist.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Avoid obsoleted
+       constructs in generated `configure.in'.  Prefer to do our checks
+       by running configure and make over grepping Makefile.in.
+       * tests/target-cflags: Move setting of `errexit' shell flag
+       earlier in the script (just after inclusion of ./defs). Use the
+       `configure.in' stub created by `./defs', rather than writing it
+       from scratch.
+       * tests/target-clash: Do not uselessly run autoconf.
+       * tests/ctarget1.test: Renamed ...
+       * tests/cond-basic.test: ... to this.  Use the `configure.in' stub
+       created by `./defs', rather than writing it from scratch.
+       Move setting of `errexit' shell flag earlier in the script (just
+       after inclusion of ./defs).  Other minor cosmetic changes.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-11-06  Stefano Lattarini  <address@hidden>
+
+       New tests on obsoleted usages of automake/autoconf macros (such
+       as AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT).
+       * tests/backcompat.test: New test script.
+       * tests/backcompat2.test: Likewise.
+       * tests/backcompat3.test: Likewise.
+       * tests/backcompat4.test: Likewise.
+       * tests/backcompat5.test: Likewise.
+       * tests/backcompat6.test: Likewise.
+       * tests/init.test: Extended and improved, esp. by trying more
+       combinations of calls to AC_INIT and AM_INIT_AUTOMAKE with few
+       arguments.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-11-06  Stefano Lattarini  <address@hidden>
+
+       Fix bug in rules for creating vala vapi/header files.
+       * automake.in (lang_vala_finish_target): Add forgotten "fi" in an
+       if control structure in a generated make rules.  Bug introduced
+       by previous commit `v1.11-221-gd7c1679', and revealed by failure
+       of test `vala2.test'.
+
+2010-11-01  Ralf Wildenhues  <address@hidden>
+
+       Fix and document rules to not touch the tree with `make -n'.
+       * doc/automake.texi (Multiple Outputs): Document the problem of
+       modifications during dry-run execution, propose solution.
+       * NEWS: Update.
+       * automake.in (lang_vala_finish_target): Split recipe so the
+       stamp file is not removed with GNU `make -n'.
+       (lang_yacc_target_hook): Separate removal of parser output file
+       and header remaking.
+       * lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
+       passed to make, take care not to remove any files in that case.
+       * lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
+       %STAMP% file from induced remaking of config header.
+       * tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
+       New tests.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-11-05  Stefano Lattarini  <address@hidden>
+
+       Fix potential bug in generated tests `instpc-*.test'.
+       This bug is due to the changes introduced by the recently-merged
+       "tests-init" branch.  In that branch, `tests/defs' didn't define
+       anymore `$srcdir', instead defining directly `$testsrcdir'; but
+       the generated tests were using `$srcdir', hence the bug.
+       Luckily, since the Automake parallel test driver automatically
+       exports `srcdir' to a proper value, that prevented the bug from
+       manifesting itself.
+       * tests/Makefile.am ($(instspc_tests)): In the generated test
+       scripts, use `$testsrcdir', not `$srcdir'.
+
+2010-11-03  Stefano Lattarini  <address@hidden>
+
+       Overhauled and modularized tests in `instspc.test'.
+       The test `instspc.test' was way too big and fragile.  Its running
+       time was very long.  It also produced a log that was nearly
+       unreadable due to its length, making it very difficult to find
+       out the reason for failures.
+       Also, it was too much monolithic, with a single (maybe spurious)
+       failure in a corner case causing the whole test to fail (even if
+       everything worked as expected in the other 99% of cases).
+       The present change should solve these problems, by separating
+       `instspc.test' into many smaller, self-contained, auto-generated
+       tests.
+       * tests/instspc.test: Removed.
+       * tests/instspc-tests.sh: New script, fulfilling a double role:
+       1. it generates a Makefile.am snippet `tests/instspc-tests.am',
+       containing the definition of a list of new tests which will take
+       over the older `instspc.test', and
+       2. it is sourced by said generated tests with proper parameters
+       pre-set, to run the "meat" of the checks.
+       This apparent abuse is indeed required because the test generation
+       code and test execution code are inevitably intertwined.
+       * tests/Makefile.am ($(srcdir)/instspc-tests.am): Include this
+       snippet, which (among the other things) defines ...
+       (instspc_tests): ... this new macro, containing the list of the
+       newly generated `instspc*.test' tests, and ...
+       (instspc_xfail_tests): ... this new macro, containing the list
+       of the `instspc*.test' tests expected to fail.
+       ($(instspc_tests)): New rule, generates the `instspc*.test' tests.
+       ($(instspc_tests:.test=.log)): New rule, registers the dependency
+       of all `instspc*.test' tests on the `instspc-tests.sh' script.
+       (TESTS): Add `$(instspc_tests)', remove `instspc.test'.
+       (XFAIL_TESTS): Add `$(xfail_instspc_tests)'.
+       (EXTRA_DIST): Distribute instspc-tests.sh.
+       (MAINTAINERCLEANFILES): Added $(instspc_tests).
+       Other minor cosmetic changes.
+       * bootstrap: Generate instspc-tests.am.
+       * tests/.gitignore: Updated.
+
+2010-11-01  Ralf Wildenhues  <address@hidden>
+
+       Add FAQ entry for bug reporting instructions.
+       * doc/automake.texi (Reporting Bugs): New section.
+       (Introduction): Refer to it.
+
+2010-10-07  Peter Rosin  <address@hidden>
+
+       depcomp: add new one-pass depmode for MSVC 7 and later.
+       * lib/depcomp: Add new depmodes 'msvc7' and 'msvc7msys' which
+       make use of the -showIncludes option added in MSVC 7.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Handle the new depmodes
+       similarly to 'msvisualcpp' and 'msvcmsys' as MSVC does not
+       support the -o option.
+
+2010-10-04  Stefano Lattarini  <address@hidden>
+
+       Add support for newer python versions.
+       * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
+       _AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
+       line and fix indentation.
+       * THANKS: Updated.
+       From a report by Thomas Klausner.
+
+       Add test for `AM_WITH_DMALLOC' macro.
+       * tests/dmalloc.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+       Fix nits and bugs in tests `help*.test'.
+       * tests/help4.test: Fix broken sed commands used to strip `-W...'
+       flags away from "$AUTOMAKE" and "$ACLOCAL".
+       * tests/help3.test: Likewise, and fix a botched comment.
+       * tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
+       instead of "$AUTOMAKE ... && Exit 1", for consistency and to
+       please maintainer-check.
+       * tests/help2.test: Likewise.
+
+2010-10-03  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Improve tests `help*.test' (also fixes maintcheck failures).
+       * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
+       flags stripped away rather than hard-coded `automake-$APIVERSION',
+       to better honour user-overrides.  Similarly for aclocal.
+       * tests/help2.test: Likewise.
+       * tests/help3.test: Likewise.
+       * tests/help4.test: Likewise.
+
+2010-10-03  Ralf Wildenhues  <address@hidden>
+
+       tests: fix ar-lib.test for echo that interprets backslashes.
+       * tests/ar-lib.test: Use printf instead of echo.  Avoid test -a.
+       More robust quoting.
+
+2010-10-03  Ralf Wildenhues  <address@hidden>
+
+       maintainer-check coverage for variables before rules.
+       * Makefile.am (sc_ensure_testsuite_has_run): Suggest keeping
+       around the test directories.
+       (sc_tests_makefile_variable_order): New rule with a heuristic to
+       catch ordering violations.
+
+       Document and fix expansion of variables before rules.
+       * doc/automake.texi (General Operation): Document that variables
+       are expanded before rules.
+       * lib/am/check.am (am__check_post): Reword a bit so it does not
+       get matched as a rule.
+       Suggestion by Ben Pfaff.
+
+2010-10-02  Ralf Wildenhues  <address@hidden>
+
+       Coverage and minor fixes for variable typo detection.
+       * automake.in (check_typos): Remove `EXTRA_' prefix when
+       computing canonical name.
+       * tests/vartypo2.test, tests/vartypos.test: New tests.
+       * tests/Makefile.am (TESTS): Update.
+
+       Implement EXTRA_maude_DEPENDENCIES for programs and libraries.
+       * automake.in (handle_programs, handle_libraries)
+       (handle_ltlibraries): Mark EXTRA_*_DEPENDENCIES as recognized.
+       * doc/automake.texi (Linking, Program and Library Variables)
+       (LIBOBJS): Document EXTRA_*_DEPENDENCIES.
+       * lib/am/library.am (%LIBRARY%): Also depend on
+       $(EXTRA_%XLIBRARY%_DEPENDENCIES).
+       * lib/am/ltlibrary.am (%LTLIBRARY%): Also depend on
+       (%XLTLIBRARY%_DEPENDENCIES).
+       * lib/am/program.am (%PROGRAM%%EXEEXT%): Also depend on
+       $(EXTRA_%XPROGRAM%_DEPENDENCIES).
+       * tests/extradep.test, tests/extradep2.test: New tests.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       Suggested by Eric Blake.
+
+       tests: avoid running into timing issues due to sanity change.
+       * tests/acloca10.test, tests/acloca18.test, tests/aclocal9.test:
+       Insert strategic sleep before aclocal reruns, to ensure files
+       are newer.
+       * tests/python11.test: Use --force for repeated autotools runs.
+       Reports from the NixOS Hydra build daemon via Ludovic Courtès.
+
+       Fix timestamp issues by ensuring configure takes at least a second.
+       * m4/sanity.m4 (AM_SANITY_CHECK): If we didn't sleep here,
+       start a sleep in the background and wait for it to finish
+       before creating config.status, hopefully fixing all spurious
+       testsuite failures involving botched time stamps.
+       * NEWS: Update.
+       Reports by Ludovic Courtès, Peter Breitenlohner, and others.
+
+2010-10-02  Ralf Wildenhues  <address@hidden>
+
+       Revert "parallel-tests: avoid command-line length limit issue."
+       This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
+       because it re-opened the bug fixed by v1.11-10-g218e678.
+
+       2010-09-07  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: avoid command-line length limit issue.
+       * automake.in (handle_tests): New argument $makefile, new
+       substitution %MAKEFILE%.
+       (generate_makefile): Adjust.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
+       sanitized TEST_LOGS value as makefile snippet on standard
+       input to $(MAKE), to avoid exceeding the command line limit on
+       w32 (MSYS).
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+
+2010-09-26  Stefano Lattarini  <address@hidden>
+
+       Extend tests on `--help' and `--version' options.
+       * tests/help.test: Create a new empty directory and chdir into
+       it, rather than removing already present files.  Run the aclocal
+       and automake wrapper scripts directly, instead of relying on
+       $AUTOMAKE and $ACLOCAL.  Be sure to correctly match literal dots
+       in aclocal's and automake's stderr.  Add a trailing `:' command.
+       * tests/help2.test: New test, checking that options `--help' and
+       `--version' works in directories with broken `configure.in'.
+       * tests/help3.test: New test, checking that options `--help' and
+       `--version' take precedence on the other options.
+       * tests/help4.test: New test, checking that the first among the
+       `--help' and `--version' options to be specified on the command
+       line wins.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-09-25  Stefano Lattarini  <address@hidden>
+
+       Testsuite: Use `$PATH_SEPARATOR', not `:', when extending PATH.
+       * tests/compile2.test: Do no uselessly (implicitly) repeat the
+       computation of PATH_SEPARATOR again.
+       * tests/instmany-mans.test: Use `$PATH_SEPARATOR', not `:', when
+       extending/redefining PATH.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       * tests/man4.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/mmodely.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/txinfo30.test: Likewise.
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Updated.
+       * Makefile.am (sc_tests_PATH_SEPARATOR): New maintainer check.
+       (syntax_check_rules): Updated.
+
+       Testsuite: new variables `$PATH_SEPARATOR' and `$APIVERSION'.
+       * tests/defs.in ($APIVERSION):  New AC_SUBST'd variable.
+       ($ACLOCAL, $AUTOMAKE): Use it.
+       ($PATH_SEPARATOR):  New AC_SUBST'd variables.
+       ($PATH): Use it.
+
+2010-09-22  Stefano Lattarini  <address@hidden>
+
+       Manual: be more agnostic w.r.t. version control system used.
+       * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
+       directories as a type of probably-unwanted files that are copied
+       regardless when adding directories to EXTRA_DIST.
+       (The dist Hook): Show a dist-hook example which removes Subversion
+       `.svn' private directories from distdir, rather than CVS private
+       directories.
+       (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
+       the version control system used.
+
+       Manual: index refer to target "git-dist", not "cvs-dist".
+       * doc/automake.texi (General Operation): Index the non-standard
+       example about "git-dist" under the "git-dist" label, not under
+       the "cvs-dist" one.
+
+       Perl modules: remove references to "Automake CVS repository".
+       * lib/Automake/Channels.pm: Update comments to refer to "Automke's
+       git repository" rather than to "Automake's CVS repository".
+       * lib/Automake/Configure_ac.pm: Likewise.
+       * lib/Automake/FileUtils.pm: Likewise.
+       * lib/Automake/Struct.pm: Likewise.
+       * lib/Automake/XFile.pm: Likewise.
+       * lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git
+       branches" rather than "CVS branches".
+
+       Remove obsolete .cvsignore files.
+       * .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore,
+       lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore,
+       m4/.cvsignore, tests/.cvsignore: Files deleted.  Even when using
+       savannah's CVS readonly mirror there's no way to commit back to
+       the real repository, so this files are not worth maintaining or
+       keeping around.
+
+2010-09-21  Stefano Lattarini  <address@hidden>
+
+       * m4/dmalloc.m4: Bump serial number and copyright years.
+
+2010-09-20  Stefano Lattarini  <address@hidden>
+
+       Fix broken link in `AM_WITH_DMALLOC' help screen.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Refer only to the dmalloc site
+       `http://www.dmalloc.com', not to the dmalloc tarball there (which
+       seems to have been removed, substituted by multiple release
+       tarballs now).
+
+2010-09-21  Peter Rosin  <address@hidden>
+
+       compile: implement library search to support MSVC static linking
+       * lib/compile (func_cl_wrapper): Implement library search and
+       -static option so that the user can select whether to prefer
+       dll import libraries or static libraries.  This enables MSVC to
+       link against dlls generated by libtool without requiring libtool
+       or workarounds such as -lfoo.dll etc.  Makes the tests/static.at
+       test case in libtool pass.
+       * tests/compile3.test: Don't trip up if there happens to exist
+       a "foo" library in the library search path.
+       * tests/compile6.test: New test, verifying the library search.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-09-17  Eric Blake  <address@hidden>
+
+       Avoid triple-space after period.
+       * automake.in (handle_single_transform): Avoid 3 spaces at
+       sentence end.
+       * ChangeLog.03: Likewise.
+       * lib/Automake/ChannelDefs.pm: Likewise.
+       * lib/Automake/Channels.pm (_print_message): Likewise.
+       * lib/Automake/Rule.pm (rule): Likewise.
+       * lib/Automake/Variable.pm (var): Likewise.
+       * lib/am/distdir.am: Likewise.
+       * tests/insthook.test: Likewise.
+
+2010-09-15  Stefano Lattarini  <address@hidden>
+
+       Test automake-generated portions of configure help screen.
+       * tests/help-depend.test: New test.
+       * tests/help-depend2.test: Likewise.
+       * tests/help-dmalloc.test: Likewise.
+       * tests/help-init.test: Likewise.
+       * tests/help-lispdir.test: Likewise.
+       * tests/help-maintainer.test: Likewise.
+       * tests/help-multilib.test: Likewise.
+       * tests/help-regex.test: Likewise.
+       * tests/help-silent.test: Likewise.
+       * tests/help-upc.test: Likewise.
+       * tests/mmode.test: Remove tests on `configure --help' output,
+       they are superseded by tests in `help-maintainer.test'.
+       * tests/Makefile.am (TESTS): Update.
+
+2010-09-14  Stefano Lattarini  <address@hidden>
+
+       * tests/README: Don't put GCS mandated tools in $required.
+
+2010-09-13  Ralf Wildenhues  <address@hidden>
+
+       * HACKING: Hint at old commits with `git describe' output.
+
+2010-09-14  Stefano Lattarini  <address@hidden>
+
+       Prefer `$(am__cd)' to plain `cd' in our Makefiles.
+       * Makefile.am (recheck, dist-hook, git-dist, path-check, fetch)
+       (release-stats): Use `$(am__cd)' rather than plain `cd'.
+       * tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise.
+
+2010-09-12  Stefano Lattarini  <address@hidden>
+
+       Fix regression in test `colon4.test'.
+       * tests/colon4.test: Fix botched editing to `configure.in'
+       that made the test useless.  Since we are at it, improve
+       comments and make grepping of generated Makefile.in slightly
+       stricter.
+       Regression introduced by change "Modernize, improve and/or
+       extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
+
+2010-09-08  Stefano Lattarini  <address@hidden>
+
+       Do not require "gzip" explicitly in tests.
+       The gzip utility is simply expected to be present on any decent
+       target system for Automake.  So it's pointless to put it in
+       $required.
+       * tests/install2.test ($required): Do not require "gzip".
+       * tests/lex3.test: Likewise.
+       * tests/pr9.test: Likewise.
+       From a suggestion by Ralf Wildenhues.
+
+2010-09-09  Stefano Lattarini  <address@hidden>
+
+       Use AS_HELP_STRING in AM_SILENT_RULES.
+       * m4/silent.m4 (AM_SILENT_RULES): Use `AS_HELP_STRING' to format
+       help message regarding configure options `--enable-silent-rules'
+       and `--disable-silent-rules'.  Also throw in a couple of cosmetic
+       changes in the related `case' statement (indentation, balancing
+       of parentheses).
+       * THANKS: Update.
+       From a report by Jeff A. Daily.
+
+2010-09-08  Stefano Lattarini  <address@hidden>
+
+       Make some `confh*.test' tests more "semantic" (plus tweakings).
+       * tests/confh.test: Run "autoconf", "configure" and "make check",
+       instead of munging/grepping the generated `Makefile.in'.
+       * tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
+       white spaces.  Do not create useless dummy source file `foo.c'
+       and useless dummy header file `acconfig.h'.
+       (configure.in): Remove superfluous call to `AC_OUTPUT'.
+       * tests/confh6.test: Add trailing `:' command.
+       * tests/confh7.test: In comments, add reference to ...
+       * tests/confh8.test: ... this new test, "semantic" sister
+       of `confh7.test'.
+       * tests/Makefile.am (TESTS): Updated.
+       Prompted by a report from Ralf Wildenhues.
+
+2010-09-08  Stefano Lattarini  <address@hidden>
+
+       Remove useless whitespace padding in XFAIL_TESTS definition.
+       * tests/Makefile.am (XFAIL_TESTS): Remove whitespace padding.
+
+2010-09-07  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: avoid command-line length limit issue.
+       * automake.in (handle_tests): New argument $makefile, new
+       substitution %MAKEFILE%.
+       (generate_makefile): Adjust.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
+       sanitized TEST_LOGS value as makefile snippet on standard
+       input to $(MAKE), to avoid exceeding the command line limit on
+       w32 (MSYS).
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+
+       Posix 2008 requires make to set errexit.
+       * lib/am/check.am: Update comment.
+
+2010-09-06  Stefano Lattarini  <address@hidden>
+
+       Tests defs: remove variable $testaclocaldir.
+       * tests/defs.in ($testaclocaldir): Removed.
+       * tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
+       `$testaclocaldir'.
+
+       Tests defs: $srcdir and $top_srcdir renaming.
+       * tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
+       * tests/Makefile.am ($(parallel_tests)): Generation of derived
+       tests updated.
+
+       Tests defs: new variable $top_testsrcdir.
+       * tests/defs.in ($top_testsrcdir): Define unconditionally
+       to @address@hidden  Use it throughout.
+       * tests/ar-lib.test: Use `$top_testsrcdir' instead of
+       `$testsrcdir/..'.
+       * tests/auxdir.test: Likewise.
+       * tests/compile.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/compile3.test: Likewise.
+       * tests/compile5.test: Likewise.
+       * tests/mdate6.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/txinfo22.test: Likewise.
+
+       Tests defs: $srcdir is unconditionally substituted.
+       * tests/defs.in ($srcdir): Define unconditionally to @address@hidden
+       Remove code for $srcdir normalization, which is now useless.
+
+2010-09-02  Stefano Lattarini  <address@hidden>
+
+       Tests defs: make spacing more consistent.
+       * tests/defs.in: Make spacing more consistent in indentation.
+       Especially, indent using only spaces, not tabs.  Also, move
+       a comment to a better position.
+
+       Improve code for requiring libtool and gettext in tests.
+       * tests/defs.in: Stricter (and more correct) detection of wheter
+       libtool, libtoolize and/or gettext are in $required.
+
+
+2010-08-27  Stefano Lattarini  <address@hidden>
+
+       Fix bug in test missing6.test.
+       * tests/missing6.test: Fix the hack used to edit `configure.in',
+       to avoid producing a configure script that breaks with shells
+       that do not support $LINENO.  Also throw in a couple of cosmetic
+       changes.
+
+2010-09-02  Peter Rosin  <address@hidden>
+
+       Make ar-lib support backslashed files in archives.
+       * lib/ar-lib: If an archive member contains a backslash, make sure
+       it is escaped when the archive member is extracted.
+       * tests/ar-lib.test: Test the above.
+
+2010-08-31  Peter Rosin  <address@hidden>
+
+       Do file name conversion for object files in the compile wrapper.
+       * lib/compile (func_cl_wrapper): Do file name conversion for object
+       files (i.e. extensions .obj, .OBJ, .o and .O) if needed.
+       * tests/compile4.test: Test the above.
+
+2010-08-21  Ralf Wildenhues  <address@hidden>
+
+       Speed up removal of auxiliary linker output files for ltlibraries.
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Rewrite using just
+       one `rm' invocation.
+       Report by Bob Friesenhahn.
+
+       Improve robustness of mdate-sh script.
+       * lib/mdate-sh: Sanitize zsh behavior on startup, to ensure
+       $ls_command is word-split properly upon invocation.
+       (error): New function.
+       (main): Use it.  Improve error checking to avoid endless loop
+       in case $ls_command gave bogus output.  Fix eval quotation.
+       * tests/mdate6.test: New test, to expose eval quotation error.
+       * tests/Makefile.am: Update.
+
+2010-08-18  Stefano Lattarini  <address@hidden>
+
+       Fix potential regressions in depcomp{3,5}.test.
+       * tests/depcomp3.test: Do not uselessly escape the character `$'
+       in makefile rules, when it's used to expand a make macro.
+       * tests/depcomp5.test: Likewise.
+
+2010-08-17  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Docs: clarify how to avoid automatic dependencies tracking.
+       * doc/automake.texi (Automatic dependency tracking): Mention that
+       automatic dependencies tracking is enabled by default, but that
+       the package developer can disable it altogether.  Add a reference
+       to the proper section for a more in-depth explanation.
+
+       Fix typo in manual (`Makefile.in' instead of `Makefile.am').
+       * doc/automake.texi (Automatic dependency tracking): Fix typo.
+
+2010-08-16  Bruno Haible  <address@hidden>
+
+       Don't hide the table of contents.
+       * doc/automake.texi: Move the table of contents to the beginning.
+
+2010-08-16  Peter Rosin  <address@hidden>
+
+       Optimize compile script on MSYS.
+       * lib/compile (func_file_conv): Add new argument 'lazy' which
+       takes an optional list of conversion types where the requested
+       conversion isn't needed.
+       (func_cl_wrapper): Take advantage of the above for cases where
+       MSYS is doing the conversion for us.
+       Suggested by Ralf Wildenhues.
+
+2010-08-16  Peter Rosin  <address@hidden>
+
+       Support more C++ file extensions for MSVC in the compile script.
+       * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
+       file extension as C++, unless it's given a hint. So hint about
+       .cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on
+       .c, .cpp, .CPP, .lib, .LIB and .Lib files.
+       * tests/compile3.test: Test the C++ hinting.
+
+2010-08-12  Peter Rosin  <address@hidden>
+
+       Enable the use of "link -lib" as the wrapped archiver.
+       * lib/ar-lib: Enable the use of "link -lib" as the wrapped
+       archiver, as well as allowing some other options to be passed
+       through to the wrapped archiver.
+       * tests/ar-lib.test: Test the above.
+
+2010-08-10  Stefano Lattarini  <address@hidden>
+
+       Tweak and/or extend some `acloca*.test' tests.
+       * tests/aclocal8.test:  Ensure verbose printing of captured
+       output.
+       * tests/aclocal.test: Likewise.  Also, add trailing `:'
+       command.
+       * tests/acloca19.test: Likewise.
+       * tests/aclocal5.test: Add trailing `:' command, and prefer
+       `$me' over hard-coded test name.
+       * tests/aclocal6.test: Likewise.
+       * tests/aclocal18.test: Add trailing `:' command, and make
+       some grepping slightly stricter.
+       * tests/acloca14.test: Likewise.  Also, prefer `diff' over
+       `cmp', and add some "cosmetic" blank lines.
+
+2010-08-09  Stefano Lattarini  <address@hidden>
+
+       Tweak and extend tests `pr[!0-9]*.test'.
+       * tests/primary3.test: Add trailing `:' command.
+       * tests/primary.test: Make grepping of Automake's stderr stricter.
+       Also, add trailing `:' command, and cosmetic changes in spacing.
+       * tests/primary2.test: Likewise.
+       * tests/prefix.test: Enable `errexit' shell flags, and related
+       changes.  Add a trailing `:' command.
+       * tests/proginst.test: Likewise.
+
+       Modernize, improve and extend tests for PR (`pr[0-9]*.test').
+       * tests/pr2.test: Add trailing `:' command.
+       * tests/pr229.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/pr300-prog.test: Likewise, plus cosmetic changes in
+       spacing.
+       * tests/pr300-lib.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise, and ensure verbose printing
+       of captured make stdout.
+       * tests/pr211.test: Add trailing `:' command.  Also, use the
+       `configure.in' stub created by ./defs, rather than writing it
+       from scratch.
+       * tests/pr204.test: Likewise, plus cosmetic spacing changes.
+       * tests/pr287.test: Likewise, and move setting of `errexit' shell
+       flag earlier in the script (just after inclusion of ./defs).
+       * tests/pr220.test: Make grepping of Automake's stderr stricter.
+       Also, add trailing `:' command, and cosmetic changes in spacing.
+       * tests/pr224.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Do not export
+       `CC=gcc' to configure explicitly (it's already exported globally
+       in ./defs, since we have "gcc" in $required).  Use the stub for
+       `configure.in' created by ./defs, rather than writing it from
+       scratch.  Do not create dummy files required by "gnu" mode (e.g.
+       README, NEWS), since we run automake in foreign mode anyway.
+       * tests/pr72.test: Enable `errexit' shell flags, and related
+       changes.  Extend existing checks a bit.
+       * tests/pr9.test: Likewise.  Also, avoid obsolescent constructs in
+       the generated `configure.in', and extend existing checks over the
+       generated tarball a bit.
+       * tests/pr87.test: Enable `errexit' shell flags, and related
+       changes.  Add a trailing `:' command.  Also, do not create dummy
+       files required by "gnu" mode (e.g. README, NEWS), since we run
+       automake in foreign mode anyway.
+       * tests/pr243.test: Avoid obsolescent constructs in the generated
+       `configure.in'.  Enable the `errexit' shell flag, and related
+       changes.  Cosmetic changes to spacing, add trailing `:' command,
+       and add a "FIXME" comment.
+       * tests/pr266.test: Likewise, and add explicit command line switch
+       `--enable-dependency-tracking' to the ./configure call.
+       * tests/pr279.test: Avoid obsolescent constructs in the generated
+       `configure.in'; also, use the `configure.in' stub created by
+       ./defs, rather than writing it from scratch.  Enable `errexit'
+       shell flag, and related changes.  Add trailing `:' command.
+       * tests/pr279-2.test: Likewise, and make grepping of Makefile.in
+       stricter.
+       * tests/pr307.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Escape literal
+       dots in grep regular expressions.  Also, add a trailing `:'
+       command, and cosmetic changes to spacing.
+
+       Tests for PR: add excerpts from original bug report, for clarity.
+       * tests/pr2.test: Ditto.
+       * tests/pr9.test: Likewise.
+       * tests/pr72.test: Likewise.
+       * tests/pr87.test: Likewise.
+       * tests/pr211.test: Likewise.
+       * tests/pr220.test: Likewise.
+       * tests/pr224.test: Likewise.
+       * tests/pr229.test: Likewise.
+       * tests/pr243.test: Likewise.
+       * tests/pr266.test: Likewise.
+       * tests/pr279.test: Likewise, and tell to keep it in sync
+       with its sister test.
+       * tests/pr279-2.test: Likewise.
+
+2010-08-08  Stefano Lattarini  <address@hidden>
+
+       Tweak, extend and improve tests `cond[a-z]*.test'.
+       * tests/condd.test: Add trailing `:' command.  Typofix in
+       comment.
+       * tests/condhook.test: Make sure target `install-data-hook' is
+       not called by `make install', but that data files are installed.
+       Use proper m4 quoting in configure.in. Add trailing `:' command.
+       * tests/condhook2.test: New test, sister test of condhook, with
+       inverted semantic.
+       * tests/condinc2.test: Use proper m4 quoting in configure.in.
+       Prefer trailing `:' command over trailing `Exit 0'.
+       * tests/condman2.test: Enable errexit shell flag, and related
+       changes.  Add trailing `:' command.
+       * tests/condman.test: Likewise.  Also, do not create useless
+       dummy manpages, and use proper m4 quoting in configure.in.
+       * tests/condman3.test: New test, similar to condman.test, but
+       it also runs ./configure and "make install", and check the
+       installed files.
+       * tests/Makefile.am (TESTS): Updated.
+
+       Modernize, improve and/or extend tests `colon*.test.
+       * tests/colon.test: Rely on the `configure.in' stub created by
+       `./defs', rather than writing one from scratch.  Do not create
+       a useless dummy file.  Add trailing `:' command.
+       * tests/colon4.test: Enable the `errexit' shell flag, and
+       related changes.  Rely on the `configure.in' stub created by
+       `./defs', rather than writing one from scratch.
+       * tests/colon7.test: Enable `errexit' shell flag, and related
+       changes.  Improve the generated `configure.in' file.  Add
+       trailing `:' command.
+       * tests/colon2.test: Likewise.  Also, add some new checks.
+       * tests/colon5.test: Improve the generated `configure.in' file.
+       Add new, much deeper checks.  Add trailing `:' command.
+       * tests/colon6.test: Likewise.
+       * tests/colon3.test: Add trailing `:' command.  Remove useless
+       comments and echos.  Improve the generated `configure.in' file.
+       make some grepping tests stricter.  Add a "FIXME" comments about
+       planned improvements.
+
+       Improve and extend tests `asm*.test'.
+       * tests/asm.test: Use configure.in stub generated by ./defs,
+       and avoid obsoleted autoconf constructs.  Make grepping of
+       Automake stderr stricter.  Do not create useless source file.
+       Improve verbose messages.  Minor cosmetic changes.  Tell to
+       keep it in sync with other sister tests asm*.test.
+       * tests/asm2.test: Likewise.
+       * tests/asm3.test: Likewise.
+
+       Modernize, improve and/or extend test scripts `conf*.test'.
+       * tests/confh5.test: Cosmetic changes.
+       * tests/conff.test: Likewise.
+       * tests/confdeps.test: Likewise.
+       * tests/conflnk.test: Likewise.
+       * tests/conflnk2.test: Likewise.
+       * tests/confsub.test: Likewise.
+       * tests/confvar.test: Likewise, and make grepping of Makefile.in
+       stricter.
+       * tests/confvar2.test: Likewise.
+       * tests/conflnk3.test: Cosmetic changes.  Re-enable a temporarily
+       disabled test (which didn't work with autoconf <= 2.59, but now we
+       are requiring autoconf 2.62, so...)
+       * tests/conflnk4.test: Cosmetic changes, and extend existing tests
+       accordingly to "TODO" comments.
+       * tests/conff2.test: Make grepping of Automake's stderr stricter.
+       Add some comments explaining why we don't use the `configure.in'
+       stub preset be ./defs.
+       * tests/confh.test: Use the `configure.in' stub created by ./defs,
+       rather than writing one from scratch, and do not call AC_OUTPUT.
+       Enable `errexit' shell flag, and related changes.  Prefer diff over
+       cmp to compare text files. Prefer perl over sed to fetch the value
+       of $(DIST_COMMON) from Makefile.in.  Make grepping of the contents
+       of $(DIST_COMMON) stricter.
+       * tests/confh4.test: Use the `configure.in' stub created by ./defs,
+       rather than writing one from scratch.  Make grepping of Makefile.in
+       stricter.
+       * tests/confh5.test: Make grepping of `config.h' stricter.  Add a
+       comment.
+       * tests/configure.test: Avoid obsolescent constructs in generated
+       `configure.ac'.  Do not write `configure.in' two times.  Escape
+       literal dots in grep regular expressions.
+       * tests/confincl.test:  Enable `errexit' shell flag, and related
+       changes.  Prefer fgrep over grep.  Other cosmetic changes.
+       * tests/config.test: Renamed to ...
+       * tests/confh6.test: ... this.  Fix m4 quoting in `configure.in',
+       and make grepping of `config.h' and `config.h.in' stricter.
+       * tests/conf2.test: Renamed ...
+       * tests/confh7.test: ... to this.  Use the `configure.in' stub
+       created by ./defs, rather than writing one from scratch.  Try to
+       run the checks both with and without AC_PROG_CC and AC_OUTPUT in
+       `configure.in'.
+       * tests/Makefile.am (TESTS): Updated.
+
+       Minor improvements and fixes in tests `depcomp*.test'.
+       * tests/depcomp.test: Do not create useless dummy source files.
+       Add a trailing `:' command.
+       * tests/depcomp2.test: Use `unset' on the CFLAGS variable to ensure
+       it's not in in the environment, rather than exporting it with an
+       empty value.  Do not pass CC=gcc to configure, as that's already
+       done in ./defs since we have gcc in $required.  Ensure verbose
+       printing of captured stderr, and normalize its checking.  Add a
+       trailing `:' command.
+       * tests/depcomp3.test: Quote literal dots and dollar characters in
+       grep regexps.  Always use `: >' rather than `touch' to create empty
+       files.  Explicitly declare phony targets as such in the created
+       Makefile.am.  Add a trailing `:' command.
+       * tests/depcomp4.test: Quote literal dots and dollar characters in
+       grep regexp.  Explicitly declare phony targets as such in the
+       created Makefile.am.  Ensure verbose printing of captured makes'
+       stoud/stderr.  Add a trailing `:' command.
+       * tests/depcomp5.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Quote literal dots
+       and dollar characters in grep regexps.  Explicitly declare phony
+       targets as such in the created Makefile.am.  Add a trailing `:'
+       command.
+       * tests/depcomp6.test: Consistently use m4 quoting in the generated
+       configure.in.  Cosmetic fixes to spacing.  Make the "dummy" `if'
+       statement required by OpenBSD's sh `set -e' more robust, and add
+       explanatory comments to it.
+       * tests/depcomp7.test: Likewise, and add  a trailing `:' command.
+
+       Separate failing part of test `all.test'.
+       * tests/all.test: Keep only (x)failing part of the test.  Working
+       checks moved out to ...
+       * tests/all2.test: ... this new test.
+       * tests/Makefile.am (TESTS): Updated.
+
+       Modernize, improve and extend tests `subobj*.test'.
+       * tests/subobjname.test:  Add trailing `:' command.
+       * tests/subobj.test: Make grepping of `Makefile.in' stricter.
+       Escape literal dots in grep regexps.
+       * tests/subobj2.test:  Add trailing `:' command.  Do not use the
+       unportable fgrep option `-e'.
+       * tests/subobj3.test: Add trailing `:' command.
+       (configure.in): Use proper m4 quoting, and avoid obsolescent
+       constructs.
+       * tests/subobj8.test: Likewise.  Also, enable `errexit' shell
+       flag, with related changes
+       * tests/subobj4.test: Likewise.  Also, make grepping of
+       `Makefile.in' stricter.
+       * tests/subobj5.test: Add trailing `:' command.  Move setting of
+       `errexit' shell flag earlier in the script (just after inclusion
+       of ./defs).
+       (configure.in): Use the stub created by `./defs', rather than
+       writing it from scratch, and avoid obsolescent constructs.
+       * tests/subobj6.test: Add trailing `:' command.  Move setting of
+       `errexit' shell flag earlier in the script (just after inclusion
+       of ./defs).  Do not create useless dummy ac-init file `f'.
+       * tests/subobj7.test: Do not create useless dummy ac-init file
+       `f'.
+       (configure.in): Use the stub created by `./defs', rather than
+       writing it from scratch, and avoid obsolescent constructs.
+       * tests/subobj9.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Fail the test if
+       `make distcheck' fails.  Ensure verbose printing of captured make
+       stdout.  Avoid useless fork by doing simple grep instead of using
+       test -n "`COMMAND | grep ...`".
+       (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
+       (Makefile.am): Explicitly mark target "print" as phony.
+       * tests/subobj10.test: Removed duplicated call to `set -e'.  Add
+       trailing `:' command.
+       (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
+
+       Remove a couple of obsoleted tests.
+       * tests/fpinstall.test: Removed.
+       * tests/fpinst2.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+
+       Bootstrap: updated HACKING entry.
+       * HACKING ("Working with git"): Explain how to override the
+       autoconf and autom4te programs used by the bootstrap process.
+
+       Bootstrap: fixlet.
+       * bootstrap: Do not remove `lib/Automake/Config.pm' anymore,
+       since we don't generate it.  Correctly quote arguments of
+       `eval' builtin.  Fixed a botched error message.  Removed an
+       extra blank line.
+
+       Bootstrap: don't search perl in $PATH.
+       * bootstrap: Do not explicitly search perl in $PATH anymore.
+       ($PATH_SEPARATOR): Removed, it's no more needed.
+
+       Bootstrap: let the user choose which autoconf to use.
+       * bootstrap ($AUTOCONF): New variable, from the environment.
+       ($AUTOM4TE): Likewise, for clarity.
+       Use "$AUTOCONF" instead of calling "autoconf" directly.
+
+       Minor improvements to tests ar*.test.
+       * tests/ar.test: Add trailing `:' command.
+       * tests/ar2.test: Likewise, and make grepping of generated
+       Makefile.in stricter.
+
+2010-08-06  Peter Rosin  <address@hidden>
+
+       Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
+       * lib/ar-lib: New auxiliary script.
+       * lib/Makefile.am: Add above.
+       * tests/ar-lib.test: New test.
+       * tests/Makefile.am: Add above.
+       * automake.in (@common_files): Distribute the 'ar-lib' script.
+       * doc/automake.texi (Auxiliary Programs): Mention the new
+       'ar-lib' script.
+       (Optional): Mention 'ar-lib' in AC_CONFIG_AUX_DIR.
+       * NEWS: Update.
+
+2010-08-07  Ralf Wildenhues  <address@hidden>
+
+       Fix shell pattern negation in compile script.
+       * lib/compile (func_file_conv): Use `!' not `^' for pattern
+       negation.
+
+2010-08-08  Ralf Wildenhues  <address@hidden>
+
+       Fix maintainer-check failure.
+       * tests/cond5.test: Quote sleep argument, this isn't about
+       time stamp differences.
+
+       Sync auxiliary files from upstream.
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex:
+       Sync from upstream.
+
+2010-08-06  Stefano Lattarini  <address@hidden>
+
+       Work around a nasty bug (segfault) of Solaris make.
+       * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
+       from $list, to avoid triggering a nasty bug (potential segfault)
+       on Solaris make.
+
+2010-08-06  Peter Rosin  <address@hidden>
+
+       Make cond5.test more robust on MSYS.
+       * tests/cond5.test: Add delay before the first kill attempt to
+       cater for problems with MSYS bash.
+
+2010-08-01  Peter Rosin  <address@hidden>
+
+       Wrap some MSVC options in the compile script.
+       * lib/compile: MSVC supports naming the output file, the option
+       is just not called -o, so transform -o into the appropriate form
+       for MSVC. Also wrap some other options while at it (-L, -l, -Wl,
+       -Xlinker and -I) and convert file names to windows form where
+       needed for those options to make MSVC more usable in an
+       autotooled environment.
+       * doc/automake.texi (Auxiliary Programs): Document the above
+       extension of the compile script.
+       * NEWS: Updated.
+       * tests/defs.in: New required entry 'cl'.
+       * tests/compile3.test: New test.
+       * tests/compile4.test: New test.
+       * tests/compile5.test: New test.
+       * tests/Makefile.am: Update.
+
+2010-07-31  Ralf Wildenhues  <address@hidden>
+
+       Add example git work flow; discuss merge --log in HACKING.
+       * HACKING: Update.
+       Suggestion by Stefano Lattarini.
+
+       Add more hints for debugging make rules.
+       * doc/automake.texi (Debugging Make Rules): Show command to find
+       out expanded values of variables; point to makefile debugger.
+       * THANKS: Update.
+       Prompted by suggestion from Ludovic Courtès and Andy Wingo.
+
+2010-07-27  Patrick Welche  <address@hidden>  (tiny change)
+
+       Fix typo in the manual.
+       * doc/automake.texi (Scripts): Fix typo.
+
+2010-07-27  Ralf Wildenhues  <address@hidden>
+
+       Document current policy for development with git.
+       * HACKING (Working with git): Overhaul.
+       Prompted by suggestion from Stefano Lattarini.
+
+       Fix AM_COND_IF for gone-invalid condition shell expression.
+       * m4/cond-if.m4 (AM_COND_IF): test contents of $COND_TRUE
+       variable, rather than re-evaluating the shell expression for
+       the condition.
+       * tests/cond40.test: Extend test.
+       * NEWS: Update.
+
+       Avoid syntax error if IF-TRUE part of AM_COND_IF expands empty.
+       * m4/cond-if.m4 (AM_COND_IF): Ensure IF-TRUE part is never empty
+       to avoid shell syntax error if the m4 expansion is empty.
+       * tests/cond40.test: Enhance test.
+
+       Coverage: bogus option to AM_INIT_AUTOMAKE.
+       * tests/init2.test: New test.
+       * tests/Makefile.am: Update.
+
+2010-07-21  Stefano Lattarini  <address@hidden>
+
+       Modernize and improve test scripts `subdir*.test'.
+       * tests/subdir.test: Enable `errexit' shell flag, and related
+       changes.  Use the `configure.in' stub created by `./defs',
+       rather than writing one from scratch.
+       * tests/subdir2.test: Likewise.
+       * tests/subdir4.test: Likewise.
+       * tests/subdir3.test: Enable `errexit' shell flag, and related
+       changes.  Do not create useless dummy source files.
+       * tests/subdir5.test: Make grepping of Makefile.in (in topdir
+       and in subdirs) stricter.  Some minor changes to keep it more
+       in sync with the related test `subdir8.test'.
+       * tests/subdir8.test: Likewise (but with the related test being
+       `subdir5.test' here).
+       * tests/subdir6.test: Cosmetic change in spacing.
+       * tests/subdir9.test: Define and use new variable `$distdir'.  Add
+       trailing `:' command.
+       * tests/subdir10.test: Cosmetic consistency-related change.
+       * tests/subdirbuiltsources.test: Cosmetic changes in spacings.
+       (configure.in): Use stub created by `./defs', rather than writing
+       it from scratch.  Do not use obsoleted and/or deprecated forms of
+       autoconf/automake macros.
+
+       Modernize and improve test scripts `dist*.test'.
+       * tests/distcleancheck.test: Do not add useless `-e' option to
+       a $MAKE call.  Extend test by grepping stderr of make.
+       * tests/distcom2.test: Do not run the same test script on the
+       Makefile.in twice, but save its output in an intermediate file
+       instead.  Make grepping of DIST_COMMON definition stricter.
+       Display the content of more files, to ease debugging.  Add a
+       trailing `:' command.  Improved heading comments w.r.t. sister
+       test(s).
+       * tests/distcom6.test: Likewise, and avoid to uselessly run
+       autoconf.
+       * tests/distcom3.test: Ensure verbose printing of captured stdout
+       and stderr.  Make grepping of captured stderr stricter.  Also,
+       add trailing `:' command.
+       * tests/distcom4.test: Declare the target `test' in the generated
+       Makefile.am as `.PHONY'.  Display content of more files, to ease
+       debugging.  Add trailing `:' command.
+       * tests/distcom5.test: Likewise.  Also, factor out common sed
+       script in subroutine `extract_distcommon'.
+       * tests/distcom7.test: Prefer cat + here-doc over echo to write
+       test Makefile.am files.  Add a trailing `:' command.
+       * tests/distname.test: Prefer `gzip -d' over `gunzip'.  Move the
+       call to `set -e' earlier.  Be stricter and more verbose in the
+       checking of the generated tarball.
+       (configure.in): Use the stub provided by ./defs, instead of
+       writing it from scratch.  Avoid obsoleted constructs.  Remove
+       useless call to `AM_PROG_CC_C_O'.
+       * tests/distdir.test: Various minor improvements/normalizations.
+       * tests/distlinks.test: Likewise.
+
+2010-07-18  Stefano Lattarini  <address@hidden>
+
+       Improve and extend test cond5.test.
+       * tests/cond5.test: Do not blindly sleep 60 seconds before polling
+       the background automake process, but poll it every 10 seconds for
+       at most 30 times (this makes the test both faster on good machines,
+       and more resilient to spurious timeout-due failures when in low
+       priority or on heavily-loaded systems).
+       Check also that automake writes the expected error messages on the
+       standard error.
+       Enable `errexit' flag, and related changes.
+       Rely on the `configure.in' stub created by `./defs', rather than
+       writing one from scratch.
+
+2010-06-26  Ralf Wildenhues  <address@hidden>
+
+       Update program --help output to match current GCS.
+       * configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
+       is not defined, for compatibility to Autoconf < 2.64.
+       * Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
+       PACKAGE_URL.
+       (sc_diff_automake_in_automake): Update number of diff lines for
+       additional substitutions.
+       * aclocal.in (usage): Use PACKAGE_BUGREPORT.  Point to Automake
+       home page and GNU general help page.
+       * automake.in (usage): Likewise.
+       * doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
+       address.
+       (Introduction, Creating amhello, amhello Explained, Options):
+       Use it throughout.
+       * lib/Automake/Makefile.am (do_subst): Substitute
+       PACKAGE_BUGREPORT.
+       * lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
+       * lib/Automake/ChannelDefs.pm: Use it for footer of fatal
+       messages.
+
+       Clean up @var handling in the manual.
+       * doc/automake.texi: Throughout the manual, lower-case @var
+       names, replace a few one-character names.
+
+2010-06-26  Stefano Lattarini  <address@hidden>
+
+       Fix typo-related bug in test script silent5.test.
+       * tests/silent5.test: Use $EGREP, not $GREP (which is not even
+       defined).
+
+       Tests: remove useless repetitions of `foreign' automake option.
+       * tests/multlib.test (configure.in): Remove useless use of
+       `foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
+       already in $AUTOMAKE by default, so no point in repeating it).
+       * tests/subobj10.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/lex3.test (Makefile.am): Similarly, remove useless use
+       of `foreign' option in AUTOMAKE_OPTIONS.
+       * tests/lex5.test: Likewise.
+       * tests/pr279.test: Likewise.
+       * tests/pr279-2.test: Likewise.
+       * tests/specflg3.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+
+       Drop useless requirement "gzip" in lex5.test.
+       * tests/lex5.test ($required): Do not list "gzip", as it's
+       never used.
+
+2010-06-24  Stefano Lattarini  <address@hidden>
+
+       Fix bugs in test script silent5.test.
+       * tests/silent5.test: Fixed a nasty bug (due to the use of grep
+       instead of egrep) that could have led to false negatives.
+
+2010-06-21  Stefano Lattarini  <address@hidden>
+
+       Add a test checking that distributed broken symlinks cause
+       `make dist' to fail.
+       * tests/distlinksbrk.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-06-21  Ralf Wildenhues  <address@hidden>
+
+       Fix minor testsuite issues, update docs, for Yacc/Lex changes.
+       * doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
+       and AM_LFLAGS, LFLAGS in the order in which they now appear in
+       the rules.
+       * NEWS: Update.
+       * tests/lflags.test, tests/lflags2.test, tests/yflags.test,
+       tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
+       please maintainer-check.  Ensure generated C files contain a
+       declaration, to please compilers.
+
+2010-06-21  Stefano Lattarini  <address@hidden>
+
+       Fix bugs in Automake Yacc/Lex support w.r.t. $(AM_FLAGS) and
+       $(FLAGS) precedence.
+       * automake.in: Fix registration of languages "Lex", "Lex (C++)",
+       "Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
+       $(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
+       * tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
+       * NEWS: Updated.
+
+       New tests, exposing bugs in Automake Yacc/Lex support w.r.t.
+       $(AM_FLAGS) and $(FLAGS) precedence.
+       * tests/lflags.test: New test, check that user $(LFLAGS) takes
+       precedence over automake (AM_LFLAGS) and (foo_LFLAGS).  Still
+       xfailing.
+       * tests/lflags2.test: Likewise.
+       * tests/yflags.test: New test, check that user $(YFLAGS) takes
+       precedence over automake (AM_YFLAGS) and (foo_YFLAGS).  Still
+       xfailing.
+       * tests/yflags2.test: Likewise.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
+
+2010-06-20  Stefano Lattarini  <address@hidden>
+
+       Modernize, improve and extend tests `suffix*.test'.
+       * tests/suffix3.test: Enable `errexit' shell flag, and related
+       changes.
+       * tests/suffix4.test: Likewise.
+       * tests/suffix6.test: Likewise, and do not create a useless dummy
+       source file.
+       * tests/suffix7.test: Likewise.
+       * tests/suffix5.test: Enable `errexit' shell flag, and related
+       changes.  Make grepping of Makefile.in slightly stricter.
+       * tests/suffix.test: Enable `errexit' shell flag, and related
+       changes.  Also, do not redirect grep output to /dev/null, as this
+       might unmotivatedly hide useful information.
+       * tests/suffix2.test: Move setting of `errexit' shell flag earlier
+       in the script (just after inclusion of ./defs).  Use a more
+       idiomatic way to count text occurrences in Makefile.in with
+       grep.  Do not create useless dummy source files.
+       * tests/suffix10.test: Ensure verbose printing of captured make
+       stdout.  Minor cosmetic changes.
+       * tests/suffix8.test: Likewise.  Also, drop useless call to the
+       env(1) utility, and make grepping of make output stricter by using
+       $FGREP rather than plain grep.
+       * tests/suffix11.test: Likewise.
+       * tests/suffix12.test: Likewise.
+       * tests/suffix9.test: Prefer cat + here-doc over echo to append to
+       the `configure.in' stub.  Cosmetic changes.
+       * tests/suffix13.test: Cosmetic spacing change.
+
+2010-06-13  Stefano Lattarini  <address@hidden>
+
+       Add useful comment in test script ext.test.
+       * tests/ext.test: Add a comment explaining why an apparently
+       useless `if' statement is indeed required.
+
+2010-06-13  Stefano Lattarini  <address@hidden>
+
+       Add useful comment in test script obsolete.test.
+       * tests/obsolete.test: Add a comment explaining why we need
+       an indirection in adding $AUTOUPDATE to $required.
+
+       Normalize whitespaces in 'tests/Makefile.am'.
+       * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
+       definition of this variable.
+
+       Parallel tests generation: improve comments (tiny change).
+       * tests/Makefile.am ($(parallel_tests)): Added useful comment to
+       generated tests.
+
+       Tests defs: truly get rid of `$am_defs_included' (unused variable)
+        * tests/defs.in ($am_defs_included): Remove, its now unused.  It
+       should have been removed in a previous changeset, but the removal
+       was done only partially (oversight).
+
+2010-06-12  Ralf Wildenhues  <address@hidden>
+
+       Remove a couple of unneeded conditionals from tests.
+       * tests/pr243.test, tests/pr266.test, tests/strip.test: No need
+       for the FOOTEST conditional.
+
+2010-06-12  Stefano Lattarini  <address@hidden>
+
+       Modernize, improve and/or fix various test scripts.
+       * tests/symlink3.test: Deleted, separated into two new, more
+       complete tests ...
+       * tests/forcemiss.test: ... this one ...
+       * tests/forcemiss2.test: ... and this one.
+       * tests/symlink2.test: Enable `errexit' shell flag, make test
+       stricter, and skip it if symlink creation is not supported.
+       * tests/postproc.test: Enable `errexit' shell flag, related
+       changes, and a couple of unrelated cosmetic changes.
+       * tests/recurs.test: Use the `configure.in' stub created by
+       `./defs', rather than writing one from scratch.  Make grepping
+       of Automake stderr slightly stricter.
+       * tests/substtarg.test: Likewise.
+       * tests/strip.test: Likewise, and move the call to `set -e'
+       earlier (just after the inclusion of `./defs'). Also, make sure
+       that the script installed by `make install-script' is equal to
+       the original one.
+       * tests/substref.test: Use the `configure.in' stub created by
+       `./defs', rather than writing one from scratch.  Move the call
+       to `set -e' earlier (just after the inclusion of `./defs').
+       Avoid to explicitly export CC for configure (that's already done
+       in ./defs).  Avoid potential problems with unpredictable make
+       output.  Finally, make grepping of Makefile.in stricter.
+       * tests/substre2.test: Ensure verbose printing of the captured
+       make's output, and make its grepping slightly stricter.
+       * tests/cygwin32.test: Enable `errexit' shell flag, and related
+       changes.  Also, do not create useless dummy source/data files.
+       * tests/scripts.test: Likewise.
+       * tests/recurs2.test: Likewise.  Also, use the `configure.in'
+       stub created by `./defs'.
+       * tests/Makefile.am (TESTS): Updated.
+
+       Modernize, improve and/or fix tests `pluseq*.test.
+       * tests/pluseq5.test: Append to configure.in using cat with an
+       here-doc, not using echo.
+       * tests/pluseq10.test: Make sure that the captured output of
+       `make' command is always displayed. Where possible, use $FGREP
+       instead of grep (this change makes some checks slightly stricter).
+       * tests/pluseq8.test: Enable `errexit' shell flag, with related
+       changes.
+       * tests/pluseq.test: Likewise.  Also, do not create useless dummy
+       data files, and use better m4 quoting in generated configure.in.
+       * tests/pluseq2.test: Likewise.  Also, append to configure.in
+       using cat with an here-doc, not using echo.
+       * tests/pluseq3.test: Likewise.
+       * tests/pluseq4.test: Likewise.
+       * tests/pluseq6.test: Likewise.
+       * tests/pluseq7.test: Do not create useless dummy source file.
+       * tests/pluseq9.test: Slightly extended w.r.t. the grepping of
+       Automake stderr.  Some unrelated cosmetic changes.
+
+2010-06-12  Stefano Lattarini  <address@hidden>
+
+       cscope.test: ensure verbose printing of captured stderr.
+       * tests/cscope.test: Print captured stderr before failing.
+
+2010-06-12  Stefano Lattarini  <address@hidden>
+
+       Testsuite: ensure verbose printing of captured stderr.
+       * tests/acloca18.test: Print captured stderr before either failing
+       or grepping it.  Be sure to send captured stderr to stderr, not to
+       stdout.
+       * tests/ansi3b.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/configure.test: Likewise.
+       * tests/missing3.test: Likewise.
+       * tests/missing6.test: Likewise.
+       * tests/output-order.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise.
+       * tests/python6.test: Likewise.
+       * tests/python7.test: Likewise.
+       * tests/python8.test: Likewise.
+       * tests/python9.test: Likewise.
+       * tests/subobj.test: Likewise.
+       * tests/vars3.test: Likewise.
+       * tests/missing4.test: Likewise, and fix a call to grep not to use
+       the `-c' flag.
+       * tests/ansi3.test: Likewise, and rely on the `configure.in' stub
+       created by `./defs', rather than writing one from scratch.
+
+       Enable `errexit' shell flag in various tests.
+       * tests/backsl.test: Enable the `errexit' shell flag, and
+       related changes.
+       * tests/backsl2.test: Likewise.
+       * tests/block.test: Likewise.
+       * tests/canon2.test: Likewise.
+       * tests/canon4.test: Likewise.
+       * tests/comment2.test: Likewise.
+       * tests/condlib.test: Likewise.
+       * tests/cond15.test: Likewise, and prefer $FGREP over grep.
+       * tests/canon3.test: Likewise.  Also, avoid to create an useless
+       dummy source file.
+       * tests/acoutpt2.test: Enable the `errexit' shell flag, and some
+       related changes.  Do some cosmetic improvements in the generated
+       `configure.in' file.
+       * tests/cond4.test: Likewise.
+       * tests/cond14.test: Likewise.
+       * tests/condinc.test: Likewise.
+       * tests/cond7.test: Likewise.  Also, remove useless setting of
+       AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am.
+       * tests/ansi.test: Enable the `errexit' shell flag, and related
+       changes.  Extended, esp. by running autoconf, ./configure and
+       make, and by looking into the distdir.
+
+2010-06-12  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Extend tests/README w.r.t. trailing `:' in test scripts.
+       * tests/README (section "Writing test cases" subsection "Do"):
+       Explain why apparently redundant trailing `:' and `Exit 0' in
+       test scripts can indeed be useful.
+
+2010-06-11  Stefano Lattarini  <address@hidden>
+
+       Improve determination of PATH separator in bootstrap script.
+       * bootstrap: Determine what the PATH separator is the same way
+       autoconf does.
+
+       Minor improvements in bootstrap script.
+       * bootstrap: Consistently use two-spaces indentation.  Cosmetic
+       improvement to comments.
+       ($me): New variable, containing program basename.
+       Prepend it to all error messages.
+
+       Testsuite now works with BSD make in parallel mode.
+       * tests/defs.in: Unset variables __MKLVL__ and MAKE_JOBS_FIFO,
+       which are exported by BSD make when run in parallel mode, and
+       which can confuse make processes spawned by our testsuite.
+       This change fixes a lot of spurious failure when the testsuite
+       is run with BSD make in parallel mode.
+
+2010-06-09  Stefano Lattarini  <address@hidden>
+
+       Modernize, improve and/or fix various test scripts.
+       * tests/sanity.test: Rely on the `configure.in' stub created by
+       `./defs', rather than writing one from scratch.
+       * tests/depend2.test: Likewise.  Also, call `set -e' just after
+       the inclusion of `./defs', instead that later in the script.
+       * tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
+       $AUTOMAKE, and improve the positioning of an $ACLOCAL call.
+       * tests/exeext4.test: Use $FGREP instead of grep, where possible.
+       Make auxiliary rules in the generated Makefile more silent.
+       These changes make some checks slightly stricter.
+       * tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
+       * tests/gettext2.test: Place final `:' at the end of the script,
+       rather than in the middle.
+       * tests/exeext.test: Call `set -e' just after the inclusion of
+       `./defs', instead that later in the script.
+       * tests/extra5.test: Likewise.
+       * tests/confdeps.test: Likewise.  Also, prefer `mv -f' over
+       plain `mv', just to be sure.
+       * tests/depcomp.test: Enable `errexit' shell flag, with related
+       changes.  Also, modernize the generated configure.in.
+       * tests/cond9.test: Likewise.  Also, rely on the `configure.in'
+       stub created by `./defs', rather than writing one from scratch.
+       * tests/cond10.test: Likewise.
+       * tests/depcomp2.test: Likewise.
+       * tests/depend3.test: Likewise.
+       * tests/distcom7.test: Likewise.
+       * tests/fortdep.test: Likewise.  Also, remove definition of
+       AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
+       since that flag is already provided by $AUTOMAKE.
+       * tests/mdate.test: Made stricter, by checking that Automake
+       actually failed, and by making a stricter grep on the error
+       message.  Also, set shell `errexit flag'.
+       * tests/python2.test: Improved verbose messages.
+
+       Make test `ammissing.test' stricter.
+       * tests/ammissing.test: Fail if $ACLOCAL succeeds unexpectedly.
+       Enable `errexit' shell flag.
+
+2010-06-08  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix error in generation of parallel tests.
+       * tests/defs.in ($am_skip_defs): New variable, to be used when
+       ./defs must be sourced multiple times.  If set, unset it and
+       only define $srcdir; otherwise, also go through the rest of
+       the script.
+       ($am_defs_included): Remove, no more needed.
+       * tests/Makefile.am ($(parallel_tests)): Update accordingly,
+       using only $srcdir from defs.
+       Fixes potential test failures of tests that use $required.
+
+2010-06-08  Stefano Lattarini  <address@hidden>
+
+       Enable `errexit' shell flag in some test scripts.
+       * tests/subcond.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/subst.test: Likewise.
+       * tests/vars.test: Likewise.
+       * tests/version4.test: Likewise.
+       * tests/vpath.test: Likewise.
+       * tests/vtexi2.test: Likewise.
+       * tests/werror.test: Likewise.
+       * tests/whoami.test: Likewise.
+       * tests/tags.test: Likewise, and avoid to crate an useless dummy
+       header file.
+       * tests/acsilent.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/unused.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/version.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+       * tests/version2.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+
+2010-06-07  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Improve declaration of dependencies in the testsuite.
+       * tests/Makefile.am (check_SCRIPTS): Remove.  Instead, let ...
+       ($(TEST_LOGS)): ... all test logs depend on the scripts.
+       * test/gen-parallel-tests: For each parallel test foo-p.test,
+       let `foo-p.log' also depend on `foo.test', since it is sourced.
+
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Coverage for TAGS_DEPENDENCIES warning.
+       * tests/tags2.test: New test.
+       * tests/Makefile.am: Update.
+
+       Coverage for use of anachronistic variables.
+       * tests/oldvars.test: New test.
+       * tests/Makefile.am: Update.
+
+       Testsuite coverage for bogus macro file serial numbers.
+       * tests/acloca18.test: Also test ill-formed serial numbers
+       and serial numbers after macro definitions.
+
+       Coverage for aclocal diagnosing underquoted macros.
+       * tests/acloca23.test: New test.
+       * tests/Makefile.am: Update.
+
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
+       * tests/ldadd.test: Enable errexit.  Use AUTOMAKE_fails so
+       the verbose log contains all output.
+       * tests/mdate.test: Likewise.
+       Prompted by Stefano Lattarini's change to discover.test.
+
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       More minor message fixes.
+       * aclocal.in (scan_file): Fix recommended info command line.
+       * automake.in (handle_lib_objects): No need to prepend function
+       name to prog_error message.
+       (handle_tags): Add missing word and missing space in error
+       message.
+       (handle_dist): Add missing closing single quote in message.
+       Line-wrap one long message for readability.
+
+2010-06-06  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix distcheck failure with distributed generated parallel tests.
+       * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir)
+       being different from the value at developer `make dist' time.
+       * tests/defs.in: Protect against multiple inclusion, by using ...
+       ($am_defs_included): ... this new variable.
+       ($srcdir): Do not compute, but simply define to address@hidden@'
+       as substituted by configure.
+       Report, suggestions and first fix by Ralf Wildenhues, final
+       patch by Stefano Lattarini.
+
+2010-06-06  Stefano Lattarini  <address@hidden>
+
+       Improve tests link*.test (enable `errexit' shell flag).
+       * tests/link_c_cxx.test: Enable `errexit shell flag, and related
+       changes.  Also, do not create useless source files.
+       * tests/link_dist.test: Likewise.
+       * tests/link_f90_only.test: Likewise.
+       * tests/link_f_only.test: Likewise.
+       * tests/link_fc.test: Likewise.
+       * tests/link_fccxx.test: Likewise.
+       * tests/link_fcxx.test: Likewise.
+
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Improve ext.test semantics, avoid OpenBSD sh errexit issue.
+       * tests/ext.test: Inside shell compound command, use
+       `if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to
+       fix failure with OpenBSD sh introduced with last patch.
+       Actually ensure that a rule for .EXT.o is created for each
+       known extension EXT.
+
+2010-06-06  Stefano Lattarini  <address@hidden>
+
+       Enable `errexit' shell flag in some test scripts.
+       * tests/dash.test: Enable `errexit' shell flag, and related
+       changes.
+       * tests/defun.test: Likewise.
+       * tests/defun2.test: Likewise.
+       * tests/dejagnu.test: Likewise.
+       * tests/double.test: Likewise.
+       * tests/distcom2.test: Likewise.
+       * tests/empty2.test: Likewise.
+       * tests/empty3.test: Likewise.
+       * tests/empty4.test: Likewise.
+       * tests/exdir.test: Likewise.
+       * tests/ext.test: Likewise.
+       * tests/extra.test: Likewise.
+       * tests/extra2.test: Likewise.
+       * tests/extra3.test: Likewise.
+       * tests/extra4.test: Likewise.
+       * tests/flibs.test: Likewise.
+       * tests/fnoc.test: Likewise.
+       * tests/fo.test: Likewise.
+       * tests/instexec.test: Likewise.
+       * tests/ltdeps.test: Likewise.
+       * tests/nodep.test: Likewise.
+       * tests/nodepcomp.test: Likewise.
+       * tests/f90only.test: Likewise, and remove botched/obsoleted
+       comments and unnecessary commands.
+       * tests/fonly.test: Likewise, and remove botched/obsoleted
+       comments and unnecessary commands.
+       * tests/discover.test: Likewise, and made stricter.
+
+       Enable `errexit' shell flag in all tests cxx*.test.
+       * tests/cxx.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/cxxansi.test: Likewise.
+       * tests/cxxcpp.test: Likewise.
+       * tests/cxxlibobj.test: Likewise.
+       * tests/cxxlink.test: Likewise.
+       * tests/cxxo.test: Likewise.
+
+       Enable `errexit' shell flag in various tests.
+       * tests/acoutnoq.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/acoutpt.test: Likewise.
+       * tests/acoutqnl.test: Likewise.
+       * tests/amassign.test: Likewise.
+       * tests/ansi2.test: Likewise.
+       * tests/ansi4.test: Likewise.
+       * tests/badprog.test: Likewise.
+       * tests/checkall.test: Likewise.
+       * tests/clean.test: Likewise.
+       * tests/colneq2.test: Likewise.
+       * tests/colon.test: Likewise.
+       * tests/colon5.test: Likewise.
+       * tests/colon6.test: Likewise.
+       * tests/comment.test: Likewise.
+       * tests/compile_f90_c_cxx.test: Likewise.
+       * tests/compile_f_c_cxx.test: Likewise.
+       * tests/cond3.test: Likewise.
+       * tests/cond6.test: Likewise.
+       * tests/cond13.test: Likewise.
+       * tests/conf2.test: Likewise.
+       * tests/confvar.test: Likewise.
+       * tests/confvar2.test: Likewise.
+       * tests/cond8.test: Likewise, plus a cosmetic change.
+       * tests/confh4.test: Likewise.  Also, add in the heading comments
+       an excerpt from the original bug report which motivated the
+       creation of this test, to make its purpose clearer.
+
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Rewrite manual to be gender-neutral.
+       * doc/automake.texi (GNU Build System)
+       (Standard Directory Variables, General Operation, CVS)
+       (Hard-Coded Install Paths, Dependencies As Side Effects):
+       Rewrite text to not contain gender-specific pronouns when
+       speaking about developers or users, either by avoiding pronouns
+       or by addressing them as `you' instead.
+       * THANKS: Update.
+       Report by Christina Gratorp.
+
+       * AUTHORS: Update.
+
+2010-06-06  Stefano Lattarini  <address@hidden>
+
+       Tiny fix in silent8.test (display output of `make' command).
+       * tests/silent8.test: Make sure that the captured output of `make'
+       command is always displayed.
+
+       Make tests on user extensibility of silent-rules mode stricter.
+       * tests/silent6.test: Made stricter w.r.t. the grepping of the
+       output produced by `make'.
+       * tests/silent7.test: Likewise.
+
+       Tests on silent-mode for C/Libtool made stricter.
+       * tests/silent.test: Made stricter w.r.t. the grepping of the
+       output produced by `make'.
+       * tests/silent2.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/silent3.test: Likewise, and add a final `make distclean'
+       command to keep it better in sync with tests/silent{4,9}.test.
+
+       Improved test silent5.test.
+       * tests/silent5.test: Remove by hand all generated C files after
+       non-verbose builds, to ensure the following builds are clean.
+       Try to clean and rebuild with the same verbosity and without
+       removing generated sources in between, to check that this does
+       not trigger a different set of rules.  Make grepping of make's
+       output stricter.  Improved/added some comments.
+
+       New tests for Automake silent-mode with Fortran.
+       * tests/silentf77.test: New test.
+       * tests/silentf90.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+
+       New test `silentcxx.test' (Automake silent-mode with C++).
+       * tests/silentcxx.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+
+       New test `silentyacc.test' (Automake silent-mode with Yacc).
+       * tests/silentyacc.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+
+       New test `silentlex.test' (Automake silent-mode with Lex).
+       * tests/silentlex.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+
+       Relax tests on silent-rules to cater to overly verbose makes.
+       * tests/silent.test: When testing silent builds, don't fail if
+       make's output simply contains the `mv' substring, but only if
+       it contains the `mv ' substring (note the trailing space).
+       * tests/silent2.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent4.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent9.test: Likewise.
+
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       Extend test on `nostdinc' automake option.
+       * tests/nostdinc.test: Enable `errexit' shell flag.  Related and
+       unrelated minor changes.  Make the grepping of the generated
+       Makefile.in slightly stricter.  Generate and run configure, so that
+       the generated Makefile can be grepped too.
+
+2010-05-23  Ralf Wildenhues  <address@hidden>
+
+       Make gnupload portable to EBCDIC hosts.
+       * lib/gnupload: Use literal newline as argument for 'tr' rather
+       than \015, for EBCDIC hosts.  Also, avoid unportable nested
+       double-quotes and backquotes.
+       * THANKS: Update.
+       Report from Eric Blake and Steve Goetze via gnulib.
+
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       Fix Autoconf version required by Automake's configure.
+       Automake configure script used to tell that automake required
+       autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
+       and if that was not found, it gave an error saying that Automake
+       required configure 2.61a-341 or later.  This change should
+       eliminate such inconsistencies.
+       * configure.ac ($required_autoconf_version): New variable.
+       Use it throughout.
+
+2010-05-23  Ralf Wildenhues  <address@hidden>
+
+       Fix truncated comment in Makefile.am.
+       * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished
+       sentence in comment.
+       Report by Stefano Lattarini.
+
+       Relax silent8.test for NetBSD make.
+       * tests/silent8.test: Accept ./foo.info in output as well.
+
+       Fix unportable sed script in maintainer-check test.
+       * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
+       not contain semicolon after 'b' or brace commands, for NetBSD.
+
+       Wildcards are not portable to NetBSD make.
+       * doc/automake.texi (Wildcards): Document portability issue.
+       * tests/extra10.test, tests/extra11.test, tests/extra12.test:
+       Require GNU make.
+
+2010-05-23  Stefano Lattarini  <address@hidden>
+
+       Make test for configure.in vs. configure.ac stricter.
+       * tests/configure.test: Use a configure.in file that provokes
+       an automake error, to ensure configure.ac is preferred.
+
+       Avoid possible false negatives in dejagnu7.test.
+       * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
+       unportable use of fgrep option `-e'.
+
+       Fix conflnk3.test to work with Solaris/Heirloom Sh.
+       * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
+       instead of respectively `test -e FILE' and `test ! -e FILE',
+       since Solaris Sh doesn't grok the latter.  Do not SKIP the test
+       if the shell doesn't support `test -e'.
+
+2010-04-25  Ralf Wildenhues  <address@hidden>
+
+       Warning and error message formatting cleanups.
+       * aclocal.in (parse_arguments, main): Remove trailing period or
+       newline in error or warning messages, avoid capitalization of
+       the first word of a message.
+       * automake.in (check_user_variables, handle_languages)
+       (handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
+       (scan_autoconf_files, cond_stack_if, require_file_internal)
+       (usage, generate_makefile, parse_arguments): Likewise.
+       * lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
+       * lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
+       * lib/Automake/Options.pm (set_strictness): Likewise.
+       * lib/Automake/Rule.pm (define): Likewise.
+       * lib/Automake/Variable.pm (define, variables_dump): Likewise.
+       * tests/ltinstloc.test, tests/suffix11.test: Adjust expected
+       error message.
+       * lib/Automake/Channels.pm (setup_channel): Reword error message
+       to be the same as in msg.
+
+       Fix placing of ellipses in English text and synopses.
+       * Makefile.am: Be sure to add a space before `...' in natural
+       language text.
+       * automake.in (scan_autoconf_traces): Likewise.
+       * lib/Automake/Rule.pm (define): Likewise.
+       * lib/Automake/Variable.pm (define): Likewise.
+       * lib/am/dejagnu.am: Likewise.
+       * lib/am/progs.am: Likewise.
+       * lib/gnupload (dprint, upload): Likewise.
+       * tests/confdeps.test: Likewise.
+       * tests/location.test: Adjust expected output.
+       * automake.in (usage): In synopsis, use singular for OPTION,
+       * remove space before ellipsis.
+       * aclocal.in (usage): Likewise.  Also, fix indentation.
+
+       Fix more duplicate message prefixes.
+       * lib/Automake/XFile.pm (seek): Do not prepend $me.
+       ($me): Remove now-unused package-global.
+       * aclocal.in (check_acinclude): Remove duplicate 'warning: '
+       prefix.
+
+       Fix typo in manual.
+       * doc/automake.texi (Simple Tests using parallel-tests): Add
+       missing closing parenthesis.
+
+       Fix leftover call to removed function macros_dump.
+       * automake.in (read_main_am_file): Call variables_dump, not
+       macros_dump.  Print actual error before list of variables.
+
+2010-04-22  Stefano Lattarini  <address@hidden>
+
+       Minor improvements in comments of test `silent3.test'.
+       * tests/silent3.test: Tell to keep it in sync with `silent9.test'
+       too.
+
+2010-04-25  Ralf Wildenhues  <address@hidden>
+
+       testsuite: ensure verbose printing of captured output.
+       * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
+       tests/fort2.test, tests/help.test, tests/missing3.test,
+       tests/missing6.test: Print captured stdout or stderr before
+       grepping it.
+
+2010-04-20  Stefano Lattarini  <address@hidden>
+
+       Make test badopt.test stricter (by enabling `set -e').
+       * tests/badopt.test: Add call to `set -e'.  Due to this change,
+       an unexpected failure in the call to `$ACLOCAL' (whose outcome
+       was previously unchecked) would cause the whole test to fail.
+       Also, bumped the copyright years.
+
+       Make test for configure.in vs. configure.ac stricter.
+       * tests/configure.test: Use a configure.in file that provokes
+       an automake error, to ensure configure.ac is preferred.
+
+       Use `set -e' in confsub.test (avoids possible false negatives).
+       * tests/confsub.test: Enable shell `errexit' flag, and related
+       changes (this helps avoiding some possible minor false negatives).
+       Also, bumped copyright years.
+
+2010-04-20  Ralf Wildenhues  <address@hidden>
+
+       Fix -Werror handling for presence of configure.in and configure.ac.
+       * lib/Automake/Variable.pm (Automake::Variable): Do not initialize
+       $configure_ac at the global level, before command-line arguments
+       have been parsed.
+       (require_variables): Initialize it here.
+       * tests/configure.test: New test.
+       * tests/Makefile.am: Update.
+       Report by Stefano Lattarini.
+
+2010-04-20  Stefano Lattarini  <address@hidden>
+
+       Avoid possible false negatives in confh5.test.
+       * tests/confh5.test: Enable shell `errexit' flag, and bumped
+       copyright years.  Due to this change, any unexpected failure
+       in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
+       a failure in grepping expected text in output files should now
+       cause the whole test to fail.
+
+2010-04-17  Stefano Lattarini  <address@hidden>
+
+       Fixed typo in POD documentation of Automake::Channels.
+       * lib/Automake/Channels.pm: Fixed typo in POD documentation:
+       @<...> was used instead of C<...>.
+
+2010-04-14  Stefano Lattarini  <address@hidden>
+
+       Refactor tests on Automake TESTS color output.
+       * tests/color.test: Tests using the expect program moved out to...
+       * tests/color2.test: ... this new file.
+       * tests/Makefile.am (TESTS): Extended accordingly.
+
+2010-04-12  Stefano Lattarini  <address@hidden>
+
+       Fix typos in comments in test confh5.test
+       * tests/confh5.test: Fix a couple of typos in comments.
+
+       Avoid possible false negatives in canon-name.test.
+       * tests/canon-name.test: Enable shell `errexit' flag.  Improve
+       test description.
+
+2010-04-11  Ralf Wildenhues  <address@hidden>
+
+       Print 'warnings are treated as errors' note if needed.
+       * lib/Automake/Channels.pm: Fix typo in comment.
+       (_print_message): If -Werror is enabled, print a 'warnings are
+       treated as errors' note before the first such warning.
+       * tests/warnopts.test: Adjust comment to mention expected warning.
+       Adjust code to ignore 'warnings are treated as errors' note.
+       * tests/location.test: Adjust expected output with -Werror.
+       * tests/werror4.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
+       Ensure we don't print 'warning:' or 'error:' twice.
+       * Makefile.am (sc_ensure_testsuite_has_run): New helper rule.
+       (sc_tests_logs_duplicate_prefixes): New rule, to check for
+       wrong-looking warning and error messages in the test suite logs.
+       * aclocal.in (scan_configure_dep, scan_file): Remove duplicate
+       `warning: ' prefix.
+       * tests/vars3.test: Rename variable to avoid false positive.
+
+       Prepend type to warning, error, and fatal messages.
+       For the first part of messages of types `error' or `fatal',
+       prepend `error: ' to the message.  Prepend `warning: ' to
+       warning messages, whatever the setting of -Werror.
+       * lib/Automake/Channels.pm (partial): Move up definition.
+       (_format_message): Emit `header' and `footer' strings only with
+       the first resp. last part of a set of partial messages.
+       * lib/Automake/ChannelDefs.pm: Add missing '1;' statement at the
+       end of the module.
+       (Automake::ChannelDefs): Setup warning channels with header
+       `warning: ', error and fatal messages with header `error: '.
+       * tests/condinc2.test, tests/ltinstloc.test: Adjust expected
+       error messages.
+       * tests/comment5.test: Likewise.  Also, include stack notes
+       should not start with `error:'.
+       * tests/location.test: Likewise.  Also, try both -Werror and
+       -Wno-error.
+       * NEWS: Update.
+       Report by Bruno Haible.
+
+       Fix capitalization of error messages, reword one message.
+       * lib/Automake/Variable.pm (define): Do not capitalize the first
+       word in the error message.
+       * automake.in (require_file_internal): Likewise.  Also, reword
+       and line-wrap for better readability.
+       * tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
+       Adjust tests.
+
+       Fix connected warnings about obsolete exeext override.
+       * lib/Automake/Rule.pm (define): Merge two warnings that belong
+       together, by setting the 'partial' flag for the first one.
+
+       Fix per-Makefile.am setting of -Werror.
+       Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
+       Makefile.am would carry over to other Makefile.am files
+       treated afterwards by the same thread, causing inconsistent
+       and unstable exit status values.
+       * lib/Automake/Channels.pm (dup_channel_setup)
+       (drop_channel_setup): Save and restore the setting of
+       $warnings_are_errors.
+       * tests/werror3.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+
+2010-04-11  Stefano Lattarini  <address@hidden>
+
+       Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
+       * tests/confh5.test: In the generated Makefile.am: do not use
+       `test ! -e FILE' to check for the non-existence of a file, since
+       that is not supported by Solaris/Heirloom Sh.
+
+       Make test `aclocal3.test' stricter.
+       * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
+       succeeds unexpectedly.
+
+       Add tests checking that symlinks are resolved by `make dist'.
+       * tests/distlinks.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+       Suggested by observations from Ralf Wildenhues.
+
+2010-04-11  Ralf Wildenhues  <address@hidden>
+
+       Use -9 for maximum xz compression with dist-xz.
+       * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
+       * NEWS, THANKS: Update.
+       Report by Pavel Sanda.
+
+2010-04-11  Stefano Lattarini  <address@hidden>
+
+       Avoid possible false negatives in cond46.test.
+       * tests/cond46.test: Enable shell `errexit' flag (and bumped
+       copyright years).  Due to this change, the testcase should now
+       fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
+       outcomes were previously unchecked), and on failures in grepping
+       the expected diagnostic in Automake stderr.
+
+2010-04-04  Stefano Lattarini  <address@hidden>
+
+       Generated tests are now just a thin layer around other tests.
+       * tests/Makefile.am: Rewrite the rule to generate the `*-p.test'
+       test scripts so that any of them simply includes the corresponding
+       `*.test' script (after setting `$parallel_tests' to `yes').
+       * tests/.gitignore: Add wildcard for temporary files used in the
+       generation of `*-p.test' tests.
+
+2010-03-30  Stefano Lattarini  <address@hidden>
+
+       Avoid an unportable use of `$status' shell variable.
+       * Makefile.am (path-check): Don't use the `$status' shell variable
+       in the target's rules, as it's special in Zsh (equivalent to `$?',
+       and readonly).
+
+       Avoid another use of `chmod -R'.
+       * Makefile.am (path-check): To be safe, do not use `chmod -R' on
+       $(distdir) before removing it (as Solaris `chmod -R' touches
+       symlink targets).  Instead, use the cleanup strategy used in
+       distdir.am.
+
+2010-03-28  Ralf Wildenhues  <address@hidden>
+
+       Remove uses of @acronym and @sc.
+       * doc/automake.texi (Public Macros, Limitations on File Names):
+       Remove all usage of @acronym and @sc in the manual.
+       Suggested by Karl Berry.
+
+2010-03-13  Karl Berry  <address@hidden>
+
+       GNU hello uses fdl.texi, not gpl.texi.
+       * doc/automake.texi (Texinfo): Adjust example to upstream
+       change.
+
+2010-03-06  Ralf Wildenhues  <address@hidden>
+
+       Formatting cleanups in macro comments.
+       * automake.in, lib/Automake/Channels.pm,
+       lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
+       lib/Automake/Variable.pm, lib/Automake/XFile.pm,
+       m4/options.m4, m4/substnot.m4: Fix macro comment format.
+
+2010-03-04  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Avoid generation of `tests/defs-p' file.
+       * tests/defs.in: In the generated `configure.in' snippet: call
+       `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
+       variable `parallel_tests' is set to `yes'.
+       * tests/Makefile.am (defs-p): Target removed.
+       (check_SCRIPTS): Removed `defs-p'.
+       (clean-local-check): Do not unlink `defs-p' anymore.
+       ($(parallel_tests)): Transformation rules for the test scripts
+       adjusted.
+       * tests/gen-parallel-tests: Selection rules for the test
+       scripts adjusted.
+       * tests/parallel-tests.test: Set `$parallel_tests' to `yes'
+       then include `./defs' (rather than simply including `./defs-p').
+       * tests/parallel-tests2.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests4.test: Likewise.
+       * tests/parallel-tests5.test: Likewise.
+       * tests/parallel-tests6.test: Likewise.
+       * tests/parallel-tests7.test: Likewise.
+       * tests/parallel-tests8.test: Likewise.
+       * tests/parallel-tests9.test: Likewise.
+       * tests/parallel-tests10.test: Likewise.
+       * tests/README (Section "Writing Test Cases" subsection "Do"):
+       Adjusted the parts referring to tests checking `parallel-tests'
+       behaviour.  Some other minor related improvements.
+       * tests/.gitignore (defs-p): Removed.
+
+2010-03-04  Stefano Lattarini  <address@hidden>
+
+       Remove redundant unset of variable TESTS from some test scripts.
+       * tests/color.test: Do not unset the `TESTS' variable, as it's
+       already unset in the `defs' file.
+       * tests/check5.test: Likewise.
+       * tests/check8.test: Likewise.
+       * tests/check9.test: Likewise.
+       * tests/check10.test: Likewise.
+       * tests/check11.test: Likewise.
+       * tests/parallel-tests.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/parallel-tests4.test: Likewise.
+       * tests/parallel-tests5.test: Likewise.
+       * tests/parallel-tests6.test: Likewise.
+       * tests/parallel-tests7.test: Likewise.
+
+2010-03-01  Ralf Wildenhues  <address@hidden>
+
+       Fix cscope test on systems without working Fortran compiler.
+       * tests/cscope.test: Skip remainder of test if `$MAKE all' fails.
+       * THANKS: Update.
+       Report by Peter Johansson.
+
+2010-02-24  Antonio Diaz Diaz  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       Add lzip compression support.
+       * automake.in (handle_dist): Recognize dist-lzip.
+       (make_paragraphs): Map LZIP to dist-lzip.
+       * doc/automake.texi (Dist): Add dist-lzip.
+       (Options): Likewise.
+       * lib/Automake/Options.pm (_process_option_list): Add dist-lzip.
+       * lib/am/distdir.am
+       (dist dist-all): Add command to create an lzip-compressed tarball.
+       (distcheck): Handle lzip-compressed tarballs just like the others.
+       * tests/defs.in: Test for lzip, too.
+       * tests/lzip.test: New file, based on nogzip.test.
+       * tests/Makefile.am (TESTS): Add lzip.test.
+       * NEWS: Update.
+
+2010-02-22  Karl Berry  <address@hidden>
+
+       Improve help message of mdate-sh.
+       * mdate-sh: mention actual output format in help message.
+
+2010-02-22  Ralf Wildenhues  <address@hidden>
+
+       Deprecate dist-lzma in favor of dist-xz.
+       * doc/automake.texi (The Types of Distributions, Options):
+       Adjust text to reflect renaming of lzma to xz.
+       * NEWS: Update.
+       Missing deprecation noted by Antonio Diaz Diaz.
+
+2010-02-20  Stefano Lattarini  <address@hidden>
+
+       Add tests about support of wildcards in EXTRA_DIST.
+       * tests/extra10.test: New test, check basic support of wildcards
+       in EXTRA_DIST.
+       * tests/extra11.test: New test, check more complex usage of
+       wildcards in EXTRA_DIST.
+       * tests/extra12.test: New test, check usage of wildcards in
+       EXTRA_DIST when $builddir != $srcdir.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+       Necessity of these new tests suggested by Braden McDaniel
+       and Ralf Wildenhues.
+
+2010-02-08  Simon Josefsson  <address@hidden>
+
+       Fix copyright statement in gnupload script.
+       * lib/gnupload: Fix copyright statement.
+
+2010-02-06  Dmitry V. Levin  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       Fix exit status of signal handlers in shell scripts.
+       The value of `$?' on entrance to signal handlers in shell scripts
+       cannot be relied upon, so set the exit code explicitly to
+       128 + SIG<SIGNAL>.
+       * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
+       * lib/elisp-comp: Likewise.
+       * lib/install-sh: Likewise.
+       * lib/ylwrap: Likewise.  Also, fix script to trap signal 13, not 3.
+       * NEWS, THANKS: Update.
+       Bug report, analysis, and initial patch by Dmitry V. Levin.
+
+2010-02-06  Karl Berry  <address@hidden>
+
+       Improve gnupload usage text.
+       * gnupload (usage): Shorten to make more likely to fit on a tty
+       line.  Mention CMD in the synopsis.  With ..., plural is implied.
+
+2010-01-28  Christos Kontas  <address@hidden>  (tiny change)
+
+       Fix some typos in the manual
+       * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
+
+2010-01-24  Ralf Wildenhues  <address@hidden>
+
+       Fix silent-rules output for disabled dependency tracking.
+       * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
+       expansion code to also work in the case where %AMDEP% expands
+       to FALSE at config.status time, using new substitution string
+       %VERBOSE-NODEP%.
+       * automake.in (verbose_nodep_flag): New function, appending
+       address@hidden@' to the verbose-variable name.
+       (handle_languages): If dependencies are not disabled, use it to
+       set %VERBOSE-NODEP%.
+       * m4/depend.m4: Substitute am__nodep as '_no', so the second
+       verbose-variable will always expand to an empty string, if
+       dependencies are enabled.
+       * tests/silent5.test: Also test --disable-dependency-tracking;
+       also test per-target flags for non-C language files.
+       * tests/silent9.test: New test, like silent4.test but disable
+       dependency tracking.
+       * tests/Makefile.am: Adjust.
+       * NEWS, THANKS: Update.
+       Report by Dmitry V. Levin <address@hidden>.
+
+2010-01-17  Stefano Lattarini  <address@hidden>
+
+       Slighty improve tests acoutbs.test and acoutbs2.test.
+       * tests/acoutbs2.test: Enable `errexit' shell flag.  Check that
+       autoconf and configure work, that the file `zot' is created by
+       configure, and that no file containing a backslash in its name is
+       created.
+       * tests/acoutbs.test: Likewise, plus updated copyright years.
+
+       Fix test acoutbs2.test.
+       * tests/acoutbs2: In the generated configure.in: add proper calls
+       to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
+       PACKAGE and VERSION. Add a call to aclocal before calling automake.
+       Updated copyright years.
+       * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
+
+       Add forgotten test scripts to $(TESTS).
+       * tests/Makefile.am (TESTS): Added test scripts present on the
+       filesystem, which were erroneously left out from $(TESTS):
+       acoutbs2.test, badopt.test, extra2.test.
+       (XFAIL_TESTS): Added acoutbs2.test.
+
+2010-01-17  Ralf Wildenhues  <address@hidden>
+
+       Sync auxiliary files from upstream.
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
+       Sync from upstream.
+
+       Bump copyright years.
+       * aclocal.in (write_aclocal, version): Bump copyright years.
+       * automake.in (gen_copyright, version): Likewise.
+       * doc/automake.texi: Likewise.
+
+       Rotate ChangeLog.
+       * ChangeLog.09: New file, rotated from ...
+       * ChangeLog: ... here.
+       * Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
+
+-----
+
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
+
+;; Variables:
+;; coding: utf-8
+;; End:
diff --git a/old/ChangeLog.96 b/old/ChangeLog.96
new file mode 100644
index 0000000..d89c2e3
--- /dev/null
+++ b/old/ChangeLog.96
@@ -0,0 +1,3685 @@
+Wed Dec 18 15:27:09 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Sort configure_vars before adding to
+       output_vars.
+       (handle_yacc_lex_cxx): Sort de_ansi_objects.
+       (handle_man_pages): Sort %section keys.
+
+Tue Dec 10 00:41:17 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (AC_SUBST_PATTERN): Check for alphanumeric variable
+       names only.  Test subst.test.
+       (scan_one_configure_file): Skip AC_DEFUN lines.  Test
+       defun2.test.
+
+Mon Dec  9 08:18:42 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (file_contents_with_transform): Use ne, not !=, to
+       compare strings.  Compare against correct string.  From Jim
+       Meyering.
+       (handle_texinfo): Use rm -f to remove info files.  From Gord
+       Matzigkeit.
+
+       * Released 1.1l.
+
+       * automake.in (handle_texinfo): Put .ps on @suffixes.
+
+Sun Dec  8 12:29:52 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Directory with 'exec' in its name
+       is installed by install-exec.
+
+       * subdirs.am (maintainer-clean-recursive): Make commands quiet.
+       * texinfos.am: Make commands quiet.
+       * scripts.am: Make commands quiet.
+       * progs.am: Make commands quiet.
+       * ltlibs.am: Make comamnds quiet.
+       * lisp.am: Make commands quiet.
+       * libs.am: Make commands quiet.
+       * header.am: Make commands quiet.
+       * data.am: Make commands quiet.
+
+       * automake.in (variable_value_as_list): Handle := substitution
+       references.
+       (am_conf_line_error): Take file argument.  Changed all callers.
+       (scan_one_configure_file): Skip config header of [$1].
+       (scan_dependency_file): Don't add top_builddir to regex if it is
+       ".".  Don't include top_builddir in output if it is ".".
+       (scan_one_configure_file): Skip version of [$2].
+
+Sat Dec  7 11:34:39 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): New sub.
+       (scan_configure): Scan aclocal.m4 as well as configure.in.
+       (handle_configure): Makefile.in now depends on $(ACLOCAL), because
+       automake scans it.
+
+       * automake.in (handle_configure): Put full path to file onto
+       @rewritten_inputs.  Test output4.test.
+
+       * automake.in (handle_configure): Put proper name onto @inputs.
+       Test output3.test.
+
+       * automake.in (handle_configure): Pass correct args to automake
+       invocations.  Test remake2.test.
+
+       * automake.in (handle_configure): Check dirname of $file, not of
+       $local.  Test output2.test.
+
+       * automake.in (handle_dependencies): Added some missing ";"s in
+       transforms.
+       (get_object_extension): Ditto.
+       (handle_tags): Ditto.
+       (handle_tests): Ditto.
+       (read_am_file): Ditto.
+       (am_install_var): Ditto.
+       (file_contents_with_transform): Die if transform missing trailing
+       ";".
+
+       * automake.in (am_install_var): Quote $ in regexp substitution.
+       From Ulrich Drepper.
+
+Fri Dec  6 18:54:10 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Require actual input files, not
+       rewritten input files.  From Ulrich Drepper.
+
+Thu Dec  5 02:52:20 1996  Tom Tromey  <address@hidden>
+
+       Suggestion from Mark Galassi:
+       * texinfos.am (DVIPS): New macro.
+       (.dvi.ps): New rule.
+
+       * automake.in (handle_dependencies): Check to make sure
+       --build-directory specified before searching for .P files.
+       (handle_configure): Correctly handle ":" syntax when running
+       config.status.
+
+       * remake.am: Removed rules to regenerate Makefile and Makefile.in;
+       now handled by handle_configure.
+
+       * remake-subd.am: Removed.
+
+       * automake.in (scan_configure): Handle multiple ":"s in AC_OUTPUT
+       arg.
+       (parse_arguments): Ditto.
+       (handle_configure): Ditto.
+       (%other_output_files): Removed.
+       (rewrite_inputs_into_dependencies): New sub.
+       (handle_configure): Use it.
+       (handle_configure): Ditto.
+
+       From Gord Matzigkeit:
+       * automake.in (generate_makefile): Handle ":" in AC_OUTPUT arg.
+       (handle_configure): Ditto.
+
+       * automake.in (handle_single_transform_list): .S is assembly
+       source.  From Anthony Green.
+
+       * automake.in (handle_single_transform_list): Correctly rewrite
+       C++ and Fortran source to objects ending in ".o".  Test
+       cxxo.test.
+
+       * automake.in: Better error message if file missing.
+
+       * aclocal.in (@obsolete_macros): ud_GNU_GETTEXT is obsolete.
+       * automake.in (handle_gettext): Use AM_GNU_GETTEXT, not
+       ud_GNU_GETTEXT.
+       (scan_configure): Ditto.  ud_GNU_GETTEXT is now obsolete.
+
+Wed Dec  4 00:41:23 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): Skip empty elements when adding to
+       libsources.  Perl 4 bug reported by Greg A Woods.
+
+       * Makefile.am (perl4-check): New target.
+       (cvs-dist): Run perl4-check.
+
+       Perl 4 fixes.  Reported by Greg A. Woods:
+       * automake.in (file_contents_with_transform): If transform caused
+       all chars to go away, then skip rest of loop.
+       (handle_texinfo): Don't use "next" in arg to
+       file_contents_with_transform.
+       (handle_dependencies): Ditto.
+       (handle_tests): Ditto.
+
+       * m4/regex.m4 (AM_WITH_REGEX): Check for GNU regex in libc.  From
+       Andreas Schwab.
+
+       * automake.in (parse_arguments): Removed --strictness.
+       (handle_dist_worker): Don't use --strictness.
+       (handle_configure): Ditto.
+       (initialize_global_constants): Don't mention --strictness.
+
+       * automake.in (handle_merge_targets): Use all-recursive-am instead
+       of all-recursive-hack.  The latter is ugly, according to Joel
+       Weber.
+
+       * automake.in (handle_emacs_lisp): Push $(ELCFILES) onto @all.
+
+       * automake.in (do_one_clean_target): Allow -local version of clean
+       targets.
+
+Tue Dec  3 18:58:40 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Skip C-only lines in
+       depend2.am when appropriate.
+       * depend2.am (.deps/%.P): Omit modification of $o if language is
+       not C.
+
+Tue Dec  3 11:29:01 1996  Gordon Matzigkeit  <address@hidden>
+
+       * compile-kr.am: Quote arguments to echo.
+
+       * progs.am: Fix up problems when LIBTOOL is not defined (by
+       setting shell variable instprog to the installation program).
+
+       * aclocal.in (scan_file): Allow the acinclude.m4 file to override
+       any other macro files (but still prevent multiple definitions
+       within acinclude.m4).
+
+Tue Dec  3 10:40:48 1996  Tom Tromey  <address@hidden>
+
+       From Ulrich Drepper:
+       * automake.in (handle_emacs_lisp): Typo fix.
+       (scan_configure): Only recognize VERSION after whitespace.
+
+       * texinfos.am: install-info requires path to info file.
+
+       * progs.am: Use @LIBTOOL@, not $(LIBTOOL).
+
+       * automake.in (am_install_var): If -ltlibs passed, substitute
+       @address@hidden
+
+Mon Dec  2 13:51:11 1996  Gordon Matzigkeit  <address@hidden>
+
+       * automake.in (get_object_extension): Unshift ansi2knr onto the
+       all target, so that it builds before any other targets.
+       [de_ansi_objects]: Delete, since unshifting ansi2knr is an easier
+       solution.
+
+Mon Dec  2 12:13:27 1996  Tom Tromey  <address@hidden>
+
+       * Released 1.1i.
+
+       From Janos Farkas:
+       * automake.in (handle_texinfo): Must quote $ for make.
+
+Sun Dec  1 15:08:09 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Correctly handle common case of
+       multiple non-Makefiles in AC_OUTPUT.  Require all input files when
+       using ":" syntax.
+
+Sun Nov 24 00:33:50 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Don't define
+       EXTRA_prog_SOURCES unnecessarily.  Test extra2.test.
+
+       * automake.in (initialize_per_input): New variables
+       included_generic_compile, included_knr_compile,
+       included_libtool_compile.
+       (get_object_extension): Use them.
+
+       * automake.in (handle_single_transform_list): Removed
+       Objective-C/C++ support (didn't really work anyway).
+       (handle_single_transform_list): Handle assembly specially.
+
+       * automake.in (handle_yacc_lex_cxx): Set --mode=compile or
+       --mode=link when running libtool.
+
+       * ltlibs.am: Set --mode=install when running libtool.
+       (address@hidden@PROGRAMS): Set --mode=uninstall when running
+       libtool.
+       * libtool.am (.c.lo): Set --mode=compile when running libtool.
+       * progs.am: Set --mode=install when running libtool.
+
+       Fix for bug reported by François Pinard:
+       * automake.in (do_check_merge_target): New sub.
+       (do_one_merge_target): No longer handle `check'.
+       (handle_merge_targets): Use do_check_merge_target.
+       (initialize_per_input): Set @check_tests.
+       (handle_tests): Push onto @check_tests, not @check.
+
+       * automake.in (am_install_var): Typo fix.
+       (handle_configure): Require $inputs[0].
+
+Fri Nov 22 00:01:45 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_lib_objects): Fixed error message
+       processing.
+
+Thu Nov 21 22:29:30 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): AC_FUNC_FNMATCH doesn't add to
+       LIBOBJS.
+       (handle_configure): Support multi-":" mode for AC_OUTPUT.
+
+       * m4/header.m4: New file.
+
+       * automake.in (scan_configure): Recognize AM_CONFIG_HEADER.
+
+Wed Nov 20 00:23:42 1996  Tom Tromey  <address@hidden>
+
+       * acinstall: Allow commentary at end of "serial" line.  From Gord
+       Matzigkeit.
+
+       * automake.in (handle_yacc_lex_cxx): Only replace output header if
+       it has changed.
+
+Tue Nov 19 19:03:30 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_primary_prefixes): Allow configure variables to
+       be named after primary.
+       (am_install_var): Ditto.
+
+       * automake.in (initialize_per_input): Initialize output_header.
+       (generate_makefile): Set up output_header; print it before
+       output_rules.
+       (handle_footer): Put .SUFFIXES into output_header, for AIX.
+
+Mon Nov 18 19:11:53 1996  Gordon Matzigkeit  <address@hidden>
+
+       * automake.in: Added a lot of libtool support.  New variable
+       prog_LDFLAGS to pass linker flags.  Use libtoolize to install
+       libtool support files.
+
+Mon Nov 18 13:29:55 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_lib_objects): Push @LIBOBJS@ and @ALLOCA@
+       onto dependency list.
+
+       * aclocal.in (obsolete_macros): Include AM_SANITY_CHECK_CC; now
+       part of autoconf proper.
+       * m4/ccsanity.m4: Removed.
+
+Sun Nov 17 12:25:17 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (check_typos): Check to make sure EXTRA_ variables
+       don't contain configure subs.
+       (handle_dist_worker): Removed EXTRA_DIST_DIRS; not needed.
+
+Fri Nov 15 18:58:04 1996  Tom Tromey  <address@hidden>
+
+       * tags-subd.am: Removed.
+
+       * tags.am (tags-recursive): Removed.
+       (TAGS): Depend on @DIRS@, @address@hidden  Use @CONFIG@ in rule.
+       (ID): From tags-subd.am.
+
+       * aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH.
+       * automake.in (scan_configure): Recognize AC_FUNC_FNMATCH.
+       * m4/fnmatch.m4: Removed (now in autoconf).
+
+       * automake.in (initialize_per_input): Init de_ansi_objects.
+       (handle_single_transform_list): Error if extension unrecognized.
+       Set elements of de_ansi_objects.
+       (get_object_extension): Don't push ANSI2KNR onto @all.
+       (handle_yacc_lex_cxx): Put ANSI2KNR into dependency of all ._o
+       files.
+       (pretty_print_internal): Initialize $bol depending on the column.
+
+Fri Nov 15 16:22:15 1996  Gordon Matzigkeit  <address@hidden>
+
+       * library.am: Fixed references to LIBRARY according to new scheme.
+
+       * libs.am, libs-clean.am: Removed references to LIBFILES.
+
+       * automake.texi (A Library): doc fix
+
+       * automake.in (handle_libraries): Deleted references to *LIBFILES,
+       since we now have the full library name in the *LIBRARIES
+       variable.
+       (am_install_var): Removed `-no-all' option, which was only required
+       for the LIBFILES hack.
+
+Fri Nov 15 16:39:29 1996  Tom Tromey  <address@hidden>
+
+       * automake.in: Applied libtool-related patches from Gord.
+       (scan_configure): Set CC configure var if AM_PROG_LIBTOOL seen.
+       Also indicate that AC_CANONICAL_HOST was run.
+
+       * Makefile.am (pkgdata_DATA): Removed aclocal.m4.
+
+Thu Nov 14 23:11:09 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Don't auto-define YACC, LEX,
+       CXX, CC.
+
+       * dejagnu.am: Print warning if runtest missing.
+
+       From Joerg-Martin Schwarz:
+       * automake.in (handle_aclocal_m4): Find aclocal.m4 in srcdir.
+       (require_file_internal): Unlink file before creating it.
+
+       * depend2.am (.deps/%.P): Don't print commands when running.
+
+Mon Nov 11 10:35:08 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Simplified C++
+       matching expression.
+
+Fri Nov  8 09:49:09 1996  Tom Tromey  <address@hidden>
+
+       * Released 1.1g.
+
+       * compile-kr.am ($(OBJECTS)): Removed.
+
+       * automake.in (get_object_extension): Define ANSI2KNR.  Push onto
+       @all if ansi2knr is in this directory.
+
+       * configure.in: Don't run AC_ARG_PROGRAM, AC_PROG_MAKE_SET.
+
+       * m4/init.m4: Run AM_SANITY_CHECK.
+
+       * m4/sanity.m4: New file.
+
+       * automake.in (handle_dist_worker): In Cygnus mode, possibly find
+       files to dist in build dir, not srcdir.
+       (%omit_dependencies): New global.
+       (scan_dependency_file): Handle OMIT_DEPENDENCIES.
+       (scan_configure): Put rx.h, regex.h on %omit_dependencies.  Ditto
+       libintl.h.
+       (handle_tests): Remove CYGNUS strings in Cygnus mode.
+       (handle_texinfo): Ditto.
+
+       * texinfos.am (dist-info): New target.
+
+       * automake.in (handle_dist_worker): Use DISTFILES, not
+       DEP_DISTFILES.
+       (initialize_per_input): Initialize dist_targets.
+       (handle_texinfo): Don't compute @infos_list; don't define or use
+       INFOS.  Put dist-info onto @dist_targets.
+       (handle_dist_worker): Handle @dist_targets.  Don't use the "echo
+       trick" for expanding DISTFILES any more.
+
+       * dist-vars.am (DEP_DISTFILES): Removed.
+       (DISTFILES): Don't include INFOS.
+
+       * automake.in (handle_texinfo): Handle Cygnus mode.
+       * texinfos.am (.texi.info, .texinfo.info): Handle Cygnus mode.
+
+       * automake.in (handle_single_transform_list): New sub.
+       (handle_source_transform): Use it.
+       (handle_built_sources): New sub.
+
+Thu Nov  7 14:49:16 1996  Tom Tromey  <address@hidden>
+
+       * remake.am ($(srcdir)/Makefile.in): Pass @ARGS@ to automake.
+       * remake-subd.am ($(srcdir)/Makefile.in): Pass @ARGS@ to
+       automake.
+       * automake.in (handle_configure): Pass --cygnus when running
+       automake again.
+
+       * remake-hdr.am ($(srcdir)/stamp-h.in): Depend on @FILES@, not
+       ACCONFIG, CONFIG_TOP, CONFIG_BOT.
+       * automake.in (handle_aclocal_m4): Always find aclocal.m4 in
+       top_srcdir.
+       (handle_configure): Don't define ACCONFIG, CONFIG_TOP, CONFIG_BOT;
+       instead substitute files directly.
+
+Wed Nov  6 10:22:26 1996  Tom Tromey  <address@hidden>
+
+       * remake-hdr.am (stamp-h): Look in top_builddir for
+       config.status.
+       ($(srcdir)/stamp-h.in): Look in top_srcdir for configure.in.
+
+Thu Oct 31 10:55:59 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texi.dvi): Set MAKEINFO when running texi2dvi.
+       From Jim Meyering.
+
+       * automake.in (handle_texinfo): Push install-info-am, not
+       install-info.
+       (handle_merge_targets): Handle no-installinfo option.
+
+       * texinfos.am (install-info-am): Renamed from install-info.
+
+       * automake.in (handle_subdirs): Include install-info-recursive if
+       no-installinfo given.
+
+       * subdirs.am: Include INSTALLINFO token.
+
+       * automake.in (handle_texinfo): Explicitly define MAKEINFO,
+       TEXI2DVI.
+       (cygnus_mode): New global.
+       (handle_dist_worker): Pass --cygnus to automake.
+       (initialize_global_constants): Document --cygnus.
+       (check_cygnus): New sub.
+       (handle_texinfo): Don't require texinfo.tex in Cygnus mode.
+
+       * texi-vars.am: Removed.
+
+       * dejagnu.am (check-DEJAGNU): Don't define rootme.
+
+       * automake.in (handle_tests): Define EXPECT, RUNTEST.
+
+       * dejagnu.am (EXPECT): Removed.
+       (RUNTEST): Removed.
+
+       * automake.in (define_program_variable): New sub.
+
+Mon Oct 28 10:43:48 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Use -M, not -MM, for C++
+       dependencies.
+
+Thu Oct 24 20:21:50 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (check_libobjs_sources): New sub.  Test
+       libobj4.test.
+       (handle_source_transform): Don't check for auto-discovered source
+       files here.
+       (handle_programs): Run check_libobjs_sources here.
+       (handle_libraries): Ditto.
+
+       * automake.in (define_configure_variable): New function.
+       (get_object_extension): Use define_configure_variable.
+       (handle_yacc_lex_cxx): Ditto.
+       (handle_emacs_lisp): Ditto.
+       (configure_vars): New global.
+       (AC_CHECK_PATTERN): New global.
+       (seen_ranlib, seen_prog_cc, seen_prog_cxx, seen_prog_lex):
+       Removed.
+       (handle_yacc_lex_cxx): Use configure_vars, not seen_prog_*.
+       (AC_SUBST_PATTERN): New global.
+       (scan_configure): Use AC_SUBST_PATTERN; don't set seen_prog_*.
+       (handle_libraries): Don't use seen_ranlib.
+       (read_am_file): Run define_configure_variable on each discovered
+       variable.
+
+Mon Oct 21 23:06:49 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): Handle AM_INIT_GUILE_MODULE.
+       (handle_libraries): Pass configure substitutions directly on to
+       LIBFILES.
+
+       * automake.in (AM_PACKAGE_VERSION_PATTERN): New global.
+       (scan_configure): Use it.  Test version.test.
+
+Sun Oct 20 12:08:46 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Explicitly pass distdir to
+       dist-hook make.  From Tatu Ylonen.
+
+       * m4/strtod.m4: Use correct cache variable.
+
+Thu Oct 17 13:45:20 1996  Tom Tromey  <address@hidden>
+
+       Lisp fixes from Erick Branderhorst:
+       * m4/lispdir.m4: Define lispdir, not LISPDIR.
+       * lisp.am: Added missing \.
+
+Fri Oct 11 00:44:49 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Only rewrite c, yacc, lex
+       to use de-ansi-fication.
+       (scan_configure): Handle multi-line AC_REPLACE_FUNCS.  Test
+       libobj5.test.
+
+       * automake.in (handle_lib_objects): Added $lex_seen argument.
+       Error if lex file used but LEXLIB not seen.
+       (handle_programs): Ditto.
+       (handle_yacc_lex_cxx): Define LEXLIB variable.
+       (handle_lib_objects): Don't allow LEXLIB to end up on dependency
+       list.
+
+Thu Oct 10 16:12:38 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_gettext): Moved check for SUBDIRS and
+       ABOUT-NLS here.
+
+       * automake.in (handle_configure): Run mkinstalldirs under
+       $(SHELL).
+       (handle_yacc_lex_cxx): Run interlock under $(SHELL).
+
+       * remake-subd.am (Makefile): Run config.status under $(SHELL).
+       * remake-hdr.am (stamp-h): Run config.status under $(SHELL).
+       * remake.am (Makefile): Run config.status under $(SHELL).
+       (config.status): Ditto.
+
+       * automake.in (read_am_file): Removed UNMAINT code.
+       (file_contents_with_transform): Ditto.
+       * m4/maintainer.m4: Removed bogus UNMAINT code.
+
+       * automake.in (handle_emacs_lisp): Define EMACS variable.
+       (handle_emacs_lisp): Make sure EMACS is in environment when
+       elisp-comp is run.
+
+       * elisp-comp: Exit with status 1 if usage bad.
+       Use "emacs -q".  Use EMACS environment variable if set (unless set
+       to t).
+
+       * m4/lispdir.m4: Unset EMACS if it is set to `t'.
+
+       * automake.in (handle_dist_worker): Allow EXTRA_DIST items to be
+       in subdirs.
+       (do_one_merge_target): Use all-am, not all, in subdirs case.
+       (handle_merge_targets): Always generate all-am in subdirs case.
+
+       * remake.am (Makefile): Depend on BUILT_SOURCES.
+       * remake-subd.am (Makefile): Depend on BUILT_SOURCES.
+       * depend.am (.deps/.P): Don't depend on BUILT_SOURCES.
+
+       * automake.in (handle_yacc_lex_cxx): Handle y.tab.h in non-ylwrap
+       case.
+
+       * ylwrap: Bug fix.  From Jim Meyering.
+
+Wed Oct  9 22:51:16 1996  Tom Tromey  <address@hidden>
+
+       * m4/mktime.m4: Don't define AC_HEADER_SYS_TIME_H; instead just
+       check directly for header.
+
+Mon Oct  7 13:08:15 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): fp_WITH_DMALLOC and fp_WITH_REGEX
+       are obsolete.
+
+Sun Oct  6 00:43:01 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (AC_CONFIG_AUX_DIR_PATTERN): New global.
+       (AM_INIT_AUTOMAKE_PATTERN): New global.
+       (scan_configure): Use them.
+
+       * aclocal.in (add_file): Search contents of included files.  Test
+       req.test.
+       (scan_m4_files): Don't skip acinclude.m4 when constructing
+       search.  Test acsilent.test.
+       (scan_m4_files): Scan acinclude.m4.
+
+       * aclocal.in (add_file): Removed debugging print.
+       (scan_configure): Set $file_contents when scanning acinclude.m4.
+       Test acinclude.test.
+
+       * configure.in: Upped to 1.1g.
+
+       * Released 1.1f.
+
+       * texinfos.am: Run : after install-info.
+
+       * aclocal.in (parse_arguments): Better error message.
+       * automake.in (parse_arguments): Better error message.
+
+       * remake.am (Makefile): Depend on $(srcdir)/Makefile.in, to work
+       around broken makes.  From David A. Swierczek.
+       * remake-subd.am (Makefile): Ditto.
+
+Sat Oct  5 11:29:48 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (generate_makefile): Put BUILT_SOURCES onto @all if
+       appropriate.
+       (handle_source_transform): Error if discovered source file is
+       mentioned.
+       (do_one_merge_target): Move all-vs-check test here.
+
+       * m4/obstack.m4: New file.
+       * m4/error.m4: New file.
+
+       * automake.in (scan_configure): Support AM_FUNC_MKTIME,
+       AM_FUNC_ERROR_AT_LINE, AM_FUNC_OBSTACK.
+
+       * texinfo.tex: New version from texinfo 3.9.
+
+       * automake.in (handle_yacc_lex_cxx): Updated for new ylwrap.
+       Also, handle y.tab.h file when "yacc -d" is used.
+       (do_one_merge_target): Use pretty_print_rule.
+
+       * ylwrap: Changed usage.
+
+       * m4/mktime.m4: New file.
+
+       * m4: Renamed all .m4 files to fit into 14-char limits.
+
+       * m4/Makefile.am (EXTRA_DIST): New macro.
+
+       * aclocal.in ($ac_defun_rx, %map, %file_contents): New globals.
+       (scan_m4_files): Use $ac_defun_rx.
+       (add_file): Ditto.
+       Run scan_m4_files.
+       (scan_configure): Scan acinclude.m4 before anything else.
+       (scan_file): New sub.
+       (check_acinclude): New sub.
+       (add_file): Rewrote.
+
+       * progs-clean.am, progs.am: Renamed from programs-clean.am,
+       programs.am.
+       * libs-clean.am, libs.am: Renamed from libraries-clean.am,
+       libraries.am.
+       * texi-vars: Renamed from texinfos-vars.am.
+       * comp-vars.am: Renamed from compile-vars.am.
+       * texi-vers.am: Renamed from texi-version.am.
+
+       * automake.in (require_file_internal): Give error if symlink can't
+       be made.
+       (require_config_file): Error message references configure.in.
+       (handle_yacc_lex_cxx): Fix order of arguments to ylwrap; from
+       Joerg-Martin Schwarz.
+       (handle_texinfo): Use texi-vers, not texi-version.
+       (get_object_extension): Use comp-vars, not compile-vars.
+       (handle_texinfo): Use texi-vars, not texinfos-vars.
+       (handle_libraries): Use `libs' prefix, not `libraries'.
+       (handle_programs): Use `progs' prefix, not `programs'.
+
+Fri Oct  4 01:14:08 1996  Tom Tromey  <address@hidden>
+
+       * aclocal.in (scan_m4_files): New sub.
+
+       * m4/AM_FUNC_STRTOD.m4 (am_cv_func_strtod_needs_libm): Set
+       am_cv_func_strtod_needs_libm, so we can avoid linking with -lm
+       everywhere.
+
+Thu Oct  3 20:11:16 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (uninstall-info): Run install-info --remove.
+
+       * automake.in (read_am_file): Define all variables after reading
+       .am file.  Test vpath.test.  Reported by Anthony Green.
+
+Mon Sep 30 08:31:51 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am: Run install-info.
+
+       * automake.in (variable_value_as_list): Just return if comment
+       seen.  Report from Mark Galassi.
+       (handle_options): Don't bother with explicit comment checking.
+
+Tue Sep 24 09:15:46 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Cleaned up dejagnu variables.
+
+Mon Sep 23 00:04:48 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (parse_arguments): New usage to conform to GNU
+       standards.
+
+       * aclocal.in (parse_arguments): New usage to conform to GNU
+       standards.
+
+       * automake.in (handle_scripts): Push new target onto @check.
+       * scripts.am (address@hidden@SCRIPTS): New target.
+
+       * automake.in (initialize_global_constants): Define %dist,
+       dist_header, dist_trailer.
+       (handle_dist): Make dist-all target.
+       (generate_makefile): Run check_typos later.
+       (examine_variable): New sub.
+       (handle_tags): Examine TAGS_DEPENDENCIES.  Test spell3.test.
+       Error if TAGS_DEPENDENCIES but no sources used.
+       (handle_configure): Examine CONFIGURE_DEPENDENCIES.
+
+Sat Sep 21 13:59:15 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): More error checking.
+
+Fri Sep 20 09:06:37 1996  Tom Tromey  <address@hidden>
+
+       * tags.am (TAGS): Minor cleanup.
+
+       * clean.am (distclean-generic): Don't remove CONFIG_HEADER.
+
+       * remake-hdr.am (mostlyclean-hdr, clean-hdr, distclean-hdr,
+       maintainer-clean-hdr): New targets.
+
+       * automake.in (handle_configure): Define CONFIG_HEADER correctly
+       when it is in current directory.
+       (handle_configure): Push "hdr" on @clean.
+
+       * remake-hdr.am (stamp-h): Run config.status in top_builddir.
+       ($(srcdir)/stamp-h.in): Run autoheader in top_srcdir.
+
+       * automake.in (scan_configure): Check for install.sh here.
+       (basename): New sub.
+       (handle_configure): Handle case where config.h is in subdir.
+       (handle_configure): Make stamp-in.h for user if it doesn't already
+       exist.
+       (touch): New sub.
+
+Tue Sep 17 23:35:14 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (EXTRA_DIST): Include pkgdata_DATA.
+
+       * dist-vars.am (DISTFILES): Don't distribute BUILT_SOURCES or
+       DATA.
+       (DEP_DISTFILES): Ditto.
+
+Mon Sep 16 22:28:56 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (check_typos): Renamed.
+       (check_typos): Check for _LDADD, _LIBADD, and _DEPENDENCIES.
+       (variable_defined): Note variable as being "seen".
+       (handle_lib_objects): Don't push configure substitutions onto
+       _DEPENDENCIES.
+
+Sun Sep 15 22:45:43 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_per_input): Init content_seen.
+       (variable_value_as_list): Set content_seen entry.
+       (define_variable): Ditto.
+       (define_pretty_variable): Ditto.
+       (check_source_typos): New sub.
+       (generate_makefile): Call it.
+
+Thu Sep 12 15:03:19 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Removed extraneous
+       space.  Test implicit.test.
+       (read_am_file): Make sure "canonical" variables are mentioned in
+       %contents.
+       (scan_configure): AC_CHECK_TOOL sets $seen_canonical to
+       $AC_CANONICAL_HOST conditionally.
+       (handle_footer): Don't use define_pretty_variable in all cases.
+
+Wed Sep 11 11:54:44 1996  Tom Tromey  <address@hidden>
+
+       * clean.am (distclean-generic): Remove CONFIG_CLEAN_FILES here,
+       per GNU/Gnits standards.
+
+       * libraries.am (address@hidden@LIBRARIES): Use two loops, so new
+       NORMAL_INSTALL and POST_INSTALL variables can work when empty.
+
+       * automake.in (handle_options): Rewrote version handling.  Now
+       returns error indicator.
+       (MACRO_PATTERN, BOGUS_MACRO_PATTERN): Handle `:=' definitions.
+       (RULE_PATTERN): Exclude `:=' from being a rule.
+
+       * m4/AM_PROG_CC_STDC.m4 (ac_save_CC): Bug fix from Jim Meyering.
+
+       * automake.in (variable_value_as_list): Always use am_line_error.
+       (define_variable): New sub.
+       (get_object_extension): Use define_variable.
+       (handle_yacc_lex_cxx): Ditto.
+       (handle_source_transform): Ditto.
+       (handle_programs): Ditto.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (handle_dependencies): Ditto.
+       (handle_aclocal_m4): Ditto.
+       (define_pretty_variable): New sub.
+       (handle_source_transform): Use define_pretty_variable.
+       (handle_lib_objects): Ditto.
+       (handle_libraries): Ditto.
+       (handle_dist): Ditto.
+       (handle_dependencies): Ditto.
+       (handle_configure): Ditto.
+       (handle_footer): Ditto.
+       (handle_emacs_lisp): Ditto.
+       (am_install_var): Ditto.
+
+       * Released version 1.1e.
+
+       * automake.in ($GNITS_VERSION_PATTERN): Handle non-alpha
+       releases.
+
+       * configure.in: Version 1.1e.
+
+       * automake.in (handle_texinfo): Distribute .info file.
+
+Sun Sep  8 09:00:37 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (EXTRA_DIST): New macro.
+       (maintainer-clean): Don't run "make check".
+       (pathchk): New target.
+
+       * automake.in (check_gnits_standards): Only check version number
+       syntax at top level.
+       ($package_version_line): New variable.
+       (scan_configure): Set it.
+       (check_gnits_standards): Use am_conf_line_error.
+       (scan_configure): Remove extraneous whitespace from version
+       number.
+       (handle_dist): Handle distcheck-hook.
+
+       * m4/AM_PROG_CC_STDC.m4: Applied patch from Jim Meyering.
+
+       * automake.in (scan_configure): Handle AM_WITH_REGEX.
+       (handle_lib_objects): Require .h files in %libsources but don't
+       generate dependencies for them.
+       (scan_configure): Also require rx.h and regex.h.
+
+       * m4/Makefile.am (m4data_DATA): Don't include AM_PROG_LIBTOOL,
+       AM_FEATURE_CTYPE, AM_FEATURE_ERRNO, AM_FEATURE_EXIT,
+       AM_SYSTEM_HEADER.
+
+       * texi-version.am: Use "cp; rm" and not "mv", to work around
+       broken mvs.
+
+       * automake.in ($package_version): New global.
+       (scan_configure): Set it.
+       (check_gnits_standards): Verify version string; require
+       README-alpha if alpha version.
+       (scan_configure): Recognize AM_FUNC_FNMATCH,
+       AM_REPLACE_GNU_GETOPT.
+
+       * Makefile.am (installcheck-local): Check all scripts.
+
+Sat Sep  7 19:22:32 1996  Tom Tromey  <address@hidden>
+
+       * tags-clean.am: Do deletions here again.
+
+Thu Sep  5 09:06:23 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (usage): Include bug-reporting information.
+       (handle_lib_objects): Error if LIBOBJS seen but never set.
+
+       * aclocal.in ($acdir): Use @datadir@/aclocal.
+       (usage): Include bug-reporting information.
+
+Wed Sep  4 11:36:06 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): .deps no longer in
+       srcdir.
+       (handle_lib_objects): Ditto.
+       (handle_dist_worker): Pass --build-dir to automake.
+       ($build_directory): New global.
+       (parse_arguments): Handle --build-dir.
+       (initialize_global_constants): Include --build-dir in help.
+       (scan_dependency_file): New sub.
+       (handle_dependencies): Use it.  Also, use $build_directory.
+       (initialize_global_constants): Added --srcdir-name.
+       (parse_arguments): Ditto.
+       (handle_dist_worker): Ditto.
+       ($srcdir_name): New global.
+       ($srcdir_rx): New global.
+       (parse_arguments): Set it.
+
+       * depend2.am: Removed all mention of $(srcdir).
+
+       * depend.am (MKDEP): Use gcc -M, not gcc -MM.
+       Removed all mention of $(srcdir); dependencies now put into build
+       dir.
+
+       * depend2.am ($(srcdir)/.deps/%.P): Fixed computation of `top'.
+       Don't do work silently.
+
+       * automake.in (handle_merge_targets): Error if invalid uninstall
+       targets are given.
+       (read_am_file): Fix for test block.test.
+
+Tue Sep  3 18:50:32 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (install-info): Added NORMAL_INSTALL.
+       * scripts.am (address@hidden@SCRIPTS): Added NORMAL_INSTALL.
+       * programs.am (address@hidden@PROGRAMS): Added NORMAL_INSTALL.
+       * lisp.am (address@hidden@LISP): Added NORMAL_INSTALL.
+       * libraries.am (address@hidden@LIBRARIES): Added NORMAL_INSTALL.
+       Also, use POST_INSTALL when running ranlib.
+       * header.am (address@hidden@HEADERS): Added NORMAL_INSTALL.
+       * data.am (address@hidden@DATA): Added NORMAL_INSTALL.
+
+       * automake.in (handle_man_pages): Added NORMAL_INSTALL invocation.
+       (handle_merge_targets): Ditto.
+       (handle_merge_targets): Error if PRE_INSTALL, POST_INSTALL, or
+       NORMAL_INSTALL defined.
+
+       * m4/AM_PROG_INSTALL.m4: INSTALL_SCRIPT defaults to
+       ${INSTALL_PROGRAM}.  From François Pinard.
+
+Tue Aug 27 08:25:05 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (file_contents_with_transform): Correctly remove
+       @(UN)?MAINT@ from input when maintainer mode not active.
+       (handle_aclocal_m4): Handle no-maintainer-mode case.
+
+       * remake-hdr.am ($(CONFIG_HEADER)): Removed @address@hidden
+
+       * m4/AM_SANITY_CHECK_CC.m4: New file (from Jim Meyering).
+
+Mon Aug 26 21:37:32 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_lib_objects): Bug fix from Steve M Robbins.
+       (handle_libraries): Don't include libraries from EXTRA_LIBRARIES
+       in LIBFILES definition.  Reported by Steve M Robbins.  Test
+       alllib.test.
+
+       * automake.in (variable_value_as_list): New sub.
+       (handle_source_transform): Use it.
+       (handle_lib_objects): Ditto.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (am_install_var): Ditto.
+       (handle_options): Ditto.
+
+Sat Aug 24 09:30:46 1996  Tom Tromey  <address@hidden>
+
+       Reported by Jim Meyering:
+       * automake.in (get_object_extension): Look in "./" for ansi2knr if
+       no path found.
+       (handle_aclocal_m4): Protect aclocal.m4 rule with @address@hidden
+
+       * remake.am (.PHONY): New target.
+
+       * m4/AM_MAINTAINER_MODE.m4: Also define UNMAINT.
+
+       * automake.in (check_gnu_standards): Disallow no-installman,
+       no-installinfo.
+       (read_am_file): Sed out UNMAINT too.
+       (file_contents_with_transform): Ditto.
+
+       * acinstall: New file.
+
+       * m4/AM_INIT_AUTOMAKE.m4: Define PACKAGE and VERSION.
+
+       * m4/AM_WITH_REGEX.m4: New version from François Pinard.
+
+       * m4/AM_TYPE_PTRDIFF_T.m4: Use am_cv, not ac_cv.
+       * m4/AM_C_PROTOTYPES.m4: Ditto.
+       * m4/AM_FUNC_STRTOD.m4: Ditto.
+       * m4/AM_PROG_CC_STDC.m4: Ditto.
+       * m4/AM_PROG_LIBTOOL.m4: Ditto.
+
+Fri Aug 23 22:23:50 1996  Tom Tromey  <address@hidden>
+
+       * m4/Makefile.am (m4datadir): New macro
+       (m4data_DATA): Renamed.
+
+       * Makefile.am (cvs-dist): Depend on distcheck target.
+
+Mon Aug 19 15:37:32 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): [common_files]
+       Include acinclude.m4.
+
+       * m4/AM_PROG_CC_STDC.m4: Patch from Jim Meyering/Kaveh Ghazi.
+
+Sat Aug 17 11:27:14 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Push `depend'-clean targets
+       on @clean.
+       * depend.am (mostlyclean-depend, clean-depend, distclean-depend,
+       maintainer-clean-depend): New targets.
+
+Tue Aug 13 17:53:58 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texinfo.info): New target.
+       (.texinfo.dvi): New target.
+
+       From Jim Meyering:
+       * automake.in (handle_texinfo): Use `.info[-0-9]*' as pattern to
+       match info files.
+       (handle_texinfo): Handle `.texinfo' files.
+
+Mon Aug 12 10:28:46 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file_internal): Special-case `.' when
+       finding files to distribute.  Test libobj2.test.
+
+       * aclocal.in (add_file): Fixed regexp for matching AC_DEFUN.  Test
+       order.test.
+
+       * m4/AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL.m4: New file.
+       * m4/AM_SYS_POSIX_TERMIOS.m4: New file.
+
+       * compile-kr.am: Removed duplicate ansi2knr rules.
+
+Sun Aug 11 00:20:16 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Bug fix from Josh MacDonald.
+       (handle_yacc_lex_cxx): Put C++ extensions on suffix list.
+       (mkdir): Removed.
+
+       * automake.in (initialize_global_constants): [common_files]
+       Include interlock and ylwrap.
+
+       * Released version 1.1c.
+
+       * aclocal.in (obsolete_macros): md_TYPE_PTRDIFF_T and
+       ud_PATH_LISPDIR are obsolete names.
+
+       * m4/AM_LC_MESSAGES.m4, m4/AM_WITH_NLS.m4, m4/AM_GNU_GETTEXT.m4:
+       Removed.
+
+       * automake.in (handle_lib_objects): Changed interface.  Now
+       generates _DEPENDENCIES variable if appropriate.
+       (handle_emacs_lisp): Use AM_PATH_LISPDIR.
+       (scan_configure): Ditto.
+
+       * Makefile.am (CLEANFILES): Removed.
+
+       * automake.in (handle_configure): Define CONFIG_CLEAN_FILES.
+
+       * clean.am (clean-generic): Remove $(CONFIG_CLEAN_FILES).
+
+       * compile-vars.am (CC, CFLAGS, COMPILE, LINK): Removed.
+
+       * automake.in (handle_yacc_lex_cxx): Require ylwrap in
+       multi-lex/yacc case.
+       (handle_source_transform): Changed return result.
+       (handle_programs): Use linker returned by
+       handle_source_transform.
+       (seen_prog_cc, seen_prog_cxx): New globals.
+       (scan_configure): Recognize AC_PROG_CC and AC_PROG_CXX.
+       (handle_yacc_lex_cxx): Error message if AC_PROG_CXX or
+       AC_PROG_YACC missing.
+       (seen_decl_yytext, seen_prog_lex): New globals.
+       (scan_configure): Set them.
+       (handle_yacc_lex_cxx): Warn about missing AC_PROG_LEX or
+       AC_DECL_YYTEXT.
+       (handle_yacc_lex_cxx): Use $(LEX_OUTPUT_ROOT).
+       (initialize_per_input): Initialize seen_c_source.
+       (handle_yacc_lex_cxx): Define CC, CFLAGS, COMPILE, LINK only when
+       C source seen.
+       (handle_source_transform): Set seen_c_source.
+
+       * interlock: Changed usage.
+
+       * ylwrap: New file.
+
+       * automake.in (handle_yacc_lex_cxx): Renamed.
+
+       * automake.in (handle_dependencies): Handle %cxx_extensions.
+       Include depend2.am when appropriate.
+
+       * depend2.am: New file; contents from depend.am but templatized.
+
+       * automake.in (initialize_per_input): Initialize
+       %cxx_extensions.
+       (handle_source_transform): Set %cxx_extensions.
+
+Sat Aug 10 10:29:30 1996  Tom Tromey  <address@hidden>
+
+       * interlock: New file.
+
+       * automake.in (handle_yacc_lex): New sub.
+       (handle_source_transform): Removed most yacc/lex handling.
+       (initialize_per_input): Init yacc_sources, lex_sources.
+       (generate_makefile): Run handle_yacc_lex.
+       (handle_merge_targets): Use `scalar' and not $# to find length of
+       array.
+
+       * m4/AM_FEATURE_EXIT.m4: Wrote.
+       * m4/AM_FEATURE_CTYPE.m4: Wrote.
+       * m4/AM_FEATURE_ERRNO.m4: Wrote.
+
+       * aclocal.in (macro_seen): New global.
+       (add_file): Set macro_seen entry.  Only push required macro on
+       @rlist if not already seen.  Test defun.test.
+
+       * automake.in (get_object_extension): Handle directory prefix on
+       `ansi2knr' option.
+
+       * kr-extra.am: New file.
+
+       * kr-vars.am: Removed.
+
+       * automake.in (handle_options): Handle directory prefix on
+       `ansi2knr' option.
+
+       * automake.in (scan_configure): Recognize AM_FUNC_STRTOD.
+
+       * aclocal.in (add_file): Error if macro is duplicated.  Test
+       dup.test.
+
+Fri Aug  9 09:18:46 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_programs): Substitute @address@hidden  Make sure
+       linker variable is transformed name.
+       * program.am (@PROGRAM@): Use @XLINK@ to link.
+
+       * automake.in (handle_scripts): Fixed call to
+       am_primary_prefixes.
+       (handle_libraries): Better error message when AC_PROG_RANLIB
+       required.
+
+       * automake.in (handle_libraries): Canonicalize library name.  Test
+       canon4.test.
+       * library.am (address@hidden@.a): Use @XLIBRARY@ where appropriate.
+       (address@hidden@.a): Look at _DEPENDENCIES variable.
+
+Thu Aug  8 10:57:21 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_scripts): Correctly compute
+       $scripts_installed.  Test scripts.test.
+
+Wed Aug  7 12:13:15 1996  Tom Tromey  <address@hidden>
+
+       * ansi2knr.c: New version.
+
+Tue Aug  6 10:58:37 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Handle more C++ file
+       extensions.  "Handle" Objective C.  Handle more FORTRAN
+       extensions.
+
+       * compile-vars.am (LEX): Removed.
+       (YACC): Removed.
+
+       * automake.in (handle_source_transform): Correctly handle lex
+       source.  Test lex.test.
+       (handle_source_transform): Skip more C++ headers.  Generate macro
+       definitions for YACC and LEX on first use.
+
+       * aclocal.in (parse_arguments): Mention GNU.
+       * automake.in (parse_arguments): Mention GNU.
+
+Mon Aug  5 00:12:45 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_programs): Define program_LINK.
+       * program.am (@PROGRAM@): Use program_LINK to link.
+
+       * Released version 1.1b
+
+       * automake.in (scan_configure): AM_INIT_AUTOMAKE sets
+       seen_prog_install to `2'.
+
+       * configure.in: Don't run AM_PROG_INSTALL.
+
+       * automake.in (parse_arguments): Use $PACKAGE.
+       ($PACKAGE): New global.
+       ($am_c_prototypes): Renamed.
+       (get_object_extension): Use am_c_prototypes.
+       (scan_configure): Ditto.
+       (scan_configure): Use AM_MAINTAINER_MODE.
+       (scan_configure): Warn about obsolete macros.
+
+       * aclocal.in (parse_arguments): Use $PACKAGE.
+       ($PACKAGE): New global.
+
+       * Makefile.am (CLEANFILES): Added aclocal.
+       (ETAGS_ARGS): Added aclocal.in.
+       (TAGS_DEPENDENCIES): Ditto.
+       (maintainer-check): Depend on aclocal.
+       (maintainer-check): Check aclocal.
+       (bin_SCRIPTS): Include aclocal.
+
+       * automake.in (scan_configure): Handle AM_INIT_AUTOMAKE.
+       (scan_configure): Use AM_PROG_INSTALL.
+
+       * configure.in: Use AM_INIT_AUTOMAKE.
+
+       * automake.in (keyed_aclocal_warning): Warning tells about
+       aclocal.
+       (handle_aclocal_m4): New sub.
+       (handle_configure): Use it.
+
+       * aclocal.in (output_file): New global.
+       (usage): Handle --output.
+       (parse_arguments): Handle --output.
+
+       * m4/AM_INIT_AUTOMAKE.m4: New file.
+
+       * m4/AM_PROG_CC_STDC.m4: Require AC_PROG_CC.
+       Don't touch CFLAGS.
+
+       * automake.in (handle_dist_worker): Reverted erroneous "-chmod".
+       (handle_texinfo): Don't generate `.info-[0-9]' as a filename.
+
+       * texinfos.am (.texi.info): Force .info file to be built in
+       srcdir.  From Franc,ois Pinard.
+
+       From Jim Meyering:
+       * m4/AM_PROG_CC_STDC.m4: (fp_PROG_CC_STDC): Include sys/stat.h in
+       test program so that DYNIX/ptx V4.1.3 doesn't use `-Xc
+       -D__EXTENSIONS__' -- with those options on that system, sys/stat.h
+       gets compile errors.  With help from Marcus Daniels.
+
+       * automake.in (initialize_global_constants): Put elisp-comp into
+       @common_files.  Bug from Glenn Amerine.
+
+Sun Aug  4 12:52:43 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Use fgrep, not grep.
+
+       * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
+
+       * automake.in (handle_emacs_lisp): Include lisp-clean.am in
+       output.
+       (initialize_global_constants): [install_man_format] Don't hide
+       "ugliness" at install time.
+
+       * lisp-clean.am: New file.
+
+       * tags-clean.am (maintainer-clean-tags): Remove TAGS and ID here.
+
+       * automake.in (handle_man_pages): Patch from Janos Farkas to fix
+       bug when installing man pages.  Test man.test.
+       (initialize_global_constants): [install_man_format] Make sure man
+       page can actually be found in either source or build dirs.
+       (handle_dist_worker): Use "755" permissions on distdir.
+
+       * automake.in (handle_dist): Allow chmod's to fail.
+       (am_primary_prefixes): New function.
+       (am_install_var): Use it.
+       (handle_libraries): Use it.  Test libfiles.test.
+       (handle_dist): For dist-tarZ, assume traditional "tar" and
+       "compress".
+
+       * m4/AM_FUNC_STRTOD.m4: New file.
+
+       * automake.in (handle_dist): Only generate `distdir' variable if
+       it doesn't already exist.
+
+       Fix for bug reported by Harlan Stenn.  Test tags.test.
+       * automake.in (initialize_per_input): Define dir_holds_sources.
+       (handle_tags): Check dir_holds_headers.
+       (handle_headers): Set dir_holds_headers.
+
+       * automake.in (handle_texinfo): Generate "version.texi" dependency
+       for .dvi file.  Bug reported by Glenn Amerine.  Test vtexi2.test.
+
+       * automake.in (handle_configure): Require file $input, not
+       "$local.in".  From Nyul Laszlo.  Test colon.test.
+
+Sun Jul 28 11:14:52 1996  Tom Tromey  <address@hidden>
+
+       * aclocal.in: New file.
+       * configure.in: Generate m4/Makefile, aclocal.
+       * Makefile.am (SUBDIRS): Include m4.
+       * m4/Makefile.am: New file.
+
+Fri Jul 19 10:12:27 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Put ansi2knr.c and
+       ansi2knr.1 into common_files.  Bug report from François Pinard.
+
+Mon Jul 15 10:28:29 1996  Tom Tromey  <address@hidden>
+
+       * install-sh: Updated copyright notice.
+
+Fri Jul  5 08:23:00 1996  Tom Tromey  <address@hidden>
+
+       * subdirs.am (maintainer-clean-recursive): Don't be so noisy.
+       Report from Josh MacDonald.
+
+       Bugs from Gord Matzigkeit:
+       * automake.in (handle_footer): Push contents of $(SUFFIXES), not
+       `$(SUFFIXES)'.
+       (handle_dist): Ignore chmod return results.
+
+       * programs-clean.am (address@hidden@PROGRAMS): Work around failing
+       Solaris "rm -f".  Bug from Kaveh R. Ghazi.
+       * libraries-clean.am (address@hidden@LIBRARIES): Likewise.
+
+Fri Jun 21 10:42:06 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (install-info): Use "if", not "&&", to avoid
+       install problem when glob doesn't match.
+
+       * automake.in (initialize_global_constants): [USAGE] Added
+       --no-force.
+       (force_generation): New global.
+       (parse_arguments): Handle --no-force.
+       (generate_makefile): Handle --no-force.
+
+       * Makefile.am (maintainer-check): Ensure all invocations of
+       mkinstalldirs are correct.
+
+Tue Jun 18 10:53:54 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Don't directly generate site.exp.
+
+Sun Jun 16 22:21:16 1996  Harlan Stenn  <address@hidden>
+
+       * automake.in:  Treat an initial `#' on a word in AUTOMAKE_OPTIONS
+       as a comment start.  Add support for a dist-tarZ target.
+
+Tue Jun 11 22:14:21 1996  Marcus Daniels  <address@hidden>
+
+       * depend.am ($(srcdir)/.deps/%.P): Convert absolute $(top_srcdir)
+       paths into relative paths.
+
+Mon Jun 10 21:11:20 1996  Tom Tromey  <address@hidden>
+
+       * texinfo.tex: New version.
+
+       * automake.in: Look for AM_PROG_LIBTOOL.  From Gord Matzigkeit.
+       (initialize_global_constants): Added libtool to
+       @common_sometimes.
+       (handle_source_transform): Pass YFLAGS to yacc and LFLAGS to lex.
+
+Sun Jun  9 17:45:48 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (install-info): Don't install ~ files.  Bug report
+       from Greg McGary.
+       * automake.in (handle_texinfo): Don't push '.info*' onto
+       @infos_list.
+
+       * automake.in (handle_gettext): Ensure po and intl in SUBDIRS when
+       using gettext.
+       (handle_dist): Pass --with-included-gettext to configure if using
+       gettext.
+
+       * compile-kr.am (._c._o): Pass -c to $(COMPILE).
+       (.c._o): Ditto.
+       * compile.am (.c.o): Pass -c to $(COMPILE).
+       * compile-vars.am (COMPILE): Don't include -c.
+
+       * remake.am ($(srcdir)/Makefile.in): Pass --strictness to
+       automake.
+       * automake.in (handle_configure): Supply --strictness arg to
+       automake.
+
+Fri Jun  7 12:31:31 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Fix quoting on `pwd`.
+       (handle_options): Recognize no-installinfo option.
+       (handle_man_pages): Don't put man directory on @installdirs if
+       no-installman is specified.
+       (handle_texinfo): Handle no-installinfo option.
+       (handle_options): Compare version against $num_version, not
+       $VERSION.
+       (handle_source_transform): Generate rules for output of lex,
+       yacc.  Bug report from Thomas Morgan.  Test yacc.test.
+       (handle_dist): "distcheck" now runs "make dvi".
+       (handle_tests): Support $(TESTS_ENVIRONMENT).  Idea from Ulrich
+       Drepper.
+
+       * dejagnu.am (check-DEJAGNU): Depend on site.exp.
+
+Sun Jun  2 10:33:10 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_emacs_lisp): New function.
+       (initialize_global_constants): Added elisp-comp to
+       @common_sometimes.
+       (seen_lispdir): New global.
+       (scan_configure): Handle ud_PATH_LISPDIR.
+
+       * elisp-comp: New file.
+
+       * lisp.am: New file.
+
+       * automake.in (generate_makefile): Run handle_emacs_lisp.
+
+       * aclocal.m4 (ud_PATH_LISPDIR): New macro, from Ulrich Drepper.
+
+       * automake.in (initialize_global_constants): Removed version.texi
+       from common_sometimes.
+       (initialize_global_constants): Added texinfo.tex to common_files.
+       Test texinfo.test.
+       (handle_tests): Allow dejagnu- and automake-style test suites to
+       coexist.  Test dejagnu.test.
+       (initialize_global_constants): New constants AC_CANONICAL_HOST,
+       AC_CANONICAL_SYSTEM.
+       (scan_configure): Use new constants.
+       (handle_tests): Put target specific information into site.exp if
+       AC_CANONICAL_* used.
+       (read_am_file): Generate some extra variables when AC_CANONICAL_*
+       used.
+       (handle_options): Allow version number to have letters appended.
+       (handle_tests): Error if RUNTEST, RUNTESTFLAGS defined but dejagnu
+       option not specd.
+       (initialize_global_constants): install_man_format changed to
+       handle built man pages.
+
+Wed May 29 10:35:01 1996  Tom Tromey  <address@hidden>
+
+       * config.guess, config.sub: New versions.
+
+Tue May 28 19:27:11 1996  Tom Tromey  <address@hidden>
+
+       * configure.in (VERSION): Upped to 1.0.
+
+Sat May 25 10:19:53 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Handle dejagnu.
+       (handle_options): Recognize dejagnu option.
+
+       * dejagnu.am: New file.
+
+Thu May 23 10:01:13 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Run installcheck target from
+       distcheck.
+
+       * configure.in (VERSION): Upped to 0.34.
+
+       * automake.in (scan_configure): Always allow upgrading to
+       fp_PROG_INSTALL.  Test fpinstall.test.
+
+Wed May 22 14:45:28 1996  Joshua Cowan  <address@hidden>
+
+       (handle_dist): Make `distcheck' check `install' target, too.
+
+Wed May 22 09:49:27 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_per_input): Don't initialize
+       $output_directory here; initialize it globally.  From Joshua
+       Cowan.  Test outdir.test.
+
+Sat May 18 10:57:40 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Don't push TESTS onto dist_common.
+       (initialize_global_constants): Put install-sh and mkinstalldirs
+       into @common_files.  Test insh2.test.
+
+Fri May 17 09:02:02 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Don't generate _OBJECTS
+       when no source files specified.  Test number.test.
+
+       From Joerg-Martin Schwarz:
+       * automake.in (seen_package, seen_version): New globals.
+       (scan_configure): Look for PACKAGE= and VERSION=.
+
+       * automake.in (handle_options): Recognize dist-zip.
+       (handle_dist): Handle dist-zip.
+       (handle_options): Use ' ', not \s+, with split.  Test
+       backsl.test.
+       (handle_source_transform): Likewise.
+       (handle_lib_objects): Likewise.
+       (handle_libraries): Likewise.
+       (handle_texinfo): Likewise.
+       (handle_man_pages): Likewise.
+       (handle_subdirs): Likewise.
+       (handle_gettext): Likewise.
+       (handle_footer): Likewise.
+       (handle_tests): Likewise.
+       (scan_configure): Likewise.
+       (am_install_var): Likewise.
+
+       * Makefile.am (TAGS_DEPENDENCIES): New macro.
+
+       * tags.am (tags-recursive): New target.
+       (TAGS): Depend on it.
+
+       * automake.in (handle_tags): Put tags-recursive on @phony.
+
+       * tags-subd.am (TAGS): Depend on HEADERS, SOURCES,
+       TAGS_DEPENDENCIES.
+       * tags.am (TAGS): Depend on HEADERS, SOURCES, TAGS_DEPENDENCIES.
+
+Thu May 16 09:21:48 1996  Tom Tromey  <address@hidden>
+
+       * remake.am (configure): Depend on $(CONFIGURE_DEPENDENCIES).
+
+       * automake.in (scan_configure): Look for install-sh and
+       mkinstalldirs here.
+       (initialize_global_constants): Moved mdate-sh from
+       common_sometimes to common_files.  Test mdate2.test.
+
+Tue May 14 21:52:01 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (seen_maint_mode): New global.
+       (scan_configure): Handle jm_MAINTAINER_MODE.
+       (read_am_file): Handle seen_maint_mode.
+       (file_contents_with_transform): Handle seen_maint_mode.
+       (handle_source_transform): Changed interface, all callers.
+
+       From Jim Meyering:
+       * remake-hdr.am, remake-subd.am, remake.am, texi-version.am:
+       Handle @address@hidden
+       * aclocal.m4 (jm_MAINTAINER_MODE): New macro.
+
+       * automake.in (handle_configure): Check $config_aux_dir against
+       empty string.  From Markku Rossi.  Test mkinstall.test.
+
+Fri May 10 14:38:47 1996  Gord Matzigkeit  <address@hidden>
+
+       * automake.in (distcheck): Added new rule to top level
+       Makefile.in.
+
+Wed May  8 21:57:21 1996  Gord Matzigkeit  <address@hidden>
+
+       * automake.in (scan_configure): Make sure that gm_PROG_LIBTOOL
+       sets seen_ranlib.
+       (generate_makefile): libtool, config.sub, and config.guess should
+       only ever appear in the top directory of a package.
+
+Tue May 14 10:24:30 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Added libversion.in
+       to @common_files.
+
+       * configure.in (VERSION): Upped to 0.33.
+
+       * automake.in (am_install_var): Fixed problem in EXTRA_ handling.
+       Test extra.test.
+
+Mon May 13 10:41:41 1996  Tom Tromey  <address@hidden>
+
+       * install-sh (transformbasename): Correct misspelling of
+       transformbasename.  From Ian Lance Taylor.
+
+Sat Apr 27 11:39:10 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Set mkinstalldirs variable
+       here.
+       (handle_dist_worker): Explicitly set distdir in subdir makes.
+       (handle_dist): Handle separate distdir target.
+       (handle_dist_worker): Only generate distdir target.
+
+       * texinfos.am (install-info): Use $(mkinstalldirs).
+       * scripts.am (address@hidden@SCRIPTS): Use $(mkinstalldirs).
+       * programs.am (address@hidden@PROGRAMS): Use $(mkinstalldirs).
+       * libraries.am (address@hidden@LIBRARIES): Use $(mkinstalldirs).
+       * header.am (address@hidden@HEADERS): Use $(mkinstalldirs).
+       * data.am (address@hidden@DATA): Use $(mkinstalldirs).
+
+       * automake.in (read_am_file): Set mkinstalldirs variable.
+       (handle_man_pages): Use it.
+       (handle_installdirs): Ditto.
+
+Fri Apr 26 15:10:48 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_man_pages): Fix mkinstalldirs invocation.
+
+Thu Apr 25 18:40:06 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Use $(TAR), not tar.
+       (handle_merge_targets): Make sure config header is built before
+       recursing into subdirs.
+       (handle_libraries): Generate LIBFILES for check_LIBRARIES.
+       (handle_merge_targets): Handle case where nothing is installed but
+       something must be built -- "make install" must still work.
+
+       * dist-vars.am (TAR): New macro.
+
+       * automake.in (scan_configure): Support AC_REPLACE_GNU_GETOPT.
+       (handle_configure): Require stamp-h.in when config header used.
+
+Tue Apr 23 17:57:13 1996  Andreas Schwab  <address@hidden>
+
+       * doc/mdate-sh: Extract the last field from the date output, not
+       the sixth, which will fail when the timezone name has more than
+       one word or is missing.
+
+Wed Apr 24 20:29:26 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Use delete, not undef, to remove
+       EXTRA entry.  From Gord Matzigkeit.
+
+Mon Apr 22 17:48:50 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Handle case where last line doesn't
+       end in newline.
+
+Tue Apr  9 22:53:16 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (variable_defined): New function.
+       (read_am_file): Ensure a blank line comes before starting comments
+       from Makefile.am.
+       (initialize_per_input): Initialize %targets.
+       (read_am_file): Set appropriate entry in %targets.
+       Many changes to use variable_defined.
+       (check_gnu_standards): Only require ChangeLog at top level.  From
+       Gord Matzigkeit.
+       (handle_tests): check-TESTS depends on $(TESTS).  From Gord
+       Matzigkeit.
+
+Mon Apr  8 22:51:41 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (parse_arguments): Added short options.
+       (initialize_global_constants): Ditto.
+
+Fri Apr  5 00:22:14 1996  Tom Tromey  <address@hidden>
+
+       * mkinstalldirs (errstatus): Don't necessarily die if mkdir
+       fails.
+
+       * automake.in (handle_source_transform): Typo fix.
+
+Thu Apr  4 15:10:50 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Renamed dist-local to
+       dist-hook.
+       (handle_merge_targets): Added install-data-hook and
+       install-exec-hook.
+       (handle_source_transform): Handle EXTRA_prog_SOURCES form.
+
+       * automake.in (handle_scripts): Never allow scripts_installed to
+       become 0.
+
+       * scripts.am (address@hidden@SCRIPTS): Scripts can be found in
+       srcdir.
+
+       * automake.in (generate_makefile): Derived file names from given
+       input; don't assume Makefile.in and Makefile.am.
+       (am_file_name, in_file_name): New globals.
+       (read_am_file): Use them.
+
+       * program.am (@PROGRAM@): Use transformed program name.
+
+       * remake-hdr.am (stamp-h): Actually touch stamp-h.
+
+Wed Apr  3 15:16:06 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file_internal): Use correct file for error
+       messages.  Test insh.test.
+
+Mon Apr  1 09:47:44 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texi.info): Build output file in srcdir.
+
+       * automake.in (require_file_internal): If $dir is ".",then look in
+       relative directory.
+       (handle_texinfo): Canonicalize name of texi file before looking
+       for dependency variable.
+
+Thu Mar 28 08:33:21 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (require_conf_file_with_conf_line): Yet another
+       function of this form.
+       (libtool_line): New variable.
+       (handle_libraries): Handle libtool.
+
+       * libraries-vars.am: Removed.
+
+       * automake.in (seen_libtool): New variable.
+       (scan_configure): Look for gm_PROG_LIBTOOL or AC_PROG_LIBTOOL.
+
+       * automake.in (handle_dist_worker): Handle dist-local.
+
+       * Makefile.am (maintainer-check): Do "make check" after all syntax
+       checks.
+
+       * texi-version.am (address@hidden@): Look for mdate-sh in appropriate
+       directory.
+
+       * automake.in ($seen_arg_prog): New global.
+       (handle_programs): Error if AC_ARG_PROGRAM not seen.
+       (handle_scripts): Ditto.
+       (handle_configure): mkinstalldirs now a config file.
+       (handle_installdirs): Find mkinstalldirs in config_aux_dir.
+       (handle_dist_worker): Removed DIST_SUBDIRS.
+       (require_file_path): New variable.
+       (require_file_with_conf_line): Set it.
+       (require_file_with_line): Ditto.
+       (require_file): Ditto.
+       (require_file_internal): Incorporated code from
+       require_config_file.
+       (require_config_file): Rewrote.
+       (require_conf_file_with_line): New function.
+       (handle_texinfo): Use it for mdate-sh.
+       (handle_texinfo): Look for mdate-sh in appropriate directory.
+
+Tue Mar 26 13:47:54 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (cvs-dist): Find NEWS in srcdir.
+       * automake.in (handle_dist_worker): Find NEWS in srcdir.
+       ($RULE_PATTERN): Include chars "$(){}/" in allowable patterns in a
+       rule.
+       (require_config_file): Set config_aux_path when file found.
+       ($config_aux_dir): New variable.
+       (require_config_file): Set it.
+       (handle_man_pages): Find mkinstalldirs in config_aux_dir.
+
+Mon Mar 25 15:32:57 1996  Tom Tromey  <address@hidden>
+
+       * data.am (address@hidden@DATA): Also allow data to be in build
+       directory.
+
+Sun Mar 24 19:56:28 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Don't look in EXTRA_primary
+       variable any more; it is handled in the main loop.
+
+Wed Mar 20 16:22:35 1996  Tom Tromey  <address@hidden>
+
+       * data.am (address@hidden@DATA): Find data in srcdir.
+
+Fri Mar 15 18:30:31 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (require_config_file): Use correct filename when
+       looking for errors.  Also, install file in `.' if not found.  Bug
+       reported by Gord Matzigkeit.  Test installsh.test.
+
+Thu Mar 14 09:28:21 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (cvs-diff): New target.
+
+       Fix for bug when install var substitutes empty.  Test empty.test.
+       * header.am (address@hidden@HEADERS): Allow empty list of headers.
+       (address@hidden@HEADERS): Ditto.
+       * scripts.am (address@hidden@SCRIPTS): Allow empty list of scripts.
+       (address@hidden@SCRIPTS): Ditto.
+       * libraries.am (address@hidden@LIBRARIES): Allow empty list of
+       libraries.
+       (address@hidden@LIBRARIES): Ditto.
+       * data.am (address@hidden@DATA): Allow empty list of data.
+       (address@hidden@DATA): Ditto.
+       * programs.am (address@hidden@PROGRAMS): Added missing semicolon.
+       From François Pinard.
+       (address@hidden@PROGRAMS): Fixed bug when list of programs empty.
+       (address@hidden@PROGRAMS): Ditto.
+
+Wed Mar 13 19:50:23 1996  Tom Tromey  <address@hidden>
+
+       * tags-subd.am (ID): Name of ID file must be flush against -f.
+
+       * configure.in (VERSION): Version 0.32.
+
+Mon Mar 11 17:50:58 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (seen_linguas, all_linguas_line): New variables.
+       (handle_gettext): New function.
+       (generate_makefile): Run it.
+       (scan_configure): Recognize ALL_LINGUAS.
+
+Mon Mar 11 14:34:36 1996  Gord Matzigkeit  <address@hidden>
+
+       * automake.texi: doc fix.
+
+       * automake.in (am_install_var): Added support for check and
+       installcheck special prefixes.
+
+Sun Mar 10 10:44:42 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_subdirs): Don't do SUBDIRS check for
+       gettext.
+
+Tue Mar  5 18:12:04 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (OBJECT_PATTERN): Removed.
+       (am_install_var): No error if name is invalid.
+       (handle_programs): Canonicalize program names.
+       (BOGUS_MACRO_PATTERN): New variable.
+       (read_am_file): Error if bad macro name given.
+       (require_file_internal): Use am_line_error, not am_conf_error.
+
+       * program.am (@PROGRAM@): Recognize @address@hidden
+
+Mon Mar  4 19:30:24 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_lib_objects): New function.
+       (handle_libraries): Use it.
+       (handle_programs): Ditto.
+       (handle_dist_worker): Deprecate DIST_SUBDIRS.
+       (am_install_var): Allow extended directory mechanism to work.
+       Test exdir.test.
+
+       * dist-vars.am (DISTFILES): Use EXTRA_DIST.
+       (DEP_DISTFILES): Ditto.
+
+       * automake.in (OBJECT_PATTERN): New variable.
+       (am_install_var): Use it.
+       (handle_dist): DIST_OTHER is an anachronism.
+
+Sat Mar  2 17:04:38 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Only cause Automake to be
+       re-run if not making a distribution.  Fixes bug reported by
+       Joerg-Martin Schwarz.
+       (require_file_with_line): New function.
+       (require_file): Use it.
+       (am_line_error): Don't print line number if $symbol is empty.
+       (get_object_extension): Use require_file_with_line.
+       (handle_libraries): Use require_file_with_line.
+       (handle_texinfo): Use require_file_with_line.
+       (handle_configure): Use am_conf_line_error and
+       require_file_with_conf_line.
+       (handle_subdirs): Use require_file_with_conf_line.
+       (handle_configure): Use require_file_with_conf_line.
+       (handle_tests): Push check-TESTS on @phony.
+       (am_conf_line_error): New function.
+       (require_file_with_conf_line): New function.
+       (require_file_internal): New function.
+       (require_file_with_line): Use it.
+       (require_file): Ditto.
+       (am_conf_line_error): Handle empty line number.
+       (ac_gettext_line, ac_output_line): New variables.
+       (scan_configure): Set them.
+
+Fri Mar  1 00:13:04 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (parse_arguments): Default strictness is gnu.
+       Changed `normal' to `foreign' everywhere.
+       (parse_arguments): Handle --foreign.
+       (initialize_global_constants): Document --foreign.
+       (handle_dependencies): Better error message.
+       (handle_texinfo): Don't push $vtexi on @texis.
+       (handle_texinfo): Only push $vtexi on @texi_deps if not null.
+       (handle_configure): install-sh is a config file; require it as
+       such.
+       (parse_arguments): Renamed --install-missing to --add-missing.
+       (add_missing): Renamed from install_missing.
+       (am_install_var): Check to make sure contents of install variable
+       are correct if primary requires it.  Test badprog.test.
+       (initialize_global_constants): Initialize
+       %primary_uses_subobjects.
+       (handle_source_transform): Skip configure substitutions.  Test
+       depend.test.  Also, skip empty elements.
+
+Thu Feb 29 22:00:30 1996  Tom Tromey  <address@hidden>
+
+       * texinfo.tex: New version.
+
+       * automake.in (am_install_var): Allow extended range of
+       installation directories.
+
+       * automake.in (get_object_extension): Don't allow
+       @CONFIG_INCLUDE_SPEC@ in the Makefile.in when config.h not used.
+       From Gord Matzigkeit.  Test confincl.test.
+
+       * texinfos.am (install-info): Changed usage of install-info (in
+       comment).  Per Feb 25 GNU Standards document.
+
+Wed Feb 28 07:40:55 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): New function.
+       (generate_makefile): Call it.
+       (handle_subdirs): Skip directories whose names look like configure
+       substitutions.
+       (handle_subdirs): Require intl and po, not @INTLSUB@ and @POSUB@,
+       when using gettext.
+       (scan_configure): Clear in_ac_output if "]" found.  Test
+       acoutqnl.test.
+       (require_config_file): New function.
+       (generate_makefile): Use require_config_file.
+       (config_aux_path): New variable.
+       (scan_configure): Check for AC_CONFIG_AUX_DIR.
+       (handle_merge_targets): Add install-strip rule.
+
+Tue Feb 27 20:00:36 1996  Tom Tromey  <address@hidden>
+
+       * mdate-sh: New version from Ulrich Drepper.
+
+       * automake.in (handle_source_transform): Changed fill back to
+       empty string.
+       (handle_libraries): Ditto.
+       (handle_dist): Ditto.
+       (handle_dependencies): Ditto.
+       (handle_footer): Ditto.
+       (handle_phony): Ditto.
+
+       * Makefile.am (DIST_SUBDIRS): Removed.
+       (installcheck-local): Use Perl, not test -x.
+       (PERL): New macro.
+       (maintainer-check): Use $(PERL), not @address@hidden
+
+       * configure.in (VERSION): Upped to 0.31.
+
+Sat Feb 24 18:02:19 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): AC_CHECK_TOOL requires config.sub
+       and config.guess.
+
+       * automake.in: Use keyed_aclocal_warning when warning about
+       fp_PROG_INSTALL.
+       (get_object_extension): Use keyed_aclocal_warning when warning
+       about fp_C_PROTOTYPES.
+       (keyed_aclocal_warning): New function.
+
+       * Makefile.am (pkgdata_DATA): Install aclocal.m4.
+       * aclocal.m4: Include fp_C_PROTOTYPES, fp_PROG_CC_STDC.
+
+       * automake.in (get_object_extension): Only give error about
+       fp_C_PROTOTYPES once.
+
+       * automake.in (seen_ranlib): New variable.
+       (scan_configure): Recognized AC_PROG_RANLIB.
+       (handle_libraries): Error if ranlib not checked for.
+
+       * automake.in (default_strictness): Default to GNU.
+       (default_strictness_name): Ditto.
+
+Wed Feb 21 18:15:02 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Removed @kr@ support.
+       (get_object_extension): Ditto.
+
+       * Makefile.am (pkgdata_DATA): Include ansi2knr.c and ansi2knr.1.
+
+Tue Feb 20 17:25:18 1996  Tom Tromey  <address@hidden>
+
+       * depend.am ($(srcdir)/.deps/%.P): Regexp fix.
+
+Mon Feb 19 19:53:09 1996  Tom Tromey  <address@hidden>
+
+       * remake.am ($(srcdir)/Makefile.in): Depend on configure.in.
+       * remake-subd.am ($(srcdir)/Makefile.in): Depend on configure.in.
+
+       * automake.in (handle_scripts): Ensure $scripts_installed set to
+       boolean value.  Test proginst.test.
+
+       * Makefile.am (installcheck-local): New target.
+
+       * automake.in (require_file): No error if missing file is
+       installed.
+
+Sun Feb 18 17:10:00 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_scripts): SCRIPTS no longer automatically
+       cleaned.  Now possible to install scripts in pkgdatadir.
+       ($seen_canonical): New variable.
+       (generate_makefile): Check for config.guess and config.sub here;
+       fixes bug reported by Gord Matzigkeit.
+
+       * Makefile.am (pkgdata_SCRIPTS): New variable.
+       (CLEANFILES): New macro.
+
+       * scripts-clean.am: Removed.
+
+Sat Feb 17 00:15:20 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Error if primary variable actually
+       defined.
+       (am_install_var): Skip elements that look like configure
+       substitutions.
+       (am_install_var): "EXTRA" is a valid prefix.
+       (am_install_var): Push contents EXTRA_PRIMARY onto @result.
+       (handle_merge_targets): Treat "all" target like "install".
+       (handle_subdirs): Don't push all-recursive.
+
+       * header.am (address@hidden@HEADERS): Don't depend on all.
+       * data.am (address@hidden@DATA): Don't depend on all.
+       * libraries.am (address@hidden@LIBRARIES): Don't depend on all.
+       * programs.am (address@hidden@PROGRAMS): Don't depend on all.
+       * scripts.am (address@hidden@SCRIPTS): Don't depend on all.
+
+       * automake.in (am_install_var): Push generated install targets
+       onto @phony.
+
+       * subdirs.am: No longer depend on Makefile and $(CONFIG_HEADER).
+       * automake.in (handle_merge_targets): Correctly handle recursive
+       calls of uninstall, install-exec, and install-data.
+       (handle_merge_targets): Put Makefile, and possibly $config_name,
+       onto @all.
+       (handle_merge_targets): Push 'all' onto @install as appropriate.
+
+Fri Feb 16 18:27:04 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): config.status is in
+       $(top_builddir), not $(top_srcdir).  Reported by Anthony Green.
+
+       * automake.in (scan_configure): Recognize (AC|fp)_FUNC_FNMATCH.
+
+Thu Feb 15 19:12:45 1996  Tom Tromey  <address@hidden>
+
+       * automake.in: (seen_prog_yacc): New variable.
+       (scan_configure): Look for yacc.
+       (handle_source_transform): Skipp C++ header files.
+       (handle_source_transform): .cxx is a C++ source file.
+
+Wed Feb 14 08:36:02 1996  Tom Tromey  <address@hidden>
+
+       * depend.am ($(srcdir)/.deps/.P): Use "echo", not ":".
+
+       Implemented --verbose feature; idea from Greg Woods:
+       * automake.in (verbose): New global.
+       (generate_makefile): Print creating message if verbose.
+       (grep_for_vers_texi): Print message if verbose.
+       (handle_dependencies): Ditto.
+       (scan_configure): Ditto.
+       (read_am_file): Ditto.
+       (parse_arguments): Added --verbose.
+       (initialize_global_constants): Ditto.
+
+       * automake.in (get_object_extension): Use am_line_error.
+       (handle_source_transform): Ditto.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (handle_dist): Ditto.
+       (handle_dist): Ditto.
+       (handle_subdirs): Ditto.
+       (handle_configure): Ditto.
+       (handle_merge_targets): Ditto.
+       (am_install_var): Ditto.
+       (am_line_error): Allow actual line number as argument.
+       (handle_configure): Use am_line_error.
+       (scan_configure): Set config_header_line.
+       (config_header_line): New global.
+       Use @PERL@ to find perl during exec.  From Greg Woods.
+
+Tue Feb 13 22:06:51 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_per_input): Init %content_lines.
+       (read_am_file): Set appropriate content_lines elements while
+       reading.
+       (am_line_error): New function.
+       (read_am_file): Use it.
+       (handle_options): Ditto.
+
+       * automake.in (scan_configure): Handle case where more than one .o
+       is put into LIBOBJS at once.  Test libobj.test.
+
+Mon Feb 12 20:39:28 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): Ignore "\" in AC_OUTPUT line.
+       Test acouttbs.test.
+       (handle_subdirs): Restored intl, po warnings.
+
+       * automake.in (scan_configure): Delete everything after "," or
+       ")".  Test acoutnoq.test.
+       (handle_dist): Use $relative_dir, not nonexistent $subdir.
+       (handle_subdirs): 'po' and 'intl' are sometimes substituted into
+       SUBDIRS; don't warn about their absence.
+
+Sun Feb 11 16:55:15 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Removed bogus error message.
+
+       * automake.in (handle_texinfo): Push $(INFO_DEPS), not 'info',
+       onto @all.
+       (handle_options): Handle version number.
+
+       * automake.in ($maint_charset, $dist_charset): New variables.
+       (initialize_per_input): Init $local_maint_charset.
+       (handle_dist): Handle DIST_CHARSET and MAINT_CHARSET.
+       (generate_makefile): Don't print "creating...".
+
+Sat Feb 10 16:45:07 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (get_object_extension): Substitute
+       @CONFIG_INCLUDE_SPEC@ if CONFIG_HEADER defined.
+       (handle_source_transform): Use $1, not \1.
+       (pretty_print_internal): Handle Tabs in fill when computing indent
+       on new line.
+       (handle_merge_targets): Always generate install-exec and
+       install-data targets.  Test instexec.test.
+       Fixed error message if fp_PROG_INSTALL missing.
+
+       * compile-vars.am (DEFS): Include -I., -I$(srcdir), and
+       @address@hidden
+
+       * automake.in (scan_configure): Delete everything after "]".  Test
+       acoutput.test.
+
+       * configure.in (AC_OUTPUT): Create tests/Makefile.
+       * Makefile.am (SUBDIRS): New macro.
+
+       * automake.in (handle_texinfo): Put $vtexi on texi_deps.  From Jim
+       Meyering.
+
+       * configure.in (AC_OUTPUT): Ensure automake is executable.
+
+Thu Feb  8 17:30:29 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_subdirs): Error if directory in SUBDIRS does
+       not exist.
+
+       * automake.in (handle_configure): Handle AC_OUTPUT ":" syntax.
+
+       From Jim Meyering:
+       * libraries.am (address@hidden@LIBRARIES): Depend on all, not
+       (@address@hidden).
+       * header.am (address@hidden@HEADERS): Depend on all, not
+       $(@address@hidden).
+       * data.am (address@hidden@DATA): Depend on all, not $(@address@hidden).
+       * scripts.am (address@hidden@SCRIPTS): Depend on all, not
+       $(@address@hidden).
+       * programs.am (address@hidden@PROGRAMS): Depend on all, not
+       $(@address@hidden).
+
+       * automake.in (initialize_per_input): Initialize
+       $use_dependencies.
+       ($seen_path_xtra): New variable.
+       (scan_configure): Look for AC_PATH_XTRA.
+       (get_object_extension): Add variables to output if X seen.
+
+Thu Feb  8 10:02:45 1996  Greg A. Woods  <address@hidden>
+
+       * automake.in (handle_programs): add pkglib to list of
+       directories for C
+       (various): include a tab as fill for continuation lines
+       printed with pretty_print*, esp. for macro variable assignments.
+       [ changed to 4 spaced by me ]
+
+Wed Feb  7 18:00:29 1996  Tom Tromey  <address@hidden>
+
+       * configure.in (VERSION): Upped to 0.30.
+
+       * Makefile.am (automake): Removed.
+       (DIST_OTHER): Removed.
+
+       * automake.in (handle_source_transform): All dep_files are
+       relative to $(srcdir).
+       (handle_libraries): Ditto.
+       (scan_configure): Test for AC_PROG_INSTALL as well as
+       fp_PROG_INSTALL.  Don't error here.
+       (seen_prog_install): Now global.
+       (scripts_installed): New global.
+       (handle_scripts): Set it.
+       Give error if appropriate install macro not seen.
+       (handle_subdirs): Ensure $seen_gettext before requiring
+       gettext-specific files.
+       (handle_configure): Automatically rebuild
+
+       From Jim Meyering:
+       * automake.in (handle_source_transform): Use \W when quoting
+       regexp.  When blah_SOURCES not explicitly defined, still create
+       entry in %deps.
+       * depend.am ($(srcdir)/.deps/%.P): Don't use \< in regexp.
+       * subdirs.am (maintainer-clean-recursive): Now depends on
+       $(CONFIG_HEADER) and Makefile.
+
+       * automake.in (handle_source_transform): Skip macro references.
+
+Mon Feb  5 14:58:58 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Include "rm" when deleting files.
+
+       * Makefile.am (maintainer-check): Expect only one ${...}.
+       * texinfos.am (install-info): Remove unneeded ${...}.  From Jim
+       Meyering.
+
+       * automake.in (handle_configure): Only define CONFIG_HEADER if
+       $config_name.
+       ($seen_gettext): New variable.
+       (handle_subdirs): Do all gettext-related checking here.
+       (scan_configure): Just set $seen_gettext.
+       (handle_man_pages): Properly quote $(MANS).
+
+Wed Jan 31 09:51:30 1996  Tom Tromey  (address@hidden)
+
+       * depend.am: Don't use srcdir anywhere.
+       * automake.in (handle_libraries): Don't make .deps relative to
+       srcdir.
+       (handle_options): Recognize no-dependencies.
+
+       * depend.am (MKDEP): From Jim Meyering: Do nothing if srcdir is
+       ".".  Properly quote regexp.
+
+Tue Jan 30 12:19:09 1996  Tom Tromey  (address@hidden)
+
+       * automake.in (handle_configure): Only defined CONFIG_HEADER if
+       $config_name.
+       (read_am_file): Quote regexp when substituting top_builddir.
+       (handle_source_transform, handle_libraries): Look in
+       $(srcdir)/.deps for .P files.
+
+Fri Jan 26 00:15:25 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (am_conf_error): New function.
+       (scan_configure): Use it.
+       (scan_configure): A comma also ends AC_OUTPUT macro.
+
+       * automake.in (read_am_file): Compute top_builddir when including
+       header-vars.am.
+       (handle_configure): Use $top_builddir, not $top_reldir.
+       (other_input_files): New variable.
+       (dirname): Fixed bug where dirname of 'a/b/c' was 'a', not 'a/b'.
+
+       Changes from Gord Matzigkeit to enabled hierarchies deeper than 2:
+       * automake.in (input_files, seen_make_set): Declare globally.
+       (parse_arguments): Use input_files, not make_list.
+       Only scan configure.in once.
+       (handle_dist): Use SUBDIRS to determine when to make
+       subdirectories and recurisvely dist.  Use $(topdir), not "..", to
+       find top of dist tree.
+       (handle_configure): Check for AC_PROG_MAKE_SET here.  Don't require
+       configure.in (done elsewhere).
+       (scan_configure): seen_make_set is global.  Allow arbitrary space
+       in LIBOBJS assignment.
+       (top_builddir): New variable.
+       * header-vars.am (top_builddir): New variable.
+       * remake-subd.am (Makefile): Look in top_builddir, not .., when
+       remaking.
+       * automake.in (handle_merge_targets): Run 'all' before
+       check-recursive.
+
+       * automake.in (file_contents_with_transform): Changed error
+       message.
+       (handle_configure): Define $contents{'CONFIG_HEADER'}.
+
+       * texi-version.am: Many changes to support multiple .texi files.
+       Replaced "version.texi" with "@VTEXI@".  Replaced "vti" with
+       "@VTI@".
+       * automake.in (handle_configure): install.sh is an anachronism.
+       (handle_texinfo): Generalized for multiple .texi files.  Handle
+       'clean-info' internally.
+       * texi-clean.am: Removed.
+       * Makefile.am: Updated for removal.
+
+Wed Jan 24 22:55:32 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (grep_for_vers_texi): New function.
+       (handle_texinfo): Use grep_for_vers_texi, not system("grep").
+       (handle_texinfo): Changes to generalize to multiple .texi files.
+
+Tue Jan 23 14:22:16 1996  Tom Tromey  <address@hidden>
+
+       Fixes from Gord Matzigkeit:
+       * libraries.am (address@hidden@LIBRARIES): Use top_srcdir, not
+       topsrcdir.
+       * header.am: New file.
+       * Makefile.am (pkgdata_DATA): Install header.am.
+       * automake.in (handle_headers): Use header.am, not data.am.
+       (am_install_var): Allow pattern to be compiled multiple times.
+
+       * config.guess, config.sub: New files.
+       * Makefile.am (pkgdata_DATA): Install config.guess and
+       config.sub.
+       * automake.in (scan_configure): Recognize AC_CANONICAL_HOST and
+       AC_CANONICAL_SYSTEM.
+
+Sun Jan 21 15:51:48 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Use info_TEXINFOS, not TEXINFOS.
+       (handle_man_pages): Use man_MANS, not MANS.
+
+       * Makefile.am (info_TEXINFOS): Renamed.
+
+       * automake.in (scan_configure): Remove comments from input line.
+       (am_variable): Removed.
+
+       * remake-hdr.am (stamp-h): Use new macro CONFIG_HEADER_IN.
+
+       * automake.in (config_name, config_header): New globals.
+       (scan_configure): Look for AC_CONFIG_HEADER.
+       (handle_configure): Handle more uses of AC_CONFIG_HEADER.
+
+Sat Jan 20 15:54:24 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Bug fix.
+
+Fri Jan 19 00:50:29 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (require_file): Install missing files only according
+       to desired strictness.
+       (initialize_per_input): Don't init libsources.
+       (scan_configure): Reinit libsources.
+       (handle_libraries): Search _LIBADD for @LIBOBJS@ and @address@hidden
+       (fp_c_prototypes): New global.
+       (scan_configure): Set it.
+       (get_object_extension): Error if fp_C_PROTOTYPES not in
+       configure.in when using ansi2knr.
+       (handle_source_transform): Skip header files.
+
+       * automake.in (handle_dist_worker): Explicitly make 'dist' in
+       subdirs.
+
+Thu Jan 18 00:25:56 1996  Tom Tromey  <address@hidden>
+
+       From François Pinard:
+       * automake.in (handle_source_transform): Transform $o file into .P
+       file.
+       (handle_dist_worker): Handle case where DISTFILES includes
+       wildcard.  Bug fix in subdir case.
+
+       * automake.in (parse_arguments): Initialize strictness to
+       'normal'.
+
+Sun Jan 14 13:54:16 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_configure): Look for NLS support.
+
+       Changes from François Pinard:
+       * texinfos.am (install-info): Correctly install when build dir is
+       not srcdir.
+       * tags-subd.am (ID): Indentation change.
+       * kr-vars.am (o): Use "address@hidden@o", not "@address@hidden".
+       * depend.am ($(srcdir)/.deps/%.P): Remove temporary file.
+       * automake.in (handle_dist_worker): Fixlets.
+       (handle_dist): Sort keys going into dist_common.
+
+Sat Jan 13 00:18:06 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): If Gnits, don't allow release
+       until NEWS is updated.
+
+       * configure.in (VERSION): Version 0.29.
+
+       * Makefile.am (maintainer-check): Look for perl4.036 in path.
+
+       * dist-vars.am (DISTFILES):  Include BUILT_SOURCES.
+       (DEP_DISTFILES): Ditto.
+
+       * automake.in (handle_dist_worker): Depend on DEP_DISTFILES.
+       * dist-vars.am (DEP_DISTFILES): New variable.
+
+       * automake.in (handle_options): Support dist-shar option.
+       (handle_dist_worker): New function.
+       (handle_dist): Use it.
+
+       * texi-version.am (mostlyclean-vti): Remove version.tmp, not
+       *.tmp.
+
+       * automake.in (handle_dist): Chmod distdir 777.  From François
+       Pinard.
+
+       * automake.in (scan_configure): New function.
+       (initialize_per_input): Init libsources.
+       (generate_makefile): Run handle_configure first.
+       (handle_configure): Run scan_configure.
+       (handle_configure): Don't look for AC_PROG_MAKE_SET here.
+
+Thu Jan 11 23:14:18 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (AUTOMAKE_OPTIONS): New variable.
+
+       * automake.in (strictness, strictness_name): Renamed.
+       (initialize_per_input): Set strictness, strictness_name.
+       Initialize %options.
+       (generate_makefile): Run handle_options.
+       (handle_options): New function.
+       (handle_man_pages): Make install-man depend on $(MANS).  Turn off
+       man page install if no-installman option given.
+       (read_am_file): Deprecate @address@hidden
+       (get_object_extension): Look at ansi2knr option.
+       (parse_arguments): Take global strictness from command-line
+       options.
+
+Tue Jan  9 11:24:14 1996  Tom Tromey  <address@hidden>
+
+       Fixes from François Pinard:
+       * depend.am ($(srcdir)/.deps/%.P): Handle deansification.
+       * automake.in (get_object_extension): Use $o, not $(kr)o.
+       (handle_source_transform): Don't look for $(kr)c files.
+       * kr-vars.am (o): New macro.
+       (kr): Removed.
+
+       * depend.am (DEP_FILES): Removed.
+       * automake.in (handle_source_transform): Push .P file onto
+       dep_files.
+       (initialize_per_input): New variable %dep_files.
+       (handle_dependencies): Generate DEP_FILES here.
+
+Mon Jan  8 22:27:33 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (do_one_clean_target): Only remove config.status in
+       top-level directory.
+       (handle_tags): Removed 'id' from .PHONY list.  From Jim Meyering.
+
+       * clean.am (maintainer-clean-generic): Remove BUILT_SOURCES.
+
+       * automake.in (handle_dist): Make "ln" quiet.
+
+       * tags-subd.am (ID): Depend on HEADERS and SOURCES.
+
+Sat Jan  6 10:58:23 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): 'check' shouldn't depend on
+       'all' at top level.
+       (file_contents_with_transform): New function.
+       (am_install_var): Use file_contents_with_transform.
+       (handle_programs): Ditto.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_merge_targets): Let 'install' depend on 'all' if no other
+       dependencies exist.  From Jim Meyering.
+       (check_gnu_standards): GNU requires AUTHORS file.  (See
+       maintain.text).
+       (require_file): Put body in loop.
+       (get_object_extension): Only call require_file once.
+       (handle_configure): Ditto.
+
+       From Jim Meyering:
+       * depend.am ($(srcdir)/.deps/.P): Depend on $(BUILT_SOURCES).
+       * tags-subd.am (id): Removed.
+
+Fri Jan  5 10:31:19 1996  Tom Tromey  <address@hidden>
+
+       * Added copyright notice to each .am file.
+
+       * automake.in: Cleanups from François Pinard to avoid $#.
+       (require_argument): Fixed sense of test.
+       (set_strictness): Bug fix.
+
+Thu Jan  4 21:21:29 1996  Tom Tromey  <address@hidden>
+
+       * Makefile.am (pkgdata_DATA): Removed old dist files.
+
+       * dist-subd-top.am, dist-subd.am, dist.am: Removed.
+
+       * automake.in (set_strictness): Set $strictness_name.
+       (strictness_name): New variable.
+       (handle_dist): Substantially rewrote.
+
+       * configure.in: Point AC_INIT at automake.in.
+
+       * automake.in (generate_makefile): Report errors against
+       Makefile.in, not Makefile.am.
+
+Wed Jan  3 00:05:40 1996  Tom Tromey  <address@hidden>
+
+       * mdate-sh: Bug fix from Jim Meyering.
+
+       * dist.am (dist): Changed in parallel with dist-subd-top.am.
+
+       * mkinstalldirs: Reverted.
+
+       * automake.in (initialize_global_constants): Allow COPYING.LIB
+       again.
+       (check_gnits_standards): Disallow COPYING.LIB.
+
+       * texinfos.am (install-info): Only look in $(srcdir) for info
+       files.
+
+       * automake.in (initialize_global_constants): New variable
+       gen_copyright.
+       (read_am_file): Put a copyright in each Makefile.in.
+
+       * dist-vars.am (DISTFILES): Put DIST_COMMON first.
+
+       * automake.in (am_install_var): Put space before "=".
+       (handle_dist): Put README first in DIST_COMMON.
+
+       * Makefile.am (pkgdata_DATA): Include COPYING.
+
+       * COPYING: New file.
+
+       * automake.in (parse_arguments): Added --gnu and --gnits as
+       synonyms.
+       (initialize_global_constants): Ditto.
+       (initialize_global_constants): Don't auto-distribute COPYING.LIB.
+       (initialize_global_constants): Look for README first.
+       (initialize_global_constants): Auto-distribute AUTHORS, BACKLOG,
+       ABOUT-GNU.
+       (check_gnu_standards): Require file COPYING.
+
+       From François Pinard:
+       * automake.in (file_contents): Comment out "warn"s.
+       (usage): Use 4 columns.
+       (USAGE_FORMAT): Ditto.
+
+       * texinfos.am (install-info): Look for info file relative to $$d.
+
+       * Makefile.am (cvs-dist): Suppress output of "grep".
+
+       * configure.in (VERSION): Version 0.28.
+
+       * automake.in (pretty_print_internal): Fix for Perl 4
+       compatibility.
+
+       * configure.in (VERSION): Version 0.27.
+
+       * depend.am ($(srcdir)/.deps/%.P): Must regexp-quote srcdir in sed
+       invocation.
+
+       * automake.in (initialize_global_constants): Don't quote "@" in
+       $install_man_format.
+       (handle_merge_targets): use "@:" as empty command, not ":".
+
+Tue Jan  2 23:33:24 1996  Tom Tromey  <address@hidden>
+
+       * texinfos.am (install-info): Look in $d for info files.  From
+       François Pinard.
+
+       * depend.am ($(srcdir)/.deps/%.P): Fixed regexp.
+
+       * automake.in (read_am_file): Correctly deal with continued
+       variable definitions.
+
+Mon Jan  1 15:43:25 1996  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): 'check' target depends on
+       'all'.
+       (file_contents): Don't be so verbose.
+       (read_am_file): Ditto.
+       (read_am_file): Must use substr to check for trailing \.
+       (am_install_var): Use push_phony_cleaners.
+       (file_contents): Set $was_rule when assuming a rule is seen.
+       (read_am_file): Ditto.
+       (do_one_clean_target): Removed spurious newline.
+
+       Some changes from François Pinard:
+       * Removed trailing whitespace from all '.am' files.
+       * tags-subd.am (ID): Use &&, not ;.
+       (TAGS): Ditto.
+       * automake.in (parse_arguments): Removed useless message.
+       (parse_arguments): Don't explicitly referenced STDERR.
+       (require_argument): Ditto.
+       (am_error): Ditto.
+       (set_strictness): Ditto.
+       (file_contents): Ditto.
+       (read_am_file): Ditto.
+       (generate_makefile): Style tweaks.
+       (handle_programs): Ditto.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (handle_tags): Ditto.
+       (handle_dist): Ditto.
+       (handle_subdirs): Ditto.
+       (handle_configure): Ditto.
+       (handle_footer): Don't put newline before footer.am contents.
+       (handle_merge_targets): Style tweaks.
+       (do_one_clean_target): Ditto.
+       (dirname): Ditto.
+       (am_variable): Ditto.
+       Defined some new constants.
+       (generate_makefile): Don't call generate_header.
+       (generate_header): Removed.
+       (file_contents): Rewrote.
+       (read_am_file): Rewrote.
+
+       * automake.in (generate_makefile): Handle phony target.
+       (do_one_clean_target): Pretty-print dependencies.
+       (handle_installdirs): Pretty-print rule.
+
+       * Makefile.am (maintainer-check): Made some commands silent.
+
+       * automake.in (initialize_global_constants): Don't install or
+       uninstall cat'd man pages.
+       (initialize_per_input): Added phony target.
+       (push_phony_cleaners): New function.
+       (get_object_extension): Handle phony targets.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (handle_tags): Ditto.
+       (handle_dist): Ditto.
+       (handle_subdirs): Ditto.
+       (handle_installdirs): Ditto.
+       (handle_merge_targets): Ditto.
+       (handle_clean): Ditto.
+       (do_one_merge_target): Ditto.
+       (am_install_var): Ditto.
+       (handle_phony): New function.
+       (generate_makefile): Call it.
+       (pretty_print_internal): New function.
+       (pretty_print_rule): Ditto.
+
+Sun Dec 31 13:04:59 1995  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Don't print body of
+       loop at make time.
+
+       Changes from François Pinard:
+       * depend.am (MKDEP): Include DEFS, INCLUDES, CPPFLAGS, CFLAGS.
+       (DEP_FILES): Put dependency files in $(srcdir).
+       Look in $(srcdir) when including dependency files.
+       ($(srcdir)/.deps/.P): .deps/.P is in $(srcdir).
+       (.deps/%.P): MKDEP includes all macro expansions.
+       * dist-subd-top.am (dist): Get absolute path for distdir.  Don't
+       be so verbose.
+       * dist-subd.am (dist): Don't be so verbose.
+       * dist.am (dist): Don't be so verbose.
+
+       * automake.in (do_one_clean_target): Remove config.status in
+       maintainer-clean.  From Jim Meyering.
+
+       * programs-clean.am (address@hidden@PROGRAMS): Bug fix.  From Jim
+       Meyering.
+
+       * automake.in (handle_merge_targets): Add dummy command for empty
+       install target.  From Jim Meyering.
+
+Tue Dec 12 10:06:28 1995  Tom Tromey  <address@hidden>
+
+       * texinfos.am (uninstall-info): Bug fix.
+
+       * Makefile.am (maintainer-check): Error if ${...} used.
+       * depend.am (DEP_FILES): Prefer $(...).
+
+       * scripts.am (address@hidden@SCRIPTS): Only install script if it
+       exists.
+       * libraries.am (address@hidden@LIBRARIES): Only install library if
+       it exists.
+       * programs.am (address@hidden@PROGRAMS): Only install program if it
+       exists.
+
+       * texinfos-vars.am (TEXFILES): Removed.
+
+       * Makefile.am (pkgdata_DATA): Removed libprograms.am.
+
+       * automake.in (do_one_merge_target): Never generate trailing
+       whitespace.
+       (pretty_print): New function.
+       (handle_footer): Prettyprint definitions.
+       (am_install_var): Ditto.
+       (handle_source_transform): Ditto.
+       (handle_dist): Ditto.
+       (handle_libraries): Ditto.
+       (read_am_file): Put comments nearer appropriate code.
+
+       * texi-clean.am (mostlyclean-info): Use continued lines, not
+       multiple rm's.  From Jim Meyering.
+
+Sun Dec 10 11:59:33 1995  Tom Tromey  <address@hidden>
+
+       * Makefile.am (pkgdata_DATA): Cause INSTALL, install-sh, mdate-sh,
+       mkinstalldirs, texinfo.tex to be installed.
+       * automake.in (symlink_exists): New global.
+       (install_missing): Ditto.
+       (require_file): Install missing files if possible.
+       (parse_arguments): Handle --install-missing option.
+       (initialize_global_constants): Document --install-missing.
+
+       * Makefile.am (cvs-dist): Don't release unless NEWS updated.
+       Ensure 'checks' pass before release.
+       (maintainer-check): Renamed.  Look in $(srcdir) for sources.  From
+       Franc,ois Pinard.
+       (cvs-dist): Depend on maintainer-check instead of explicitly
+       running check.
+
+       * configure.in (VERSION): Version 0.26.
+
+       * Makefile.am (check-local): Only look at [a-z]*.am.  Fixed sense
+       of 'if' test.
+
+       * depend.am (DEP_FILES): Bug fix.
+
+       * automake.in (do_one_clean_target): Typo.
+
+       * Makefile.am (check-local): Run syntax check under Perl 4.
+
+       * automake.in: Fixes for Perl 4, from Gord Matzigkeit.
+       (handle_source_transform): Loop variable is now $_.  From Gor
+
+       * Makefile.am (check-local): Check for 'true' in source.
+       * texinfos.am (install-info): Can't use "true" in any rule.
+
+Sat Dec  9 10:16:48 1995  Tom Tromey  <address@hidden>
+
+       * Makefile.am (cvs-dist): New target.
+
+       * tags.am (TAGS): Use "test -z ... ||" to avoid spurious
+       failures.
+
+       * texinfos.am (install-info): Don't do install-info for now.
+
+       * clean.am (distclean-generic): Don't remove config.status here.
+       * automake.in (do_one_clean_target): Remove config.status later,
+       for 'make -j2'.  From Jim Meyering.
+
+Fri Dec  8 16:30:48 1995  Tom Tromey  <address@hidden>
+
+       * configure.in (VERSION): Version 0.25.
+
+       * automake.in (handle_texinfo): Use "$? >> 8", not "$?".
+       (handle_configure): Check for AC_PROG_MAKE_SET.
+
+       * depend.am (DEP_FILES): Handle deANSIfication case.  From Jim
+       Meyering.
+
+       * automake.in (am_install_var): Changed how 'clean' handled for
+       uniform name targets.
+       * Makefile.am (pkgdata_DATA): Added new files.
+       * data-clean.am: New file.
+       * scripts-clean.am: New file.
+       * libraries-clean.am: New file.
+       * programs-clean.am: New file.
+
+Wed Dec  6 00:06:11 1995  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Error if variable name
+       "misspelled".
+       (handle_source_transform): Automatically include .c file
+       corresponding to .y or .l.
+
+Tue Dec  5 00:46:14 1995  Tom Tromey  <address@hidden>
+
+       * programs.am: Changed for uniform naming scheme.
+
+       * automake.in (read_am_file): Allow '-' and '.' in target names.
+       (generate_makefile): Don't pass arguments to handle_libraries.
+       (initialize_per_input): Define @sources, @objects.
+       (generate_makefile): Init @sources, @objects if needed.
+       (handle_source_transform): Push onto @sources, @objects here.
+       (am_install_var): Push primary onto @all, for configure-time
+       customization.
+       (handle_programs): Use new uniform naming scheme.
+
+       * Makefile.am (check-local): New target.
+
+       * automake.in (handle_libraries): Use uniform naming scheme.
+
+       * libraries.am: Rewrote for uniform naming scheme.
+
+       * scripts.am: Updated names of all clean targets.
+
+       * automake.in (handle_programs): Split on all whitespace.
+       (handle_libraries): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_man_pages): Ditto.
+       (am_install_var): Changed return result.
+       (am_install_var): Changed interface.
+       (am_install_var): Push onto @clean@ if requested.
+       (handle_scripts): Pass -clean to am_install_var.
+
+Mon Dec  4 11:55:36 1995  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Push target onto @all.
+       (get_object_extension): Use $(...).
+       (handle_source_transform): Ditto.
+       (handle_programs): Ditto.
+
+       * automake.in (require_argument): New function.
+       (parse_arguments): Use it.
+       (push_dist_common): New function.
+       (generate_makefile): Use it.
+       (handle_texinfo): Ditto.
+       (handle_dist): Ditto.
+       (handle_configure): Ditto.
+       (require_file): Ditto.
+       (generate_makefile): Don't pass arguments to handle_scripts.
+       (handle_configure): Require configure.in.
+       (check_gnu_standards): New function.
+       (check_gnits_standards): Ditto.
+       (generate_makefile): Check standards.
+
+       * Makefile.am (bin_SCRIPTS): Changed name from SCRIPTS.
+
+       * automake.in (LENIENT, GNU, GNITS): New constants.
+       (initialize_per_input): New function.
+       (generate_makefile): Use it.
+       (initialize_global_constants): Renamed from init_globals.
+       (require_file): Added strictness argument.
+       (parse_arguments): Added --strict option.
+       (set_strictness): New function.
+       (parse_arguments): use it.
+       (initialize_global_constants): Document --strictness.
+
+       * automake.in: Use ${1+"$@"} to preserve quoting when running
+       under sh.
+
+       * texinfos.am (install-info): Don't use "true".
+       * tags.am (TAGS): Don't use "true".
+
+       * dist.am, dist-subd-top.am, remake-hdr.am, remake-subd.am,
+       remake.am, subdirs.am, texinfos.am: Use "&&" after cd.
+
+       * program.am (@PROGRAM@): Use LINK macro.
+       * compile.am (.c.o): Use COMPILE macro.
+
+       * clean.am, remake-hdr.am, remake.am, texinfos.am: Use $(...), not
+       ${...}.
+
+       * subdirs.am (RECURSIVE): Removed macro.
+
+       * clean.am: Changed to not be so verbose.
+
+       * Makefile.am (pkgdata_DATA): Include texi-clean.am.
+       * automake.in (handle_texinfo): Transform texi-clean and put into
+       output rules.
+       * texinfos-vars.am (TEXFILES): Removed.
+       * texinfos.am: Removed 'clean' targets.
+       * texi-clean.am: New file.
+
+       * Makefile.am (ETAGS_ARGS): Just use 'automake.in'.
+
+       * texinfos-vars.am (TEXFILES): Added *.op.
+
+       * dist-vars.am (DISTFILES): Renamed from DIST_FILES, per GNU
+       standards.
+       * dist.am (dist): Use DISTFILES.
+       * dist-subd.am (dist): Use DISTFILES.
+       * dist-subd-top.am (dist): Use DISTFILES.
+
+Sun Dec  3 00:24:08 1995  Tom Tromey  <address@hidden>
+
+       * Makefile.am (ETAGS_ARGS): Define.
+
+       * depend.am (.deps/.P): Use ":", not "echo timestamp".  From Jim
+       Meyering.
+
+       * dist-vars.am (DIST_FILES): Removed PACKAGEDATA.
+
+       * automake.in (handle_scripts): Use am_install_var.
+
+       * scripts.am: Rewrote for new uniform naming scheme.
+
+       * Makefile.am (pkgdata_DATA): Removed libscripts.am.
+
+       * libscripts.am: Removed.
+
+       * packagedata.am: Removed.
+
+       * Makefile.am (PACKAGEDATA): Removed packagedata.am.
+       (pkgdata_DATA): Renamed from PACKAGEDATA.
+
+       * automake.in (handle_data): Use am_install_var.
+       (init_globals): Init %exec_dir_p.
+
+       * data.am: Rewrote for new uniform naming scheme.
+
+       * automake.in (get_object_extension): New function.
+       (handle_programs): Use it.
+       (dir_holds_sources): Changed interpretation.
+       (handle_headers): New function.
+       (am_install_var): New function.
+       (generate_makefile): Call handle_headers.
+
+       * header-vars.am (pkgdatadir): New macro.
+       (pkglibdir): Ditto.
+       (pkgincludedir): Ditto.
+
+       * automake.in (handle_source_transform): New function.
+       (am_error): New function.
+       (generate_makefile): Use it.
+       (handle_source_transform): Ditto.
+       (handle_texinfo): Ditto.
+       (handle_dependencies): Ditto.
+       (handle_merge_targets): Ditto.
+       (require_file): Ditto.
+
+Sat Dec  2 21:39:56 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: Updated FSF address.  From Jim Meyering.
+       * header-vars.am: Updated FSF address.
+
+       * distname.am: Removed.
+
+       * automake.in (file_contents): Strip "##" comments.
+       * Various files: Added "##" comments for strange things.
+
+       * automake.in (handle_tags): Generate TAGS rule for every
+       directory.
+
+       * subdirs.am (RECURSIVE): Include installcheck-recursive.
+       * automake.in (installcheck): New variable.
+       (generate_makefile): Initialize it.
+       (handle_subdirs): Push 'installcheck-recursive'.
+       (handle_merge_targets): Handle installcheck target.
+
+Thu Nov 30 20:13:16 1995  Tom Tromey  <address@hidden>
+
+       * automake.in ($PACKAGE): Removed.
+
+       * header-vars.am (ALL): Removed.
+
+       * automake.in: Reworked 'all' target handling.
+
+       * automake.in (generate_makefile):
+       Don't use AM_ forms in call to am_variable.
+
+       * automake.in: Changes for Perl 5, from Gord Matzigkeit
+
+       * clean.am (MOSTLYCLEANFILES, MAINTAINERCLEANFILES): New variables.
+
+       * automake.in (handle_footer): Allow SUFFIXES variable.
+
+       * automake.in (am_variable): New function.
+       (handle_texinfo): Use it.
+       (generate_makefile): Use it.
+
+       * configure.in: Version 0.24.
+
+Wed Nov 29 23:50:14 1995  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_libraries):
+       Generate blah_LIBADD defines if required.
+
+       * library.am (address@hidden@.a): Look at $(@address@hidden)
+
+       * libraries-vars.am (LIBOBJS, ALLOCA): Removed.
+
+       * compile-kr.am: ($(OBJECTS)): Depend on $(ANSI2KNR), not ansi2knr.
+
+       * configure.in: Version 0.23
+
+       * dist-subd-top.am (dist): Don't die if a subdirectory already exists.
+
+       * dist-subd-top.am, dist.am (dist): Give automake --output-dir option.
+
+       * automake.in: New option --output-dir
+
+       * automake.in (handle_configure): Fixed typo.
+
+       * automake.in (handle_installdirs): Always make installdirs target.
+
+       * subdirs.am (RECURSIVE): Removed uninstall-data-recursive and
+       uninstall-exec-recursive.  Added installdirs-recursive.
+
+       * automake.in (handle_installdirs): Handle installdirs-recursive.
+       (handle_man_pages): 'all' depends on $(MANS)
+
+       * Makefile.am: Removed mans.am.
+
+       * automake.in: More man-related fixes
+
+       * automake.in: Bug fixes
+
+       * automake.in: Rewrote man page handling.
+
+       * texi-version.am, remake-hdr.am, depend.am: Don't use touch.
+
+       * automake.in (handle_installdirs): New function.
+       (@installdirs): New global.
+       Many changes to deal with installdirs.
+
+       * clean.am (clean-generic): Always supply 'else' clause to 'if'
+
+       * automake.in (generate_header): Don't use header.am.
+       (handle_dist): Don't use dist-subd-vars.am.
+
+       * Makefile.am (PACKAGEDATA): Removed dist-subd-vars.am, header.am.
+
+       * Makefile.am (DISTCLEANFILES): Removed.
+
+       * clean.am (clean-generic): Bug fix.
+
+       * clean.am (clean-generic): Only remove CLEANFILES if nonempty
+
+       * texi-version.am (clean-vti): No such macro as VTI
+
+Tue Nov 28 19:56:07 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: Bug fix for maintainer-clean
+
+       * automake.in (do_one_clean_target):
+       Print special text in maintainer-clean.
+       (handle_clean): Always include clean.am
+
+       * clean.am: Use -generic clean targets.
+
+       * compile.am: Added clean targets.
+
+       * configure.in: Version 0.22.
+
+       * automake.in (handle_dependencies):
+       Put trailing newline after all deps.
+
+       * automake.in (handle_dependencies): Another dependency bug fix.
+
+       * automake.in (handle_dependencies):
+       Bug fix when including dependencies.
+
+       * automake.in (handle_configure):
+       Verify existence of install-sh, mkinstalldirs
+
+       * automake.in (handle_texinfo): Include stamp-vti in distribution
+
+       * dist-subd-vars.am, dist-vars.am (DIST_FILES):
+       Include DATA, PACKAGEDATA.
+
+       * Makefile.am: Nothing
+
+       * Makefile.am (DIST_OTHER): Don't distribute gettext-sh
+
+       * automake.in (handle_texinfo): Typo
+
+       * automake.in: If script ends up in shell, feed to perl
+
+       * automake.in: Rewrote 'clean' rules.
+       Documentation made and installed first.
+       'all' depends on 'info'
+
+Mon Nov 27 23:57:29 1995  Tom Tromey  <address@hidden>
+
+       * configure.in, Makefile.am: Turned off internationalization.
+
+       * clean-kr.am: Rewrote for new clean scheme.
+
+       * tags-clean.am: Remove TAGS in distclean, not maintainer-clean
+
+       * Makefile.am (PACKAGEDATA): Include tags-clean.am
+
+       * subdirs.am: Removed bogus local clean targets
+
+       * tags-clean.am: Initial revision
+
+       * texi-version.am: Added clean targets
+
+       * texinfos.am: Fixes to clean targets.
+
+       * texinfos.am, libscripts.am, scripts.am, libraries.am, libprograms.am, 
programs.am:
+       Added clean targets
+
+       * compile-kr.am (ansi2knr.o): Depend on CONFIG_HEADER
+
+       * automake.in: Completely revamped automatic de-ANSI-fication
+
+       * compile-kr.am: (ansi2knr, $(OBJECTS)): New targets
+
+       * compile-vars.am (LINK): New macro
+
+       * kr-vars.am: Trailing blank line
+
+       * compile-kr.am: Rewrote
+
+       * compile-vars.am (COMPILE): New macro
+
+       * compile-vars.am (ANSI2KNR): Removed
+
+       * Makefile.am (PACKAGEDATA): Removed all sed scripts.  Added kr-vars.am
+
+       * kr-vars.am: Initial revision
+
+       * automake.in (require_file): New function.
+       (handle_texinfo): Require 'mdate-sh'
+       (common_sometimes): New variable
+       (usage): Use it.
+
+       * texi-version.am (stamp-vti): Use Ulrich's mdate-sh script
+
+       * mdate-sh: Initial revision
+
+       * automake.in (handle_footer): Don't define SOURCES or OBJECTS if empty
+
+       * automake.in (generate_makefile):
+       Put Makefile.in, Makefile.am in @dist_common
+       (handle_configure): Use @dist_common as appropriate
+
+       * dist-subd-vars.am, dist-vars.am (DIST_CONF): Removed
+
+       * configure.in: Abort if perl not found
+
+       * configure.in: Look for perl
+
+       * automake.in: Reimplemented in Perl
+
+       * automake.in: Fixlet
+
+Sun Nov 26 08:09:30 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: Always print ".SUFFIXES:" rule.
+
+       * automake.in: Distribution config.h.in if required
+
+       * automake.in: Bug fix when including texi-version.am
+
+       * automake.in: Bug fix when looking for .texi file in $am_reldir
+
+       * depend.am: Comment fix
+
+       * automake.in: Look for .texi file in $am_reldir
+
+       * automake.in: Fixlet
+
+       * automake.in: Blank line after targets from user's Makefile.am
+
+       * automake.in: Move footer items to actual footer
+
+       * automake.in: Include stamp-h.in in DIST_COMMON if necessary
+
+       * automake.in (common):
+       Don't include acconfig.h, config.h.top, config.h.bot
+
+       * Makefile.am (CONFIG_HEADER): Renamed from CONFIG_H
+
+       * Makefile.am (CONFIG_H): Define
+
+       * acconfig.h: Initial revision
+
+       * configure.in: Use AC_CONFIG_HEADER.
+
+       * automake.in: Put blah_TEXINFOS into DIST_COMMON
+
+       * automake.in: .info file explicitly depends on primary .texi file
+
+       * texinfos.am (install-info): Always supply 'else' clause to 'if'
+
+       * tags.am (TAGS): Always supply 'else' clause to 'if'
+
+       * subdirs.am (.NOEXPORT): Removed (now in footer.am)
+
+       * automake.in: Always include footer.am in output
+
+       * mans.am (install-man): Always supply 'else' clause to 'if'
+
+       * automake.in: More version.texi fixes
+
+       * automake.in: Only do version.texi processing if requested.
+
+       * automake.in: Minor internationalization fixes.
+       Subshell can now exit with nonzero status.
+       Fixed up .texi handling; now uses texi-version.am
+       Make sure '.c' and '.o' are in .SUFFIXES if required.
+
+       * Makefile.am (PACKAGEDATA): Include texi-version.am
+       (stamp-vti, version.texi): Removed
+       (TEXINFOS): Don't reference version.texi
+
+       * texi-version.am: Initial revision
+
+       * dist.am, dist-subd-top.am (dist):
+       [DIST_SUBDIRS] Follow symlinks when copying.
+
+       * dist-subd-top.am (dist): Removed unneeded subdir= option to make
+
+Sat Nov 25 23:23:39 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: Added --amdir option
+
+       * Makefile.am, configure.in: Turned on internationalization
+
+       * Makefile.am: Set EDITION
+
+       * configure.in: Version 0.21
+
+       * tags.am, tags-subd.am: Don't use double-colon rules
+
+       * automake.in: Redid install-data, install-exec, uninstall handling
+
+       * configure.in: Turn off i18n
+
+Fri Nov 24 23:51:37 1995  Tom Tromey  <address@hidden>
+
+       * automake.in (common): Remove NLS
+
+       * automake.in (common): Include ABOUT-NLS.
+
+       * automake.in: Test for install-sh and mkinstalldirs
+
+       * automake.in: Blank line after OBJECTS= line
+
+       * automake.in: Start subshell in loop after check for Makefile.am
+
+       * automake.in: --use-deps now the default
+
+       * automake.in (am_dir): Don't apply transform to install directory name
+
+       * packagedata.am: Don't apply transform to install directory name
+
+       * Makefile.am (SUBDIRS): Hold off on internationalization
+
+Thu Nov 23 18:02:38 1995  Tom Tromey  <address@hidden>
+
+       * automake.in:
+       Write 'SOURCES =' line after copying Makefile.am variables
+
+       * automake.in: Fixed bug in "--" option processing
+
+       * subdirs.am: ($(RECURSIVE)): Removed trailing \ from last line
+
+       * Makefile.am (DIST_OTHER): Include gettext-sh
+
+       * Makefile.am (SUBDIRS): Define
+
+       * configure.in: Include internationalization bits
+
+       * automake.in: Many changes to avoid double-colon rules.
+
+       * subdirs.am: ($(RECURSIVE)): Print name of target actually used
+
+       * subdirs.am: Removed "::" rules
+
+       * header.am: Removed install, uninstall
+
+       * header.am: Added install, uninstall targets
+
+       * hack-make.sed: Rewrite targets like "all-local" to "all_local"
+
+       * header.am, libraries.am, mans.am, texinfos.am, footer.am:
+       Removed "::" rules
+
+       * Makefile.am (PACKAGEDATA): Include libscripts.am
+
+       * libprograms.am: Don't install libscripts here
+
+       * libscripts.am: Initial revision
+
+       * scripts.am, programs.am, libprograms.am: Removed "::" rules
+
+       * automake.in (am_dir): Run package name through name transform.
+
+       * automake.in: Don't use packagedata.sed or data.sed
+
+       * Makefile.am (PACKAGEDATA): Removed data.sed, packagedata.sed.  Added
+       packagedata.am
+
+       * data.am: No longer run through sed
+
+       * packagedata.am: Initial revision
+
+Wed Nov 22 22:31:02 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: No blank line after Usage
+
+       * automake.in: Removed "NLS nuisances" section.
+       Now uniformly uses $echo for user-visible messages (in advance of
+       internationalization)
+
+       * subdirs.am (maintainer-clean): Don't use realclean-local
+
+       * Makefile.am: Use PACKAGEDATA, not custom code
+
+       * data.am: Use @LONG@, not $(@LONG@)
+
+       * automake.in: Handle DATA and PACKAGEDATA
+
+       * packagedata.sed: Initial revision
+
+       * data.am: Use @DIR@, not $(@DIR@)
+
+       * data.sed: Use $(datadir), not datadir
+
+       * data.sed: Initial revision
+
+       * data.am: Wrote uninstall targets
+
+       * data.am: Initial revision
+
+       * dist-subd.am (dist): Don't link a file that has already been linked
+
+       * dist-subd-top.am, dist.am (dist):
+       Run `automake --include-deps' before making distribution
+
+       * automake.in: More dependency-tracking bug fixes
+
+       * dist-vars.am (DIST_FILES): Rearranged to be like dist-vars-subd.am
+
+       * dist-subd-vars.am (DIST_FILES): Include DIST_COMMON
+
+       * tags-subd.am, tags.am: Added trailing blank line
+
+       * depend.am: Use ".P", not "empty.P", as placeholder.
+
+       * automake.in: Only include depend.am if SOURCES not empty
+
+       * automake.in: Added --use-deps and --include-deps options.
+       Handle auto-generating dependencies.
+
+       * Makefile.am (am_DATA): Include depend.am
+
+       * depend.am: Initial revision
+
+       * automake.in: Look for acconfig.h, config.h.top, and config.h.bot
+
+       * automake.in: Put blank line after .SUFFIXES
+
+       * scripts.am: Added blank line at end
+
+       * scripts.am: Removed unnecessary comment
+
+       * scripts.am: Removed unnecessary workarounds
+
+       * automake.in: Don't include programs.am if PROGRAMS empty
+
+       * header-vars.am (INSTALL_SCRIPT): Typo
+
+       * texinfos.am, compile-kr.am: Don't include .SUFFIXES
+
+       * automake.in: Handle .SUFFIXES here.
+
+       * configure.in: Use fp_PROG_INSTALL
+
+       * header-vars.am: Changes for autoconf 2.5.
+       Now includes INSTALL_SCRIPTS.
+
+       * texinfos.am (install-info): Bug fix
+
+       * automake.in:
+       Include scripts.am or libscripts.am in output if appropriate
+
+       * programs.am (install-programs, uninstall-programs):
+       Don't install SCRIPTS
+
+       * Makefile.am (am_DATA): Include scripts.am
+
+       * scripts.am: Initial revision
+
+Tue Nov 21 09:11:38 1995  Tom Tromey  <address@hidden>
+
+       * automake.in:
+       Cleaned up how "prog_SOURCES" variable is found in input.
+       Ditto prog_OBJECTS.
+       Put static sed scripts into separate, installed files.
+
+       * Makefile.am (am_DATA): Include hack-make.sed and nl-remove.sed
+
+       * hack-make.sed, nl-remove.sed: Initial revision
+
+       * texinfos.am (install-info): Rewrote
+
+       * subdirs.am (all-recursive): Put with other -recursive rules
+
+       * configure.in: Version 0.20
+
+       * automake.in: Another bug fix
+
+       * automake.in: Bug fix when looking for texinfo.tex
+
+       * texinfo.tex: Initial revision
+
+       * automake.in:
+       If TEXINFOS defined but texinfo.tex does not exist, give warning.
+
+       * subdirs.am (all): Renamed from _all.  Now uses all-recursive
+       (all-recursive): Don't fail immediately if -k specified.
+
+Mon Nov 20 22:48:03 1995  Tom Tromey  <address@hidden>
+
+       * subdirs.am (_all):
+       New target.  Now use Jim Meyering's formulation of AIX
+       workaround.
+       (install-exec, install-data): New targets
+
+Sat Nov 18 19:07:30 1995  Tom Tromey  <address@hidden>
+
+       * remake.am (Makefile.in): automake "Makefile", not "Makefile.am"
+
+       * automake.in: Use @datadir@
+
+       * automake.in: Added @configure_input@ line
+
+Fri Nov 17 23:32:43 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: "--help" option now prints auto-recognized file names.
+       Allow AM_ overriding of more variables.
+
+       * texinfos.am (install-info):
+       Don't cd to srcdir to avoid breaking install-sh
+       Other bug fixes
+
+       * Makefile.am: Handle automake.texi
+
+Thu Nov 16 18:43:43 1995  Tom Tromey  <address@hidden>
+
+       * subdirs.am (all): Separated out due to AIX 3.2.5 bug.
+
+       * tags.am (TAGS): bug fix
+
+       * automake.in: Use am_dir, not AM_DIR.
+       Use version, not VERSION.
+       Bug fix in TAGS code.
+
+       * Makefile.am (am_DATA): Include tags.am and tags-subd.am
+
+       * subdirs.am: TAGS target now in tags.am
+
+       * footer.am: TAGS and ID targets now in tags-subd.am
+
+       * tags-subd.am, tags.am: Initial revision
+
+       * automake.in: Cleaned up AM_PROGRAM code.
+       Handle TAGS target better
+
+       * remake.am, remake-subd.am (Makefile.in): Bug fix.
+
+       * automake.in (usage): Updated
+
+       * remake-subd.am, remake.am:
+       Added rule where Makefile.in depends on Makefile.am
+
+       * automake.in: Entire body of 'for' loop now in subshell
+
+       * automake.in (common): config.guess and config.sub are common files.
+
+       * dist-subd-top.am, dist.am (dist): Bug fix.
+
+       * Makefile.am (DIST_OTHER): Don't include TODO
+
+       * automake.in: Auto-include TODO and THANKS files.
+
+       * dist-subd-top.am, dist.am (dist): Don't depend on DIST_DIRS
+
+       * automake.in: More bug fixes in "look for Makefile.am" code.
+
+       * automake.in: Bug fix in "look for Makefile.am" code.
+
+       * automake.in:
+       If no arguments given, look for all Makefile.am's in this
+       directory and in immediate subdirs
+
+       * automake.in: Bug fixes for LDADD-override feature.
+
+       * program.am: Use @address@hidden, and put after LDFLAGS
+
+       * automake.in: Allow `prog_LDADD', if specified, to override LDADD.
+
+       * automake.in: Use AM_PROGRAMS, not ALLPROGRAMS, and invert sense.
+
+       * header-vars.am (ALL): Use PROGRAMS, not ALLPROGRAMS.
+
+Wed Nov 15 01:54:43 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: No longer look for _SOURCES or _OBJECTS
+
+       * header-vars.am:
+       Remove "automatically created" header (now in automake).
+       Updated copyright.
+
+       * automake.in: Put version info in Makefile header
+
+Tue Nov 14 23:38:17 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: Minor cleanups
+
+       * dist-subd-top.am, dist.am (dist):
+       Don't link or copy file if it already exists.
+
+       * automake.in:
+       Look for _SOURCES (common sources) and generate _OBJECTS.
+
+       * footer.am (ID, TAGS): Include HEADERS
+
+       * dist-vars.am, dist-subd-vars.am (DIST_FILES): Include HEADERS
+
+Mon Nov 13 22:20:02 1995  Tom Tromey  <address@hidden>
+
+       * dist-subd.am (distdir): Is relative to ".."
+
+       * dist-subd-vars.am (PACKAGE, VERSION): Define
+
+       * dist-subd.am (dist): Don't handle DIST_DIRS.
+
+       * mans.am (uninstall-man): Another bug fix.
+
+       * mans.am (uninstall-man): Bug fix.
+
+       * dist.am, dist-subd-top.am (dist): Bug fix
+
+       * Makefile.am (DIST_SUBDIRS): New macro
+
+       * dist-subd-top.am, dist.am (dist): Handle DIST_SUBDIRS
+
+       * Makefile.am (DIST_OTHER): Include automake.in
+
+       * Makefile.am (DISTCLEANFILES): New macro.
+
+       * automake.in (common): Include COPYING.LIB
+
+       * Makefile.am (automake): New rule.
+
+       * texinfos.am (install-info): Changed per GNU standards
+
+       * remake-hdr.am (stamp-h.in):
+       Use "touch", not "date", per GNU standards.
+
+       * automake.in (common): Include texinfo.tex
+
+Sun Nov 12 23:59:08 1995  Tom Tromey  <address@hidden>
+
+       * automake.in: More fixes when finding common files.
+
+       * Makefile.am (DIST_OTHER): Another removal.
+
+       * automake.in: Special-case when amdir=.
+
+       * Makefile.am (DIST_OTHER): Removed auto-detected files.
+
+       * automake.in:
+       Search for commonly-used files and auto-include them in distribution
+
+       * dist-vars.am (DIST_FILES): Include DIST_COMMON.
+       (DIST_CONF): Removed files searched for by automake.
+
+       * automake.in: More arg-parsing bug fixes.
+
+       * Makefile.am (DIST_OTHER): Include install-sh
+
+       * Makefile.am (DIST_OTHER): Don't include auto-included files.
+
+       * automake.in: Bug fixes to argument parsing code.
+
+       * automake.in: Handle --version and --help.
+       NLS stuff from autoconf.
+
+       * Makefile.am (amdatadir): Fixed typo.
+       (install): Make install directories
+
+       * Makefile.am: Use "install::", not "install:"
+
+       * install-sh, mkinstalldirs: Initial revision
+
+       * configure.in: Use AC_PROG_INSTALL
+
+       * automake.in: Set AM_DIR based on configure results.
+
+       * Makefile.am (install): New target.
+       (amdatadir): New variable.
+
+       * automake.in: Use "#! /", not "#!/".
+
+       * Makefile.am, configure.in: Initial revision
+
+       * automake.in: Renamed from "automake".
+       Set VERSION.
+
+       * dist.am (PACKAGE, VERSION): Now in dist-vars.am
+
+       * automake.in: Insert remake-subd.am if appropriate.
+
+       * subdirs.am (TAGS): Include $(CONFIG_HEADER) when making tags.
+
+       * automake.in: Handle ALLPROGRAMS variable.
+
+       * header-vars.am (ALL): Use ALLPROGRAMS, not PROGRAMS.
+
+       * automake.in: Fixlet when printing "subdir=DIR"
+
+       * automake.in: Put "subdir=DIR" into subdir Makefile
+
+       * automake.in: Don't refer to distname.am.
+       Only put footer.am in subdir Makefiles.
+
+       * subdirs.am (id, ID): New target.
+       (.NOEXPORT): Copied from footers.am.
+
+       * subdirs.am (TAGS): Bug fixes.
+
+       * subdirs.am (TAGS): Don't fail if a subdir doesn't have TAGS target.
+
+       * subdirs.am (maintainer-clean-local): Remove TAGS
+
+       * subdirs.am (TAGS): Make tags file that includes all subdir tags files
+
+       * subdirs.am: Use maintainer-clean, per GNU standards
+
+       * dist-subd-top.am: Some variables defined in dist-vars.am
+
+       * dist-vars.am (PACKAGE, VERSION):
+       New variables, initialized by configure
+
+       * footer.am (id, ID): New targets
+       (TAGS): Put TAGS file in build, not source, directory
+
+       * remake-subd.am (Makefile): Don't assume subdir is 'src'
+
+       * dist.am: Changed to assume PACKAGE and VERSION are set by configure.
+
+       * dist-subd.am: Changed to conform to new top-level dist target.
+
+       * dist-subd-top.am:
+       Changed to assume PACKAGE and VERSION are set by configure.
+
+       * clean-kr.am, clean.am (maintainer-clean):
+       Updated rules per GNU standards.
+
+       * clean.am, clean-kr.am (maintainer-clean): Renamed from realclean.
+
+Sat Nov  5 14:39:50 1994  djm  <address@hidden>
+
+       * automake.in, texinfos.am: kludge for multiple-part info files
+
+Thu Nov  3 13:33:44 1994  djm  <address@hidden>
+
+       * clean.am, clean-kr.am: remove INFOS
+
+Wed Nov  2 06:15:42 1994  djm  <address@hidden>
+
+       * texinfos.am: add path
+
+       * remake.am, remake-hdr.am: account for VPATH limitations
+
+Mon Oct 24 23:01:59 1994  djm  <address@hidden>
+
+       * automake.in, dist-subd-top.am, dist-subd.am, dist.am, header-vars.am, 
libprograms.am, programs.am:
+       handle SCRIPTS and LIBSCRIPTS similar to PROGRAMS
+
+Sun Oct 23 01:50:41 1994  djm  <address@hidden>
+
+       * texinfos.am: install-info depends on info files
+
+       * dist-subd-vars.am, dist-vars.am: distrib info files
+
+Sun Oct  2 02:03:06 1994  djm  <address@hidden>
+
+       * clean-kr.am, clean.am: fix up distclean
+
+       * subdirs.am: fix typo
+
+       * clean.am: do more in distclean
+
+Sat Oct  1 23:52:51 1994  djm  <address@hidden>
+
+       * libraries.am: make install depend on all
+
+       * automake.in: fix typo
+
+Wed Sep 28 21:15:26 1994  djm  <address@hidden>
+
+       * dist-subd-vars.am, dist-vars.am, header-vars.am: fix doc bugs
+
+       * automake.in, compile-vars.am, dist.am: fix dist for no subdirs
+
+       * dist-subd-top.am: Initial revision
+
+       * automake.in, header-vars.am, libraries-vars.am, mans-vars.am, 
texinfos-vars.am:
+       centralize prefix var setting
+
+       * header-vars.am: set all the std vars based on prefix
+
+Tue Sep 27 01:32:22 1994  djm  <address@hidden>
+
+       * automake.in: don't add kr stuff if not needed
+
+       * dist-vars.am: add config vars to dist
+
+Mon Sep 26 23:09:09 1994  djm  <address@hidden>
+
+       * program.am: add LDADD
+
+       * compile-vars.am: remove LDADD from LDFLAGS
+
+       * clean.am: move knr stuff to another file
+
+       * automake.in: use different clean file for ansi2knr
+
+       * clean-kr.am: Initial revision
+
+Thu Sep 22 03:45:02 1994  djm  <address@hidden>
+
+       * automake.in, dist-subd.am, dist.am: fix rules and dist
+
+Tue Sep 20 21:29:40 1994  djm  <address@hidden>
+
+       * compile.am, automake.in: split out knr
+
+       * compile-kr.am: Initial revision
+
+       * libprograms.am: fix typo
+
+       * automake.in, clean.am, compile-vars.am, header-vars.am, 
libprograms.am:
+       make libprograms work
+
+       * libprograms.am: Initial revision
+
+       * automake.in, compile.am, header-vars.am: fix little bugs
+
+       * compile.am: allow parallel K&R
+
+       * clean.am: remove kerb temps
+
+       * automake.in: fix recognizing start of rules
+
+       * dist-subd.am, dist.am: fix dist
+
+       * automake.in, compile.am, footer.am, texinfos.am: fix ansi2knr
+
+Mon Sep 19 23:39:21 1994  djm  <address@hidden>
+
+       * automake.in: works on m4 too
+
+       * automake.in, mans.am: works on fileutils
+
+       * automake.in, clean.am, compile.am, dist-subd.am, dist.am, footer.am, 
header-vars.am, header.am, libraries.am, library.am, mans-vars.am, mans.am, 
programs.am, remake-hdr.am, remake-subd.am, remake.am, subdirs.am, texinfos.am:
+       works on fileutils except for all
+
+       * automake.in: vars thing
+
+       * header-vars.am: Initial revision
+
+       * texinfos-vars.am, mans-vars.am, libraries-vars.am, dist-vars.am, 
dist-subd-vars.am:
+       entered into RCS
+
+       * compile-vars.am: Initial revision
+
+       * automake.in: many improvements
+
+       * footer.am: Initial revision
+
+       * dist.am: remove distname
+
+       * automake.in: namespace cleanup
+
+       * distname.am: Initial revision
+
+       * automake.in, clean.am, compile.am, dist-subd.am, dist.am, header.am, 
libraries.am, library.am, mans.am, program.am, programs.am, remake-hdr.am, 
remake.am, subdirs.am, texinfos.am:
+       might work
+
+       * mans.am, libraries.am, texinfos.am, library.am, compile.am, 
program.am, programs.am, clean.am, subdirs.am, remake-subd.am, remake.am, 
remake-hdr.am, dist.am, dist-subd.am, header.am, automake.in:
+       Initial revision
+
+
+-----
+
+Copyright 1994-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.98 b/old/ChangeLog.98
new file mode 100644
index 0000000..3eeb353
--- /dev/null
+++ b/old/ChangeLog.98
@@ -0,0 +1,2191 @@
+1998-12-22  Marcus G. Daniels  <address@hidden>
+
+       * automake.in (handle_dependencies): Transform EXT & PFX in
+       Objective C case.
+
+1998-12-11  Marcus G. Daniels  <address@hidden>
+
+       * automake.in: Register Objective C language.
+       (finish_languages): Consider Objective C to be non_c.
+       (lang_objc_rewrite, lang_objc_finish): New functions.
+       (resolve_linker): Recognize OBJCLINK before LINK.
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Handle empty $config_aux_dir.
+
+       * automake.in (handle_texinfo): Set $conf_pat correctly when
+       config_aux_dir not used.
+       (handle_texinfo): Run maintainer-clean-aminfo rules in srcdir.
+       From Erez Zadok.
+       * texi-vers.am (address@hidden@): Prefix file names with
+       $(srcdir).  From Erez Zadok.
+       ($(srcdir)/address@hidden@): Don't run mdate-sh from srcdir.
+
+1999-01-08  Thomas Tanner  <address@hidden>
+
+       * depend.am: remove the dependencies (.deps)
+       in "make distclean", not "make maintainer-clean"
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * aclocal.in (write_aclocal): Updated copyright.
+       (parse_arguments): Likewise.
+       * automake.in (parse_arguments): Updated copyright.
+       (initialize_global_constants): Likewise.
+
+       * Makefile.am (pkgdata_DATA): Renamed from pkgdata_SCRIPTS.
+       (install-data-hook): New hook.  Report from Petter Reinholdtsen.
+
+       * remake-hdr.am: Provide `else' clause for each `if'.
+
+1999-01-10  Alexandre Oliva  <address@hidden>
+
+       * remake-hdr.am: recover from removal of config headers, and try
+       to get real timestamps, which is useful for CVS files
+
+1999-01-10  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): Don't special-case "-local"
+       targets.  Test all.test.
+
+       * automake.in (handle_texinfo): Prepend $(srcdir) to directory
+       used to find texinfo.tex.  Report from Glenn Amerine.
+
+1999-01-07  Tom Tromey  <address@hidden>
+
+       Based on report from Marcus G. Daniels.  Fixes include.test.
+       * automake.in (generate_makefile): Call read_main_am_file.
+       (read_main_am_file): New sub.
+       (read_am_file): Moved header generation code into
+       read_main_am_file.
+
+1999-01-06  Gary V. Vaughan  <address@hidden>
+
+       * automake.in (require_file_internal): qub perl on win32 hangs
+       on a call to unlink for a non-existant file, which in turn causes
+       tests/symlink.test to hang on win32.  Check that the file exists
+       before unlinking it!
+
+1998-12-24  Thomas Tanner  <address@hidden>
+
+       * automake.in (handle_ltlibraries): check whether -module was
+       defined for libraries names without 'lib' prefix.
+
+Fri Dec 11 10:20:42 1998  Matthew D. Langston  <address@hidden>
+
+       * compile_f_c_cxx.test: Change to use F77 and F77LINK instead of
+       FC and FLINK, respectively.
+       * flibs.test: same
+       * fnoc.test: same
+       * fo.test: same
+       * fonly.test: same
+       * link_f_c.test: same
+       * link_f_c_cxx.test: same
+       * link_f_cxx.test: same
+       * link_f_only.test: same
+
+Fri Dec 11 10:23:17 1998  Matthew D. Langston  <address@hidden>
+
+       * automake.in, automake.texi: Change all of the Fortran 77 code to
+       use the new `F77' prefix instead of the older `FC' prefix.
+       Specifically this changed FC, FCOMPILE, LTFCOMPILE, FLINK and FLD
+       to F77, F77COMPILE, LTF77COMPILE, F77LINK and F77LD, respectively.
+
+1999-01-05  Tom Tromey  <address@hidden>
+
+       * depend2.am (%.o): Use \012, not \n, to avoid losing `tr's.  From
+       Bill Currie.
+       (%.lo): Likewise.
+
+1998-12-22  Alexandre Oliva  <address@hidden>
+
+       * depend2.am: Don't assume backslash can't occur in the middle of
+       filename; it loses on M$W
+
+1998-12-21  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_libraries): Reverted Thomas Tanner's
+       change.  Non-libtool libraries still must fit naming
+       requirements.
+
+1998-12-21  Alexandre Oliva  <address@hidden>
+
+       * automake.in (handle_configure): Dist inputs for AC_OUTPUT.
+
+1998-12-21  Alexandre Oliva  <address@hidden>
+
+       * depend2.am: don't use .p and .P for dependencies; it loses on
+       case-insensitive filesystems.
+       Reported by Henrik Frystyk Nielsen <address@hidden>
+
+1998-12-20  Thomas Tanner  <address@hidden>
+
+       * automake.in (handle_libraries, handle_ltlibraries): relax the
+       name checking to not enforce `^lib.*' for the sake of building libtool
+       modules.
+
+1998-12-21  Tom Tromey  <address@hidden>
+
+       * automake.in (do_one_merge_target): Special case
+       install-data-hook and install-exec-hook.
+       (handle_merge_targets): Removed install-data-hook and
+       install-exec-hook code.  Test insthook.test.
+
+1998-12-16  Tom Tromey  <address@hidden>
+
+       * tags.am (ID): Uniquify list of sources.  Report from Jim
+       Meyering.
+
+1998-12-11  Tom Tromey  <address@hidden>
+
+       Bug report from Paul D. Smith:
+       * automake.in (handle_merge_targets): Set
+       AM_INSTALL_PROGRAM_FLAGS, not INSTALL_PROGRAM.
+       * header-vars.am (INSTALL_PROGRAM): Added
+       AM_INSTALL_PROGRAM_FLAGS.
+
+1998-12-03  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Print prettier banner when
+       `make dist' succeeds.  From Akim Demaille.
+
+1998-12-02  Tom Tromey  <address@hidden>
+
+       * configure.in: Upped version to 1.3e (1.3d was just released).
+
+       * configure.in: Upped version to 1.3d.
+
+       * texinfo.tex, config.guess, config.sub, install-sh: New
+       versions.
+       * ansi2knr.c: New version.
+
+       * automake.in (handle_configure): Quote @MAINTAINER_MODE_TRUE@ to
+       avoid problems where AM_MAINTAINER_MODE is put into automake's own
+       configure.in.
+
+       * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir.
+
+       Some bugs from François Pinard:
+       * automake.in (usage): Remove duplicates in file list.
+
+       * automake.in (usage): Print files in column-major order.
+       (handle_gettext): Only require ABOUT-NLS for GNU programs.
+
+1998-12-01  Tom Tromey  <address@hidden>
+
+       * automake.texi (Dist): Documented GZIP_ENV.
+       * automake.in (handle_dist): Define and use GZIP_ENV, not GZIP.
+       (initialize_global_constants): Use GZIP_ENV, not GZIP.
+
+1998-11-27  Tom Tromey  <address@hidden>
+
+       * automake.in (quote_cond_val): Use "\002", not '\002', to
+       represent null string.
+       (unquote_cond_val): Removing all "\002" strings from result.  Test
+       cond7.test.
+
+       * automake.texi: Formatting changes for latest texinfo.
+
+       * automake.in (handle_java): Removed debugging print.
+
+1998-11-18  Tom Tromey  <address@hidden>
+
+       * automake.in (finish_languages): Use CCLD, not CLD.
+
+       * automake.in (finish_languages): Define CLD; use it in LINK
+       definition.
+       (lang_cxx_finish): Define CXXLD; use it in CXXLINK definition.
+       (lang_f77_finish): Define FLD; use it in FLINK definition.
+       (lang_ppf77_finish): Likewise.
+       (lang_ratfor_finish): Likewise.
+
+1998-11-10  Matthew D. Langston  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Recognize
+       AC_F77_LIBRARY_LDFLAGS, and recognize FLIBS as a configure
+       substitution.
+
+       * automake.texi: Fix several little Fortran 77 references to now
+       point to autoconf.texi.  Rename associated Fortran 77 macros from
+       `AM_' to `AC_'.
+
+1998-11-10  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): Handle configure_vars case.  Test
+       pluseq4.test.
+
+1998-11-09  Tom Tromey  <address@hidden>
+
+       * automake.in (read_am_file): `conditional_stack' isn't a
+       function.  Correctly add new value to existing value in `+='
+       case.
+
+1998-10-29  Gary V. Vaughan <address@hidden>
+
+       * automake.in (parse_arguments): Fixed type of -c for copying
+
+1998-10-30  Tom Tromey  <address@hidden>
+
+       * automake.texi (Install): Documented DESTDIR more fully.  From
+       Jeff Garzik.
+
+       * automake.in (MACRO_PATTERN): Recognize `+='.
+       (BOGUS_MACRO_PATTERN): Likewise.
+       (read_am_file): Handle `+=' assignments.
+
+1998-10-28  Tom Tromey  <address@hidden>
+
+       * Makefile.am (maintainer-check): Changed code to be acceptable to
+       bash 2.01.1.
+
+       * automake.in (do_one_clean_target): Special-case config.status.
+       Report from Jeff Garzik.
+
+       * m4/Makefile.am (m4data_DATA): Don't mention f77.m4.
+       * m4/f77.m4: Removed; macro now in autoconf proper.
+
+1998-10-24  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Typo fix in code testing to
+       see if subdir is `.'.  From Raja R Harinath.
+
+       * m4/lispdir.m4: Fixed sed invocation.  From Akim Demaille.
+
+1998-10-20  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_dependency_file): Fixed test on `while' loop.
+       Fixes depend2.test.  Report from Akim Demaille.
+
+1998-10-16  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_ltlibraries): Specify `noinst' when
+       computing valid prefixes.  From Ulrich Drepper.
+
+       * automake.in (scan_dependency_file): Don't give an error if there
+       is text after the last line.  Report from Matthew D. Langston.
+
+       * m4/mktime.m4: Detect glibc mktime bug.  From Jim Meyering.
+
+       * Makefile.am (SUBDIRS): Added `.' again.
+
+       * Makefile.am (EXTRA_DIST): Removed automake.spec.in.  From
+       Matthew D. Langston.
+       (info_TEXINFOS): Removed am-f77.texi.
+
+       * automake.in (handle_ltlibraries): Allow `noinst' LTLIBRARIES.
+       These are libtool convenience libraries.
+
+1998-10-13  Tom Tromey  <address@hidden>
+
+       * m4/f77.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Added f77.m4.
+
+Thu Oct  8 15:00:57 1998  Matthew D. Langston  <address@hidden>
+
+       * automake.in (resolve_linker): Put the Fortran 77 linker where it
+       needs to be.
+
+       * automake.in (lang_f77_finish): Add support for Fortran 77.
+
+       * automake.in (f77_extensions): New helper function for function
+       `lang_f77_finish'.
+
+       * automake.in (lang_f77_rewrite): Change to return success.
+
+       * automake.in (scan_one_configure_file): Add test for the Fortran
+       77 compiler.
+
+       * automake.in (finish_languages): Changed tests for "C++ only" to
+       "C++ and/or Fortran 77 only", and renamed `all_cxx' to `non_c'.
+
+       * automake.in: Registered the ppf77 language (`.F' extension) for
+       preprocessed Fortran 77.
+
+       * automake.in: Registered the ratfor language (`.r' extension).
+
+       * automake.in: Registered Fortran 77 header files with the "header
+       language" (`.inc' extension).
+
+Tue Sep  8 14:50:50 1998  Matthew D. Langston  <address@hidden>
+
+       * automake.texi: Added several new index entries.
+
+Sun Aug 30 16:10:31 1998  Matthew D. Langston  <address@hidden>
+
+       * automake.texi:
+       - Add address@hidden' (output variable index).
+       - Merge address@hidden' (Autoconf macros) and address@hidden' to the 
General
+         Index.
+
+       * automake.texi (Macros):
+       - Changed the address@hidden @code' list of macros to address@hidden'.
+       - Add `AC_PROG_FC' and `MDL_F77_LIBRARY_LDFLAGS' to the list.
+
+Tue Aug 11 10:42:39 1998  Matthew D. Langston  <address@hidden>
+
+       * automake.texi (C++): Change address@hidden' to address@hidden'.
+
+       * automake.texi (Fortran 77): Add Fortran 77 documentation.
+
+1998-10-11  Tom Tromey  <address@hidden>
+
+       Preliminary (completely untested) multilib support.
+       * automake.texi (Macros): Document AM_ENABLE_MULTILIB.
+       * m4/Makefile.am (m4data_DATA): Added multi.m4.
+       * Makefile.am (amfiles): Added multilib.am.
+       * automake.in (seen_multilib): New global.
+       (scan_one_configure_file): Recognize AM_ENABLE_MULTILIB.
+       (generate_makefile): Call handle_multilib.
+       (handle_multilib): New function.
+       * multilib.am: New file.
+       * m4/multi.m4: New file.
+
+1998-10-08  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Always include configure.in and
+       configure in distribution.  Fixes confdist.test.
+
+       * automake.in (do_one_merge_target): Be silent when running
+       install-exec-am and install-data-am.  Fixes extra3.test and
+       extra4.test.
+
+1998-10-07  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Added -noextra option.
+       (handle_data): Pass -noextra to am_install_var.
+
+Sun Oct  4 22:24:10 1998  Tom Tromey  <address@hidden>
+
+       * m4/winsz.m4 (AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use
+       3-argument form of AC_DEFINE.
+       * m4/regex.m4 (AM_WITH_REGEX): Use 3-argument form of AC_DEFINE.
+       * m4/ptrdiff.m4 (AM_TYPE_PTRDIFF_T): Use 3-argument form of
+       AC_DEFINE.
+       * m4/protos.m4 (AM_C_PROTOTYPES):Use 3-argument form of
+       AC_DEFINE.
+       * m4/obstack.m4 (AM_FUNC_OBSTACK): Use 3-argument form of
+       AC_DEFINE.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use 3-argument form of
+       AC_DEFINE.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Use 3-argument form of
+       AC_DEFINE.
+
+Tue Oct  6 00:02:15 1998  Tom Tromey  <address@hidden>
+
+       * depend2.am (%.lo): Handle case where compiler does not put space
+       before ":".  From Raja R Harinath.
+
+Mon Oct  5 13:05:43 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): AC_CONFIG_HEADER is not
+       obsolete; it simply isn't preferred with automake.
+       (scan_one_configure_file): Likewise for AC_DECL_YYTEXT and
+       AC_PROG_LEX.
+
+       * automake.in (am_line_error): Handle case where variable defined
+       in configure.in.  Fixes test badline.test.
+       (%configure_vars): Redefined meaning of values.
+       (scan_one_configure_file): Set $configure_vars values
+       appropriately.
+
+Sat Oct  3 14:53:34 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_aclocal_m4): Use new MAINTAINER_MODE
+       conditional.
+       (handle_configure): Likewise.
+       (read_am_file): Likewise.
+       (file_contents_with_transform): Likewise.
+       (scan_one_configure_file): Recognize that AM_MAINTAINER_MODE
+       defines a conditional.
+       * automake.texi (Optional): Document new AM_MAINTAINER_MODE.
+       * texi-vers.am ($(srcdir)/@VTEXI@): Look at MAINTAINER_MODE
+       conditional.
+       (address@hidden@): Likewise.
+       * remake.am ($(srcdir)/configure): Look at MAINTAINER_MODE
+       conditional.
+       * remake-hdr.am ($(srcdir)/@CONFIG_HEADER_IN@): Look at
+       MAINTAINER_MODE conditional.
+       * m4/maintainer.m4 (AM_MAINTAINER_MODE): Defined MAINTAINER_MODE
+       conditional.
+
+1998-10-03  Jim Blandy  <address@hidden>
+
+       * depend2.am (%.lo): When editing the dependency file to add the
+       .lo file to the targets, allow for whitespace between the end of
+       the filename and the colon.  Some compilers (notably the Cygnus
+       release of GCC 2.7-97r1) put space there: "alist.o : ..."
+
+Sat Oct  3 12:07:21 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Handle case where there is no
+       Makefile in the config header directory.  Fixes test config.test.
+
+Thu Oct  1 00:51:51 1998  Tom Tromey  <address@hidden>
+
+       * depend2.am (%.o): Append sed results to .P file in this case
+       too.  From Raja R Harinath.
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Correctly find xemacs and
+       xemacs install directories.  From Robert Bihlmeyer.
+
+       * depend2.am: Don't bother trying to delete source file from
+       list.
+
+       * depend2.am (%.o): Handle deleted header file problem.
+       (%.lo): Likewise.
+
+       * texinfos.am (install-info-am): Handle case where INFO_DEPS is
+       empty.  Reported by Andrew Cagney.
+       (uninstall-info): Likewise.
+       (dist-info): Likewise.
+
+       * automake.in (handle_texinfo): Error if user tries to generate
+       HTML.
+
+Wed Sep 30 00:41:40 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (do_one_clean_target): Don't push previous clean
+       target if this target is `mostly'.  Report from Raja R Harinath.
+
+       * subdirs.am (mostlyclean-recursive ...): Build local_target, not
+       target.  From Raja R Harinath.
+
+       Completely changed how languages and source files are handled:
+       * automake.in: Call register_language for each language.
+       (lang_c_rewrite): New function.
+       (lang_cxx_rewrite): Likewise.
+       (lang_header_rewrite): Likewise.
+       (lang_yacc_rewrite): Likewise.
+       (lang_yaccxx_rewrite): Likewise.
+       (lang_lex_rewrite): Likewise.
+       (lang_lexxx_rewrite): Likewise.
+       (lang_asm_rewrite): Likewise.
+       (lang_fortran_rewrite): Likewise.
+       (register_language): Likewise.
+       (extension_map): New global.
+       (language_map): Likewise.
+       (resolve_linker): New function.
+       (handle_single_transform_list): Rewrote to use lang_X_rewrite
+       functions.  Changed meaning of first argument.
+       (initialize_per_input): Removed seen_any_source.  Initialize
+       language_scratch, extension_seen.  Removed cxx_extensions,
+       seen_c_source, dir_holds_headers, dir_holds_sources.
+       (handle_source_transform): Don't compute $objpat.  Pass $obj
+       directly to handle_single_transform_list.
+       (handle_built_sources): Fixed call to
+       handle_single_transform_list.
+       (lang_c_finish): New function.
+       (lang_cxx_finish): Likewise.
+       (lang_header_finish): Likewise.
+       (lang_yacc_finish): Likewise.
+       (lang_yaccxx_finish): Likewise.
+       (lang_lex_finish): Likewise.
+       (lang_lexxx_finish): Likewise..
+       (lang_asm_finish): Likewise.
+       (lang_fortran_finish): Likewise.
+       (yacc_lex_finish_helper): Likewise.
+       (libtool_compiler): Likewise.
+       (saw_extension): New function.
+       (handle_lib_objects_cond): Use saw_extension, not old variables.
+       (handle_yacc_lex_cxx): Removed.
+       (finish_languages): New function.
+       (get_object_extension): Don't set dir_holds_sources.
+       (handle_headers): Don't set dir_holds_headers.  Instead, call
+       saw_extension.
+       (saw_sources_p): New function.
+       (handle_tags): Use it.
+       (handle_dependencies): Likewise.
+       (cxx_extensions): New function.
+       (handle_dependencies): Use it.
+       (generate_makefile): Call finish_languages, not
+       handle_yacc_lex_cxx.
+
+1998-05-24  Andreas Schwab  <address@hidden>
+
+       * texi-vers.am: Use the correct target names.  Fix generation of
+       stamp file.
+
+       * automake.in (handle_tests): In commands generating site.exp copy
+       the old contents from site.exp, not site.bak, which does not
+       exist.
+
+Tue Sep 29 00:10:22 1998  Tom Tromey  <address@hidden>
+
+       Fixed noinst.test again:
+       * automake.in (do_one_merge_target): Special-case `install-am'.
+       (handle_merge_targets): Don't compute @install variable.
+
+       Fixes for recurs2.test.  Report from Jim Meyering.
+       * automake.in (vars_scanned): Define globally.
+       (variable_value_as_list_worker): Delete $var entry in
+       %vars_scanned after local work is done.
+
+1998-05-26  Marcus G. Daniels  <address@hidden>
+
+       * automake.in: New pattern: INCLUDE_PATTERN.
+       (read_am_file):  Make AM_FILE a local filehandle.
+       For INCLUDE_PATTERN, store included paths on @include_stack and call
+       read_am_file with argument.
+       (handle_configure): When printing the dependencies for
+       Makefile.in, print the items on include_stack (if any) as
+       dependencies, too.
+
+       * automake.texi: Make a command index `cm' that goes into the
+       concept index.  Put if, endif, else, and include in the command index.
+       (Include): Show usage of include directive.
+
+Mon Sep 28 00:03:45 1998  Tom Tromey  <address@hidden>
+
+       `.' in SUBDIRS changes order of builds:
+       * Makefile.am (SUBDIRS): Added `.'.  Put tests last.
+       * tags.am (TAGS): Don't look for TAGS file in `.'.
+       * automake.texi (Top level): Document SUBDIRS change.
+       * automake.in (handle_installdirs): Create separate installdirs-am
+       target.
+       (handle_merge_targets): Don't put all-am onto @all.  Fixed error
+       message.  Correctly handle install-info.  Give error if
+       install-info-local inappropriately defined.  Don't special-case
+       install-data, install-exec, install, uninstall, or all.
+       (handle_subdirs): Don't push `-recursive' target names onto
+       corresponding lists.
+       (do_one_merge_target): Always define `-am' form of rule, and point
+       ordinary form to `-am' or `-recursive' as appropriate.
+       Special-case `all'.
+       (do_check_merge_target): Generate check-am target.
+       (handle_dist_worker): Use target_defined.
+       (handle_dist): Likewise.
+       (handle_merge_targets): Likewise.
+       (do_one_merge_target): Likewise.
+       (do_check_merge_target): Likewise.
+       (do_one_clean_target): Likewise.
+       (initialize_per_input): Initialize $all_target.
+       (do_one_clean_target): Always generate -am form of rule; other
+       changes for new SUBDIRS change.
+       (handle_clean): Always generate clean-am form of rule.
+       (handle_tags): Only build subdir if not `.'.
+       (handle_dist_worker): Skip `.' directory.
+       * subdirs.am: Allow `.' to be specified in SUBDIRS.
+
+Sun Sep 27 20:02:21 1998  Tom Tromey  <address@hidden>
+
+       * automake.texi (Dist): Document EXTRA_DIST change.
+       * automake.in (handle_dist_worker): Allow subdirs in EXTRA_DIST.
+
+       * automake.in (handle_ltlibraries): Wrote better comment about
+       EXTRA_LTLIBRARIES.
+
+       * automake.texi (Invoking Automake): Document --copy.
+       * automake.in (copy_missing): New global.
+       (parse_arguments): Recognize --copy/-c.
+       (require_file_internal): Handle $copy_missing.  Fixed error
+       message.
+       (initialize_global_constants): Document -c/--copy.
+
+       * automake.texi: Document LIBOBJS trick.
+
+       * automake.in (handle_dist_worker): If DIST_SUBDIRS defined, use
+       it even when SUBDIRS not conditional.
+
+       * automake.in (quote_cond_val): Turn tabs into \003.
+       (unquote_cond_val): Turn \003 back into tabs.  Fixes test
+       cond6.test.
+
+       * automake.in (read_am_file): Treat backslash-newline as
+       whitespace.  Test parse.test.
+
+Sat Sep 26 19:31:22 1998  Tom Tromey  <address@hidden>
+
+       * configure: Rebuilt.
+       * configure.in: Upped version to 1.3c.
+
+       Track recent autoconf changes:
+       * m4/Makefile.in: Rebuilt.
+       * m4/Makefile.am (m4data_DATA): Updated for deleted files.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AC_PROG_INSTALL.
+       * m4/mingw.m4: Removed.
+       * m4/cygwin.m4: Removed.
+       * m4/install.m4: Removed.
+       * m4/exeext.m4: Removed.
+       * automake.in (scan_one_configure_file): Don't look for
+       AM_EXEEXT.
+       (check_cygnus): Only mention AC_EXEEXT.
+       (obsolete_macros): Mention AM_PROG_INSTALL, AM_EXEEXT,
+       AM_CYGWIN32, AM_MINGW32.
+       ($seen_prog_install): Changed interpretation; changed all users.
+       (scan_one_configure_file): Don't look for AM_PROG_INSTALL.
+       ($scripts_installed): Removed.
+       (handle_scripts): Use local $scripts_installed.
+       * aclocal.in (obsolete_macros): Added AM_PROG_INSTALL, AM_EXEEXT,
+       AM_CYGWIN32, AM_MINGW32.
+
+Mon Jul  6 14:52:49 1998  Ian Lance Taylor  <address@hidden>
+
+       * compile.am (mostlyclean-compile): If OBJEXT, remove *.$(OBJEXT)
+       along with *.o.
+
+Thu May 28 18:49:47 1998  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (seen_objext): New variable.
+       (get_object_extension): If seen_objext, use .$(OBJEXT) rather than
+       .o.  When including compile.am, keep or discard OBJEXT lines
+       according to whether seen_objext is set.  If seen_objext, add .obj
+       to @suffixes.  If seen_objext, use .$(OBJEXT) rather than .o when
+       building ansi2knr.
+       (handle_yacc_lex_cxx): If seen_objext, add a rule to create .obj
+       files.  If seen_objext, use .$(OBJEXT) rather than .o when
+       building ansi2knr.
+       (scan_one_configure_file): Check for .obj as well as .o in
+       LIBOBJS.  Set seen_exeext if we see AC_EXEEXT.  Look for
+       AC_OBJEXT, and if found set seen_objext and set OBJEXT in
+       configure_vars.
+       (check_cygnus): Change error message to permit AC_EXEEXT.
+       * compile.am: Add OBJEXT lines for .c.obj compilation.
+       * Makefile.in: Rebuild.
+       * m4/Makefile.in: Rebuild.
+       * tests/Makefile.in: Rebuild.
+
+Mon Sep 11 16:07:55 1997  Chris Provenzano <address@hidden>
+
+       * header-vars.am: address@hidden@
+       Ran aclocal, autoconf, and automake.
+
+Sat Sep 26 16:31:29 1998  Tom Tromey  <address@hidden>
+
+       * ltlib.am: Use $(INSTALL) and not $(INSTALL_DATA).
+
+Mon Sep 14 08:27:38 1998  Per Cederqvist  <address@hidden>
+
+       * automake.in (handle_texinfo): The logic for when to provide
+       texinfo.tex was broken.  Attempt to fix.
+
+Mon Sep 14 00:55:12 1998  Per Cederqvist  <address@hidden>
+
+       Fix for Dynix 3.1.1.
+       * automake.in (handle_yacc_lex_cxx): Transform "# " to "#line";
+       some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the
+       output from the preprocessor.
+
+Tue Aug 25 18:40:51 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): Don't create site.exp target if it
+       is already in Makefile.am.
+
+Sun Aug 16 23:26:26 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Use @inputs, not
+       @rewritten_inputs, when constructing CONFIG_FILES.  Use different
+       list to test for file existence.  Test colon6.test.
+       (rewrite_inputs_into_dependencies): Added add_srcdir argument.
+       Updated all callers.
+
+Wed Aug 12 14:16:57 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.3b.
+
+Tue Aug 11 12:18:59 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_clean): Added missing close-paren.  Quote
+       `$' so it doesn't expand when replacing.  From Markus
+       F.X.J. Oberhumer.
+
+       * aclocal.in (usage): Changed bug address.
+       * automake.in (usage): Changed bug address.
+
+       * clean.am (distclean-generic): Don't mention
+       DISTCONFIGCLEANFILES.  From Markus F.X.J. Oberhumer.
+
+Mon Aug 10 20:57:35 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Redirect ansi2knr output to
+       correct file.  From Kave Ghazi.
+
+Sun Aug  2 16:05:16 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.3a.
+
+       * config.sub, config.guess, texinfo.tex: New versions from FSF.
+
+Sun Jul 19 00:04:25 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (variable_conditions): Initialize %vars_scanned.
+       (variable_conditions_sub): Check it.  Test cond5.test.
+
+Sat Jul 18 00:24:14 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (variable_value_as_list_worker): Renamed from
+       variable_value_as_list.  Set entry in vars_scanned, and give error
+       if variable recursively defined.  Test recurs.test.
+       (value_to_list): Call it instead.
+       (variable_value_as_list): New function.
+
+       * automake.in (variable_conditions_sub): If var is not
+       conditional, but does have conditional subvariables, then return
+       value should be all permutations of subvariable conditions.  Test
+       cond4.test.
+       (handle_source_transform): Define _OBJECTS variable with each
+       condition; no need to define multiple new variables.
+
+Fri Jul 17 12:56:14 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Use DESTDIR, not DATADIR.  From
+       Motoyuki Kasahara.
+
+       * automake.in (scan_dependency_file): Recognize DOS-style paths as
+       absolute.
+       * ylwrap: Recognize DOS-style paths as absolute.  From Ian Lance
+       Taylor.
+
+Fri Jul 17 07:37:20 1998  H.J. Lu  (address@hidden)
+
+       * ylwrap: Don't use absolute path if the input is in the
+       current directory.
+
+Fri Jul 17 11:58:27 1998  Ian Lance Taylor  <address@hidden>
+
+       * automake.in: Use $(AM_MAKEFLAGS) in every invocation of $(MAKE).
+       * subdirs.am: Likewise.
+
+Thu Jul 16 18:09:03 1998  Ian Lance Taylor  <address@hidden>
+
+       * remake.am (config.status): Depend upon
+       $(CONFIG_STATUS_DEPENDENCIES).
+       * automake.in (handle_configure): Examine
+       CONFIG_STATUS_DEPENDENCIES.
+
+Tue Jul 14 13:37:48 1998  Tom Tromey  <address@hidden>
+
+       * Makefile.am: Always look in srcdir for automake.in.
+
+Tue Jun 23 14:00:27 1998  Ian Lance Taylor  <address@hidden>
+
+       * progs.am: Don't let $(EXEEXT) interfere with $(transform).
+       Report from Mike Stump <address@hidden>.
+
+Tue Jun  2 13:27:34 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Make CONFIGURE file
+       handle local.  From Kevin Street.
+
+       * automake.in (read_am_file): Error if blank line or comment
+       follows trailing backslash.  Test syntax.test.
+       (file_contents_with_transform): Likewise.
+
+Thu May 28 18:49:47 1998  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (handle_configure): Always use $(SHELL) when running
+       config.status.
+
+Mon Jun  1 14:23:29 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Use AM_CPPFLAGS, AM_CXXFLAGS,
+       AM_CFLAGS.
+       (output_yacc_build_rule): Use AM_YFLAGS, AM_LFLAGS.
+       (handle_dependencies): Don't define CXXMKDEP.
+
+       * clean.am (mostlyclean-generic): Prefix rule with MOSTLYCLEAN.
+       (clean-generic): Prefix rule with CLEAN.
+       (distclean-generic): Prefix rule with DISTCLEAN.
+       (maintainer-clean-generic): Prefix rule with MAINTAINERCLEAN.
+       BUILT_SOURCES now handled in automake itself.
+       * automake.in (initialize_per_input): Initialize
+       maintainer_clean_files.
+       (handle_yacc_lex_cxx): Put lex and yacc output files onto
+       @maintainer_clean_files.
+       (handle_clean): Handle @maintainer_clean_files.  Transform
+       clean.am when installing; try to remove unnecessary tests in
+       generated code.
+
+       * automake.in (do_check_merge_target): Only generate $(MAKE)
+       command if there are check targets to make.  Report from Karl
+       Heuer.
+
+Sun May 17 23:05:55 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.in (write_aclocal): Fixed generated copyright message.
+       From Eleftherios Gkioulekas.
+
+       * automake.in (parse_arguments): Typo fix from Paul D. Smith.
+
+Fri May  8 12:14:03 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Put lex and yacc output files
+       onto @clean.
+
+Wed May  6 01:18:05 1998  Tom Tromey  <address@hidden>
+
+       * header-vars.am (DESTDIR): Changed from DISTDIR.
+
+Fri Apr 24 10:16:20 1998  Tom Tromey  <address@hidden>
+
+       * libs.am: Don't display loop while it runs.
+
+Sun Apr  5 13:58:24 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.3.
+
+       * automake.in (handle_options): Correctly handle trailing alpha
+       version letter or lack thereof.  Test version3.test.
+
+       * automake.in (am_conf_line_warning): Perl 4 fixlet; typo fix.
+
+       * automake.in (handle_ltlibraries): Examine _DEPENDENCIES
+       variable.  Report from Chris Provenzano.  Test library.test.
+       (handle_libraries): Likewise.
+
+       * m4/lex.m4: Allow AM_PROG_LEX to be called with no arguments.
+
+Sun Apr  5 13:54:25 1998  Alexandre Oliva <address@hidden>
+
+       * automake.in (scan_one_configure_file): Only warn about
+       AC_DECL_YYTEXT and AC_PROG_LEXX.
+       (am_conf_line_warning): New function.
+
+Fri Apr  3 15:43:46 1998  Doug Evans  <address@hidden>
+
+       * automake.in (handle_configure): Fix setting of colon_infile
+       in case where multiple files are used to build Makefile.
+       [ Test colon5.test ]
+
+Fri Apr  3 13:07:58 1998  Tom Tromey  <address@hidden>
+
+       * ansi2knr.c, texinfo.tex: New versions from respective
+       maintainers.
+
+       * automake.in (scan_one_configure_file): Exclude INSTALL_DATA from
+       configure_vars.  Test instdata.test.
+
+Tue Mar 31 21:07:42 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_yacc_lex_cxx): Changed to use new version of
+       ansi2knr.
+       * ansi2knr.c: New version from L. Peter Deutsch.
+
+Thu Mar 26 11:00:04 1998  Tom Tromey  <address@hidden>
+
+       * m4/exeext.m4: Correctly eliminate bad cases when computing
+       am_cv_exeext.  Report from Markus F.X.J. Oberhumer.
+
+Wed Mar 25 15:09:56 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_options): Support alpha version numbers.
+
+       * lisp.am (address@hidden@LISP): Allow .el files to appear in build
+       directory.  From Gary V Vaughan.
+
+Mon Mar 23 07:55:04 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.2h.
+
+       * header.am (address@hidden@HEADERS): A header can appear in the
+       build directory as well as the source directory.  From Gary V
+       Vaughan.
+
+       * automake.in (handle_yacc_lex_cxx): Push lib sources onto
+       de_ansi_files before generating ._c dependencies.  Test
+       libobj8.test.
+
+       * m4/mktime.m4: New version from Jim Meyering.
+
+       * aclocal.in (usage): Document --print-ac-dir.
+       (parse_arguments): Added --print-ac-dir.
+
+       * ansi2knr.c, ansi2knr.1: New versions from ghostscript.
+       (main): Reapplied "-" change from Harlan Stenn.
+
+Fri Mar 20 22:42:30 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Use &am_conf_line_error,
+       not warn.  Check to make sure warnings happen only for
+       configure.in, not for "not aclocal.m4".
+
+Fri Mar 20 22:35:31 1998  Alexandre Oliva <address@hidden>
+
+       * automake.in: understand AM_PROG_LEX as a replacement for
+       AC_PROG_LEX and AC_DECL_YYTEXT
+       warn if the replaced macros are used.
+       * m4/Makefile.am: add lex.m4
+       * m4/lex.m4 (AM_PROG_LEX): new file and macro
+       * missing: added lex/flex support
+       instead of touching flex and bison output files, try to copy
+       them from a filename based on the last given argument
+
+Fri Mar 20 00:26:10 1998  Tom Tromey  <address@hidden>
+
+       * m4/protos.m4: Require AC_PROG_CPP.
+
+       * aclocal.in (add_file): If &search fails, and macro matches AM_,
+       then print error.  Test aclocalii.test.
+
+       De-ansi-fication fixes from Harlan Stenn:
+       * ansi2knr.c (main): Accept "-" argument to mean stdin.
+       * automake.in (handle_yacc_lex_cxx): Preprocess C source before
+       running through ANSI2KNR.
+       (get_object_extension): Generate rule for <dir>/ansi2knr.o.
+
+       * texinfos.am: Include $(DESTDIR).
+       * lisp.am: Include $(DESTDIR).
+       * java.am: Include $(DESTDIR).
+       * mans.am (address@hidden@): Include $(DESTDIR).
+       * automake.in (handle_man_pages): Include $(DESTDIR) in
+       installdirs variable.
+       (handle_texinfo): Likewise.
+       (am_install_var): Likewise.
+       * header-vars.am (DISTDIR): Define.
+       * data.am, header.am, libs.am, ltlib.am, progs.am, scripts.am:
+       Support $(DESTDIR) at install time.  From Assar Westerlund.
+
+       * automake.in (handle_java): Put Java sources in distribution.
+
+Thu Mar 19 01:33:35 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_java): Put JAVACFLAGS after -d option.  From
+       Per Bothner.
+
+       * automake.in (handle_java): Use $(JAVAROOT) in place of `../..'
+       in default CLASSPATH.
+       (am_install_var): Allow `JAVA' variable to be defined.  Don't
+       define `JAVA' primary.
+
+       * automake.in (scan_one_configure_file): Check for `sinclude' and
+       turn into recursive call.
+
+       * automake.in (initialize_per_input): Set $output_all.
+       (generate_makefile): Don't set $output_header or generate
+       `default' target.  Print $output_all before $output_header.
+       (handle_merge_targets): Put `all' target into $output_all.
+
+Wed Mar 18 14:48:44 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Put secondary dependencies from
+       multi-":" AC_OUTPUT entry into dependency list for file created by
+       config.status, not file created by automake.  Test colon3.test.
+       (generate_makefile): Pass $output, not $makefile, to
+       handle_merge_targets.
+
+       * Makefile.am (pkgdata_DATA): Added java.am, java-clean.am.
+       * java-clean.am: New file.
+       * java.am: New file.
+       * automake.in (generate_makefile): Call handle_java.
+       (handle_java): New sub.
+       (am_install_var): Only push primary variable on @all if not doing
+       Java.
+
+Sun Mar  8 15:43:09 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): When recognizing AC_OUTPUT ":"
+       syntax, make regexp less greedy.  From Maciej W. Rozycki.  Test
+       colon4.test.
+
+Fri Mar  6 21:20:53 1998  Tom Tromey  <address@hidden>
+
+       * m4/exeext.m4 (AM_EXEEXT): Ignore am_c_test.o.  From Bruno
+       Haible.
+
+Tue Feb 24 12:10:44 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.2f.
+
+       * mans.am (address@hidden@, address@hidden@): Quote
+       `$' in sed expression.
+
+       * config.guess, config.sub, texinfo.tex: New versions from FSF.
+
+       * Makefile.am (pkgdata_DATA): Added mans.am.
+       * automake.in (handle_man_pages): Rewrote for new man page
+       handling.
+       (initialize_global_constants): Removed install_man_format,
+       uninstall_man_format.
+       * mans.am: New file.
+
+       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs.am,
+       scripts.am, texinfos.am: Put `@' before NORMAL_UNINSTALL
+       invocation.
+
+Mon Feb 23 13:38:56 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (get_object_extension): Remove .c.lo rule from
+       libtool when dependencies turned on.
+       * libtool.am (.c.lo): Disable when dependency checking turned on.
+
+       Dependency fixes from Alexandre Oliva:
+       * automake.in (handle_dependencies): Fixed quoting when
+       substituting @PFX@ and @address@hidden  Don't look for the `.P' file.
+       * depend2.am (%.o): Use @PFX@ and @address@hidden
+       (%.lo): New rule.
+
+       * texinfos.am (.txi.info, .txi.dvi, .txi): New rules.
+       * automake.in (handle_texinfo): Recognize .txi files.  From Karl
+       Berry.
+
+       * automake.in (handle_single_transform_list): $objpat now a
+       parameter.  Set $objpat when suffix rule found.
+
+       * aclocal.in (parse_arguments): Only put current year in --version
+       output.
+       * automake.in (parse_arguments): Only put current year in
+       --version output.
+
+Mon Feb 16 00:12:03 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_aclocal_m4): When processing -I options,
+       directory is separate argument.  Test aclocali.test.
+
+Fri Feb 13 14:35:39 1998  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (handle_texinfo): Correct condition for whether
+       texinfo.tex is required.  [Test texinfo5.test]
+
+Fri Feb 13 00:28:53 1998  Tom Tromey  <address@hidden>
+
+       * Released 1.2e.
+
+       * Makefile.am: Removed bogus line.
+
+Thu Feb 12 22:27:05 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (get_object_extension): Conditionally include .c.o
+       rule from compile.am.
+       (handle_dependencies): Generate correct code when including new
+       depend2.am.
+       (file_contents_with_transform): Better error reporting.
+       * depend.am (MKDEP): Removed.
+       (.deps/.P): Removed.  Don't include .deps/.P.
+       * compile.am (.c.o): Now conditional on dependencies not being
+       generated by compiles.
+       * depend2.am (%.o): New rule.
+       (.deps/%.P): Removed.
+
+       * tags.am (TAGS): Uniquify list of files.  From Harlan Stenn.
+
+       * aclocal.in (scan_m4_files): Reverse-sort keys when constructing
+       `search' function.  From Johan Danielsson.
+
+Tue Sep 16 14:13:15 1997  Paul D. Smith  <address@hidden>
+
+       * automake.in: Create new option --generate-deps.  This option has
+       automake generate a .dep_segment file containing just the
+       dependencies created from the .P list.  This is needed to maintain
+       other makefiles that automake doesn't deal with (Makefile.DOS,
+       SMakefile, etc.)
+       * automake.texi (Invoking Automake): Document it.
+
+Thu Feb 12 19:45:16 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.in (scan_configure): Tightened regexp a bit.  Test
+       whoami.test.  From Johan Danielsson.
+
+       Report from H.J. Lu.
+       * automake.in (output_yacc_build_rule): Don't write rule to create
+       `.h' file.
+       (handle_yacc_lex_cxx): Generate rule to build each .h file.
+
+       * automake.in (handle_options): Set readme-alpha and check-news
+       for Gnits after main processing.  Test alpha.test.  From Jim
+       Meyering.
+
+       * aclocal.in (usage): Updated bug-reporting address.
+       * automake.in (usage): Updated bug-reporting address.
+
+       * compile.am: Remove *.core for 4.4BSD systems.  From Assar
+       Westerlund.
+
+       * automake.in (handle_single_transform_list): Don't set
+       seen_any_source if all sources are C++.
+
+Wed Feb 11 17:30:01 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.in (write_aclocal): Write to $output_file, not
+       aclocal.m4.  From Alexandre Oliva.
+
+Thu Feb  5 13:38:55 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Put CXCPP before CXX in
+       regexp.  From Garth Corral.  Test cxxxcpp.test.
+
+Sun Jan 25 11:16:53 1998  Tom Tromey  <address@hidden>
+
+       * automake.in (generate_makefile): Run handle_minor_options before
+       handle_dist, to make sure README-alpha ends up in distribution.
+       From Jim Meyering.
+
+Tue Jan 13 09:19:33 1998  Tom Tromey  <address@hidden>
+
+       * aclocal.in (add_file): Hack for Perl 4.  From Seth Alves.
+
+Thu Dec 11 12:29:46 1997  Ian Lance Taylor  <address@hidden>
+
+       * scripts.am: Don't add @EXEEXT@ to installed scripts.  Scripts
+       are not executables.
+
+Tue Dec  2 20:07:18 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Bug fix in
+       uninstall_man_format.  Report from Eric Backus.
+
+Mon Dec  1 13:52:39 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Correctly generate
+       _OBJECTS when _SOURCES is defined conditionally.  Reported by Rob
+       Savoye.  Test cond3.test.
+
+       Fixes for test objc.test:
+       * automake.in (initialize_per_input): New global seen_any_source.
+       (handle_yacc_lex_cxx): Use seen_any_source to decide when to
+       define LINK, et al.
+       (handle_single_transform_list): Set seen_any_source.
+       (handle_lib_objects_cond): Likewise.
+
+Wed Nov 26 13:41:57 1997  Tom Tromey  <address@hidden>
+
+       * Released 1.2d.
+
+       * m4/ccstdc.m4: Don't force AM_PROG_CC_STDC before AC_PROG_CPP.
+       Temporary hack.
+
+       * m4/mktime.m4 (AM_FUNC_MTIME): New version from Paul Eggert.
+
+       * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL,
+       NORMAL_UNINSTALL, PRE_UNINSTALL, POST_UNINSTALL): Define as `:',
+       not `true'.
+
+       * automake.in (output_yacc_build_rule): Don't overwrite .h file in
+       non-ylwrap case.
+
+       * tags.am (ID): Scan lisp files.
+       (TAGS): Make tags for lisp files.
+
+Tue Nov 25 14:20:42 1997  Tom Tromey  <address@hidden>
+
+       * ltlib.am: Use INSTALL_DATA, not INSTALL_PROGRAM.  From Gord
+       Matzigkeit.
+
+Fri Nov 21 15:15:50 1997  Tom Tromey  <address@hidden>
+
+       * m4/mingw.m4, m4/cygwin.m4: Argument to AC_TRY_COMPILE is
+       function body, not entire function.  From Ian Taylor.
+
+Sat Oct 25 12:39:19 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Skip empty string for
+       Perl 4.  From Assar Westerlund.
+
+       * config.guess, config.sub, texinfo.tex: New versions from FSF.
+
+Fri Oct 24 23:15:09 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (output_yacc_build_rule): Use YFLAGS again.
+       (handle_yacc_lex_cxx): Error if YACCFLAGS used.
+
+Wed Aug 27 19:26:45 1997  Rob Savoye  <address@hidden>
+
+       * compile.am: Add suffix rules for ".s.o" and ".S.o" so assembler
+       files can be used.
+       * libtool.am: Add suffix rules for ".s.lo" and ".S.lo" so assembler
+       files can be used.
+       * automake.in: Add .S and .s to the standard list of suffixes so
+       assembler files can be used.
+
+Fri Oct 24 13:39:01 1997  Tom Tromey  <address@hidden>
+
+       * m4/exeext.m4: Require AM_MINGW32.  Check MINGW32 setting.
+
+Thu Oct 23 21:16:28 1997  Tom Tromey  <address@hidden>
+
+       * m4/init.m4 (missing_dir): AC_REQUIRE AM_SANITY_CHECK,
+       AC_ARG_PROGRAM, and AC_PROG_MAKE_SET.
+
+Tue Oct 21 16:49:36 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_options): Recognize `cygnus'.
+
+Tue Sep  9 17:09:47 1997  Rob Savoye  <address@hidden>
+
+       * m4/mingw.m4: New file for mingw32 support.
+       * m4/exeext.m4: Also check for the mingw32 environment.
+
+Tue Oct 21 00:39:44 1997  Tom Tromey  <address@hidden>
+
+       * m4/Makefile.am (m4data_DATA): Added mingw.m4.
+
+       * automake.in (handle_lib_objects_cond): Don't require @address@hidden
+       (handle_programs): Likewise.
+
+       * subdirs.am (check-recursive installcheck-recursive
+       info-recursive dvi-recursive): Handle case when SUBDIRS is empty.
+       (maintainer-clean-recursive): Likewise.  From Assar Westerlund.
+
+       * aclocal.in (scan_m4_files): If macro recognized, &search will
+       return 1.
+       (scan_configure): If AM_ macro not found, give error.
+
+       * m4/sanity.m4: If `ls' completely fails, die.  From Jim
+       Meyering.
+
+Mon Oct 20 16:13:48 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_single_transform_list): Fixlet for Fortran.
+       From Bernard Urban.
+
+       * libtool.am: Remove _libs, for libtool 1.0d.  From Gord
+       Matzigkeit.
+
+Sun Oct 19 22:59:35 1997  Tom Tromey  <address@hidden>
+
+       * texinfos.am: Bug fix.  From John W. Coomes.
+
+Mon Sep 29 12:57:00 1997  Tom Tromey  <address@hidden>
+
+       * Released 1.2c.
+
+       * automake.in (handle_dist_worker): In topmost directory of
+       project, use `distdir', not `top_distdir', as argument to
+       --output-dir; likewise when building in subdirs.
+
+Sun Sep 28 15:55:46 1997  Tom Tromey  <address@hidden>
+
+       * m4/sanity.m4: Test $*, not address@hidden  From Akim Demaille.
+
+       * automake.in (handle_minor_options): New sub.
+       (check_gnits_standards): Don't handle README-alpha here.
+       (handle_dist_worker): Check NEWS file if `check-news' option
+       requested.
+       (generate_makefile): Run handle_minor_options.
+       (handle_options): Handle readme-alpha and check-news.  Set them if
+       --gnits.
+
+       * depend.am (MKDEP): Use $(CC), not gcc.
+
+Wed Sep 24 23:48:26 1997  Tom Tromey  <address@hidden>
+
+       * Release 1.2b.
+
+       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Make sure this is run before
+       AC_PROG_CPP.  From Markus Oberhumer.
+
+Fri Sep 12 00:04:19 1997  Paul Eggert  <address@hidden>
+
+       * m4/ccstdc.m4 (AM_PROG_CC_STDC): Don't look at __STDC__;
+       look only at whether function prototypes are supported.
+
+Wed Sep 24 16:10:37 1997  Tom Tromey  <address@hidden>
+
+       * Various: Put "-" before each `rm' line.  This avoids a bug in
+       some losing makes (Ultrix, 4.3 BSD).
+
+       * automake.in (handle_dist_worker): Correctly handle subdirs that
+       have their own configure.in.  From Peter Mattis.
+
+       * automake.in (handle_yacc_lex_cxx): Handle de-ansi-fied sources
+       in srcdir as well as build dir.
+
+       * automake.in (scan_one_configure_file): Detect AC_OUTPUT().
+       (handle_single_transform_list): Don't apply length() to a list.
+
+       * automake.in (handle_programs): Define _DEPENDENCIES variable if
+       not defined by user.
+
+Thu Sep 18 19:43:38 1997  Tom Tromey  <address@hidden>
+
+       * m4/sanity.m4: Quote "$@" for m4.  From Gord Matzigkeit.
+
+Mon Sep  1 23:50:38 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Set need_texi_file only when
+       TEXINFO_TEX not defined.
+
+Thu Aug 28 09:37:29 1997  Tom Tromey  <address@hidden>
+
+       From Juergen Erhard:
+       * automake.in (SUFFIX_RULE_PATTERN): New global.
+       (handle_single_transform_list): If suffix matches a source suffix,
+       rewrite.
+       (read_am_file): Add suffix rules to %suffix_rules.
+       (initialize_per_input): Initialize %suffix_rules.
+
+Wed Aug 27 12:56:50 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Also remove .kys and .ps files.
+
+       * automake.in (handle_yacc_lex_cxx): Quoting fixlet.  From Kaveh
+       Ghazi.
+
+       * aclocal.in (write_aclocal): Print copyright and copying
+       permissions.  From RMS.
+       * automake.in (initialize_global_constants): More copyright stuff
+       from RMS.
+
+       * automake.in (handle_texinfo): Only require texinfo.tex in
+       appropriate situations.  Report from Paul D. Smith.
+
+Mon Aug 25 15:45:52 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_dependency_file): Fix so that
+       OMIT_DEPENDENCIES will work.  From Alexander Lukyanov.
+
+       * automake.in (handle_texinfo): texi2dvi can generate `.cn'
+       files.  From Akim Demaille.
+
+Wed Aug  6 10:51:37 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): Reversed sense of test.
+
+Tue Aug  5 17:49:54 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Always mark OMIT_DEPENDENCIES
+       as seen.
+
+       * automake.in (handle_yacc_lex_cxx): Make each _.c file depend on
+       ansi2knr.
+
+       * automake.in (handle_yacc_lex_cxx): Fix for makes which don't
+       allow $< in non-suffix rules.  From Akim Demaille.
+
+       * automake.in (value_to_list): If variable name contains configure
+       substitution, then just ignore it.
+
+       * automake.in (variable_defined): Mark variable is seen, even if
+       only conditionally seen.
+
+       * Makefile.am: Check for bad splits.
+       * automake.in (various): Use split(' ',...), not split(/ /,...).
+
+Tue Aug  5 14:08:51 1997  Ian Lance Taylor  <address@hidden>
+
+       * ylwrap: If the program is a relative path, force it to be
+       absolute.
+
+Tue Aug  5 16:59:41 1997  Tom Tromey  <address@hidden>
+
+       * missing: Examine A[CM]_CONFIG_HEADER for name of files to
+       touch.  From Markus F.X.J. Oberhumer.
+
+       * automake.in (require_file_internal): Better error message when
+       installing.
+
+       * automake.in (handle_texinfo): Smarter test when deleting output
+       of makeinfo.
+
+Sat Aug  2 13:32:45 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (do_check_merge_target): In --cygnus mode, check
+       doesn't depend on all.
+
+       * automake.in (output_yacc_build_rule): Use YACCFLAGS, not
+       YFLAGS.  Per GNU Standards.
+
+       * dejagnu.am (RUNTESTDEFAULTFLAGS): New macro.
+       (check-DEJAGNU): Use it.
+
+       * subdirs.am (maintainer-clean-recursive): Actually reverse subdir
+       list.  From Alexander Lukyanov.
+
+       * automake.in (initialize_global_constants): Changed generated
+       copyright.  From RMS.
+
+       * automake.in (handle_configure): Pass correct value for
+       CONFIG_FILES.  From Ian Taylor.
+
+Thu Jul 31 17:36:10 1997  Ian Lance Taylor  <address@hidden>
+
+       * ylwrap (pairlist): Shift out trailing "--"; don't pass it to
+       $prog.
+
+Thu Jul 24 00:52:02 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Changed index names
+       in dist hash so that alternate dist targets will be generated.
+       Report from Glenn Amerine.
+
+       Suggestion from Karl Berry:
+       * automake.in (usage): Added short info line.
+
+       * aclocal.in (usage): Updated bug-reporting address.  Added short
+       info line.
+
+       * automake.in (handle_emacs_lisp): Put contents of lisp-clean.am
+       into output.  Report from Karl Berry.
+
+Mon Aug 25 16:14:32 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Only generate ":" syntax for
+       CONFIG_FILES when really needed.
+
+Wed Aug  6 14:47:12 1997  Ian Lance Taylor  <address@hidden>
+
+       * remake-hdr.am (@CONFIG_HEADER@): Use a dummy command to force
+       GNU make to recheck the file modification time.
+
+Tue Aug  5 14:44:10 1997  Ian Lance Taylor  <address@hidden>
+
+       * ylwrap: If the program is a relative path, force it to be
+       absolute.
+
+Mon Aug  4 14:52:08 1997  Ian Lance Taylor  <address@hidden>
+
+       * automake.in ($RULE_PATTERN): Accept $ in body of rule name.
+       (handle_programs): Don't append $(EXEEXT) if the
+       program name contains '.'.
+       (am_install_var): When rewriting _PROGRAMS, don't append $(EXEEXT)
+       if the program names contains '.'.  Also, handle conditionals.
+
+Sat Aug  2 14:43:41 1997  Tom Tromey  <address@hidden>
+
+       * m4/exeext.m4: Fixed quoting.
+
+       * m4/exeext.m4 (am_cv_exeext): Use echo, not ls.
+
+       * automake.in (handle_programs): Transform @EXEEXT@ when including
+       program.am.
+
+Fri Aug  1 17:09:09 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_programs): Don't transform CYGWIN or
+       NOTCYGWIN.
+       (am_install_var): Likewise.
+
+       * progs-clean.am (address@hidden@PROGRAMS): Never include EXEEXT.
+
+       * progs.am: Removed @EXEEXT@; it is now implicit.
+       * program.am: Add @EXEEXT@ in appropriate places; removed
+       cygwin-dependent code.
+       * automake.in (seen_exeext): Renamed from seen_cygwin32.
+       (handle_programs): Use seen_exeext.
+       (scan_one_configure_file): Look for AM_EXEEXT, not AM_CYGWIN32.
+       (check_cygnus): Use seen_exeext.
+       (am_install_var): Likewise.
+       (am_install_var): When handling PROGRAMS primary, append EXELIST
+       to program names as necessary.
+       * m4/exeext.m4: Require AM_CYGWIN32.
+
+Thu Jul 31 17:36:10 1997  Ian Lance Taylor  <address@hidden>
+
+       * ylwrap (pairlist): Shift out trailing "--"; don't pass it to
+       $prog.
+
+       * texinfos.am: Add -I $(srcdir) when invoking $(MAKEINFO) for
+       CYGNUS .texinfo.info case and .texinfo case.
+
+       * automake.in (handle_configure): Correct handling of inputs for
+       for AC_OUTPUT files when invoking config.status.
+
+Mon Jul 28 15:29:25 1997  Rob Savoye  <address@hidden>
+
+       * m4/cygwin.m4: Set a variable CYGWIN32, rather than EXEEXT.
+       * m4/exeext.m4: New autoconf test for an executable suffix.
+       * m4/Makefile.in: Install the new exeext.m4 test.
+
+Sun Jun 22 14:01:59 1997  Tom Tromey  <address@hidden>
+
+       * Released version 1.2.
+
+       * automake.in (handle_texinfo): Look for texinfo.tex in aux dir.
+
+       * automake.in (require_file_internal): Only print "installing"
+       when actually installing.  From Gord Matzigkeit.
+
+       * automake.in (handle_tests): Exit status `77' means `ignore
+       test'.  From François Pinard.
+       (handle_tests) Also, make banner same size as text.
+
+       * automake.in (handle_configure): Don't handle PRE_BUILT_SOURCES.
+       (handle_built_sources): Likewise; don't have `all' depend on
+       BUILT_SOURCES.
+
+       * depend.am (DEPS_MAGIC): New variable.
+       (.deps/.P): Depend on BUILT_SOURCES again.
+
+       * texinfos.am: Use ||, not ;.
+
+Tue Jun 10 11:04:16 1997  Tom Tromey  <address@hidden>
+
+       * m4/cygwin.m4: Examine output of compiler to see if .exe needed.
+
+Sun Jun  1 13:16:05 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_built_sources): Handle PRE_BUILT_SOURCES.
+       (handle_configure): Likewise.
+
+       * depend2.am (.deps/%.P): Don't generate file if MKDEP fails.
+       From Alexandre Oliva.
+
+       * depend.am (.deps/.P): Depend on PRE_BUILT_SOURCES, not
+       BUILT_SOURCES.
+
+       * automake.in (initialize_global_constants): Added 1997 to
+       copyright info.
+
+       * automake.in (output_yacc_build_rule): Never move y.tab.c over
+       the .h file.  From Jim Meyering.
+
+Thu May 29 23:16:02 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): Avoid defining ACLOCAL,
+       AUTOCONF, AUTOMAKE, AUTOHEADER.  From David Zaroski.
+
+Sat Feb 22 16:05:24 1997  Gordon Matzigkeit  <address@hidden>
+
+       * Makefile.am (pkgdata_DATA): Under this new scheme, we no longer
+       need compile-kr.am.  Delete it.
+
+       * automake.in (handle_yacc_lex_cxx, get_object_extension): Use
+       _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification.
+
+       * ansi2knr.c (main): Parse our arguments a little differently so
+       that we don't create null output files when we can't read the
+       input file.
+
+Wed May 28 23:40:33 1997  Tom Tromey  <address@hidden>
+
+       * depend.am (.deps/.P): Depend on $(BUILT_SOURCES) again.  From
+       Gord Matzigkeit.
+
+Mon May 26 22:50:49 1997  Tom Tromey  <address@hidden>
+
+       * remake-hdr.am ($(srcdir)/@address@hidden): Make echo silent.  Report
+       from Alexandre Oliva.
+
+       * automake.in (generate_makefile): If --no-force, check
+       Makefile.in against configure.in and aclocal.m4.  Report from
+       Alexandre Oliva.
+
+       * automake.in (handle_dist_worker): Put --include-deps on command
+       line if specified originally.
+       (handle_configure): Likewise.
+
+       * configure.in: Error if Perl 5.001 is used.
+
+       * ylwrap: Don't quote $prog when executing it.  From Jim
+       Meyering.
+
+Thu May 15 12:05:20 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_merge_targets): Set INSTALL_SCRIPT in
+       install-strip target.
+
+Tue May 13 08:20:02 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dependencies): Don't generate dependencies
+       if DEP_FILES would be empty.
+
+Sun May 11 13:59:14 1997  Tom Tromey  <address@hidden>
+
+       * config.guess: New version from FSF.
+
+       * automake.in (get_object_extension): If ansi2knr in another
+       directory, always define ANSI2KNR to full path.  From Akim
+       Demaille.
+
+       * kr-extra.am (clean-krextra): Remove ansi2knr here, not in
+       distclean-krextra.
+
+       * missing: Regularized grammar.  From François Pinard.
+
+Sat May 10 16:48:47 1997  Tom Tromey  <address@hidden>
+
+       * Released 1.1p.
+
+       * m4/init.m4: Error if source directory already configured.
+
+       * automake.in (scan_dependency_file): Always use srcdir name as
+       passed in on command line.
+
+Thu May  1 12:53:46 1997  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (value_to_list): Don't fail when a variable
+       substitution is not a complete word.
+
+Tue May  6 15:22:41 1997  Ian Lance Taylor  <address@hidden>
+
+       * subdirs.am: Fix check for make -k to use $(MAKEFLAGS) and to not
+       get fooled by command line arguments.
+
+Sat May 10 15:48:46 1997  Tom Tromey  <address@hidden>
+
+       * m4/ccstdc.m4: Print "none needed" if compiler accepts ANSI C by
+       default.
+
+Mon May  5 23:24:09 1997  Tom Tromey  <address@hidden>
+
+       * mkinstalldirs, config.guess, config.sub, COPYING, texinfo.tex:
+       New versions from FSF.
+
+Sun May  4 15:21:22 1997  Tom Tromey  <address@hidden>
+
+       * texinfos.am (install-info): Avoid the Debian install-info.
+       (uninstall-info): Likewise.
+
+       * automake.in (handle_single_transform_list): Strip any directory
+       name before processing name.
+
+Thu May  1 19:24:08 1997  Tom Tromey  <address@hidden>
+
+       * depend2.am (.deps/%.P): Don't put $(srcdir)/ into dependency.
+
+Wed Apr 30 19:15:47 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Change how top_distdir is
+       computed.  Based on patch from Ian Taylor.
+       (handle_dist): Define top_distdir.
+
+       * automake.in (handle_yacc_lex_cxx): Include CXXFLAGS in CXXLINK.
+       (handle_yacc_lex_cxx): Include CFLAGS in LINK.
+
+Wed Apr 30 14:46:37 1997  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (handle_dist_worker): When building a distribution,
+       if SUBDIRS is defined conditionaly, recur into each possible
+       subdirectory.
+
+       * clean.am (distclean-generic): Remove stamp-h[0-9]*.
+
+Tue Apr 29 19:11:45 1997  Tom Tromey  <address@hidden>
+
+       * INSTALL, mkinstalldirs, install-sh: Update from François
+       Pinard.
+
+       * aclocal.in (add_macro): If AC_ macro was defined, then mark it
+       as seen.  Report from Janos Farkas.
+
+       * subdirs.am: Clean targets now run in reverse order.  From Kevin
+       Dalley.
+
+       * automake.in (handle_texinfo): Put `aminfo', not `info' on
+       @clean.
+
+       * mdate-sh: New version from Ulrich Drepper.
+
+Mon Apr 28 01:18:05 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Makefile only depends on
+       BUILT_SOURCES when generating dependencies.
+
+       * Released 1.1o.
+
+Sun Apr 27 23:58:20 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist): Use variable_value, not
+       variable_contents.
+
+Wed Apr 23 14:04:28 1997  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (IF_PATTERN): Define.
+       (ELSE_PATTERN, ENDIF_PATTERN): Define.
+       (AM_CONDITIONAL_PATTERN): Define.
+       (%configure_cond): New global hash table.
+       (handle_source_transform): If xx_SOURCES is defined conditionally,
+       define xx_OBJECTS using the same conditions.
+       (handle_lib_objects): If variable is defined conditionally, define
+       xx_DEPENDENCIES conditionally.  Most code moved into subroutine.
+       (handle_lib_objects_cond): New function, broken out of
+       handle_lib_objects.
+       (scan_one_configure_file): Look for $AM_CONDITIONAL_PATTERN.
+       (conditional_true_when): New function.
+       (variable_defined): Add new parameter: cond.  Change some
+       callers.
+       (variable_conditions): New function.
+       (variable_conditionally_defined): New function.
+       (variable_value): New function.  Change most uses of $contents to
+       call variable_value instead.
+       (value_to_list): New function, from variable_value_as_list.
+       (variable_value_as_list): Add new parameter: cond.  Change all
+       callers.  Move some code into subroutine value_to_list.
+       (define_pretty_variable): Add new parameter: cond.  Change call
+       callers.
+       (read_am_file): Handle conditionals.
+       (initialize_per_input): Initialize %conditional and
+       @conditional_stack.
+       * m4/cond.m4: New file.
+       * m4/Makefile.am (m4data_DATA): Add cond.m4.
+
+Sun Apr 27 11:03:36 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Run automake once per
+       directory, instead of once at the top.
+       (handle_dist_worker): Changed interface.
+       (handle_dist): Likewise.
+       (generate_makefile): Better error message if can't write the
+       file.
+       (handle_dist_worker): Pass top_distdir to subdir makes.
+
+       * automake.in (handle_dist_worker): Use mode 777 on directories in
+       distribution.  GNU Standards compliance.
+
+       * automake.in (handle_yacc_lex_cxx): Don't use interlock.
+       (output_yacc_build_rule): Don't use interlock; just use new ylwrap
+       instead.  The new ylwrap builds in a subdir; idea from Mark
+       Eichin.
+       (output_lex_build_rule): Likewise.
+       (initialize_global_constants): [common_files] Don't include
+       interlock.
+
+       * Makefile.am (pkgdata_SCRIPTS): Removed interlock.
+       * interlock: Removed.
+       * ylwrap: Changed interface.  Now runs command in subdir.
+
+       * remake.am (config.status): Look in srcdir for config header.
+       ($(srcdir)/configure): Likewise.
+       * remake-hdr.am (@STAMP@): Look in srcdir for config header.  From
+       Phil Nelson.
+       ($(srcdir)/@CONFIG_HEADER_IN@): Likewise.
+
+       * automake.in (handle_aclocal_m4): Make target $(ACLOCAL_M4), not
+       value spelled out.  From Phil Nelson
+
+       * automake.in (handle_configure): Don't skip Makefiles; instead
+       skip automake inputs.
+       (handle_merge_targets): Changed interface; put $makefile at
+       beginning of @all (rather than Makefile at end).
+
+       * automake.in (handle_yacc_lex_cxx): Correctly compute
+       de_ansi_sources.
+
+       * clean-kr.am (distclean-kr): Do nothing; ansi2knr is removed in
+       kr-extra.am.
+
+       * Makefile.am: Check to make sure there are no accidental
+       configure substitutions.
+
+       * automake.in (handle_texinfo): Don't allow configure substitution
+       on @MAKEINFO@ here.
+
+       * automake.in (handle_yacc_lex_cxx): ._c and ._o files both depend
+       on $(ANSI2KNR).
+
+       * kr-extra.am (ansi2knr): Removed.
+       (ansi2knr.o): Likewise.
+
+       * automake.in (get_object_extension): Allow ansi2knr to be built
+       from any directory.
+
+Fri Apr 25 12:33:23 1997  Tom Tromey  <address@hidden>
+
+       * missing: Changed bison text.  From Ian Taylor.
+
+       * m4/missing.m4: Redirect stdin of testee.  From Bill Fenner.
+
+       * automake.in (output_yacc_build_rule): Generate rule to create .h
+       file.
+       (handle_footer): Generate unique, sorted list of suffixes.
+
+       * automake.in (scan_one_configure_file): Recognize AC_PROG_AWK,
+       _CPP, _CXCPP, _LN_S.  From Ralph Schleicher.
+
+Mon Apr 21 12:35:57 1997  Ian Lance Taylor  <address@hidden>
+
+       * automake.in (@config_fullnames): New array.
+       (@config_names): New array, replacing $config_name.
+       (@config_headers): New array, replacing $config_header.
+       (get_object_extension): Handle multiple header files.
+       (handle_tags, handle_merge_targets): Likewise.
+       (scan_one_configure_file): Likewise.
+       (handle_configure): Likewise.  Don't check for the configuration
+       header file in AC_OUTPUT; it won't be there.
+       * remake-hdr.am: Handle multiple header files.
+       * clean-hdr.am: New file, broken out of remake-hdr.am.
+       * m4/header.m4: Handle multiple header files.
+       * Makefile.am (pkgdata_DATA): Add clean-hdr.am.
+
+Wed Apr 16 00:05:47 1997  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texi.info, .texi, .texinfo.info, .info): Remove
+
+       * automake.in (define_program_variable): Added `override' argument.
+       (handle_texinfo): Pass override arg when defining MAKEINFO.
+       (AC_MISSING_PROG): New constant.
+       (scan_one_configure_file): Use it.
+
+Tue Apr 15 12:12:28 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_texinfo): In --cygnus mode, reserve
+       clean-info for the user.
+
+       * automake.in (handle_subdirs): Typo fix.  From Akim Demaille.
+
+       * automake.in (handle_tags): Only use SUBDIRS if it is actually
+       defined.  Report from Ian Taylor.
+
+       * tags.am: Added prefix to SUBDIRS rules.
+
+Wed Apr  9 17:09:40 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_ltlibraries): Use correct rpath
+       substitution.  Bug from Jim Blandy.
+
+Mon Apr  7 17:40:18 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (AM_INIT_AUTOMAKE_PATTERN): Fixed for new 3rd arg.
+       Test version2.test.
+
+Thu Apr  3 19:07:59 1997  Tom Tromey  <address@hidden>
+
+       * Released 1.1n.
+
+       * tags.am (TAGS): Run "cd && etags" in subshell for proper
+       associativity.
+
+       * texinfos.am (install-info-am): If --cygnus, then info file can
+       be in build dir.  From David Zaroski.
+
+       * ltlibrary.am (@LTLIBRARY@): use @RPATH@, not explicit -rpath.
+
+       * automake.in (handle_ltlibraries): Treat EXTRA_ libraries
+       specially.
+
+Wed Apr  2 00:03:50 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_source_transform): Don't generate dependency
+       on config.h.
+       (scan_dependency_file): Strip the .P file from the target.
+
+       * automake.in (handle_tags): Use single, not double, quotes when
+       setting list variable.
+
+       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs-clean.am,
+       progs.am, scripts.am, tags.am: Use single quotes to fill list
+       variable; otherwise `$' in filename will not work.  From Per
+       Bothner.
+
+       * mdate-sh: Use "ls -d" so mdate-sh can be run on a directory.
+       From Bruno Haible.
+
+       * automake.in (handle_programs): Error if LIBADD used where LDADD
+       meant.
+       (handle_libraries): Error if LDADD used where LIBADD meant.
+       (handle_ltlibraries): Likewise.
+
+Tue Apr  1 22:46:33 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (check_canonical_spelling): New sub.
+       (handle_programs): Use it.
+       (handle_libraries): Likewise.
+       (handle_ltlibraries): Likewise.
+
+Mon Mar 31 12:13:08 1997  Tom Tromey  <address@hidden>
+
+       * depend2.am (.deps/%.P): Make .P file depend on everything the .c
+       file includes.
+
+Fri Mar 28 23:34:49 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_configure): Error if stamp-h appears in
+       AC_OUTPUT line.
+
+Thu Mar 27 17:28:47 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_dist_worker): Avoid automake rules in
+       generated Makefile when no-dependencies specified.  From Greg
+       Woods.
+
+       * m4/lispdir.m4: Don't AC_SUBST ELCFILES.  From Greg Woods.
+
+       * texi-vers.am (address@hidden@): Make commands silent.
+
+       * Makefile.am (maintainer-check): "true" is ok now.
+
+       * m4/init.m4: Added optional 3rd argument, which avoids
+       AC_DEFINE.
+
+       * automake.in (scan_one_configure_file): Explicitly avoid
+       INSTALL_SCRIPT to avoid defining it twice.
+
+       * header-vars.am: Change _INSTALL variable definitions to `true'.
+       Updated all users to put `@' before invocation.
+
+Tue Mar 25 22:09:45 1997  Tom Tromey  <address@hidden>
+
+       Update to follow GNU Standards:
+       * automake.in (handle_man_pages): Use NORMAL_UNINSTALL before
+       uninstall-man.
+       * texinfos.am (uninstall-info): Use two loops, and have
+       PRE_UNINSTALL before running install-info.
+       * data.am, header.am, libs.am, lisp.am, ltlib.am, progs.am,
+       scripts.am, texinfos.am: Use NORMAL_UNINSTALL.
+       * header-vars.am (PRE_UNINSTALL, POST_UNINSTALL,
+       NORMAL_UNINSTALL): Define.
+
+       * automake.in (scan_one_configure_file): Don't define ANSI2KNR as
+       a configure varriable.
+
+       * m4/missing.m4: Run test in a subshell.  From Gord Matzigkeit.
+
+Mon Mar 24 23:28:59 1997  Tom Tromey  <address@hidden>
+
+       * m4/sanity.m4: Sleep before creating temp file.
+
+       * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL):
+       Define.
+
+Sat Mar 22 00:06:00 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Make sure to delete
+       CYGWIN/NOTCYGWIN tokens as appropriate.
+       (handle_programs): Remove NOTCYGWIN tokens as well.
+       (file_contents_with_transform): A single newline makes an empty
+       line.
+
+       * program.am: Remove executable before linking.
+
+       * texinfos.am (.texi.dvi): Look in @TEXINFODIR@ for texinfo.tex.
+       (.texinfo.dvi): Likewise.
+
+       * automake.in (handle_texinfo): TEXINFO_TEX variable can set
+       location of texinfo.tex.
+
+Fri Mar 21 10:22:51 1997  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texinfo.dvi): Mirror .texi.dvi.
+
+       * ansi2knr.c, ansi2knr.1: New versions from L. Peter Deutsch.
+
+       * scripts.am: Add @EXEEXT@ to installed scripts.
+
+Wed Jan 22 20:12:31 1997  Jim Meyering  <address@hidden>
+
+       * m4/mktime.m4 (AM_FUNC_MKTIME): Run tests for each of a few values
+       for the TZ environment variable.  Andre Novaes Cunha provided the
+       hairy TZ setting that exercized the Solaris tzset bug.
+
+1997-01-22  Paul Eggert  <address@hidden>
+
+       * m4/mktime.m4: (AM_FUNC_MKTIME): Fix bug in mktime test -- don't
+       test now, test a couple of thousand times.
+
+Thu Mar 20 00:16:54 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_programs): Remove CYGWIN lines unless
+       AM_CYGWIN32 seen.
+       (am_install_var): Remove CYGWIN lines from -clean file as well.
+
+       * progs.am: Put @EXEEXT@ where appropriate.
+
+       * program.am (@PROGRAM@): If using Cygwin32, then create actual
+       name in addition to ".exe" name.
+
+       * progs-clean.am (address@hidden@PROGRAMS): Conditionalize on CYGWIN.
+
+       * automake.in (check_cygnus): Require AM_CYGWIN32 in --cygnus mode.
+       (am_install_var): If AM_CYGWIN32 not seen, then remove @EXEEXT@
+       from .am files.
+
+       * automake.in (seen_cygwin32): New global.
+       (scan_one_configure_file): Check for AM_CYGWIN32.
+
+       * m4/cygwin.m4: New file.
+
+       * automake.in (scan_one_configure_file): Explicitly handle
+       AC_CONFIG_HEADER so we can avoid spurious warnings.
+       (obsolete_macros): Removed AC_CONFIG_HEADER.
+
+       * automake.in (handle_yacc_lex_cxx): Perl 4 fixes.  From Greg
+       A. Woods.
+
+Wed Mar 19 00:35:13 1997  Tom Tromey  <address@hidden>
+
+       * Released 1.1m.
+
+       * m4/missing.m4: Print message saying what is happening.
+
+       * m4/sanity.m4: sleep before testing.
+
+Tue Mar 18 17:20:03 1997  Tom Tromey  <address@hidden>
+
+       * config.guess, config.sub: New from the FSF.
+
+       * automake.in (initialize_global_constants): [common_files]
+       Include `missing'.
+       (scan_configure): Require `missing'.
+
+       * header-vars.am (MAKEINFO): Don't define.
+
+       * m4/init.m4 (missing_dir): Use AM_MISSING_PROG.
+       * m4/missing.m4: New file.
+
+       `missing' changes from François Pinard:
+       * Everywhere: Use ACLOCAL_M4 to name aclocal.m4 file; ACLOCAL now
+       names aclocal program.
+       * m4/init.m4: Replace programs with `missing' if not found.
+       * automake.in (handle_texinfo): Define MAKEINFO as @address@hidden
+       (AC_CHECK_PATTERN): Check for alphanumeric names only.
+       (handle_aclocal_m4): Use ACLOCAL, not aclocal.
+       * Makefile.am (pkgdata_SCRIPTS): Include missing.
+       * missing: New file.
+
+       * automake.in (target_defined): New sub.
+       (handle_footer): Error if target .SUFFIXES used.
+
+Sun Mar 16 14:33:41 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_lib_objects): Set seen_c_source to line
+       number.
+       (handle_yacc_lex_cxx): Use seen_c_source as line number.
+       (am_line_error): Line of -1 means skip line-number check.
+
+       * automake.in (read_am_file): Change to keep perl -w quiet.
+       (check_typos): Removed extra check of EXTRA_ containing config
+       subs.
+
+Mon Mar 10 23:17:19 1997  Tom Tromey  <address@hidden>
+
+       * remake-hdr.am (stamp-h): Set CONFIG_HEADERS to
+       $(CONFIG_HEADER_FULL).
+       * automake.in (handle_configure): Define CONFIG_HEADER_FULL.
+
+       * automake.in (handle_lib_objects): Set seen_c_source as
+       appropriate.  From Alexander V. Lukyanov.  Test cxxlibobj.test.
+
+Sat Mar  8 22:54:35 1997  Tom Tromey  <address@hidden>
+
+       * texinfo.tex: New version.
+
+       * automake.in (handle_emacs_lisp): If EMACS is `no', then we
+       couldn't find an Emacs.  So don't bother running elisp-comp.  From
+       Ulrich Drepper.
+
+       * automake.in (handle_texinfo): Added .tr and .cv to list of
+       texinfo clean extensions.  From Karl Berry.
+
+Fri Feb 28 22:14:53 1997  Tom Tromey  <address@hidden>
+
+       * Makefile.am: Make sure we never use "undef".
+
+       * automake.in (usage): Changed bug-reporting address.
+       (handle_dist): Use undef, not delete.
+
+Wed Feb 26 08:41:11 1997  Gordon Matzigkeit  <address@hidden>
+
+       * automake.in (%obsolete_macros): Reintroduce, with hints for what
+       to do to upgrade the support.
+
+       * automake.in, ltlib-clean.am, ltlib.am, ltlibrary.am: Revamped
+       libtool support to use the _LTLIBRARIES primary.
+
+Wed Feb 26 00:20:39 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tags): In default case, add @tags_deps to
+       dependencies of tags target.
+
+Tue Feb 25 23:46:29 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_tests): If a test failed, then make should
+       fail.  From Jim Meyering.
+
+Mon Feb 24 19:02:21 1997  Tom Tromey  <address@hidden>
+
+       * texi-vers.am (@VTEXI@): Copy stamp file into output.
+
+Sun Feb 23 00:10:36 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (handle_programs): Give correct error line for lex
+       error.
+       (am_line_error): Avoid uninitialized value errors from perl -w.
+
+       * aclocal.in (scan_m4_files): Fixed perl -w warning.
+
+       * texinfos.am (.texi, .texinfo): New targets.
+
+       * automake.in (scan_texinfo_file): Renamed.
+       (handle_texinfo): Handle files without ".info" extension.
+
+       * automake.in (handle_subdirs): Error if directory contains "/".
+       (handle_yacc_lex_cxx): Quoting fix.
+       (handle_single_transform_list): Use transformed (non-ansi) version
+       of $obj instead of explicit ".o".  From Gord Matzigkeit.
+
+       * m4/sanity.m4: Pass -L to ls if possible.
+
+Sat Feb 22 15:22:31 1997  Tom Tromey  <address@hidden>
+
+       * dist-vars.am (DISTFILES): Don't distribute MANS.
+
+       * automake.in (handle_dist): Use define_variable to define TAR,
+       GZIP.
+       (handle_dist): Pass GZIP in environment to tar.
+       (initialize_global_constants): Likewise.
+
+       From Kaveh Ghazi:
+       * m4/protos.m4: Don't put any dependencies on AC_C_INLINE or
+       AC_C_CONST.
+       * m4/ccstdc.m4: Force AM_PROG_CC_STDC to come before AC_C_INLINE
+       or AC_C_CONST.
+
+Fri Feb 21 00:39:17 1997  Tom Tromey  <address@hidden>
+
+       From The Crimson Binome:
+       * automake.in (handle_yacc_lex_cxx): Handle C++ yacc/lex source.
+       (output_yacc_build_rule): New sub for C++ yacc/lex.
+
+       * automake.in (my_glob): New sub.
+       (handle_dependencies): Use my_glob.
+       (handle_aclocal_m4): Scan ACLOCAL_AMFLAGS for dependencies.
+
+       * ltlibs.am, lisp.am, libs.am, header.am, data.am, progs.am,
+       scripts.am, texinfos.am: Add leading space to echo.
+
+       * automake.in (handle_texinfo): Added .tps and .vrs to list of TeX
+       endings.  From Jim Blandy.
+       (install_man_format): Make rule silent; instead print actual
+       command.
+
+Tue Feb  4 18:29:42 1997  Tom Tromey  <address@hidden>
+
+       * dist-vars.am (TAR): Removed.
+       * automake.in (TAR): New variable.
+       (handle_dist): Explicitly define TAR.
+       * configure.in: Compute TAR.
+
+       * automake.in (handle_lib_objects): Put @ALLOCA@ on @dep_list, not
+       @dep_files.
+       (AC_SUBST_PATTERN): Typo fix.
+       (handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
+       (handle_clean): Put -recursive target before -am target.
+       (handle_merge_targets): Put basename of $config_name on @all.
+       Test confsub.test.  From Ramón García Fernández.
+
+Tue Jan 28 22:19:04 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (initialize_global_constants): Put libtoolize files
+       into @common_files, not @common_sometimes.  From Gord Matzigkeit.
+
+Sun Jan 26 17:46:08 1997  Tom Tromey  <address@hidden>
+
+       * texinfos.am (.texi.info): If --cygnus, set -I $(srcdir).  From
+       Per Bothner.
+
+Sun Jan 12 18:28:16 1997  Fred Fish  (address@hidden)
+
+       * automake.in: Use 'interlock' and 'ylwrap' from source
+       directory or aux config directory, not build directory.
+
+Tue Jan  7 18:35:10 1997  Tom Tromey  <address@hidden>
+
+       * aclocal.in (parse_arguments): Handle -I.
+       (usage): Ditto.
+       (scan_m4_files): Ditto.
+
+       * automake.in (handle_single_transform_list): Don't give error
+       message if extension unrecognized.
+
+Tue Dec 17 11:18:20 1996  Andreas Schwab  <address@hidden>
+
+       * m4/header.m4 (AM_CONFIG_HEADER): Check for $CONFIG_HEADERS, not
+       $CONFIG_HEADER.
+
+Tue Jan  7 17:59:26 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (scan_one_configure_file): AM_INIT_GUILE_MODULE runs
+       AM_PROG_INSTALL, not AC_PROG_INSTALL.  From Jim Blandy.
+       (handle_texinfo): Handle no-texinfo.tex option.
+       (handle_options): Ditto.
+
+Thu Jan  2 14:16:17 1997  Tom Tromey  <address@hidden>
+
+       * automake.in (am_install_var): Ignore EXTRA libtool libraries.
+       From Marius Vollmer.
+
+-----
+
+Copyright 1997-2012 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted provided the copyright notice and this notice are preserved.
diff --git a/old/TODO b/old/TODO
new file mode 100644
index 0000000..f8e4754
--- /dev/null
+++ b/old/TODO
@@ -0,0 +1,504 @@
+the new YFLAGS code doesn't correctly handle srcdir
+
+allow foo_NAME to rename an object (library or program)
+at build/install time
+
+remove _LTLIBRARIES and just use _LIBRARIES
+then use this for zip/jar as well
+
+add an error if the user makefile.am violates our
+   namespace rules
+
+we need a document describing automake from the end user's point of view
+eg describe INSTALL_HEADER there, among other things
+
+* maintainer-clean
+
+Akim:
+> @@ -31,5 +31,9 @@
+>  DISTCLEAN   -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+>
+>  maintainer-clean-generic:
+> +## FIXME: shouldn't we really print these messages before running
+> +## the dependencies?
+> +    @echo "This command is intended for maintainers to use"
+> +    @echo "it deletes files that may require special tools to rebuild."
+>        -rm -f Makefile.in
+
+Tom:
+> I'd like to eventually fix the FIXME comment by having
+> maintainer-clean look like:
+>
+>     maintainer-clean:
+>        @echo ...
+>        $(MAKE) whatever
+>
+> We're left with the question of whether we should repeat them in every
+> subdir.
+
+*
+Alexandre Oliva:
+> Hmm...  Interesting.  It must have been a side effect of the enabling
+> of forced `relink' on GNU/Linux/x86.  Anyway, on platforms that
+> actually require relinking, this problem remains, and I see no way to
+> overcome it other than arranging for automake to install libraries
+> before executables, as you suggest.  This shouldn't be a big problem,
+> anyway.
+>
+> A bigger problem could show up if two libraries in the same directory,
+> one dependent on the other, are installed concurrently.  If relinking
+> is needed for the dependent library, we have a problem.  It appears to
+> me that user will have to live without `make -j install', in this
+> case.
+
+Alex Hornby
+> Here's an Automake patch and changelog entry allow make -j install on
+> such degenerate systems (and Linux with buggy libtool <g>)
+>
+> If you install to locations other that bin_ and lib_ then a larger fix
+> is necessary, but this should fix the 90% case.
+
+* think about how per-object flags should work.  in particular:
+  * how should they be specified?
+    using the object name is confusing when .lo/.obj in use
+    however, the object name provides a nice interaction with
+    per-exe flags
+  * how should they interact with per-executable flags?
+  [ this is probably a feature in search of a problem ]
+
+* cross-compilation support:
+  programs built and used by the build process need to be
+  built for CC_FOR_BUILD
+  introduce a new prefxi for this, e.g. `build_PROGRAMS'
+  [ we can do this in an automatic way I think.
+    unfortunately it isn't that useful until autoconf has support
+    for this sort of thing as well ]
+
+* one performance enhancement would be to have autoconf write
+  a single file containing all the macro assignments.
+  then read this file via `include'
+  unfortunately this can't be done because of conditionals
+  -- but it could be made to work if we also changed:
+    * automake to rewrite @FOO@ to $(FOO), and
+    * the implementation of conditionals to rely on some new
+      config.status magic
+
+* support prog_LIBS as override for LIBS
+
+* Test subdir-objects option with yacc, lex, ansi2knr
+  Our locking scheme won't prevent a parallel make from losing
+  if there are two `bar.o' files and the timing is just right
+  This only happens with parallel make and no-`-c -o' compiler,
+  so it probably isn't very important
+  `-c -o' when doing libtool
+  try to find a losing compiler and see if it really works.
+  (actually: hack config.cache and do it)
+
+* per-exe flags
+** LIBOBJS shouldn't be used when there are per-exe flags (?)
+
+* Allow creation of Java .zip/.jar files in natural way
+  If you are building a compiled Java library, then the .zip/.jar
+  ought to be made automatically.
+
+* examine possibility of using any character in a macro name
+  and rewriting names automatically.  this means we must rewrite
+  all references as well.
+  [ this is a 2.0-style feature ]
+
+* `distcheck' and `dist' should depend on `all'
+
+* Add code to generate foo-config script like gnome, gtk
+
+* document user namespace for macro/target names
+  adopt some conventions and use uniformly
+    [ this is a good thing for the rewrite ]
+
+* distclean must remove config.status
+  can't this cause problems for maintainer-clean?
+  shouldn't maintainer-clean print the message before running
+  any part of the make?  (just to slow things down long enough
+  for the user to stop it)
+  (maybe doesn't matter since people who even know about
+  maintainer-clean already have a clue)
+
+* reintroduce AM_FUNC_FNMATCH which sets LIBOBJS
+  Then have automake know about fnmatch.h.
+    [ probably should wait for autoconf to get right functionality ]
+
+* "make diff" capability
+  look at gcc's Makefile.in to see what to do
+  or look at maint program
+
+* in --cygnus, clean-info not generated at top level
+
+* what if an element of a scanned variable looks like
+       $(FOO).$(BAR)  ?
+  or some other arbitrary thing?
+  right now we try to cope, but not very well
+    [ this is only of theoretical interest for now ]
+    [ We now have an 'inner_expand' option to traverse_recursively,
+      but it is not yet used. ]
+
+* make sure every variable that is used is also defined
+    [ we don't really look at variable uses in detail.
+      2.0 thing ]
+
+* make sure `missing' defines are generated
+
+* missing should handle install -d and rmdir -p (for uninstall)
+
+* NORMAL_INSTALL / NORMAL_UNINSTALL -vs- recursive rules
+  [ requires changes to the standard ]
+
+* should not put texiname_TEXINFOS into distribution
+  should rename this macro anyway, to foo_texi_DEPENDENCIES
+
+* For now I guess I'll just have automake give an error if it encounters
+non-C source in a libtool library specification.
+
+* if program has the same name as a target, do something sensible:
+  - if the target is internal, rename it
+  - if the target is mandated (eg, "info"), tell the user
+    consider auto-modifying the program name to work around this
+
+* should separate actual options from strictness levels
+  strictness should only cover requirements
+  You should be able to pick and choose options
+
+having just one Makefile for a project would give a big speed increase
+for a project with many directories, eg glibc.  ideally (?) you'd
+still be able to have a Makefile.am in each directory somehow; this
+might make editing conceptually easier.
+
+* finish up TAGS work
+
+* only remove libtool at top level?
+
+* clean up source directory by moving stuff into subdirs
+
+* consider adding other variables similar to pkglibexecdir?
+  requests for pkg-dirs with version included
+
+Avoid loops when installing; instead unroll them in automake
+[ Impossible when @AC_SUBST@ values are used. ]
+
+Some long-term projects:
+* if $(FOO) is used somewhere, ensure FOO is defined, either by
+  user or by automake if possible
+
+[ include, += support ]
+* even better would be allowing targets in different included
+  fragments to be merged.  e.g., `install-local'.
+
+consider putting all check-* targets onto @check?
+
+take diff-n-query code from libit
+
+Per Bothner says:
+Per> 1) Being able to build a set of non-source programs
+Per> from source programs, without necessarily linking them together.
+Per> I.e. one should be able to say something like:
+Per>   dummy_SOURCES=foo.c bar.c
+Per> and automake should realize that it needs to build foo.o and bar.o.
+Per> 2) Being intelligent about new kinds of suffixes.
+Per> If it sees:
+Per>   SUFFIXES = .class .java
+Per> and a suffix rule of the form:
+Per>   .java.class:
+Per> then it should be able to realize it can build .class files from
+Per> .java files, and thus be able to generate a list of
+Per> .class files from a list of .java source files.
+[What Per wanted here was a way to have automate automatically follow
+suffix rules.  So for instance if you had a `.x.y:' rule, and automake
+saw a `.x' file, it would automatically build and install the
+corresponding `.y' file.]
+
+Jim's idea: should look for @setfilename and warn if filenames too long
+* guess split size
+
+from joerg-martin schwarz:
+ -- If Makefile.am contains $(CC), $(COMPILE), $(YLWRAP), ....
+    in an explicitly written rule,  you should emit the corresponding
+    Makefile variables automatically.
+
+From the GNU Standards.  These things could be checked, and probably
+should be if --gnu.
+*    Make sure that the directory into which the distribution unpacks (as
+well as any subdirectories) are all world-writable (octal mode 777).
+*   Make sure that no file name in the distribution is more than 14
+characters long.
+*    Don't include any symbolic links in the distribution itself.
+     (ditto hard links)
+*    Make sure that all the files in the distribution are world-readable.
+
+should be able to determine what is built by looking at rules (and
+configure.in).  Then built man pages (eg) could automatically be
+omitted from the distribution.
+
+Right now, targets generated internally (eg "install") are not
+overridable by user code.  This should probably be possible, even
+though it isn't very important.  This could be done by generating all
+internal rules via a function call instead of just appending to
+$output_rules.
+ [ this will be harder to implement when scanning a rule like all-recursive
+   from subdirs.am ]
+
+Other priorities:
+* Must rewrite am_install_var.  Should break into multiple functions.
+  This will allow the callers to be a little smarter.
+* Rewrite clean targets.
+* Fix up require_file junk.
+
+djm wants ``LINKS'' variable; list of things to link together after
+install.  In BSD environment, use:
+       LINKS = from1 to1 from2 to2 ...
+
+Need way to say there are no suffixes in a Makefile (Franc,ois'
+"override" idea suffices here)
+
+Check to make sure various scripts are executable (IE when looking for
+them in a directory)
+
+Add support for html via an option.  Use texi2html.  Use
+"html_TEXINFOS", and htmldir = .../html.  Include html files in
+distribution.  Also allow "html_DATA", for raw .html files.
+  [ when will texinfo directly support html? ]
+See also Karl Berry's message on a roadmap for a "info -> html"
+transition:
+<http://lists.gnu.org/archive/html/texinfo-devel/2012-03/msg00018.html>
+
+uninstall and pkg-dirs should rm -rf the dir.
+
+In general most .am files should be merged into automake.  For
+instance all the "clean" targets could be merged by keeping lists of
+things to be removed.  This would be a lot nicer looking.  Note that
+the install targets probably should not be merged; it is sometimes
+useful to only install a small part.
+
+* Lex, yacc support:
+** It would be nice to automatically support using bison's better features
+  to rename the output files.  This requires autoconf support
+** Consider supporting syntax from autoconf "derived:source", eg:
+       y.tab.c:perly.y
+  for yacc and lex source
+** what if you use flex and the option to avoid -lfl?
+  should support this?
+
+* Multi-language support:
+** should have mapping of file extensions to languages
+** should automatically handle the linking issue (special-case C++)
+** must get compile rules for various languages; FORTRAN probably
+  most important unimplemented language
+This should be integrated in some way with Per's idea.
+Eg .f.o rules should be recognized & auto-handled in _SOURCES
+That way any random language can be treated with C/C++ on a first-class
+basis (maybe)
+
+It might be cool to generate .texi dependencies by grepping for
address@hidden  (If done, it should be done the same way C dependencies are
+done)
+[ Ask Karl Berry for a -M option to makeinfo and texi2dvi? ]
+
+It would be good to check some parts of GNU standards.  Already check
+for install-sh and mkinstalldirs.  What else is required to be in
+package by GNU standards or by automake?
+Some things for --strictness=gnits:
+* "cd $(foo); something" is an error in a rule.  Should be:
+  "cd $(foo) && something"
+* Look for 'ln -s' and warn about using $(LN_S) and AC_PROG_LN_S
+* Look for $(LN_S) and require AC_PROG_LN_S
+
+Auto-distribute "ChangeLog.[0-9]+"?  "ChangeLog.[a-z]+"?
+
+Check all source files to make sure that FSF address is up-to-date.
+--gnits or --gnu only.
+
+Merge each -vars.am file with corresponding ".am" file.  Can do this
+because of changes to &file_contents.
+
+Should libexec programs have the name transform done on them?
+
+Order the output rules sensibly, so FOO_SOURCES and FOO_OBJECTS are
+together and rules are in the usual order.
+
+djm says:
+David> To avoid comments like the one about subdirs getting buried in
+David> the middle of a Makefile.in, how about pushing comments that
+David> start with ### to the top of the Makefile.in (in order)?  Sort
+David> of like how Autoconf uses diversions to force initialization
+David> code to the top of configure.
+
+================================================================
+
+Stuff for aclocal:
+
+probably should put each group of m4 files into a subdir owned by the
+containing application.
+
+================================================================
+
+Document:
+
+AM_MISSING_PROG
+
+how to use the generated makefiles
+ - standard targets
+ - required targets
+ - NORMAL_INSTALL junk
+
+rationale for avoiding
+       make CFLAGS="$CFLAGS" ...
+in subdirs make rule
+
+write example of using automake with dejagnu
+follow calc example in dejagnu docs
+
+document which variables are actually scanned and which are not.
+
+Document customary ordering of Makefile.am.  From François.
+
+Should include extended version of diagram from Autoconf (suggested by
+Greg Woods)
+
+Make a definition of the term "source"
+
+document how to use Automake with CVS.  Idea from Mark Galassi.  Also
+include Greg Woods' more sophisticated "cvs-dist" target.
+
+-- must document all variables that are supposed
+   to be public knowledge
+
+must document the targets required for integration with
+non-automake-using subdirs
+
+document the "make SHELL='/bin/sh -x'" trick for debugging
+
+section on relationship to GNU make.  include notes on parallel makes
+
+add a concept index
+
+move discussion of cygwin32, etags, mkid under other gnu tools
+
+CCLD, CXXLD, FLD
+
+================================================================
+
+Libraries:
+
+* Should support standalone library along with subdir library in same
+  Makefile.am.  Maybe: turn off "standalone" mode if library's Makefile.am
+  is not only one specd? [ add an option for this ]
+
+================================================================
+
+Longer term:
+
+Would it be useful to integrate in some way with the Debian package
+building utility?  Must check.  maybe it would be possible to deal
+with all the different package utilities somehow.  Lately I've been
+hearing good things about the RedHat packaging utilities.  Why are
+there so many of these?  Are they fun to write or something?
+The RedHat package utility is called RPM; see
+       ftp://ftp.redhat.com/pub/code/rpm
+It actually has problems, like no configure script and no documentation.
+
+For Cygnus it would probably be good to be able to handle the native
+package utility on each platform.  There are probably 3 or 4 of these
+(sysv, solaris?, aix?)
+
+tcl/unix/Makefile.in has some code to generate a Solaris package.
+
+Automake probably can't do all of this on its own.  A new tool might
+be a better idea
+
+I have some notes from a Debian developer on how the integration
+should work
+
+================================================================
+
+A tool to guess what the local Makefile.am should look like:
+(see Gord's Maint program!)
+
+* Probably integrate with autoscan
+* Use various simple rules to determine what to do:
+  * get name of top directory, sans version info
+  * search for .c files with 'main' in them
+    * if in main.c, use directory name for program
+    * if in more than one, generate multiple programs
+    * if not found, generate a library named after directory
+  * order subdir searches correctly: lib first, src last
+  * assume 'testsuite' dir means we are using dejagnu
+* maybe be smart about reading existing Makefile.am, so tool
+  can be run for incremental changes?  You could imagine:
+
+       Makefile.am:
+               autoproject --incremental
+
+================================================================
+
+Stuff NOT to do, and why:
+
+consider auto-including any file that matches "*.in".
+  [ no: po/Makefile.in shouldn't be included ]
+
+must look at mkid to see how it works (for subdir usage)
+  [ right now, it doesn't.  i don't see a simple fix right now ]
+
+if configure.in not found, move up a directory and try again?  This
+could eliminate a common source of problems.
+  [ this is just a bad idea ]
+
+* scripts are installed in $exec_prefix/bin, not $prefix/bin
+  Bug or feature?
+  [ the consensus on Gnits is that this isn't required.
+    doubters can work around it anyway ]
+
+Scan source directories and warn about missing files, eg .c/.h files
+that aren't mentioned?
+  [ distcheck makes this less useful ]
+
+* quoting bugs
+  - how to install file with a space in its name?
+  [ don't bother with this -- make is just too losing ]
+
+* notice when a .c file is a target somewhere, and auto-add it to
+    BUILT_SOURCES
+  [ BUILT_SOURCES are for files that need to be built before anything
+    else because of hidden dependencies (something .c files are
+    unlikely to be) ]
+
+* Scan multiple input files when Makefile is generated?
+  This would provide flexibility for large projects; subsumes
+  the "Makefile.tmpl" idea
+ [ can't do this.  must explain why in manual.
+   basically, solving all the problems is too hard
+   like: how to remove redundancies between generated .in files
+   instead should implement `include' directive for Makefile.am ]
+
+* Should be a way to have "nobuild_PROGRAMS" which aren't even built,
+  but which could be by running the magic make command.
+  [ We already have EXTRA_PROGRAMS for this. ]
+
+
+* copyright notice
+
+Copyright 1994-2012 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+Local Variables:
+mode: outline
+End:
diff --git a/syntax-checks.mk b/syntax-checks.mk
new file mode 100644
index 0000000..4d5ab6f
--- /dev/null
+++ b/syntax-checks.mk
@@ -0,0 +1,583 @@
+# Maintainer checks for Automake.  Requires GNU make.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# We also have to take into account VPATH builds (where some generated
+# tests might be in '$(builddir)' rather than in '$(srcdir)'), TAP-based
+# tests script (which have a '.tap' extension) and helper scripts used
+# by other test cases (which have a '.sh' extension).
+xtests := $(shell \
+  if test $(srcdir) = .; then \
+     dirs=.; \
+   else \
+     dirs='$(srcdir) .'; \
+   fi; \
+   for d in $$dirs; do \
+     for s in tap sh; do \
+       ls $$d/t/*.$$s $$d/t/ax/*.$$s 2>/dev/null; \
+     done; \
+   done | sort)
+
+xdefs = $(srcdir)/defs $(srcdir)/defs-static.in
+
+ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
+
+# Some simple checks, and then ordinary check.  These are only really
+# guaranteed to work on my machine.
+syntax_check_rules = \
+sc_test_names \
+sc_diff_automake_in_automake \
+sc_diff_aclocal_in_automake \
+sc_perl_syntax \
+sc_no_brace_variable_expansions \
+sc_rm_minus_f \
+sc_no_for_variable_in_macro \
+sc_mkinstalldirs \
+sc_pre_normal_post_install_uninstall \
+sc_perl_no_undef \
+sc_perl_no_split_regex_space \
+sc_cd_in_backquotes \
+sc_cd_relative_dir \
+sc_perl_at_uscore_in_scalar_context \
+sc_perl_local \
+sc_AMDEP_TRUE_in_automake_in \
+sc_tests_make_without_am_makeflags \
+sc_tests_obsolete_variables \
+sc_tests_plain_make \
+sc_tests_plain_autoconf \
+sc_tests_plain_autoupdate \
+sc_tests_plain_automake \
+sc_tests_plain_autom4te \
+sc_tests_plain_autoheader \
+sc_tests_plain_autoreconf \
+sc_tests_here_document_format \
+sc_tests_Exit_not_exit \
+sc_tests_automake_fails \
+sc_tests_plain_aclocal \
+sc_tests_plain_perl \
+sc_tests_required_after_defs \
+sc_tests_overriding_macros_on_cmdline \
+sc_tests_plain_sleep \
+sc_tests_plain_egrep_fgrep \
+sc_tests_no_configure_in \
+sc_tests_PATH_SEPARATOR \
+sc_tests_logs_duplicate_prefixes \
+sc_tests_makefile_variable_order \
+sc_mkdir_p \
+sc_perl_at_substs \
+sc_unquoted_DESTDIR \
+sc_tabs_in_texi \
+sc_at_in_texi
+
+$(syntax_check_rules): automake aclocal
+maintainer-check: $(syntax_check_rules)
+.PHONY: maintainer-check $(syntax_check_rules)
+
+## Check that the list of tests given in the Makefile is equal to the
+## list of all test scripts in the Automake testsuite.
+maintainer-check: maintainer-check-list-of-tests
+
+## Look for test whose names can cause spurious failures when used as
+## first argument to AC_INIT (chiefly because they might contain an
+## m4/m4sugar builtin or macro name).
+m4_builtins = \
+  __gnu__ \
+  __unix__ \
+  bpatsubst \
+  bregexp \
+  builtin \
+  changecom \
+  changequote \
+  changeword \
+  debugfile \
+  debugmode \
+  decr \
+  define \
+  defn \
+  divert \
+  divnum \
+  dnl \
+  dumpdef \
+  errprint \
+  esyscmd \
+  eval \
+  format \
+  ifdef \
+  ifelse \
+  include \
+  incr \
+  index \
+  indir \
+  len \
+  m4exit \
+  m4wrap \
+  maketemp \
+  mkstemp \
+  patsubst \
+  popdef \
+  pushdef \
+  regexp \
+  shift \
+  sinclude \
+  substr \
+  symbols \
+  syscmd \
+  sysval \
+  traceoff \
+  traceon \
+  translit \
+  undefine \
+  undivert
+sc_test_names:
+       @m4_builtin_rx=`echo $(m4_builtins) | sed 's/ /|/g'`; \
+        m4_macro_rx="\\<($$m4_builtin_rx)\\>|\\<_?(A[CUMHS]|m4)_"; \
+        if { \
+          for t in $(xtests); do echo $$t; done \
+            | LC_ALL=C grep -E "$$m4_macro_rx"; \
+        }; then \
+          echo "the names of the tests above can be problematic" 1>&2; \
+          echo "Avoid test names that contain names of m4 macros" 1>&2; \
+          exit 1; \
+        fi
+
+## These check avoids accidental configure substitutions in the source.
+## There are exactly 9 lines that should be modified from automake.in to
+## automake, and 10 lines that should be modified from aclocal.in to
+## aclocal; these wors out to 32 and 34 lines of diffs, respectively.
+sc_diff_automake_in_automake:
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 32; then \
+         echo "found too many diffs between automake.in and automake" 1>&2; \
+         diff -c $(srcdir)/automake.in automake; \
+         exit 1; \
+       fi
+sc_diff_aclocal_in_aclocal:
+       @if test `diff $(srcdir)/aclocal.in aclocal | wc -l` -ne 34; then \
+         echo "found too many diffs between aclocal.in and aclocal" 1>&2; \
+         diff -c $(srcdir)/aclocal.in aclocal; \
+         exit 1; \
+       fi
+
+## Syntax check with default Perl (on my machine, Perl 5).
+sc_perl_syntax:
+       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
+       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
+
+## expect no instances of '${...}'.  However, $${...} is ok, since that
+## is a shell construct, not a Makefile construct.
+sc_no_brace_variable_expansions:
+       @if grep -F '$${' $(ams) | grep -F -v '$$$$'; then \
+         echo "Found too many uses of '\$${' in the lines above." 1>&2; \
+         exit 1;                               \
+       else :; fi
+
+## Make sure 'rm' is called with '-f'.
+sc_rm_minus_f:
+       @if grep -v '^#' $(ams) $(xtests) \
+          | grep -v '/spy-rm\.tap:' \
+          | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
+       then \
+         echo "Suspicious 'rm' invocation." 1>&2; \
+         exit 1;                               \
+       else :; fi
+
+## Never use something like "for file in $(FILES)", this doesn't work
+## if FILES is empty or if it contains shell meta characters (e.g. $ is
+## commonly used in Java filenames).
+sc_no_for_variable_in_macro:
+       @if grep 'for .* in \$$(' $(ams) | grep -v '/Makefile\.am:'; then \
+         echo 'Use "list=$$(mumble); for var in $$$$list".' 1>&2 ; \
+         exit 1; \
+       else :; fi
+
+## Make sure all invocations of mkinstalldirs are correct.
+sc_mkinstalldirs:
+       @if grep -n 'mkinstalldirs' $(ams) \
+             | grep -F -v '$$(mkinstalldirs)' \
+             | grep -v '^\./Makefile.am:[0-9][0-9]*:  *lib/mkinstalldirs 
\\$$'; \
+       then \
+         echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
+         exit 1; \
+       else :; fi
+
+## Make sure all calls to PRE/NORMAL/POST_INSTALL/UNINSTALL
+sc_pre_normal_post_install_uninstall:
+       @if grep -E -n '\((PRE|NORMAL|POST)_(|UN)INSTALL\)' $(ams) | \
+             grep -v ':##' | grep -v ':        @\$$('; then \
+         echo "Found incorrect use of PRE/NORMAL/POST_INSTALL/UNINSTALL in the 
lines above" 1>&2; \
+         exit 1; \
+       else :; fi
+
+## We never want to use "undef", only "delete", but for $/.
+sc_perl_no_undef:
+       @if grep -n -w 'undef ' $(srcdir)/automake.in | \
+             grep -F -v 'undef $$/'; then \
+         echo "Found undef in automake.in; use delete instead" 1>&2; \
+         exit 1; \
+       fi
+
+## We never want split (/ /,...), only split (' ', ...).
+sc_perl_no_split_regex_space:
+       @if grep -n 'split (/ /' $(srcdir)/automake.in; then \
+         echo "Found bad split in the lines above." 1>&2; \
+         exit 1; \
+       fi
+
+## Look for cd within backquotes
+sc_cd_in_backquotes:
+       @if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in $(ams); then \
+         echo "Consider using \$$(am__cd) in the lines above." 1>&2; \
+         exit 1; \
+       fi
+
+## Look for cd to a relative directory (may be influenced by CDPATH).
+## Skip some known directories that are OK.
+sc_cd_relative_dir:
+       @if grep -n '^[^#]*cd ' $(srcdir)/automake.in $(ams) | \
+             grep -v 'echo.*cd ' | \
+             grep -v 'am__cd =' | \
+             grep -v '^[^#]*cd [./]' | \
+             grep -v '^[^#]*cd \$$(top_builddir)' | \
+             grep -v '^[^#]*cd "\$$\$$am__cwd' | \
+             grep -v '^[^#]*cd \$$(abs' | \
+             grep -v '^[^#]*cd "\$$(DESTDIR)'; then \
+         echo "Consider using \$$(am__cd) in the lines above." 1>&2; \
+         exit 1; \
+       fi
+
+## Using @_ in a scalar context is most probably a programming error.
+sc_perl_at_uscore_in_scalar_context:
+       @if grep -Hn 'address@hidden) ] *= address@hidden' 
$(srcdir)/automake.in; then \
+         echo "Using @_ in a scalar context in the lines above." 1>&2; \
+         exit 1; \
+       fi
+
+## Allow only few variables to be localized in Automake.
+sc_perl_local:
+       @if egrep -v '^[ \t]*local \$$[_~]( *=|;)' $(srcdir)/automake.in | \
+               grep '^[ \t]*local [^*]'; then \
+         echo "Please avoid 'local'." 1>&2; \
+         exit 1; \
+       fi
+
+## Don't let AMDEP_TRUE substitution appear in automake.in.
+sc_AMDEP_TRUE_in_automake_in:
+       @if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
+         echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
+         exit 1; \
+       fi
+
+## Recursive make invocations should always pass $(AM_MAKEFLAGS)
+## to $(MAKE), for portability to non-GNU make.
+sc_tests_make_without_am_makeflags:
+       @if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in \
+           | grep -v 'AM_MAKEFLAGS' \
+           | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \
+       then \
+         echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \
+         exit 1; \
+       fi
+
+## Look out for some obsolete variables.
+sc_tests_obsolete_variables:
+       @vars=" \
+         using_tap \
+         parallel_tests \
+         test_prefer_config_shell \
+         original_AUTOMAKE \
+         original_ACLOCAL \
+       "; \
+       seen=""; \
+       for v in $$vars; do \
+         if grep -E "\b$$v\b" $(xtests) $(xdefs); then \
+           seen="$$seen $$v"; \
+         fi; \
+       done; \
+       if test -n "$$seen"; then \
+         for v in $$seen; do \
+           echo "Variable '$$v' is obsolete, use 'am_$$v' instead." 1>&2; \
+         done; \
+         exit 1; \
+       else :; fi
+
+## Tests should never call make directly.
+sc_tests_plain_make:
+       @if grep -v '^#' $(xtests) | $(EGREP) ':[       ]*make( |$$)'; then \
+         echo 'Do not run "make" in the above tests.  Use "$$MAKE" instead.' 
1>&2; \
+         exit 1; \
+       fi
+
+## Tests should never call autoconf directly.
+sc_tests_plain_autoconf:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*autoconf\>'; then \
+         echo 'Do not run "autoconf" in the above tests.  Use "$$AUTOCONF" 
instead.' 1>&2; \
+         exit 1; \
+       fi
+
+## Tests should never call autoupdate directly.
+sc_tests_plain_autoupdate:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*autoupdate\>'; then \
+         echo 'Do not run "autoupdate" in the above tests.  Use "$$AUTOUPDATE" 
instead.' 1>&2; \
+         exit 1; \
+       fi
+
+## Tests should never call automake directly.
+sc_tests_plain_automake:
+       @if grep -v '^#' $(xtests) | grep -E ':[        ]*automake\>([^:]|$$)'; 
then \
+         echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" 
instead.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should never call autoheader directly.
+sc_tests_plain_autoheader:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*autoheader\>'; then \
+         echo 'Do not run "autoheader" in the above tests.  Use "$$AUTOHEADER" 
instead.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should never call autoreconf directly.
+sc_tests_plain_autoreconf:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*autoreconf\>'; then \
+         echo 'Do not run "autoreconf" in the above tests.  Use "$$AUTORECONF" 
instead.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should never call autom4te directly.
+sc_tests_plain_autom4te:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*autom4te\>'; then \
+         echo 'Do not run "autom4te" in the above tests.  Use "$$AUTOM4TE" 
instead.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should only use END and EOF for here documents
+## (so that the next test is effective).
+sc_tests_here_document_format:
+       @if grep '<<' $(xtests) | grep -Ev '\b(END|EOF)\b|\bstd::cout <<'; then 
\
+         echo 'Use here documents with "END" and "EOF" only, for 
greppability.' 1>&2; \
+         exit 1; \
+       fi
+
+## Tests should never call exit directly, but use Exit.
+## This is so that the exit status is transported correctly across the 0 trap.
+## Ignore comments, testsuite self tests, and one perl line in ext2.sh.
+sc_tests_Exit_not_exit:
+       @found=false; for file in $(xtests); do \
+         case $$file in */self-check-*) continue;; esac; \
+         res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
+                     -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
+         if test -n "$$res"; then \
+           echo "$$file:$$res"; \
+           found=true; \
+         fi; \
+       done; \
+       if $$found; then \
+         echo 'Do not call plain "exit", use "Exit" instead, in above tests.' 
1>&2; \
+         exit 1; \
+       fi
+
+## Use AUTOMAKE_fails when appropriate
+sc_tests_automake_fails:
+       @if grep -v '^#' $(xtests) | grep '\$$AUTOMAKE.*&&.*[eE]xit'; then \
+         echo 'Use AUTOMAKE_fails + grep to catch automake failures in the 
above tests.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should never call aclocal directly.
+sc_tests_plain_aclocal:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*aclocal\>'; then \
+         echo 'Do not run "aclocal" in the above tests.  Use "$$ACLOCAL" 
instead.' 1>&2;  \
+         exit 1; \
+       fi
+
+## Tests should never call perl directly.
+sc_tests_plain_perl:
+       @if grep -v '^#' $(xtests) | grep ':[   ]*perl\>'; then \
+         echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 
1>&2; \
+         exit 1; \
+       fi
+
+## Setting 'required' after sourcing './defs' is a bug.
+sc_tests_required_after_defs:
+       @for file in $(xtests); do \
+         if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; 
then \
+           echo 'Do not set "required" after sourcing "defs" in '"$$file: 
$$out" 1>&2; \
+           exit 1; \
+         fi; \
+       done
+
+## Overriding a Makefile macro on the command line is not portable when
+## recursive targets are used.  Better use an envvar.  SHELL is an
+## exception, POSIX says it can't come from the environment.  V, DESTDIR,
+## DISTCHECK_CONFIGURE_FLAGS and DISABLE_HARD_ERRORS are exceptions, too,
+## as package authors are urged not to initialize them anywhere.
+## Finally, 'exp' is used by some ad-hoc checks, where we ensure it's
+## ok to override it from the command line.
+sc_tests_overriding_macros_on_cmdline:
+       @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(xtests); then \
+         echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e 
SHELL=$$SHELL"' 1>&2; \
+         echo ' in the above lines, it is more portable.' 1>&2; \
+         exit 1; \
+       fi
+# The first s/// tries to account for usages like "$MAKE || st=$?".
+# 'DISTCHECK_CONFIGURE_FLAGS' and 'exp' are allowed to contain whitespace in
+# their definitions, hence the more complex last three substitutions below.
+# Also, the 'make-dryrun.sh' is whitelisted, since there we need to
+# override variables from the command line in order to cover the expected
+# code paths.
+       @tests=`for t in $(xtests); do \
+                 case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \
+               done`; \
+       if sed -e 's/ || .*//' -e 's/ && .*//' \
+               -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
+               -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
+               -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
+               -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
+               -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
+               -e "s/ exp='[^']*'/ /" \
+               -e 's/ exp="[^"]*"/ /' \
+               -e 's/ exp=[^ ]/ /' \
+             $$tests | grep '\$$MAKE .*='; then \
+         echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above 
lines,' 1>&2; \
+         echo 'it is more portable.' 1>&2; \
+         exit 1; \
+       fi
+       @if grep 'SHELL=.*\$$MAKE' $(xtests); then \
+         echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=$$SHELL" in' 
1>&2; \
+         echo 'the above lines.' 1>&2; \
+         exit 1; \
+       fi
+
+## Never use 'sleep 1' to create files with different timestamps.
+## Use '$sleep' instead.  Some filesystems (e.g., Windows) have only
+## a 2sec resolution.
+sc_tests_plain_sleep:
+       @if grep -E '\bsleep +[12345]\b' $(xtests); then \
+         echo 'Do not use "sleep x" in the above tests.  Use "$$sleep" 
instead.' 1>&2; \
+         exit 1; \
+       fi
+
+## fgrep and egrep are not required by POSIX.
+sc_tests_plain_egrep_fgrep:
+       @if grep -E '\b[ef]grep\b' $(xtests) ; then \
+         echo 'Do not use egrep or fgrep in test cases.  Use $$FGREP or 
$$EGREP.' 1>&2; \
+         exit 1; \
+       fi
+       @if grep -E '\b[ef]grep\b' $(ams) $(srcdir)/m4/*.m4; then \
+         echo 'Do not use egrep or fgrep in the above files, they are not 
portable.' 1>&2; \
+         exit 1; \
+       fi
+
+## Prefer 'configure.ac' over the obsolescent 'configure.in' as the name
+## for configure input files in our testsuite.  The latter  has been
+## deprecated for several years (at least since autoconf 2.50).
+sc_tests_no_configure_in:
+       @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \
+             | grep -Ev '/backcompat.*\.(sh|tap):' \
+             | grep -Ev '/autodist-configure-no-subdir\.sh:' \
+             | grep -Ev '/(configure|help)\.sh:' \
+             | grep .; \
+       then \
+         echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
+         echo "for configure input files in the test cases above." >&2; \
+         exit 1; \
+       fi
+
+## Rule to ensure that the testsuite has been run before.  We don't depend
+## on 'check' here, because that would be very wasteful in the common case.
+## We could run "make check RECHECK_LOGS=" and avoid toplevel races with
+## AM_RECURSIVE_TARGETS.  Suggest keeping test directories around for
+## greppability of the Makefile.in files.
+sc_ensure_testsuite_has_run:
+       @if test ! -f '$(TEST_SUITE_LOG)'; then \
+         echo 'Run "env keep_testdirs=yes make check" before' \
+              'running "make maintainer-check"' >&2; \
+         exit 1; \
+       fi
+.PHONY: sc_ensure_testsuite_has_run
+
+## Ensure our warning and error messages do not contain duplicate 'warning:' 
prefixes.
+## This test actually depends on the testsuite having been run before.
+sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run
+       @if grep -E '(warning|error):.*(warning|error):' t/*.log; then \
+         echo 'Duplicate warning/error message prefixes seen in above tests.' 
>&2; \
+         exit 1; \
+       fi
+
+## Ensure variables are listed before rules in Makefile.in files we generate.
+sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run
+       @st=0; \
+       for file in `find t -name Makefile.in -print`; do \
+         latevars=`sed -n \
+           -e :x -e 's/#.*//' \
+           -e '/\\\\$$/{' -e N -e 'b x' -e '}' \
+           -e '# Literal TAB.' \
+           -e '1,/^    /d' \
+           -e '# Allow @ so we match conditionals.' \
+           -e '/^ address@hidden,\} *=/p' $$file`; \
+         if test -n "$$latevars"; then \
+           echo "Variables are expanded too late in $$file:" >&2; \
+           echo "$$latevars" | sed 's/^/  /' >&2; \
+           st=1; \
+         fi; \
+       done; \
+       test $$st -eq 0 || { \
+         echo 'Ensure variables are expanded before rules' >&2; \
+         exit 1; \
+       }
+
+## Using ':' as a PATH separator is not portable.
+sc_tests_PATH_SEPARATOR:
+       @if grep -E '\bPATH=.*:.*' $(xtests) ; then \
+         echo "Use '\$$PATH_SEPARATOR', not ':', in PATH definitions" \
+              "above." 1>&2; \
+         exit 1; \
+       fi
+
+sc_mkdir_p:
+       @if grep 'mkdir_p' $(srcdir)/automake.in $(ams) $(xtests); then \
+         echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
+         exit 1; \
+       fi
+
+## Try to make sure all @...@ substitutions are covered by our
+## substitution rule.
+sc_perl_at_substs:
+       @if test `grep -E 'address@hidden@' aclocal | wc -l` -ne 0; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
+       @if test `grep -E 'address@hidden@' automake | wc -l` -ne 0; then \
+         echo "Unresolved @...@ substitution in automake" 1>&2; \
+         exit 1; \
+       fi
+
+sc_unquoted_DESTDIR:
+       @if grep -E "[^\'\"]\\\$$\(DESTDIR" $(ams); then \
+         echo 'Suspicious unquoted DESTDIR uses.' 1>&2 ; \
+         exit 1; \
+       fi
+
+sc_tabs_in_texi:
+       @if grep '      ' $(srcdir)/doc/automake.texi; then \
+         echo 'Do not use tabs in the manual.' 1>&2; \
+         exit 1; \
+       fi
+
+sc_at_in_texi:
+       @if grep -E '(address@hidden|^)@([       address@hidden|$$)' 
$(srcdir)/doc/automake.texi; \
+       then \
+         echo 'Unescaped @.' 1>&2; \
+         exit 1; \
+       fi
diff --git a/t/CheckListOfTests.am b/t/CheckListOfTests.am
new file mode 100644
index 0000000..a3913f2
--- /dev/null
+++ b/t/CheckListOfTests.am
@@ -0,0 +1,68 @@
+## -*- Automake -*-
+##
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+## Temporary files used in the 'check-list-of-tests' recipe.
+am__tmk = tests-in-makefile-list.tmp
+am__tfs = tests-on-filesystem-list.tmp
+am__tdf = diff-in-tests-lists.tmp
+
+## Check that the list of tests given in the Makefile is equal to the
+## list of all test scripts in the Automake testsuite.
+.PHONY: maintainer-check-list-of-tests
+maintainer-check-list-of-tests:
+## Prefer unified diffs over plain diffs, for readability.
+        @if diff -u /dev/null /dev/null >/dev/null 2>&1; then \
+          diff='diff -u'; \
+        else \
+          diff='diff'; \
+        fi; \
+## List of tests in Makefile.
+        lst='$(expected_list_of_tests)'; \
+        test -n "$$lst" || lst='$(TESTS)'; \
+        for t in $$lst; do \
+          echo "$$t"; \
+        done | sort >$(am__tmk); \
+## List of subdirs where to look for tests.
+        dirs='$(test_subdirs)'; \
+        test -n "$$dirs" || dirs=.; \
+## List of tests on filesystem.  Be careful to cater for VPATH builds too.
+        test_extensions='$(TEST_EXTENSIONS)'; \
+        for ext in $$test_extensions; do \
+          for dir in $$dirs; do \
+            ls $$dir/*$$ext 2>/dev/null; \
+            if test $(srcdir) != $(builddir); then \
+              ($(am__cd) $(srcdir) && ls $$dir/*$$ext 2>/dev/null); \
+            fi; \
+          done; \
+        done | sed 's,^\./,,' | sort | uniq >$(am__tfs); \
+## Compare the two lists, complain if they differ.
+        if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
+           result=0; \
+        else \
+           echo '$@: list of tests in Makefile an on filesystem differ' >&2; \
+           echo "+ $$diff in-makefile on-filesystem" >&2; \
+           cat $(am__tdf) >&2; \
+           result=1; \
+        fi; \
+        rm -f $(am__tmk) $(am__tfs) $(am__tdf); \
+        exit $$result;
+
+.PHONY: clean-maintcheck-testslist-tmp
+clean-local: clean-maintcheck-testslist-tmp
+clean-maintcheck-testslist-tmp:
+       rm -f $(am__tmk) $(am__tfs) $(am__tdf)
diff --git a/t/README b/t/README
new file mode 100644
index 0000000..75dae9e
--- /dev/null
+++ b/t/README
@@ -0,0 +1,289 @@
+                           The Automake test suite
+
+
+User interface
+==============
+
+
+Running the tests
+-----------------
+
+  To run all tests:
+
+    make -k check
+
+  By default, verbose output of a test 't/foo.sh' or 't/foo.tap' is retained
+  in the log file 't/foo.log'.  Also, a summary log is created in the file
+  'test-suite.log' (in the top-level directory).
+
+  You can use '-jN' for faster completion (it even helps on a uniprocessor
+  system, due to unavoidable sleep delays, as noted below):
+
+    make -k -j4
+
+  To rerun only failed tests:
+
+    make -k recheck
+
+  To run only tests that are newer than their last results:
+
+    make -k check RECHECK_LOGS=
+
+  To run only selected tests:
+
+    make -k check TESTS="t/foo.sh t/bar.tap"           (GNU make)
+    env TESTS="t/foo.sh t/bar.tap" make -e -k check    (non-GNU make)
+
+ To run the tests in cross-compilation mode, you should first configure
+ the automake source tree to a cross-compilation setup.  For example, to
+ run with a Linux-to-MinGW cross compiler, you will need something like
+ this:
+
+   ./configure --host i586-mingw32msvc --build i686-pc-linux-gnu
+
+ To avoid possible spurious error, you really have to *explicitly* specify
+ '--build' in addition to '--host'; the 'lib/config.guess' script can help
+ determine the correct value to pass to '--build'.
+ Then you can just run the testsuite in the usual way, and the test cases
+ using a compiler should automatically use a cross-compilation setup.
+
+
+Interpretation
+--------------
+
+  Successes:
+    PASS  - success
+    XFAIL - expected failure
+
+  Failures:
+    FAIL  - failure
+    XPASS - unexpected success
+
+  Other:
+    SKIP  - skipped tests (third party tools not available)
+    ERROR - some unexpected error condition
+
+
+About the tests
+---------------
+
+  There are two kinds of tests in the Automake testsuite (both implemented
+  as shell scripts).  The scripts with the '.sh' suffix are "simple"
+  tests, their outcome completely determined by their exit status.  Those
+  with the '.tap' suffix use the TAP protocol.  If you want to run a test
+  by hand, you can do so directly if it is a simple test:
+
+    ./t/nogzip.sh
+
+  (it will be verbose by default), while if it is a TAP test you can pass
+  it to your preferred TAP runner, as in e.g.:
+
+    prove --verbose --merge ./t/add-missing.tap
+
+  The tests can also be run directly in a VPATH build, as with:
+
+    /path/to/srcdir/t/nogzip.sh
+    prove --verbose --merge /path/to/srcdir/t/add-missing.tap
+
+
+Supported shells
+----------------
+
+  By default, the tests are run by the $SHELL detected at configure
+  time.  They also take care to re-execute themselves with that shell,
+  unless told not to.  So, to run the tests with a different shell, say
+  '/path/to/another/sh', the user must use:
+
+    AM_TESTS_REEXEC=no /path/to/another/sh ./t/foo.sh
+    AM_TESTS_REEXEC=no prove -v -e /path/to/another/sh ./t/bar.tap
+
+  to run a test directly, and:
+
+    make check LOG_COMPILER=/path/to/sh         (GNU make)
+    LOG_COMPILER=/path/to/sh make -e check      (non-GNU make)
+
+  to run the test(s) through the makefile test driver.
+
+  The test scripts are written with portability in mind, so that they
+  should run with any decent Bourne-compatible shell.
+
+  However, some care must be used with Zsh, since, when not directly
+  started in Bourne-compatibility mode, it has some incompatibilities
+  in the handling of $0 which conflict with our usage.  Our testsuite
+  can automatically work around these incompatibilities when a version
+  4.3 or later of Zsh is used, but unfortunately not when an older
+  version of Zsh is used.  Thus, if you want to run a test script, say
+  'foo.sh', with Zsh 4.2, you *can't* simply do "zsh foo.sh", but
+  you *must* resort to:
+
+    AM_TESTS_REEXEC=no zsh -o no_function_argzero foo.sh
+
+  Note that this problem does not occur if Zsh is executed through
+  a symlink with a basename of 'sh', since in that case Zsh starts
+  in Bourne compatibility mode.  So you should be perfectly safe
+  when /bin/sh is Zsh, even a it's version < 4.3.
+
+
+Reporting failures
+------------------
+
+  Send verbose output, i.e., the contents of test-suite.log, of failing
+  tests to <address@hidden>, along with the usual version numbers
+  (which Automake, which Autoconf, which operating system, which make
+  version, which shell, etc.)
+
+
+
+Writing test cases
+==================
+
+
+Do
+--
+
+  If you plan to fix a bug, write the test case first.  This way you'll
+  make sure the test catches the bug, and that it succeeds once you have
+  fixed the bug.
+
+  Add a copyright/license paragraph.
+
+  Explain what the test does.
+
+  Cite the PR number (if any), and the original reporter (if any), so
+  we can find or ask for information if needed.
+
+  If a test checks examples or idioms given in the documentation, make
+  sure the documentation reference them appropriately in comments, as in:
+    @c Keep in sync with autodist-config-headers.sh
+    @example
+    ...
+    @end example
+
+  Use "required=..." for required tools.  Do not explicitly require
+  tools which can be taken for granted because they're listed in the
+  GNU Coding Standards (for example, 'gzip').
+
+  Include ./defs in every test script (see existing tests for examples
+  of how to do this).
+
+  Use the 'skip_' function to skip tests, with a meaningful message if
+  possible.  Where convenient, use the 'warn_' function to print generic
+  warnings, the 'fail_' function for test failures, and the 'fatal_'
+  function for hard errors.  In case a hard error is due to a failed
+  set-up of a test scenario, you can use the 'framework_fail_' function
+  instead.
+
+  For tests that use the 'parallel-tests' Automake option, set the shell
+  variable 'am_parallel_tests' to "yes" before including ./defs.  For
+  tests that are *not* meant to work with the 'parallel-tests' Automake
+  option (these should be very very few), set the shell variable
+  'am_parallel_tests' to "no" before including ./defs.
+
+  Some tests in the Automake testsuite are auto-generated; those tests
+  might have custom extensions, but their basename (that is, with such
+  extension stripped) is expected to end with "-w" string, optionally
+  followed by decimal digits.  For example, the name of a valid
+  auto-generated test can be 'color-w.sh' or 'tap-signal-w09.tap'.
+  Please don't name hand-written tests in a way that could cause them
+  to be confused with auto-generated tests; for example, 'u-v-w.sh'
+  or 'option-w0.tap' are *not* valid name for hand-written tests.
+
+  ./defs brings in some commonly required files, and sets a skeleton
+  configure.ac.  If possible, append to this file.  In some cases
+  you'll have to overwrite it, but this should be the exception.  Note
+  that configure.ac registers Makefile.in but do not output anything by
+  default.  If you need ./configure to create Makefile, append AC_OUTPUT
+  to configure.ac.  In case you don't want ./defs to pre-populate your
+  test directory (which is a rare occurrence), set the 'am_create_testdir'
+  shell variable to "empty" before sourcing ./defs.
+
+  By default, the testcases are run with the errexit shell flag on,
+  to make it easier to catch failures you might not have thought of.
+  If  this is undesirable in some testcase, you can use "set +e" to
+  disable the errexit flag (but please do so only if you have a very
+  good reason).
+
+  End the test script with a ":" or "Exit 0".  Otherwise, when somebody
+  changes the test by adding a failing command after the last command,
+  the test will spuriously fail because $? is nonzero at the end.  Note
+  that this is relevant even if the errexit shell flag is on, in case
+  the test contains commands like "grep ... Makefile.in && Exit 1" (and
+  there are indeed a lot of such tests).
+
+  Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
+  $PERL, $MAKE, $EGREP, and $FGREP, instead of the corresponding
+  commands.
+
+  Use $sleep when you have to make sure that some file is newer
+  than another.
+
+  Use cat or grep or similar commands to display (part of) files that
+  may be interesting for debugging, so that when a user send a verbose
+  output we don't have to ask him for more details.  Display stderr
+  output on the stderr file descriptor.  If some redirected command is
+  likely to fail, display its output even in the failure case, before
+  exiting.
+
+  Use 'Exit' rather than 'exit' to abort for leave early from a test
+  case.
+
+  Use '$PATH_SEPARATOR', not hard-coded ':', as the separator of
+  PATH's entries.
+
+  It's more important to make sure that a feature works, than make
+  sure that Automake's output looks correct.  It might look correct
+  and still fail to work.  In other words, prefer running 'make' over
+  grepping Makefile.in (or do both).
+
+  If you run $ACLOCAL, $AUTOMAKE or $AUTOCONF several times in the
+  same test and change configure.ac by the meantime, do
+    rm -rf autom4te*.cache
+  before the following runs.  On fast machines the new configure.ac
+  could otherwise have the same timestamp as the old autom4te.cache.
+
+  Use filenames with two consecutive spaces when testing that some
+  code preserves filenames with spaces.  This will catch errors like
+  `echo $filename | ...`.
+
+  Make sure your test script can be used to faithfully check an
+  installed version of automake (as with "make installcheck").  For
+  example, if you need to copy or grep an automake-provided script,
+  do not assume that they can be found in the '$top_srcdir/lib'
+  directory, but use '$am_scriptdir' instead.  The complete list of
+  such "$am_...dir" variables can be found in the 'defs-static.in'
+  file.
+
+  When writing input for lex, include the following in the definitions
+  section:
+    %{
+    #define YY_NO_UNISTD_H 1
+    %}
+  to accommodate non-ANSI systems, since GNU flex generates code that
+  includes unistd.h otherwise.  Also add:
+    int isatty (int fd) { return 0; }
+  to the definitions section if the generated code is to be compiled
+  by a C++ compiler, for similar reasons (i.e., the isatty(3) function
+  from that same unistd.h header would be required otherwise).
+
+  Before commit: make sure the test is executable, add the tests to
+  TESTS in Makefile.am, add it to XFAIL_TESTS in addition if needed,
+  write a ChangeLog entry, send the diff to <address@hidden>.
+
+
+Do not
+------
+
+  Do not test an Automake error with "$AUTOMAKE && Exit 1", or in three
+  years we'll discover that this test failed for some other bogus reason.
+  This happened many times.  Better use something like
+     AUTOMAKE_fails
+     grep 'expected diagnostic' stderr
+  (Note this doesn't prevent the test from failing for another reason,
+  but at least it makes sure the original error is still here).
+
+  Do not override Makefile variables using make arguments, as in e.g.:
+    $MAKE prefix=/opt install
+  This is not portable for recursive targets (targets that call a
+  sub-make may not pass "prefix=/opt" along).  Use the following
+  instead:
+    prefix=/opt $MAKE -e install
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
new file mode 100755
index 0000000..5c906a2
--- /dev/null
+++ b/t/ac-output-old.tap
@@ -0,0 +1,180 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for various older bugs related to quoting, escaping and
+# line breaking in the use of AC_OUTPUT.  Synthesised by a bunch
+# of older tests (referenced below).
+
+. ./defs || Exit 1
+
+plan_ 22
+
+rm -f configure.ac depcomp # Not required.
+
+# -----------------------------------------------------------------------
+
+# Test for bug reported by François Pinard.
+# If \ is in AC_OUTPUT, automake barfs.
+# This was the old test 'acoutbs.test'.
+
+# Also test for bug reported by David A. Swierczek.
+# Another bug with \ in AC_OUTPUT (this time with whitespace).
+# This was the old test 'acoutbs2.test'.
+
+acoutbs_check ()
+{
+  dir=acoutbs$1
+  mkdir $dir
+  cd $dir
+  cat > configure.ac
+  touch Makefile.am zot.in
+  command_ok_ "aclocal groks '\\' in AC_OUTPUT ($dir)" $ACLOCAL
+  command_ok_ "automake groks '\\' in AC_OUTPUT ($dir)" $AUTOMAKE
+  command_ok_ "autoconf groks '\\' in AC_OUTPUT ($dir)" $AUTOCONF
+  command_ok_ "can ./configure in $dir" ./configure
+  command_ok_ "zot created in $dir" test -f zot
+  ls -a > lst || bailout_ "cannot get file listing in $dir"
+  command_ok_ "'\\' not leaked in filenames in $dir" not grep '\\' lst
+  cd ..
+}
+
+acoutbs_check 1 << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT(Makefile \
+zot)
+END
+
+acoutbs_check 2 << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_OUTPUT(\
+   Makefile \
+   zot
+)
+END
+
+# -----------------------------------------------------------------------
+
+# Test for bug reported by Jerome Santini.
+# If I put this line in my configure.ac:
+#  AC_OUTPUT(Makefile src/Makefile tests/Makefile, echo timestamp > stamp-h)dnl
+# automake is not happy:
+#  [ ... ]
+# This was the old test 'acoutnoq.test'.
+
+mkdir acoutnoq
+cd acoutnoq
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT(Makefile, [true])
+END
+
+: > Makefile.am
+
+command_ok_ "aclocal and quoted AC_OUTPUT second argument" $ACLOCAL
+command_ok_ "automake and quoted AC_OUTPUT second argument" $AUTOMAKE
+
+cd ..
+
+# -----------------------------------------------------------------------
+
+# Test for bug when AC_OUTPUT has 2 args on the same line, eg:
+#   AC_OUTPUT([Makefile automake tests/Makefile],[chmod +x automake])
+# This was the old test 'acoutpt.test'.
+
+mkdir acoutpt
+cd acoutpt
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT([Makefile], [true])
+END
+
+: > Makefile.am
+
+command_ok_ "aclocal and two AC_OUTPUT arguments on same line" $ACLOCAL
+command_ok_ "automake and two AC_OUTPUT arguments on same line" $AUTOMAKE
+
+cd ..
+
+# -----------------------------------------------------------------------
+
+# Test for bug reported by Eric Magnien.
+# This was the old test 'acoutpt2.test'.
+
+mkdir acoutpt2
+cd acoutpt2
+
+# Name of the current "subtest".
+cur=acoutput2
+
+cat > configure.ac <<END
+AC_INIT([$cur], [1.0])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([subdir/Makefile subdir/foo Makefile foo], [true])
+END
+
+mkdir subdir
+
+: > Makefile.am
+: > subdir/Makefile.am
+: > foo.in
+: > subdir/foo.in
+
+command_ok_ "aclocal and AC_OUTPUT ($cur)" $ACLOCAL
+command_ok_ "automake and AC_OUTPUT ($cur)" $AUTOMAKE
+command_ok_ "foo.in mentioned two times in Makefile.in ($cur)" \
+             test `$FGREP foo.in Makefile.in | wc -l` -eq 2
+
+# This ought to work as well.
+command_ok_ "'automake -a -f' and AC_OUTPUT ($cur)" \
+            $AUTOMAKE --add-missing --force-missing
+
+cd ..
+
+# -----------------------------------------------------------------------
+
+# Test for bug reported by François Pinard.
+# This was the old test 'acoutqnl.test'.
+
+mkdir acoutqnl
+cd acoutqnl
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT([Makefile],
+[echo zardoz has spoken])
+END
+
+: > Makefile.am
+
+command_ok_ "aclocal and two AC_OUTPUT arguments on two lines" $ACLOCAL
+command_ok_ "automake and two AC_OUTPUT arguments on two lines" $AUTOMAKE
+
+cd ..
+
+# -----------------------------------------------------------------------
+
+# And we're done.
+Exit 0
diff --git a/t/acloca10.sh b/t/acloca10.sh
new file mode 100755
index 0000000..05db9b9
--- /dev/null
+++ b/t/acloca10.sh
@@ -0,0 +1,100 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal define macros in the same order as -I's.
+# This is the same as aclocal9.test, with the macro calls reversed.
+# (It did make a difference.)
+#
+# Also check for --install.
+
+# TODO: write a sister test that doesn't use a 'dirlist' file, but
+# TODO: puts third-party macros directly into 'acdir'.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+MACRO1
+MACRO2
+MACRO3
+END
+
+ACLOCAL="$ACLOCAL --system-acdir acdir"
+
+mkdir m4_1 m4_2 acdir acdir2
+echo ./acdir2 > acdir/dirlist
+
+cat >m4_1/somedefs.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
+EOF
+
+cat >m4_2/somedefs.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro12:])
+EOF
+
+cat >acdir2/macro.m4 <<EOF
+AC_DEFUN([MACRO3], [:macro33:])
+EOF
+
+$ACLOCAL -I m4_1 -I m4_2
+$AUTOCONF
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
+grep MACRO3 aclocal.m4
+test ! -f m4_1/macro.m4
+test ! -f m4_2/macro.m4
+
+$sleep
+
+$ACLOCAL -I m4_2 -I m4_1
+$AUTOCONF
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
+grep MACRO3 aclocal.m4
+test ! -f m4_1/macro.m4
+test ! -f m4_2/macro.m4
+
+$sleep
+
+$ACLOCAL -I m4_1 -I m4_2 --install
+$AUTOCONF
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
+grep MACRO3 aclocal.m4 && Exit 1
+test -f m4_1/macro.m4
+test ! -f m4_2/macro.m4
+cp aclocal.m4 copy.m4
+
+$sleep
+
+echo '#GREPME' >>acdir2/macro.m4
+$ACLOCAL -I m4_1 -I m4_2 --install
+$AUTOCONF
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+$FGREP ':macro33:' configure
+grep MACRO3 aclocal.m4 && Exit 1
+grep GREPME m4_1/macro.m4 && Exit 1
+test -f m4_1/macro.m4
+test ! -f m4_2/macro.m4
+diff aclocal.m4 copy.m4
+
+:
diff --git a/t/acloca11.sh b/t/acloca11.sh
new file mode 100755
index 0000000..7a1cff6
--- /dev/null
+++ b/t/acloca11.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that when two files define the same macro in the same
+# directory, the macro from the lexically greatest file is used.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+MACRO2
+MACRO1
+END
+
+mkdir m4
+
+cat >m4/version1.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
+EOF
+
+cat >m4/version2.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro12:])
+EOF
+
+$ACLOCAL -I m4
+$AUTOCONF
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+
+:
diff --git a/t/acloca12.sh b/t/acloca12.sh
new file mode 100755
index 0000000..958238e
--- /dev/null
+++ b/t/acloca12.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that when two files define the same macro in the same
+# directory, the macro from the lexically greatest file is used.
+# Same as acloca11.test, but without calling MACRO2.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+MACRO1
+END
+
+mkdir m4
+
+cat >m4/version1.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
+EOF
+
+cat >m4/version2.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro12:])
+EOF
+
+$ACLOCAL --verbose -I m4
+$AUTOCONF
+$FGREP ':macro11:' configure && Exit 1
+$FGREP ':macro21:' configure && Exit 1
+$FGREP ':macro12:' configure
+
+:
diff --git a/t/acloca13.sh b/t/acloca13.sh
new file mode 100755
index 0000000..e91a534
--- /dev/null
+++ b/t/acloca13.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure changes to m4_included files also cause aclocal.m4 to change.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+m4_include([somefile.m4])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'EOF'
+check-local:
+       test -f "$(srcdir)/somefile.m4"
+       test -f "$(srcdir)/m4/version1.m4"
+       test -f "$(srcdir)/m4/otherfile.m4"
+EOF
+
+mkdir m4
+
+echo MACRO1 >somefile.m4
+echo 'AC_PREREQ([2.58])' >m4/otherfile.m4
+
+cat >m4/version1.m4 <<EOF
+AC_DEFUN([MACRO1])
+AC_DEFUN([MACRO2])
+m4_sinclude(m4/otherfile.m4)
+EOF
+
+cat >m4/version2.m4 <<EOF
+AC_DEFUN([MACRO1])
+EOF
+
+$ACLOCAL -I m4
+grep version2 aclocal.m4
+grep version1 aclocal.m4 && Exit 1
+
+$sleep
+echo MACRO2 >somefile.m4
+
+$ACLOCAL -I m4
+grep version2 aclocal.m4 && Exit 1
+grep version1 aclocal.m4
+
+$sleep
+# aclocal.m4 should change if we touch otherfile.m4
+touch m4/otherfile.m4
+$sleep
+$ACLOCAL -I m4
+test `ls -1t aclocal.m4 m4/otherfile.m4 | sed 1q` = aclocal.m4
+
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
diff --git a/t/acloca14.sh b/t/acloca14.sh
new file mode 100755
index 0000000..ba1f072
--- /dev/null
+++ b/t/acloca14.sh
@@ -0,0 +1,118 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure m4_included files are also scanned for definitions.
+# Report from Phil Edwards.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+echo 'm4_include([a.m4])' > acinclude.m4
+echo 'm4_include([b.m4])' > a.m4
+
+cat >b.m4 <<EOF
+m4_include([c.m4])
+AC_DEFUN([AM_PROG_LIBTOOL],
+[AC_REQUIRE([SOMETHING])dnl
+AC_REQUIRE([SOMETHING_ELSE])dnl
+])
+
+AC_DEFUN([SOMETHING])
+EOF
+
+echo 'm4_include([d.m4])' > c.m4
+echo 'AC_DEFUN([SOMETHING_ELSE])' >d.m4
+
+mkdir defs
+echo 'AC_DEFUN([SOMETHING_ELSE])' >defs/e.m4
+echo 'AC_DEFUN([ANOTHER_MACRO])' >defs/f.m4
+
+cat >>Makefile.am<<\EOF
+ACLOCAL_AMFLAGS = -I defs
+testdist1: distdir
+       test -f $(distdir)/acinclude.m4
+       test -f $(distdir)/a.m4
+       test -f $(distdir)/b.m4
+       test -f $(distdir)/c.m4
+       test -f $(distdir)/d.m4
+       test ! -d $(distdir)/defs
+testdist2: distdir
+       test -f $(distdir)/acinclude.m4
+       test -f $(distdir)/a.m4
+       test -f $(distdir)/b.m4
+       test -f $(distdir)/c.m4
+       test -f $(distdir)/d.m4
+       test ! -f $(distdir)/defs/e.m4
+       test -f $(distdir)/defs/f.m4
+EOF
+
+$ACLOCAL -I defs
+
+$FGREP acinclude.m4 aclocal.m4
+# None of the following macro should be included.  acinclude.m4
+# includes the first four, and the last two are not needed at all.
+$FGREP a.m4 aclocal.m4 && Exit 1
+$FGREP b.m4 aclocal.m4 && Exit 1
+$FGREP c.m4 aclocal.m4 && Exit 1
+$FGREP d.m4 aclocal.m4 && Exit 1
+$FGREP defs/e.m4 aclocal.m4 && Exit 1
+$FGREP defs/f.m4 aclocal.m4 && Exit 1
+
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE testdist1
+
+cp aclocal.m4 stamp
+$sleep
+
+cat >>c.m4 <<\EOF
+AC_DEFUN([FOO], [ANOTHER_MACRO])
+EOF
+
+$MAKE
+
+# Because c.m4 has changed, aclocal.m4 must have been rebuilt.
+test `ls -1t aclocal.m4 stamp | sed 1q` = aclocal.m4
+# However, since FOO is not used, f.m4 should not be included
+# and the contents of aclocal.m4 should remain the same
+diff aclocal.m4 stamp
+
+# If FOO where to be used, that would be another story, of course.
+cat >>configure.ac <<EOF
+FOO
+EOF
+
+cp aclocal.m4 stamp
+$sleep
+
+$MAKE
+
+$FGREP defs/f.m4 aclocal.m4
+$MAKE testdist2
+
+# Make sure aclocal diagnose missing included files with correct 'file:line:'.
+rm -f b.m4
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'a\.m4:1: .*b\.m4.*does not exist' stderr
+
+:
diff --git a/t/acloca15.sh b/t/acloca15.sh
new file mode 100755
index 0000000..690c06c
--- /dev/null
+++ b/t/acloca15.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal scans configure.ac for macro definitions.
+# PR/319.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+# Start macros with AM_ because that causes aclocal to complain if it
+# cannot find them.
+
+cat > configure.ac << 'END'
+AC_INIT
+m4_include([somedef.m4])
+AC_DEFUN([AM_SOME_MACRO])
+AC_DEFUN([AM_SOME_OTHER_MACRO])
+AM_SOME_MACRO
+AM_SOME_OTHER_MACRO
+AM_MORE_MACRO
+END
+
+mkdir m4
+echo 'AC_DEFUN([AM_SOME_MACRO])' > m4/some.m4
+echo 'AC_DEFUN([AM_SOME_DEF])' > somedef.m4
+echo 'AC_DEFUN([AM_MORE_MACRO], [AC_REQUIRE([AM_SOME_DEF])])' > m4/more.m4
+
+$ACLOCAL -I m4
+$FGREP AM_SOME_MACRO aclocal.m4 && Exit 1
+$FGREP AM_MORE_MACRO aclocal.m4 && Exit 1
+$FGREP 'm4_include([m4/more.m4])' aclocal.m4
+test 1 = `grep m4_include aclocal.m4 | wc -l`
+
+:
diff --git a/t/acloca16.sh b/t/acloca16.sh
new file mode 100755
index 0000000..ab894c7
--- /dev/null
+++ b/t/acloca16.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal does not include definitions that are not actually
+# evaluated.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_SUBST([POM])
+END
+
+mkdir m4
+cat >m4/some.m4 <<'EOF'
+AC_DEFUN([AM_SOME_MACRO],
+[AC_DEFUN([AC_SUBST], [GREPME])])
+EOF
+
+$ACLOCAL -I m4
+grep m4/some.m4 aclocal.m4 && Exit 1
+
+:
diff --git a/t/acloca17.sh b/t/acloca17.sh
new file mode 100755
index 0000000..e6098f0
--- /dev/null
+++ b/t/acloca17.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal report unused required macros.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+SOME_DEFS
+END
+
+mkdir m4
+cat >m4/somedefs.m4 <<EOF
+AC_DEFUN([SOME_DEFS], [
+  AC_REQUIRE([UNDEFINED_MACRO])
+])
+EOF
+
+# FIXME: We want autom4te's 'undefined required macro' warning to be fatal,
+# but have no means to say so to aclocal.  We use WARNINGS=error instead.
+
+WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep '^configure\.ac:2:.*UNDEFINED_MACRO' stderr
+
+:
diff --git a/t/acloca18.sh b/t/acloca18.sh
new file mode 100755
index 0000000..c0510e1
--- /dev/null
+++ b/t/acloca18.sh
@@ -0,0 +1,137 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for --install with #serial numbers.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_MACRO1
+AM_MACRO2
+END
+
+mkdir 1 2 3 4 5 6
+
+cat >1/m1.m4 <<EOF
+#serial 1.8.1230.9
+AC_DEFUN([AM_MACRO1], [:macro11:])
+AC_DEFUN([AM_MACRO2], [:macro21:])
+EOF
+
+cat >2/m1.m4 <<EOF
+#serial 1.8.1231.9
+AC_DEFUN([AM_MACRO1], [:macro12:])
+EOF
+
+cat >3/m2.m4 <<EOF
+#serial 13
+AC_DEFUN([AM_MACRO2], [:macro23:])
+EOF
+
+cat >3/m1.m4 <<EOF
+#serial 1.8.1230.1
+AC_DEFUN([AM_MACRO1], [:macro13:])
+EOF
+
+cat >4/mumble.m4 <<EOF
+#serial 0
+AC_DEFUN([AM_MACRO1], [:macro14:])
+EOF
+
+cat >5/ill-formed.m4 <<EOF
+#serial bla
+#serial .2
+#serial
+AC_DEFUN([AM_MACRO1], [:macro15:])
+EOF
+
+cat >6/after-def.m4 <<EOF
+AC_DEFUN([AM_MACRO1], [:macro16:])
+#serial 1
+EOF
+
+clean_stale ()
+{
+  rm -rf aclocal.m4 configure autom4te*.cache
+}
+
+$ACLOCAL -I 1 -I 2 -I 3 -I 4
+$AUTOCONF
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+
+clean_stale
+$ACLOCAL  -I 1 -I 2 -I 3 -I 4 --install
+$AUTOCONF
+$FGREP ':macro12:' configure
+$FGREP ':macro23:' configure
+
+cp -f aclocal.m4 aclocal-m4.sav
+clean_stale
+mv -f aclocal-m4.sav aclocal.m4
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
+$AUTOCONF
+$FGREP ':macro12:' configure
+$FGREP ':macro23:' configure
+
+clean_stale
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
+$AUTOCONF
+$FGREP ':macro14:' configure
+$FGREP ':macro23:' configure
+
+clean_stale
+$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'macro.*AM_MACRO2.*not found' stderr
+
+clean_stale
+$ACLOCAL -I 4 -I 1 --install
+$AUTOCONF
+$FGREP ':macro14:' configure
+$FGREP ':macro21:' configure
+
+mkdir acdir
+ACLOCAL="$ACLOCAL --system-acdir acdir"
+
+cat >acdir/m1.m4 <<EOF
+#serial 456
+AC_DEFUN([AM_MACRO1], [:macro1d:])
+AC_DEFUN([AM_MACRO2], [:macro2d:])
+EOF
+clean_stale
+$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
+  cat stderr >&2
+  cat stdout
+  Exit 1
+}
+cat stderr >&2
+cat stdout
+grep '#serial 456' stdout
+test ! -f 4/m1.m4
+grep 'installing.*4/m1\.m4' stderr
+
+$ACLOCAL -I 5 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+test `grep -c 'ill-formed serial' stderr` -eq 3
+
+$ACLOCAL -I 6 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'serial.*before any macro definition' stderr
+
+:
diff --git a/t/acloca19.sh b/t/acloca19.sh
new file mode 100755
index 0000000..60e8afe
--- /dev/null
+++ b/t/acloca19.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal does not fail on configure.ac inclusions that do
+# more than just variable definitions.
+# Report from Peter Breitenlohner (PR/450).
+
+. ./defs || Exit 1
+
+cat >configure.ac <<'END'
+AC_INIT([acloca19], [1.0])
+m4_include([aconfig.ac])
+FOO
+AC_OUTPUT
+END
+
+cat >aconfig.ac <<'END'
+AM_INIT_AUTOMAKE
+AC_DEFUN([FOO], [echo GREPME])
+sinclude([bconfig.ac])
+END
+
+cat >bconfig.ac <<'END'
+AC_ARG_WITH([grepme], [string])
+END
+
+$ACLOCAL
+$AUTOCONF
+./configure >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep GREPME stdout
+grep 'aconfig\.ac' aclocal.m4 && Exit 1
+grep 'bconfig\.ac' aclocal.m4 && Exit 1
+grep with-grepme configure
+
+:
diff --git a/t/acloca20.sh b/t/acloca20.sh
new file mode 100755
index 0000000..0305066
--- /dev/null
+++ b/t/acloca20.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal does not write into symlinked aclocal.m4.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+echo 'm4_define([FOO], [wrong foo])' > foo.m4
+echo 'm4_define([FOO], [right foo])' > acinclude.m4
+echo 'AC_INIT FOO' > configure.ac
+
+chmod a-w foo.m4
+
+# Setup.
+ln -s foo.m4 aclocal.m4 && test -h aclocal.m4 \
+  || skip_ "cannot create symlinks to files"
+
+# Sanity check.
+grep 'wrong foo' aclocal.m4 \
+  || fatal_ "weird error symlinking aclocal.m4 -> foo.m4"
+
+$ACLOCAL
+$AUTOCONF
+grep 'right foo' configure
+grep 'wrong foo' foo.m4
+
+:
diff --git a/t/acloca21.sh b/t/acloca21.sh
new file mode 100755
index 0000000..d9b47af
--- /dev/null
+++ b/t/acloca21.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal ignores include() commands in comments.
+# Report from Mike Frysinger.
+# Also make sure aclocal does not think 'include' is
+# an Autoconf macro.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+dnl m4_include(__some_really_bogus_nonexistent_file__.m4)
+  # m4_include(__some_really_bogus_nonexistent_file__.m4)
+##  m4_include(__some_really_bogus_nonexistent_file__.m4)
+echo 'include(foobar)' is OK
+EOF
+$ACLOCAL
diff --git a/t/acloca22.sh b/t/acloca22.sh
new file mode 100755
index 0000000..85ef29b
--- /dev/null
+++ b/t/acloca22.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the "deleted header file" issue is fixed w.r.t. aclocal.m4
+# dependencies.  See also related the tests 'remake-deleted-m4-file.test'
+# and 'remake-renamed-m4-macro-and-file.test'.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+FOO
+AC_OUTPUT
+EOF
+cat >foo.m4 <<EOF
+AC_DEFUN([FOO], [AC_SUBST([GREPFOO])])
+EOF
+cat >bar.m4 <<EOF
+AC_DEFUN([BAR], [AC_SUBST([GREPBAR])])
+EOF
+cat >Makefile.am <<EOF
+ACLOCAL_AMFLAGS = -I .
+EOF
+
+$ACLOCAL -I .
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE
+grep GREPFOO Makefile
+grep GREPBAR Makefile && Exit 1
+
+sed 's/FOO/BAR/' < configure.ac > t
+mv -f t configure.ac
+rm -f foo.m4
+$MAKE
+grep GREPFOO Makefile && Exit 1
+grep GREPBAR Makefile
+
+:
diff --git a/t/acloca23.sh b/t/acloca23.sh
new file mode 100755
index 0000000..b5f66e4
--- /dev/null
+++ b/t/acloca23.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure we diagnose underquoted AC_DEFUN's.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+FOO
+END
+
+mkdir m4
+cat >m4/foo.m4 <<EOF
+AC_DEFUN(FOO, [echo foo])
+EOF
+
+$ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'underquoted definition.*FOO' stderr
+grep 'warning.*warning' stderr && Exit 1
+
+:
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
new file mode 100755
index 0000000..88caef6
--- /dev/null
+++ b/t/aclocal-acdir.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir'
+# options.  Also check that stuff in the automake acdir takes precedence
+# over stuff in the system acdir.
+
+. ./defs || Exit 1
+
+mkdir am sys
+
+cat >> configure.ac <<'END'
+MY_MACRO
+END
+
+cat > am/foo.m4 <<'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [fake--init--automake])
+END
+
+cat > sys/foo.m4 <<'END'
+AC_DEFUN([MY_MACRO], [my--macro])
+END
+
+$ACLOCAL --automake-acdir am
+$AUTOCONF --force
+$FGREP 'fake--init--automake' configure
+$FGREP 'MY_MACRO' configure
+
+rm -rf autom4te*.cache
+
+$ACLOCAL --system-acdir sys
+$AUTOCONF --force
+$FGREP 'am__api_version' configure
+$FGREP 'my--macro' configure
+
+rm -rf autom4te*.cache
+
+$ACLOCAL --automake-acdir am --system-acdir sys
+$AUTOCONF --force
+$FGREP 'fake--init--automake' configure
+$FGREP 'my--macro' configure
+
+rm -rf autom4te*.cache
+
+$ACLOCAL --system-acdir sys --automake-acdir am
+$AUTOCONF --force
+$FGREP 'fake--init--automake' configure
+$FGREP 'my--macro' configure
+
+rm -rf autom4te*.cache
+
+# Stuff in automake acdir takes precedence over stuff in system acdir.
+cat > am/bar.m4 <<'END'
+AC_DEFUN([MY_MACRO], [am--macro])
+END
+$ACLOCAL --automake-acdir am --system-acdir sys
+$AUTOCONF --force
+$FGREP 'fake--init--automake' configure
+$FGREP 'am--macro' configure
+$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
+
+rm -rf autom4te*.cache
+
+# Obsolescent '--acdir' option.
+$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep '.*--acdir.*deprecated' stderr
+
+rm -rf autom4te*.cache
+
+$ACLOCAL -Wno-obsolete --acdir am
+$AUTOCONF --force
+$FGREP 'fake--init--automake' configure
+$FGREP 'am--macro' configure
+
+rm -rf autom4te*.cache
+
+$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr
+
+:
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
new file mode 100755
index 0000000..b07f7fa
--- /dev/null
+++ b/t/aclocal-install-absdir.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure "aclocal --install" install files also in directories
+# passed to '-I' as absolute paths.  Now that we support the
+# ACLOCAL_PATH variable, it is clear that this is the right thing
+# to do.  See also automake bug#8407.
+
+. ./defs || Exit 1
+
+mkdir loc sys
+
+echo 'AM_DUMMY_MACRO' >> configure.ac
+echo 'AC_DEFUN([AM_DUMMY_MACRO], [:])' >> sys/foo.m4
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+env ACLOCAL_PATH="$cwd/sys" $ACLOCAL --verbose --install -I "$cwd/loc"
+diff sys/foo.m4 loc/foo.m4
+
+:
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
new file mode 100755
index 0000000..fae2997
--- /dev/null
+++ b/t/aclocal-install-fail.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that "aclocal --install" fails when it should.
+# FIXME: this is a good candidate for a conversion to TAP.
+
+am_create_testdir=empty
+required=ro-dir
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+MY_MACRO
+END
+
+mkdir sys-acdir
+cat > sys-acdir/my-defs.m4 <<END
+AC_DEFUN([MY_MACRO], [:])
+END
+
+ACLOCAL="$ACLOCAL -Wnone --system-acdir=sys-acdir"
+
+: > a-regular-file
+mkdir unwritable-dir
+chmod a-w unwritable-dir
+
+$ACLOCAL -I a-regular-file --install 2>stderr \
+  && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$EGREP '(mkdir:|directory ).*a-regular-file' stderr
+test ! -f aclocal.m4
+
+$ACLOCAL --install -I unwritable-dir/sub 2>stderr \
+  && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$EGREP '(mkdir:|directory ).*unwritable-dir/sub' stderr
+test ! -f aclocal.m4
+
+$ACLOCAL -I unwritable-dir --install 2>stderr \
+  && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$EGREP '(cp:|copy ).*unwritable-dir' stderr
+test ! -f aclocal.m4
+
+# Sanity check.
+mkdir m4
+$ACLOCAL -I m4 --install && test -f aclocal.m4 \
+  || fatal_ "aclocal failed also when expected to succeed"
+
+:
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
new file mode 100755
index 0000000..ba4be2a
--- /dev/null
+++ b/t/aclocal-install-mkdir.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that "aclocal --install" creates the local m4 directory if
+# necessary.
+# FIXME: this is a good candidate for a conversion to TAP.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+MY_MACRO
+END
+
+mkdir sys-acdir
+cat > sys-acdir/my-defs.m4 <<END
+AC_DEFUN([MY_MACRO], [:])
+END
+
+ACLOCAL="$ACLOCAL --system-acdir=sys-acdir"
+
+$ACLOCAL -I foo --install
+test -f foo/my-defs.m4
+
+$ACLOCAL --install -I "`pwd`/bar"
+test -f bar/my-defs.m4
+
+$ACLOCAL --install -I baz/sub/sub2
+test -f baz/sub/sub2/my-defs.m4
+
+# What should happen:
+#  * zardoz1 should be created, and required m4 files copied into there.
+#  * zardoz2 shouldn't be preferred to quux, even if the former exists
+#    while the latter does not.
+mkdir zardoz2
+$ACLOCAL --install -I zardoz1 -I zardoz2
+test -d zardoz1
+grep MY_MACRO zardoz1/my-defs.m4
+ls zardoz2 | grep . && Exit 1
+
+# Directories in ACLOCAL_PATH should never be created if they don't
+# exist.
+ACLOCAL_PATH="`pwd`/none:`pwd`/none2" $ACLOCAL --install && Exit 1
+test ! -d none
+test ! -d none2
+ACLOCAL_PATH="`pwd`/none:`pwd`/none2" $ACLOCAL --install -I x
+test -f x/my-defs.m4
+test ! -d none
+test ! -d none2
+
+# It's better if aclocal doesn't create the first include dir on failure.
+$ACLOCAL --install -I none -I none2 && Exit 1
+test ! -d none
+test ! -d none2
+
+:
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
new file mode 100755
index 0000000..3e685f0
--- /dev/null
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that aclocal does not create a non-existent local m4 directory
+# if the '--install' option is not given.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+MY_MACRO
+END
+
+mkdir sys-acdir
+cat > sys-acdir/my-defs.m4 <<END
+AC_DEFUN([MY_MACRO], [:])
+END
+
+$ACLOCAL -I foo --system-acdir=sys-acdir && Exit 1
+test ! -d foo
+test ! -r foo
+
+:
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
new file mode 100755
index 0000000..8a2b22c
--- /dev/null
+++ b/t/aclocal-path-install-serial.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ACLOCAL_PATH, acdir and '--install' interactions when serial number
+# are involved.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_FOO
+END
+
+set_serial ()
+{
+  serial=$1 file=$2
+  sed '/^# serial/d' $file > t
+  case $serial in
+    none) mv -f t $file;;
+       *) (echo "# serial $serial" && cat t) > $file; rm -f t;;
+  esac
+  cat $file # For debugging.
+}
+
+win ()
+{
+  case $1 in
+    sdir) ok=sdir ko=pdir;;
+    pdir) ok=pdir ko=sdir;;
+       *) fatal_ "win(): invalid argument '$1'";;
+  esac
+  # This is required on fast machine, to avoid caching and timestamp
+  # issues with the autotools (already happened in practice).
+  rm -rf configure aclocal.m4 autom4te*.cache m4/*
+  $ACLOCAL -I m4 --install
+  test -f m4/foo.m4 # Sanity check.
+  $AUTOCONF
+  $FGREP "::$ok:"  m4/foo.m4
+  $FGREP "::$ok::" configure
+  $FGREP "::$ko::" m4/foo.m4 configure && Exit 1
+  :
+}
+
+mkdir sdir pdir m4
+
+ACLOCAL="$ACLOCAL --system-acdir=`pwd`/sdir"
+ACLOCAL_PATH=./pdir; export ACLOCAL_PATH
+
+cat > sdir/foo.m4 << 'END'
+AC_DEFUN([AM_FOO], [::sdir::])
+END
+cat > pdir/foo.m4 << 'END'
+AC_DEFUN([AM_FOO], [::pdir::])
+END
+
+set_serial 2 sdir/foo.m4
+set_serial 1 pdir/foo.m4
+win sdir
+
+set_serial 3.3 sdir/foo.m4
+set_serial 5.7 pdir/foo.m4
+win pdir
+
+set_serial 0    sdir/foo.m4
+set_serial none pdir/foo.m4
+win sdir
+
+set_serial none  sdir/foo.m4
+set_serial 1.2.3 pdir/foo.m4
+win pdir
+
+:
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
new file mode 100755
index 0000000..a9a8b97
--- /dev/null
+++ b/t/aclocal-path-install.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# ACLOCAL_PATH and '--install' interactions.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_FOO
+END
+
+mkdir acdir pdir ldir
+
+ACLOCAL="$ACLOCAL --system-acdir=`pwd`/acdir"
+ACLOCAL_PATH=./pdir; export ACLOCAL_PATH
+
+cat > acdir/foo.m4 << 'END'
+AC_DEFUN([AM_FOO], [:])
+END
+
+cat > pdir/bar.m4 << 'END'
+AC_DEFUN([AM_BAR], [:])
+END
+
+# The '--install' option should never cause anything to be installed
+# in a directory specified in ACLOCAL_PATH.
+$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep ' no -I was supplied' stderr
+test ! -f pdir/foo.m4
+
+# The '--install' option should cause a required macro found in a
+# directory specified in ACLOCAL_PATH to be installed locally.
+echo AM_BAR >> configure.ac
+$ACLOCAL --install -I ldir
+diff pdir/bar.m4 ldir/bar.m4
+
+:
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
new file mode 100755
index 0000000..8c42ddc
--- /dev/null
+++ b/t/aclocal-path-nonexistent.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Non-existent directories in ACLOCAL_PATH are ok.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_FOO
+END
+
+mkdir mdir
+echo 'AC_DEFUN([AM_FOO], [am--foo])' > mdir/foo.m4
+
+ACLOCAL_PATH=./nonesuch:./mdir:`pwd`/nonesuch2:nonesuch3 $ACLOCAL
+$AUTOCONF
+$FGREP 'am--foo' configure
+
+:
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
new file mode 100755
index 0000000..91d9a42
--- /dev/null
+++ b/t/aclocal-path-precedence.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check precedence rules for ACLOCAL_PATH.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([foo], [1.0])
+AM_INIT_AUTOMAKE([parallel-tests])
+FOO_MACRO
+BAR_MACRO
+AC_PROG_LIBTOOL
+AM_GNU_GETTEXT
+END
+
+mkdir mdir1 mdir2 mdir3 sysdir extradir
+
+cat > mdir1/foo1.m4 << 'END'
+AC_DEFUN([FOO_MACRO], [::pass-foo::])
+END
+
+cat > mdir2/foo2.m4 << 'END'
+AC_DEFUN([FOO_MACRO], [::fail-foo::])
+END
+
+cat > mdir1/baz.m4 << 'END'
+AC_DEFUN([BAR_MACRO], [::fail-bar::])
+END
+
+cat > mdir3/bar.m4 << 'END'
+AC_DEFUN([BAR_MACRO], [::pass-bar::])
+END
+
+cat > mdir2/quux.m4 << 'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [::fail-init::])
+AC_DEFUN([AC_PROG_LIBTOOL],  [::pass-libtool::])
+AC_DEFUN([AM_GNU_GETTEXT],   [::pass-gettext::])
+END
+
+cat > sysdir/libtool.m4 << 'END'
+AC_DEFUN([AC_PROG_LIBTOOL], [::fail-libtool::])
+END
+
+cat > extradir/gettext.m4 << 'END'
+AC_DEFUN([AM_GNU_GETTEXT], [::fail-gettext::])
+END
+
+echo ./extradir > sysdir/dirlist
+
+ACLOCAL_PATH=mdir1:mdir2 $ACLOCAL -I mdir3 --system-acdir sysdir
+$AUTOCONF
+
+$FGREP '::' configure # For debugging.
+
+# Directories coming first in ACLOCAL_PATH should take precedence
+# over those coming later.
+$FGREP '::pass-foo::' configure
+
+# Directories from '-I' options should take precedence over directories
+# in ACLOCAL_PATH.
+$FGREP '::pass-bar::' configure
+
+# Directories in ACLOCAL_PATH should take precedence over system acdir
+# (typically '${prefix}/share/aclocal'), and any directory added through
+# the 'dirlist' special file.
+$FGREP '::pass-gettext::' configure
+$FGREP '::pass-libtool::' configure
+
+# Directories in ACLOCAL_PATH shouldn't take precedence over the internal
+# automake acdir (typically '${prefix}/share/aclocal-${APIVERSION}').
+$FGREP 'am__api_version' configure
+
+# A final sanity check.
+$FGREP '::fail' configure && Exit 1
+
+:
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
new file mode 100755
index 0000000..d1279f0
--- /dev/null
+++ b/t/aclocal-path.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check basic ACLOCAL_PATH support.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_FOO_MACRO
+AM_BAR_MACRO
+AM_BAZ_MACRO
+END
+
+mkdir mdir1 mdir2 mdir3
+
+cat > mdir1/foo.m4 << 'END'
+AC_DEFUN([AM_FOO_MACRO], [am--foo])
+END
+
+cat > mdir2/bar.m4 << 'END'
+AC_DEFUN([AM_BAR_MACRO], [am--bar])
+END
+
+cat > mdir3/baz.m4 << 'END'
+AC_DEFUN([AM_BAZ_MACRO], [am--baz])
+END
+
+ACLOCAL_PATH=mdir1:./mdir2:`pwd`/mdir3 $ACLOCAL
+$AUTOCONF
+
+# there should be no m4_include in aclocal.m4, even though ACLOCAL_PATH
+# contains 'mdir1' and './mdir2' as relative directories.  Only -I
+# directories should be subject to file inclusion.
+$FGREP m4_include aclocal.m4 && Exit 1
+
+$EGREP 'AM_(FOO|BAR|BAZ)_MACRO' configure && Exit 1
+$FGREP 'am--foo' configure
+$FGREP 'am--bar' configure
+$FGREP 'am--baz' configure
+
+:
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
new file mode 100755
index 0000000..3d8bf4e
--- /dev/null
+++ b/t/aclocal-print-acdir.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on aclocal's '--print-ac-dir' option.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+$ACLOCAL --print-ac-dir
+test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir"
+
+$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir
+test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo
+
+$ACLOCAL --system-acdir /bar --print-ac-dir
+test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar
+
+$ACLOCAL --automake-acdir /bar --print-ac-dir
+test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$am_system_acdir"
+
+:
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
new file mode 100755
index 0000000..099fff4
--- /dev/null
+++ b/t/aclocal-verbose-install.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check verbose messages by `aclocal --install'.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+MY_MACRO_BAR
+MY_MACRO_QUUX
+END
+
+mkdir sys-acdir
+cat > sys-acdir/bar.m4 <<END
+AC_DEFUN([MY_MACRO_BAR], [:])
+END
+cat > sys-acdir/quux.m4 <<END
+AC_DEFUN([MY_MACRO_QUUX], [:])
+END
+
+mkdir foodir
+: > foodir/bar.m4
+
+$ACLOCAL --system-acdir=sys-acdir --install --verbose -I foodir 2>stderr \
+ || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep ' installing .*sys-acdir/bar\.m4.* to .*foodir/bar\.m4' stderr
+grep ' installing .*sys-acdir/quux\.m4.* to .*foodir/quux\.m4' stderr
+grep ' overwriting .*foodir/bar\.m4.* with .*sys-acdir/bar\.m4' stderr
+grep ' installing .*foodir/quux\.m4.* from .*sys-acdir/quux\.m4' stderr
+
+# Sanity checks.
+ls -l foodir
+grep MY_MACRO_BAR foodir/bar.m4
+grep MY_MACRO_QUUX foodir/quux.m4
+
+:
diff --git a/t/aclocal.sh b/t/aclocal.sh
new file mode 100755
index 0000000..4030b13
--- /dev/null
+++ b/t/aclocal.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on some aclocal options.  Report from Alexandre Oliva.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+echo "AC_INIT([$me], [0]) AM_INIT_AUTOMAKE" > configure.ac
+
+$ACLOCAL --output=fred
+test -f fred
+
+$ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'option.*--output.*requires an argument' stderr
+grep '[Tt]ry.*--help.*for more information' stderr
+
+$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'unrecognized option.*--unknown-option' stderr
+grep '[Tt]ry.*--help.*for more information' stderr
+
+$ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'unrecognized option.*--ver' stderr
+grep '[Tt]ry.*--help.*for more information' stderr
+
+$ACLOCAL --versi
+
+:
diff --git a/t/aclocal3.sh b/t/aclocal3.sh
new file mode 100755
index 0000000..b2d2ab9
--- /dev/null
+++ b/t/aclocal3.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure include of include detects missing macros
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_INIT([$me], [1.0])
+GNOME_X_CHECKS
+END
+
+mkdir macros
+
+cat > macros/gnome.m4 << 'END'
+AC_DEFUN([GNOME_X_CHECKS], [
+# Use a macro that cannot be installed in a third-party system-wide m4
+# file; otherwise, this test might fail under "make installcheck".
+       AM__PATH__GTK(0.99.5,,AC_MSG_ERROR(GTK not installed, or gtk-config not 
in path))
+])
+END
+
+$ACLOCAL -I macros 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr
+grep '^macros/gnome\.m4:4:.*AM__PATH__GTK.*not found' stderr
+
+:
diff --git a/t/aclocal4.sh b/t/aclocal4.sh
new file mode 100755
index 0000000..bc80f64
--- /dev/null
+++ b/t/aclocal4.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure dependencies on aclocal.m4 are set correctly.
+# Report from Jim Meyering.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_RANLIB
+AM_PROG_AR
+AC_PROG_CC
+MY_MACRO
+AC_CONFIG_FILES([lib/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir m4
+cat >m4/mymacro.m4 <<EOF
+AC_DEFUN([MY_MACRO], [])
+EOF
+
+mkdir lib
+: > lib/foo.c
+: > lib/bar.c
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = liberi.a
+liberi_a_SOURCES = bar.c
+liberi_a_LIBADD = $(LIBOBJS)
+EOF
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib
+EXTRA_DIST = m4/mymacro.m4
+ACLOCAL_AMFLAGS = -I m4
+check-foo: distdir
+       test -f $(distdir)/lib/foo.c
+       test -f $(distdir)/lib/bar.c
+
+check-not-foo: distdir
+       test ! -f $(distdir)/lib/foo.c
+       test -f $(distdir)/lib/bar.c
+EOF
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE check-not-foo
+
+# Update one of the macros.  This should cause ./configure, Makefile.in,
+# Makefile, lib/Makefile.in, and lib/Makefile to be updated.
+
+cat >m4/mymacro.m4 <<'EOF'
+AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
+EOF
+
+using_gmake || $MAKE
+$MAKE check-foo
+
+:
diff --git a/t/aclocal5.sh b/t/aclocal5.sh
new file mode 100755
index 0000000..23a7e5e
--- /dev/null
+++ b/t/aclocal5.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that aclocal.m4's dependencies are honored in
+# sub-directories.  See also related tests 'remake-subdir*.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_TEST([GREPME])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+ACLOCAL_AMFLAGS = -I m4
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+mkdir m4
+echo 'AC_DEFUN([AM_TEST], [echo address@hidden)' > m4/moredefs.m4
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+./configure
+$MAKE
+
+# Update an aclocal.m4 dependency, then make sure all Makefiles are
+# updated, even from a sub-directory.  Check that AU_ALIAS is
+# recognized. Change the definition of AM_TEST to check that its new
+# definition is used.
+$sleep # Modified configure dependencies must be newer than config.status.
+echo 'AU_ALIAS([AM_TEST], [AC_SUBST])' > m4/moredefs.m4
+cd sub
+$MAKE
+cd ..
+grep GREPME Makefile
+grep GREPME sub/Makefile
+
+# Make sure configure dependencies are distributed.
+$MAKE distdir
+test -f $me-1.0/m4/moredefs.m4
+
+# Change the definition of AM_TEST to check that its new definition is
+# used.  Check that AC_DEFUN_ONCE is caught.
+$sleep # Modified configure dependencies must be newer than config.status.
+echo 'AC_DEFUN_ONCE([AM_TEST], [AC_SUBST(__$1__)])' > m4/moredefs.m4
+$MAKE
+grep 'm4/moredefs\.m4' aclocal.m4
+grep '__GREPME__' configure
+
+:
diff --git a/t/aclocal6.sh b/t/aclocal6.sh
new file mode 100755
index 0000000..8923851
--- /dev/null
+++ b/t/aclocal6.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal.m4 is rebuilt whenever a configure
+# dependency changes.  Test for acinclude.m4 and VPATH too.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+SOME_DEFS
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+ACLOCAL_AMFLAGS = -I m4
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+mkdir m4
+echo 'AC_DEFUN([SOME_DEFS], [])' > m4/somedefs.m4
+echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+mkdir build
+cd build
+
+../configure
+$MAKE
+
+# Modified configure dependencies must be newer than config.status.
+$sleep
+# Update an aclocal.m4 dependency, then make sure all Makefiles
+# are updated, even from a sub-directory.
+echo 'AC_DEFUN([SOME_DEFS], [MORE_DEFS])' > ../m4/somedefs.m4
+# Because aclocal will run again, it should also pick up acinclude.m4.
+echo 'AC_SUBST([METOO])' > ../acinclude.m4
+
+cd sub
+$MAKE
+cd ..
+grep GREPME Makefile
+grep GREPME sub/Makefile
+grep GREPME sub/Makefile
+grep METOO Makefile
+grep METOO sub/Makefile
+grep METOO sub/Makefile
+
+# Make sure configure dependencies are distributed.
+$MAKE distdir
+test -f $me-1.0/m4/moredefs.m4
+test -f $me-1.0/m4/somedefs.m4
+test -f $me-1.0/acinclude.m4
+
+:
diff --git a/t/aclocal7.sh b/t/aclocal7.sh
new file mode 100755
index 0000000..548d890
--- /dev/null
+++ b/t/aclocal7.sh
@@ -0,0 +1,116 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal does not overwrite aclocal.m4 needlessly.
+# Also make sure automake --no-force does not overwrite Makefile.in needlessly.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+SOME_DEFS
+AC_CONFIG_FILES([sub/Makefile])
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+cat >> Makefile.am << 'END'
+SUBDIRS = sub
+include fragment.inc
+END
+
+: > fragment.inc
+
+mkdir m4
+echo 'AC_DEFUN([SOME_DEFS], [])' > m4/somedefs.m4
+
+$sleep
+
+$ACLOCAL -I m4
+
+# Automake will take aclocal.m4 to be newer if it has the same timestamp
+# as Makefile.in.  Avoid the confusing by sleeping.
+$sleep
+
+$AUTOMAKE --no-force
+
+$sleep
+
+touch foo
+$ACLOCAL -I m4
+$AUTOMAKE --no-force
+
+# aclocal.m4 and Makefile.in should not have been updated, so 'foo'
+# should be younger
+test `ls -1t aclocal.m4 Makefile.in sub/Makefile.in foo | sed 1q` = foo
+
+$sleep
+$ACLOCAL -I m4 --force
+test `ls -1t aclocal.m4 foo | sed 1q` = aclocal.m4
+# We still use --no-force for automake, but since aclocal.m4 has
+# changed all Makefile.ins should be updated.
+$sleep
+$AUTOMAKE --no-force
+test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
+test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
+
+touch m4/somedefs.m4
+$sleep
+touch foo
+$sleep
+$ACLOCAL -I m4
+$sleep
+$AUTOMAKE --no-force
+
+# aclocal.m4 should have been updated, although its contents haven't changed.
+test `ls -1t aclocal.m4 foo | sed 1q` = aclocal.m4
+test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
+test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
+
+touch fragment.inc
+$sleep
+touch foo
+$sleep
+$ACLOCAL -I m4
+$AUTOMAKE --no-force
+# Only ./Makefile.in should change.
+test `ls -1t aclocal.m4 foo | sed 1q` = foo
+test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
+test `ls -1t sub/Makefile.in foo | sed 1q` = foo
+
+grep README Makefile.in && Exit 1
+
+: > README
+$sleep
+touch foo
+$sleep
+$AUTOMAKE --no-force
+# Even if no dependency change, the content changed.
+test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
+test `ls -1t sub/Makefile.in foo | sed 1q` = foo
+
+grep README Makefile.in
+
+: > sub/Makefile.in
+$sleep
+touch foo
+$sleep
+$ACLOCAL -I m4
+$AUTOMAKE --no-force
+# Only sub/Makefile.in should change.
+test `ls -1t aclocal.m4 foo | sed 1q` = foo
+test `ls -1t Makefile.in foo | sed 1q` = foo
+test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
diff --git a/t/aclocal8.sh b/t/aclocal8.sh
new file mode 100755
index 0000000..8df0835
--- /dev/null
+++ b/t/aclocal8.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal does not require unused macros.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+SOME_DEFS
+END
+
+mkdir m4
+cat >m4/somedefs.m4 <<EOF
+AC_DEFUN([SOME_DEFS], [
+  m4_if([a], [a], [MACRO1], [MACRO2])
+])
+EOF
+
+echo 'AC_DEFUN([MACRO1],)' >m4/macro1.m4
+echo 'AC_DEFUN([MACRO2], [AC_REQUIRE([AM_UNUSED_MACRO])])' >m4/macro2.m4
+
+$ACLOCAL -I m4 >output 2>&1 || { cat output; Exit 1; }
+test 0 = `wc -l <output`
+grep macro1.m4 aclocal.m4
+grep macro2.m4 aclocal.m4 && Exit 1
+
+:
diff --git a/t/aclocal9.sh b/t/aclocal9.sh
new file mode 100755
index 0000000..c7ce751
--- /dev/null
+++ b/t/aclocal9.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal define macros in the same order as -I's.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+MACRO1
+MACRO2
+END
+
+mkdir m4_1 m4_2
+
+cat >m4_1/somedefs.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro11:])
+AC_DEFUN([MACRO2], [:macro21:])
+EOF
+
+cat >m4_2/somedefs.m4 <<EOF
+AC_DEFUN([MACRO1], [:macro12:])
+EOF
+
+$ACLOCAL -I m4_1 -I m4_2
+$AUTOCONF
+$FGREP ':macro11:' configure
+$FGREP ':macro21:' configure
+
+$ACLOCAL --force -I m4_2 -I m4_1
+$AUTOCONF --force
+$FGREP ':macro12:' configure
+$FGREP ':macro21:' configure
+
+:
diff --git a/t/acsilent.sh b/t/acsilent.sh
new file mode 100755
index 0000000..0f9c1cb
--- /dev/null
+++ b/t/acsilent.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure there are no spurious acinclude warnings.
+
+. ./defs || Exit 1
+
+cat >configure.ac <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+EOF
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+END
+
+$ACLOCAL >output 2>&1 || { cat output; Exit 1; }
+cat output
+test ! -s output
diff --git a/t/acsubst.sh b/t/acsubst.sh
new file mode 100755
index 0000000..9390944
--- /dev/null
+++ b/t/acsubst.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST([FOOBAR_LDFLAGS],[blablabla])
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = mumble
+mumble_SOURCES = a.c b.c d.h
+mumble_LDFLAGS = $(FOOBAR_LDFLAGS)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
new file mode 100755
index 0000000..e8c8663
--- /dev/null
+++ b/t/acsubst2.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_SUBST([FOOBAR_CFLAGS],[blablabla])
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = mumble
+mumble_SOURCES = a.c b.c d.h
+mumble_CFLAGS = $(FOOBAR_CFLAGS)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
diff --git a/t/add-missing.tap b/t/add-missing.tap
new file mode 100755
index 0000000..39b7ae7
--- /dev/null
+++ b/t/add-missing.tap
@@ -0,0 +1,391 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake complains when required auxiliary files are not
+# found, and that 'automake --add-missing' installs the files (and only
+# the files) it's supposed to, and that these files are symlinked by
+# default, but copied if the '--copy' option is used.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+plan_ "later"
+
+build_aux=build-aux
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+# Try to improve readability of displayed diffs.
+if diff -u /dev/null /dev/null; then
+  am_diff='diff -u'
+elif diff -c /dev/null /dev/null; then
+  am_diff='diff -c'
+else
+  am_diff=diff
+fi
+
+# MinGW/MSYS lacks real symlinks, so we'll have to skip some checks
+# on that system.  More details below.
+echo dummy > foo
+if ln -s foo bar && test -h bar; then
+  have_true_symlinks=yes
+else
+  have_true_symlinks=no
+fi
+rm -f foo bar
+
+cat > configure.stub << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([$build_aux])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+# Pre-compute aclocal.m4, in order to save several aclocal invocations.
+cat configure.stub - > configure.ac <<'END'
+AC_PROG_CC
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AC_CANONICAL_SYSTEM
+AM_PATH_LISPDIR
+AM_PATH_PYTHON
+END
+$ACLOCAL || framework_failure_ "cannot pre-compute aclocal.m4"
+
+rm -rf configure.ac autom4te*.cache
+mv aclocal.m4 aclocal.stub
+
+# For debugging.
+cat configure.stub
+cat aclocal.stub
+
+check_count=0
+
+# This is hacky and ugly and complex, but allow us to organize our tests
+# below in a more "declarative fashion".  All in all, a good trade-off.
+check_ ()
+{
+  set +x # Temporary disable shell traces to remove noise from log files.
+  incr_ check_count
+  echo check count: $check_count
+  override=no
+  run_aclocal=no
+  fetch_file=
+  while test $# -gt 0; do
+    case $1 in
+      --override) override=yes;;
+      --run-aclocal) run_aclocal=yes;;
+      --fetch-file) fetch_file=$2; shift;;
+      *) framework_failure_ "check_: invalid argument '$1'";;
+    esac
+    shift
+  done
+  mkdir testdir-$check_count
+  cd testdir-$check_count
+  # Directory for common data files (specific to the current test, but
+  # shared by its "subtests").
+  mkdir generic
+  cd generic
+  # Use 'echo > ...', not ': > ...', here and below, as Solaris 10 /bin/sh
+  # might not execute the latter (the Autoconf manual gives more details).
+  echo > Makefile.am
+  if test $override = yes; then
+    echo > configure.ac
+  else
+    cp "$ocwd"/configure.stub configure.ac
+  fi
+  test -z "$fetch_file" || cp "$ocwd/$fetch_file" .
+  # Read description of "test scenario" from standard input.
+  what= line= name= files=
+  while read line; do
+    case $line in
+      '== Name ==') what=NAME;;
+      '== Makefile.am ==') what=Makefile.am;;
+      '== configure.ac ==') what=configure.ac;;
+      '== Files ==') what=LIST;;
+      '==*') framework_failure_ "invalid input line: $line";;
+      ''|'#%'*) : Empty line or ad-hoc comment, ignore. ;;
+      *)
+        if test $what = LIST; then
+          files="$files $line"
+        elif test $what = NAME; then
+          name=$line
+        else
+          printf '%s\n' "$line" >> "$what"
+        fi
+        ;;
+    esac
+  done
+  test -n "$name" || fatal_ "name of a test case not specified"
+  if test $run_aclocal = yes; then
+    if $ACLOCAL; then
+      ok_ "[$name] aclocal.m4 rebuilt"
+      echo == aclocal.m4 ==
+      cat aclocal.m4
+    else
+      not_ok_ "[$name] aclocal failure, aclocal.m4 not rebuilt"
+    fi
+  else
+    cp "$ocwd"/aclocal.stub aclocal.m4
+  fi
+  echo == Makefile.am ==
+  cat Makefile.am
+  echo == configure.ac ==
+  cat configure.ac
+  echo Expected files: $files
+  mkdir "$build_aux"
+  cd ..
+  # End of "test scenario" setup.
+  set -x # Re-enable shell traces.
+  pwd
+  ls -l generic
+  # Test once with '--copy', once without.
+  for action in link copy; do
+    case $action in
+      link) opts='--add-missing';;
+      copy) opts='-a --copy';;
+         *) fatal_ "invalid value '$action' for \$action";;
+    esac
+    pfx="[$action $name]"
+    cp -R generic $action
+    cd $action
+    # If the required auxiliary files are missing, and automake is
+    # not told to install them, it should complain and error out,
+    # and also give a useful suggestion.
+    AUTOMAKE_fails -d "$pfx missing files, automake fails"
+    for f in $files; do
+      command_ok_ \
+        "$pfx warn about missing file $f" \
+        grep "required file ['\`]$build_aux/$f' not found" stderr
+      # Suggest the user to use '--add-missing'.
+      command_ok_ \
+        "$pfx suggest --add-missing for $f" \
+        grep ".*--add-missing.* install .*$f" stderr
+    done
+    # No files should be automatically installed by automake if it
+    # is not told to.
+    if ls "$build_aux" | grep .; then r='not ok'; else r=ok; fi
+    result_ "$r" "$pfx no extra files installed"
+    AUTOMAKE_run -d "$pfx automake run successfully" -- $opts
+    ls -l . $build_aux
+    # The expected files should get installed correctly (e.g., no
+    # broken symlinks).
+    for f in $files; do
+      command_ok_ \
+        "$pfx file $f installed" \
+        test -f $build_aux/$f
+    done
+    # Automake should inform about which files it's installing.
+    for f in $files; do
+      command_ok_ \
+        "$pfx report installation of $f" \
+        grep ": installing ['\`]$build_aux/$f'$" stderr
+    done
+    # Only the expected files should be installed.  But automake always
+    # require 'missing' and 'install-sh', so account for them.
+    all_files="install-sh missing $files"
+    for f in $all_files; do echo $f; done | sort | uniq > files.exp
+    (cd $build_aux && ls) | sort > files.got
+    cat files.exp
+    cat files.got
+    command_ok_ \
+      "$pfx all and only expected files installed" \
+      $am_diff files.exp files.got
+    # The files should be copied by '--copy' and symlinked otherwise.
+    # But these checks make no sense on systems like MSYS/MinGW where
+    # there are no true symlinks ('ln -s' behaves like 'cp -p'), so be
+    # ready to skip the checks in that case.  See automake bug#10441.
+    for f in $files; do
+      if test $have_true_symlinks = no; then
+        skip_ -r "system lacks true symlinks" "$pfx $f is a symlink or not"
+      else
+        if test -h $build_aux/$f; then
+          is_symlink=yes
+        else
+          is_symlink=no
+        fi
+        case $action,$is_symlink in
+          link,yes)     ok_ "$pfx $f has been symlinked"     ;;
+           link,no) not_ok_ "$pfx $f has not been symlinked" ;;
+          copy,yes) not_ok_ "$pfx $f has been symlinked"     ;;
+           copy,no)     ok_ "$pfx $f has not been symlinked" ;;
+                 *)  fatal_ "invalid condition in case"      ;;
+        esac
+      fi
+    done
+    # Now that the required auxiliary files have been installed, automake
+    # should not complain anymore even if the '--add-missing' option is
+    # not used.
+    AUTOMAKE_run -d "$pfx automake finds all added files"
+    cd ..
+  done # for action in link copy
+  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
+}
+
+# Automake should always and unconditionally require the 'missing'
+# and 'install-sh' scripts.
+check_ <<'END'
+== Name ==
+minimal
+== Files ==
+install-sh missing
+END
+
+check_ <<'END'
+== Name ==
+depcomp/C
+== Files ==
+depcomp
+== configure.ac ==
+AC_PROG_CC
+== Makefile.am ==
+bin_PROGRAMS = foo
+END
+
+check_ <<'END'
+== Name ==
+depcomp/C++
+== Files ==
+depcomp
+== configure.ac ==
+AC_PROG_CXX
+== Makefile.am ==
+bin_PROGRAMS = foo
+foo_SOURCES = foo.cc
+END
+
+check_ --run-aclocal <<'END'
+== Name ==
+compile
+== Files ==
+compile
+== configure.ac ==
+# Using AM_PROG_CC_C_O in configure.ac should be enough.  No need to
+# use AC_PROG_CC too, nor to define xxx_PROGRAMS in Makefile.am.
+AM_PROG_CC_C_O
+END
+
+# For config.guess and config.sub.
+for mach in build host target system; do
+  MACH=`echo "$mach" | LC_ALL=C tr '[a-z]' '[A-Z]'`
+  check_ <<END
+== Name ==
+cfg-$mach
+== Files ==
+config.sub
+config.guess
+== configure.ac ==
+AC_CANONICAL_$MACH
+END
+done
+
+check_ <<'END'
+== Name ==
+ylwrap/Lex
+== Files ==
+ylwrap
+== configure.ac ==
+AC_PROG_CC
+AC_PROG_LEX
+== Makefile.am ==
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo
+foo_SOURCES = foo.l
+END
+
+check_ <<'END'
+== Name ==
+ylwrap/Yacc
+== Files ==
+ylwrap
+== configure.ac ==
+AC_PROG_CC
+AC_PROG_YACC
+== Makefile.am ==
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+END
+
+echo '@setfilename foo.info' > foo.texi
+check_ --fetch-file foo.texi <<'END'
+== Name ==
+Texinfo
+== Files ==
+texinfo.tex
+== Makefile.am ==
+info_TEXINFOS = foo.texi
+END
+
+echo '@include version.texi' >> foo.texi
+check_ --fetch-file foo.texi <<'END'
+== Name ==
+Texinfo/mdate-sh
+== Files ==
+mdate-sh
+texinfo.tex
+== Makefile.am ==
+info_TEXINFOS = foo.texi
+END
+
+rm -f foo.texi
+
+check_ <<'END'
+== Name ==
+elisp-comp
+== Files ==
+elisp-comp
+== configure.ac ==
+AM_PATH_LISPDIR
+== Makefile.am ==
+lisp_LISP = foo.el
+END
+
+check_ <<'END'
+== Name ==
+py-compile
+== Files ==
+py-compile
+== configure.ac ==
+AM_PATH_PYTHON
+== Makefile.am ==
+python_PYTHON = foo.py
+END
+
+# Try few unrelated auxiliary scripts together.
+check_ <<'END'
+== Name ==
+misc
+== Files ==
+py-compile
+depcomp
+ylwrap
+config.sub
+config.guess
+== configure.ac ==
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_PROG_CXX
+== Makefile.am ==
+PYTHON = python
+pythondir = $(prefix)/py
+YACC = bison -y
+bin_PROGRAMS = foo
+foo_SOURCES = bar.yxx baz.c++
+python_PYTHON = zardoz.py
+END
+
+:
diff --git a/t/all.sh b/t/all.sh
new file mode 100755
index 0000000..0baf9da
--- /dev/null
+++ b/t/all.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure several *-local's in a single rule work.
+
+. ./defs || Exit 1
+
+targets='all install-exec install-data uninstall'
+echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am
+cat Makefile.am # For debugging.
+
+$ACLOCAL
+$AUTOMAKE
+
+for target in $targets; do
+  grep "${target}-local" Makefile.in # For debugging.
+  grep "${target}-am:.*${target}-local" Makefile.in
+done
+
+:
diff --git a/t/all2.sh b/t/all2.sh
new file mode 100755
index 0000000..da22e68
--- /dev/null
+++ b/t/all2.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure all-local and other -local targets work correctly.
+
+. ./defs || Exit 1
+
+$ACLOCAL
+
+targets='all install-exec install-data uninstall'
+for target in $targets; do
+  : Doing $target
+  echo "${target}-local:" > Makefile.am
+  $AUTOMAKE
+  grep "${target}-local ${target}-local" Makefile.in && Exit 1
+  grep "${target}-am:.*${target}-local" Makefile.in
+done
+
+:
diff --git a/t/alloca.sh b/t/alloca.sh
new file mode 100755
index 0000000..c87904b
--- /dev/null
+++ b/t/alloca.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we complain if @ALLOCA@ is used without being set in configure.ac
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AM_PROG_AR
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @ALLOCA@
+END
+
+: > alloca.c
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:1:.*define .*RANLIB.* add .*AC_PROG_RANLIB' stderr
+grep '^Makefile\.am:3:.*define .*ALLOCA.* add .*AC_FUNC_ALLOCA' stderr
+
+:
diff --git a/t/alloca2.sh b/t/alloca2.sh
new file mode 100755
index 0000000..08fad97
--- /dev/null
+++ b/t/alloca2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we complain if @LTALLOCA@ is used without being set in configure.ac
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = libtu.la
+libtu_la_SOURCES =
+libtu_la_LIBADD = @LTALLOCA@
+END
+
+: > alloca.c
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:1:.*define.*LIBTOOL.* add .*LT_INIT' stderr
+grep '^Makefile\.am:3:.*LTALLOCA' stderr
+
+:
diff --git a/t/alpha.sh b/t/alpha.sh
new file mode 100755
index 0000000..90f2cc2
--- /dev/null
+++ b/t/alpha.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure README-alpha is distributed when appropriate.  Report from
+# Jim Meyering.
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([alpha], [1.0a])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnits
+SUBDIRS = sub
+check-local: distdir
+       test -f $(distdir)/README-alpha
+       test -f $(distdir)/sub/README
+       test ! -f $(distdir)/sub/README-alpha
+       : > works
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnits
+END
+
+: > README-alpha
+: > sub/README-alpha
+: > sub/README
+
+# Gnits stuff.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+# "make distdir" should fail because NEWS does not mention 1.0a
+$MAKE check 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'NEWS not updated' stderr
+test ! -f works
+
+echo 'alpha 1.0a released' > NEWS
+$MAKE check
+test -f works
diff --git a/t/alpha2.sh b/t/alpha2.sh
new file mode 100755
index 0000000..6d5207f
--- /dev/null
+++ b/t/alpha2.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another check for README-alpha support.  This time it is requested
+# from configure.ac.  Report from Akim Demaille.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([alpha], [1.0b])
+AM_INIT_AUTOMAKE([readme-alpha])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+check-local: distdir
+       test -f $(distdir)/README-alpha
+       test -f $(distdir)/sub/README
+       test ! -f $(distdir)/sub/README-alpha
+       : > works
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+: > README-alpha
+: > sub/README-alpha
+: > sub/README
+
+# Gnits stuff.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE check
+test -f works
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
new file mode 100755
index 0000000..3a6e755
--- /dev/null
+++ b/t/am-tests-environment.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
+# interactions with TESTS_ENVIRONMENT.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_MKDIR_P
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .sh .test
+TESTS = foo.test bar.sh
+SH_LOG_COMPILER = sh
+AM_TESTS_ENVIRONMENT = \
+  $(MKDIR_P) quux.dir; \
+  if test -f $(srcdir)/test-env.sh; then \
+    . $(srcdir)/test-env.sh; \
+  fi; \
+  FOO=1; export FOO;
+EXTRA_DIST = $(TESTS) test-env.sh
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+ls -l && test -d quux.dir
+END
+chmod a+x foo.test
+
+cat > bar.sh << 'END'
+echo "FOO='$FOO'"
+echo "BAR='$BAR'"
+test x"$FOO" = x"$BAR"
+END
+
+debug_info ()
+{
+  cat test-suite.log
+  cat foo.log
+  cat bar.log
+}
+
+minicheck ()
+{
+  debug_info
+  test -d quux.dir
+}
+
+miniclean ()
+{
+  rmdir quux.dir
+  rm -f foo.log bar.log test-suite.log
+}
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+TESTS_ENVIRONMENT='BAR=1' $MAKE check || { debug_info; Exit 1; }
+minicheck
+miniclean
+
+TESTS_ENVIRONMENT='BAR=2' $MAKE check && { debug_info; Exit 1; }
+minicheck
+miniclean
+
+echo 'BAR=1 && export BAR' > test-env.sh
+$MAKE check || { debug_info; Exit 1; }
+minicheck
+$MAKE distcheck
+
+:
diff --git a/t/amassign.sh b/t/amassign.sh
new file mode 100755
index 0000000..1649dd0
--- /dev/null
+++ b/t/amassign.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to see if AM_ name can be assigned to in configure.ac.
+# Report from Steve Robbins.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CFLAGS=foo
+AC_SUBST(AM_BAR)
+AC_SUBST([AM_ZARDOZ])
+END
+
+$ACLOCAL
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
new file mode 100755
index 0000000..4b3e0e2
--- /dev/null
+++ b/t/amhello-binpkg.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test an example from the manual about the 'amhello' package:
+# using DESTDIR to build simple, no-frills binary packages.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cp "$am_docdir"/amhello-1.0.tar.gz . \
+  || fatal_ "cannot get amhello tarball"
+
+gzip -dc amhello-1.0.tar.gz | tar xf -
+cd amhello-1.0
+
+./configure --prefix /usr
+$MAKE
+$MAKE DESTDIR="`pwd`/inst" install
+cd inst
+find . -type f -print > ../files.lst
+tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > tar.got 2>&1
+
+EXEEXT=`sed -n -e 's/^EXEEXT *= *//p' < ../Makefile`
+
+if tar --version </dev/null | grep GNU; then
+  LC_ALL=C sort tar.got > t
+  mv -f t tar.got
+  diff - tar.got <<END
+./usr/bin/hello$EXEEXT
+./usr/share/doc/amhello/README
+END
+else
+  : Be laxer with other tar implementations, to avoid spurious failures.
+  $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got
+  $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
+fi
+
+:
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
new file mode 100755
index 0000000..4132bc1
--- /dev/null
+++ b/t/amhello-cflags.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test an example from the manual about the 'amhello' package:
+# using VPATH builds to configure the same package with different
+# options.
+
+am_create_testdir=empty
+required=gcc
+. ./defs || Exit 1
+
+cp "$am_docdir"/amhello-1.0.tar.gz . \
+  || fatal_ "cannot get amhello tarball"
+
+gzip -dc amhello-1.0.tar.gz | tar xf -
+cd amhello-1.0
+
+mkdir debug optim
+cd debug
+../configure CFLAGS='-g -O0'
+$MAKE
+ls -l . src # For debugging.
+cd ../optim
+../configure CFLAGS='-O3 -fomit-frame-pointer'
+$MAKE
+ls -l . src # For debugging.
+cd ..
+
+# Check that we have really compiled the objects with two different
+# configurations.
+for exeext in '' .exe :; do
+  test -f optim/src/hello$exeext && break
+  test "$exeext" = : && fatal_ "cannot determine extension of executables"
+done
+cmp optim/src/hello$exeext debug/src/hello$exeext && Exit 1
+
+:
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
new file mode 100755
index 0000000..b138d87
--- /dev/null
+++ b/t/amhello-cross-compile.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test an example from the manual about the 'amhello' package:
+# cross-compiling a package from Linux/Unix to MinGW.
+
+am_create_testdir=empty
+required=i586-mingw32msvc-gcc
+. ./defs || Exit 1
+
+cp "$am_docdir"/amhello-1.0.tar.gz . \
+  || fatal_ "cannot get amhello tarball"
+
+host=i586-mingw32msvc
+build=`"$am_scriptdir"/config.guess` && test -n "$build" \
+  || fatal_ "cannot guess build platform"
+case $build in *mingw*) skip_ "build system is MinGW too";; esac
+
+gzip -dc amhello-1.0.tar.gz | tar xf -
+cd amhello-1.0
+
+./configure --build "$build" --host "$host" > stdout \
+  || { cat stdout ; Exit 1; }
+cat stdout
+grep '^checking for i586-mingw32msvc-strip\.\.\.' stdout
+grep '^checking for i586-mingw32msvc-gcc\.\.\.' stdout
+grep '^checking for suffix of executables\.\.\. \.exe *$' stdout
+grep '^checking for suffix of object files\.\.\. o *$' stdout
+grep '^checking whether i586-mingw32msvc-gcc accepts -g\.\.\. yes' stdout
+
+$MAKE
+
+cd src
+file hello.exe > whatis
+cat whatis
+$EGREP 'DOS|Win' whatis
+grep 'executable' whatis
+grep 'ELF' whatis && Exit 1
+
+:
diff --git a/t/ammissing.sh b/t/ammissing.sh
new file mode 100755
index 0000000..aa28126
--- /dev/null
+++ b/t/ammissing.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to see if aclocal correctly reports missing AM_ macro.
+
+. ./defs || Exit 1
+
+echo AM_ZARDOZ >> configure.ac
+
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr
+grep 'configure.ac:.*AM_ZARDOZ.*not found' stderr
diff --git a/t/amopt.sh b/t/amopt.sh
new file mode 100755
index 0000000..7861184
--- /dev/null
+++ b/t/amopt.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make Automake diagnose a conditional AUTOMAKE_OPTIONS.
+# Report from Bas Wijnen.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AM_CONDITIONAL([COND], [true])
+END
+
+mkdir sub
+
+cat >Makefile.am <<END
+if COND
+AUTOMAKE_OPTIONS = -Wall
+endif
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:2.*AUTOMAKE_OPTIONS.*conditional' stderr
+
+:
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
new file mode 100755
index 0000000..0219f18
--- /dev/null
+++ b/t/amopts-location.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that errors about AUTOMAKE_OPTIONS refers to correct
+# locations.
+
+. ./defs || Exit 1
+
+cat > Makefile.am <<'END'
+# comment \
+# continued
+include Makefile0.am
+END
+
+cat > Makefile0.am <<'END'
+#1
+#2
+#3
+include Makefile1.am
+END
+
+cat > Makefile1.am <<'END'
+AUTOMAKE_OPTIONS = tar-pax
+# comment
+END
+
+cat > Makefile2.am <<'END'
+## automake comment
+bar:
+       :
+line = \
+continued
+AUTOMAKE_OPTIONS = tar-ustar
+END
+
+cat > Makefile3.am <<'END'
+quux = a
+AUTOMAKE_OPTIONS =
+quux += b
+AUTOMAKE_OPTIONS += tar-v7
+zardoz = 1
+END
+
+cat >>configure.ac <<'END'
+AC_CONFIG_FILES([Makefile2 Makefile3])
+END
+
+$ACLOCAL
+# Automake options 'tar-v7', 'tar-ustar' and 'tar-pax' can only be used
+# as argument to AM_INIT_AUTOMAKE, and not in AUTOMAKE_OPTIONS.
+AUTOMAKE_fails
+
+# Check that all the expected line numbers are correctly reported
+# in automake warning/error messages.
+grep '^Makefile1\.am:1:.*tar-pax' stderr
+grep '^Makefile2\.am:6:.*tar-ustar' stderr
+grep '^Makefile3\.am:2:.*tar-v7' stderr
+grep '^Makefile\.am:3:.*Makefile0\.am.*included from here' stderr
+grep '^Makefile0\.am:4:.*Makefile1\.am.*included from here' stderr
+
+# And also check that no botched line number is reported.
+cat stderr \
+  | grep -v '^Makefile\.am:3:'  \
+  | grep -v '^Makefile0\.am:4:' \
+  | grep -v '^Makefile1\.am:1:' \
+  | grep -v '^Makefile2\.am:6:' \
+  | grep -v '^Makefile3\.am:2:' \
+  | grep . && Exit 1
+
+:
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
new file mode 100755
index 0000000..8a035d1
--- /dev/null
+++ b/t/amopts-variable-expansion.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that AUTOMAKE_OPTIONS support variable expansion.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am <<'END'
+# The following should expand to '-Wnone -Wno-error foreign -Wportability'.
+AUTOMAKE_OPTIONS = $(foo) foreign
+AUTOMAKE_OPTIONS += ${bar}
+foo = $(foo1)
+foo1 = ${foo2}
+foo2 = -Wnone
+foo2 += $(foo3)
+foo3 = -Wno-error
+bar = -Wportability
+# This will give a warning with '-Wportability'.
+zardoz :=
+# This would give a warning with '-Woverride'.
+install:
+END
+
+$ACLOCAL
+AUTOMAKE_run
+grep '^Makefile\.am:.*:=.*not portable' stderr
+grep README stderr && Exit 1
+$EGREP '(install|override)' stderr && Exit 1
+
+:
diff --git a/t/amsubst.sh b/t/amsubst.sh
new file mode 100755
index 0000000..b655ce4
--- /dev/null
+++ b/t/amsubst.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for _AM_SUBST_NOTMAKE.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([backslash], "\\")
+_AM_SUBST_NOTMAKE([backslash])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+test:
+       @echo $(backslash) @address@hidden
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+# If _AM_SUBST_NOTMAKE is not honored, the backslash
+# variable will not be empty.
+$MAKE test | grep '^[$]$'
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
new file mode 100755
index 0000000..fb2e2a5
--- /dev/null
+++ b/t/ansi2knr-no-more.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that any attempt to use the obsolete de-ANSI-fication support
+# is diagnosed.
+
+. ./defs || Exit 1
+
+warn_rx='automatic de-ANSI-fication.*removed'
+
+echo AC_PROG_CC >> configure.ac
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
+cp configure.ac configure.sav
+
+echo AM_C_PROTOTYPES >> configure.ac
+
+$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep "^configure\\.ac:5:.*$warn_rx" stderr
+
+cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
+$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep "^configure\\.ac:5:.*$warn_rx" stderr
+
+for opt in ansi2knr lib/ansi2knr; do
+  # ansi2knr option in Makefile.am
+  cp configure.sav configure.ac
+  echo "AUTOMAKE_OPTIONS = $opt" > Makefile.am
+  rm -rf autom4te*.cache
+  AUTOMAKE_fails -Wnone
+  grep "^Makefile\.am:1:.*$warn_rx" stderr
+  # ansi2knr option in configure.ac
+  echo > Makefile.am # `echo', not `:', for Solaris /bin/sh.
+  sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.ac
+  cat configure.ac # For debugging.
+  rm -rf autom4te*.cache
+  AUTOMAKE_fails -Wnone
+  grep "^configure\\.ac:2:.*$warn_rx" stderr
+done
+
+:
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
new file mode 100755
index 0000000..1ddec64
--- /dev/null
+++ b/t/ar-lib.sh
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'ar-lib' wraps the Microsoft Library Manager (lib) correctly.
+
+am_create_testdir=empty
+required=xsi-lib-shell
+. ./defs || Exit 1
+
+get_shell_script ar-lib
+
+# Use a dummy lib, since lib isn't readily available on all systems.
+cat >lib <<'END'
+#! /bin/sh
+if test x"$2" = x-LIST && test x"$3" = xfake.lib; then
+  echo fake.obj
+elif test x"$2" = x-LIST && test x"$3" = xfake2.lib; then
+  printf "%s\n" "dir\\fake2.obj"
+else
+  printf "%s\n" "lib $*"
+fi
+END
+
+chmod +x ./lib
+
+# Check if ar-lib can create an archive with "cr".
+opts=`./ar-lib ./lib cr foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.obj"
+
+# Check if ar-lib can update an existing archive with "r".
+touch foo.lib
+opts=`./ar-lib ./lib r foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
+
+# Check if ar-lib can update an existing archive with "q".
+opts=`./ar-lib ./lib q foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
+
+# Check if ar-lib accepts "u" as a modifier.
+# NOTE: "u" should have an effect, but currently doesn't.
+opts=`./ar-lib ./lib ru foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
+
+# Check if ar-lib accepts "s" as a modifier.
+opts=`./ar-lib ./lib rs foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
+
+# Check if ar-lib accepts "S" as a modifier.
+opts=`./ar-lib ./lib rS foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
+
+# Check if ar-lib passes on @FILE with "r"
+opts=`./ar-lib ./lib r foo.lib @list`
+test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib @list"
+
+# Check if ar-lib can delete a member from an archive with "d".
+opts=`./ar-lib ./lib d foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib"
+
+# Check if ar-lib can delete members in an @FILE.
+echo foo.obj > foolist
+opts=`./ar-lib ./lib d foo.lib @foolist`
+test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib"
+
+# Check if ar-lib can list archive members with "t".
+opts=`./ar-lib ./lib t foo.lib`
+test x"$opts" = x"lib -NOLOGO -LIST foo.lib"
+
+# Check if ar-lib accepts "v" as a modifier.
+# NOTE: "v" should have an effect, but currently doesn't.
+opts=`./ar-lib ./lib tv foo.lib`
+test x"$opts" = x"lib -NOLOGO -LIST foo.lib"
+
+# Check if ar-lib can extract archive members with "x".
+touch fake.lib
+opts=`./ar-lib ./lib x fake.lib`
+test x"$opts" = x"lib -NOLOGO -EXTRACT:fake.obj fake.lib"
+
+# Check if ar-lib can extract specified archive members with "x".
+opts=`./ar-lib ./lib x foo.lib foo.obj`
+test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
+
+# Check if ar-lib can extract members in an @FILE.
+opts=`./ar-lib ./lib x foo.lib @foolist`
+test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
+
+# Check if ar-lib passes -lib and -LTCG through to the wrappee.
+opts=`./ar-lib ./lib -lib -LTCG x foo.lib foo.obj`
+test x"$opts" = x"lib -lib -LTCG -NOLOGO -EXTRACT:foo.obj foo.lib"
+
+# Check if ar-lib can extract backslashed members.
+touch fake2.lib
+opts=`./ar-lib ./lib x fake2.lib`
+test x"$opts" = x"lib -NOLOGO -EXTRACT:dir\\fake2.obj fake2.lib"
+
+# Check if ar-lib accepts "s" as an action.
+opts=`./ar-lib ./lib s foo.lib`
+test x"$opts" = x
+
+:
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
new file mode 100755
index 0000000..7d7e9b5
--- /dev/null
+++ b/t/ar-lib2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if AM_PROG_AR installs ar-lib.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+# Make sure ar-lib is installed, and that Automake says so.
+grep '^configure\.ac:.*install.*ar-lib' stderr
+test -f ar-lib
+
+:
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
new file mode 100755
index 0000000..02696f6
--- /dev/null
+++ b/t/ar-lib3.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if lib_LIBRARIES requests AM_PROG_AR.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'requires.*AM_PROG_AR' stderr
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+END
+
+rm -rf autom4te*.cache
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+:
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
new file mode 100755
index 0000000..d1be2eb
--- /dev/null
+++ b/t/ar-lib4.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if lib_LTLIBRARIES requests AM_PROG_AR.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cp configure.ac X
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = foo.c
+END
+
+libtoolize
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'requires.*AM_PROG_AR' stderr
+
+cp X configure.ac
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+:
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
new file mode 100755
index 0000000..1987936
--- /dev/null
+++ b/t/ar-lib5a.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if AM_PROG_AR triggers the use of the ar-lib script.
+# This test requires Microsoft lib.
+# Keep this test in sync with sister test 'ar-lib5b.test'.
+
+required=lib
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([auxdir])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+# We want to test the content of am_cv_ar_interface in the Makefile.
+AC_SUBST([am_cv_ar_interface])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libwish.a
+libwish_a_SOURCES = wish.c
+
+check-local:
+       test x'$(am_cv_ar_interface)' = x'lib'
+       test -f ar-lib-worked
+       test -f libwish.a
+MOSTLYCLEANFILES = ar-lib-worked
+END
+
+cat > wish.c << 'END'
+int wish(void) { return 0; }
+END
+
+mkdir auxdir
+cat - "$am_scriptdir/ar-lib" > auxdir/ar-lib << 'END'
+#! /bin/sh
+:> ar-lib-worked
+END
+chmod +x auxdir/ar-lib
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Sanity check: test that it is ok to use 'am_cv_ar_interface' as we do.
+$FGREP 'am_cv_ar_interface=' configure
+
+./configure AR=lib RANLIB=:
+
+$MAKE check
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='AR=lib RANLIB=:'
+
+:
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
new file mode 100755
index 0000000..2fb0cf4
--- /dev/null
+++ b/t/ar-lib5b.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if AM_PROG_AR triggers the use of the ar-lib script.
+# This test does not require Microsoft lib.
+# Keep this test in sync with sister test 'ar-lib5a.test'.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([auxdir])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+# We want to test the content of am_cv_ar_interface in the Makefile.
+AC_SUBST([am_cv_ar_interface])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libwish.a
+libwish_a_SOURCES = wish.c
+
+check-local:
+       test x'$(am_cv_ar_interface)' = x'lib'
+       test -f ar-lib-worked
+MOSTLYCLEANFILES = ar-lib-worked
+END
+
+cat > wish.c << 'END'
+int wish(void) { return 0; }
+END
+
+mkdir auxdir
+cat > auxdir/ar-lib << 'END'
+#! /bin/sh
+:> ar-lib-worked
+END
+chmod +x auxdir/ar-lib
+
+# Let's fake microsoft lib.
+mkdir bin
+cat > bin/lib << 'END'
+#! /bin/sh
+echo lib command line: $* >&2 # For debugging.
+case " $* " in
+  # The '-OUT:' option is used by tests in configure.  So don't create
+  # the 'ar-lib-worked' file here, as that might cause spurious passes
+  # of this test; but don't fail either, as that would confuse said
+  # configure tests.
+  *' -OUT:'*) exit 0;;
+  # This means that $* looks like a command-line for 'ar'.  We have to
+  # exit with failure here, to accommodate the two following ortoghonal
+  # scenarios:
+  #  1. when 'lib' is tested by configure, this will tell that it does
+  #     not use the ar(1) interface, so that the 'ar-lib' script will
+  #     get involved;
+  #  2. when 'lib' is called by the Makefile, an ar-style command line
+  #     passed to it would mean that the 'ar-lib' script has failed to
+  #     properly munge the command line, or hasn't been invoked to do so.
+  *\ c*) exit 1;;
+  # Assume everything else is OK.
+  *) : > ar-lib-worked;;
+esac
+END
+chmod +x bin/lib
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Sanity check: test that it is ok to use 'am_cv_ar_interface' as we do.
+$FGREP 'am_cv_ar_interface=' configure
+
+./configure AR=lib RANLIB=:
+
+$MAKE check
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS="AR=lib RANLIB=:"
+
+:
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
new file mode 100755
index 0000000..be6afcd
--- /dev/null
+++ b/t/ar-lib6a.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_PROG_AR ordering requirements
+# Keep this test in sync with sister test 'ar-lib6b.test'.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
+AM_PROG_AR
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+$EGREP '(AC_PROG_LIBTOOL|LT_INIT).*before.*AM_PROG_AR' stderr
+
+:
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
new file mode 100755
index 0000000..54c0222
--- /dev/null
+++ b/t/ar-lib6b.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_PROG_AR ordering requirements for older Libtools
+# Keep this test in sync with sister test 'ar-lib6a.test'.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AM_PROG_AR
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+$EGREP 'AC_PROG_LIBTOOL.*before.*AM_PROG_AR' stderr
+
+:
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
new file mode 100755
index 0000000..34e6c6e
--- /dev/null
+++ b/t/ar-lib7.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if automake warns if ar-lib is missing when AM_PROG_AR is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+END
+
+:> Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+
+grep '^configure\.ac:.*ar-lib.*not found' stderr
+
+$AUTOMAKE --add-missing
+
+:
diff --git a/t/ar.sh b/t/ar.sh
new file mode 100755
index 0000000..b8d9901
--- /dev/null
+++ b/t/ar.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.ac.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+AC_SUBST([AR], ['echo it works'])
+AC_SUBST([ARFLAGS], ['>'])
+AC_SUBST([RANLIB], ['echo really works >>'])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES =
+END
+
+:> ar-lib
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+grep 'it works' libfoo.a
+grep 'really works' libfoo.a
+
+:
diff --git a/t/ar2.sh b/t/ar2.sh
new file mode 100755
index 0000000..c71afea
--- /dev/null
+++ b/t/ar2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
+# Report from Kevin Ryde.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-extra-portability
+grep '^ARFLAGS =' Makefile.in
+grep '^AR =' Makefile.in
+
+:
diff --git a/t/ar3.sh b/t/ar3.sh
new file mode 100755
index 0000000..ba0b4b7
--- /dev/null
+++ b/t/ar3.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that AR, ARFLAGS, etc. works also when the macro AM_PROG_AR
+# is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE
+$EGREP '^ARFLAGS =' Makefile.in
+$EGREP '^AR =' Makefile.in
+
+:
diff --git a/t/ar4.sh b/t/ar4.sh
new file mode 100755
index 0000000..424a776
--- /dev/null
+++ b/t/ar4.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if configure bails out if $AR does not work and AM_PROG_AR is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+END
+
+$ACLOCAL
+$AUTOCONF
+
+st=0; ./configure AR=/bin/false >stdout 2>stderr || st=$?
+cat stdout
+cat stderr >&2
+test $st -eq 1
+
+grep '^checking.* archiver .*interface.*\.\.\. unknown' stdout
+grep '^configure: error: could not determine /bin/false interface' stderr
+ls *conftest* && Exit 1
+
+:
diff --git a/t/ar5.sh b/t/ar5.sh
new file mode 100755
index 0000000..711fad6
--- /dev/null
+++ b/t/ar5.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the optional argument of AM_PROG_AR.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR([
+  echo spy > bad-archiver-interface-detected
+  AC_MSG_CHECKING([for something else])
+  AC_MSG_RESULT([found it])
+  echo Grep This
+])
+END
+
+$ACLOCAL
+$AUTOCONF
+
+./configure AR=/bin/false >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking.* archiver .*interface.*\.\.\. unknown$' stdout
+grep '^checking for something else\.\.\. found it$' stdout
+grep '^Grep This$' stdout
+test -f bad-archiver-interface-detected
+
+:
diff --git a/t/asm.sh b/t/asm.sh
new file mode 100755
index 0000000..b9a958d
--- /dev/null
+++ b/t/asm.sh
@@ -0,0 +1,100 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of basic assembly functionality.
+# Keep this in sync with sister tests asm2.test and asm3.test.
+
+. ./defs || Exit 1
+
+mv configure.ac configure.stub
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = maude
+maude_SOURCES = maude.s
+END
+
+echo '*** Try 1 -- should fail because we need CC and CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+# On fast machines the autom4te.cache created during the above run of
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
+# used.  We could do '$sleep', but it's faster to erase the
+# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
+# bogus installations of Autoconf use a versioned cache.)
+rm -rf autom4te*.cache
+
+echo '*** Try 2 -- we still need CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 3 -- we need CCASFLAGS ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
+grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 4 -- we have everything needed, expect success ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+
+echo '*** Try 5 -- we have everything needed, expect success ***'
+cat configure.stub - > configure.ac << 'END'
+AM_PROG_AS
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/asm2.sh b/t/asm2.sh
new file mode 100755
index 0000000..737d46d
--- /dev/null
+++ b/t/asm2.sh
@@ -0,0 +1,116 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of basic preprocessed assembly functionality.
+# Keep this in sync with sister tests asm.test and asm3.test.
+
+. ./defs || Exit 1
+
+mv configure.ac configure.stub
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = maude
+maude_SOURCES = maude.S
+END
+
+echo '*** Try 1 -- should fail because we need CC and CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+# On fast machines the autom4te.cache created during the above run of
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
+# used.  We could do '$sleep', but it's faster to erase the
+# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
+# bogus installations of Autoconf use a versioned cache.)
+rm -rf autom4te*.cache
+
+echo '*** Try 2 -- we still need CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 3 -- we need CCASFLAGS ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
+grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 4 -- we need dependency tracking. ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep ' add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 5 -- we have everything needed, expect success. ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+_AM_DEPENDENCIES([CCAS])
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+
+echo '*** Try 6 -- we have everything needed, expect success. ***'
+cat configure.stub - > configure.ac << 'END'
+AM_PROG_AS
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/asm3.sh b/t/asm3.sh
new file mode 100755
index 0000000..f7f835a
--- /dev/null
+++ b/t/asm3.sh
@@ -0,0 +1,116 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of basic preprocessed assembly functionality with extension .sx.
+# Keep this in sync with sister tests asm.test and asm2.test.
+
+. ./defs || Exit 1
+
+mv configure.ac configure.stub
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = maude
+maude_SOURCES = maude.sx
+END
+
+echo '*** Try 1 -- should fail because we need CC and CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+# On fast machines the autom4te.cache created during the above run of
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
+# used.  We could do '$sleep', but it's faster to erase the
+# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
+# bogus installations of Autoconf use a versioned cache.)
+rm -rf autom4te*.cache
+
+echo '*** Try 2 -- we still need CCAS ***'
+cat configure.stub - > configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCAS.* undefined' stderr
+grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 3 -- we need CCASFLAGS ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
+grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 4 -- we need dependency tracking. ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep ' add .*AM_PROG_AS' stderr
+
+rm -rf autom4te*.cache
+
+echo '*** Try 5 -- we have everything needed, expect success. ***'
+cat configure.stub - > configure.ac << 'END'
+CCAS='$(CC)'
+AC_SUBST([CCAS])
+AC_PROG_CC
+_AM_DEPENDENCIES([CCAS])
+AC_SUBST([CCASFLAGS])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+
+echo '*** Try 6 -- we have everything needed, expect success. ***'
+cat configure.stub - > configure.ac << 'END'
+AM_PROG_AS
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/autodist-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh
new file mode 100755
index 0000000..d4ad1d9
--- /dev/null
+++ b/t/autodist-acconfig-no-subdir.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'acconfig.h' is *not* automatically distributed when
+# placed in a subdirectory.
+# Related to automake bug#7819.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+sub/acconfig.h:
+       echo target $@ should not be built >&2; exit 1
+check-local: distdir
+       ls -l $(distdir)/sub
+       test ! -f $(distdir)/sub/acconfig.h
+END
+
+mkdir sub
+
+cat > sub/Makefile.am <<'END'
+acconfig.h:
+       echo target $@ should not be built >&2; exit 1
+check-local:
+       echo $(DISTFILES) | grep 'acconfig\.h' && exit 1; :
+       echo $(DIST_COMMON) | grep 'acconfig\.h' && exit 1; :
+END
+
+: > sub/acconfig.h
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE check
+
+:
diff --git a/t/autodist-acconfig.sh b/t/autodist-acconfig.sh
new file mode 100755
index 0000000..18b280c
--- /dev/null
+++ b/t/autodist-acconfig.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'acconfig.h' is automatically distributed if it exists
+# (at automake runtime).
+# Related to automake bug#7819.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+.PHONY: test
+test: distdir
+       ls -l $(distdir)
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
+       test -f $(distdir)/acconfig.h
+END
+
+: > acconfig.h
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE test
+
+:
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
new file mode 100755
index 0000000..6108f57
--- /dev/null
+++ b/t/autodist-aclocal-m4.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'aclocal.m4' is not automatically distributed if not
+# required to build 'configure'.  This is *really* a corner-case
+# check, and the behaviour it checks is not documented either, so
+# if that behaviour is deliberately changed in the future, just
+# remove this test.
+# Related to automake bug#7819.
+
+. ./defs || Exit 1
+
+{ echo 'm4_include([defs.m4])'
+  cat configure.ac
+  echo 'AC_OUTPUT'
+} > t
+mv -f t configure.ac
+
+cat > Makefile.am <<'END'
+.PHONY: test
+test: distdir
+       ls -l $(distdir)
+       test ! -f $(distdir)/aclocal.m4
+       echo $(DISTFILES) | grep 'aclocal\.m4' && exit 1; :
+       echo $(DIST_COMMON) | grep 'aclocal\.m4' && exit 1; :
+check-local: test
+END
+
+: > defs.m4
+$ACLOCAL
+mv -f aclocal.m4 defs.m4
+
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
new file mode 100755
index 0000000..65888f8
--- /dev/null
+++ b/t/autodist-config-headers.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that config.h.bot and config.h.top are automatically
+# distributed if the AC_CONFIG_HADERS macro is used and they
+# exist at automake runtime.
+# Related to automake bug#7819.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_CONFIG_HEADERS([config.h sub/config.h cfg2.h:conf2.hin])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+.PHONY: test
+test: distdir
+       ls -l $(distdir) $(distdir)/sub
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.bot '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.top '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.bot '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.top '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.bot '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.top '
+       test -f $(distdir)/config.h.bot
+       test -f $(distdir)/config.h.top
+       test -f $(distdir)/cfg2.h.bot
+       test -f $(distdir)/cfg2.h.top
+       test -f $(distdir)/sub/config.h.bot
+       test -f $(distdir)/sub/config.h.top
+END
+
+mkdir sub
+touch config.h.in config.h.top config.h.bot \
+      conf2.hin cfg2.h.top cfg2.h.bot \
+      sub/config.h.in sub/config.h.top sub/config.h.bot
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE test
+
+:
diff --git a/t/autodist-configure-no-subdir.sh 
b/t/autodist-configure-no-subdir.sh
new file mode 100755
index 0000000..cc53caf
--- /dev/null
+++ b/t/autodist-configure-no-subdir.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'configure', 'configure.ac' and 'configure.in' are *not*
+# automatically distributed when placed in a subdirectory.
+# Related to automake bug#7819.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+dontbuild = echo target $@ should not be built >&2; exit 1
+sub/configure:
+       $(dontbuild)
+sub/configure.ac:
+       $(dontbuild)
+sub/configure.in:
+       $(dontbuild)
+check-local: distdir
+       ls -l $(distdir)/sub
+       test ! -f $(distdir)/sub/configure
+       test ! -f $(distdir)/sub/configure.in
+       test ! -f $(distdir)/sub/configure.ac
+END
+
+mkdir sub
+
+cat > sub/Makefile.am <<'END'
+dontbuild = echo target $@ should not be built >&2; exit 1
+configure:
+       $(dontbuild)
+configure.ac:
+       $(dontbuild)
+configure.in:
+       $(dontbuild)
+check-local:
+       echo $(DISTFILES) | grep 'configure' && exit 1; :
+       echo $(DIST_COMMON) | grep 'configure' && exit 1; :
+END
+
+: > sub/configure.ac
+: > sub/configure.in
+: > sub/configure
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE check
+
+:
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
new file mode 100755
index 0000000..90a2c7d
--- /dev/null
+++ b/t/autodist-no-duplicate.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that there are no duplicates in the list of files automatically
+# distributed by automake.
+
+. ./defs || Exit 1
+
+re='Files .*automatically distributed.*if found'
+
+# The automake manual states that the list of automatically-distributed
+# files should be given by 'automake --help'.
+
+list1=`$AUTOMAKE --help \
+        | sed -n "/^$re.*always/,/^ *$/p" \
+        | sed 1d`
+list1=`echo $list1`
+
+list2=`$AUTOMAKE --help \
+        | sed -n "/^$re.*under certain conditions/,/^ *$/p" \
+        | sed 1d`
+list2=`echo $list2`
+
+test -n "$list1"
+test -n "$list2"
+
+st=0
+for i in 1 2; do
+  eval list=\${list$i}
+  for f in $list; do echo $f; done | sort > files$i.lst
+  uniq files$i.lst > files$i.uniq
+  cat files$i.lst
+  cat files$i.uniq
+  diff files$i.lst files$i.uniq || st=1
+done
+
+Exit $st
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
new file mode 100755
index 0000000..4db1f14
--- /dev/null
+++ b/t/autodist-stamp-vti.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'stamp-vti' is automatically distributed when info_TEXINFOS
+# and version.texi are involved.
+# Related to automake bug#7819.
+
+required=makeinfo
+. ./defs || Exit 1
+
+cat >> configure.ac << END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foo.texi
+.PHONY: test
+test: all distdir
+       ls -l $(distdir)
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
+       test -f $(distdir)/stamp-vti
+END
+
+cat > foo.texi << 'END'
+\input texinfo
address@hidden foo.info
address@hidden Zardoz
address@hidden Top
address@hidden version.texi
+bar baz quux
address@hidden
+END
+
+# Required when using Texinfo.
+: > texinfo.tex
+cp "$am_scriptdir"/mdate-sh .
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE test
+
+:
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
new file mode 100755
index 0000000..5e1f044
--- /dev/null
+++ b/t/autodist-subdir.sh
@@ -0,0 +1,120 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake really automatically distributes all the files
+# it advertises to do, even when in subdirectories.
+#
+# This behavior might be suboptimal, but it has been in place for quite
+# a long time, and it would be risky to change it now.  See also the
+# discussion of automake bug#7819:
+#  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7819>
+#
+# Keep this test in sync with sister test 'autodist.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+# The automake manual states that the list of automatically-distributed
+# files should be given by 'automake --help'.
+list=`$AUTOMAKE --help \
+        | sed -n '/^Files.*automatically distributed.*if found.*always/,/^ 
*$/p' \
+        | sed 1d`
+# Normalize whitespace, just in case.
+list=`echo $list`
+
+test -n "$list"
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+check-local:
+## For debugging.
+       @echo DIST_COMMON:
+       @for f in $(DIST_COMMON); do echo "  $$f"; done
+       @echo DISTDIR:
+       @ls -l $(distdir) | sed 's/^/  /'
+## Now the checks.
+       @for f in $(autodist_list); do \
+         echo "file: sub/$$f"; \
+         test -f $(distdir)/sub/$$f \
+           || { echo $$f: distdir fail >&2; exit 1; }; \
+       done
+END
+
+mkdir sub
+
+cat > sub/Makefile.am <<'END'
+include distfiles.am
+check-local:
+## For debugging.
+       @echo DIST_COMMON:
+       @for f in $(DIST_COMMON); do echo "  $$f"; done
+       @echo DISTDIR:
+       @ls -l $(distdir) | sed 's/^/  /'
+## Now the checks.
+       @for f in $(autodist_list); do \
+         echo "file: $$f"; \
+## Some filenames might contain dots, but this won't cause spurious
+## failures, and "spurious successes" are so unlikely that they're
+## not worth worrying about.
+         echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
+           || { echo $$f: distcom fail >&2; exit 1; }; \
+       done
+END
+
+: First try listing the automatically-distributed files in proper
+: targets in Makefile.am
+
+echo "MAINTAINERCLEANFILES = $list" > sub/distfiles.am
+for f in $list; do echo "$f :; touch $f"; done >> sub/distfiles.am
+
+cat sub/distfiles.am # For debugging.
+
+$AUTOMAKE -a
+
+./configure
+
+$MAKE distdir
+autodist_list="$list" $MAKE check
+
+$MAKE maintainer-clean
+test ! -f sub/README    # Sanity check.
+rm -rf $me-1.0          # Remove $(distdir).
+
+: Now try creating the automatically-distributed files before
+: running automake.
+
+: > sub/distfiles.am
+for f in $list; do
+  echo dummy > sub/$f
+done
+
+ls -l # For debugging.
+
+$AUTOMAKE
+
+./configure
+
+$MAKE distdir
+autodist_list="$list" $MAKE check
+
+:
diff --git a/t/autodist.sh b/t/autodist.sh
new file mode 100755
index 0000000..e6435c5
--- /dev/null
+++ b/t/autodist.sh
@@ -0,0 +1,103 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake really automatically distributes all the files
+# it advertises to do.
+# Related to automake bug#7819.
+# Keep this test in sync with sister test 'autodist-subdir.test'.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+# The automake manual states that the list of automatically-distributed
+# files should be given by 'automake --help'.
+list=`$AUTOMAKE --help \
+        | sed -n '/^Files.*automatically distributed.*if found.*always/,/^ 
*$/p' \
+        | sed 1d`
+# Normalize whitespace, just in case.
+list=`echo $list`
+
+test -n "$list"
+
+cat > Makefile.am <<'END'
+include distfiles.am
+check-local:
+## For debugging.
+       @echo DIST_COMMON:
+       @for f in $(DIST_COMMON); do echo "  $$f"; done
+       @echo DISTDIR:
+       @ls -l $(distdir) | sed 's/^/  /'
+## Now the checks.
+       @for f in $(autodist_list); do \
+         echo "file: $$f"; \
+         test -f $(distdir)/$$f \
+           || { echo $$f: distdir fail >&2; exit 1; }; \
+## Some filenames might contain dots, but this won't cause spurious
+## failures, and "spurious successes" are so unlikely that they're
+## not worth worrying about.
+         echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
+           || { echo $$f: distcom fail >&2; exit 1; }; \
+       done
+END
+
+: First try listing the automatically-distributed files in proper
+: targets in Makefile.am
+
+echo "MAINTAINERCLEANFILES = $list" > distfiles.am
+for f in $list; do echo "$f :; touch $f"; done >> distfiles.am
+
+cat distfiles.am # For debugging.
+
+$AUTOMAKE -a
+
+./configure
+
+$MAKE distdir
+autodist_list="$list" $MAKE check
+
+$MAKE maintainer-clean
+test ! -f README        # Sanity check.
+rm -rf $me-1.0          # Remove $(distdir).
+
+: Now try creating the automatically-distributed files before
+: running automake.
+
+: > distfiles.am
+for f in $list; do
+  echo dummy > $f
+done
+
+ls -l # For debugging.
+
+$AUTOMAKE
+
+./configure
+
+$MAKE distdir
+autodist_list="$list" $MAKE check
+
+:
diff --git a/t/autohdr.sh b/t/autohdr.sh
new file mode 100755
index 0000000..bef7027
--- /dev/null
+++ b/t/autohdr.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_CONFIG_HEADERS([thisfile.h])
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOHEADER
+
+test -f thisfile.h.in
diff --git a/t/autohdr2.sh b/t/autohdr2.sh
new file mode 100755
index 0000000..6f5415e
--- /dev/null
+++ b/t/autohdr2.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_CONFIG_HEADER([thisfile.h])
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOHEADER
+
+test -f thisfile.h.in
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
new file mode 100755
index 0000000..ad55130
--- /dev/null
+++ b/t/autohdr3.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check rebuild rules for autoheader.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+m4_include([foo.m4])
+AC_CONFIG_HEADERS([config.h:config.hin])
+AC_OUTPUT
+EOF
+
+: > foo.m4
+
+cat > Makefile.am <<'END'
+.PHONY: test
+check-local: test
+test: all
+       cat $(srcdir)/config.hin ;: For debugging.
+       cat config.h             ;: Likewise.
+       grep '#.*GREPME' $(srcdir)/config.hin
+       grep '#.*define.*GREPME' config.h
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+./configure
+$MAKE
+
+$sleep
+echo 'AC_DEFINE([GREPME], 1, [Doc for GREPME])' > foo.m4
+
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
new file mode 100755
index 0000000..9acbab1
--- /dev/null
+++ b/t/autohdr4.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check rebuild rules for AC_CONFIG_HEADERS.
+# (This should also work without GNU Make.)
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_PROG_CC
+AC_SUBST([BOT], [bot])
+AC_CONFIG_HEADERS([defs.h config.h:sub1/config.top:sub2/config.${BOT}],,
+                  [BOT=$BOT])
+AC_CONFIG_FILES([sub3/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir sub1 sub2 sub3
+
+: > sub1/config.top
+echo '#define NAME "grepme1"' >sub2/config.bot
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub3
+.PHONY: test-prog-updated
+test-prog-updated:
+       stat older sub3/run$(EXEEXT) || : For debugging.
+       test `ls -t older sub3/run$(EXEEXT) | sed 1q` = sub3/run$(EXEEXT)
+END
+
+cat > sub3/Makefile.am <<'END'
+noinst_PROGRAMS = run
+END
+
+cat >sub3/run.c <<'EOF'
+#include <defs.h>
+#include <config.h>
+#include <stdio.h>
+
+int main (void)
+{
+  puts (NAME); /* from config.h */
+  puts (PACKAGE); /* from defs.h */
+}
+EOF
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+# Do not reject slow dependency extractors: we need dependency tracking.
+./configure --enable-dependency-tracking
+$MAKE
+# Sanity check.
+cross_compiling || { sub3/run | grep grepme1; }
+
+: > older
+$sleep
+echo '#define NAME "grepme2"' > sub2/config.bot
+$MAKE
+cross_compiling || { sub3/run | grep grepme2; }
+$MAKE test-prog-updated
+
+$MAKE distcheck
+
+:
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
new file mode 100755
index 0000000..9df36f1
--- /dev/null
+++ b/t/autohdrdry.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Removal recovery rules for AC_CONFIG_HEADERS should not remove files
+# with 'make -n'.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_CONFIG_HEADERS([config.h])
+AC_OUTPUT
+EOF
+
+: >Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+./configure
+$MAKE
+
+rm -f config.h
+$MAKE -n
+test -f stamp-h1
+test ! -f config.h
+
+:
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
new file mode 100755
index 0000000..72c559a
--- /dev/null
+++ b/t/automake-cmdline.tap
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake's command-line options.
+
+. ./defs || Exit 1
+
+plan_ 17
+
+# Usage: bad_cmdline DESCRIPTION REGEX-FOR-STDERR [ARGS-FOR-AUTOMAKE...]
+do_check ()
+{
+  test $# -ge 3 || fatal_ "do_check: invalid usage"
+  desc=$1; shift
+  regex=$1; shift
+  AUTOMAKE_fails -d "$desc (run)" -- "$@"
+  command_ok_ "$desc (stderr)" grep "$regex" stderr
+}
+
+do_check 'invalid long option' 'unrecognized option.*--voo' --voo
+
+# Older perl has a buggy Getopt::Long which makes this fail.
+if $PERL -e 'require 5.8.2;'; then
+  do_check "list of options terminated by '--'" \
+           'input file.*--voo' -- --voo
+else
+  skip_row_ 2 -r "older perl with buggy Getopt::Long"
+fi
+
+do_check "empty argument" \
+         'empty argument' ''
+
+do_check "missing argument for long option" \
+         'option.*-W.*requires an argument' -W
+
+do_check "missing argument for short option" \
+         'option.*--warnings.*requires an argument' --warnings
+
+do_check "'--help' as option argument" \
+         'unknown warning.*--help' --warnings --help
+
+do_check "'--help' as option argument" \
+         'unknown warning.*--help' --warnings --help
+
+do_check "ambiguous incomplete option" \
+         'unrecognized option.*--ver' --ver
+
+command_ok_ "unambiguous incomplete long option" $AUTOMAKE --vers
+
+:
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
new file mode 100755
index 0000000..790d1b1
--- /dev/null
+++ b/t/auxdir-autodetect.sh
@@ -0,0 +1,130 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that, if AC_CONFIG_AUX_DIR is not specified, Automake tries
+# to use '.', '..' and '../..', in precisely that order.
+
+. ./defs || Exit 1
+
+nil=__no_such_program
+
+unset NONESUCH || :
+
+cat >>configure.ac << END
+AM_MISSING_PROG([NONESUCH],[$nil])
+AC_OUTPUT
+END
+
+mkdir d3
+mkdir d3/d2
+mkdir d3/d2/d1
+mkdir d3/d2/d1/d0
+
+echo 'echo %%d3%% $*' > d3/missing
+chmod +x d3/missing
+echo 'echo %%d2%% $*' > d3/d2/missing
+chmod +x d3/d2/missing
+echo 'echo %%d1%% $*' > d3/d2/d1/missing
+chmod +x d3/d2/d1/missing
+echo 'echo %%d0%% $*' > d3/d2/d1/d0/missing
+chmod +x d3/d2/d1/d0/missing
+
+mv configure.ac d3/d2/d1/d0/
+
+cd d3/d2/d1/d0
+
+cat > Makefile.am << 'EOF'
+.PHONY: test
+test:
+       $(NONESUCH) >$(out)
+EOF
+
+$ACLOCAL
+$AUTOCONF
+
+# ------------------------------------------- #
+:  We must end up with AC_CONFIG_AUX_DIR = .  #
+# ------------------------------------------- #
+
+: > install-sh
+$AUTOMAKE
+./configure
+out=out0 $MAKE test
+cat out0
+grep "%%d0%%.*$nil" out0
+grep '%%d[123]' out0 && Exit 1
+
+rm -f missing install-sh
+
+# -------------------------------------------- #
+:  We must end up with AC_CONFIG_AUX_DIR = ..  #
+# -------------------------------------------- #
+
+# Automake finds 'install-sh' in '.', so it assumes that auxdir is '.';
+# but it won't find 'missing' in '.', so it will fail.
+: > install-sh
+AUTOMAKE_fails
+grep 'required file.*[^.]\./missing.*not found' stderr
+rm -f install-sh
+
+# Now things should work.
+: > ../install-sh
+$AUTOMAKE
+./configure
+out=out1 $MAKE test
+cat out1
+grep "%%d1%%.*$nil" out1
+grep '%%d[023]' out1 && Exit 1
+
+rm -f ../missing ../install-sh
+
+# ----------------------------------------------- #
+:  We must end up with AC_CONFIG_AUX_DIR = ../..  #
+# ----------------------------------------------- #
+
+# Automake finds 'install-sh' in '.', so it assumes that auxdir is '.';
+# but it won't find 'missing' in '.', so it will fail.
+: > install-sh
+AUTOMAKE_fails
+grep 'required file.*[^.]\./missing.*not found' stderr
+rm -f install-sh
+
+# Automake finds 'install-sh' in '..', so it assumes that auxdir is '..';
+# but it won't find 'missing' in '.', so it will fail.
+: > ../install-sh
+AUTOMAKE_fails
+grep 'required file.*[^.]\.\./missing.*not found' stderr
+rm -f ../install-sh
+
+# Now things should work.
+: > ../../install-sh
+$AUTOMAKE
+./configure
+out=out2 $MAKE test
+cat out2
+grep "%%d2%%.*$nil" out2
+grep '%%d[013]' out2 && Exit 1
+
+rm -f ../../missing ../../install-sh
+
+# --------------------------------------------------------- #
+:  AC_CONFIG_AUX_DIR will not be found: automake must fail  #
+# --------------------------------------------------------- #
+
+AUTOMAKE_fails
+grep 'required file.*missing.*not found' stderr
+
+:
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
new file mode 100755
index 0000000..487958d
--- /dev/null
+++ b/t/auxdir-computed.tap
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# It should be possible to use a computed auxdir.  This might seem
+# bizarre, but it is actually used in multilib builds.
+
+. ./defs || Exit 1
+
+plan_ 3
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([\$foo])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+: > Makefile.am
+
+command_ok_ "aclocal" $ACLOCAL
+# Both these two invocations are meant.
+# They exercise both code paths concerning auxiliary files.
+command_ok_ "automake -a" -D TODO -r "long-standing limitation" $AUTOMAKE -a
+command_ok_ "automake"    -D TODO -r "long-standing limitation" $AUTOMAKE
+
+:
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
new file mode 100755
index 0000000..33f5db0
--- /dev/null
+++ b/t/auxdir-misplaced.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_AUX_DIR([.]) dnl this will appear after AM_INIT_AUTOMAKE
+END
+
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'AC_CONFIG_AUX_DIR.*AM_INIT_AUTOMAKE' stderr
+
+:
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
new file mode 100755
index 0000000..5575b28
--- /dev/null
+++ b/t/auxdir-nonexistent.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we diagnose non-existent AC_CONFIG_AUX_DIR names.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([nonesuch])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^configure\.ac:2:.*nonesuch.* not exist' stderr
+
+:
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
new file mode 100755
index 0000000..d04b38c
--- /dev/null
+++ b/t/auxdir-unportable.tap
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we diagnose unportable AC_CONFIG_AUX_DIR names.
+
+. ./defs || Exit 1
+
+plan_ 4
+
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([aux])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+: > Makefile.am
+
+am_warn_unportable_auxdir ()
+{
+  details=$1
+  AUTOMAKE_fails
+  command_ok_ \
+    "warn about $details unportable auxdir name" \
+    grep '^configure\.ac:2:.*aux.*W32' stderr
+}
+
+$ACLOCAL || fatal_ "aclocal failed"
+
+am_warn_unportable_auxdir "non-existent"
+
+if mkdir aux; then
+  am_warn_unportable_auxdir "existent"
+else
+  skip_row_ 2 -r "cannot create directory named 'aux'"
+fi
+
+:
diff --git a/t/auxdir.sh b/t/auxdir.sh
new file mode 100755
index 0000000..c4860f4
--- /dev/null
+++ b/t/auxdir.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AC_CONFIG_AUX_DIR works correctly.
+
+. ./defs || Exit 1
+
+# The "./." is here so we don't have to mess with subdirs.
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([./.])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+cp "$am_scriptdir/mkinstalldirs" .
+
+# The "././" prefix confuses Automake into thinking it is doing a
+# subdir build.  Yes, this is hacky.
+$ACLOCAL
+$AUTOMAKE ././Makefile
+
+grep '/\./\./mkinstalldirs' Makefile.in
+
+:
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
new file mode 100755
index 0000000..08de241
--- /dev/null
+++ b/t/auxdir6.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AC_CONFIG_AUX_DIR works correctly.
+# This test calls AC_CONFIG_AUX_DIR with an explicit literal argument,
+# thus explicitly making the directory named by that argument the
+# config auxdir.
+# Keep this in sync with sister tests auxdir7.test and auxdir8.test.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([auxdir])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile subdir/Makefile])
+END
+
+mkdir subdir auxdir
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+cp Makefile.am subdir/Makefile.am
+
+: > auxdir/mkinstalldirs
+: > auxdir/install-sh
+: > auxdir/missing
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '$(top_srcdir)/auxdir/mkinstalldirs' Makefile.in
+$FGREP '$(top_srcdir)/auxdir/mkinstalldirs' subdir/Makefile.in
+
+:
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
new file mode 100755
index 0000000..9a32bcb
--- /dev/null
+++ b/t/auxdir7.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AC_CONFIG_AUX_DIR works correctly.
+# This test calls AC_CONFIG_AUX_DIR with a '.' argument, thus explicitly
+# making the top-level directory the config auxdir.
+# Keep this in sync with sister tests auxdir6.test and auxdir8.test.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile subdir/Makefile])
+END
+
+mkdir subdir
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+cp Makefile.am subdir/Makefile.am
+
+: > mkinstalldirs
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '$(top_srcdir)/mkinstalldirs' Makefile.in
+$FGREP '$(top_srcdir)/mkinstalldirs' subdir/Makefile.in
+
+:
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
new file mode 100755
index 0000000..4dd0835
--- /dev/null
+++ b/t/auxdir8.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AC_CONFIG_AUX_DIR works correctly.
+# This test tries without an explicit call to AC_CONFIG_AUX_DIR;
+# the config auxdir should be implicitly defined to '.' since
+# the install-sh, mkinstalldirs, etc., scripts are in the top-level
+# directory.
+# Keep this in sync with sister tests auxdir6.test and auxdir7.test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([subdir/Makefile])
+END
+
+mkdir subdir
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+cp Makefile.am subdir/Makefile.am
+
+: > mkinstalldirs
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '$(top_srcdir)/mkinstalldirs' Makefile.in
+$FGREP '$(top_srcdir)/mkinstalldirs' subdir/Makefile.in
+
+:
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
new file mode 100644
index 0000000..a9180e9
--- /dev/null
+++ b/t/ax/depcomp.sh
@@ -0,0 +1,420 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check dependency tracking in various flavours.
+# Contains both libtool and non-libtool case.
+# Sourced by the various (autogenerated) 'depcomp*.tap' tests.
+# Examples of reported failures that motivated those test are
+# listed below.
+
+# -------------------------------------------------------------------------
+
+# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00028.html>
+#
+# Here's the bug: makedepend will prefix VPATH to the object file name,
+# thus the second make will invoke depcomp with object='../../src/foo.o',
+# causing errors such as:
+#
+#  touch: cannot touch '../../src/.deps/foo.TPo': No such file or directory
+#  makedepend: error:  cannot open "../../src/.deps/foo.TPo"
+#  ../../depcomp: line 560: ../../src/.deps/foo.TPo: No such file or directory
+
+# -------------------------------------------------------------------------
+
+# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8473>
+# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00079.html>
+#
+# Here's the bug: hp depmode will prefix VPATH to the object file name,
+# thus the second gmake will invoke depcomp with object='../../src/foo.o',
+# causing errors such as (broken on multiple lines for clarity):
+#
+#   cpp: "", line 0: error 4066: Cannot create
+#        "../../gllib/.deps/nonblocking.TPo" file for
+#        "-M../../gllib/.deps/nonblocking.TPo" option.
+#        (No such file or directory[errno=2])
+#
+
+# -------------------------------------------------------------------------
+
+# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00140.html>
+# <http://lists.gnu.org/archive/html/automake-patches/2011-05/msg00019.html>
+#
+# A partial failure of an earlier version of this test; some bad
+# post-processing of the '*.Po' files led to the following broken
+# contents of 'src/sub/.deps/subfoo.Po':
+#
+#  > sub/subfoo.o: ../../depmod-data.dir/src/sub/subfoo.c \
+#  >   ../../depmod-data.dir/src/foo.h
+#  > ../../depmod-data.dir/src/sub/subfoo.c \:
+#  >   ../../depmod-data.dir/src/foo.h:
+#
+# which caused make to die with an error like:
+#
+#  "sub/.deps/subfoo.Po:3: *** missing separator.  Stop."
+
+# -------------------------------------------------------------------------
+
+# This expects ./defs has already been included has already been included..
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+longpath=this-is/a-path/which-has/quite-a/definitely/truly/long_long_name
+cachevar=am_cv_CC_dependencies_compiler_type
+
+srctree=depmod-1.0
+mkdir $srctree
+cd $srctree
+
+cd_top ()
+{
+  cd "$ocwd" || fatal_ "cannot chdir back to top directory"
+}
+
+delete ()
+{
+  test -f "$1" || fatal_ "$1: file does not exist"
+  rm -f "$1" || fatal_ "$1: couldn't remove"
+}
+
+edit ()
+{
+  file=$1; shift
+  sed "$@" <"$file" > t && mv -f t "$file" \
+    || fatal_ "$file: editing of file failed"
+}
+
+rewrite ()
+{
+  file=$1; shift
+  "$@" > "$file" || fatal_ "$file: couldn't rewrite"
+}
+
+setup_srcdir ()
+{
+  srcdir=$1 # This is intended to be global.
+  mkdir -p "$srcdir" \
+    || fatal_ "couldn't create source directory '$srcdir'"
+  cp -pR "$ocwd/$srctree"/* "$srcdir"/ \
+    || fatal_ "couldn't populate source directory '$srcdir'"
+}
+
+
+check_no_depfiles ()
+{
+  find . -name '*.Plo' -o -name '*.Po' | grep . && return 1
+  return 0
+}
+
+check_distclean ()
+{
+  # "make distcleancheck" can only run from a VPATH build.
+  if test $vpath = no; then
+    make_ok distclean && check_no_depfiles
+  else
+    $MAKE distcleancheck
+  fi
+}
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+`if test $depcomp_with_libtool = yes; then
+  echo AC_PROG_LIBTOOL
+else
+  echo AC_PROG_RANLIB
+fi`
+AC_CONFIG_FILES([Makefile src/Makefile])
+AC_OUTPUT
+END
+
+mkdir build-aux sub src src/sub2
+
+case $depcomp_with_libtool in
+  yes)
+    po=Plo objext=lo a=la
+    normalized_target=libfoo_la
+    # On platforms requiring that no undefined symbols exist in order
+    # to build shared libraries (e.g. Windows DLLs), you have to
+    # explicitly declare that the libtool library you are building
+    # does not actually have any undefined symbols, for libtool to
+    # even try to build it as a shared library.  Without that
+    # explicit declaration, libtool falls back to a static library
+    # only, regardless of any --enable-shared flags etc.
+    LIBPRIMARY=LTLIBRARIES LINKADD=LIBADD NOUNDEF=-no-undefined
+    libbaz_ldflags="libbaz_${a}_LDFLAGS = $NOUNDEF"
+    echo lib_LTLIBRARIES = libfoo.la >> Makefile.am
+    make_ok ()
+    {
+      $MAKE ${1+"$@"} >output 2>&1 || { cat output; return 1; }
+      cat output
+      $FGREP 'unknown directive' output && return 1
+      rm -f output
+      # Checks for stray files possibly left around by less common
+      # depmodes.
+      find . -name '*.[ud]' | grep . && return 1
+      return 0
+    }
+    ;;
+  no)
+    po=Po objext='$(OBJEXT)' a=a
+    normalized_target=foo
+    LIBPRIMARY=LIBRARIES LINKADD=LDADD NOUNDEF=
+    libbaz_ldflags=
+    echo bin_PROGRAMS = foo >> Makefile.am
+    make_ok ()
+    {
+      $MAKE ${1+"$@"}
+    }
+    ;;
+  *)
+    fatal_ "invalid value '$depcomp_with_libtool' for variable" \
+           "\$depcomp_with_libtool"
+    ;;
+esac
+
+cat >> Makefile.am <<END
+SUBDIRS = src
+# We include subfoo only to be sure that the munging in depcomp
+# doesn't remove too much from the object file name.
+${normalized_target}_SOURCES = foo.c sub/subfoo.c foo.h sub/subfoo.h
+${normalized_target}_LDFLAGS = $NOUNDEF
+${normalized_target}_${LINKADD} = src/libbaz.$a
+
+.PHONY: grep-test
+grep-test:
+## For debugging.
+       cat \$(DEPDIR)/foo.$po || :
+       cat \$(DEPDIR)/subfoo.$po || :
+       cat src/\$(DEPDIR)/baz.$po || :
+       cat src/sub2/\$(DEPDIR)/sub2foo.$po || :
+## Checks done here.
+       grep '^foo.$objext.*:' \$(DEPDIR)/foo.$po
+       grep '^subfoo\.$objext.*:' \$(DEPDIR)/subfoo.$po
+       grep '^baz\.$objext.*:' src/\$(DEPDIR)/baz.$po
+       grep '^sub2/sub2foo\.$objext.*:' src/sub2/\$(DEPDIR)/sub2foo.$po
+END
+
+cat > src/Makefile.am <<END
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_${LIBPRIMARY} = libbaz.$a
+# We include sub2foo only to be sure that the munging in depcomp
+# doesn't remove too much from the object file name.
+libbaz_${a}_SOURCES = baz.c sub2/sub2foo.c baz.h sub2/sub2foo.h
+$libbaz_ldflags
+END
+
+cat > foo.c <<'END'
+#include "foo.h"
+#include "src/baz.h"
+#include <stdlib.h>
+int main (void)
+{
+  printf ("foo bar\n");
+  exit (EXIT_SUCCESS + subfoo () + baz ());
+}
+END
+
+cat > foo.h <<'END'
+#include <stdio.h>
+#include "sub/subfoo.h"
+END
+
+cat > sub/subfoo.c <<'END'
+#include "sub/subfoo.h"
+int subfoo (void) { return 0; }
+END
+
+echo '/* empty */' > src/sub2/sub2foo.h
+
+cat > sub/subfoo.h <<'END'
+#include <stdio.h>
+extern int subfoo (void);
+END
+
+cat > src/baz.c <<'END'
+#include "baz.h"
+int baz (void) { return 0; }
+END
+
+cat > src/baz.h <<'END'
+extern int baz (void);
+END
+
+cat > src/sub2/sub2foo.c <<'END'
+#include "sub2foo.h"
+int sub2foo (void) { return 0; }
+END
+
+test $depcomp_with_libtool = no || libtoolize \
+  || fatal_ "libtoolize failed"
+$ACLOCAL && $AUTOCONF && $AUTOMAKE -a \
+  || fatal_ "autotools failed"
+test -f build-aux/depcomp \
+  || fatal_ "depcomp script not installed"
+
+# To offer extra coverage for the depmodes (like "aix" of "hp2") where the
+# name of the compiler-generated depfiles can depend on whether libtool is
+# in use *and* on which kind of libraries libtool is building (static,
+# shared, or both), we would like to run the libtool-oriented tests thrice:
+# once after having run configure with the '--disable-shared' option, once
+# after having run it with the '--enable-shared' options, and once by
+# leaving it to configure to automatically select which kind of library (or
+# libraries) to build.
+#
+# But doing such three-fold checks unconditionally for all the depmodes
+# would slow down the already too slow libtool tests unacceptably (up to a
+# 150-200% factor), with no real gain in coverage for most of the depmodes.
+# So, since the depmodes that would benefit from the extra tests are never
+# forced to configure in out tests below, but can only be automatically
+# selected by '--enable-dependency-tracking', we make this threefold check
+# only in this later case.
+
+if test $depmode,$depcomp_with_libtool = auto,yes; then
+  do_all_tests ()
+  {
+    do_test default
+    do_test noshared --disable-shared
+    do_test nostatic --disable-static
+  }
+else
+  do_all_tests () { do_test; }
+fi
+
+case $depmode in
+  auto)
+    displayed_depmode='..*' # At least one character long.
+    cfg_deptrack=--enable-dependency-tracking ;;
+  disabled)
+    displayed_depmode=none
+    cfg_deptrack=--disable-dependency-tracking ;;
+  *)
+    displayed_depmode="(cached) $depmode"
+    cfg_deptrack="$cachevar=$depmode"
+    # Sanity check: ensure the cache variable we force is truly
+    # used by configure.
+    $FGREP $cachevar configure \
+      || fatal_ "configure lacks required cache variable '$cachevar'";;
+esac
+
+cd_top
+
+do_test ()
+{
+  cd_top
+  if test $vpath = no; then
+    pfx="in-tree build"
+  else
+    pfx="$vpath VPATH"
+  fi
+  if test $# -gt 0; then
+    subdir=$1; shift
+    pfx="$pfx, $subdir"
+    test -d $subdir || mkdir $subdir || fatal_ "creating directory $subdir"
+    cd $subdir
+  fi
+  pfx="[$pfx]"
+  case $vpath in
+    simple)
+      mkdir -p vpath-simple/build
+      cd vpath-simple/build
+      setup_srcdir ..
+      ;;
+    long)
+      mkdir -p vpath-long/src vpath-long/wrk
+      cd vpath-long/wrk
+      setup_srcdir ../src/$longpath
+      ;;
+    absolute)
+      mkdir -p vpath-abs/build
+      cd vpath-abs/build
+      absdir="`(cd .. && pwd)`" || fatal_ "getting absolute directory"
+      setup_srcdir "$absdir/vpath-abs"
+      unset absdir
+      ;;
+    no)
+      mkdir intree
+      cd intree
+      setup_srcdir .
+      ;;
+    *)
+      fatal_ "invalid value '$vpath' for variable \$vpath"
+      ;;
+  esac
+
+  command_ok_ \
+    "$pfx configure" \
+    "$srcdir/configure" $cfg_deptrack ${1+"$@"} >stdout
+  cat stdout
+
+  command_ok_ \
+    "$pfx right depmode selected" \
+    grep "^checking dependency style .*\.\.\. $displayed_depmode$" stdout
+  rm -f stdout
+
+  command_ok_ "$pfx simple make" make_ok
+  # Some bugs in VPATH builds only kick in during a rebuild.
+  command_ok_ "$pfx clean & rebuild" eval '$MAKE clean && make_ok'
+
+  if test $depmode = disabled; then
+      command_ok_ "$pfx no dependency files generated" check_no_depfiles
+      r=ok \
+        && grep "[ $tab]depmode=none" Makefile \
+        && rewrite "$srcdir"/src/sub2/sub2foo.h echo 'choke me' \
+        && delete "$srcdir"/sub/subfoo.h \
+        && make_ok \
+        || r='not ok'
+      result_ "$r" "$pfx dependency tracking is truly disabled"
+  elif grep "[ $tab]depmode=none" Makefile; then
+    skip_row_ 2 -r "automatic dependency tracking couldn't be activated"
+  else
+    command_ok_ "$pfx generated $po files look correct" $MAKE grep-test
+    r=ok \
+      && : "Some checks in the subdir." \
+      && $sleep \
+      && : "Ensure rebuild rules really kick in." \
+      && rewrite "$srcdir"/src/sub2/sub2foo.h echo 'choke me' \
+      && cd src \
+      && not $MAKE  \
+      && cd .. \
+      && : "Ensure the deleted header bug is fixed." \
+      && delete "$srcdir"/src/sub2/sub2foo.h \
+      && edit "$srcdir"/src/sub2/sub2foo.c -e 1d \
+      && cd src \
+      && make_ok \
+      && : "Now do similar checks for the parent directory." \
+      && cd .. \
+      && rewrite "$srcdir"/sub/subfoo.h echo 'choke me' \
+      && not $MAKE \
+      && delete "$srcdir"/sub/subfoo.h \
+      && edit "$srcdir"/sub/subfoo.c -e 1d \
+      && edit "$srcdir"/foo.h -e 2d \
+      && make_ok \
+      || r='not ok'
+    result_ "$r" "$pfx dependency tracking works"
+  fi
+
+  command_ok_ "$pfx make distclean" check_distclean
+  cd_top
+}
+
+for vpath in no simple long absolute; do
+  do_all_tests
+done
+
+:
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
new file mode 100644
index 0000000..5d36102
--- /dev/null
+++ b/t/ax/distcheck-hook-m4.am
@@ -0,0 +1,30 @@
+## Data files for some tests.  Not used in the automake build system.
+##
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+distcheck-hook:
+       @fatal () { echo "$@: $$*" >&2; exit 1; }; \
+       $(am__cd) $(distdir) && chmod u+w . && mkdir _m4 \
+         || fatal "cannot setup distdir"; \
+       $(ACLOCAL) -I _m4 $(ACLOCAL_AMFLAGS) --install --output=_am.m4 \
+         || fatal "cannot regenerate aclocal.m4"; \
+       lst=`ls _m4 | tr '\012\015' '  '`; \
+       if test -n "$$lst"; then \
+         fatal "required m4 files not distributed or outdated: $$lst"; \
+       fi; \
+       $(AUTOCONF) -o /dev/null || fatal "can't remake configure"; \
+       rm -rf _m4 _am.m4 autom4te.cache && chmod a-w . \
+         || fatal "cannot reset distdir"
diff --git a/t/ax/extract-testsuite-summary.pl 
b/t/ax/extract-testsuite-summary.pl
new file mode 100644
index 0000000..28a9c35
--- /dev/null
+++ b/t/ax/extract-testsuite-summary.pl
@@ -0,0 +1,30 @@
+#! /usr/bin/env perl
+# Extract the testsuite summary generated by the parallel-tests harness
+# from the output of "make check".
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use warnings FATAL => 'all';
+use strict;
+
+my $br = '=' x 76;
+my @sections = ('');
+while (<>)
+  {
+    push @sections, $_, '' if /$br/;
+    $sections[-1] .= $_ if !/$br/;
+  }
+print @sections[1..$#sections-1];
diff --git a/t/ax/is b/t/ax/is
new file mode 100755
index 0000000..1e1c0ce
--- /dev/null
+++ b/t/ax/is
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that two whitespace-separated lists are equal.
+# Assumes the two lists are passed on the command line separated by
+# a '==' string.
+# This script is useful to test equality of lists in makefile rules,
+# in the face of variables defined through line-continuations,
+# automake rewrites and expansions of empty variables.
+
+set -e
+set -u
+
+# Initialize before unsetting, for shells (like older bash or Solaris
+# ksh) that fail to unset variables that are already unset.
+exp= got=; unset exp got
+seen_eqeq=no
+while test $# -gt 0; do
+  if test x"$1" = x"=="; then
+    if test $seen_eqeq = no; then
+      seen_eqeq=yes
+    else
+      echo "$0: more than one '==' argument seen on command line" >&2
+      exit 2
+    fi
+  else
+    if test $seen_eqeq = no; then
+      got=${got+"$got "}$1
+    else
+      exp=${exp+"$exp "}$1
+    fi
+  fi
+  shift
+done
+
+if test $seen_eqeq = no; then
+  echo "$0: no '==' argument seen on command line" >&2
+  exit 2
+fi
+
+test x"${exp-}" = x"${got-}"
diff --git a/t/ax/plain-functions.sh b/t/ax/plain-functions.sh
new file mode 100644
index 0000000..e6483dc
--- /dev/null
+++ b/t/ax/plain-functions.sh
@@ -0,0 +1,40 @@
+# -*- shell-script -*-
+#
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Helper functions used by "plain" tests of the Automake testsuite
+# (i.e., tests that don't use any test protocol).
+
+# Print warnings (e.g., about skipped and failed tests) to this file
+# number.  Override by putting, say:
+#   AM_TESTS_ENVIRONMENT = stderr_fileno_=9; export stderr_fileno_;
+#   AM_TESTS_FD_REDIRECT = 9>&2
+# in your Makefile.am.
+# This is useful when using automake's parallel tests mode, to print the
+# reason for skip/failure to console, rather than to the *.log files.
+: ${stderr_fileno_=2}
+
+# Copied from Gnulib's 'tests/init.sh'.
+warn_ () { echo "$@" 1>&$stderr_fileno_; }
+fail_ () { warn_ "$me: failed test: $@"; Exit 1; }
+skip_ () { warn_ "$me: skipped test: $@"; Exit 77; }
+fatal_ () { warn_ "$me: hard error: $@"; Exit 99; }
+framework_failure_ () { warn_ "$me: set-up failure: $@"; Exit 99; }
+
+# For compatibility with TAP functions.
+skip_all_ () { skip_ "$@"; }
+
+:
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
new file mode 100644
index 0000000..3a5db03
--- /dev/null
+++ b/t/ax/tap-functions.sh
@@ -0,0 +1,239 @@
+# -*- shell-script -*-
+#
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Helper functions used by TAP-producing tests of the Automake testsuite.
+
+#
+# IMPORTANT: All the functions defined in this file can *not* be used
+#            from within a subshell, unless explicitly noted otherwise.
+#
+
+# The counts of the TAP test results seen so far: total count and
+# per-result counts.
+tap_count_=0
+tap_pass_count_=0
+tap_skip_count_=0
+tap_fail_count_=0
+tap_xfail_count_=0
+tap_xpass_count_=0
+
+# The first "test -n" tries to avoid extra forks when possible.
+if test -n "${ZSH_VERSION}${BASH_VERSION}" \
+     || (eval 'test $((1 + 1)) = 2') >/dev/null 2>&1
+then
+  # Outer use of 'eval' needed to protect dumber shells from parsing
+  # errors.
+  eval 'incr_ () { eval "$1=\$((\${$1} + 1))"; }'
+else
+  incr_ () { eval "$1=\`expr \${$1} + 1\`"; }
+fi
+
+# not COMMAND [ARGS...]
+# ---------------------
+# Run the given command and invert its exit status.
+not ()
+{
+  if "$@"; then return 1; else return 0; fi
+}
+
+# plan_ [unknown|later|lazy|now|NUMBER-OF-PLANNED-TESTS]
+# ------------------------------------------------------
+# Print a TAP plan for the given number of tests.  This must be called
+# before reporting any test result.  If called with the special argument
+# "unknown" or "later", it will do nothing, expecting the calling script
+# to declare the plan later.  If called with the special argument "lazy"
+# or "now", it will print a TAP plan that accounts for the number of tests
+# seen so far.
+plan_ ()
+{
+  if test $# -eq 0; then
+    bailout_ "plan_: missing argument"
+  elif test $# -ge 2; then
+    bailout_ "plan_: too many arguments"
+  elif test x"$planned_" != x"none" && test x"$planned_" != x"later"; then
+    bailout_ "plan_: called to many times"
+  elif test x"$1" = x"unknown" || test x"$1" = x"later"; then
+    # This means we want to get back later to declaring the TAP plan.
+    planned_=later
+    return 0
+  elif test x"$1" = x"lazy" || test x"$1" = x"now"; then
+    planned_=$tap_count_ # Number of test results seen so far.
+  elif test $1 -ge 0; then
+    planned_=$1
+  else
+    bailout_ "plan_: invalid argument '$1'"
+  fi
+  echo "1..$planned_"
+}
+planned_=none
+
+# diag_ [EXPLANATION]
+# ------------------
+# Report the given text as TAP diagnostic.  Assumes the string denoting
+# TAP diagnostic lines is stored in the '$diag_string_' variable; this is
+# done to allow better interplay with TAP drivers that allow such a string
+# to be configured.
+diag_ ()
+{
+  test $# -eq 0 || echo "$diag_string_ $*"
+}
+
+# Used by the 'diag_' function above.  User-overridable.
+diag_string_="#"
+
+# warn_ [EXPLANATION]
+# ------------------
+# Give a warning (using TAP diagnostic).
+warn_ ()
+{
+  case $# in
+    0) diag_ "WARNING: (unknown warning)";;
+    *) diag_ "WARNING: $*";;
+  esac
+}
+
+# result_ RESULT [-D DIRECTIVE] [-r REASON] [--] [DESCRIPTION...]
+# ---------------------------------------------------------------
+# Report a test case with the given RESULT (valid values are "ok" and
+# "not ok") and the given DESCRIPTION (if any).  If DIRECTIVE is given
+# and non-empty (valid values being "TODO" and "SKIP"), it will be
+# reported too, with the REASON (if given) appended.
+result_ ()
+{
+  set +x # Don't pollute the log files.
+  test $# -gt 0 || bailout_ "result_: missing argument"
+  tap_result_=$1; shift
+  case $tap_result_ in
+    "ok"|"not ok") ;;
+    *) bailout_ "result_: invalid result '$tap_result'" ;;
+  esac
+  tap_directive_= tap_reason_=
+  while test $# -gt 0; do
+    case $1 in
+      -D|--directive) tap_directive_=$2; shift;;
+      -r|--reason) tap_reason_=$2; shift;;
+      --) shift; break;;
+      -*) bailout_ "result_: invalid option '$1'";;
+       *) break;;
+    esac
+    shift
+  done
+  case $tap_directive_ in
+    ""|TODO|SKIP) ;;
+    *) bailout_ "result_: invalid directive '$directive_'" ;;
+  esac
+  incr_ tap_count_
+  case $tap_result_,$tap_directive_ in
+    ok,) incr_ tap_pass_count_;;                # Passed.
+    not\ ok,TODO) incr_ tap_xfail_count_;;      # Expected failure.
+    not\ ok,*) incr_ tap_fail_count_ ;;         # Failed.
+    ok,TODO) incr_ tap_xpass_count_ ;;          # Unexpected pass.
+    ok,SKIP) incr_ tap_skip_count_ ;;           # Skipped.
+    *) bailout_ "internal error in 'result_'";; # Can't happen.
+  esac
+  tap_text_="$tap_result_ $tap_count_"
+  if test x"$*" != x; then
+    tap_text_="$tap_text_ - $*"
+  fi
+  if test x"$tap_directive_" != x; then
+    tap_text_="$tap_text_ # $tap_directive_"${tap_reason_:+" $tap_reason_"}
+  fi
+  printf '%s\n' "$tap_text_"
+  set -x # Restore shell xtraces.
+}
+
+#  Shorthands for common usages of 'result_'.
+ok_ () { result_ 'ok' ${1+"$@"}; }
+not_ok_ () { result_ 'not ok' ${1+"$@"}; }
+skip_ () { result_ 'ok' -D SKIP ${1+"$@"}; }
+
+# skip_row_ COUNT [-r REASON] [--] [DESCRIPTION...]
+# -------------------------------------------------
+# Report a COUNT of skipped test, with the given reason and descriptions
+# (if any).  Useful to avoid cascade failures in case a fair number of
+# tests depend on an earlier one that failed.
+skip_row_ ()
+{
+  skip_count_=$1; shift
+  for i_ in `seq_ $skip_count_`; do skip_ ${1+"$@"}; done
+}
+
+# skip_all_ [REASON ...]
+# ----------------------
+# Skip all the tests in a test script.  Must be used before calling 'plan_'
+# or reporting any test result.  Can't be used from within a subshell.
+skip_all_ ()
+{
+  echo "1..0 # SKIP" ${1+"$@"}
+  planned_=0
+  Exit 0
+}
+
+# bailout_ [REASON ...]
+# ---------------------
+# Stop the execution of the current test suite right now, due to an
+# unrecoverable error.  Can be called at any point, but cannot be used
+# from within a subshell.
+bailout_ ()
+{
+  echo 'Bail out!' ${1+"$@"}
+  Exit 99
+}
+
+# fatal_ [REASON ...]
+# -------------------
+# Same as 'bailout_'; for compatibility with 'plain-functions.sh'.
+fatal_ ()
+{
+  bailout_ ${1+"$@"}
+}
+
+# framework_failure_ [REASON ...]
+# -------------------------------
+# Stop the execution of the current test suite right now, due to an
+# unrecoverable error in the set-up of the test case.  Can be called
+# at any point, but cannot be used from within a subshell.
+framework_failure_ ()
+{
+  bailout_ "set-up failure"${1+": $*"}
+}
+
+# command_ok_ TEST-DESCRIPTION [OPTIONS..] [--] CMD [ARGS...]
+# -----------------------------------------------------------
+# Helper subroutine for when a TAP result must be determined by the
+# outcome of a command.
+command_ok_ ()
+{
+  tap_directive_= tap_reason_=
+  test $# -gt 0 || bailout_ "command_ok_: missing argument"
+  tap_description_=$1; shift
+  while test $# -gt 0; do
+    case $1 in
+      -D|--directive) tap_directive_=$2; shift;;
+      -r|--reason) tap_reason_=$2; shift;;
+      --) shift; break;;
+      -*) bailout_ "command_ok_: invalid option '$1'";;
+       *) break;;
+    esac
+    shift
+  done
+  tap_result_="ok"; "$@" || tap_result_="not ok"
+  result_ "$tap_result_" -D "$tap_directive_" -r "$tap_reason_" \
+          -- "$tap_description_"
+}
+
+:
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
new file mode 100644
index 0000000..70487c3
--- /dev/null
+++ b/t/ax/tap-setup.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Auxiliary shell script that copies the common data and files used by
+# many tests on TAP support into the current directory.  It should be
+# sourced by client test scripts, and assumes the auxiliary test
+# 'tap-common-setup.test' has been run beforehand (it will error out
+# if this is not the case).
+
+# Check that we are running from a proper directory: last thing we want
+# is to overwrite some random user files.
+test -f ../../defs-static && test -f ../../defs && test -d ../../t \
+  || fatal_ "running from a wrong directory"
+
+test ! -f Makefile.am || mv Makefile.am Makefile.am~ \
+  || fatal_ "failed to save Makefile.am"
+
+test -d ../tap-common-setup.dir && cp -fpR ../tap-common-setup.dir/* . \
+  || fatal_ "couldn't get precomputed data files"
+
+fetch_tap_driver
+
+if test -f Makefile.am~; then
+  mv -f Makefile.am~ Makefile.am \
+    || fatal_ "failed to restore Makefile.am"
+  echo 'TEST_LOG_DRIVER = $(PERL) $(srcdir)/tap-driver' >> Makefile.am \
+    || fatal_ "failed to update Makefile.am"
+  $AUTOMAKE Makefile \
+    || fatal_ "failed to remake Makefile.in"
+  ./config.status Makefile \
+    || fatal_ "failed to remake Makefile"
+fi
+
+:
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
new file mode 100644
index 0000000..6e6a74a
--- /dev/null
+++ b/t/ax/tap-summary-aux.sh
@@ -0,0 +1,359 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Auxiliary script for tests on TAP support: checking testsuite summary.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+br='============================================================================'
+
+case $use_colors in
+  yes|no) ;;
+  *) fatal_ "invalid \$use_colors value '$use_colors'"
+esac
+
+fetch_tap_driver
+
+cat > configure.ac <<END
+AC_INIT([GNU AutoTAP], [5.12], address@hidden)
+AM_INIT_AUTOMAKE([parallel-tests])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+TEST_LOG_COMPILER = cat
+TESTS = all.test
+END
+
+# The following shell variables are influential for this function:
+#  - expect_failure
+#  - use_colors
+do_check ()
+{
+  case $#,$1 in
+    1,--pass) expect_failure=no;;
+    1,--fail) expect_failure=yes;;
+           *) fatal_ "invalid usage of 'do_check'";;
+  esac
+  shift
+  cat > summary.exp
+  cat all.test
+  st=0
+  if test $use_colors = yes; then
+    make_cmd="env TERM=ansi AM_COLOR_TESTS=always $MAKE -e"
+  else
+    make_cmd=$MAKE
+  fi
+  $make_cmd check > stdout || st=$?
+  cat stdout
+  if test $expect_failure = yes; then
+    test $st -gt 0 || Exit 1
+  else
+    test $st -eq 0 || Exit 1
+  fi
+  $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
+    || fatal_ "cannot extract testsuite summary"
+  cat summary.exp
+  cat summary.got
+  if test $use_colors = yes; then
+    # Use cmp, not diff, because the files might contain binary data.
+    compare=cmp
+  else
+    compare=diff
+  fi
+  $compare summary.exp summary.got || Exit 1
+}
+
+if test $use_colors = yes; then
+  red=''
+  grn=''
+  lgn=''
+  blu=''
+  mgn=''
+  brg=''
+  std=''
+  echo AUTOMAKE_OPTIONS = color-tests >> Makefile.am
+else
+  red= grn= lgn= blu= mgn= brg= std=
+fi
+
+  success_header="\
+${grn}${br}${std}
+${grn}Testsuite summary for GNU AutoTAP 5.12${std}
+${grn}${br}${std}"
+
+  success_footer=${grn}${br}${std}
+
+  failure_header="\
+${red}${br}${std}
+${red}Testsuite summary for GNU AutoTAP 5.12${std}
+${red}${br}${std}"
+
+  failure_footer="\
+${red}${br}${std}
+${red}See ./test-suite.log${std}
+${red}Please report to address@hidden
+${red}${br}${std}"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+# 1 pass.
+{ echo 1..1 && echo ok; } > all.test
+do_check --pass <<END
+$success_header
+${brg}# TOTAL: 1${std}
+${grn}# PASS:  1${std}
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+# 1 skip.
+{ echo 1..1 && echo 'ok # SKIP'; } > all.test
+do_check --pass <<END
+$success_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+${blu}# SKIP:  1${std}
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+# 1 xfail.
+{ echo 1..1 && echo 'not ok # TODO'; } > all.test
+do_check --pass <<END
+$success_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+# 1 fail.
+{ echo 1..1 && echo not ok; } > all.test
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+${red}# FAIL:  1${std}
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+# 1 xpass.
+{ echo 1..1 && echo 'ok # TODO'; } > all.test
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+${red}# XPASS: 1${std}
+# ERROR: 0
+$failure_footer
+END
+
+# 1 hard error.
+{ echo 1..1 && echo 'Bail out!'; } > all.test
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+# 3 non-failing results.
+cat > all.test <<END
+1..3
+ok
+not ok # TODO
+ok # SKIP
+END
+do_check --pass <<END
+$success_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+# 1 pass, 1 skip, 1 fail.
+cat > all.test <<END
+1..3
+ok
+ok # SKIP
+not ok
+END
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+# XFAIL: 0
+${red}# FAIL:  1${std}
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+# 1 pass, 1 xfail, 1 xpass.
+cat > all.test <<END
+1..3
+ok
+ok # TODO
+not ok # TODO
+END
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+# SKIP:  0
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+${red}# XPASS: 1${std}
+# ERROR: 0
+$failure_footer
+END
+
+# 1 skip, 1 xfail, 1 error.
+cat > all.test <<END
+1..3
+ok # SKIP
+not ok # TODO
+Bail out!
+END
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+# PASS:  0
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+# 1 of each kind
+cat > all.test <<END
+1..6
+ok
+not ok
+ok # TODO
+not ok # TODO
+ok # SKIP
+Bail out!
+END
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 6${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+${red}# FAIL:  1${std}
+${red}# XPASS: 1${std}
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+# Prepare some common data for later.
+for i in 0 1 2 3 4 5 6 7 8 9; do
+  for j in 0 1 2 3 4 5 6 7 8 9; do
+    echo "ok"
+    echo "not ok # TODO"
+    echo "ok # SKIP"
+  done
+done > tap
+
+# Lots of non-failures (300 per kind).
+(cat tap && cat tap && cat tap) > all.test
+test `wc -l <all.test` -eq 900 || Exit 99 # Sanity check.
+echo 1..900 >> all.test # Test plan.
+do_check --pass <<END
+$success_header
+${brg}# TOTAL: 900${std}
+${grn}# PASS:  300${std}
+${blu}# SKIP:  300${std}
+${lgn}# XFAIL: 300${std}
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+# 1 failure and lots of non-failures means failure.
+(cat tap && echo "not ok" && cat tap) > all.test
+test `wc -l <all.test` -eq 601 || Exit 99 # Sanity check.
+echo 1..601 >> all.test # Test plan.
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 601${std}
+${grn}# PASS:  200${std}
+${blu}# SKIP:  200${std}
+${lgn}# XFAIL: 200${std}
+${red}# FAIL:  1${std}
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+# 1 error and lots of non-failures means failure.
+(cat tap && sed 30q tap && echo 'Bail out!') > all.test
+test `wc -l <all.test` -eq 331 || Exit 99 # Sanity check.
+echo 1..331 >> all.test # Test plan.
+do_check --fail <<END
+$failure_header
+${brg}# TOTAL: 331${std}
+${grn}# PASS:  110${std}
+${blu}# SKIP:  110${std}
+${lgn}# XFAIL: 110${std}
+# FAIL:  0
+# XPASS: 0
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+:
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
new file mode 100644
index 0000000..309d473
--- /dev/null
+++ b/t/ax/testsuite-summary-checks.sh
@@ -0,0 +1,106 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the testsuite summary with the parallel-tests harness.  This
+# script is meant to be sourced by other test script, so that it can
+# be used to check different scenarios (colorized and non-colorized
+# testsuite output, packages with and without bug-report addresses,
+# testsuites in subdirectories, ...)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+case $use_colors in
+  yes)
+    AM_COLOR_TESTS=always; export AM_COLOR_TESTS
+    TERM=ansi; export TERM
+    am_opts='parallel-tests color-tests'
+    ;;
+  no)
+    am_opts='parallel-tests'
+    ;;
+  *)
+    fatal_ "invalid use_colors='$use_colors'";;
+esac
+
+cat > configure.ac <<END
+AC_INIT([GNU AutoFoo], [7.1], address@hidden)
+AM_INIT_AUTOMAKE([$am_opts])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TEST_EXTENSIONS = .t
+T_LOG_COMPILER = $(SHELL) $(srcdir)/log-compiler
+## Will be defined at runtime.
+TESTS =
+$(TESTS):
+END
+
+cat > log-compiler <<'END'
+#!/bin/sh
+case "$1" in
+  pass*|*/pass*|xpass*|*/xpass*) exit 0;;
+  fail*|*/fail*|xfail*|*/xfail*) exit 1;;
+  skip*|*/skip*) exit 77;;
+  error*|/error*) exit 99;;
+  copy*|*/copy*) cat "$1";;
+  *) exit 99;;
+esac
+END
+
+# Quite complexish, but allow the tests in client scripts to be written
+# in a "data-driven fashion".
+do_check ()
+{
+  cat > summary.exp
+  expect_failure=false
+  xfail_tests=''
+  tests="TESTS='$*'"
+  for t in $*; do
+    case $t in fail*|xpass*|error*) expect_failure=:;; esac
+    case $t in xfail*|xpass*) xfail_tests="$xfail_tests $t";; esac
+  done
+  test -z "$xfail_tests" || xfail_tests="XFAIL_TESTS='$xfail_tests'"
+  st=0
+  eval "env $tests $xfail_tests \$MAKE -e check > stdout || st=\$?"
+  cat stdout
+  if $expect_failure; then
+    test $st -gt 0 || Exit 1
+  else
+    test $st -eq 0 || Exit 1
+  fi
+  $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
+   || fatal_ "cannot extract testsuite summary"
+  cat summary.exp
+  cat summary.got
+  if test $use_colors = yes; then
+    # Use cmp, not diff, because the files might contain binary data.
+    compare=cmp
+  else
+    compare=diff
+  fi
+  $compare summary.exp summary.got || Exit 1
+}
+
+br='============================================================================'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+:
diff --git a/t/ax/trivial-test-driver b/t/ax/trivial-test-driver
new file mode 100644
index 0000000..3968acb
--- /dev/null
+++ b/t/ax/trivial-test-driver
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Test driver for a very simple test protocol used by the Automake
+# testsuite to check support for custom test drivers allowing for more
+# test results per test script.
+#
+# The exit status of the wrapped script is ignored.  Lines in its stdout
+# and stderr beginning with 'PASS', 'FAIL', 'XFAIL', 'XPASS', 'SKIP' or
+# 'ERROR' count as a test case result with the obviously-corresponding
+# outcome.  Every other line is ignored for what concerns the testsuite
+# outcome.
+#
+# This script is used at least by the 'driver-custom-multitest*.test'
+# tests.
+#
+
+# Help to avoid typo-related bugs.
+set -u
+
+## Option parsing.
+
+test_name=INVALID.NAME
+log_file=BAD.LOG
+trs_file=BAD.TRS
+while test $# -gt 0; do
+  case $1 in
+    --test-name) test_name=$2; shift;;
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    # Ignored.
+    --expect-failure) shift;;
+    --color-tests) shift;;
+    --enable-hard-errors) shift;;
+    # Explicitly terminate option list.
+    --) shift; break;;
+    # Shouldn't happen
+    *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+
+## Log file header.
+{
+  echo "RUN: $test_name"
+  echo "RUN: $test_name" | sed 's/./=/g'
+  echo
+} > $log_file
+
+## Run the test script, get test cases results, display them on console.
+
+"$@" 2>&1 | tee -a $log_file | (
+  i=0 st=0
+  exec 5> $trs_file
+  while read line; do
+    result=
+    case $line in
+      PASS:*)  result=PASS  ;;
+      FAIL:*)  result=FAIL  ;;
+      XPASS:*) result=XPASS ;;
+      XFAIL:*) result=XFAIL ;;
+      SKIP:*)  result=SKIP  ;;
+      ERROR:*) result=ERROR ;;
+    esac
+    if test -n "$result"; then
+      case $result in FAIL|XPASS|ERROR) st=1;; esac
+      # Output testcase result to console.
+      echo "$result: $test_name"
+      # Register testcase outcome for the log file.
+      echo ":test-result: $line" >&5
+      echo >&5
+    fi
+  done
+  if test $st -eq 0; then
+    recheck=no
+    copy_in_global_log=no
+  else
+    recheck=yes
+    copy_in_global_log=yes
+  fi
+  echo ":recheck: $recheck" >&5
+  echo ":copy-in-global-log: $copy_in_global_log" >&5
+  exec 5>&-
+) | awk '{ print $0 ", testcase " NR }'
+
+## And we're done.
+
+exit 0
diff --git a/t/backcompat.sh b/t/backcompat.sh
new file mode 100755
index 0000000..ec8292c
--- /dev/null
+++ b/t/backcompat.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test usage of AM_INIT_AUTOMAKE with two or three arguments, for
+# backward-compatibility.
+
+. ./defs || Exit 1
+
+cat > Makefile.am <<'END'
+.PHONY: test display
+
+## Might be useful for debugging.
+display:
+## The following should be substituted by AM_INIT_AUTOMAKE.
+       @echo PACKAGE = $(PACKAGE)
+       @echo VERSION = $(VERSION)
+## The following should not be substituted, as we used the
+## old form of AC_INIT.
+       @echo PACKAGE_NAME = $(PACKAGE_NAME)
+       @echo PACKAGE_VERSION = $(PACKAGE_VERSION)
+       @echo PACKAGE_TARNAME = $(PACKAGE_TARNAME)
+       @echo PACKAGE_STRING = $(PACKAGE_STRING)
+
+test: display
+       test x'$(PACKAGE)' = x'FooBar'
+       test x'$(VERSION)' = x'0.7.1'
+       test x'$(PACKAGE_NAME)' = x
+       test x'$(PACKAGE_VERSION)' = x
+       test x'$(PACKAGE_TARNAME)' = x
+       test x'$(PACKAGE_STRING)' = x
+END
+
+for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do
+  for am_extra_args in '' ', []' ', [:]' ', [false]'; do
+    rm -rf autom4te*.cache config* Makefile.in Makefile
+    unindent > configure.in <<END
+      $ac_init
+      AM_INIT_AUTOMAKE([FooBar], [0.7.1]$am_extra_args)
+      AC_CONFIG_FILES([Makefile])
+      AC_OUTPUT
+END
+    cat configure.in # For debugging.
+    $ACLOCAL
+    $AUTOCONF
+    $AUTOMAKE
+    ./configure
+    $MAKE test
+  done
+done
+
+:
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
new file mode 100755
index 0000000..ba9ec3b
--- /dev/null
+++ b/t/backcompat2.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Backward-compatibility test: check that AM_INIT_AUTOMAKE with two or
+# three arguments does AC_DEFINE the symbols PACKAGE and VERSION iff the
+# third argument is empty or non-existent.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+# A trick to make the test run muuuch faster, by avoiding repeated
+# runs of aclocal (one order of magnitude improvement in speed!).
+echo 'AC_INIT(x,0) AM_INIT_AUTOMAKE' > configure.in
+$ACLOCAL
+rm -rf configure.in autom4te.*
+
+touch install-sh missing
+
+cat > config.h.in <<'END'
+#undef PACKAGE
+#undef VERSION
+END
+
+for am_arg3 in ':' 'false' '#' ' '; do
+  unindent > configure.in <<END
+    AC_INIT
+    AC_CONFIG_HEADERS([config.h])
+    AM_INIT_AUTOMAKE([pkgname], [pkgversion], [$am_arg3])
+    AC_OUTPUT
+END
+  cat configure.in # For debugging.
+  $AUTOCONF
+  ./configure
+  cat config.h # For debugging.
+  # The non-empty third argument should prevent PACKAGE and VERSION
+  # from being AC_DEFINE'd.
+  $EGREP 'pkg(name|version)' config.h && Exit 1
+  # This is required because even relatively-recent versions of the
+  # BSD shell wrongly exit when the 'errexit' shell flag is active if
+  # the last command of a compound statement fails, even if it should
+  # be protected by the use of "&&".
+  :
+done
+
+for am_extra_args in '' ',' ', []'; do
+  unindent > configure.in <<END
+    AC_INIT
+    AC_CONFIG_HEADERS([config.h])
+    AM_INIT_AUTOMAKE([pkgname], [pkgversion]$am_extra_args)
+    AC_OUTPUT
+END
+  cat configure.in # For debugging.
+  $AUTOCONF
+  ./configure
+  cat config.h # For debugging.
+  grep '^ *# *define  *PACKAGE  *"pkgname" *$' config.h
+  grep '^ *# *define  *VERSION  *"pkgversion" *$' config.h
+done
+
+:
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
new file mode 100755
index 0000000..2377e88
--- /dev/null
+++ b/t/backcompat3.sh
@@ -0,0 +1,152 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Backward-compatibility test: check what happens when AC_INIT and
+# AM_INIT_AUTOMAKE are both given two or more arguments.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+empty=''
+
+cat > Makefile.am <<'END'
+## Leading ':;' here required to work around bugs of (at least) bash 3.2
+got: Makefile
+       @:; { \
+         echo 'PACKAGE = $(PACKAGE)'; \
+         echo 'VERSION = $(VERSION)'; \
+         echo 'PACKAGE_NAME = $(PACKAGE_NAME)'; \
+         echo 'PACKAGE_VERSION = $(PACKAGE_VERSION)'; \
+         echo 'PACKAGE_STRING = $(PACKAGE_STRING)'; \
+         echo 'PACKAGE_TARNAME = $(PACKAGE_TARNAME)'; \
+         echo 'PACKAGE_BUGREPORT = $(PACKAGE_BUGREPORT)'; \
+         echo 'PACKAGE_URL = $(PACKAGE_URL)'; \
+       } >$@
+END
+
+
+### Run 1 ###
+
+cat > configure.in <<END
+AC_INIT([ac_name], [ac_version])
+AM_INIT_AUTOMAKE([am_name], [am_version])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat configure.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cat >exp <<END
+PACKAGE = am_name
+VERSION = am_version
+PACKAGE_NAME = ac_name
+PACKAGE_VERSION = ac_version
+PACKAGE_STRING = ac_name ac_version
+PACKAGE_TARNAME = ac_name
+PACKAGE_BUGREPORT = $empty
+PACKAGE_URL = $empty
+END
+
+$MAKE got
+
+diff exp got
+
+
+### Run 2 ###
+
+cat > configure.in <<'END'
+dnl: 'AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument.
+dnl: Luckily, 'AC_AUTOCONF_VERSION' and 'm4_version_prereq' are
+dnl: both present in autoconf 2.62, which we require; so that we
+dnl: can at least use the following workaround.
+m4_version_prereq([2.64],
+    [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname],
+             [ac_url])],
+    [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname])
+     AC_SUBST([PACKAGE_URL], [ac_url])])
+AM_INIT_AUTOMAKE([am_name], [am_version])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat configure.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+cat >exp <<END
+PACKAGE = am_name
+VERSION = am_version
+PACKAGE_NAME = ac_name
+PACKAGE_VERSION = ac_version
+PACKAGE_STRING = ac_name ac_version
+PACKAGE_TARNAME = ac_tarname
+PACKAGE_BUGREPORT = ac_bugreport
+PACKAGE_URL = ac_url
+END
+
+$MAKE got
+
+diff exp got
+
+
+### Run 3 ###
+
+cat > configure.in <<END
+AC_INIT([ac_name], [ac_version])
+AM_INIT_AUTOMAKE([am_name], [am_version], [am_foo_quux])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat configure.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+cat >exp <<END
+PACKAGE = am_name
+VERSION = am_version
+PACKAGE_NAME = ac_name
+PACKAGE_VERSION = ac_version
+PACKAGE_STRING = ac_name ac_version
+PACKAGE_TARNAME = ac_name
+PACKAGE_BUGREPORT = $empty
+PACKAGE_URL = $empty
+END
+
+$MAKE got
+
+diff exp got
+
+$FGREP am_foo_quux Makefile.in Makefile configure config.status && Exit 1
+
+
+### Done ###
+
+:
diff --git a/t/backcompat4.sh b/t/backcompat4.sh
new file mode 100755
index 0000000..9088aae
--- /dev/null
+++ b/t/backcompat4.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Backward-compatibility: AC_OUTPUT with arguments.
+
+. ./defs || Exit 1
+
+mkdir sub
+: > Makefile.am
+: > zardoz
+: > foo.in
+: > foo1.in
+: > foo2.in
+: > foo3.in
+: > sub/bar.in
+
+ls -l # For debugging.
+
+for args in \
+  'foo' \
+  'foo:foo1.in' \
+  'foo:zardoz' \
+  'foo:sub/bar.in' \
+  'foo:foo1.in:foo2.in' \
+  'foo:zardoz:zardoz' \
+  'foo:foo1.in:foo2.in:foo3.in' \
+  'foo:foo1.in:foo2.in:sub/bar.in:foo3.in' \
+; do
+  rm -rf autom4te*.cache aclocal.m4
+  unindent >configure.ac <<END
+    AC_INIT([$me], [1.0])
+    AM_INIT_AUTOMAKE
+    AC_CONFIG_FILES([$args])
+    AC_OUTPUT
+END
+  cat configure.ac # For debugging.
+  $ACLOCAL
+  $AUTOMAKE Makefile
+  mv -f Makefile.in Makefile.acf
+  rm -rf autom4te*.cache aclocal.m4
+  unindent >configure.ac <<END
+    AC_INIT([$me], [1.0])
+    AM_INIT_AUTOMAKE
+    AC_OUTPUT([$args])
+END
+  cat configure.ac # For debugging.
+  $ACLOCAL
+  $AUTOMAKE Makefile
+  mv -f Makefile.in Makefile.aco
+  diff Makefile.acf Makefile.aco
+done
+
+:
diff --git a/t/backcompat5.sh b/t/backcompat5.sh
new file mode 100755
index 0000000..3aa9067
--- /dev/null
+++ b/t/backcompat5.sh
@@ -0,0 +1,125 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Backward-compatibility test: try to build and distribute a package
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
+# This script can also serve as mild stress-testing for Automake.
+# See also the similar test 'backcompat6.test'.
+
+am_parallel_tests=no
+am_create_testdir=empty
+. ./defs || Exit 1
+
+makefiles='hacky/Makefile src/Makefile data/Makefile tests/Makefile'
+
+# Yuck!
+cat > configure.in <<END
+dnl: Everything here is *deliberately* underquoted!
+AC_INIT(src/foo.input)
+AM_INIT_AUTOMAKE(foo, 1.0)
+AC_CONFIG_FILES(Makefile:mkfile.in)
+AC_OUTPUT($makefiles)
+END
+
+distdir=foo-1.0
+
+cat > mkfile.am <<'END'
+SUBDIRS = src data tests hacky
+installcheck-local:
+       grep DataDataData $(DESTDIR)$(prefix)/data/$(PACKAGE)-$(VERSION)/bar
+END
+
+mkdir hacky src tests data
+
+echo 'This is a dummy package' > README
+
+cat > src/foo.input <<'END'
+#!sh
+echo Zardoz
+END
+
+cat > tests/a.test <<'END'
+#!/bin/sh
+"$srcdir/../src/foo" | grep Zardoz
+END
+chmod a+x tests/a.test
+
+cat > data/bar <<'END'
+line1
+line2
+line3
+END
+
+cat >hacky/Makefile.am <<'END'
+dist-hook:
+       find $(top_distdir) -print
+       chmod a+rx $(top_distdir)/tests/*.test
+END
+
+cat > src/Makefile.am <<'END'
+dist_bin_SCRIPTS = foo
+foo: foo.input
+       sed '1s,^#!.*$$,#!/bin/sh,' $(srcdir)/foo.input >$@
+       chmod a+x $@
+EXTRA_DIST = foo.input
+DISTCLEANFILES = foo
+END
+
+cat > data/Makefile.am <<'END'
+nodist_data_DATA = bar
+datadir = $(prefix)/data/$(PACKAGE)-$(VERSION)
+bar:
+       echo DataDataData >$@
+distclean-local:
+       rm -f bar
+END
+
+cat > tests/Makefile.am <<'END'
+TESTS = a.test
+EXTRA_DIST = $(TESTS)
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+test -f install-sh
+for f in $makefiles; do mv -f $f.in $f.sav; done
+$AUTOMAKE
+for f in $makefiles; do diff $f.sav $f.in; done
+
+./configure
+ls -l . hacky src data tests # For debugging.
+test ! -f mkfile
+$MAKE
+$MAKE distdir
+test ! -f $distdir/Makefile.in
+test ! -f $distdir/data/bar
+test -f $distdir/src/foo
+diff README $distdir/README
+diff mkfile.in $distdir/mkfile.in
+diff tests/a.test $distdir/tests/a.test
+diff src/foo.input $distdir/src/foo.input
+
+$MAKE check
+$MAKE distcheck
+
+test -f $distdir.tar.gz
+
+chmod a-x tests/a.test
+# dist-hook should take care of making test files executables.
+$MAKE distcheck
+
+:
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
new file mode 100755
index 0000000..fde118b
--- /dev/null
+++ b/t/backcompat6.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Backward-compatibility test: try to build and distribute a package
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
+# This script can also serve as mild stress-testing for Automake.
+# See also the similar test 'backcompat5.test'.
+
+required=cc
+am_create_testdir=empty
+. ./defs || Exit 1
+
+# Anyone doing something like this in a real-life package probably
+# deserves to be killed.
+cat > configure.in <<'END'
+dnl: Everything here is *deliberately* underquoted!
+AC_INIT(quux.c)
+PACKAGE=nonesuch-zardoz
+VERSION=nonesuch-0.1
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_SUBST(one,1)
+two=2
+AC_SUBST(two, $two)
+three=3
+AC_SUBST(three)
+AC_PROG_CC
+AC_CONFIG_HEADERS(config.h:config.hin)
+AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes)
+AC_OUTPUT(Makefile foo.got:foo1.in:foo2.in:foo3.in)
+END
+
+echo @one@ > foo1.in
+echo @two@ > foo2.in
+echo @three@ > foo3.in
+
+cat >config.hin <<'END'
+#undef PACKAGE
+#undef VERSION
+END
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = quux.c
+check-local:
+       test x'$(PACKAGE)' = x'nonesuch-zardoz'
+       test x'$(VERSION)' = x'nonesuch-0.1'
+if ! CROSS_COMPILING
+       ./foo
+## Do not anchor the regexps w.r.t. the end of line, because on
+## MinGW/MSYS, grep may assume LF line endings only, while our
+## 'foo' program may generate CRLF line endings.
+       ./foo | grep '^PACKAGE = nonesuch-zardoz!'
+       ./foo | echo '^VERSION = nonesuch-0\.1!'
+endif
+END
+
+cat > quux.c <<'END'
+#include <config.h>
+#include <stdio.h>
+int main (void)
+{
+  printf("PACKAGE = %s!\nVERSION = %s!\n", PACKAGE, VERSION);
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+
+cat >foo.exp <<'END'
+1
+2
+3
+END
+
+diff foo.exp foo.got
+
+$MAKE
+$MAKE check
+
+distdir=nonesuch-zardoz-nonesuch-0.1
+$MAKE distdir
+test -f $distdir/quux.c
+test ! -f $distdir/foo.got
+
+$MAKE distcheck
+
+:
diff --git a/t/backsl.sh b/t/backsl.sh
new file mode 100755
index 0000000..48d70c7
--- /dev/null
+++ b/t/backsl.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for "\" problems.  Bug report from Joerg-Martin Schwarz.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = \
+   frob
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^_SOURCE' Makefile.in && Exit 1
+Exit 0
diff --git a/t/backsl2.sh b/t/backsl2.sh
new file mode 100755
index 0000000..82e2f08
--- /dev/null
+++ b/t/backsl2.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# We must skip the backslash, not complain about './\' not existing.
+# Reported by Rick Scott <address@hidden>
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = \
+   .
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/backsl3.sh b/t/backsl3.sh
new file mode 100755
index 0000000..36fab7f
--- /dev/null
+++ b/t/backsl3.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we diagnose trailing backslash at the end of a file.
+# Report from Akim Demaile <address@hidden>.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+foo = \
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+cat stderr
+grep 'trailing backslash' stderr
diff --git a/t/backsl4.sh b/t/backsl4.sh
new file mode 100755
index 0000000..c11d20d
--- /dev/null
+++ b/t/backsl4.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we diagnose and fix white spaces following backslash.
+# Report from Peter Muir.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >>configure.ac
+
+# Note: trailing whitespace used during the test should not appear as
+# trailing whitespace in this file, or it will get stripped by any
+# reasonable editor.
+
+echo 'bin_SCRIPTS = foo \ ' >Makefile.am
+cat >>Makefile.am <<'END'
+bar
+ok:
+       :
+END
+echo 'data_DATA = baz \  ' >>Makefile.am
+echo ' fum' >>Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails
+grep ':1:.*whitespace' stderr
+grep ':5:.*whitespace' stderr
+$AUTOMAKE -Wno-error
+./configure
+# Older versions of Automake used to produce invalid Makefiles such input.
+$MAKE ok
diff --git a/t/badline.sh b/t/badline.sh
new file mode 100755
index 0000000..3f548f7
--- /dev/null
+++ b/t/badline.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that line number and file name in error message
+# referring to variable is always correct.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_SUBST(TEXINFOS)
+AC_CONFIG_FILES([Makefile])
+END
+
+: > Makefile.am
+
+$ACLOCAL || Exit 1
+AUTOMAKE_fails
+grep 'configure.ac:3:.*info_TEXINFOS' stderr
diff --git a/t/badopt.sh b/t/badopt.sh
new file mode 100755
index 0000000..b06657f
--- /dev/null
+++ b/t/badopt.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure bad options cause error.
+
+. ./defs || Exit 1
+
+echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep zardoz stderr
diff --git a/t/badprog.sh b/t/badprog.sh
new file mode 100755
index 0000000..81ff5b7
--- /dev/null
+++ b/t/badprog.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that programs with bad names are properly
+# transformed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = a,b
+a_b_SOURCES = ab.c
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/block.sh b/t/block.sh
new file mode 100755
index 0000000..a6e9e32
--- /dev/null
+++ b/t/block.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure block comments are not double-spaced.
+# Report from François Pinard.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+#START
+#a
+#b
+#c
+#END
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && Exit 1
+Exit 0
diff --git a/t/bsource.sh b/t/bsource.sh
new file mode 100755
index 0000000..482015f
--- /dev/null
+++ b/t/bsource.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for install-recursive appearing in a non recursive Makefile.
+# Report from Bruno Haible.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+noinst_SCRIPTS = hostname
+include_HEADERS = gettext-po.h
+BUILT_SOURCES = po-hash-gen.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+grep 'install-recursive' Makefile.in && Exit 1
+
+:
diff --git a/t/candist.sh b/t/candist.sh
new file mode 100755
index 0000000..88d8854
--- /dev/null
+++ b/t/candist.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure things that cannot be dist_'ed are diagnosed.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >>configure.ac
+
+cat > Makefile.am << 'END'
+dist_bin_PROGRAMS = foo
+dist_lib_LIBRARIES = libfoo.a
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+test 2 -eq `grep -c 'dist.*forbidden' stderr`
+
+Exit 0
diff --git a/t/canon-name.sh b/t/canon-name.sh
new file mode 100755
index 0000000..3e8de08
--- /dev/null
+++ b/t/canon-name.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# PR 511: Make sure we warn about e.g. AC_CONFIG_FILES([./gmakefile]),
+# as not all make implementations treat 'file' and './file' equally.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([./gmakefile ./sub/gmakefile])
+AC_OUTPUT
+END
+
+mkdir sub
+echo 'SUBDIRS = sub' >gmakefile.am
+: >sub/gmakefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'leading.*\./.*\./gmakefile' stderr
+grep 'leading.*\./.*\./sub/gmakefile' stderr
+
+:
diff --git a/t/canon.sh b/t/canon.sh
new file mode 100755
index 0000000..b5038a5
--- /dev/null
+++ b/t/canon.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that name canonicalization error works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = sniff-glue
+sniff-glue_SOURCES = sg.c
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile\.am:2:.* bad .*variable.*sniff-glue_SOURCES' stderr
+grep 'Makefile\.am:2:.* use .*sniff_glue_SOURCES' stderr
+
+:
diff --git a/t/canon2.sh b/t/canon2.sh
new file mode 100755
index 0000000..4d39a7e
--- /dev/null
+++ b/t/canon2.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure name canonicalization happens for texinfo.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = zar-doz.texi
+zar_doz_TEXINFOS = frob.texi
+END
+
+: > texinfo.tex
+echo '@setfilename zar-doz.info' > zar-doz.texi
+echo '@setfilename frob' > frob.texi
+
+$ACLOCAL
+$AUTOMAKE
+
+grep zar-doz_TEXINFOS Makefile.in && Exit 1
+
+:
diff --git a/t/canon3.sh b/t/canon3.sh
new file mode 100755
index 0000000..25a8e71
--- /dev/null
+++ b/t/canon3.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Yet another canonicalization test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = perm-number
+END
+
+: > perm-number.c
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP 'perm_number.c' Makefile.in && Exit 1
+
+:
diff --git a/t/canon4.sh b/t/canon4.sh
new file mode 100755
index 0000000..6cdfd41
--- /dev/null
+++ b/t/canon4.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure name canonicalization happens for static libraries.
+# Keep this in sync with sister test 'canon6.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libx-y.a
+libx_y_a_SOURCES = xy.c
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^ *libx-y.*=' Makefile.in && Exit 1
+
+:
diff --git a/t/canon5.sh b/t/canon5.sh
new file mode 100755
index 0000000..0d71d83
--- /dev/null
+++ b/t/canon5.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that we allow variable names starting in
+# non-letters.  Whatever that might mean.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+$ACLOCAL
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = 123test
+123test_SOURCES = 123.c
+END
+
+$AUTOMAKE
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = _foo
+_foo_SOURCES = foo.c
+END
+
+$AUTOMAKE
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = ,foo
+,foo_SOURCES = foo.c
+END
+
+AUTOMAKE_fails
+grep 'Makefile\.am:2:.* bad .*variable.*,foo_SOURCES' stderr
+grep 'Makefile\.am:2:.* use .*_foo_SOURCES' stderr
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = ,foo
+_foo_SOURCES = foo.c
+END
+
+$AUTOMAKE -Wno-portability
+
+:
diff --git a/t/canon6.sh b/t/canon6.sh
new file mode 100755
index 0000000..64f946c
--- /dev/null
+++ b/t/canon6.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure name canonicalization happens for libtool libraries.
+# Keep this in sync with sister test 'canon4.test'.
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = libx-y.la
+libx_y_la_SOURCES = xy.c
+END
+
+: > ltmain.sh
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '^ *libx-y.*=' Makefile.in && Exit 1
+
+:
diff --git a/t/canon7.sh b/t/canon7.sh
new file mode 100755
index 0000000..d9d22c2
--- /dev/null
+++ b/t/canon7.sh
@@ -0,0 +1,101 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Stress test on canonicalization.
+
+required='cc libtool libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB  dnl: for static libraries
+AC_PROG_LIBTOOL dnl: for libtool libraries
+AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
+AC_OUTPUT
+END
+
+if touch ,foo-bar libb.az+baz lib~zardoz,,; then
+  rm -f ,foo-bar libb.az+baz lib~zardoz,,
+else
+  skip_ "cannot create regular files with \"tricky\" names"
+fi
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = dummy_static dummy_dynamic ,foo-bar
+noinst_LIBRARIES = libb.az+baz.a
+noinst_LTLIBRARIES = lib~zardoz,,.la
+
+dummy_static_SOURCES = dummy.c lib.h
+dummy_dynamic_SOURCES = $(dummy_static_SOURCES)
+
+dummy_static_LDADD = $(noinst_LIBRARIES)
+dummy_dynamic_LDADD = $(noinst_LTLIBRARIES)
+
+_foo_bar_SOURCES = foobar.c
+libb_az_baz_a_SOURCES = libs.c
+lib_zardoz___la_SOURCES = libd.c
+
+check-local:
+       ls -l
+if CROSS_COMPILING
+       test -f ./,foo-bar$(EXEEXT)
+       test -f ./dummy_static$(EXEEXT)
+       test -f ./dummy_dynamic$(EXEEXT)
+else !CROSS_COMPILING
+       ./,foo-bar
+       ./dummy_static
+       ./dummy_dynamic
+       ./,foo-bar | grep 'Hello, FooBar!'
+       ./dummy_static | grep 'Hello from Static!'
+       ./dummy_dynamic | grep 'Hello from Dynamic!'
+endif !CROSS_COMPILING
+END
+
+cat > foobar.c << 'END'
+#include <stdio.h>
+int main(void)
+{
+  printf("Hello, FooBar!\n");
+  return 0;
+}
+END
+
+cat > dummy.c << 'END'
+#include <stdio.h>
+#include "lib.h"
+int main(void)
+{
+  printf("Hello from %s!\n", dummy_func());
+  return 0;
+}
+END
+
+echo 'const char *dummy_func(void);' > lib.h
+echo 'const char *dummy_func(void) { return "Dynamic"; }' > libd.c
+echo 'const char *dummy_func(void) { return "Static"; }' > libs.c
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/canon8.sh b/t/canon8.sh
new file mode 100755
index 0000000..180e333
--- /dev/null
+++ b/t/canon8.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that canonicalization does not transliterate the '@' charactrer.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# The first grep is here mostly for debugging.
+grep foob.rquux Makefile.in
+grep address@hidden Makefile.in
+grep 'address@hidden' Makefile.in && Exit 1
+
+:
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
new file mode 100755
index 0000000..1df950d
--- /dev/null
+++ b/t/ccnoco.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure we can compile when the compiler doesn't
+# understand '-c -o'.
+
+required=gcc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+# Make sure that $CC can be used after AM_PROG_CC_C_O.
+$CC -v || exit 1
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+# Make sure we need something strange.
+wish_CFLAGS = -g
+END
+
+cat > a.c << 'END'
+#include <stdio.h>
+
+int main ()
+{
+   printf ("hi\n");
+}
+END
+
+cat > Mycomp << END
+#!/bin/sh
+
+case " \$* " in
+ *\ -c*\ -o* | *\ -o*\ -c*)
+    exit 1
+    ;;
+esac
+
+# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'.
+exec $CC "\$@"
+END
+
+chmod +x Mycomp
+
+# Make sure the compiler doesn't understand '-c -o'
+CC=`pwd`/Mycomp
+export CC
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+for vpath in : false; do
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+  $srcdir/configure
+  $MAKE
+  cd $srcdir
+done
+
+:
diff --git a/t/ccnoco2.sh b/t/ccnoco2.sh
new file mode 100755
index 0000000..e6c9c64
--- /dev/null
+++ b/t/ccnoco2.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake requires AM_PROG_CC_C_O when either per-targets
+# flags or subdir-objects are used.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+wish_CPPFLAGS = -DWHATEVER
+EOF
+
+touch a.c
+
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails --copy --add-missing
+grep '^Makefile\.am:2:.*per-target.*AM_PROG_CC_C_O' stderr
+
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = wish
+wish_SOURCES = sub/a.c
+EOF
+
+mkdir sub
+mv a.c sub
+
+$AUTOMAKE --copy --add-missing
+
+echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
+AUTOMAKE_fails --copy --add-missing
+grep '^Makefile\.am:2:.*subdir.*AM_PROG_CC_C_O' stderr
+
+:
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
new file mode 100755
index 0000000..eb291ec
--- /dev/null
+++ b/t/ccnoco3.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
+
+required=gcc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+$CC --version; $CC -v; # For debugging.
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+END
+
+mkdir sub
+
+cat > a.c << 'END'
+#include <stdio.h>
+
+int main ()
+{
+  printf ("hi\n");
+}
+END
+
+cat > Mycomp << END
+#!/bin/sh
+
+case " \$* " in
+ *\ -c*\ -o* | *\ -o*\ -c*)
+    exit 1
+    ;;
+esac
+
+# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'.
+exec $CC "\$@"
+END
+
+chmod +x Mycomp
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+mkdir build
+cd build
+
+# Make sure the compiler doesn't understand '-c -o'
+CC=`pwd`/../Mycomp
+export CC
+
+../configure
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'mv.*the same file' stderr && Exit 1
+
+:
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
new file mode 100755
index 0000000..064dce2
--- /dev/null
+++ b/t/check-concurrency-bug9245.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Look for a bug where FreeBSD make in concurrent mode reported success
+# even when the Automake-generated parallel testsuite harness failed.
+# See automake bug#9245.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+END
+
+cat > foo.test <<'END'
+#!/bin/sh
+exit 1
+END
+chmod a+x foo.test
+
+cp foo.test bar.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# Some make implementations don't grok the '-j' option.
+$MAKE -j1 || Exit 77
+
+for j in '' -j1 -j2; do
+  $MAKE $j check && Exit 1
+  TESTS=foo.test $MAKE $j -e check && Exit 1
+  if test x"$am_parallel_tests" = x"yes"; then
+    $MAKE $j recheck && Exit 1
+    TEST_LOGS=foo.log $MAKE $j -e check && Exit 1
+    rm -f test-suite.log
+    $MAKE $j test-suite.log && Exit 1
+    test -f test-suite.log || Exit 1
+  else
+    : # For shells with buggy 'set -e'.
+  fi
+done
+
+:
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
new file mode 100755
index 0000000..124269b
--- /dev/null
+++ b/t/check-exported-srcdir.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the testsuite driver (either with or without the
+# parallel-tests option enabled) exports the 'srcdir' value in the
+# environment of the tests.  This is documented in the manual.
+
+. ./defs || Exit 1
+
+show_info ()
+{
+  if test x"$am_parallel_tests" = x"yes"; then
+     cat foo.log
+     cat test-suite.log
+  else
+     :
+  fi
+}
+
+mkdir SrcDir
+mv [!S]* SrcDir
+mkdir BuildDir
+cd SrcDir
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test
+END
+
+cat > foo.test <<'END'
+#!/bin/sh
+echo "foo.test: srcdir='$srcdir'"
+test x"$srcdir" = x"../SrcDir"
+END
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cd ../BuildDir
+../SrcDir/configure
+
+$MAKE check || { show_info; Exit 1; }
+show_info
+
+:
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
new file mode 100755
index 0000000..5a64c22
--- /dev/null
+++ b/t/check-fd-redirect.sh
@@ -0,0 +1,110 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Simple Tests support: redirection of file descriptors with
+# AM_TESTS_FD_REDIRECT.
+# See also related test 'parallel-tests-fd-redirect.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = foo.test
+AM_TESTS_FD_REDIRECT = 3<three 4>four 5>>five 7<&0 8>&1 9>&2
+END
+
+echo '3333' > three
+chmod a-w three
+
+: > foo.test
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+
+do_check ()
+{
+  cat foo.test # For debugging.
+  echo 'this line will be removed' > four
+  echo 'this line will not be removed' > five
+  st=0
+  echo 'ok ok ok' | $MAKE check >stdout 2>stderr || st=1
+  cat stdout
+  cat stderr >&2
+  cat four
+  test x"$am_parallel_tests" != x"yes" || cat foo.log
+  test $st -eq 0
+  grep '[ /]foo\.test: foofoofoo$' stdout
+  grep '[ /]foo\.test: barbarbar$' stderr
+  grep 'this line' four && Exit 1
+  grep '^3333$' four
+  grep '^this line will not be removed$' five
+  grep '^ok ok ok$' five
+  $EGREP '(foofoofoo|barbarbar|3333|ok ok ok|this line)' foo.log && Exit 1
+  :
+}
+
+# Try using both shell script and a perl script as the test, for
+# better coverage.
+
+cat > foo.test <<'END'
+#! /bin/sh
+set -e
+
+read FOO <&3
+test 3333 -eq "$FOO"
+echo "$FOO" >&4
+
+grep '^ok ok ok$' <&7 >&5
+
+echo " " $0: foofoofoo >&8
+echo " " $0: barbarbar >&9
+END
+
+do_check
+
+echo "#! $PERL -w" > foo.test
+cat >> foo.test <<'END'
+use warnings FATAL => 'all';
+use strict;
+
+open (FD3, "<&=3") or die "opening FD3: $!";
+open (FD4, ">&=4") or die "opening FD4: $!";
+open (FD5, ">&=5") or die "opening FD5: $!";
+open (FD7, "<&=7") or die "opening FD7: $!";
+open (FD8, ">&=8") or die "opening FD8: $!";
+open (FD9, ">&=9") or die "opening FD9: $!";
+
+chomp (my $FOO = <FD3>);
+die "$FOO != 3333" if not $FOO eq "3333";
+print FD4 "$FOO\n";
+
+chomp ($_ = <FD7>);
+die "$_ != 'ok ok ok'" if not $_ eq 'ok ok ok';
+print FD5 "$_\n";
+
+print FD8 "  $0: foofoofoo\n";
+print FD9 "  $0: barbarbar\n";
+END
+
+do_check
+
+:
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
new file mode 100755
index 0000000..cccc0ed
--- /dev/null
+++ b/t/check-no-test-driver.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that auxiliary script 'test-driver' doesn't get needlessly
+# installed or referenced when the 'parallel-tests' option is not
+# used.
+
+am_parallel_tests=no
+. ./defs || Exit 1
+
+echo 'TESTS = foo.test' > Makefile.am
+
+$ACLOCAL
+
+for opts in '' '-a' '--add-missing --copy'; do
+  $AUTOMAKE $opts
+  $FGREP 'test-driver' Makefile.in && Exit 1
+  find . | $FGREP 'test-driver' && Exit 1
+  : For shells with busted 'set -e'.
+done
+
+:
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
new file mode 100755
index 0000000..30e8763
--- /dev/null
+++ b/t/check-subst-prog.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check @substituted@ TESTS, some of which are also PROGRAMS.
+# See also sister test 'check-subst.test'.
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST([script_tests],
+         ['subst-pass-script.test subst-xfail-script.test'])
+AC_SUBST([prog_tests],
+         ['subst-pass-prog.test$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
+AC_SUBST([xfail_tests],
+         ['xfail-script.test subst-xfail-script.test]dnl
+         [ xfail-prog$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = pass-script.test xfail-script.test @script_tests@ $(check_PROGRAMS)
+XFAIL_TESTS = @xfail_tests@
+check_PROGRAMS = pass-prog xfail-prog @prog_tests@
+EXTRA_PROGRAMS = subst-pass-prog.test subst-xfail-prog.test
+END
+
+cat > pass-script.test <<'END'
+#! /bin/sh
+exit 0
+END
+cat > xfail-script.test <<'END'
+#! /bin/sh
+exit 1
+END
+chmod a+x pass-script.test xfail-script.test
+cp pass-script.test subst-pass-script.test
+cp xfail-script.test subst-xfail-script.test
+
+cat > pass-prog.c <<'END'
+int main (void) { return 0; }
+END
+cat > xfail-prog.c <<'END'
+#include <stdlib.h>
+int main (void) { return EXIT_FAILURE; }
+END
+# The .test extension is removed for the default source file name:
+cp pass-prog.c subst-pass-prog.c
+cp xfail-prog.c subst-xfail-prog.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE all
+$MAKE check
+$MAKE distclean
+
+mkdir build
+cd build
+../configure
+$MAKE all
+$MAKE check
+$MAKE distclean
+
+:
diff --git a/t/check-subst.sh b/t/check-subst.sh
new file mode 100755
index 0000000..79d7526
--- /dev/null
+++ b/t/check-subst.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check @substituted@ TESTS.
+# Note that in this test, we rely on the .test extension for the
+# substituted names: this is necessary for parallel-tests.
+# See also sister test 'check-subst-prog.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([script_tests], ['subst-pass-script.sh subst-xfail-script.sh'])
+AC_SUBST([xfail_tests], ['xfail-script.test subst-xfail-script.sh'])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = pass-script.test xfail-script.test @script_tests@
+XFAIL_TESTS = @xfail_tests@
+END
+
+if test "$am_parallel_tests" = yes; then
+  unindent >> Makefile.am <<'END'
+    TEST_EXTENSIONS = .sh .test
+    SH_LOG_COMPILER = $(SHELL)
+END
+fi
+
+cat > pass-script.test <<'END'
+#! /bin/sh
+exit 0
+END
+cat > xfail-script.test <<'END'
+#! /bin/sh
+exit 1
+END
+cp pass-script.test subst-pass-script.sh
+cp xfail-script.test subst-xfail-script.sh
+chmod a+x pass-script.test xfail-script.test
+
+if test "$am_parallel_tests" != yes; then
+  chmod a+x subst-pass-script.sh subst-xfail-script.sh
+fi
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in false : ; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE all
+  $MAKE check
+  if test "$am_parallel_tests" = yes; then
+    ls -l
+    test -f pass-script.log
+    test -f xfail-script.log
+    test -f subst-pass-script.log
+    test -f subst-xfail-script.log
+  fi
+  $MAKE distclean
+  cd $srcdir
+
+done
+
+:
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
new file mode 100755
index 0000000..9f1fe4a
--- /dev/null
+++ b/t/check-tests-in-builddir.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the testsuite driver can find test in the srcdir as
+# well as in builddir, and that is prefers those in the builddir.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+exit ${FOO_EXIT_STATUS-0}
+END
+chmod a+x foo.test
+
+unset FOO_EXIT_STATUS || :
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+
+../configure
+
+cat > bar.test << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x bar.test
+
+$MAKE check >out 2>&1 || { cat out; Exit1; }
+cat out
+# The simple-tests driver does not strip VPATH components from
+# the name of the test, but the parallel-tests driver should.
+if test x"$am_parallel_tests" = x"yes"; then
+  grep '\.\./foo' out && Exit 1
+  grep '^PASS: foo.test *$' out
+else
+  grep '^PASS: .*foo.test *$' out
+fi
+grep '^PASS: bar.test *$' out
+
+rm -f test-suite.log foo.log bar.log
+
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; }
+cat out
+# See comments above.
+if test x"$am_parallel_tests" = x"yes"; then
+  grep '\.\./foo' out && Exit 1
+  grep '^FAIL: foo.test *$' out
+else
+  grep '^FAIL: .*foo.test *$' out
+fi
+grep '^PASS: bar.test *$' out
+
+rm -f test-suite.log foo.log bar.log
+
+# Check that if the same test is present in srcdir and builddir,
+# the one in builddir is preferred.
+cp bar.test foo.test
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; Exit1; }
+cat out
+grep '^PASS: foo.test *$' out
+grep '^PASS: bar.test *$' out
+
+# The tests in the builddir must be preferred also by "make dist".
+FOO_EXIT_STATUS=1 $MAKE distcheck
+
+:
diff --git a/t/check.sh b/t/check.sh
new file mode 100755
index 0000000..c9ab0fa
--- /dev/null
+++ b/t/check.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake style tests.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TESTS = frob.test
+END
+
+test x"$am_parallel_tests" != x"yes" || : > test-driver
+
+: > frob.test
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'check-TESTS.*:' Makefile.in
+grep 'check-DEJAGNU' Makefile.in && Exit 1
+
+# 'check-TESTS' is phony.
+sed -n '/^\.PHONY:/,/^$/p' Makefile.in | $EGREP '(^| )check-TESTS($| )'
+
+# 'check' should depend directly on 'check-am' (similar tests are
+# in check2.test and check3.test).
+$EGREP '^check:.* check-am( |$)' Makefile.in
+
+:
diff --git a/t/check10.sh b/t/check10.sh
new file mode 100755
index 0000000..3b3ee8b
--- /dev/null
+++ b/t/check10.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check singular and plural in test summaries.
+
+# This test only makes sense for the older serial testsuite driver.
+am_parallel_tests=no
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = fail pass skip xfail xpass fail2 pass2 skip2 xfail2 xpass2
+XFAIL_TESTS = xfail xpass xfail2 xpass2
+END
+
+cat > pass <<'END'
+#! /bin/sh
+exit 0
+END
+cat > fail <<'END'
+#! /bin/sh
+exit 1
+END
+cat > skip <<'END'
+#! /bin/sh
+exit 77
+END
+chmod a+x pass fail skip
+cp pass pass2
+cp pass xpass
+cp xpass xpass2
+cp fail xfail
+cp fail fail2
+cp xfail xfail2
+cp skip skip2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+(
+  # Do not check for failure in this subshell
+  set +e
+  env TESTS=pass $MAKE -e check
+  env TESTS=fail $MAKE -e check
+  env TESTS=skip $MAKE -e check
+  env TESTS=xfail $MAKE -e check
+  env TESTS=xpass $MAKE -e check
+  env TESTS="pass pass2" $MAKE -e check
+  env TESTS="fail fail2" $MAKE -e check
+  env TESTS="skip skip2" $MAKE -e check
+  env TESTS="xfail xfail2" $MAKE -e check
+  env TESTS="xpass xpass2" $MAKE -e check
+  env TESTS='pass skip xfail' $MAKE -e check
+  $MAKE check
+  :
+) >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep '1 [tT]ests' stdout && Exit 1
+grep '[02-9] [tT]est ' stdout && Exit 1
+grep '1 .* were ' stdout && Exit 1
+grep '[02-9].* was .*run' stdout && Exit 1
+grep 'All 1 ' stdout && Exit 1
+$EGREP '1 (un)?expected (failures|passes)' stdout && Exit 1
+$EGREP '[^1] (un)?expected (failure|pass)\)' stdout && Exit 1
+
+:
diff --git a/t/check11.sh b/t/check11.sh
new file mode 100755
index 0000000..e78da0f
--- /dev/null
+++ b/t/check11.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check skip summary.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = skip skip2
+END
+
+cat > skip <<'END'
+#! /bin/sh
+exit 77
+END
+chmod a+x skip
+cp skip skip2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+env TESTS=skip $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+if test x"$am_parallel_tests" = x"yes"; then
+  count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0
+else
+  grep '1.*passed' stdout && Exit 1
+  : For shells with buggy 'set -e'.
+fi
+
+env TESTS="skip skip2" $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+if test x"$am_parallel_tests" = x"yes"; then
+  count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0
+else
+  grep '2.*passed' stdout && Exit 1
+  : For shells with buggy 'set -e'.
+fi
+
+:
diff --git a/t/check12.sh b/t/check12.sh
new file mode 100755
index 0000000..a21c6da
--- /dev/null
+++ b/t/check12.sh
@@ -0,0 +1,214 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dejagnu tests, automake-style tests, and check-local
+# target can coexist.
+
+required=runtest
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS =
+EXTRA_DIST =
+CLEANFILES =
+END
+
+## Simple tests.
+
+cat > a.test << 'END'
+#!/bin/sh
+echo a.test: exit status: ${A_EXIT_STATUS-0}
+exit ${A_EXIT_STATUS-0}
+END
+cat > b.test << 'END'
+#!/bin/sh
+echo b.test: exit status: ${B_EXIT_STATUS-0}
+exit ${B_EXIT_STATUS-0}
+END
+chmod +x a.test b.test
+
+cat >> Makefile.am << 'END'
+TESTS = a.test b.test
+EXTRA_DIST += $(TESTS)
+END
+
+A_EXIT_STATUS=0; export A_EXIT_STATUS
+B_EXIT_STATUS=0; export B_EXIT_STATUS
+
+## DejaGnu tests.
+
+cat >> Makefile.am << 'END'
+AUTOMAKE_OPTIONS += dejagnu
+DEJATOOL = hammer spanner
+AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+EXTRA_DIST += hammer.test/hammer.exp
+EXTRA_DIST += spanner.test/spanner.exp
+END
+
+cat > hammer << 'END'
+#! /bin/sh
+echo "Everything looks like a ${NAIL-nail} to me!"
+END
+
+NAIL=nail; export NAIL
+
+cat > spanner << 'END'
+#! /bin/sh
+echo "I'm a right spanner!"
+END
+chmod +x hammer spanner
+
+mkdir hammer.test spanner.test
+
+cat > hammer.test/hammer.exp << 'END'
+set test test_hammer
+spawn $HAMMER
+expect {
+    "Everything looks like a nail to me!" { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+cat > spanner.test/spanner.exp << 'END'
+set test test_spanner
+spawn $SPANNER
+expect {
+    "I'm a right spanner!" { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+## User-defined extra tests.
+
+cat >> Makefile.am <<'END'
+check-local:
+       case $$CHECKLOCAL_EXIT_STATUS in \
+         0) echo 'check-local succeeded :-)';; \
+         *) echo 'check-local failed :-(';; \
+       esac >local.log
+       exit $$CHECKLOCAL_EXIT_STATUS
+CLEANFILES += local.log
+END
+CHECKLOCAL_EXIT_STATUS=0; export CHECKLOCAL_EXIT_STATUS
+
+## Go with the testcase execution.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build_
+    cd build_
+  else
+    srcdir=.
+  fi
+
+  if test -f config.status; then
+    $MAKE distclean
+  fi
+
+  $srcdir/configure
+
+  $MAKE check
+  test -f hammer.log
+  test -f hammer.sum
+  test -f spanner.log
+  test -f spanner.sum
+  # This checks will be run only by the autogenerated 'check12-p.test'.
+  if test x"$am_parallel_tests" = x"yes"; then
+    test -f test-suite.log
+    test -f a.log
+    test -f b.log
+  else :; fi
+  grep 'check-local succeeded :-)' local.log
+
+  cp -f config.status config-status.sav
+
+  $MAKE distclean
+  test ! -r hammer.log
+  test ! -r hammer.sum
+  test ! -r spanner.log
+  test ! -r spanner.sum
+  test ! -r test-suite.log
+  test ! -r a.log
+  test ! -r b.log
+  test ! -r local.log
+
+  mv -f config-status.sav config.status
+  ./config.status
+
+  NAIL=screw $MAKE check && Exit 1
+  test -f hammer.log
+  test -f hammer.sum
+  test -f spanner.log
+  test -f spanner.sum
+  grep 'FAIL: test_hammer' hammer.sum
+  grep 'FAIL:' spanner.sum && Exit 1
+
+  B_EXIT_STATUS=1 $MAKE check && Exit 1
+  # This checks will be run only by the autogenerated 'check12-p.test'.
+  if test x"$am_parallel_tests" = x"yes"; then
+    cat test-suite.log
+    cat a.log
+    cat b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 1$' b.log
+    grep '^FAIL: b$' test-suite.log
+    grep '^b\.test: exit status: 1$' test-suite.log
+    grep '^a\.test' test-suite.log && Exit 1
+    : For shells with busted 'set -e'.
+  else :; fi
+
+  CHECKLOCAL_EXIT_STATUS=1 $MAKE check && Exit 1
+  grep 'check-local failed :-(' local.log
+
+  # Do not trust the exit status of 'make -k'.
+  NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || :
+  test -f hammer.log
+  test -f hammer.sum
+  test -f spanner.log
+  test -f spanner.sum
+  grep 'FAIL: test_hammer' hammer.sum
+  grep 'FAIL:' spanner.sum && Exit 1
+  # This checks will be run only by the autogenerated 'check12-p.test'.
+  if test x"$am_parallel_tests" = x"yes"; then
+    cat test-suite.log
+    cat a.log
+    cat b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 23$' b.log
+    grep '^FAIL: b$' test-suite.log
+    grep '^b\.test: exit status: 23$' test-suite.log
+    grep '^a\.test' test-suite.log && Exit 1
+    : For shells with busted 'set -e'.
+  else :; fi
+  grep 'check-local failed :-(' local.log
+
+  cd $srcdir
+
+done
+
+$MAKE distcheck
+
+:
diff --git a/t/check2.sh b/t/check2.sh
new file mode 100755
index 0000000..8a05c9c
--- /dev/null
+++ b/t/check2.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake style tests.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([dir/Makefile])
+AC_OUTPUT
+END
+
+mkdir dir
+
+cat > Makefile.am << 'END'
+SUBDIRS = dir
+TESTS = \
+  subrun.sh
+subrun.sh:
+       (echo '#! /bin/sh'; echo 'dir/echo.sh') > $@
+       chmod +x $@
+CLEANFILES = subrun.sh
+END
+
+cat > dir/Makefile.am << 'END'
+check_SCRIPTS = echo.sh
+echo.sh:
+       (echo '#! /bin/sh'; echo 'echo Hello') > $@
+       chmod +x $@
+CLEANFILES = echo.sh
+END
+
+if test x"$am_parallel_tests" = x"yes"; then
+  cp "$am_scriptdir/test-driver" .
+fi
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^PASS: subrun\.sh *$' stdout
+grep 'PASS.*echo\.sh' stdout && Exit 1
+
+# 'check' should depend directly on 'check-am' (similar tests are
+# in check.test and check3.test).
+$EGREP '^check:.* check-recursive( |$)' Makefile.in
+$EGREP '^check:.* check-am( |$)' dir/Makefile.in
+
+# Make sure subrun.sh is still on its line as above.  This means Automake
+# hasn't rewritten the TESTS line unnecessarily (we can tell, because all
+# Automake variables are reformatted by VAR_PRETTY).
+grep '^  subrun\.sh$' Makefile.in
+
+:
diff --git a/t/check3.sh b/t/check3.sh
new file mode 100755
index 0000000..3edfd98
--- /dev/null
+++ b/t/check3.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'check:' and 'install:' honor $(BUILT_SOURCES).
+# PR/359.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([dir/Makefile])
+AC_OUTPUT
+END
+
+mkdir dir
+
+cat > Makefile.am << 'END'
+BUILT_SOURCES = command1.inc
+SUBDIRS = dir
+TESTS = subrun.sh
+subrun.sh:
+       (echo '#! /bin/sh'; cat command1.inc) > $@
+       chmod +x $@
+command1.inc:
+       echo 'dir/echo.sh' > $@
+CLEANFILES = subrun.sh command1.inc
+END
+
+cat > dir/Makefile.am << 'END'
+BUILT_SOURCES = command2.inc
+check_SCRIPTS = echo.sh
+echo.sh:
+## The next line ensures that command1.inc has been built before
+## recurring into the subdir.
+       test -f ../command1.inc
+       (echo '#! /bin/sh'; cat command2.inc) > $@
+       chmod +x $@
+command2.inc:
+       echo 'echo Hello' > $@
+CLEANFILES = echo.sh command2.inc
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure --prefix "`pwd`/inst"
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^PASS: subrun\.sh *$' stdout
+grep 'PASS.*echo\.sh' stdout && Exit 1
+
+# check should depend directly on $(BUILT_SOURCES) (similar tests
+# are in check.test and check2.test).
+$EGREP '^check:.* \$\(BUILT_SOURCES\)( |$)' Makefile.in
+$EGREP '^check:.* \$\(BUILT_SOURCES\)( |$)' dir/Makefile.in
+
+$MAKE clean
+# Sanity checks
+test ! -f command1.inc
+test ! -f dir/command2.inc
+# Now make sure these two files are rebuilt during make install.
+$MAKE install
+test -f command1.inc
+test -f dir/command2.inc
+
+:
diff --git a/t/check4.sh b/t/check4.sh
new file mode 100755
index 0000000..26548b3
--- /dev/null
+++ b/t/check4.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'make -k check' processes all directories.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([dir/Makefile])
+AC_OUTPUT
+END
+
+mkdir dir
+
+cat > Makefile.am <<'END'
+SUBDIRS = dir
+TESTS = ok.sh
+END
+
+echo TESTS = fail.sh >dir/Makefile.am
+
+cat >ok.sh <<'END'
+#!/bin/sh
+:
+END
+
+cat >dir/fail.sh <<'END'
+#!/bin/sh
+exit 1
+END
+
+chmod +x ok.sh dir/fail.sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --prefix "`pwd`/inst"
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^FAIL: fail\.sh *$' stdout
+grep '^PASS: ok\.sh *$' stdout && Exit 1
+
+# The exit status of 'make -k' can be anything
+# (depending on the Make implementation)
+$MAKE -k check >stdout || :
+cat stdout
+grep '^FAIL: fail\.sh *$' stdout
+grep '^PASS: ok\.sh *$' stdout
+
+# Should also works when -k is not in first position.
+$MAKE -s -k check >stdout || :
+cat stdout
+grep '^FAIL: fail\.sh *' stdout
+grep '^PASS: ok\.sh *' stdout
+
+# The rest of the test is for GNU Make.
+
+if using_gmake; then
+  # Try with a long-option that do not have a short option equivalent
+  # (here, --no-print-directory).  That should cause all options to
+  # appear verbatim in MAKEFLAGS.
+  $MAKE --no-print-directory -k check >stdout || :
+  cat stdout
+  grep '^FAIL: fail\.sh *$' stdout
+  grep '^PASS: ok\.sh *$' stdout
+fi
+
+:
diff --git a/t/check5.sh b/t/check5.sh
new file mode 100755
index 0000000..31790f8
--- /dev/null
+++ b/t/check5.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test TESTS = $(check_PROGRAMS)
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+check_PROGRAMS = one two
+TESTS = $(check_PROGRAMS)
+check-local:
+       test -f one$(EXEEXT)
+       test -f two$(EXEEXT)
+       touch ok
+.PHONY: print-tests
+print-tests:
+       echo BEG: $(TESTS) :END
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cat > one.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+cp one.c two.c
+
+./configure
+$MAKE check
+test -f ok
+EXEEXT=.bin $MAKE -e print-tests >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: one.bin two.bin :END' stdout
+# No am__EXEEXT_* variable is needed.
+grep '_EXEEXT_[1-9]' Makefile.in && Exit 1
+$FGREP 'TESTS = $(check_PROGRAMS)' Makefile.in
+
+:
diff --git a/t/check6.sh b/t/check6.sh
new file mode 100755
index 0000000..b6f6a67
--- /dev/null
+++ b/t/check6.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 400: XFAIL_TESTS delimited by TABs.
+# Also test that Solaris make VPATH rewriting is honored
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = $(XFAIL_TESTS)
+XFAIL_TESTS = a        b       c
+END
+
+cat >>a <<'END'
+#! /bin/sh
+exit 1
+END
+
+cp a b
+cp a c
+
+chmod a+x a b c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+$MAKE distclean
+mkdir build
+cd build
+../configure
+$MAKE check
+
+:
diff --git a/t/check7.sh b/t/check7.sh
new file mode 100755
index 0000000..574569b
--- /dev/null
+++ b/t/check7.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check EXEEXT extension for XFAIL_TESTS.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = $(XFAIL_TESTS)
+XFAIL_TESTS = a b c d
+check_PROGRAMS = a c d
+check_SCRIPTS = b
+EXTRA_DIST = $(check_SCRIPTS)
+
+.PHONY: print-xfail-tests
+print-xfail-tests:
+       @echo BEG: $(XFAIL_TESTS) :END
+END
+
+cat > b <<'END'
+#! /bin/sh
+exit 1
+END
+chmod a+x b
+
+cat > a.c <<'END'
+#include <stdlib.h>
+int main (void)
+{
+  return EXIT_FAILURE;
+}
+END
+
+cp a.c c.c
+cp a.c d.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+EXEEXT=.bin $MAKE -e print-xfail-tests >stdout || {  cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: a.bin b c.bin d.bin :END' stdout
+
+$MAKE distcheck
+
+:
diff --git a/t/check8.sh b/t/check8.sh
new file mode 100755
index 0000000..75a4bef
--- /dev/null
+++ b/t/check8.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check subdir TESTS.
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+TESTS = foo sub/foo $(check_PROGRAMS)
+XFAIL_TESTS = foo sub/baz
+check_PROGRAMS = bar sub/bar baz sub/baz
+END
+
+mkdir sub
+
+cat > foo <<'END'
+#! /bin/sh
+test -f "$srcdir/Makefile.am"
+END
+cat > sub/foo <<'END'
+#! /bin/sh
+test -f "$srcdir/Makefile.am"
+END
+chmod a+x foo sub/foo
+
+cat > bar.c <<'END'
+int main (void) { return 0; }
+END
+cat > sub/bar.c <<'END'
+int main (void) { return 0; }
+END
+cat > baz.c <<'END'
+#include <stdlib.h>
+int main (void) { return EXIT_FAILURE; }
+END
+cat > sub/baz.c <<'END'
+#include <stdlib.h>
+int main (void) { return EXIT_FAILURE; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr &&
+  { cat stdout; cat stderr >&2; Exit 1; }
+cat stdout
+cat stderr >&2
+grep 'XPASS.* foo$' stdout
+grep '^[^X]*PASS.* sub/foo$' stdout
+grep '^[^X]*PASS.* bar' stdout
+grep '^[^X]*PASS.* sub/bar' stdout
+grep '^[^X]*FAIL.* baz' stdout
+grep 'XFAIL.* sub/baz' stdout
+# 'parallel-tests' should not add circular dependencies.
+# Look for known warnings from a couple of 'make' implementations.
+grep -i 'circular.*dependency' stderr && Exit 1
+grep -i 'graph cycles' stderr && Exit 1
+
+$MAKE distclean
+
+mkdir build
+cd build
+../configure
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+# Note: we are not grepping for the space in the lines from the 'foo'
+# tests, due to the Solaris make VPATH rewriting (if we fix that, we
+# can still write a separate test for it).
+grep 'XPASS.*foo$' stdout
+grep '^[^X]*PASS.*sub/foo$' stdout
+grep '^[^X]*PASS.* bar' stdout
+grep '^[^X]*PASS.* sub/bar' stdout
+grep '^[^X]*FAIL.* baz' stdout
+grep 'XFAIL.* sub/baz' stdout
+
+:
diff --git a/t/checkall.sh b/t/checkall.sh
new file mode 100755
index 0000000..3b04d56
--- /dev/null
+++ b/t/checkall.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug where check target doesn't depend on all.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_SCRIPTS = derived
+check-local:
+       true
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^check-am:.*all-am' Makefile.in
+grep 'MAKE.*check-local' Makefile.in
diff --git a/t/clean.sh b/t/clean.sh
new file mode 100755
index 0000000..279e162
--- /dev/null
+++ b/t/clean.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure a clean target depends on previous one.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^clean-am:.*mostlyclean-am' Makefile.in
diff --git a/t/clean2.sh b/t/clean2.sh
new file mode 100755
index 0000000..2599e97
--- /dev/null
+++ b/t/clean2.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure distclean works in cygnus mode.
+# Report from Daniel Jacobowitz.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+
+data_DATA = bar
+
+bar:
+       touch $@
+
+DISTCLEANFILES = bar
+END
+
+mkdir sub
+
+cat > sub/Makefile.am << 'END'
+data_DATA = foo
+
+foo:
+       touch $@
+
+CLEANFILES = $(data_DATA)
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --cygnus
+
+./configure
+$MAKE
+ls -l
+test -f bar
+test -f sub/foo
+$MAKE distclean
+ls -l
+test ! -r bar
+test ! -r sub/foo
+test ! -r Makefile
+test ! -r config.status
+test -f Makefile.in
+test -f configure
+
+:
diff --git a/t/colneq.sh b/t/colneq.sh
new file mode 100755
index 0000000..0b5bbcd
--- /dev/null
+++ b/t/colneq.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that := definitions produce warnings, but otherwise work.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+ICONS := $(wildcard *.xbm)
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep ':=.*not portable' stderr
+
+$AUTOMAKE -Wno-portability
+grep '^ICONS *:= *\$(wildcard \*\.xbm) *$' Makefile.in
+
+:
diff --git a/t/colneq2.sh b/t/colneq2.sh
new file mode 100755
index 0000000..b313441
--- /dev/null
+++ b/t/colneq2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that := in var substitutions works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+t = a b c
+EXTRA_DIST = $(t:=.test)
+.PHONY: test
+test:
+       is $(EXTRA_DIST) == a.test b.test c.test
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+:
diff --git a/t/colneq3.sh b/t/colneq3.sh
new file mode 100755
index 0000000..728cc32
--- /dev/null
+++ b/t/colneq3.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that := definitions work as expected at make time.
+
+required=GNUmake
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+BAR := $(FOO)
+BAZ = $(FOO)
+FOO := foo
+.PHONY: test
+test:
+       test x'$(FOO)' = x'foo'
+       test x'$(BAZ)' = x'foo'
+       test x'$(BAR)' = x
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -Wno-portability
+
+./configure
+$MAKE test
+
+:
diff --git a/t/colon.sh b/t/colon.sh
new file mode 100755
index 0000000..f5cb4e0
--- /dev/null
+++ b/t/colon.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported by Nyul Laszlo.  When using the ":" syntax in
+# AC_OUTPUT, Automake fails to find the correct file.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([foo.h:foo.hin])
+AC_OUTPUT
+END
+
+: > foo.hin
+
+cat > Makefile.am <<'END'
+.PHONY: test
+test: distdir
+       ls -l . $(distdir)
+       test -f foo.h
+       test -f $(distdir)/foo.hin
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/colon2.sh b/t/colon2.sh
new file mode 100755
index 0000000..2b06151
--- /dev/null
+++ b/t/colon2.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure ":" works with files automake generates.
+# See also sister test 'colon3.test'.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile:zardoz.in])
+AC_OUTPUT
+END
+
+cat > zardoz.am <<END
+.PHONY: dummy
+dummy:
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# Automake should have created zardoz.in.
+test -f zardoz.in
+
+# The generated file should refer to zardoz.in and zardoz.am, but
+# never just "zardoz".
+$FGREP 'zardoz.am' zardoz.in
+$FGREP 'zardoz.in' zardoz.in
+sed -e 's|zardoz\.am|zrdz.am|g' \
+    -e 's|zardoz\.in|zrdz.in|g' \
+  <zardoz.in | $FGREP 'zardoz' && Exit 1
+
+# The configure-generated Makefile should depend on zardoz.in, two.in and
+# three.in.  The automake-generated zardoz.in should depend on zardoz.am.
+# Let's do this check the right way by running configure and make.
+
+str='%% ZaR DoZ %%'
+
+$AUTOCONF
+./configure
+test -f Makefile # Sanity check.
+
+$MAKE dummy
+# Again, make sure that the generated Makefile do not unduly
+# refer to 'zardoz' .
+$MAKE -n zardoz && Exit 1
+
+$sleep
+cat >> zardoz.am <<END
+check-local: testam testin testmk
+.PHONY: testam testin testmk
+testam:
+       grep '$str' \$(srcdir)/zardoz.am
+testin:
+       grep '$str' \$(srcdir)/zardoz.in
+testmk:
+       grep '$str' Makefile
+END
+$MAKE Makefile # For non-GNU make.
+$MAKE testam testin testmk
+
+$MAKE distcheck
+
+:
diff --git a/t/colon3.sh b/t/colon3.sh
new file mode 100755
index 0000000..5d7b3b2
--- /dev/null
+++ b/t/colon3.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure ":" works with files automake generates.
+# This test is for multiple ":"s.
+# See also sister test 'colon2.test'.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile:zardoz.in:two.in:three.in])
+AC_OUTPUT
+END
+
+cat > zardoz.am <<END
+.PHONY: dummy
+dummy:
+END
+
+: > two.in
+: > three.in
+
+$ACLOCAL
+$AUTOMAKE
+
+# Automake should have created zardoz.in.
+test -f zardoz.in
+
+# The generated file should refer to zardoz.in and zardoz.am, but
+# never just "zardoz".
+$FGREP 'zardoz.am' zardoz.in
+$FGREP 'zardoz.in' zardoz.in
+sed -e 's|zardoz\.am|zrdz.am|g' \
+    -e 's|zardoz\.in|zrdz.in|g' \
+  <zardoz.in | $FGREP 'zardoz' && Exit 1
+
+# The configure-generated Makefile should depend on zardoz.in, two.in and
+# three.in.  The automake-generated zardoz.in should depend on zardoz.am.
+# Let's do this check the right way by running configure and make.
+
+str='%% ZaR DoZ %%'
+str2='// 2_TwO_2 //'
+str3='== @thr33@ =='
+
+$AUTOCONF
+./configure
+test -f Makefile # Sanity check.
+
+$MAKE dummy
+# Again, make sure that the generated Makefile do not unduly
+# refer to 'zardoz' .
+$MAKE -n zardoz && Exit 1
+
+$sleep
+cat >> zardoz.am <<END
+check-local: testam testin testmk test2 test3
+.PHONY: testam testin test2 testmk test3
+testam:
+       grep '$str' \$(srcdir)/zardoz.am
+testin:
+       grep '$str' \$(srcdir)/zardoz.in
+testmk:
+       grep '$str' Makefile
+test2:
+       grep '$str2' \$(srcdir)/two.in
+test3:
+       grep '$str3' \$(srcdir)/three.in
+END
+echo "# $str2" >> two.in
+echo "# $str3" >> three.in
+$MAKE Makefile # For non-GNU make.
+$MAKE testam testin testmk test2 test3
+
+$MAKE distcheck
+
+:
diff --git a/t/colon4.sh b/t/colon4.sh
new file mode 100755
index 0000000..6dad3ab
--- /dev/null
+++ b/t/colon4.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure multiple ":"s in AC_CONFIG_FILES do not generate broken
+# rebuild rules.
+# Test from Maciej W. Rozycki.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_CONFIG_FILES([zardoz:one:two:three])
+AC_OUTPUT
+END
+
+: > Makefile.am
+: > one
+: > two
+: > three
+
+$ACLOCAL
+$AUTOMAKE
+
+# The rule should regenerate the file "zardoz", not a meaningless
+# file "'zardoz:one:two".
+$FGREP 'zardoz:one:two' Makefile.in && Exit 1
+Exit 0
diff --git a/t/colon5.sh b/t/colon5.sh
new file mode 100755
index 0000000..5a0ef37
--- /dev/null
+++ b/t/colon5.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another multi-":" test, this time from Doug Evans.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile:Makefile.in:Makefile.dep])
+AC_OUTPUT
+END
+
+: > Makefile.dep
+
+cat > Makefile.am <<'END'
+.PHONY: test-fs-layout test-grep test-distcommon test-distdir
+check-local: test-fs-layout test-grep test-distcommon test-distdir
+test-fs-layout:
+       test x'$(srcdir)' = '.' || test ! -r Makefile.dep
+test-grep:
+## The use of $(empty) prevents spurious matches.
+       grep '=GrEp$(empty)Me_am=' $(srcdir)/Makefile.in
+       grep '=GrEp$(empty)Me_dep=' $(srcdir)/Makefile.dep
+       grep '=GrEp$(empty)Me_am=' Makefile
+       grep '=GrEp$(empty)Me_dep=' Makefile
+test-distcommon:
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]Makefile.dep '
+test-distdir: distdir
+       test -f $(distdir)/Makefile.dep
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+grep '=GrEpMe_am=' Makefile && Exit 1  # Sanity check.
+grep '=GrEpMe_dep=' Makefile && Exit 1 # Likewise.
+
+$MAKE test-distcommon
+$MAKE test-distdir
+
+$sleep
+
+echo '# =GrEpMe_am=' >> Makefile.am
+echo '# =GrEpMe_dep=' >> Makefile.dep
+
+$MAKE Makefile # For non-GNU make.
+$MAKE test-grep
+$MAKE test-distcommon
+$MAKE test-distdir
+
+$MAKE distcheck
+
+:
diff --git a/t/colon6.sh b/t/colon6.sh
new file mode 100755
index 0000000..9f14d2a
--- /dev/null
+++ b/t/colon6.sh
@@ -0,0 +1,103 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Yet another multi-":" test, this time from Ken Pizzini.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+# With this, version.good should depend on version.gin, while
+# Makefile should not depend on either of them.
+AC_CONFIG_FILES([demo/Makefile demo/version.good:demo/version.gin])
+AC_OUTPUT
+END
+
+mkdir demo
+: > demo/version.gin
+: > demo/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+# These are older "grepping checks", kept mostly for backward-compatibility.
+# They might (unlikely, but possibly) require updating when automake
+# internals are changed.  Just relax or remove if they become too fragile.
+$EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
+grep 'version\.good:.*version\.gin' demo/Makefile.in
+
+$AUTOCONF
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  test -f demo/version.good   # Sanity check.
+  test ! -s demo/version.good # Likewise.
+
+  cd demo
+
+  $sleep
+  # HP-UX make considers targets with exact time stamps as one of their
+  # prerequisites out of date.  Ensure Makefile is newer than config.status to
+  # avoid triggering the am--refresh rule in the (here-nonexistent) toplevel
+  # Makefile.
+  touch Makefile
+
+  # version.good should depend on version.gin.
+  echo "Rebuilt (srcdir=$srcdir)" > ../$srcdir/demo/version.gin
+  $MAKE version.good
+  $FGREP "Rebuilt (srcdir=$srcdir)" version.good
+
+  # Makefile should not depend on version.good.
+  rm -f version.good
+  $MAKE Makefile
+  test ! -r version.good
+
+  # version.good should be rebuilt from version.gin.
+  $MAKE version.good
+  test -f version.good
+
+  # Makefile should not depend on version.gin.
+  rm -f ../$srcdir/demo/version.gin
+  $MAKE Makefile
+  test ! -r ../$srcdir/demo/version.gin # Sanity check.
+
+  # version.good should depend on version.gin.
+  rm -f version.good
+  $MAKE version.good >output 2>&1 && { cat output; Exit 1; }
+  cat output
+  # Try to verify that we errored out for the right reason.
+  $FGREP version.gin output
+
+  cd .. # Back in top builddir.
+  cd $srcdir
+
+  # Re-create it for the next pass (if any).
+  : > demo/version.gin
+
+done
+
+:
diff --git a/t/colon7.sh b/t/colon7.sh
new file mode 100755
index 0000000..1b84d80
--- /dev/null
+++ b/t/colon7.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another test for a failing ":" in AC_OUTPUT.
+# Report from Maciej Stachowiak.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([colon7], [1.0])
+AM_INIT_AUTOMAKE
+dnl: Please do not add proper m4 quoting here.
+AC_OUTPUT(subdir/bar:subdir/foo \
+   Makefile \
+   subdir/Makefile
+)
+END
+
+mkdir subdir
+: > Makefile.am
+: > subdir/foo
+cat > subdir/Makefile.am << 'END'
+# DIST_COMMON should contain 'foo', not 'subdir/foo'.
+test:
+       case '$(DIST_COMMON)' in *subdir/foo*) exit 1;; *) exit 0;; esac
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]foo '
+.PHONY: test
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# Should nowhere refer to 'bar.in'.
+$FGREP 'bar.in' Makefile.in subdir/Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+cd subdir
+$MAKE test
+
+:
diff --git a/t/color.sh b/t/color.sh
new file mode 100755
index 0000000..6db4454
--- /dev/null
+++ b/t/color.sh
@@ -0,0 +1,157 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake TESTS color output, by forcing it.
+# Keep this in sync with the sister test 'color2.test'.
+
+. ./defs || Exit 1
+
+TERM=ansi
+export TERM
+
+esc=''
+# Escape '[' for grep, below.
+red="$esc\[0;31m"
+grn="$esc\[0;32m"
+lgn="$esc\[1;32m"
+blu="$esc\[1;34m"
+mgn="$esc\[0;35m"
+std="$esc\[m"
+
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$std" | grep .` in
+  "$std") ;;
+  *) skip_ "grep can't parse nonprinting characters";;
+esac
+
+cat >>configure.ac <<END
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = color-tests
+TESTS = $(check_SCRIPTS)
+check_SCRIPTS = pass fail skip xpass xfail error
+XFAIL_TESTS = xpass xfail
+END
+
+cat >pass <<END
+#! /bin/sh
+exit 0
+END
+
+cat >fail <<END
+#! /bin/sh
+exit 1
+END
+
+cat >skip <<END
+#! /bin/sh
+exit 77
+END
+
+cat >error <<END
+#! /bin/sh
+exit 99
+END
+
+cp fail xfail
+cp pass xpass
+chmod +x pass fail skip xpass xfail error
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+test_color ()
+{
+  # Not a useless use of cat; see above comments about grep.
+  cat stdout | grep "^${grn}PASS${std}: .*pass"
+  cat stdout | grep "^${red}FAIL${std}: .*fail"
+  cat stdout | grep "^${blu}SKIP${std}: .*skip"
+  cat stdout | grep "^${lgn}XFAIL${std}: .*xfail"
+  cat stdout | grep "^${red}XPASS${std}: .*xpass"
+  # The old serial testsuite driver doesn't distinguish between failures
+  # and hard errors.
+  if test x"$am_parallel_tests" = x"yes"; then
+    cat stdout | grep "^${mgn}ERROR${std}: .*error"
+  else
+    cat stdout | grep "^${red}FAIL${std}: .*error"
+  fi
+  :
+}
+
+test_no_color ()
+{
+  # With make implementations that, like Solaris make, in case of errors
+  # print the whole failing recipe on standard output, we should content
+  # ourselves with a laxer check, to avoid false positives.
+  # Keep this in sync with lib/am/check.am:$(am__color_tests).
+  if $FGREP '= Xalways || test -t 1 ' stdout; then
+    # Extra verbose make, resort to laxer checks.
+    # Note that we also want to check that the testsuite summary is
+    # not unduly colorized.
+    (
+      set +e # In case some grepped regex below isn't matched.
+      # Not a useless use of cat; see above comments about grep.
+      cat stdout | grep "TOTAL.*:"
+      cat stdout | grep "PASS.*:"
+      cat stdout | grep "FAIL.*:"
+      cat stdout | grep "SKIP.*:"
+      cat stdout | grep "XFAIL.*:"
+      cat stdout | grep "XPASS.*:"
+      cat stdout | grep "ERROR.*:"
+      cat stdout | grep 'test.*expected'
+      cat stdout | grep 'test.*not run'
+      cat stdout | grep '===='
+      cat stdout | grep '[Ss]ee .*test-suite\.log'
+      cat stdout | grep '[Tt]estsuite summary'
+    ) | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  else
+    cat stdout | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  fi
+}
+
+for vpath in false :; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  test_color
+
+  $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  test_no_color
+
+  $MAKE distclean
+  cd $srcdir
+
+done
+
+:
diff --git a/t/color2.sh b/t/color2.sh
new file mode 100755
index 0000000..b1c8830
--- /dev/null
+++ b/t/color2.sh
@@ -0,0 +1,194 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake TESTS color output, using the expect(1) program.
+# Keep this in sync with the sister test 'color.test'.
+
+. ./defs || Exit 1
+
+TERM=ansi
+export TERM
+
+esc=''
+# Escape '[' for grep, below.
+red="$esc\[0;31m"
+grn="$esc\[0;32m"
+lgn="$esc\[1;32m"
+blu="$esc\[1;34m"
+mgn="$esc\[0;35m"
+std="$esc\[m"
+
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$std" | grep .` in
+  "$std") ;;
+  *) skip_ "grep can't parse nonprinting characters";;
+esac
+
+# This test requires a working a working 'expect' program.
+# Creative quoting required to avoid spurious maintainer-check failure.
+(set +e; expect -c 'exit ''77'; test $? -eq 77) \
+  || skip_ "requires a working expect program"
+
+# Also, if the $MAKE program fails to consider the standard output as a
+# tty (this happens with e.g., BSD make and Solaris dmake when they're
+# run in parallel mode; see the autoconf manual), there is little point
+# in proceeding.
+cat > Makefile <<'END'
+all:
+## Creative quoting in the 'echo' below to avoid risk of spurious output
+## matches by 'expect', below.
+       @test -t 1 && echo "stdout" "is" "a" "tty"
+END
+
+cat > expect-check <<'END'
+eval spawn $env(MAKE)
+expect {
+  "stdout is a tty" { exit 0 }
+  default { exit 1 }
+}
+exit 1
+END
+MAKE=$MAKE expect -f expect-check \
+  || skip_ "make spawned by expect should have a tty stdout"
+rm -f expect-check Makefile
+
+# Do the tests.
+
+cat >>configure.ac <<END
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = color-tests
+TESTS = $(check_SCRIPTS)
+check_SCRIPTS = pass fail skip xpass xfail error
+XFAIL_TESTS = xpass xfail
+END
+
+cat >pass <<END
+#! /bin/sh
+exit 0
+END
+
+cat >fail <<END
+#! /bin/sh
+exit 1
+END
+
+cat >skip <<END
+#! /bin/sh
+exit 77
+END
+
+cat >error <<END
+#! /bin/sh
+exit 99
+END
+
+cp fail xfail
+cp pass xpass
+chmod +x pass fail skip xpass xfail error
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+test_color ()
+{
+  # Not a useless use of cat; see above comments about grep.
+  cat stdout | grep "^${grn}PASS${std}: .*pass"
+  cat stdout | grep "^${red}FAIL${std}: .*fail"
+  cat stdout | grep "^${blu}SKIP${std}: .*skip"
+  cat stdout | grep "^${lgn}XFAIL${std}: .*xfail"
+  cat stdout | grep "^${red}XPASS${std}: .*xpass"
+  # The old serial testsuite driver doesn't distinguish between failures
+  # and hard errors.
+  if test x"$am_parallel_tests" = x"yes"; then
+    cat stdout | grep "^${mgn}ERROR${std}: .*error"
+  else
+    cat stdout | grep "^${red}FAIL${std}: .*error"
+  fi
+  :
+}
+
+test_no_color ()
+{
+  # With make implementations that, like Solaris make, in case of errors
+  # print the whole failing recipe on standard output, we should content
+  # ourselves with a laxer check, to avoid false positives.
+  # Keep this in sync with lib/am/check.am:$(am__color_tests).
+  if $FGREP '= Xalways || test -t 1 ' stdout; then
+    # Extra verbose make, resort to laxer checks.
+    # Note that we also want to check that the testsuite summary is
+    # not unduly colorized.
+    (
+      set +e # In case some grepped regex below isn't matched.
+      # Not a useless use of cat; see above comments about grep.
+      cat stdout | grep "TOTAL.*:"
+      cat stdout | grep "PASS.*:"
+      cat stdout | grep "FAIL.*:"
+      cat stdout | grep "SKIP.*:"
+      cat stdout | grep "XFAIL.*:"
+      cat stdout | grep "XPASS.*:"
+      cat stdout | grep "ERROR.*:"
+      cat stdout | grep 'test.*expected'
+      cat stdout | grep 'test.*not run'
+      cat stdout | grep '===='
+      cat stdout | grep '[Ss]ee .*test-suite\.log'
+      cat stdout | grep '[Tt]estsuite summary'
+    ) | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  else
+    cat stdout | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  fi
+}
+
+cat >expect-make <<'END'
+eval spawn $env(MAKE) -e check
+expect eof
+END
+
+for vpath in false :; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  test_color
+
+  AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  test_no_color
+
+  $MAKE distclean
+  cd $srcdir
+
+done
+
+:
diff --git a/t/commen10.sh b/t/commen10.sh
new file mode 100755
index 0000000..d0c246a
--- /dev/null
+++ b/t/commen10.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure comments following trailing backslashes are diagnosed.
+# Report from Harald Dunkel.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = foo \
+# bar
+
+END
+
+mkdir foo
+
+$ACLOCAL
+AUTOMAKE_fails
+grep backslash stderr
diff --git a/t/commen11.sh b/t/commen11.sh
new file mode 100755
index 0000000..d4b264a
--- /dev/null
+++ b/t/commen11.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure backslash-newline-hash combinations are diagnosed as
+# comments following a trailing backslash, even when the combination
+# follows a variable assignment that is preceded by a comment.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+# initial comment
+variable = value-before-comment \
+#
+
+# comment
+SUBDIRS = foo \
+# bar
+
+END
+
+mkdir foo
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:3:.*backslash' stderr
+grep '^Makefile\.am:7:.*backslash' stderr
+
+:
diff --git a/t/comment.sh b/t/comment.sh
new file mode 100755
index 0000000..6ca98ba
--- /dev/null
+++ b/t/comment.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that '#' as start of word in AUTOMAKE_OPTIONS means
+# comment.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = #no such option
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/comment2.sh b/t/comment2.sh
new file mode 100755
index 0000000..a63075c
--- /dev/null
+++ b/t/comment2.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure comment recognition works in PROGRAMS.  Report from Mark
+# Galassi.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = sim_products receive_th receive_pos # image_proc
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^image_proc' Makefile.in && Exit 1
+Exit 0
diff --git a/t/comment3.sh b/t/comment3.sh
new file mode 100755
index 0000000..8f80945
--- /dev/null
+++ b/t/comment3.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that '#' after a tab is a failure.
+# The Tru64 Unix V5.1 system make will pass these to the
+# shell, which in turn can't find '#' as a command.
+# Sigh.  Some vendors must be destroyed.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+install-data-local:
+       # Tru64 Unix must die
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:2:.*#' stderr
diff --git a/t/comment4.sh b/t/comment4.sh
new file mode 100755
index 0000000..42e7bf9
--- /dev/null
+++ b/t/comment4.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure commented variables are output near their comments.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+# UnIqUe_COPYRIGHT_BOILERPLATE
+
+# UnIqUe_MUMBLE_COMMENT
+mumble = UnIqUe_MUMBLE_VALUE
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+# UnIqUe_COPYRIGHT_BOILERPLATE should appear near the top of the file
+test `sed -n -e '1,/UnIqUe_COPYRIGHT_BOILERPLATE/p' Makefile.in \
+      | wc -l` -le 30
+# UnIqUe_MUMBLE_COMMENT should appear right before the mumble declaration.
+test `sed -n -e '/UnIqUe_MUMBLE_COMMENT/,/UnIqUe_MUMBLE_VALUE/p' Makefile.in \
+      | wc -l` -eq 2
diff --git a/t/comment5.sh b/t/comment5.sh
new file mode 100755
index 0000000..0c2a4d6
--- /dev/null
+++ b/t/comment5.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR/280.
+# (Automake should complain about trailing backslashes in comments.)
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+all-local:
+       @echo ${var}
+
+# a comment with backslash \
+
+
+var = foo
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile.am:5: error: blank line following trailing backslash' stderr
+
+
+## Here is a second test because head comments are
+## handled differently in Automake 1.5.
+
+cat > Makefile.am << 'EOF'
+# a comment with backslash \
+
+
+all-local:
+       @echo ${var}
+
+var = foo
+EOF
+
+AUTOMAKE_fails
+grep '^Makefile.am:2: error: blank line following trailing backslash' stderr
+
+
+## Make sure we print an 'included' stack on errors.
+
+echo 'include Makefile.inc'> Makefile.am
+cat > Makefile.inc << 'EOF'
+# a comment with backslash \
+
+EOF
+
+AUTOMAKE_fails
+grep '^Makefile.inc:2: error: blank line following trailing backslash' stderr
+grep '^Makefile.am:1: .*included from here' stderr
+grep -v '^Makefile.am:1: .*error:' stderr
+
+
+## Make sure backslashes are still allowed within a comment.
+## This usually happens when commenting out a Makefile rule.
+
+cat > Makefile.am << 'EOF'
+all-local:
+       @echo ${var}
+
+# a comment with backslash \
+# but terminated by a line without backslash
+
+var = foo
+EOF
+
+$AUTOMAKE
diff --git a/t/comment6.sh b/t/comment6.sh
new file mode 100755
index 0000000..9fd8d10
--- /dev/null
+++ b/t/comment6.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR/322.
+# Automake 1.6.1 seems to have a problem parsing comments that use
+# '\' to span multiple lines.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+## There are two tests: one with backslashed comments at the top
+## of the file, and one with a rule first.  This is because
+## Comments at the top of the file are handled specially
+## since Automake 1.5.
+
+cat > Makefile.am << 'EOF'
+# SOME_FILES = \
+         file1 \
+         file2 \
+         file3
+
+all-local:
+       @echo Good
+
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+grep '# SOME_FILES' Makefile
+grep '# *file3' Makefile
+
+cat > Makefile.am << 'EOF'
+all-local:
+       @echo Good
+
+# SOME_FILES = \
+         file1 \
+         file2 \
+         file3
+EOF
+
+$AUTOMAKE
+./configure
+$MAKE
+grep '# SOME_FILES' Makefile
+grep '# *file3' Makefile
+
+:
diff --git a/t/comment7.sh b/t/comment7.sh
new file mode 100755
index 0000000..5637fb7
--- /dev/null
+++ b/t/comment7.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure comment for conditional variables are output near the
+# corresponding conditional definitions.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_CONDITIONAL([COND], [true])
+EOF
+
+cat > Makefile.am << 'EOF'
+if COND
+# Comment for VAR in COND_TRUE.
+VAR = foo
+else
+# Comment for VAR in COND_FALSE.
+VAR = bar
+endif
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+# The VAR definition appears once for each condition.
+test `grep '@address@hidden' Makefile.in | wc -l` = 1
+test `grep '@address@hidden' Makefile.in | wc -l` = 1
+
+# Make sure the right definition follows each comment.
+sed -n '/^#.*VAR.*COND_TRUE/ {
+          n
+          p
+        }' Makefile.in |
+  grep '@address@hidden = foo'
+sed -n '/^#.*VAR.*COND_FALSE/ {
+          n
+          p
+        }' Makefile.in |
+  grep '@address@hidden = bar'
diff --git a/t/comment8.sh b/t/comment8.sh
new file mode 100755
index 0000000..3ed31e7
--- /dev/null
+++ b/t/comment8.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure += does not append to a comment.
+# Report from Stepan Kasal.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+VAR = valA# comA ## com C
+VAR += valB # comB
+if COND1
+  VAR += val1 # com1
+endif COND1
+VAR += valC
+if COND2
+  VAR += val2 # com2
+endif COND2
+
+.PHONY: test
+test:
+       is $(VAR) == valA valB val1 valC val2
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE test
diff --git a/t/comment9.sh b/t/comment9.sh
new file mode 100755
index 0000000..a75fafc
--- /dev/null
+++ b/t/comment9.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure ##-comments are ignored in variable definitions.
+# Report from Julien Sopena.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+TESTS = \
+   1.test \
+   2.test \
+   3.test \
+## 4.test \
+   5.test \
+   6.test \
+   7.test
+EOF
+
+: > test-driver
+
+$ACLOCAL
+$AUTOMAKE
+
+sed -n -e '/^TESTS =.*\\$/ {
+   :loop
+   p
+   n
+   t clear
+   :clear
+   s/\\$/\\/
+   t loop
+   p
+   n
+   }' -e '/^TESTS =/ p' Makefile.in > tests
+
+grep '3\.test' tests
+grep '##' tests && Exit 1
+grep '4\.test' tests && Exit 1
+grep '5\.test' tests
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
new file mode 100755
index 0000000..5c01d76
--- /dev/null
+++ b/t/comments-in-var-def.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake ignores in-line comments when using variables,
+# but preserve them in the output.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+# Use a slash in the comment, because automake takes the dirname
+# of TEXINFO_TEX to compute $(am__TEXINFO_TEX_DIR).
+cat > Makefile.am << 'END'
+TEXINFO_TEX = tex/texinfo.tex    # some comment w/ a slash
+info_TEXINFOS = main.texi
+.PHONY: test
+test:
+       test tex/texinfo.tex = $(TEXINFO_TEX)
+       test -d '$(am__TEXINFO_TEX_DIR)'
+       case '$(am__TEXINFO_TEX_DIR)' in tex|./tex) :;; *) exit 1;; esac
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
+END
+
+mkdir tex
+: > tex/texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+grep TEX Makefile.in # For debugging.
+grep '^TEXINFO_TEX *= *tex/texinfo\.tex  *# some comment w/ a slash *$' 
Makefile.in
+
+$AUTOCONF
+./configure
+$MAKE test
+
+:
diff --git a/t/compile.sh b/t/compile.sh
new file mode 100755
index 0000000..638a0d7
--- /dev/null
+++ b/t/compile.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' preserves spaces in its arguments.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script compile
+
+# -o 'a  c' should not be stripped because 'a  c' is not an object
+# (it does not matter whether touch creates ./-- or not)
+./compile touch a.o -- -o 'a  c' a.c
+test -f 'a  c'
+test -f ./-o
+test -f a.o
+test -f a.c
+
+rm -f 'a  c' ./-o a.o a.c
+
+./compile touch a.o -- -o 'a  c.o' a.c
+test -f 'a  c.o'
+test ! -f ./-o
+test ! -f a.o
+test -f a.c
+
+# Make sure 'compile' works for .obj too.
+./compile touch a.obj -- -o ac.obj a.c
+test ! -f a.obj
+test ac.obj
+
+:
diff --git a/t/compile2.sh b/t/compile2.sh
new file mode 100755
index 0000000..f808607
--- /dev/null
+++ b/t/compile2.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' deals correctly with Windows-style paths.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script compile
+
+cat >mycc <<'END'
+source_seen=no
+for arg
+do
+  test "X$arg" = X-o && exit 1
+  test "X$arg" = "X$amtest_source" && source_seen=yes
+done
+if test "$source_seen" != yes; then
+  echo "$0: no source file seen" >&2
+  exit 1
+fi
+if test ! -f "$amtest_source"; then
+  echo "$0: $amtest_source not readable" >&2
+  exit 1
+fi
+if test ! -d "$amtest_lock"; then
+  echo "$0: no lockdir $amtest_lock" >&2
+  exit 1
+fi
+touch "$amtest_obj"
+END
+
+chmod +x ./mycc
+
+# In case this test runs on a system with backslash directory separators:
+mkdir libltdl libltdl/libltdl
+
+# Backslashes in the input and the output name should be accepted.
+# Since this test might run on non-w32 systems, we need to be careful not
+# to use any backslash sequences which might be interpreted by 'echo'.
+amtest_source='libltdl\libltdl\slist.c'
+amtest_object='libltdl\libltdl\libltdl_libltdl_la-slist.obj'
+amtest_obj='slist.o'
+amtest_lock='slist_o.d'
+export amtest_source amtest_object amtest_obj amtest_lock
+
+: > "$amtest_source"
+./compile ./mycc -c "$amtest_source" -o "$amtest_object"
+test -f "$amtest_object"
+
+# Absolute Windows paths should be accepted.
+# Do not actually run this test on anything that could be Windows.
+if test -d 'C:\'; then
+  skip_ "this test shouldn't run on a Windows-like system"
+fi
+case $PATH_SEPARATOR in
+ ';'|':');;
+ *) skip_ "unrecognized PATH separator '$PATH_SEPARATOR'"
+esac
+
+amtest_source='C:\libltdl\libltdl\slist.c'
+amtest_object='C:\libltdl\libltdl\libltdl_libltdl_la-slist.obj'
+amtest_obj='slist.o'
+amtest_lock='slist_o.d'
+export amtest_source amtest_object amtest_obj amtest_lock
+
+: > "$amtest_source"
+./compile ./mycc -c "$amtest_source" -o "$amtest_object"
+test -f "$amtest_object"
+
+:
diff --git a/t/compile3.sh b/t/compile3.sh
new file mode 100755
index 0000000..009de70
--- /dev/null
+++ b/t/compile3.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' wraps the Microsoft C/C++ compiler (cl) correctly
+
+am_create_testdir=empty
+required=xsi-lib-shell
+. ./defs || Exit 1
+
+get_shell_script compile
+
+# Use a dummy cl, since cl isn't readily available on all systems
+cat >cl <<'END'
+#! /bin/sh
+echo "$@"
+END
+
+chmod +x ./cl
+
+# POSIX mandates that the compiler accepts a space between the -I,
+# -l and -L options and their respective arguments.  Traditionally,
+# this should work also without a space.  Try both usages.
+for sp in '' ' '; do
+  # Check if compile handles "-o foo", -I, -l, -L, -Xlinker -Wl,
+  opts=`LIB= ./compile ./cl foo.c -o foo -l${sp}bar -L${sp}gazonk -I${sp}baz 
-Xlinker foobar -Wl,-foo,bar`
+  test x"$opts" = x"foo.c -Fefoo bar.lib -Ibaz -link -LIBPATH:gazonk foobar 
-foo bar"
+
+  # Check if compile handles "-o foo.obj"
+  opts=`./compile ./cl -c foo.c -o foo.obj -I${sp}baz`
+  test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
+
+  # Check if compile handles "-o foo.o"
+  opts=`./compile ./cl -c foo.c -o foo.o -I${sp}baz`
+  test x"$opts" = x"-c foo.c -Fofoo.o -Ibaz"
+
+  # Check if compile handles "foo.cc" as C++.
+  opts=`./compile ./cl -c foo.cc -o foo.o -I${sp}baz`
+  test x"$opts" = x"-c -Tpfoo.cc -Fofoo.o -Ibaz"
+
+  # Check if compile clears the "eat" variable properly.
+  opts=`eat=1 ./compile ./cl -c foo.c -o foo.obj -I${sp}baz`
+  test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
+done
+
+:
diff --git a/t/compile4.sh b/t/compile4.sh
new file mode 100755
index 0000000..bb9f671
--- /dev/null
+++ b/t/compile4.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' wraps the Microsoft C/C++ compiler (cl) correctly
+# with respect to absolute paths.
+
+required='cl'
+. ./defs || Exit 1
+
+get_shell_script compile
+
+mkdir sub
+
+cat >sub/foo.c <<'EOF'
+int
+foo ()
+{
+  return 0;
+}
+EOF
+
+cat >main.c <<'EOF'
+extern int foo ();
+int
+main ()
+{
+  return foo ();
+}
+EOF
+
+absfoodir=`pwd`/sub
+absmainc=`pwd`/main.c
+absmainobj=`pwd`/main.obj
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+cat > sub/Makefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE
+
+./compile cl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc"
+
+# cl expects archives to be named foo.lib, not libfoo.a so
+# make a simple copy here if needed. This is a severe case
+# of badness, but ignore that since this is not what is
+# being tested here...
+if test -f sub/libfoo.a; then
+  cp sub/libfoo.a sub/foo.lib
+fi
+
+# POSIX mandates that the compiler accepts a space between the -I,
+# -l and -L options and their respective arguments.  Traditionally,
+# this should work also without a space.  Try both usages.
+for sp in '' ' '; do
+  rm -f main
+
+  ./compile cl $CFLAGS $LDFLAGS -L${sp}"$absfoodir" "$absmainobj" -o main 
-l${sp}foo
+
+  ./main
+done
+
+:
diff --git a/t/compile5.sh b/t/compile5.sh
new file mode 100755
index 0000000..02afca3
--- /dev/null
+++ b/t/compile5.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the file name translation in the 'compile' script works
+# correctly
+
+. ./defs || Exit 1
+
+get_shell_script compile
+
+# Use a dummy cl, since cl isn't readily available on all systems
+cat >cl <<'END'
+#! /bin/sh
+echo "$@"
+END
+
+chmod +x ./cl
+
+cat >>configure.ac << 'END'
+AC_CANONICAL_HOST
+AC_CONFIG_FILES([check_host], [chmod +x check_host])
+AC_OUTPUT
+END
+
+: >Makefile.am
+
+# This will be sourced, nor executed.
+cat >check_host.in << 'END'
+case '@host_os@' in
+  mingw*)
+    ;;
+  *)
+    skip_ "target OS is not MinGW"
+    ;;
+esac
+case @build_os@ in
+  mingw* | cygwin*)
+    ;;
+  *)
+    winepath -w / \
+      || skip_ "not on MinGW or Cygwin, and winepath not available"
+    ;;
+esac
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+. ./check_host
+
+pwd=`pwd`
+
+# POSIX mandates that the compiler accepts a space between the -I,
+# -l and -L options and their respective arguments.  Traditionally,
+# this should work also without a space.  Try both usages.
+for sp in '' ' '; do
+  # Check if "compile cl" transforms absolute file names to
+  # host format (e.g /somewhere -> c:/msys/1.0/somewhere).
+
+  res=`./compile ./cl -L${sp}"$pwd" | sed -e 's/-link -LIBPATH://'`
+
+  case $res in
+    ?:[\\/]*)
+      ;;
+    *)
+      Exit 1
+      ;;
+  esac
+done
+
+:
diff --git a/t/compile6.sh b/t/compile6.sh
new file mode 100755
index 0000000..9db3373
--- /dev/null
+++ b/t/compile6.sh
@@ -0,0 +1,105 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' searches libraries correctly
+
+am_create_testdir=empty
+required=xsi-lib-shell
+. ./defs || Exit 1
+
+get_shell_script compile
+
+# Use a dummy cl, since cl isn't readily available on all systems
+cat >cl <<'END'
+#! /bin/sh
+echo "$@"
+END
+
+chmod +x ./cl
+
+# POSIX mandates that the compiler accepts a space between the -I,
+# -l and -L options and their respective arguments.  Traditionally,
+# this should work also without a space.  Try both usages.
+for sp in '' ' '; do
+  rm -rf lib lib2 syslib "sys  lib2"
+
+  mkdir syslib
+  :> syslib/foo.lib
+
+  syslib=`pwd`/syslib
+  LIB=$syslib
+  export LIB
+
+  mkdir lib
+  :> lib/bar.lib
+  :> lib/bar.dll.lib
+
+  # Check if compile library search correctly
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib"
+
+  # Check if -static makes compile avoid bar.dll.lib
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib -static -l${sp}bar -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo lib/bar.lib $syslib/foo.lib -link 
-LIBPATH:lib"
+
+  :> syslib/bar.lib
+  :> syslib/bar.dll.lib
+
+  # Check if compile finds bar.dll.lib in syslib
+  opts=`./compile ./cl foo.c -o foo -l${sp}bar -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo $syslib/bar.dll.lib $syslib/foo.lib"
+
+  # Check if compile prefers -L over $LIB
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib"
+
+  mkdir lib2
+  :> lib2/bar.dll.lib
+
+  # Check if compile avoids bar.dll.lib in lib2 when -static
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -static -l${sp}bar -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo $syslib/bar.lib $syslib/foo.lib -link 
-LIBPATH:lib2"
+
+  # Check if compile gets two different bar libraries when -static
+  # is added in the middle
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -L${sp}lib -l${sp}bar -static 
-l${sp}bar`
+  test x"$opts" = x"foo.c -Fefoo lib2/bar.dll.lib lib/bar.lib -link 
-LIBPATH:lib2 -LIBPATH:lib"
+
+  # Check if compile gets the correct bar.dll.lib
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib -L${sp}lib2 -l${sp}bar 
-l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib -LIBPATH:lib2"
+
+  # Check if compile gets the correct bar.dll.lib
+  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -L${sp}lib -l${sp}bar 
-l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo lib2/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib2 -LIBPATH:lib"
+
+  mkdir "sys  lib2"
+  :> "sys  lib2/foo.dll.lib"
+
+  syslib2="`pwd`/sys  lib2"
+  LIB="$syslib2;$LIB"
+
+  # Check if compile handles spaces in $LIB and that it prefers the order
+  # in a multi-component $LIB.
+  opts=`./compile ./cl foo.c -o foo -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo $syslib2/foo.dll.lib"
+
+  # Check if compile handles the 2nd directory in a multi-component $LIB.
+  opts=`./compile ./cl foo.c -o foo -static -l${sp}foo`
+  test x"$opts" = x"foo.c -Fefoo $syslib/foo.lib"
+done
+
+:
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
new file mode 100755
index 0000000..806c59f
--- /dev/null
+++ b/t/compile_f90_c_cxx.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure rules to invoke all compilers are selected with
+# mixed source objects.
+# (copied from compile_f_c_cxx.test) Mike Nolta <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_FC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES  = foo.f90 bar.c baz.cc
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# Look for the macros at the beginning of rules.
+tab=
+$FGREP "$tab\$(COMPILE)"    Makefile.in
+$FGREP "$tab\$(CXXCOMPILE)" Makefile.in
+$FGREP "$tab\$(FCCOMPILE)"  Makefile.in
+
+:
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
new file mode 100755
index 0000000..99893d8
--- /dev/null
+++ b/t/compile_f_c_cxx.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure rules to invoke all compilers are selected with
+# mixed source objects.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_F77
+AC_F77_LIBRARY_LDFLAGS
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES  = foo.f bar.c baz.cc
+END
+
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+# Look for the macros at the beginning of rules.
+$FGREP "$tab\$(COMPILE)"    Makefile.in
+$FGREP "$tab\$(CXXCOMPILE)" Makefile.in
+$FGREP "$tab\$(F77COMPILE)" Makefile.in
+
+:
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
new file mode 100755
index 0000000..5d18b5c
--- /dev/null
+++ b/t/cond-basic.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check basic use of conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TEST], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if TEST
+target: true
+       action
+else
+target: false
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'address@hidden@target: true' Makefile.in
+grep "address@hidden@${tab}action" Makefile.in
+grep 'address@hidden@target: false' Makefile.in
+
+:
diff --git a/t/cond.sh b/t/cond.sh
new file mode 100755
index 0000000..f7f0a8c
--- /dev/null
+++ b/t/cond.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check basic use of conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TEST], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if TEST
+VAR = true
+else
+VAR = false
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^TEST_FALSE' Makefile.in && Exit 1
+grep '^TEST_TRUE' Makefile.in && Exit 1
+grep 'address@hidden@VAR = true$' Makefile.in
+grep 'address@hidden@VAR = false$' Makefile.in
+
+:
diff --git a/t/cond10.sh b/t/cond10.sh
new file mode 100755
index 0000000..56a9083
--- /dev/null
+++ b/t/cond10.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.  From Raja R Harinath.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([USE_A], [test x = y])
+AM_CONDITIONAL([USE_B], [test x = z])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if USE_A
+out=output_a.c
+else
+if USE_B
+out=output_b.c
+else
+out=output_c.c
+endif
+endif
+
+noinst_PROGRAMS=foo
+foo_SOURCES=foo.c $(out)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+grep 'USE_A_FALSE.*USE_B_FALSE.*output_c\...OBJEXT.' Makefile.in
+
+:
diff --git a/t/cond11.sh b/t/cond11.sh
new file mode 100755
index 0000000..b53cb70
--- /dev/null
+++ b/t/cond11.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.  From Richard Boulton.
+# This checks that, if LDADD is set from a conditional variable
+# and an AC_SUBST, the _DEPENDENCIES variable is set correctly.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([CC], [false])
+AM_CONDITIONAL([USE_A], [test -z "$two"])
+AC_SUBST([SUBSTVAR], [bar])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if USE_A
+foolibs=faz.la
+else
+foolibs=
+endif
+
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+LDADD = $(SUBSTVAR) $(foolibs)
+
+.PHONY: test1 test2
+test1:
+       is faz.la == $(foo_DEPENDENCIES)
+test2:
+       is "" == $(foo_DEPENDENCIES)
+END
+
+: > config.guess
+: > config.sub
+: > compile
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --ignore-deps
+
+./configure
+$MAKE test1
+
+./configure two=yes
+$MAKE test2
+
+:
diff --git a/t/cond13.sh b/t/cond13.sh
new file mode 100755
index 0000000..1ab328d
--- /dev/null
+++ b/t/cond13.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.
+# Report from Lars J. Aas.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtest.a
+
+if COND1
+SOURCEVAR1 =
+SOURCEVAR2 = habla.cpp espanol.cpp
+else
+SOURCEVAR1 = dummy.cpp
+SOURCEVAR2 =
+endif
+
+if COND2
+TESTSOURCES = $(SOURCEVAR1)
+else
+TESTSOURCES = $(SOURCEVAR2)
+endif
+
+libtest_a_SOURCES = $(TESTSOURCES)
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^am_libtest_a_OBJECTS =' Makefile.in
+
+:
diff --git a/t/cond14.sh b/t/cond14.sh
new file mode 100755
index 0000000..f3725c3
--- /dev/null
+++ b/t/cond14.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.
+# Report from Robert Boehne.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([COND1], [true])
+END
+
+cat > Makefile.am << 'END'
+if COND1
+BUILD_helldl = helldl
+helldl_SOURCES = dlmain.c
+helldl_DEPENDENCIES = libhello.la
+else
+BUILD_helldl =
+bin_SCRIPTS = helldl
+helldl$(EXEEXT):
+       rm -f $@
+       echo '#! /bin/sh' > $@
+       echo '-dlopen is unsupported' >> $@
+       chmod +x $@
+endif
+
+bin_PROGRAMS = $(BUILD_helldl)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP helldl Makefile.in # For debugging.
+test `$FGREP -c 'helldl$(EXEEXT):' Makefile.in` -eq 2
+
+:
diff --git a/t/cond15.sh b/t/cond15.sh
new file mode 100755
index 0000000..68f70fd
--- /dev/null
+++ b/t/cond15.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for conditionally defined overriding of automatic rules.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+END
+
+cat > Makefile.am << 'END'
+if COND1
+if COND2
+bin_SCRIPTS = helldl
+helldl$(EXEEXT):
+       rm -f $@
+       echo '#! /bin/sh' > $@
+       echo '-dlopen is unsupported' >> $@
+       chmod +x $@
+endif
+else
+if COND2
+else
+bin_SCRIPTS = helldl
+helldl$(EXEEXT):
+       rm -f $@
+       echo '#! /bin/sh' > $@
+       echo '-dlopen is unsupported' >> $@
+       chmod +x $@
+endif
+endif
+
+bin_PROGRAMS = helldl
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP helldl Makefile.in # For debugging.
+num1=`$FGREP 'helldl$(EXEEXT):' Makefile.in | wc -l`
+num2=`$FGREP '@COND1_FALSE@@address@hidden(EXEEXT):' Makefile.in | wc -l`
+test $num1 -eq 4
+test $num2 -eq 1
+
+:
diff --git a/t/cond16.sh b/t/cond16.sh
new file mode 100755
index 0000000..11a4f68
--- /dev/null
+++ b/t/cond16.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals in SOURCES with variable substitution
+# references.
+# Report from Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND1], [true])
+AC_OUTPUT
+END
+
+: > hello.c
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+OBJEXT = o
+
+if COND1
+var = foo.c
+else
+var = foo.c
+endif
+
+bin_PROGRAMS = hell
+hell_SOURCES = $(var:=)
+
+.PHONY: test
+test:
+       is $(hell_SOURCES) $(hell_OBJECTS) == foo.c foo.o
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE test
+
+:
diff --git a/t/cond17.sh b/t/cond17.sh
new file mode 100755
index 0000000..37a0793
--- /dev/null
+++ b/t/cond17.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for being able to define an object to be generated in different ways
+# according to a conditional.
+# Report from Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_CONDITIONAL([COND1], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = helldl
+if COND1
+helldl_SOURCES = foo.cc
+else
+helldl_SOURCES = foo.c
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+:
diff --git a/t/cond18.sh b/t/cond18.sh
new file mode 100755
index 0000000..32c0ab2
--- /dev/null
+++ b/t/cond18.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for substitution references to conditional variables.
+# Report from Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+OBJEXT = obj
+
+var1 = dlmain
+
+if COND1
+var2 = $(var1:=.c) foo.cc
+else
+var2 = $(var1:=.c)
+endif
+
+if COND2
+var3 = $(var2:.cc=.c)
+else
+var3 = $(var2:.cc=.c)
+endif
+
+helldl_SOURCES = $(var3)
+
+.PHONY: test
+test:
+       is $(helldl_SOURCES) $(helldl_OBJECTS) == \
+           dlmain.c foo.c dlmain.obj foo.obj
+
+bin_PROGRAMS = helldl
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE test
+
+:
diff --git a/t/cond19.sh b/t/cond19.sh
new file mode 100755
index 0000000..86f677e
--- /dev/null
+++ b/t/cond19.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for substitution references to conditional variables.
+# Report from Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([CC], [false])
+AC_SUBST([OBJEXT], [o])
+AM_CONDITIONAL([COND1], [test "x$CONDITION1" = "xtrue"])
+AM_CONDITIONAL([COND2], [test "x$CONDITION2" = "xtrue"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = helldl
+
+var1 = dlmain
+
+if COND1
+var2 = $(var1:=.c)
+else
+var2 = $(var1:=.c)
+endif
+
+if COND2
+var3 = $(var2:.c=a.c)
+var4 = $(var2:.c=b.c)
+else
+var3 = $(var2:.c=b.c)
+var4 = $(var2:.c=a.c)
+endif
+
+helldl_SOURCES = $(var3:.c=1.c) $(var4:.c=2.c)
+
+.PHONY: test
+test:
+       is $(exp) == $(helldl_SOURCES) $(helldl_OBJECTS)
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a -i
+
+CONDITION1=true CONDITION2=true ./configure
+$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o'
+CONDITION1=true CONDITION2=false ./configure
+$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o'
+CONDITION1=false CONDITION2=true ./configure
+$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o'
+CONDITION1=false CONDITION2=false ./configure
+$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o'
+
+:
diff --git a/t/cond2.sh b/t/cond2.sh
new file mode 100755
index 0000000..1b5fcea
--- /dev/null
+++ b/t/cond2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check SUBDIRS set based on conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TEST], [true])
+END
+
+cat > Makefile.am << 'END'
+if TEST
+DIR = dir1
+else
+DIR = dir2
+endif
+SUBDIRS = $(DIR)
+END
+
+mkdir dir1
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:4:.*dir2.*does not exist' stderr
+
+:
diff --git a/t/cond20.sh b/t/cond20.sh
new file mode 100755
index 0000000..40e41f1
--- /dev/null
+++ b/t/cond20.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for recursion handling in substitution references to
+# conditional variables.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([COND1], [true])
+END
+
+cat > Makefile.am << 'END'
+var1 = $(var2)
+
+if COND1
+var2 = $(var1:=.c) foo.c
+else
+var2 = $(var1:=.c)
+endif
+
+helldl_SOURCES = $(var2)
+
+bin_PROGRAMS = helldl
+END
+
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails -a
+grep "variable.*var2.*recursively defined" stderr
+
+:
diff --git a/t/cond21.sh b/t/cond21.sh
new file mode 100755
index 0000000..7719c83
--- /dev/null
+++ b/t/cond21.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for use of = and += in different conditions.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AM_CONDITIONAL([COND3], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+
+FOO = foo
+if COND1
+  FOO += foo1
+else
+  FOO += foon1
+endif
+if COND2
+  FOO += foo2
+else
+  FOO += foon2
+endif
+if COND1
+  FOO += foo1b
+else
+  FOO += foon1b
+endif
+
+if COND1
+if COND2
+  BAR = bar12
+else
+  BAR = bar1n2
+endif
+else
+  BAR = barn1
+endif
+
+BAR += bar
+
+if COND3
+  BAR += bar3
+endif
+
+.PHONY: test
+test:
+       @echo BAR: $(BAR) :BAR
+       @echo FOO: $(FOO) :FOO
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
+$MAKE test | $FGREP 'FOO: foo foo1 foo2 foo1b :FOO'
+
+:
diff --git a/t/cond22.sh b/t/cond22.sh
new file mode 100755
index 0000000..7a58c24
--- /dev/null
+++ b/t/cond22.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for bug when sources listed in conditional.
+# Report from Richard Boulton.  PR/326.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+CC=false; AC_SUBST([CC])
+OBJEXT=oo; AC_SUBST([OBJEXT])
+AM_CONDITIONAL([ONE], [true])
+AM_CONDITIONAL([TWO], [false])
+AM_CONDITIONAL([THREE], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = targ
+
+if ONE
+SONE = one.c
+endif
+
+if TWO
+STWO =
+else
+STWO = two.c
+endif
+
+if THREE
+STHREE =
+else
+STHREE = three.c
+endif
+
+if THREE
+STHREE2 =
+else
+STHREE2 = three2.c
+endif
+
+targ_SOURCES = $(SONE) $(STWO) $(STHREE) $(STHREE2)
+
+.PHONY: test
+test:
+       is $(targ_OBJECTS) == one.oo two.oo three.oo three2.oo
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --ignore-deps
+./configure
+$MAKE test
+
+:
diff --git a/t/cond23.sh b/t/cond23.sh
new file mode 100755
index 0000000..d6c2bdf
--- /dev/null
+++ b/t/cond23.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
+# Report from Patrik Weiskircher.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_CONDITIONAL([COND], [true])
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+libdir = mumble
+endif
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:2:.* libdir was already defined' stderr
+
+:
diff --git a/t/cond24.sh b/t/cond24.sh
new file mode 100755
index 0000000..b7038cc
--- /dev/null
+++ b/t/cond24.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
+# Report from Patrik Weiskircher.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_SUBST([foo], [bar])
+AM_CONDITIONAL([COND], [true])
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+## A dummy comment to change line numer.
+foo = baz
+endif
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:3:.* foo was already defined' stderr
+grep '^configure\.ac:4:.*foo.* previously defined here' stderr
+
+:
diff --git a/t/cond25.sh b/t/cond25.sh
new file mode 100755
index 0000000..c427033
--- /dev/null
+++ b/t/cond25.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that conditional primaries can use non-conditional directories.
+# From Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'EOF'
+AM_CONDITIONAL([USE_FOO], [true])
+AC_PROG_CC
+EOF
+
+cat >Makefile.am << 'EOF'
+if USE_FOO
+foo_PROGRAMS = foo
+endif
+
+foodir = $(libdir)/foo
+foo_SOURCES = foo.c
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/cond26.sh b/t/cond26.sh
new file mode 100755
index 0000000..f0aac96
--- /dev/null
+++ b/t/cond26.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that non-conditional primaries can use conditional directories.
+# Reported by Juergen Keil.
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'EOF'
+AM_CONDITIONAL([USE_FOO], [true])
+EOF
+
+cat >Makefile.am << 'EOF'
+if USE_FOO
+mydir = /foo
+else
+mydir = /bar
+endif
+my_DATA = foo
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/cond27.sh b/t/cond27.sh
new file mode 100755
index 0000000..0a8263d
--- /dev/null
+++ b/t/cond27.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that non-conditional primaries cannot use directories defined
+# in some conditions (but not others).
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'EOF'
+AM_CONDITIONAL([USE_FOO], [true])
+EOF
+
+cat >Makefile.am << 'EOF'
+if USE_FOO
+mydir = /foo
+endif
+my_DATA = foo
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep ' USE_FOO' stderr && Exit 1
+grep '!USE_FOO' stderr
+
+:
diff --git a/t/cond28.sh b/t/cond28.sh
new file mode 100755
index 0000000..7a6bcff
--- /dev/null
+++ b/t/cond28.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that conditional primaries can use directories defined
+# in the same conditions (but not others).
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'EOF'
+AM_CONDITIONAL([USE_FOO], [true])
+EOF
+
+cat >Makefile.am << 'EOF'
+if USE_FOO
+mydir = /foo
+endif
+if USE_FOO
+my_DATA = foo
+endif
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/cond29.sh b/t/cond29.sh
new file mode 100755
index 0000000..ee9bf9b
--- /dev/null
+++ b/t/cond29.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that many conditions do not lead to combinatorial explosion.
+# (This is related to PR/352.)
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >>configure.ac
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = a
+a02_LDADD =
+a03_SOURCES =
+EOF
+
+# On this test, Automake 1.7.x would compute all 2**24 = 16777216
+# possible combinations of conditionals (it would do this five times,
+# to define a01_DEPENDENCIES, a02_DEPENDENCIES, a03_OBJECTS,
+# a04_OBJECTS, and to rewrite bin_PROGRAM), eating all memory, swap,
+# or cpu time it can found.
+# Limit memory available to spawned processes to ~ 150 MB.  Considering
+# that 70 MB is enough for x86_64 Fedora 16, that gives tools and
+# libraries plenty of room to grow.  Suggested by Jim Meyering in
+# automake bug#10374.
+(ulimit -v 1; sh -c ":") && skip_ "no adequate 'ulimit' builtin found"
+(ulimit -v 150000; sh -c ":") || skip_ "no adequate 'ulimit' builtin found"
+ulimit -v 150000
+
+for i in \
+  01 02 03 04 05 06 07 08 09 10 \
+  11 12 13 14 15 16 17 18 19 20 \
+  21 22 23 24
+do
+  unindent >>Makefile.am <<EOF
+    if C$i
+    bin_PROGRAMS += a$i
+    a01_LDADD = foo${i}.o
+    a02_LDADD += bar${i}.o
+    a03_SOURCES += baz${i}.c
+    a04_SOURCES = quux${i}.c
+    endif C$i
+EOF
+  echo "AM_CONDITIONAL([C$i], [:])" >>configure.ac
+done
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/cond3.sh b/t/cond3.sh
new file mode 100755
index 0000000..2bcb8c1
--- /dev/null
+++ b/t/cond3.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test sources listed in conditional.
+# Report from Rob Savoye <address@hidden>, and Lars J. Aas.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([ONE], [true])
+AM_CONDITIONAL([TWO], [false])
+AM_CONDITIONAL([THREE], [maybe])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = targ
+
+if ONE
+SONE = one.c
+else
+SONE =
+endif
+
+if TWO
+STWO = two.c
+else
+STWO =
+endif
+
+if THREE
+STHREE = three.c
+else
+STHREE =
+endif
+
+targ_SOURCES = $(SONE) $(STWO) $(STHREE)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# 'b top' so that
+sed -n '
+/[oO][bB][jJ][eE][cC][tT].* =/ {
+  : loop
+  /\\$/ {
+    p
+    n
+    b loop
+  }
+  p
+}' Makefile.in >produced
+
+cat >expected << 'EOF'
address@hidden@am__objects_1 = one.$(OBJEXT)
address@hidden@am__objects_2 = two.$(OBJEXT)
address@hidden@am__objects_3 = three.$(OBJEXT)
+am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)
+targ_OBJECTS = $(am_targ_OBJECTS)
+EOF
+
+diff expected produced
+
+:
diff --git a/t/cond30.sh b/t/cond30.sh
new file mode 100755
index 0000000..6c2b396
--- /dev/null
+++ b/t/cond30.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([C1], [test -z "$two"])
+AM_CONDITIONAL([C2], [test -n "$two"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+EXEEXT = .foo
+
+if C1
+bin_PROGRAMS = a
+endif
+if C2
+bin_PROGRAMS = b $(undefined)
+endif
+
+.PHONY: test-a test-b
+test-a:
+       test a.foo = $(bin_PROGRAMS)
+test-b:
+       test b.foo = $(bin_PROGRAMS)
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+$FGREP 'a_SOURCES = a.c' Makefile.in
+$FGREP 'b_SOURCES = b.c' Makefile.in
+
+./configure
+$MAKE test-a
+
+./configure two=yes
+$MAKE test-b
+
+:
diff --git a/t/cond31.sh b/t/cond31.sh
new file mode 100755
index 0000000..d6006cb
--- /dev/null
+++ b/t/cond31.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we define conditional _DEPENDENCIES correctly.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_SUBST([CC], [false])
+AC_SUBST([OBJEXT], [o])
+AM_CONDITIONAL([C1], [test -z "$two"])
+AM_CONDITIONAL([C2], [test -n "$two"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+bin_PROGRAMS = a
+a_LDADD = c0.o -L/some/where
+if C1
+a_LDADD += c1.o -llibfoo.a
+endif
+if C2
+a_LDADD += c2.o -dlopen c3.la
+endif
+
+.PHONY: test1 test2
+test1:
+       is $(a_DEPENDENCIES) == c0.o c1.o
+test2:
+       is $(a_DEPENDENCIES) == c0.o c2.o c3.la
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --ignore-deps
+
+./configure
+$MAKE test1
+
+./configure two=yes
+$MAKE test2
+
+:
diff --git a/t/cond32.sh b/t/cond32.sh
new file mode 100755
index 0000000..7ff1a41
--- /dev/null
+++ b/t/cond32.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the user can override a conditional _DEPENDENCIES.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([C1], [test -z "$two"])
+AM_CONDITIONAL([C2], [test -n "$two"])
+AM_CONDITIONAL([C3], [test -z "$three"])
+# We define CC in Makefile.am, but OBJEXT here.
+OBJEXT=o; AC_SUBST([OBJEXT])
+AC_SUBST([MYSUB], ["foo.$OBJEXT"])
+AC_OUTPUT
+EOF
+
+cat >>Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = :
+
+bin_PROGRAMS = a
+
+if C1
+a_LDADD = $(MYSUB)
+a_DEPENDENCIES = $(MYSUB) nonsense.a
+# Note that 'nonsense.a' is there just to make sure Automake insn't
+# using some self computed a_DEPENDENCIES variable.
+endif
+
+if C2
+if C3
+BAR = bar.o
+else
+BAR = baz.o
+endif
+a_LDADD = $(BAR)
+endif
+
+test:
+       is $(exp) == $(a_DEPENDENCIES)
+.PHONY: test
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test exp='foo.o nonsense.a'
+
+./configure two=yes three=
+$MAKE test exp='bar.o'
+
+./configure two=yes three=yes
+$MAKE test exp='baz.o'
+
+:
diff --git a/t/cond33.sh b/t/cond33.sh
new file mode 100755
index 0000000..9655d3b
--- /dev/null
+++ b/t/cond33.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that conditionally-defined install directories are handled
+# correctly.
+# Report from Ralf Corsepius.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([INC], [test -z "$two"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+if INC
+include_foodir = $(includedir)/foo
+include_foo_HEADERS = foo.h
+else
+bardir = $(bindir)
+dist_bar_SCRIPTS = x.sh
+endif
+
+foo.h x.sh:
+       :>$@
+
+.PHONY: distdircheck
+distdircheck: distdir
+       test -f $(distdir)/foo.h
+       test -f $(distdir)/x.sh
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cwd=`pwd` || fatal_ "cannot get current directory"
+mkdir nowhere
+chmod a-w nowhere
+
+./configure --prefix="$cwd"/nowhere --bindir="$cwd"/bin \
+            --includedir="$cwd"/inc
+$MAKE installdirs
+test ! -d bin
+test -d inc/foo
+test ! -f inc/foo/foo.h
+rm -rf inc
+$MAKE install
+test ! -d bin
+test -f inc/foo/foo.h
+$MAKE distdircheck
+
+rm -rf inc
+
+./configure two=two --prefix="$cwd"/nowhere --bindir="$cwd"/bin \
+                    --includedir="$cwd"/inc
+$MAKE install
+test ! -d inc
+test -f bin/x.sh
+rm -rf inc
+$MAKE installdirs
+test ! -d inc
+test -d bin
+$MAKE distdircheck
+
+:
diff --git a/t/cond34.sh b/t/cond34.sh
new file mode 100755
index 0000000..8349406
--- /dev/null
+++ b/t/cond34.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for _DEPENDENCIES definition with conditional _LDADD.
+# Report from Elena A. Vengerova.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([TWO], [test -n "$two"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+OBJEXT=z
+CC=false
+AUTOMAKE_OPTIONS=no-dependencies
+
+bin_PROGRAMS = test1 test2
+
+if TWO
+  test1_LDADD = two.$(OBJEXT)
+  test2_LDADD = two.$(OBJEXT)
+  test2_DEPENDENCIES = $(test2_LDADD) somethingelse.a
+else !TWO
+  test1_LDADD = one.$(OBJEXT)
+  test2_LDADD = three.$(OBJEXT)
+endif !TWO
+
+test1_DEPENDENCIES = $(test1_LDADD) somethingelse.a
+
+.PHONY: dep-test1 dep-test2
+dep-test1:
+       echo BEG: $(test1_DEPENDENCIES) :END
+dep-test2:
+       echo BEG: $(test2_DEPENDENCIES) :END
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$MAKE dep-test1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: one.z somethingelse.a :END' stdout
+
+$MAKE dep-test2 >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: three.z :END' stdout
+
+./configure two=2
+
+$MAKE dep-test1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: two.z somethingelse.a :END' stdout
+
+$MAKE dep-test2 >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: two.z somethingelse.a :END' stdout
+
+:
diff --git a/t/cond35.sh b/t/cond35.sh
new file mode 100755
index 0000000..043b3b0
--- /dev/null
+++ b/t/cond35.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check rules output for parser defined conditionally.
+# Report from Roman Fietze.
+
+required='cc lex yacc'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
+AC_PROG_CC
+AM_PROG_LEX
+AC_PROG_YACC
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+AM_YFLAGS               =       -d
+
+BUILT_SOURCES           =       tparse.h
+
+if CASE_A
+bin_PROGRAMS            =       ta
+ta_SOURCES              =       ta.c tparse.h tscan.l tparse.y
+ta_LDADD                =       $(LEXLIB)
+else
+bin_PROGRAMS            =       tb
+tb_SOURCES              =       tb.c tparse.h tscan.l tparse.y
+tb_LDADD                =       $(LEXLIB)
+endif
+
+
+test-ta:
+       test -f ta$(EXEEXT)
+test-tb:
+       test -f tb$(EXEEXT)
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+$FGREP 'tparse.h' Makefile.in # For debugging.
+test `$FGREP -c 'tparse.h:' Makefile.in` = 1
+
+cat > tscan.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+%%
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+cat > tparse.y << 'END'
+%{
+void yyerror (char *s) {}
+%}
+%token EOF
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+END
+
+cat > ta.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cp ta.c tb.c
+
+./configure
+$MAKE
+$MAKE test-ta
+
+./configure case_B=yes
+$MAKE
+$MAKE test-tb
+
+:
diff --git a/t/cond36.sh b/t/cond36.sh
new file mode 100755
index 0000000..82200cc
--- /dev/null
+++ b/t/cond36.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check rules output for parser defined conditionally.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
+AC_PROG_CC
+AM_PROG_LEX
+AC_PROG_YACC
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+AM_YFLAGS               =       -d
+
+BUILT_SOURCES           =       tparse.h
+
+if CASE_A
+bin_PROGRAMS            =       ta
+ta_SOURCES              =       ta.c tparse.h tscan.l tparse.y
+ta_LDADD                =       $(LEXLIB)
+else
+bin_PROGRAMS            =       tb
+tb_SOURCES              =       tb.c tparse.h tscan.l tparse.y
+tb_LDADD                =       $(LEXLIB)
+tparse.h: tparce.c
+       echo whatever
+endif
+EOF
+
+$ACLOCAL
+
+# Presently Automake doesn't fully support partially overriden rules
+# and should complain.
+AUTOMAKE_fails --add-missing
+grep 'tparse\.h.*already defined' stderr
+$AUTOMAKE -Wno-error
+
+# Still and all, it should generate two rules.
+$FGREP 'tparse.h' Makefile.in # For debugging.
+test `$FGREP -c 'tparse.h:' Makefile.in` = 2
+$FGREP '@address@hidden:' Makefile.in
+$FGREP '@address@hidden:' Makefile.in
+
+:
diff --git a/t/cond37.sh b/t/cond37.sh
new file mode 100755
index 0000000..6423d39
--- /dev/null
+++ b/t/cond37.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check conditional local rules.
+# Report from Simon Josefsson.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([CASE_A], [test -n "$case_A"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+if CASE_A
+check-local:
+       @echo GrepMe1
+else
+install-data-local:
+       @echo GrepMe2
+endif
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep GrepMe1 stdout && Exit 1
+$MAKE install >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep GrepMe2 stdout
+
+./configure case_A=1
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep GrepMe1 stdout
+$MAKE install >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep GrepMe2 stdout && Exit 1
+
+:
diff --git a/t/cond38.sh b/t/cond38.sh
new file mode 100755
index 0000000..71ae69a
--- /dev/null
+++ b/t/cond38.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check conditional variable ordering.
+# Report from Ed Hartnett.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_CONDITIONAL([CASE_A], :)
+AM_CONDITIONAL([CASE_B], :)
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+SUBDIRS = a
+if CASE_A
+SUBDIRS += b
+endif
+SUBDIRS += c
+if CASE_A
+SUBDIRS += d
+if CASE_B
+SUBDIRS += e
+endif
+SUBDIRS += f
+endif
+SUBDIRS += g
+if CASE_B
+SUBDIRS += h
+endif
+if CASE_B
+SUBDIRS += iXYZ
+SUBDIRS += jZYX
+endif
+
+.PHONY: test
+test:
+       is $(SUBDIRS) == a b c d e f g h iXYZ jZYX
+EOF
+
+mkdir a b c d e f g h iXYZ jZYX
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+# Make sure no extra variable was created for the last 3 items.
+grep 'append.*=.* h iXYZ jZYX' Makefile
+# Check good ordering.
+$MAKE test
+
+:
diff --git a/t/cond39.sh b/t/cond39.sh
new file mode 100755
index 0000000..840b8b8
--- /dev/null
+++ b/t/cond39.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Build either as CONFIG_FILE or as PROGRAM.
+
+required=cc
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_CONDITIONAL([COND], [test "$COND" = true])
+AM_COND_IF([COND], [],
+          [AC_CONFIG_FILES([prog1], [chmod 755 prog1])
+           AC_CONFIG_FILES([sub/prog2], [chmod 755 sub/prog2])])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+SUBDIRS = sub
+if COND
+bin_PROGRAMS = prog1
+prog1_SOURCES = prog.c
+else
+bin_SCRIPTS = prog1
+CLEANFILES = prog1
+endif
+
+sure-exist:
+       test -f prog1 || test -f prog1$(EXEEXT)
+       test -f sub/prog2 || test -f sub/prog2$(EXEEXT)
+
+sure-not-exist:
+       test ! -f prog1 && test ! -f prog1$(EXEEXT)
+       test ! -f sub/prog2 && test ! -f sub/prog2$(EXEEXT)
+END
+
+cat >sub/Makefile.am <<'END'
+if COND
+bin_PROGRAMS = prog2
+prog2_SOURCES = prog.c
+else
+bin_SCRIPTS = prog2
+CLEANFILES = prog2
+endif
+END
+
+cat >prog.c <<'END'
+int main () { return 42; }
+END
+
+cat >prog1.in <<'END'
+#! /bin/sh
+bindir='@bindir@'
+echo "hi, this is $0, and bindir is $bindir"
+END
+
+cp prog.c sub
+cp prog1.in sub/prog2.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure COND=true
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'overriding commands' stderr && Exit 1
+$MAKE sure-exist
+./prog1 && Exit 1
+./sub/prog2 && Exit 1
+$MAKE clean
+$MAKE sure-not-exist
+$MAKE
+$MAKE sure-exist
+./prog1 && Exit 1
+./sub/prog2 && Exit 1
+$MAKE distclean
+
+./configure COND=false
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'overriding commands' stderr && Exit 1
+./prog1
+./sub/prog2
+$MAKE clean
+$MAKE sure-not-exist
+$MAKE
+./prog1
+./sub/prog2
+
+:
diff --git a/t/cond4.sh b/t/cond4.sh
new file mode 100755
index 0000000..9bd0cc6
--- /dev/null
+++ b/t/cond4.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another sources-in-conditional test.  Report from Tim Goodwin.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([CC], [false])
+AC_SUBST([OBJEXT], [o])
+AM_CONDITIONAL([ONE], [test "x$CONDITION1" = "xtrue"])
+AM_CONDITIONAL([TWO], [test "x$CONDITION2" = "xtrue"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = targ
+
+if ONE
+OPT1 = one.c
+endif
+
+if TWO
+OPT2 = two.c
+endif
+
+targ_SOURCES = main.c $(OPT1) $(OPT2)
+
+.PHONY: test
+test:
+       is $(exp) == $(targ_OBJECTS)
+END
+
+$ACLOCAL
+$AUTOMAKE -i
+
+# We should not output useless definitions.
+grep 'address@hidden@' Makefile.in && Exit 1
+grep 'address@hidden@' Makefile.in && Exit 1
+
+$AUTOCONF
+
+CONDITION1=true CONDITION2=true ./configure
+$MAKE test exp='main.o one.o two.o'
+CONDITION1=true CONDITION2=false ./configure
+$MAKE test exp='main.o one.o'
+CONDITION1=false CONDITION2=true ./configure
+$MAKE test exp='main.o two.o'
+CONDITION1=false CONDITION2=false ./configure
+$MAKE test exp='main.o'
+
+:
diff --git a/t/cond40.sh b/t/cond40.sh
new file mode 100755
index 0000000..7dadfc1
--- /dev/null
+++ b/t/cond40.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_COND_IF.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_DEFUN([FOO],
+        [AC_CONFIG_FILES([$1])])
+
+AM_CONDITIONAL([COND], [test "$cond" = yes])
+# Next lines should not cause a shell syntax error.
+AM_COND_IF([COND])
+AM_COND_IF([COND],
+          [AC_SUBST([BAR])])
+AM_COND_IF([COND],
+          [AC_CONFIG_FILES([file1])])
+
+# Things should work even at a time when the shell expressions
+# for the conditional are not valid any more.
+ok=$cond1
+AM_CONDITIONAL([COND1], [test "$ok" = yes])
+ok=$cond2
+AM_CONDITIONAL([COND2], [test "$ok" = yes])
+ok=$cond3
+AM_CONDITIONAL([COND3], [test "$ok" = yes])
+
+AM_COND_IF([COND1],
+          [AM_COND_IF([COND2], [FOO([file2])],
+                      [AM_COND_IF([COND3],
+                                  [FOO([file3])])])])
+
+AC_OUTPUT
+END
+
+: >Makefile.am
+: >file1.in
+: >file2.in
+: >file3.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure cond=yes cond1=yes cond2=no cond3=yes
+test -f file1
+test ! -f file2
+test -f file3
+rm -f file1 file3
+$MAKE file1 file3
+$MAKE file2 && Exit 1
+test -f file1
+test ! -f file2
+test -f file3
+$MAKE distclean
+
+./configure cond=no cond1=yes cond2=yes
+test ! -f file1
+test -f file2
+test ! -f file3
+rm -f file2
+$MAKE file1 && Exit 1
+$MAKE file2
+$MAKE file3 && Exit 1
+test ! -f file1
+test -f file2
+test ! -f file3
+
+:
diff --git a/t/cond41.sh b/t/cond41.sh
new file mode 100755
index 0000000..7c59a0a
--- /dev/null
+++ b/t/cond41.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# AM_COND_IF with an undefined condition should fail.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_COND_IF([BAD_COND], [AC_CONFIG_FILES([file1])])
+AC_OUTPUT
+END
+
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep '^configure\.ac:4:.*AM_COND_IF.* no such condition.*BAD_COND' stderr
+
+:
diff --git a/t/cond42.sh b/t/cond42.sh
new file mode 100755
index 0000000..d4eee01
--- /dev/null
+++ b/t/cond42.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure an error with inconsistent state of conditionals in configure.ac.
+# This shouldn't happen with user input, as _AM_COND_* are not documented,
+# but better to be safe.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND], [:])
+# The next line is needed so that cond-if.m4 is pulled in.
+AM_COND_IF([COND])
+_AM_COND_IF([COND])
+AC_OUTPUT
+END
+
+edit_configure_in ()
+{
+  sed "$@" < configure.ac >configure.int
+  mv -f configure.int configure.ac
+  rm -rf autom4te*.cache
+}
+
+: >Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^configure\.ac:8:.* condition stack' stderr
+
+edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/'
+AUTOMAKE_fails
+grep '^configure\.ac:7:.* else without if' stderr
+
+edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
+AUTOMAKE_fails
+grep '^configure\.ac:7:.* endif without if' stderr
+
+edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
+_AM_COND_ENDIF/'
+AUTOMAKE_fails
+grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr
+grep '^configure\.ac:8:.* not enough arguments.* _AM_COND_ENDIF' stderr
+test 2 = `grep -c 'not enough arguments' stderr`
+
+:
diff --git a/t/cond43.sh b/t/cond43.sh
new file mode 100755
index 0000000..028168e
--- /dev/null
+++ b/t/cond43.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND1], [:])
+AM_CONDITIONAL([COND2], [:])
+AM_COND_IF([COND1],
+           AM_COND_IF([COND2], [:])
+)
+AC_OUTPUT
+END
+
+: >Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+$EGREP '^configure\.ac:7:.* missing m4 quoting.*macro depth 2( |$)' stderr
+
+sed '/.AM_COND_IF/{
+        s/^/[/
+        s/$/]/
+     }' < configure.ac > configure.int
+mv -f configure.int configure.ac
+rm -rf autom4te*.cache
+$AUTOMAKE
+
+:
diff --git a/t/cond44.sh b/t/cond44.sh
new file mode 100755
index 0000000..8cc2c2e
--- /dev/null
+++ b/t/cond44.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
+# are not diagnosed.  See cond23.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_CONDITIONAL([COND], [true])
+AM_SUBST_NOTMAKE([libdir])
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+libdir = mumble
+endif
+EOF
+
+$ACLOCAL
+AUTOMAKE_run
+grep 'libdir was already defined' stderr && Exit 1
+grep '^libdir = ' Makefile.in && Exit 1
+Exit 0
diff --git a/t/cond45.sh b/t/cond45.sh
new file mode 100755
index 0000000..1296cd1
--- /dev/null
+++ b/t/cond45.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
+# are not diagnosed.  See cond24.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_SUBST([foo], [bar])
+AM_SUBST_NOTMAKE([foo])
+AM_CONDITIONAL([COND], [true])
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+foo = baz
+endif
+EOF
+
+$ACLOCAL
+AUTOMAKE_run
+grep 'foo was already defined' stderr && Exit 1
+grep '^foo =' Makefile.in && Exit 1
+Exit 0
diff --git a/t/cond46.sh b/t/cond46.sh
new file mode 100755
index 0000000..c89caf9
--- /dev/null
+++ b/t/cond46.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure the right condition is listed after 'else' and 'endif'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([USE_A], [test x = y])
+AM_CONDITIONAL([USE_B], [test x = z])
+AC_OUTPUT
+END
+
+notcompat="incompatible with current conditional"
+
+$ACLOCAL
+
+cat > Makefile.am << 'END'
+if USE_A
+endif !USE_A
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:2:.*endif.*!USE_A.*$notcompat.*[^!]USE_A" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+endif USE_B
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:2:.*endif.*[^!]USE_B.*$notcompat.*[^!]USE_A" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+else
+endif USE_A
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:3:.*endif.*[^!]USE_A.*$notcompat.*USE_A" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+else
+endif !USE_A
+END
+
+$AUTOMAKE
+
+cat > Makefile.am << 'END'
+if USE_A
+if USE_B
+else
+endif !USE_A
+endif
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:4:.*endif.*!USE_A.*$notcompat.*USE_B" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+else USE_A
+endif
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:2:.*else.*[^!]USE_A.*$notcompat.*[^!]USE_A" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+else !USE_A
+endif
+END
+
+$AUTOMAKE
+
+cat > Makefile.am << 'END'
+if USE_A
+else USE_B
+endif
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:2:.*else.*[^!]USE_B.*$notcompat.*[^!]USE_A" stderr
+
+cat > Makefile.am << 'END'
+if USE_A
+if USE_B
+else USE_A
+endif
+endif
+END
+
+AUTOMAKE_fails
+grep "^Makefile\\.am:3:.*else.*[^!]USE_A.*$notcompat.*[^!]USE_B" stderr
+
+:
diff --git a/t/cond5.sh b/t/cond5.sh
new file mode 100755
index 0000000..dd45678
--- /dev/null
+++ b/t/cond5.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Yet another sources-in-conditional test.  Report from Tim Goodwin.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([ONE], [true])
+AM_CONDITIONAL([TWO], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = targ
+
+if ONE
+OPT_SRC = one.c
+endif
+
+if TWO
+OPT_SRC = $(OPT_SRC) two.c
+endif
+
+targ_SOURCES = main.c $(OPT_SRC)
+END
+
+# The bug is that automake hangs.  So we give it an appropriate grace
+# time, then kill it if necessary.
+$ACLOCAL
+$AUTOMAKE 2>stderr &
+pid=$!
+
+# MSYS bash seems to have a bug in kill, so don't try to kill too soon;
+# and avoid maintainer-check test.
+sleep '2'
+
+# Make at most 30 tries, one every 10 seconds (= 300 seconds = 5 min).
+try=1
+while test $try -le 30; do
+  if kill -0 $pid; then
+    : process $pid is still alive, wait and retry
+    sleep '10'
+    try=`expr $try + 1`
+  else
+    cat stderr >&2
+    # Automake must fail with a proper error message.
+    grep 'variable.*OPT_SRC.*recursively defined' stderr
+    Exit 0
+  fi
+done
+# The automake process probably hung.  Kill it, and exit with failure.
+echo "$me: automake process $pid hung"
+kill $pid
+Exit 1
diff --git a/t/cond6.sh b/t/cond6.sh
new file mode 100755
index 0000000..f6a499d
--- /dev/null
+++ b/t/cond6.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for an odd conditional bug.  Report from Matt Leach.
+
+. ./defs || Exit 1
+
+echo 'AM_CONDITIONAL([FOO], [true])' >> configure.ac
+
+cat > Makefile.am << 'END'
+if FOO
+
+helpdir = $(prefix)/Help
+# The continuation line below must start with a Tab to see the bug.
+help_DATA = a b c d e \
+       f g h
+
+else
+
+helpdir = $(prefix)/help
+help_DATA = foo
+
+endif
+
+a b c d e f g h:
+       touch $@
+
+.PHONY: test
+test:
+       is $(help_DATA) == a b c d e f g h
+END
+
+
+# Older versions of this test checked that automake could process the above
+# Makefile.am even with no AC_OUTPUT in configure.  So continue to do this
+# check, for completeness.
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+
+echo AC_OUTPUT >> configure.ac
+touch aclocal.m4 # Avoid unnecessary firing the remake rules.
+$AUTOCONF
+$AUTOMAKE Makefile
+
+./configure --prefix="`pwd`/_inst"
+
+$MAKE test
+
+$MAKE install
+for x in a b c d e f g h; do
+  test -f _inst/Help/$x
+done
+
+:
diff --git a/t/cond7.sh b/t/cond7.sh
new file mode 100755
index 0000000..1651ac9
--- /dev/null
+++ b/t/cond7.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for an odd conditional bug.  Report from Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+compat=yes
+AM_CONDITIONAL([Compatible], [test x$compat = xyes])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if Compatible
+abdir = none
+ab_HEADERS = \
+        minus.h
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^[^#].*002' Makefile.in && Exit 1
+Exit 0
diff --git a/t/cond8.sh b/t/cond8.sh
new file mode 100755
index 0000000..f21aacb
--- /dev/null
+++ b/t/cond8.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure _PROGRAMS conditionals can be written in a useful
+# way.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([X], [test "$x" = yes])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if X
+bin_PROGRAMS = x y
+else
+noinst_PROGRAMS = x y
+endif
+
+.PHONY: get-built get-install not-install
+get-built:
+       test -f x.$(OBJEXT)
+       test -f y.$(OBJEXT)
+       test -f x$(EXEEXT)
+       test -f y$(EXEEXT)
+get-installed:
+       test -f $(bindir)/x$(EXEEXT)
+       test -f $(bindir)/y$(EXEEXT)
+not-installed:
+       if find $(prefix) -type f | grep .; then exit 1; else :; fi
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+cat > x.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cp x.c y.c
+
+instdir=`pwd`/_inst || fatal_ "cannot get current directory"
+
+# Skip the rest of the test in case of e.g. missing C compiler.
+./configure --prefix="$instdir" x=yes || Exit $?
+$MAKE install
+$MAKE get-built
+$MAKE get-installed
+
+$MAKE distclean
+rm -rf _inst
+
+./configure --prefix="$instdir" x=no
+$MAKE install
+$MAKE get-built
+$MAKE not-installed
+
+:
diff --git a/t/cond9.sh b/t/cond9.sh
new file mode 100755
index 0000000..b9addab
--- /dev/null
+++ b/t/cond9.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.  From Raja R Harinath.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([WRONG], [test x = y])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if WRONG
+this=
+else
+this=is_something_interesting
+endif
+
+.PHONY: test-this
+test-this:
+       test '$(this)' = is_something_interesting
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE test-this
+
+:
diff --git a/t/condd.sh b/t/condd.sh
new file mode 100755
index 0000000..be32b7d
--- /dev/null
+++ b/t/condd.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+dnl Define a macro with the same name as the conditional to exhibit
+dnl any underquoted bug.
+AC_DEFUN([COND1], ["some'meaningless;characters`])
+AM_CONDITIONAL([COND1], [false])
+AC_CONFIG_FILES([foo/Makefile])
+AC_CONFIG_FILES([bar/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+
+SUBDIRS = foo
+if COND1
+SUBDIRS += bar
+endif
+
+# Small example from the manual.
+bin_PROGRAMS = hello
+hello_SOURCES = hello-common.c
+if COND1
+hello_SOURCES += hello-cond1.c
+else
+hello_SOURCES += hello-generic.c
+endif
+
+.PHONY: test
+test: distdir
+       test -f $(distdir)/foo/Makefile.am
+       test -f $(distdir)/bar/Makefile.am
+       test -f $(distdir)/hello-common.c
+       test -f $(distdir)/hello-cond1.c
+       test -f $(distdir)/hello-generic.c
+END
+
+mkdir foo bar
+
+: > foo/Makefile.am
+: > bar/Makefile.am
+: > hello-common.c
+: > hello-cond1.c
+: > hello-generic.c
+
+$ACLOCAL
+$AUTOCONF
+grep "meaningless;characters" configure && Exit 1
+$AUTOMAKE
+./configure
+$MAKE test
+
+:
diff --git a/t/condhook.sh b/t/condhook.sh
new file mode 100755
index 0000000..3b0f89c
--- /dev/null
+++ b/t/condhook.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test install when a conditional install-*-hook is not defined.
+# Keep this in sync with sister test condhook2.test.
+# Report by Nik A. Melchior (PR/428).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TEST], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+sysconf_DATA = mumble
+if TEST
+install-data-hook:
+       : > $(top_srcdir)/bad
+endif
+END
+
+: > mumble
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --prefix "`pwd`/inst"
+
+$MAKE install
+test -f inst/etc/mumble
+test ! -f bad
+
+:
diff --git a/t/condhook2.sh b/t/condhook2.sh
new file mode 100755
index 0000000..a853e37
--- /dev/null
+++ b/t/condhook2.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test install when a conditional install-*-hook is defined.
+# Keep this in sync with sister test condhook.test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TEST], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+sysconf_DATA = mumble
+if TEST
+install-data-hook:
+       : > $(top_srcdir)/good
+endif
+END
+
+: > mumble
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --prefix "`pwd`/inst"
+
+$MAKE install
+test -f inst/etc/mumble
+test -f good
+
+:
diff --git a/t/condinc.sh b/t/condinc.sh
new file mode 100755
index 0000000..b7011e7
--- /dev/null
+++ b/t/condinc.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure a conditional include statement is handled properly.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TOBE], [false])
+END
+
+cat > Makefile.am << 'END'
+if TOBE
+include adjunct
+endif
+END
+
+cat > adjunct << 'END'
+target: dependency
+       rule
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^target:' Makefile.in && Exit 1
+grep 'address@hidden@target:' Makefile.in
+
+:
diff --git a/t/condinc2.sh b/t/condinc2.sh
new file mode 100755
index 0000000..e88b0d2
--- /dev/null
+++ b/t/condinc2.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another test of conditional include statements.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([TOBE], [false])
+END
+
+cat > Makefile.am << 'END'
+if TOBE
+include adjunct
+endif
+END
+
+cat > adjunct << 'END'
+target: dependency
+       rule
+endif
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'adjunct:3: error: too many conditionals closed' stderr
+
+cat > adjunct << 'END'
+if TOBE
+target: dependency
+       rule
+END
+
+AUTOMAKE_fails
+grep 'unterminated conditionals' stderr
+
+cat > adjunct << 'END'
+if TOBE
+target: dependency
+       rule
+endif
+END
+
+$AUTOMAKE
+
+:
diff --git a/t/condlib.sh b/t/condlib.sh
new file mode 100755
index 0000000..fae04bf
--- /dev/null
+++ b/t/condlib.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug with conditional library.
+# From Harlan Stenn.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AM_MAINTAINER_MODE
+AM_PROG_AR
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = @LIBRSAREF@
+EXTRA_LIBRARIES = librsaref.a
+
+nodist_librsaref_a_SOURCES = desc.c digit.c
+
+BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP librsaref.a.c Makefile.in && Exit 1
+Exit 0
diff --git a/t/condman2.sh b/t/condman2.sh
new file mode 100755
index 0000000..fbb3844
--- /dev/null
+++ b/t/condman2.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure appropriate man install targets generated in all cases.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+man_MANS = foo.1 foo.2
+man5_MANS = foo.5
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^install-man1:' Makefile.in
+grep '^install-man2:' Makefile.in
+grep '^install-man5:' Makefile.in
+
+:
diff --git a/t/condman3.sh b/t/condman3.sh
new file mode 100755
index 0000000..9f2714f
--- /dev/null
+++ b/t/condman3.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure conditionals work with man pages.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [test x"$FOO" = x"true"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if COND
+man_MANS = foo.1
+man4_MANS = 6.man
+else
+man_MANS = bar.2 baz.1
+man5_MANS = zap.5
+endif
+
+.PHONY: test1 test2
+test1:
+       find $(mandir) ;: For debugging.
+       test -f $(mandir)/man1/foo.1
+       test -f $(mandir)/man4/6.4
+       test ! -f $(mandir)/man2/bar.2
+       test ! -f $(mandir)/man1/baz.1
+       test ! -f $(mandir)/man5/zap.5
+test2:
+       find $(mandir) ;: For debugging.
+       test -f $(mandir)/man2/bar.2
+       test -f $(mandir)/man1/baz.1
+       test -f $(mandir)/man5/zap.5
+       test ! -f $(mandir)/man1/foo.1
+       test ! -f $(mandir)/man4/6.4
+       test ! -f $(mandir)/man4/6.man
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+$EGREP 'MANS|\.([123456789]|man)' Makefile.in # For debugging.
+
+mkdir build
+cd build
+../configure FOO=true --prefix="`pwd`/_inst"
+$EGREP 'MANS|\.([123456789]|man)' Makefile # For debugging.
+touch foo.1 6.man
+$MAKE install
+$MAKE test1
+
+cd ..
+./configure FOO=false --prefix="`pwd`/_inst"
+$EGREP 'MANS|\.([123456789]|man)' Makefile # For debugging.
+touch bar.2 baz.1 zap.5
+$MAKE install
+$MAKE test2
+
+:
diff --git a/t/confdeps.sh b/t/confdeps.sh
new file mode 100755
index 0000000..f508d45
--- /dev/null
+++ b/t/confdeps.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that config* files are properly regenerated.
+
+. ./defs || Exit 1
+
+echo "FOO = foo" > Makefile.am
+
+$ACLOCAL
+
+echo "$me: Generated by aclocal ..."
+$AUTOMAKE
+grep '^\$(ACLOCAL_M4):' Makefile.in
+
+echo "$me: Not generated by aclocal ..."
+# Pretend it is not from aclocal (remove the signature),
+# but keep it correct, i.e., with AM_INIT_AUTOMAKE etc.
+sed -n '3,$p' aclocal.m4 >aclocal.m4t
+mv -f aclocal.m4t aclocal.m4
+$AUTOMAKE
+grep '^\$(ACLOCAL_M4):' Makefile.in && Exit 1
+
+:
diff --git a/t/conff.sh b/t/conff.sh
new file mode 100755
index 0000000..d969660
--- /dev/null
+++ b/t/conff.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
+# Report from Alexander Turbov.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([bar/Makefile:bar/Makefile.in:Makefile.bot])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = bar
+EXTRA_DIST = Makefile.bot
+END
+
+mkdir bar
+cat > bar/Makefile.am << 'END'
+top-rule:
+       @echo 'top rule'
+END
+
+cat > Makefile.bot << 'END'
+bot-rule:
+       @echo 'bot rule'
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'top rule' stdout
+$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'bot rule' stdout
+cd ..
+
+$sleep
+
+cat > bar/Makefile.am << 'END'
+top-rule:
+       @echo 'top2 rule'
+END
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'top2 rule' stdout
+$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'bot rule' stdout
+cd ..
+
+$sleep
+
+cat > Makefile.bot << 'END'
+bot-rule:
+       @echo 'bot2 rule'
+END
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'top2 rule' stdout
+$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'bot2 rule' stdout
+cd ..
+
+$MAKE distcheck
+
+:
diff --git a/t/conff2.sh b/t/conff2.sh
new file mode 100755
index 0000000..2c42f29
--- /dev/null
+++ b/t/conff2.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed.
+
+. ./defs || Exit 1
+
+# We avoid using configure.ac stub initialized by ./defs, since we need
+# to keep track of line numbers (to grep for error messages).
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES ([oops])
+AC_CONFIG_HEADERS
+AC_OUTPUT
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'configure\.ac:3:.* arguments .*AC_CONFIG_FILES' stderr
+grep 'configure\.ac:4:.* arguments .*AC_CONFIG_HEADERS' stderr
+
+:
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
new file mode 100755
index 0000000..9c4cb4f
--- /dev/null
+++ b/t/conffile-leading-dot.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Automake must complain if AC_CONFIG_FILES is passed something starting
+# with a dot (like "./Makefile"), since the remake rules might be subtly
+# broken in that case.
+
+required=GNUmake
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([./Makefile])
+AC_CONFIG_FILES([./foo:a.in:b.in:c.in])
+AC_OUTPUT
+END
+
+touch a.in b.in c.in Makefile.am
+
+$ACLOCAL
+
+AUTOMAKE_fails -Wnone -Wunsupported
+grep "^configure\.ac:3:.*'\\./Makefile'" stderr
+grep "^configure\.ac:3:.* omit leading '\\./'" stderr
+grep "^configure\.ac:3:.*remake rules might be subtly broken" stderr
+grep "^configure\.ac:4:.*'\\./foo'" stderr
+grep "^configure\.ac:4:.* omit leading '\\./'" stderr
+grep "^configure\.ac:4:.*remake rules might be subtly broken" stderr
+
+# Check that our warning was actually justified.
+sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.ac >t
+mv -f t configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -Wall -Wno-unsupported
+./configure
+$MAKE
+$sleep
+touch Makefile.am
+# Check that remake rules do truly break -- otherwise automake is
+# giving a bogus warning.
+$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep "config\\.status:.*invalid argument.*Makefile" stderr
+
+:
diff --git a/t/confh.sh b/t/confh.sh
new file mode 100755
index 0000000..4759619
--- /dev/null
+++ b/t/confh.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config.h works in a subdir.
+# Report from Alexandre Oliva.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONFIG_HEADER([include/config.h])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+.PHONY: test1 test2
+test1:
+       @echo DIST_COMMON = $(DIST_COMMON)
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
+test2: distdir
+       ls -l $(distdir)/*
+       test -f $(distdir)/acconfig.h
+check-local: test1 test2
+END
+
+mkdir include
+: > include/config.h.in
+: > acconfig.h
+
+# The test used to fail if 'include/Makefile.am' was created (!)
+: > include/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+./configure
+
+$MAKE test1
+$MAKE test2
+$MAKE distcheck
+
+# Make sure re-running automake in a different way generates same
+# Makefile.in.
+mv Makefile.in Makefile.sav
+$ACLOCAL
+$AUTOMAKE Makefile
+diff Makefile.sav Makefile.in
+
+:
diff --git a/t/confh4.sh b/t/confh4.sh
new file mode 100755
index 0000000..ea6a9ff
--- /dev/null
+++ b/t/confh4.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 34.
+# > Description:
+#  Automake fails to add -I option to include configuration
+#  header indicated like AM_CONFIG_HEADER(magick/config.h)
+# > How-To-Repeat:
+#  Use AM_CONFIG_HEADER(subdir/config.h) to place configuration
+#  header in subdirectory and observe that it is not included.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([include/Makefile])
+AM_CONFIG_HEADER([include/config.h])
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+END
+
+mkdir include
+: > include/Makefile.am
+: > include/config.h.in
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^ *DEFAULT_INCLUDES *=.* -I\$(top_builddir)/include' Makefile.in
+
+:
diff --git a/t/confh5.sh b/t/confh5.sh
new file mode 100755
index 0000000..c35c3e8
--- /dev/null
+++ b/t/confh5.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we do not distribute header sources when they are built.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([FOO], [NameToBeGrepped])
+AC_CONFIG_FILES([include/config.h.in])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([include/config.h])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+.PHONY: test
+test: distdir
+       test -f $(distdir)/config.h.in
+       test -f $(distdir)/include/config.h.in.in
+       : # Solaris Sh does not support 'test -e'.
+       test ! -f $(distdir)/include/config.h.in
+       test ! -r $(distdir)/include/config.h.in
+END
+
+mkdir include
+: > include/config.h.in.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+./configure
+$MAKE
+
+$sleep
+echo '#undef @FOO@' > include/config.h.in.in
+$MAKE include/config.h
+# Don't try to be too strict in this grepping, since the substitution
+# is done by config.status, and we don't have too much control on it.
+grep '/\*.*#undef.*NameToBeGrepped' include/config.h
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/confh6.sh b/t/confh6.sh
new file mode 100755
index 0000000..c5e7d7e
--- /dev/null
+++ b/t/confh6.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config.h rule made even if it is in a subdir.  The
+# idea is that if config.h is in a subdir, and there is no Makefile in
+# that subdir, then we want to build config.h as the top level.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONFIG_HEADER([subdir/config.h])
+AC_OUTPUT
+END
+
+: > Makefile.am
+mkdir subdir
+: > subdir/config.h.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+$sleep
+echo '#define gRePmE' > subdir/config.h.in
+$MAKE subdir/config.h
+$FGREP gRePmE subdir/config.h
+
+$MAKE distcheck
+
+:
diff --git a/t/confh7.sh b/t/confh7.sh
new file mode 100755
index 0000000..4080779
--- /dev/null
+++ b/t/confh7.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure several config headers are allowed.
+# See also sister "semantic" test 'confh8.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONFIG_HEADER([config.h two.h])
+END
+
+: > Makefile.am
+
+: > config.h.in
+: > two.h.in
+
+$ACLOCAL
+$AUTOMAKE
+
+# Try again with more macros.
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+$ACLOCAL --force
+$AUTOMAKE
+
+:
diff --git a/t/confh8.sh b/t/confh8.sh
new file mode 100755
index 0000000..c3a27d1
--- /dev/null
+++ b/t/confh8.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure several config headers are allowed.
+# See also sister "minimalistic" test 'confh7.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONFIG_HEADER([one.h two.h])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+.PHONY: test0 test1 test2
+test0:
+       @echo DIST_COMMON = $(DIST_COMMON)
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]one\.h\.in '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]two\.h\.in '
+       : Processed header files should not be distributed.
+       if echo ' ' $(DIST_COMMON) ' ' | grep '\.h '; then \
+         exit 1; \
+       else \
+         exit 0; \
+       fi
+test1: all
+       test -f one.h
+       test -f two.h
+test2: distdir
+       ls -l $(distdir)/*
+       test -f $(distdir)/one.h.in
+       test -f $(distdir)/two.h.in
+       : Processed header files should not be distributed.
+       test ! -r $(distdir)/one.h
+       test ! -r $(distdir)/two.h
+check-local: test0 test1 test2
+END
+
+: > one.h.in
+: > two.h.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE test0
+$MAKE test1
+$MAKE test2
+$MAKE distcheck
+
+:
diff --git a/t/configure.sh b/t/configure.sh
new file mode 100755
index 0000000..cedba55
--- /dev/null
+++ b/t/configure.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Diagnose if both configure.in and configure.ac are present, prefer
+# configure.ac.
+
+. ./defs || Exit 1
+
+cat >configure.ac <<EOF
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+EOF
+
+cat >configure.in <<EOF
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([an-invalid-automake-option])
+AC_CONFIG_FILES([Makefile])
+EOF
+
+: >Makefile.am
+
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'configure\.ac.*configure\.in.*both present' stderr
+
+$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'configure\.ac.*configure\.in.*both present' stderr
+grep 'proceeding.*configure\.ac' stderr
+
+# Ensure we really proceed with configure.ac.
+AUTOMAKE_fails -Werror
+grep 'configure\.ac.*configure\.in.*both present' stderr
+grep 'proceeding.*configure\.ac' stderr
+
+AUTOMAKE_run -Wno-error
+grep 'configure\.ac.*configure\.in.*both present' stderr
+grep 'proceeding.*configure\.ac' stderr
+
+:
diff --git a/t/confincl.sh b/t/confincl.sh
new file mode 100755
index 0000000..dfc7551
--- /dev/null
+++ b/t/confincl.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This tests for a bug reported by Gord Matzigkeit.
+# If config.h is not used, @CONFIG_INCLUDE_SPEC@ should not appear
+# in Makefile.in.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = fred
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '@CONFIG_INCLUDE_SPEC@' Makefile.in && Exit 1
+
+:
diff --git a/t/conflnk.sh b/t/conflnk.sh
new file mode 100755
index 0000000..93851ca
--- /dev/null
+++ b/t/conflnk.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure links created by AC_CONFIG_LINKS get removed with
+# 'make distclean'
+
+. ./defs || Exit 1
+
+echo 'SUBDIRS = sdir' > Makefile.am
+: > src
+mkdir sdir
+: > sdir/Makefile.am
+: > sdir/src2
+mkdir sdir-no-make
+
+cat >>configure.ac << 'EOF'
+AC_CONFIG_FILES([sdir/Makefile])
+AC_CONFIG_LINKS([dest:src])
+AC_CONFIG_LINKS([dest2:src])
+AC_CONFIG_LINKS([sdir/dest3:src])
+AC_CONFIG_LINKS([dest4:sdir/src2])
+AC_CONFIG_LINKS([sdir/dest5:sdir/src2 sdir-no-make/dest6:src])
+AC_OUTPUT
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+
+# Make sure nothing is deleted by 'make clean'
+$MAKE clean
+
+test -r dest
+test -r dest2
+test -r sdir/dest3
+test -r dest4
+test -r sdir/dest5
+test -r sdir-no-make/dest6
+test -f src
+test -f sdir/src2
+
+# Make sure the links are deleted by 'make distclean' and the original files
+# are not.
+$MAKE distclean
+
+test -f src
+test -f sdir/src2
+
+test -r dest && Exit 1
+test -r dest2 && Exit 1
+test -r sdir/dest3 && Exit 1
+test -r dest4 && Exit 1
+test -r sdir/dest5 && Exit 1
+test -r sdir-no-make/dest6 && Exit 1
+
+:
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
new file mode 100755
index 0000000..4a1478b
--- /dev/null
+++ b/t/conflnk2.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that sources for links created by AC_CONFIG_LINKS
+# are distributed.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = sdir
+.PHONY: test
+test: distdir
+       test -f $(distdir)/src
+       test -f $(distdir)/src2
+       test -f $(distdir)/sdir/src3
+       test -f $(distdir)/sdir-no-make/src4
+       test 2 -gt `find $(distdir)/sdir -type d | wc -l`
+       test 2 -gt `find $(distdir)/sdir-no-make -type d | wc -l`
+       test 4 -gt `find $(distdir) -type d | wc -l`
+END
+
+: > src
+: > src2
+mkdir sdir
+: > sdir/Makefile.am
+: > sdir/src3
+mkdir sdir-no-make
+: > sdir-no-make/src4
+
+cat >>configure.ac << 'EOF'
+AC_CONFIG_FILES([sdir/Makefile])
+AC_CONFIG_LINKS([dest:src])
+AC_CONFIG_LINKS([sdir/dest2:src2 sdir-no-make/dest3:sdir/src3])
+AC_CONFIG_LINKS([sdir/dest4:sdir-no-make/src4])
+AC_OUTPUT
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+$MAKE test
+
+:
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
new file mode 100755
index 0000000..ffb0d98
--- /dev/null
+++ b/t/conflnk3.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that AC_CONFIG_LINKS using a variable source
+# is not broken.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = sdir
+.PHONY: test
+test: distdir
+       test ! -r $(distdir)/sdir/dest3
+       test ! -r $(distdir)/sdir/dest2
+       test ! -r $(distdir)/dest3
+       test ! -r $(distdir)/dest2
+       test -f $(distdir)/src2
+## src3 cannot be distributed, Automake knows nothing about it.
+       test ! -r $(distdir)/sdir/src3
+       test ! -r $(distdir)/src3
+END
+
+: > src
+: > src2
+mkdir sdir
+: > sdir/Makefile.am
+: > sdir/src3
+
+cat >>configure.ac << 'EOF'
+AC_CONFIG_FILES([sdir/Makefile])
+my_src_dir=sdir
+my_dest=dest
+AC_CONFIG_LINKS([sdir/dest2:src2 sdir/dest3:$my_src_dir/src3])
+AC_CONFIG_LINKS([$my_dest:src])
+# The following is a link whose source is itself a link.
+AC_CONFIG_LINKS([dest4:sdir/dest2])
+# Some package prefer to compute links.
+cmplink='dest5:src';
+AC_CONFIG_LINKS([$cmplink])
+AC_OUTPUT
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# $my_src_dir and $my_dest are variables local to configure, they should
+# not appear in Makefile.
+grep my_src_dir Makefile.in && Exit 1
+grep my_dest Makefile.in && Exit 1
+
+./configure
+test -r sdir/dest2
+test -r sdir/dest3
+test -r dest
+test -r dest4
+test -r dest5
+$MAKE test
+
+$MAKE distclean
+test ! -r sdir/dest2
+test ! -r sdir/dest3
+test -r dest  # Should still exist, Automake knows nothing about it.
+test -r dest5 # Ditto.
+rm -f dest dest5
+test ! -r dest4
+
+mkdir build
+cd build
+../configure
+$MAKE test
+
+:
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
new file mode 100755
index 0000000..a1f2f0e
--- /dev/null
+++ b/t/conflnk4.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
+# removed with 'make distclean' only if doing a VPATH build.
+
+. ./defs || Exit 1
+
+mkdir nonmk-subdir sdir sdir/mk-subdir
+: > src
+: > sdir/Makefile.am
+: > sdir/src2
+: > nonmk-subdir/src3
+: > sdir/mk-subdir/src4
+
+cat >> Makefile.am <<'EOF'
+SUBDIRS = sdir
+.PHONY: test
+test: distdir
+       test -f $(distdir)/src
+       test -f $(distdir)/sdir/src2
+       test -f $(distdir)/nonmk-subdir/src3
+       test -f $(distdir)/sdir/mk-subdir/src4
+EOF
+
+cat >>configure.ac << 'EOF'
+AC_CONFIG_FILES([sdir/Makefile])
+AC_CONFIG_LINKS([src:src])
+AC_CONFIG_LINKS([sdir/src2:sdir/src2])
+AC_CONFIG_LINKS([nonmk-subdir/src3:nonmk-subdir/src3])
+AC_CONFIG_LINKS([sdir/mk-subdir/src4:sdir/mk-subdir/src4])
+AC_OUTPUT
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+
+$MAKE test
+
+# Make sure nothing is deleted by 'make clean'
+$MAKE clean
+
+test -f ../src
+test -f ../sdir/src2
+test -f ../nonmk-subdir/src3
+test -f ../sdir/mk-subdir/src4
+
+# Make sure the links are deleted by 'make distclean' and the original files
+# are not.
+$MAKE distclean
+
+test -f ../src
+test -f ../sdir/src2
+test -f ../nonmk-subdir/src3
+test -f ../sdir/mk-subdir/src4
+
+test -r src && Exit 1
+test -r sdir/src2 && Exit 1
+test -r nonmk-subdir/src3 && Exit 1
+test -r sdir/mk-subdir/src4 && Exit 1
+
+cd ..
+./configure
+
+$MAKE test
+
+# Make sure nothing is deleted by 'make distclean'
+$MAKE distclean
+
+test -f src
+test -f sdir/src2
+test -f nonmk-subdir/src3
+test -f sdir/mk-subdir/src4
+
+:
diff --git a/t/confsub.sh b/t/confsub.sh
new file mode 100755
index 0000000..1887046
--- /dev/null
+++ b/t/confsub.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config.h can be in subdir.
+# Also, make sure config.h is properly rebuilt.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
+AC_OUTPUT(Makefile subdir/Makefile)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+END
+
+mkdir subdir
+cat > subdir/Makefile.am << 'END'
+END
+
+echo 'Before.' > subdir/config.hin
+
+$ACLOCAL
+$AUTOMAKE
+
+# Make sure subdir Makefile.in doesn't itself look in the subdir.
+# One line is allowed though:
+#
+# cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h
+($FGREP 'subdir/config.h' subdir/Makefile.in |
+   $FGREP -v 'cd $(top_builddir)') && Exit 1
+
+$AUTOCONF
+./configure
+$FGREP 'Before.' subdir/config.h
+
+$sleep
+echo 'After.' > subdir/config.hin
+$MAKE
+$FGREP 'After.' subdir/config.h
+
+:
diff --git a/t/confvar.sh b/t/confvar.sh
new file mode 100755
index 0000000..e77563e
--- /dev/null
+++ b/t/confvar.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure configure_vars stuff works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([QBERT])
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^QBERT =' Makefile.in
+
+:
diff --git a/t/confvar2.sh b/t/confvar2.sh
new file mode 100755
index 0000000..bc6ffca
--- /dev/null
+++ b/t/confvar2.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported by Jim Meyering.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([OTHER_SCRIPTS])
+END
+
+cat > Makefile.am << 'END'
+bin_SCRIPTS = foo
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^OTHER_SCRIPTS =' Makefile.in
+
+:
diff --git a/t/copy.sh b/t/copy.sh
new file mode 100755
index 0000000..a9f0f56
--- /dev/null
+++ b/t/copy.sh
@@ -0,0 +1,101 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure '-c' works.  Report from Andris Pavenis.
+# See also the much more in-depth test 'add-missing'.
+
+. ./defs || Exit 1
+
+# We'll have to cater to systems like MSYS/MinGW where there are no
+# true symlinks ('ln -s' behaves like 'cp -p'); see automake bug#10441.
+
+echo dummy > foo
+if ln -s foo bar && test -h bar; then
+  is_symlink () { test -h "$1"; }
+  is_not_symlink () { test ! -h "$1"; }
+else
+  is_symlink () { return 0; } # Avoid spurious failures.
+  is_not_symlink () { return 0; }
+fi
+rm -f foo bar
+
+# First a simple test, where the auxdir is automatically determined
+# by automake.
+
+: > Makefile.am
+rm -f install-sh
+
+$ACLOCAL
+$AUTOMAKE -c -a
+ls -l # For debugging.
+
+test -f install-sh
+is_not_symlink install-sh
+
+# Let's do a couple of more elaborated tests, this time with the auxdir
+# explicitly defined in configure.ac.
+
+mkdir sub
+cd sub
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([auxdir])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<END
+bin_PROGRAMS = foo
+END
+
+$ACLOCAL
+
+# 'automake -a' called without '-c' should create symlinks by default,
+# even when there is already a non-symlinked required auxiliary file.
+
+mkdir auxdir
+echo FAKE-DEPCOMP > auxdir/depcomp
+$AUTOMAKE -a
+ls -l auxdir # For debugging.
+test -f auxdir/install-sh
+is_symlink auxdir/install-sh
+test -f auxdir/depcomp
+is_not_symlink auxdir/depcomp
+test FAKE-DEPCOMP = `cat auxdir/depcomp`
+
+# 'automake -a -c' should not create symlinks, even when there are
+# already symlinked required auxiliary files.
+
+rm -rf auxdir
+mkdir auxdir
+cd auxdir
+ln -s "$am_scriptdir/missing" "$am_scriptdir/install-sh" .
+cd ..
+
+$AUTOMAKE -a -c
+ls -l auxdir # For debugging.
+test -f auxdir/install-sh
+is_symlink auxdir/install-sh
+test -f auxdir/missing
+is_symlink auxdir/missing
+test -f auxdir/depcomp
+is_not_symlink auxdir/depcomp
+diff "$am_scriptdir"/depcomp auxdir/depcomp
+
+:
diff --git a/t/cscope.tap b/t/cscope.tap
new file mode 100755
index 0000000..c39feed
--- /dev/null
+++ b/t/cscope.tap
@@ -0,0 +1,168 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test cscope functionality.
+
+. ./defs || Exit 1
+
+plan_ 18
+
+ocwd=`pwd` || fatal_ "getting top-level directory"
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_SUBST([CC],  [who-cares])
+AC_SUBST([CXX], [who-cares])
+AC_SUBST([FC],  [who-cares])
+AC_SUBST([GCJ], [who-cares])
+AM_PATH_LISPDIR
+AC_OUTPUT
+END
+
+mkdir sub sub/subsub
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c bar.cpp baz.f90
+lisp_LISP = foo.el
+EXTRA_DIST = foo.el
+END
+
+cat > sub/Makefile.am <<'END'
+bin_PROGRAMS = bar
+bar_SOURCES = subsub/dist.c
+nodist_bar_SOURCES = subsub/gen.c
+subsub/gen.c:
+       $(MKDIR_P) subsub
+       echo 'int generated_subsub () { return 0; }' > $@
+CLEANFILES = subsub/gen.c
+END
+
+echo 'int foo_func () { return 0; }' > foo.c
+echo 'int main () { return 0; }' > bar.cpp
+cat > baz.f90 <<'END'
+      subroutine baz
+      end
+END
+: > foo.el
+echo 'int main () { return 0; }' > sub/subsub/dist.c
+
+$ACLOCAL || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE -i -a || fatal_ "automake -i -a failed"
+
+# Sun cscope is interactive without redirection.
+if cscope --version </dev/null; then
+  have_cscope=yes
+else
+  have_cscope=no
+fi
+
+test_cleanup ()
+{
+  r=ok
+  if test -f configure; then
+    # In-tree build.
+    $MAKE distclean
+  else
+    # VPATH build.
+    $MAKE distcleancheck
+  fi \
+    && test ! -f cscope.files \
+    && test ! -f cscope.out \
+    && test ! -f cscope.in.out \
+    && test ! -f cscope.po.out \
+    || r='not ok'
+  result_ "$r" "[$pfx] make distcheck"
+}
+
+test_cscope ()
+{
+  r=ok
+  $MAKE -n cscope || r='not ok'
+  result_ "$r" "[$pfx] make -n cscope"
+
+  if test $have_cscope = no; then
+    # For later tests.
+    touch cscope.files cscope.out cscope.in.out cscope.po.out
+    skip_row_ 3 -r "no cscope program avaiable"
+    return 0
+  fi
+
+  r=ok
+  $MAKE cscope 2>stderr || r='not ok'
+  cat stderr >&2
+  grep 'cannot find file' stderr && r='not ok'
+  rm -f stderr
+  result_ "$r" "[$pfx] make cscope"
+
+  r=ok
+  test -f cscope.files \
+    && $FGREP foo.c cscope.files \
+    && $FGREP bar.cpp cscope.files \
+    && $FGREP sub/subsub/dist.c cscope.files \
+    && $FGREP sub/subsub/gen.c cscope.files \
+    || r='not ok'
+  result_ "$r" "[$pfx] cscope.files looks correct"
+
+  r=ok
+  # cscope.files might not exist of the earlier "make cscope" failed.
+  cp cscope.files cscope.files1 \
+    && $MAKE cscope \
+    && diff cscope.files cscope.files1 \
+    || r='not ok'
+  rm -f cscope.files1
+  result_ "$r" "[$pfx] second \"make cscope\" is consistent"
+}
+
+my_configure ()
+{
+  command_ok_ "[$pfx] configure" \
+              "$1"/configure EMACS=no --with-lispdir=/who/cares
+}
+
+if using_gmake; then
+
+  cd "$ocwd"
+  pfx="relative VPATH"
+  mkdir build
+  cd build
+  my_configure ..
+  test_cscope
+  test_cleanup
+
+  cd "$ocwd"
+  pfx="absolute VPATH"
+  mkdir build2
+  cd build2
+  my_configure "$ocwd"
+  test_cscope
+  test_cleanup
+
+else
+
+  skip_row_ 12 -r "cscope in VPATH required GNU make"
+
+fi
+
+cd "$ocwd"
+pfx="in-tree build"
+my_configure .
+test_cscope
+test_cleanup
+
+:
diff --git a/t/cscope2.sh b/t/cscope2.sh
new file mode 100755
index 0000000..f72bb6a
--- /dev/null
+++ b/t/cscope2.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The 'cscope' target should not fail if there are no sources.
+
+required=
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+: >Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE cscope
+
+:
diff --git a/t/cscope3.sh b/t/cscope3.sh
new file mode 100755
index 0000000..47bcd4d
--- /dev/null
+++ b/t/cscope3.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The 'cscope' target should not fail if there are no sources in a subdir.
+# In practice this means 'cscope' should not be invoked if cscope.files
+# is empty.
+
+required=cscope
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+mkdir sub
+echo 'SUBDIRS = sub' >Makefile.am
+: >sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE cscope
+
+:
diff --git a/t/cxx.sh b/t/cxx.sh
new file mode 100755
index 0000000..63e55b8
--- /dev/null
+++ b/t/cxx.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that '.c++' extension works.
+# From Ralf Corsepius.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.c++
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^\.SUFFIXES:.*c[+][+]' Makefile.in
diff --git a/t/cxx2.sh b/t/cxx2.sh
new file mode 100755
index 0000000..243e607
--- /dev/null
+++ b/t/cxx2.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that Automake suggests using AC_PROG_CXX if C++ sources are used.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >>configure.ac
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.cpp
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AC_PROG_CXX stderr
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
new file mode 100755
index 0000000..cc69163
--- /dev/null
+++ b/t/cxxcpp.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure automake sees AC_PROG_CXXCPP.  From Garth Corral.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXXCPP
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^CXXCPP' Makefile.in
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
new file mode 100755
index 0000000..6f4ce2e
--- /dev/null
+++ b/t/cxxlibobj.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure LIBOBJS and C++ sources work right.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_CC
+AC_REPLACE_FUNCS(strdup)
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.C jane.C
+anonymous_LDADD = @LIBOBJS@
+END
+
+: > strdup.c
+: > doe.C
+: > jane.C
+
+$ACLOCAL
+$AUTOMAKE
+
+grep CC Makefile.in
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
new file mode 100755
index 0000000..5ce3beb
--- /dev/null
+++ b/t/cxxlink.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure C++ linker is used when appropriate.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.c lamp.cxx
+END
+
+: > lava.c
+: > lamp.cxx
+
+$ACLOCAL
+$AUTOMAKE
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.CXXLINK' Makefile.in
diff --git a/t/cxxnoc.sh b/t/cxxnoc.sh
new file mode 100755
index 0000000..66d0b0d
--- /dev/null
+++ b/t/cxxnoc.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure pure C++ sources don't include C-specific code.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.C jane.C
+END
+
+: > doe.C
+: > jane.C
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '(CC)' Makefile.in && Exit 1
+Exit 0
diff --git a/t/cxxo.sh b/t/cxxo.sh
new file mode 100755
index 0000000..a754701
--- /dev/null
+++ b/t/cxxo.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure C++ files are rewritten to ".o" and not just "o".
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.C
+END
+
+: > doe.C
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/t/cygnus-check-without-all.sh b/t/cygnus-check-without-all.sh
new file mode 100755
index 0000000..f428e95
--- /dev/null
+++ b/t/cygnus-check-without-all.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that, in cygnus mode, target "check" does not depend target
+# "all".
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AM_MAINTAINER_MODE
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+all-local:
+       : > all-target-has-failed
+       exit 1
+check-local:
+       touch check-target-has-run
+END
+
+$ACLOCAL
+$AUTOMAKE --cygnus
+
+$EGREP '(^| )all.*(:|:.* )check' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+
+$MAKE check
+test -f check-target-has-run
+test ! -r all-target-has-failed
+# Sanity checks.
+$MAKE && Exit 1
+test -f all-target-has-failed
+
+:
diff --git a/t/cygnus-dependency-tracking.sh b/t/cygnus-dependency-tracking.sh
new file mode 100755
index 0000000..f07c6fc
--- /dev/null
+++ b/t/cygnus-dependency-tracking.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that cygnus mode disables automatic dependency tracking.
+# And check that this *cannot* be overridden.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+.PHONY: test-nodeps
+test-nodeps:
+       test ! -d .deps
+       test ! -d _deps
+       test ! -d '$(DEPDIR)'
+END
+
+cat > foo.c <<'END'
+#include "bar.h"
+int main ()
+{
+  GIVE_BACK 0;
+}
+END
+
+cat > bar.sav <<'END'
+#define GIVE_BACK return
+END
+
+cp bar.sav bar.h
+
+$ACLOCAL
+$AUTOMAKE --include-deps --cygnus --include-deps
+$AUTOCONF
+
+# Unknown options should cause just warnings from configure.
+./configure --enable-dependency-tracking
+$MAKE
+$MAKE test-nodeps
+
+: > bar.h
+$MAKE
+$MAKE test-nodeps
+
+# Sanity check.
+$MAKE clean
+$MAKE >out 2>&1 && { cat out; Exit 1; }
+cat out
+# Not all compilers mention the undefined symbol in the error message.
+grep GIVE_BACK out || grep main out
+
+:
diff --git a/t/cygnus-imply-foreign.sh b/t/cygnus-imply-foreign.sh
new file mode 100755
index 0000000..3dcf671
--- /dev/null
+++ b/t/cygnus-imply-foreign.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'cygnus' mode imply 'foreign' mode.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+# This is *required* in cygnus mode
+AM_MAINTAINER_MODE
+END
+
+$ACLOCAL
+
+: > Makefile.am
+
+# We want complete control automake flags, while honouring the
+# user overrides for $AUTOMAKE.
+AUTOMAKE=$am_original_AUTOMAKE
+
+# Sanity check: gnu mode must complain about missing files and
+# portability problems.
+AUTOMAKE_fails
+grep 'required file.*README' stderr
+
+# But cygnus mode should imply foreign mode, so no complaints.
+# And cygnus mode should by able to override gnu and gnits modes.
+$AUTOMAKE --cygnus -Werror
+$AUTOMAKE --gnu --cygnus -Werror
+$AUTOMAKE --gnits --cygnus -Werror
+
+# Try again, this time enabling cygnus mode from Makefile.am.
+cp Makefile.am Makefile.sav
+echo 'AUTOMAKE_OPTIONS = gnu cygnus' >> Makefile.am
+$AUTOMAKE -Werror
+mv -f Makefile.sav Makefile.am
+
+# Try again, this time enabling cygnus mode from configure.ac.
+cp configure.ac configure.sav
+sed 's/^AM_INIT_AUTOMAKE$/&([gnits cygnus])/' configure.sav >configure.ac
+cmp configure.ac configure.sav && fatal_ 'failed to edit configure.ac'
+
+$ACLOCAL --force
+$AUTOMAKE -Werror
+mv -f configure.sav configure.ac
+
+:
diff --git a/t/cygnus-no-dist.sh b/t/cygnus-no-dist.sh
new file mode 100755
index 0000000..519f0c2
--- /dev/null
+++ b/t/cygnus-no-dist.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that cygnus mode forbids creation of distribution tarball.
+
+. ./defs || Exit 1
+
+echo AM_MAINTAINER_MODE >> configure.ac
+mv -f configure.ac configure.stub
+
+cat configure.stub - > configure.ac <<'END'
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --cygnus
+
+./configure
+$MAKE
+
+for target in dist distdir distcheck dist-all dist-gzip; do
+  $MAKE -n $target >out 2>&1 && { cat out; Exit 1; }
+  cat out
+  grep $target out
+done
+
+# Now check that cygnus mode in a subdirectory disables
+# distribution-building in that subdirectory.
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub1 sub2
+END
+
+mkdir sub1 sub2
+: > sub1/Makefile.am
+cat > sub2/Makefile.am <<'END'
+# The '-Wall' after 'cygnus' should ensure no warning gets
+# unintentionally disabled.  We are particularly interested
+# in override warnings, for when (below) we add the 'distdir'
+# target.
+AUTOMAKE_OPTIONS = cygnus -Wall
+END
+
+cat configure.stub - > configure.ac <<'END'
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+cd sub2
+$MAKE -n distdir >out 2>&1 && { cat out; Exit 1; }
+grep distdir out
+cd ..
+
+cat >> sub2/Makefile.am <<'END'
+distdir:
+END
+$AUTOMAKE sub2/Makefile
+./config.status sub2/Makefile
+
+$MAKE distdir
+$MAKE dist
+
+:
diff --git a/t/cygnus-no-installinfo.sh b/t/cygnus-no-installinfo.sh
new file mode 100755
index 0000000..6f3f322
--- /dev/null
+++ b/t/cygnus-no-installinfo.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that cygnus mode enables the 'no-installinfo' option.
+
+required=makeinfo
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AM_MAINTAINER_MODE
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+info_TEXINFOS = foo.texi
+END
+
+cat > foo.texi <<'END'
address@hidden foo.info
+END
+
+$ACLOCAL
+# FIXME: -Wno-override works around a buglet in definition of $(MAKEINFO)
+# in cygnus mode; see also xfailing test 'txinfo5.test'.
+$AUTOMAKE --cygnus -Wno-override
+$AUTOCONF
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd"/_inst
+$MAKE
+$MAKE install
+test ! -d _inst
+test ! -r foo.info
+test ! -d _inst/share/info
+$MAKE install-info
+ls -l _inst
+test -f foo.info
+test -f _inst/share/info/foo.info
+
+:
diff --git a/t/cygnus-requires-maintainer-mode.sh 
b/t/cygnus-requires-maintainer-mode.sh
new file mode 100755
index 0000000..b01dfbc
--- /dev/null
+++ b/t/cygnus-requires-maintainer-mode.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that, in cygnus mode, maintainer mode is required.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails --cygnus
+grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+cat > sub/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = cygnus
+END
+
+rm -rf autom4te.cache
+$ACLOCAL
+AUTOMAKE_fails
+grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
+
+cat >> configure.ac <<'END'
+AM_MAINTAINER_MODE
+END
+
+rm -rf autom4te.cache
+$ACLOCAL
+$AUTOMAKE --cygnus
+
+:
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
new file mode 100755
index 0000000..9415fb6
--- /dev/null
+++ b/t/cygwin32.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test basic Cygwin32 functionality.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = www
+www_SOURCES = www.c
+EXTRA_www_SOURCES = xtra.c
+www_LDADD = @extra_stuff@
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^CYGWIN' Makefile.in && Exit 1
+grep 'EXEEXT' Makefile.in
+
+:
diff --git a/t/dash.sh b/t/dash.sh
new file mode 100755
index 0000000..992bf62
--- /dev/null
+++ b/t/dash.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure '-' can be used in path.
+# Report from Matthew D. Langston.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+include Make-lang
+END
+
+: > Make-lang
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/defun.sh b/t/defun.sh
new file mode 100755
index 0000000..9b66a56
--- /dev/null
+++ b/t/defun.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal picks up on all macro definitions.
+
+. ./defs || Exit 1
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([AM_FUNC_THREE])
+AC_DEFUN([AM_FUNC_TWO], address@hidden@AM_FUNC_THREE])
+AC_DEFUN([AM_FUNC_ONE], [AC_REQUIRE([AM_FUNC_TWO])])
+END
+
+cat >>configure.ac << 'END'
+AM_FUNC_ONE
+END
+
+$ACLOCAL
+$AUTOCONF
+grep 'address@hidden@$' configure
+
+:
diff --git a/t/defun2.sh b/t/defun2.sh
new file mode 100755
index 0000000..0b3f96b
--- /dev/null
+++ b/t/defun2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we don't mistake a macro definition for an invocation.
+# From Jim Meyering.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+dnl if buggy this will require getloadavg.c
+AC_PROG_CC
+AC_DEFUN([AC_FUNC_GETLOADAVG])
+dnl need this to avoid LIBOBJS used but not defined.
+AC_FUNC_MEMCMP
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_LDADD = @LIBOBJS@
+END
+
+: > memcmp.c
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
new file mode 100755
index 0000000..8cdc3a1
--- /dev/null
+++ b/t/dejagnu-absolute-builddir.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that DejaGnu testsuites have 'objdir' defined (as a TCL variable)
+# to an absolute path.
+
+required=runtest
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = tcl env
+EXTRA_DIST = tcl.test/tcl.exp
+END
+
+mkdir tcl.test
+
+cat > tcl.test/tcl.exp << 'END'
+send_user "tcl_objdir: $objdir\n"
+if { [ regexp "^/" $objdir ] } {
+    pass "test_tcl_objdir"
+} else {
+    fail "test_tcl_objdir"
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+
+# Sanity check: all tests have run.
+test -f env.log
+test -f env.sum
+test -f tcl.log
+test -f tcl.sum
+
+$MAKE distcheck
+
+:
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
new file mode 100755
index 0000000..05ae200
--- /dev/null
+++ b/t/dejagnu-relative-srcdir.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that DejaGnu testsuites have 'srcdir' defined to a relative path
+# (both as TCL variable and as environment variable).
+
+required=runtest
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = tcl env
+EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp lib/tcl.exp
+END
+
+mkdir env.test tcl.test lib
+
+# DejaGnu can change $srcdir behind our backs, so we have to
+# save its original value.  Thanks to Ian Lance Taylor for the
+# suggestion.
+cat > lib/tcl.exp << 'END'
+send_user "tcl_lib_srcdir: $srcdir\n"
+set orig_srcdir $srcdir
+END
+
+cat > env.test/env.exp << 'END'
+set env_srcdir $env(srcdir)
+send_user "env_srcdir: $env_srcdir\n"
+if { [ regexp "^\.\.?$" $env_srcdir ] } {
+    pass "test_env_src"
+} else {
+    fail "test_env_src"
+}
+END
+
+cat > tcl.test/tcl.exp << 'END'
+send_user "tcl_srcdir: $srcdir\n"
+if { [ regexp "^\.\.?$" $srcdir ] } {
+    pass "test_tcl_src"
+} else {
+    fail "test_tcl_src"
+}
+send_user "tcl_orig_srcdir: $orig_srcdir\n"
+if { [ regexp "^\.\.?$" $orig_srcdir ] } {
+    pass "test_tcl_orig_src"
+} else {
+    fail "test_tcl_orig_src"
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --srcdir=.
+
+$MAKE check
+
+# Sanity check: all tests have run.
+test -f env.log
+test -f env.sum
+test -f tcl.log
+test -f tcl.sum
+
+$MAKE distcheck
+
+:
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
new file mode 100755
index 0000000..c3bfff6
--- /dev/null
+++ b/t/dejagnu-siteexp-append.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the files in $(EXTRA_DEJAGNU_SITE_CONFIG) get appended to
+# site.exp in the same order in which they're listed in that variable.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = tool
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE site.exp
+sed '/^##.*##$/d' site.exp > expected
+
+cat > foo.exp << 'END'
+foo1
+foo2
+foo3
+END
+
+cat foo.exp - >> expected << 'END'
+BAR 1
+# foo
+BAR 2
+END
+
+cat >> Makefile.am << 'END'
+EXTRA_DEJAGNU_SITE_CONFIG = foo.exp bar.exp
+bar.exp:
+       @(echo 'BAR 1' && echo '# foo' && echo 'BAR 2') > $@
+END
+
+$AUTOMAKE Makefile
+./config.status Makefile
+
+rm -f site.exp
+$MAKE site.exp
+sed '/^##.*##$/d' site.exp > obtained
+
+cat expected
+cat site.exp
+
+diff expected obtained
+
+:
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
new file mode 100755
index 0000000..f0f6194
--- /dev/null
+++ b/t/dejagnu-siteexp-extend.sh
@@ -0,0 +1,159 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the developer can extend the site.exp generated by the
+# automake-generated Makefile.
+
+required=runtest
+. ./defs || Exit 1
+
+write_check_for ()
+{
+  echo "send_user \"$1: \$$1\\n\""
+  unindent << END
+    if { \$$1 == "/$1/" } {
+        pass "test_$1"
+    } else {
+        fail "test_$1"
+    }
+END
+}
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = tool
+
+EXTRA_DIST = tool.test/tool.exp
+
+EXTRA_DEJAGNU_SITE_CONFIG = foo.exp
+EXTRA_DIST += foo.exp
+END
+
+echo 'set foo "/foo/"' > foo.exp
+
+mkdir tool.test
+write_check_for foo > tool.test/tool.exp
+cat tool.test/tool.exp
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+cat foo.exp
+cat site.exp
+grep 'PASS: test_foo' tool.sum
+
+write_check_for bar >> tool.test/tool.exp
+write_check_for baz >> tool.test/tool.exp
+cat tool.test/tool.exp
+
+# Ensure that foo.exp will be newer than site.exp, which will
+# thus have to be remade.
+$sleep
+# With this, below we'll also check that settings in files coming later in
+# $(EXTRA_DEJAGNU_SITE_CONFIG) override those in files coming earlier.
+cat >> foo.exp <<'END'
+set bar "/foo/"
+set baz "/foo/"
+set qux "/foo/"
+END
+
+$MAKE check && { cat site.exp; Exit 1; }
+grep 'PASS: test_foo' tool.sum
+grep 'FAIL: test_bar' tool.sum
+grep 'FAIL: test_baz' tool.sum
+
+cat >> Makefile.am << 'END'
+EXTRA_DEJAGNU_SITE_CONFIG += bar bar.dir/bar
+EXTRA_DIST += bar
+DISTCLEANFILES = bar.dir/bar
+bar.dir/bar:
+       test -d bar.dir || mkdir bar.dir
+       echo 'set baz "/baz/"' > $@
+END
+
+echo 'set bar "/bar/"' > bar
+# This will allow us to check one more time that settings in files
+# coming later in $(EXTRA_DEJAGNU_SITE_CONFIG) override those in
+# files coming earlier.
+echo 'set baz "/xyz/"' >> bar
+
+# Ensure that the Makefile will be newer than site.exp, which will
+# thus have to be remade.
+$sleep
+$AUTOMAKE Makefile
+./config.status Makefile
+
+$MAKE check || { cat site.exp; Exit 1; }
+cat site.exp
+cat bar.dir/bar
+$FGREP '/bar/' site.exp
+$FGREP '/baz/' site.exp
+grep 'PASS: test_foo' tool.sum
+grep 'PASS: test_bar' tool.sum
+grep 'PASS: test_baz' tool.sum
+
+# Check that the features we're testing behave well in VPATH builds.
+$MAKE distcheck
+
+# Check that the user can edit the site.exp file, and that his edits
+# are retained.
+write_check_for zardoz >> tool.test/tool.exp
+cat tool.test/tool.exp
+echo 'set zardoz "/zardoz/"' >> site.exp
+
+$MAKE check
+cat site.exp
+grep 'PASS: test_zardoz' tool.sum
+
+cat >> Makefile.am << 'END'
+EXTRA_DEJAGNU_SITE_CONFIG += quux.exp
+quux.exp:
+       echo 'set zardoz "/quux/"' > $@
+END
+
+# Ensure that the Makefile will be newer than on site.exp, which will
+# thus have to be remade.
+$sleep
+$AUTOMAKE Makefile
+./config.status Makefile
+grep 'zardoz.*/quux/' Makefile
+
+$MAKE site.exp
+cat site.exp
+cat quux.exp
+grep 'zardoz.*/quux/' site.exp
+
+$MAKE check
+grep 'PASS: test_zardoz' tool.sum
+grep 'zardoz: /zardoz/' tool.log
+grep 'zardoz.*quux' tool.log && Exit 1
+
+# Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
+# by default.
+$MAKE distdir
+ls -l $distdir
+test ! -r $distdir/bar.dir/bar
+test ! -r $distdir/quux.exp
+
+:
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
new file mode 100755
index 0000000..9be5eba
--- /dev/null
+++ b/t/dejagnu-siteexp-useredit.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the user can edit the Makefile-generated site.exp, and
+# have its edits survive to the remaking of that file.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = foo
+END
+
+# Deliberately select a variable defined automatically by
+# the Makefile-generated site.exp.
+mkdir foo.test
+cat > foo.test/foo.exp << 'END'
+send_user "objdir: $objdir\n"
+set pipe "|"
+if { $objdir == "${pipe}objdir${pipe}" } {
+    pass "test_obj"
+} else {
+    fail "test_obj"
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE site.exp
+echo 'set objdir "|objdir|"' >> site.exp
+cat site.exp
+$sleep
+touch Makefile
+$MAKE site.exp
+cat site.exp
+is_newest site.exp Makefile  # Sanity check.
+grep '|objdir|' site.exp
+test `grep -c '|objdir|' site.exp` -eq 1
+
+# We can do a "more semantic" check if DejaGnu is available.
+if runtest SOMEPROGRAM=someprogram --version; then
+  $MAKE check
+  grep 'PASS: test_obj' foo.sum
+fi
+
+:
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
new file mode 100755
index 0000000..14b118c
--- /dev/null
+++ b/t/dejagnu.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Superficial test to check that dejagnu tests and automake-style
+# tests can coexist.  See also related deeper test 'check12.test'.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+TESTS = frob.test
+END
+
+test x"$am_parallel_tests" != x"yes" || : > test-driver
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^check-TESTS' Makefile.in
+grep '^check-DEJAGNU' Makefile.in
+
+:
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
new file mode 100755
index 0000000..0a0d091
--- /dev/null
+++ b/t/dejagnu2.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we don't override the user's site.exp rule.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+
+site.exp:
+       echo :GREP:ME: > $@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -Wno-override
+
+grep 'site\.exp' Makefile.in
+test `grep -c '^site\.exp:' Makefile.in` -eq 1
+
+./configure
+$MAKE site.exp
+grep ':GREP:ME:' site.exp
+
+AUTOMAKE_fails
+grep '^Makefile\.am:3:.*site\.exp' stderr
+
+:
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
new file mode 100755
index 0000000..7d15bc9
--- /dev/null
+++ b/t/dejagnu3.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the DejaGnu rules work for a simple program and test case.
+
+required=runtest
+. ./defs || Exit 1
+
+cat > hammer << 'END'
+#! /bin/sh
+echo "Everything looks like a nail to me!"
+END
+
+chmod +x hammer
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = hammer
+AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer
+EXTRA_DIST = hammer hammer.test/hammer.exp
+END
+
+mkdir hammer.test
+
+cat > hammer.test/hammer.exp << 'END'
+set test test
+spawn $HAMMER
+expect {
+    "Everything looks like a nail to me!" { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+test -f hammer.log
+test -f hammer.sum
+
+$MAKE distcheck
+
+# Ensure that the envvar RUNTESTFLAGS is used.
+# Report from Mark Mitchell.
+RUNTESTFLAGS=--unknown-runtest-option $MAKE check >output 2>&1 \
+  && { cat output; Exit 1; }
+cat output
+$FGREP 'unknown-runtest-option' output
+
+:
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
new file mode 100755
index 0000000..44904df
--- /dev/null
+++ b/t/dejagnu4.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the DejaGnu rules work for a simple program and test case.
+# Also check PR 488: Failure of the first of several tools tested.
+# From the original bug report:
+# ``If you use dejagnu for testing and have multiple tools (i.e.,
+#   multiple entries in the DEJATOOL variable) then the success/failure
+#   of "make check" is only dependent on the success/failure of the
+#   tests on the final tool. Thus there may be failures in the tests on
+#   previous tools, but at first glance "make check" has passed.''
+
+required=runtest
+. ./defs || Exit 1
+
+cat > hammer << 'END'
+#! /bin/sh
+echo "Everything looks like a nail to me!"
+END
+chmod +x hammer
+
+cat > spanner << 'END'
+#! /bin/sh
+echo "I'm a right spanner!"
+END
+chmod +x spanner
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+
+DEJATOOL = hammer spanner
+
+AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+
+EXTRA_DIST  = hammer  hammer.test/hammer.exp
+EXTRA_DIST += spanner spanner.test/spanner.exp
+END
+
+mkdir hammer.test spanner.test
+
+cat > hammer.test/hammer.exp << 'END'
+set test test
+spawn $HAMMER
+expect {
+    "Everything looks like a nail to me!" { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+cat > spanner.test/spanner.exp << 'END'
+set test test
+spawn $SPANNER
+expect {
+    "I'm a right spanner!" { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+test -f hammer.log
+test -f hammer.sum
+test -f spanner.log
+test -f spanner.sum
+
+$MAKE distcheck
+
+# Test for PR 488.
+sed 's/E\(verything\)/Not e\1/' hammer > thammer
+mv -f thammer hammer
+chmod +x hammer
+
+rm -f hammer.log hammer.sum spanner.log spanner.sum
+$MAKE check && Exit 1
+test -f hammer.log
+test -f hammer.sum
+test -f spanner.log
+test -f spanner.sum
+
+:
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
new file mode 100755
index 0000000..26eaa60
--- /dev/null
+++ b/t/dejagnu5.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the DejaGnu rules do look for a testsuite named after
+# the package by default.
+
+required=runtest
+. ./defs || Exit 1
+
+package=$me
+
+cat > $package << 'END'
+#! /bin/sh
+echo "Ah, we have been expecting you, Mr. Blond."
+END
+chmod +x $package
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << END
+AUTOMAKE_OPTIONS = dejagnu
+EXTRA_DIST = $package $package.test/$package.exp
+AM_RUNTESTFLAGS = PACKAGE=\$(srcdir)/$package
+END
+
+mkdir $package.test
+cat > $package.test/$package.exp << 'END'
+set test "a_dejagnu_test"
+spawn $PACKAGE
+expect {
+    "Ah, we have been expecting you, Mr. Blond." { pass "$test" }
+    default { fail "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+test -f $package.log
+test -f $package.sum
+
+$MAKE distcheck
+
+:
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
new file mode 100755
index 0000000..38255f6
--- /dev/null
+++ b/t/dejagnu6.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that "make check" fails, when a DejaGnu test fails.
+
+required=runtest
+. ./defs || Exit 1
+
+cat > faildeja << 'END'
+#! /bin/sh
+echo whatever
+END
+chmod +x faildeja
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = faildeja
+AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja
+END
+
+mkdir faildeja.test
+cat > faildeja.test/faildeja.exp << 'END'
+set test failing_deja_test
+spawn $FAILDEJA
+expect {
+    default { fail "$test" }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check && Exit 1
+test -f faildeja.log
+test -f faildeja.sum
+$FGREP 'FAIL: failing_deja_test' faildeja.sum
+
+:
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
new file mode 100755
index 0000000..a926955
--- /dev/null
+++ b/t/dejagnu7.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that "make check" fails, when we invoke DejaGnu tests with --status
+# (to detect TCL errors) on a file with TCL errors.
+
+required=runtest
+. ./defs || Exit 1
+
+runtest --help | grep '.*--status' \
+  || skip_ "dejagnu lacks support for '--status'"
+
+cat > failtcl << 'END'
+#! /bin/sh
+echo whatever
+END
+chmod +x failtcl
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = failtcl
+AM_RUNTESTFLAGS = --status FAILTCL=$(srcdir)/failtcl
+END
+
+mkdir failtcl.test
+cat > failtcl.test/failtcl.exp << 'END'
+set test test
+spawn $FAILTCL
+expect {
+    default { pass "$test" }
+# Oops, no closing brace.
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check && Exit 1
+test -f failtcl.log
+test -f failtcl.sum
+$FGREP 'missing close-brace' failtcl.sum
+
+:
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
new file mode 100755
index 0000000..636286c
--- /dev/null
+++ b/t/deleted-am.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The stub rules emitted to work around the "deleted header problem"
+# for '.am' files shouldn't prevent the remake rules from correctly
+# erroring out when a still-required file is missing.
+# See also discussion about automake bug#9768.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+echo 'include $(top_srcdir)/foobar.am' > Makefile.am
+echo 'include zardoz.am' > foobar.am
+: > zardoz.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+
+rm -f zardoz.am
+$sleep # Required to avoid racy failures with FreeBSD make.
+$MAKE >output 2>&1 && { cat output; Exit 1; }
+cat output
+# This error will come from automake, not make, so we can be stricter
+# in our grepping of it.
+grep 'cannot open.*zardoz\.am' output
+grep 'foobar\.am' output && Exit 1 # No spurious error, please.
+
+# Try with one less indirection.
+: > foobar.am
+$AUTOMAKE Makefile
+./config.status Makefile
+$MAKE # Sanity check.
+rm -f foobar.am
+$sleep # Required to avoid racy failures with FreeBSD make.
+$MAKE >output 2>&1 && { cat output; Exit 1; }
+cat output
+# This error will come from automake, not make, so we can be stricter
+# in our grepping of it.
+grep 'cannot open.*foobar\.am' output
+
+:
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
new file mode 100755
index 0000000..e1bbfce
--- /dev/null
+++ b/t/deleted-m4.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The stub rules emitted to work around the "deleted header problem"
+# for '.m4' files shouldn't prevent the remake rules from correctly
+# erroring out when a still-required file is missing.
+# See also discussion about automake bug#9768.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+m4_include([foobar.m4])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+echo 'm4_include([zardoz.m4])' > foobar.m4
+: > zardoz.m4
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+
+rm -f zardoz.m4
+$MAKE >output 2>&1 && { cat output; Exit 1; }
+cat output
+# This error will come from aclocal, not make, so we can be stricter
+# in our grepping of it.
+grep ' foobar\.m4:1:.*zardoz\.m4.*does not exist' output
+# No spurious errors, please.
+$FGREP -v ' foobar.m4:1:' output | $FGREP 'foobar.m4' && Exit 1
+
+# Try with one less indirection.
+: > foobar.m4
+$ACLOCAL --force
+$AUTOCONF
+./configure
+$MAKE # Sanity check.
+rm -f foobar.m4
+$MAKE >output 2>&1 && { cat output; Exit 1; }
+cat output
+# This error will come from aclocal, not make, so we can be stricter
+# in our grepping of it.
+grep 'foobar\.m4.*does not exist' output
+# No spurious errors, please (ok, this is really paranoid).
+$FGREP 'zardoz.m4' output && Exit 1
+
+:
diff --git a/t/depacl2.sh b/t/depacl2.sh
new file mode 100755
index 0000000..378a1a2
--- /dev/null
+++ b/t/depacl2.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependencies work when required macro is part of
+# autoconf.
+
+. ./defs || Exit 1
+
+echo 'AM_FOO' >> configure.ac
+echo 'AC_DEFUN([AM_FOO], [AC_REQUIRE([AC_HEADER_STDC])])' > AM_FOO.m4
+
+$ACLOCAL -I .
+
+:
diff --git a/t/depcomp.sh b/t/depcomp.sh
new file mode 100755
index 0000000..f2e0370
--- /dev/null
+++ b/t/depcomp.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure depcomp is installed and found properly
+# when required for multiple directories.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([subdir/Makefile subdir2/Makefile])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+rm -f depcomp
+mkdir subdir
+mkdir subdir2
+
+cat > subdir/Makefile.am << 'END'
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+END
+
+cp subdir/Makefile.am subdir2/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+# There used to be a bug where this was created in the first subdir with C
+# sources in it instead of in $top_srcdir or $ac_auxdir.
+test -f depcomp
+
+:
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
new file mode 100755
index 0000000..624dee6
--- /dev/null
+++ b/t/depcomp2.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that depcomp is not used when it's not installed
+# From Pavel Roskin.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([subdir/Makefile])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+END
+
+rm -f depcomp
+mkdir subdir
+
+cat > subdir/Makefile.in << 'END'
+foo:
+       $(CC) -o foo foo.c
+END
+
+: > subdir/foo.c
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+./configure 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+test ! -s stderr
+
+:
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
new file mode 100755
index 0000000..01a2403
--- /dev/null
+++ b/t/depcomp8a.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for regressions in computation of names of .Po files for
+# automatic dependency tracking.
+# Keep this in sync with sister test 'depcomp8b.test', which checks the
+# same thing for libtool objects.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+#x AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = foo.c sub/bar.c
+END
+
+mkdir sub
+cat > foo.c << 'END'
+int main (void)
+{
+  extern int bar;
+  return bar;
+}
+END
+cat > sub/bar.c << 'END'
+extern int bar = 0;
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # For debugging.
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
+grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
+
+$AUTOCONF
+# Don't reject slower dependency extractors, for better coverage.
+./configure --enable-dependency-tracking
+$MAKE
+cross_compiling || ./zardoz
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+
+# Try again with subdir-objects option.
+
+sed 's/#x //' configure.ac >configure.int
+mv -f configure.int configure.ac
+echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # For debugging.
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+
+$AUTOCONF
+# Don't reject slower dependency extractors, for better coverage.
+./configure --enable-dependency-tracking
+$MAKE
+cross_compiling || ./zardoz
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+
+:
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
new file mode 100755
index 0000000..b5f7371
--- /dev/null
+++ b/t/depcomp8b.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for regressions in computation of names of .Plo files for
+# automatic dependency tracking.
+# Keep this in sync with sister test 'depcomp8a.test', which checks the
+# same thing for non-libtool objects.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+#x AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libzardoz.la
+libzardoz_la_SOURCES = foo.c sub/bar.c
+END
+
+mkdir sub
+echo 'extern int foo = 0;' > foo.c
+echo 'extern int bar = 0;' > sub/bar.c
+
+libtoolize
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # For debugging.
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
+grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
+
+$AUTOCONF
+# Don't reject slower dependency extractors, for better coverage.
+./configure --enable-dependency-tracking
+$MAKE
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+
+# Try again with subdir-objects option.
+
+sed 's/#x //' configure.ac >configure.int
+mv -f configure.int configure.ac
+echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+grep include Makefile.in # For debugging.
+grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+
+$AUTOCONF
+# Don't reject slower dependency extractors, for better coverage.
+./configure --enable-dependency-tracking
+$MAKE
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+
+:
diff --git a/t/depdist.sh b/t/depdist.sh
new file mode 100755
index 0000000..e81e097
--- /dev/null
+++ b/t/depdist.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure depcomp is found for the distribution.
+# From Eric Magnien.
+
+required=cc
+. ./defs || Exit 1
+
+rm -f configure.ac
+
+mkdir config
+for i in *; do
+   if test "$i" != "config"; then
+      mv -f "$i" config
+   fi
+done
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_FILES([subdir/Makefile Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+check-local: test1 test2
+.PHONY: test1 test2
+test1:
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config/depcomp '
+test2: distdir
+       ls -l $(distdir)/*
+       test -f $(distdir)/config/depcomp
+END
+
+mkdir subdir
+cat > subdir/foo.c << 'END'
+int main(void)
+{
+  return 0;
+}
+END
+
+cat > subdir/Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/depend.sh b/t/depend.sh
new file mode 100755
index 0000000..a2e3bd8
--- /dev/null
+++ b/t/depend.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This tests for a bug reported by Henrik Frystyk Nielsen <address@hidden>
+# In some cases the auto-dependency can get confused and try
+# to '-include' a directory (if a backslash-newline appears in _SOURCES).
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = fred
+fred_SOURCES = \
+   fred.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
diff --git a/t/depend3.sh b/t/depend3.sh
new file mode 100755
index 0000000..8f8431a
--- /dev/null
+++ b/t/depend3.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test _DEPENDENCIES variable.  From Lee Iverson.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST(DEPS)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = TerraVision
+
+TerraVision_SOURCES = \
+       AboutDialog.c Clock.c Dialogs.c DrawModel.c \
+       TsmWidget.c Gats.c GATSDialogs.c Model.c ModelAnim.c \
+       ScannedMap.c \
+        TerraVision.c TerraVisionAvs.c TerraVisionCAVE.c \
+       Texture.c ThreeDControl.c ThreeDPanel.c \
+       ThreeDWidget.c ThreeDWidget1.c TileManager.c \
+       TileRequester.c TwoDWidget.c \
+        Visible.c RequestGenerator.c X11FrameGrab.c \
+       matrix.c pixmaps.c xpmhash.c xpmread.c xcolor.c xv24to8.c
+
+DEPS = @DEPS@
+
+TerraVision_DEPENDENCIES = $(DEPS)
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/depend4.sh b/t/depend4.sh
new file mode 100755
index 0000000..d9896f8
--- /dev/null
+++ b/t/depend4.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that dependencies are included when there are many header files.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+$ACLOCAL
+
+headers=
+for header in one.h two.h three.h four.h five.h six.h; do
+  headers="$headers $header"
+  unindent > Makefile.am << END
+    bin_PROGRAMS = fred
+    fred_SOURCES = fred1.c $headers
+END
+  $AUTOMAKE
+  test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
+done
+
+:
diff --git a/t/depend5.sh b/t/depend5.sh
new file mode 100755
index 0000000..ca900f0
--- /dev/null
+++ b/t/depend5.sh
@@ -0,0 +1,78 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
+# quoting in $CONFIG_FILES, done by newer Autoconf.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac << END
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << END
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c foo.h
+END
+
+cat >foo.c << END
+#include "foo.h"
+END
+: >foo.h
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure --enable-dependency-tracking
+if test -d .deps; then
+  depdir=.deps
+elif test -d _deps; then
+  depdir=_deps
+else
+  depdir=
+fi
+
+# For the fun of it, we should also cope with makefile
+# names that contain weird characters, with Autoconf 2.62
+# and newer.
+# Pick the first name that the file system will accept.
+for name in \
+  'weird  name with $ `#() &! characters"' \
+  'weird  name with $ `#()  characters"' \
+  'weird  name with  characters'
+do
+  cp Makefile.in "$name.in" && break || :
+done
+
+for arg in Makefile \
+  --file=Makefile \
+  "--file=$name"
+do
+  rm -rf .deps _deps
+  ./config.status "$arg" depfiles >stdout 2>stderr ||
+    { cat stdout; cat stderr >&2; Exit 1; }
+  cat stdout
+  cat stderr >&2
+  grep '[Nn]o such file' stderr && Exit 1
+
+  if test -n "$depdir"; then
+    test -d $depdir || Exit 1
+  fi
+done
+
+:
diff --git a/t/depend6.sh b/t/depend6.sh
new file mode 100755
index 0000000..fb4c140
--- /dev/null
+++ b/t/depend6.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug,
+# reported by Markus Duft.
+
+. ./defs || Exit 1
+
+cat >>configure.ac << END
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << END
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c foo.h
+END
+
+cat >foo.c << END
+#include "foo.h"
+END
+: >foo.h
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure --disable-dependency-tracking 2>stderr || {
+  stat=$?; cat stderr >&2; Exit $stat;
+}
+cat stderr >&2
+grep shift stderr && Exit 1
+
+:
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
new file mode 100755
index 0000000..d130f9c
--- /dev/null
+++ b/t/deprecated-acinit.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake and autoconf complain about an old-style AC_INIT
+# call used with a new-style AM_AUTOMAKE_INIT call.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+# We'll need a proper aclocal.m4, but aclocal is expected to fail
+# later, so get and store it now.
+$ACLOCAL
+mv aclocal.m4 aclocal-m4.sav
+
+errmsg='AC_INIT should be called with package and version argument'
+
+for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
+  for am_init_automake in AM_INIT_AUTOMAKE 'AM_INIT_AUTOMAKE([1.11])'; do
+    rm -rf autom4te*.cache aclocal.m4
+    unindent > configure.ac <<END
+        $ac_init
+        $am_init_automake
+        AC_CONFIG_FILES([Makefile])
+END
+    cat configure.ac # For debugging.
+    $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+    cat stderr >&2
+    grep "^configure\\.ac:.* $errmsg" stderr
+    cp aclocal-m4.sav aclocal.m4
+    $AUTOCONF 2>stderr && { cat stderr >&2; Exit 1; }
+    cat stderr >&2
+    grep "^configure\\.ac:.* $errmsg" stderr
+    AUTOMAKE_fails
+    grep "^configure\\.ac:.* $errmsg" stderr
+  done
+done
+
+:
diff --git a/t/destdir.sh b/t/destdir.sh
new file mode 100755
index 0000000..22bf184
--- /dev/null
+++ b/t/destdir.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that 'make distcheck' can find some $(DESTDIR) omissions.
+# PR/186.
+
+# The feature we test here relies on read-only directories.
+# It will only work for non-root users.
+required='ro-dir'
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+dist_data_DATA = foo
+
+# This rule is bogus because it doesn't use $(DESTDIR) on the
+# second argument of cp.  distcheck is expected to catch this.
+install-data-hook:
+       cp $(DESTDIR)$(datadir)/foo $(datadir)/bar
+
+uninstall-local:
+       rm -f $(DESTDIR)$(datadir)/bar
+EOF
+
+: > foo
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE distcheck && Exit 1
+
+:
diff --git a/t/dirlist-abspath.sh b/t/dirlist-abspath.sh
new file mode 100755
index 0000000..78af8b1
--- /dev/null
+++ b/t/dirlist-abspath.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check use of absolute paths in dirlist.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+mkdir acdir-more sub sub/acdir
+echo "`pwd`/acdir-more" > sub/acdir/dirlist
+
+echo 'AC_DEFUN([AM_FOO], [foo-foo--foo])' > acdir-more/foo.m4
+
+cd sub
+
+cat > configure.ac <<EOF
+AC_INIT([$me], [1.0])
+AM_FOO
+EOF
+
+$ACLOCAL --system-acdir acdir
+$AUTOCONF
+
+# Only -I directories are subject to file inclusion.
+grep m4_include aclocal.m4 && Exit 1
+
+grep 'foo-foo--foo' configure
+
+:
diff --git a/t/dirlist.sh b/t/dirlist.sh
new file mode 100755
index 0000000..76daa35
--- /dev/null
+++ b/t/dirlist.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check dirlist support.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+EOF
+
+mkdir acdir dirlist-test
+echo ./dirlist-test > acdir/dirlist
+
+cat >dirlist-test/dirlist-check.m4 <<'END'
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+END
+
+cat >dirlist-test/init.m4 <<EOF
+AC_DEFUN([AM_INIT_AUTOMAKE], [I should not be included])
+EOF
+
+$ACLOCAL --system-acdir acdir
+$AUTOCONF
+
+# There should be no m4_include in aclocal.m4, even though m4/dirlist
+# contains './dirlist-test' as a relative directory.  Only -I directories
+# are subject to file inclusion.
+grep m4_include aclocal.m4 && Exit 1
+
+grep 'GUILE-VERSION' configure
+
+# This bug can occur only when we do a VPATH build of Automake
+# (because of the '-I' passed to aclocal in tests/defs/aclocal.in) but
+# it's OK because VPATH builds are done by 'make distcheck'.
+grep 'I should not be included' configure && Exit 1
+
+:
diff --git a/t/dirlist2.sh b/t/dirlist2.sh
new file mode 100755
index 0000000..f3b9c4d
--- /dev/null
+++ b/t/dirlist2.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check dirlist globbing support.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+AM_FOO_BAR
+EOF
+
+mkdir dirlist21-test dirlist22-test
+
+cat >dirlist21-test/dirlist21-check.m4 <<'END'
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+END
+
+cat >dirlist22-test/dirlist22-check.m4 <<'END'
+AC_DEFUN([AM_FOO_BAR],[
+: foo bar baz
+])
+END
+
+mkdir my-acdir
+cat > my-acdir/dirlist <<'END'
+dirlist2*-test
+END
+
+$ACLOCAL --system-acdir my-acdir
+$AUTOCONF
+
+# There should be no m4_include in aclocal.m4, even though m4/dirlist
+# contains './dirlist-test' as a relative directory.  Only -I directories
+# are subject to file inclusion.
+grep m4_include aclocal.m4 && Exit 1
+
+grep 'GUILE-VERSION' configure
+grep 'foo bar baz' configure
+
+:
diff --git a/t/discover.sh b/t/discover.sh
new file mode 100755
index 0000000..7a01dc7
--- /dev/null
+++ b/t/discover.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure LIBOBJS file cannot be mentioned explicitly.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AM_PROG_AR
+AC_PROG_CC
+AC_LIBOBJ([fsusage])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES = fsusage.c
+libtu_a_LIBADD = @LIBOBJS@
+END
+
+: > fsusage.c
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'automatically discovered.*fsusage\.c.*explicitly mentioned' stderr
+
+:
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
new file mode 100755
index 0000000..db9aa94
--- /dev/null
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -0,0 +1,140 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# It should be legitimate for many subdir Makefiles to require the
+# same config-aux files.
+
+am_create_testdir=empty
+am_parallel_tests=yes
+required=cc
+. ./defs || Exit 1
+
+count=0
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+# Usage: do_check [--add-missing] [CONFIG-AUXDIR-PATH=.]
+do_check ()
+{
+  case $1 in
+    -a|--add-missing) add_missing=yes; shift;;
+    *) add_missing=no;;
+  esac
+  auxdir=${1-.}
+
+  count=`expr $count + 1`
+  mkdir T$count.d
+  cd T$count.d
+
+  distdir=$me-$count
+  unindent > configure.ac << END
+    AC_INIT([$me], [$count])
+    AC_CONFIG_AUX_DIR([$auxdir])
+    AM_INIT_AUTOMAKE([parallel-tests])
+    AC_PROG_CC
+    # We don't want to require python or emcas in this test, so
+    # the tricks below.
+    AM_PATH_PYTHON([2.2], [], [:])
+    EMACS=no; AM_PATH_LISPDIR
+    AC_CONFIG_FILES([Makefile])
+END
+
+  unindent > Makefile.stub <<'END'
+    ## For depcomp.
+    bin_PROGRAMS = foo
+    foo_SOURCES = foo.c
+    ## For py-compile.
+    python_PYTHON = bar.py
+    ## For elisp-comp.
+    lisp_LISP = baz.el
+    ## For test-driver.
+    TESTS =
+END
+
+  required_files='
+    install-sh
+    missing
+    depcomp
+    py-compile
+    elisp-comp
+    test-driver
+  '
+
+  echo "SUBDIRS =" > Makefile.am
+
+  suffixes='0 1 2 3 4 5 6 7 8 9'
+
+  for x in $suffixes; do
+    mkdir sub$x
+    echo "SUBDIRS += sub$x" >> Makefile.am
+    echo "AC_CONFIG_FILES([sub$x/Makefile])" >> configure.ac
+    cp Makefile.stub sub$x/Makefile.am
+    echo 'int main (void) { return 0; }' > sub$x/foo.c
+    touch sub$x/bar.py sub$x/baz.el
+  done
+  echo AC_OUTPUT >> configure.ac
+
+  $ACLOCAL
+  $AUTOCONF
+
+  "$am_scriptdir"/install-sh -d $auxdir \
+    || fatal_ "creating directory '$auxdir' with install-sh"
+  if test $add_missing = yes; then
+    $AUTOMAKE -a --copy
+    for f in $required_files; do
+      test -f $auxdir/$f
+      # To ensure that if a auxiliary file is required and distributed
+      # by many Makefiles, the "dist" rule won't try to copy it multiple
+      # times in $(distdir).
+      chmod a-w $auxdir/$f
+    done
+  else
+    for f in $required_files; do
+      cp "$am_scriptdir"/$f $auxdir/$f \
+        || fatal_ "faild to fetch auxiliary script '$f'"
+      # See comments above.
+      chmod a-w $auxdir/$f
+    done
+    $AUTOMAKE
+  fi
+
+  for vpath in : false; do
+    if $vpath; then
+      mkdir build
+      cd build
+      srcdir=..
+    else
+      srcdir=.
+    fi
+    $srcdir/configure
+    $MAKE distdir
+    find $distdir # For debugging.
+    for f in $required_files; do
+      test -f $distdir/$auxdir/$f
+    done
+    cd $srcdir
+  done
+
+  cd "$ocwd" || fatal_ "cannot chdir back to '$ocwd'"
+}
+
+do_check .
+do_check --add-missing .
+do_check build-aux
+do_check --add-missing build-aux
+do_check a/b/c
+do_check --add-missing a/b/c
+
+:
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
new file mode 100755
index 0000000..b7e2e2d
--- /dev/null
+++ b/t/dist-auxfile-2.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Files specified by AC_REQUIRE_AUX_FILE must exist, and if a Makefile
+# is present in the build-aux directory, they correctly get automatically
+# distributed.
+# Related to automake bug#9651.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([sub])
+AM_INIT_AUTOMAKE
+AC_REQUIRE_AUX_FILE([zardoz])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+test: distdir
+       ls -l $(distdir) $(distdir)/* ;: For debugging.
+       test -f $(distdir)/sub/zardoz
+.PHONY: test
+check-local: test
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+echo dummy > sub/zardoz
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+test -f sub/install-sh
+# Should work also without '--add-missing'.
+$AUTOMAKE
+
+./configure
+
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
new file mode 100755
index 0000000..9f7e8ee
--- /dev/null
+++ b/t/dist-auxfile.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Files specified by AC_REQUIRE_AUX_FILE must exist, and they get
+# automatically distributed by the top-level Makefile.am.
+# Automake bug#9651 reported that this didn't happen when the build-aux
+# directory was set to '.' by AC_CONFIG_AUX_DIR.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+i=0
+for auxdir in build-aux ''; do
+
+  echo "*** Testing with auxdir '$auxdir' ***"
+
+  i=`expr $i + 1`
+  mkdir T$i.d
+  cd T$i.d
+
+  unindent > configure.ac <<END
+    AC_INIT([$me], [1.0])
+    AC_CONFIG_AUX_DIR([${auxdir:-.}])
+    AM_INIT_AUTOMAKE
+    AC_REQUIRE_AUX_FILE([foo.txt])
+    AC_REQUIRE_AUX_FILE([bar.sh])
+    AC_REQUIRE_AUX_FILE([zardoz])
+    AC_CONFIG_FILES([Makefile subdir/Makefile])
+    AC_OUTPUT
+END
+
+  echo auxdir = ${auxdir:+"$auxdir/"} > Makefile.am
+  unindent >> Makefile.am <<'END'
+    SUBDIRS = subdir
+    test: distdir
+       ls -l $(distdir) $(distdir)/*      ;: For debugging.
+       @echo DIST_COMMON = $(DIST_COMMON) ;: Likewise.
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)foo.txt '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)bar.sh '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)zardoz '
+       test -f $(distdir)/$(auxdir)foo.txt
+       test -f $(distdir)/$(auxdir)bar.sh
+       test -f $(distdir)/$(auxdir)zardoz
+    .PHONY: test
+    check-local: test
+END
+
+  mkdir subdir
+  echo > subdir/Makefile.am # 'echo', not ':', for Solaris /bin/sh.
+
+  test -z "$auxdir" || mkdir "$auxdir" || Exit 99
+
+  if test -z "$auxdir"; then
+    auxdir=.
+    auxdir_rx='\.'
+  else
+    auxdir_rx=$auxdir
+  fi
+
+  $ACLOCAL
+  $AUTOCONF
+
+  AUTOMAKE_fails
+  grep "^configure\\.ac:4:.* required file.*$auxdir_rx/foo\\.txt" stderr
+  grep "^configure\\.ac:5:.* required file.*$auxdir_rx/bar\\.sh"  stderr
+  grep "^configure\\.ac:6:.* required file.*$auxdir_rx/zardoz"    stderr
+
+  touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
+  cp "$am_scriptdir"/missing "$am_scriptdir"/install-sh $auxdir \
+    || fatal_ "fetching auxiliary scripts 'missing' and 'install-sh'"
+  $AUTOMAKE
+  ./configure
+  $MAKE test
+  $EGREP '(foo\.txt|bar\.sh|zardoz)' subdir/Makefile.in && Exit 1
+
+  $MAKE distcheck
+
+  cd ..
+
+done
+
+:
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
new file mode 100755
index 0000000..d627cf8
--- /dev/null
+++ b/t/dist-formats.tap
@@ -0,0 +1,451 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for different compression formats used by distribution
+# archives.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+plan_ 70
+
+# ---------------------------------------------------- #
+#  Common and/or auxiliary subroutines and variables.  #
+# ---------------------------------------------------- #
+
+ocwd=`pwd` || fatal_ "obtaining current working directory"
+
+TAR='' && unset TAR
+
+# Create common aclocal.m4 file, for later tests.
+mkdir setup \
+  && cd setup \
+  && echo 'AC_INIT([x], [0]) AM_INIT_AUTOMAKE' > configure.ac \
+  && $ACLOCAL \
+  && mv aclocal.m4 .. \
+  && cd .. \
+  && rm -rf setup \
+  || fatal_ "creating common aclocal.m4 file"
+
+# Some make implementations (e.g., HP-UX) don't grok '-j', some require
+# no space between '-j' and the number of jobs (e.g., older GNU make
+# versions), and some *do* require a space between '-j' and the number
+# of jobs (e.g., Solaris dmake).  We need a runtime test to see what
+# works.
+for MAKE_j4 in "$MAKE -j4" "$MAKE -j 4" false; do
+  echo all: | $MAKE_j4 -f - && break
+  : For shells with buggy 'set -e'.
+done
+
+# Set variables '$compressor' and '$suffix'.
+setup_vars_for_compression_format ()
+{
+  suffix=NONE compressor=NONE
+  case $1 in
+    gzip) suffix=tar.gz  compressor=gzip     ;;
+    tarZ) suffix=tar.Z   compressor=compress ;;
+    lzip) suffix=tar.lz  compressor=lzip     ;;
+      xz) suffix=tar.xz  compressor=xz       ;;
+   bzip2) suffix=tar.bz2 compressor=bzip2    ;;
+     zip) suffix=zip     compressor=zip      ;;
+    shar) suffix=shar.gz compressor=shar     ;;
+       *) fatal_ "invalid compression format '$1'";;
+  esac
+}
+
+all_compression_formats='gzip tarZ lzip xz bzip2 zip shar'
+
+all_compressors=`
+  for x in $all_compression_formats; do
+    setup_vars_for_compression_format $x
+    echo $compressor
+  done | tr "$nl" ' '`
+echo All compressors: $all_compressors
+
+missing_compressors=`
+  for c in $all_compressors; do
+    case $c in
+      # Assume gzip(1) is available on every reasonable portability target.
+      gzip)
+        continue
+        ;;
+      # On Cygwin, as of 9/2/2012, 'compress' is provided by sharutils
+      # and is just a dummy script that is not able to actually compress
+      # (it can only decompress).  So, check that the 'compress' program
+      # is actually able to compress input.
+      # Note that, at least on GNU/Linux, 'compress' does (and is
+      # documented to) exit with status 2 if the output is larger than
+      # the input after (attempted) compression; so we need to pass it
+      # an input that it can actually reduce in size when compressing.
+      compress)
+        for x in 1 2 3 4 5 6 7 8; do
+          echo aaaaaaaaaaaaaaa
+        done | $c -c >/dev/null && continue
+        : For shells with busted 'set -e'.
+        ;;
+      *)
+        $c --version </dev/null >&2 && continue
+        : For shells with busted 'set -e'.
+        ;;
+    esac
+    echo $c
+  done | tr "$nl" ' '`
+echo Missing compressors: $missing_compressors
+
+have_compressor ()
+{
+  case " $missing_compressors " in *\ $1\ *) false;; *) : ;; esac
+}
+
+have_all_compressors ()
+{
+  test -z "$missing_compressors"
+}
+
+start_subtest ()
+{
+  name=$1; shift
+  test -n "$name" || fatal_ "start_subtest: no subtest name given"
+  if test $# -gt 0; then
+    eval "$@" || fatal_ "start_subtest: evaluating assignments"
+  fi
+  ac_opts=`echo $ac_opts | tr ',' ' '`
+  am_opts=`echo $am_opts | tr ',' ' '`
+  mkdir "$name"
+  cd "$name"
+  unindent > configure.ac <<END
+    AC_INIT([$name], [1.0])
+    AM_INIT_AUTOMAKE([$ac_opts])
+    AC_CONFIG_FILES([Makefile])
+    AC_OUTPUT
+END
+  echo "AUTOMAKE_OPTIONS = $am_opts" > Makefile.am
+  # It is imperative that aclocal.m4 is copied after configure.ac has
+  # been created, to avoid a spurious trigger of the automatic remake
+  # rules for configure & co.
+  cp "$ocwd"/aclocal.m4 \
+     "$am_scriptdir"/missing \
+     "$am_scriptdir"/install-sh \
+     .
+}
+
+end_subtest ()
+{
+  unset name; unset ac_opts; unset am_opts;
+  cd "$ocwd" || fatal_ "couldn't chdir back to '$ocwd'"
+}
+
+command_ok_if_have_compressor ()
+{
+  if have_compressor "$compressor"; then
+    command_ok_ "$@"
+  else
+    skip_ -r "'$compressor' not available" "$1"
+  fi
+}
+
+can_compress ()
+{
+  test $# -eq 2 || fatal_ "can_compress: bad number of arguments"
+  tarname=$1 format=$2
+  setup_vars_for_compression_format "$format"
+
+  command_ok_ "'dist-$format' target always created" $MAKE -n dist-$format
+
+  command_ok_if_have_compressor "'make dist-$format' work by default" \
+    eval '
+      rm -rf *$tarname* \
+        && make dist-$format \
+        && test -f $tarname-1.0.$suffix \
+        && ls -l *$tarname* \
+        && test "`ls *$tarname*`" = $tarname-1.0.$suffix'
+
+  unset suffix compressor format tarname
+}
+
+# ---------------------------------------- #
+#  Defaults layout of the dist-* targets.  #
+# ---------------------------------------- #
+
+start_subtest defaults
+
+command_ok_ "default [automake]"        $AUTOMAKE
+command_ok_ "default [autoconf]"        $AUTOCONF
+command_ok_ "default [configure]"       ./configure
+command_ok_ "default [make distcheck]"  $MAKE distcheck
+
+command_ok_ "'make dist' only builds *.tar.gz by default" \
+            test "`ls *defaults*`" = defaults-1.0.tar.gz
+
+rm -rf *defaults*
+
+for fmt in $all_compression_formats; do
+  can_compress defaults $fmt
+done
+unset fmt
+
+end_subtest
+
+# ----------------------------------------------------------- #
+#  Check diagnostic for no-dist-gzip without another dist-*.  #
+# ----------------------------------------------------------- #
+
+nogzip_stderr ()
+{
+  grep "$1:.*no-dist-gzip" stderr \
+    && grep "$1:.* at least one archive format must be enabled" stderr
+}
+
+nogzip_automake_failure ()
+{
+  AUTOMAKE_fails -d "no-dist-gzip ($1) without other formats is an error"
+  command_ok_ "no-dist-gzip ($1) without other formats gives diagnostic" \
+              nogzip_stderr "$2"
+}
+
+start_subtest am-nogz-only am_opts=no-dist-gzip ac_opts=
+nogzip_automake_failure 'am' 'Makefile\.am:1'
+end_subtest
+
+start_subtest ac-nogz-only am_opts= ac_opts=no-dist-gzip
+nogzip_automake_failure 'ac' 'configure\.ac:2'
+end_subtest
+
+# ------------------------------------------------- #
+#  Check use of no-dist-gzip with a dist-* option.  #
+# ------------------------------------------------- #
+
+append_to_opt ()
+{
+  var=$1_opts val=$2
+  eval "$var=\${$var:+\"\$$var,\"}\$val" || fatal_ "evaluating \${$var}"
+  unset var val
+}
+
+nogzip ()
+{
+  test $#,$1,$3,$5 = 6,in,and,in \
+    && case $2,$6 in ac,ac|ac,am|am,ac|am,am) :;; *) false;; esac \
+    || fatal_ "nogzip: invalid usage"
+  format=$4 where_dist_nogzip=$2 where_dist_format=$6
+  shift 6
+
+  am_opts= ac_opts=
+  append_to_opt $where_dist_format dist-$format
+  append_to_opt $where_dist_nogzip no-dist-gzip
+  setup_vars_for_compression_format "$format"
+  # Do these before the am_opts and ac_opts variable can be munged
+  # by 'start_subtest'.
+  desc=
+  test -n "$am_opts" && desc=${desc:+"$desc "}"am=$am_opts"
+  test -n "$ac_opts" && desc=${desc:+"$desc "}"ac=$ac_opts"
+
+  start_subtest nogzip-$format am_opts=$am_opts ac_opts=$ac_opts
+
+  unindent >> Makefile.am <<END
+    check-ark-name:
+       test \$(DIST_ARCHIVES) = \$(distdir).$suffix
+    check-ark-exists:
+       test -f \$(distdir).$suffix
+    check-no-tar-gz:
+       test ! -f \$(distdir).tar.gz
+END
+
+  command_ok_ "$desc [automake]" $AUTOMAKE
+  command_ok_ "$desc [autoconf]" $AUTOCONF
+  command_ok_ "$desc [configure]" ./configure
+  command_ok_ "$desc [ark-name]" $MAKE check-ark-name
+  command_ok_if_have_compressor "$desc [distcheck]" $MAKE distcheck
+  command_ok_if_have_compressor "$desc [ark-exists]" $MAKE check-ark-exists
+  command_ok_ "$desc [no .tar.gz]"  $MAKE check-no-tar-gz
+
+  unset desc
+
+  end_subtest
+}
+
+#      $1 $2  $3   $4     $5  $6
+nogzip in am  and  bzip2  in  am
+nogzip in ac  and  xz     in  am
+nogzip in am  and  lzip   in  ac
+nogzip in ac  and  tarZ   in  ac
+
+
+# ----------------------------------------------------------- #
+#  The 'dist-gzip' target is created also with no-dist-gzip.  #
+# ----------------------------------------------------------- #
+
+start_subtest dist-gzip-persistence am_opts=no-dist-gzip,dist-xz
+command_ok_ "dist-gzip persistence [automake]"  $AUTOMAKE
+command_ok_ "dist-gzip persistence [autoconf]"  $AUTOCONF
+command_ok_ "dist-gzip persistence [configure]" ./configure
+can_compress dist-gzip-persistence gzip
+end_subtest
+
+
+# ----------------------- #
+#  Parallel compression.  #
+# ----------------------- #
+
+# We only use formats requiring 'gzip', 'bzip2' and 'compress' programs,
+# since there are the most likely to be all found on the great majority
+# of systems.
+
+start_subtest parallel-compression ac_opts=dist-bzip2 am_opts=dist-tarZ
+
+desc=gzip+bzip2+tarZ
+tarname=parallel-compression-1.0
+
+check_tarball ()
+{
+  format=$1
+  setup_vars_for_compression_format $format
+  (
+    tarball=$tarname.$suffix \
+      && test -f $tarball \
+      && mkdir check-$format \
+      && cp $tarball check-$format \
+      && cd check-$format \
+      && $compressor -d $tarball \
+      && tar xvf $tarname.tar \
+      && diff ../Makefile.in $tarname/Makefile.in \
+      && cd .. \
+      && rm -rf check-$format
+   )
+}
+
+command_ok_ "$desc [automake]" $AUTOMAKE
+
+skip_reason=
+have_compressor compress || skip_reason="'compress' not available"
+have_compressor bzip2 || skip_reason="'bzip2' not available"
+if test "$MAKE_j4" = false; then
+  test -z "$skip_reason" || skip_reason="$skip_reason and "
+  skip_reason="${skip_reason}make concurrency unavailable"
+fi
+
+if test -n "$skip_reason"; then
+  skip_row_ 6 -r "$skip_reason" "$desc"
+else
+  command_ok_ "$desc [autoconf]" $AUTOCONF
+  command_ok_ "$desc [configure]" ./configure
+  command_ok_ "$desc [make -j4 dist-all]"  $MAKE_j4 dist
+  ls -l # For debugging.
+  command_ok_ "$desc [check .tar.gz tarball]"  check_tarball gzip
+  command_ok_ "$desc [check .tar.bz2 tarball]" check_tarball bzip2
+  command_ok_ "$desc [check .tar.Z tarball]"   check_tarball tarZ
+fi
+
+unset tarname desc skip_reason
+
+end_subtest
+
+
+# --------------------------------------------------------- #
+#  The various 'dist-*' targets can happily work together.  #
+# --------------------------------------------------------- #
+
+start_subtest all-together
+
+desc='all compressors together'
+tarname=all-together-1.0
+
+echo 'AM_INIT_AUTOMAKE([' > am-init.m4
+echo 'AUTOMAKE_OPTIONS =' > Makefile.am
+
+# Add half 'dist-*' options to AM_INIT_AUTOMAKE, half to AUTOMAKE_OPTIONS.
+flip=:
+for fmt in $all_compression_formats; do
+  test $fmt = gzip && continue
+  if $flip; then
+    echo "  dist-$fmt" >> am-init.m4
+    flip=false
+  else
+    echo "AUTOMAKE_OPTIONS += dist-$fmt" >> Makefile.am
+    flip=:
+  fi
+done
+unset flip fmt
+
+echo '])' >> am-init.m4
+
+sed 's/AM_INIT_AUTOMAKE.*/m4_include([am-init.m4])/' configure.ac > t
+mv -f t configure.ac
+
+# For debugging.
+cat Makefile.am
+cat configure.ac
+cat am-init.m4
+
+command_ok_ "$desc [aclocal]" $ACLOCAL --force
+command_ok_ "$desc [automake]" $AUTOMAKE
+command_ok_ "$desc [autoconf]" $AUTOCONF
+command_ok_ "$desc [configure]" ./configure
+
+if have_all_compressors; then
+  command_ok_ "$desc [make distcheck, real]" $MAKE distcheck
+else
+  skip_ -r "not all compressors available" "$desc [make distcheck, real]"
+fi
+
+# We fake existence of all the compressors here, so that we don't have
+# to require any of them to run the further tests.  This is especially
+# important since it's very unlikely that a non-developer has all the
+# compression tools installed on his machine at the same time.
+
+mkdir bin
+cd bin
+cat > check-distdir <<END
+#!/bin/sh
+{ ls -l '$tarname' && diff Makefile.am '$tarname'/Makefile.am; } >&2 \
+  || { echo "== distdir fail =="; exit 1; }
+END
+cat > grep-distdir-error <<'END'
+#!/bin/sh
+grep 'distdir fail' && exit 1
+:
+END
+chmod a+x check-distdir grep-distdir-error
+for prog in tar $all_compressors; do
+  case $prog in
+    tar|shar|zip) cp check-distdir $prog;;
+               *) cp grep-distdir-error $prog;;
+  esac
+done
+unset prog
+ls -l # For debugging.
+cd ..
+
+oPATH=$PATH
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+
+command_ok_ \
+  "$desc ['make dist-all', stubbed]" \
+  $MAKE dist-all
+
+subdesc="$desc ['make dist -j4', stubbed]"
+if test "$MAKE_j4" = false; then
+  skip_ -r "make concurrency unavailable" "$subdesc"
+else
+  command_ok_ "$subdesc" $MAKE_j4 dist
+fi
+unset subdesc
+
+PATH=$oPATH; export PATH
+
+end_subtest
+
+:
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
new file mode 100755
index 0000000..ae135ae
--- /dev/null
+++ b/t/dist-included-parent-dir.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure included files in parent directory are distributed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+test: distdir
+       test -f $(distdir)/foo
+       test -f $(distdir)/bar
+       test 2 -gt `find $(distdir)/sub -type d | wc -l`
+END
+
+: > foo
+: > bar
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+include $(top_srcdir)/foo
+include ../bar
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+# Use --srcdir with an absolute path because it's harder
+# to support in 'distdir'.
+./configure --srcdir "`pwd`"
+$MAKE test
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
new file mode 100755
index 0000000..0765b0c
--- /dev/null
+++ b/t/dist-missing-am.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The stub rules emitted to work around the "deleted header problem"
+# for '.am' files shouldn't prevent "make" from diagnosing a missing
+# required '.am' file from a distribution tarball.
+# See discussion about automake bug#9768.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+include $(srcdir)/foobar.am
+include $(srcdir)/zardoz.am
+END
+
+: > foobar.am
+: > zardoz.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# A faulty distribution tarball, with a required '.am' file missing.
+# Building from it should fail, both for in-tree and VPATH builds.
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+for vpath in false :; do
+  $MAKE distdir
+  test -f $distdir/zardoz.am # Sanity check.
+  rm -f $distdir/zardoz.am
+  if $vpath; then
+    # We can't just build in a subdirectory of $distdir, otherwise
+    # we'll hit automake bug#10111.
+    mkdir vpath-distcheck
+    cd vpath-distcheck
+    ../$distdir/configure
+  else
+    cd $distdir
+    ./configure
+  fi
+  $MAKE >output 2>&1 && { cat output; Exit 1; }
+  cat output
+  # This error comes from automake, not make, so we can be stricter
+  # in our grepping of it.
+  grep 'cannot open.*zardoz\.am' output
+  grep 'foobar\.am' output && Exit 1 # No spurious error, please.
+  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
+done
+
+:
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
new file mode 100755
index 0000000..5960003
--- /dev/null
+++ b/t/dist-missing-included-m4.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The stub rules emitted to work around the "deleted header problem"
+# for '.m4' files shouldn't prevent "make" from diagnosing a missing
+# required '.m4' file from a distribution tarball.
+# See discussion about automake bug#9768.
+# See also sister test 'dist-missing-m4.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+m4_include([foobar.m4])
+m4_include([zardoz.m4])
+AC_OUTPUT
+END
+
+: > foobar.m4
+: > zardoz.m4
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# A faulty distribution tarball, with a required '.m4' file missing.
+# Building from it should fail, both for in-tree and VPATH builds.
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+for vpath in false :; do
+  $MAKE distdir
+  test -f $distdir/zardoz.m4 # Sanity check.
+  rm -f $distdir/zardoz.m4
+  if $vpath; then
+    # We can't just build in a subdirectory of $distdir, otherwise
+    # we'll hit automake bug#10111.
+    mkdir vpath-distcheck
+    cd vpath-distcheck
+    ../$distdir/configure
+  else
+    cd $distdir
+    ./configure
+  fi
+  $MAKE >output 2>&1 && { cat output; Exit 1; }
+  cat output
+  # This error will come from automake, not make, so we can be stricter
+  # in our grepping of it.
+  grep 'zardoz\.m4.*does not exist' output
+  grep 'foobar\.m4' output && Exit 1 # No spurious error, please.
+  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
+done
+
+:
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
new file mode 100755
index 0000000..9a418d3
--- /dev/null
+++ b/t/dist-missing-m4.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The stub rules emitted to work around the "deleted header problem"
+# for '.m4' files shouldn't prevent "make" from diagnosing a missing
+# required '.m4' file from a distribution tarball.
+# See discussion about automake bug#9768.
+# See also sister test 'dist-missing-included-m4.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+m4_pattern_forbid([^MY_])
+MY_FOOBAR || exit 1
+MY_ZARDOZ || exit 1
+AC_OUTPUT
+END
+
+mkdir m4
+echo 'AC_DEFUN([MY_FOOBAR], [:])' > m4/foobar.m4
+echo 'AC_DEFUN([MY_ZARDOZ], [:])' > m4/zardoz.m4
+
+echo 'ACLOCAL_AMFLAGS = -I m4' > Makefile.am
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# A faulty distribution tarball, with a required '.m4' file missing.
+# Building from it should fail, both for in-tree and VPATH builds.
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+for vpath in false :; do
+  $MAKE distdir
+  test -f $distdir/m4/zardoz.m4 # Sanity check.
+  rm -f $distdir/m4/zardoz.m4
+  if $vpath; then
+    # We can't just build in a subdirectory of $distdir, otherwise
+    # we'll hit automake bug#10111.
+    mkdir vpath-distcheck
+    cd vpath-distcheck
+    ../$distdir/configure
+  else
+    cd $distdir
+    ./configure
+  fi
+  $MAKE >output 2>&1 && { cat output; Exit 1; }
+  cat output
+  # This error will come from autoconf, not make, so we can be stricter
+  # in our grepping of it.
+  grep 'possibly undefined .*MY_ZARDOZ' output
+  grep 'MY_FOOBAR' output && Exit 1 # No spurious error, please.
+  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
+done
+
+:
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
new file mode 100755
index 0000000..2e22e84
--- /dev/null
+++ b/t/dist-pr109765.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Expose automake bug#10975: when several "dist-*" targets are invoked
+# on the make command line, the first one ends up removing the distdir,
+# so that the latter ones fail.
+
+required=bzip2
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+: > Makefile.am
+
+$ACLOCAL  || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE || fatal_ "automake failed"
+
+./configure
+$MAKE dist-gzip dist-bzip2
+
+gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; Exit 1; }
+cat one
+bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; Exit 1; }
+cat two
+
+$FGREP "$distdir/Makefile.am" one
+diff one two
+
+:
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
new file mode 100755
index 0000000..1aa32c8
--- /dev/null
+++ b/t/dist-readonly.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that a readonly files are distributed as such, and not make
+# writable while being copied in the $(distdir).
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+EXTRA_DIST = bar.txt
+check-local: test
+.PHONY: test
+test:
+       test -f $(srcdir)/foo.c && test ! -w $(srcdir)/foo.c
+       if (echo x > $(srcdir)/foo.c); then exit 1; else :; fi
+       grep 'main (void)' $(srcdir)/foo.c
+       test -f $(srcdir)/bar.txt && test ! -w $(srcdir)/bar.txt
+       if (echo x > $(srcdir)/bar.txt); then exit 1; else :; fi
+       grep 'To be, or not to be' $(srcdir)/bar.txt
+END
+
+echo 'int main (void) { return 0; }' > foo.c
+echo To be, or not to be ... > bar.txt
+chmod a-w foo.c bar.txt
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distdir
+ls -l $distdir # For debugging.
+test -f foo.c && test ! -w foo.c || Exit 1
+(echo x > foo.c) && Exit 1
+test -f bar.txt && test ! -w bar.txt || Exit 1
+(echo x > bar.txt) && Exit 1
+$MAKE distcheck
+
+:
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
new file mode 100755
index 0000000..6651e72
--- /dev/null
+++ b/t/dist-repeated.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that we can distribute the same file as many times as we want.
+# The distdir target should take care of not copying it more than one
+# time anyway.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = foo.c
+bar_SOURCES = foo.c
+python_PYTHON = bar.py
+EXTRA_DIST = foo.c bar.py
+
+.PHONY: sanity-check
+sanity-check:
+       for f in $(DISTFILES); do echo " $$f "; done > dist.txt
+       cat dist.txt
+       test `grep ' foo\.c '  dist.txt | wc -l` -eq 3
+       test `grep ' bar\.py ' dist.txt | wc -l` -eq 2
+
+# So that we don't have to require a C compiler.
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+
+# So that we don't have to require a Python interpreter.
+pythondir = ${prefix}/py
+PYTHON = false
+END
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+# Help to ensure cp won't see the same file twice.
+mkdir bin
+cat > bin/cp <<END
+#!/bin/sh
+PATH='$PATH'; export PATH
+
+case " \$* " in
+  *foo.c\ *)
+    if test -f '$ocwd'/foo-c-copied; then
+      echo "\$0: we tried to copy foo.c twice" >&2
+      exit 1
+    else
+      # For a sanity check later.
+      echo ok > '$ocwd'/cp-wrapper-has-seen-foo-c
+    fi
+    ;;
+esac
+
+case " \$* " in
+  *bar.py\ *)
+    if test -f '$ocwd'/bar-py-copied; then
+      echo "\$0: we tried to copy bar.py twice" >&2
+      exit 1
+    else
+      # For a sanity check later.
+      echo ok > '$ocwd'/cp-wrapper-has-seen-bar-py
+    fi
+    ;;
+esac
+
+exec cp "\$@"
+END
+chmod a+x bin/cp
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH;
+
+: > foo.c
+: > bar.py
+: > py-compile
+
+# Help to ensure cp won't try to copy the same file twice.
+chmod a-w foo.c bar.py
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE sanity-check || fatal_ "expected invariants not verified"
+$MAKE distdir
+test -f cp-wrapper-has-seen-foo-c && test -f cp-wrapper-has-seen-bar-py \
+  || fatal_ "our cp wrapper hasn't run correctly"
+
+:
diff --git a/t/distcheck-configure-flags-am.sh 
b/t/distcheck-configure-flags-am.sh
new file mode 100755
index 0000000..7dbe2ab
--- /dev/null
+++ b/t/distcheck-configure-flags-am.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for AM_DISTCHECK_CONFIGURE_FLAGS at "make distcheck"
+# time, and its interactions with DISTCHECK_CONFIGURE_FLAGS.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
+AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
+      [:],
+      [AC_MSG_ERROR([success='$success', sentence='$sentence'])])
+AC_OUTPUT
+END
+
+unset sentence || :
+
+cat > Makefile.am << 'END'
+AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
+dc_flags1 = --enable-success sentence='it works :-)'
+dc_flags2 =
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
+$FGREP '$(AM_DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
+grep 'DISTCHECK_CONFIGURE_FLAGS.*AM_DISTCHECK_CONFIGURE_FLAGS' Makefile.in \
+  && Exit 1
+
+$AUTOCONF
+./configure --enable-success sentence='it works :-)'
+
+# The configure call in "make distcheck" should honour
+# $(AM_DISTCHECK_CONFIGURE_FLAGS).
+
+$MAKE distcheck
+
+# $(DISTCHECK_CONFIGURE_FLAGS) takes precedence over
+# $(AM_DISTCHECK_CONFIGURE_FLAGS)
+
+cat >> Makefile.am << 'END'
+dc_flags2 += --disable-success
+END
+$AUTOMAKE Makefile
+./config.status Makefile
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+grep "^configure:.* success='no', sentence='it works :-)'" output
+
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes"
+
+:
diff --git a/t/distcheck-configure-flags-subpkg.sh 
b/t/distcheck-configure-flags-subpkg.sh
new file mode 100755
index 0000000..45d0e0c
--- /dev/null
+++ b/t/distcheck-configure-flags-subpkg.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check AM_DISTCHECK_CONFIGURE_FLAGS and DISTCHECK_CONFIGURE_FLAGS
+# are not honored in a subpackage Makefile.am, but the flags from
+# AM_DISTCHECK_CONFIGURE_FLAGS and DISTCHECK_CONFIGURE_FLAGS are
+# passed down to the configure script of the subpackage.  This is
+# explicitly documented in the manual.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SUBDIRS([subpkg])
+if test $dc != ok || test $am_dc != ok; then
+  AC_MSG_ERROR([dc=$dc am_dc=$dc])
+fi
+AC_OUTPUT
+END
+
+mkdir subpkg
+
+sed <configure.ac >subpkg/configure.ac \
+    -e 's/^AC_INIT.*/AC_INIT([subpkg], [2.0])/' \
+    -e '/^AC_CONFIG_SUBDIRS/d' \
+
+cat configure.ac
+cat subpkg/configure.ac
+
+dc=KO am_dc=KO; export dc am_dc
+
+cat > Makefile.am << 'END'
+AM_DISTCHECK_CONFIGURE_FLAGS = am_dc=ok
+DISTCHECK_CONFIGURE_FLAGS = dc=ok
+END
+
+: > subpkg/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+cd subpkg
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+cd ..
+
+# For debugging.
+$FGREP 'DISTCHECK_CONFIGURE_FLAGS' Makefile.in subpkg/Makefile.in
+
+grep '^AM_DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
+grep '^DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
+$EGREP '^(AM_)?DISTCHECK_CONFIGURE_FLAGS' subpkg/Makefile.in && Exit 1
+
+./configure dc=ok am_dc=ok
+
+# Flags in $(DISTCHECK_CONFIGURE_FLAGS) and $(AM_DISTCHECK_CONFIGURE_FLAGS)
+# should be passed down to the subpackage configure when "make distcheck"
+# is run from the top-level package ...
+$MAKE distcheck
+
+# ... but not when "make distcheck" is run from the subpackage.
+cd subpkg
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+grep '^configure:.* dc=KO am_dc=KO' output
+
+:
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
new file mode 100755
index 0000000..ae9fe40
--- /dev/null
+++ b/t/distcheck-configure-flags.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for DISTCHECK_CONFIGURE_FLAGS at "make distcheck" time.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
+AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
+      [:],
+      [AC_MSG_ERROR([success='$success', sentence='$sentence'])])
+AC_OUTPUT
+END
+
+unset sentence || :
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
+
+$AUTOCONF
+./configure --enable-success sentence='it works :-)'
+
+# It should be ok to define DISTCHECK_CONFIGURE_FLAGS either on the
+# make command line or in the environment.
+
+env DISTCHECK_CONFIGURE_FLAGS='--enable-success sentence=it\ works\ :-\)' \
+  $MAKE distcheck # Not 'make -e' here, deliberately.
+
+$MAKE distcheck \
+  DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes sentence='it works :-)'"
+
+# Sanity check.
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+grep "^configure:.* success='no', sentence=''" output
+
+:
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
new file mode 100755
index 0000000..dfc2001
--- /dev/null
+++ b/t/distcheck-hook.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check basic support for distcheck-hook.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+distcheck-hook:
+       ls -l $(distdir)
+       chmod u+w $(distdir)
+       : > $(distdir)/dc-hook-has-run
+       chmod a-w $(distdir)
+check-local:
+       ls -l $(srcdir)
+       test -f $(srcdir)/dc-hook-has-run
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP 'distcheck-hook' Makefile.in
+$FGREP '$(MAKE) $(AM_MAKEFLAGS) distcheck-hook' Makefile.in
+grep '^distcheck-hook:' Makefile.in
+
+$AUTOCONF
+./configure
+
+$MAKE
+$MAKE check && Exit 1
+$MAKE distdir
+test -f $distdir/dc-hook-has-run && Exit 1
+$MAKE distcheck
+
+:
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
new file mode 100755
index 0000000..93446b3
--- /dev/null
+++ b/t/distcheck-hook2.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that no 'distcheck-hook' target is created automatically by
+# Automake, and that a used-defined 'distcheck-hook' is *not* honored
+# in a subpackage Makefile.am.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SUBDIRS([subpkg])
+AC_OUTPUT
+END
+
+mkdir subpkg
+
+cat > subpkg/configure.ac << 'END'
+AC_INIT([subpkg], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+distcheck-hook:
+       ls -l $(distdir)
+       chmod u+w $(distdir)
+       : > $(distdir)/dc-hook-has-run
+       chmod a-w $(distdir)
+check-local:
+       ls -l $(srcdir)
+       test -f $(srcdir)/dc-hook-has-run
+END
+
+cat > subpkg/Makefile.am <<'END'
+check-local:
+       ls -l $(srcdir)
+       test ! -r $(srcdir)/dc-hook-has-run
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+cd subpkg
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+cd ..
+
+# For debugging.
+$FGREP 'distcheck-hook' Makefile.in subpkg/Makefile.in
+
+$FGREP 'distcheck-hook' subpkg/Makefile.in && Exit 1
+$FGREP '$(MAKE) $(AM_MAKEFLAGS) distcheck-hook' Makefile.in
+grep '^distcheck-hook:' Makefile.in
+
+./configure
+
+$MAKE
+$MAKE check && Exit 1
+cd subpkg
+$MAKE check
+cd ..
+$MAKE distcheck
+
+:
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
new file mode 100755
index 0000000..e583be1
--- /dev/null
+++ b/t/distcheck-missing-m4.sh
@@ -0,0 +1,118 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that we can define a distcheck-hook to diagnose m4 files
+# missing from the dist tarball (interaction with '--install').
+# See automake bug#9037.
+
+. ./defs || Exit 1
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+
+cp "$am_testauxdir"/distcheck-hook-m4.am . \
+  || fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
+
+cat > Makefile.am << 'END'
+## The lack of '--install' here is meant.
+ACLOCAL_AMFLAGS = -I m4
+include $(srcdir)/distcheck-hook-m4.am
+END
+
+cat >> configure.ac << 'END'
+dnl We *deliberately* don't use m4_pattern_forbid here.
+AC_OUTPUT
+MY_FOO
+MY_BAR
+MY_BAZ
+MY_ZAR
+END
+
+mkdir m4 acdir acdir1 acdir2 pth
+
+cat > acdir/dirlist << END
+$cwd/acdir1
+$cwd/acdir2
+END
+
+echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
+echo 'AC_DEFUN([MY_BAR], [:])' > acdir1/bar.m4
+echo 'AC_DEFUN([MY_BAZ], [:])' > acdir1/baz.m4
+echo 'AC_DEFUN([MY_QUX], [:])' > acdir2/qux.m4
+echo 'AC_DEFUN([MY_ZAR], [:])' > pth/zar.m4
+echo 'AC_DEFUN([MY_BLA], [:])' > pth/bla.m4
+
+ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
+ACLOCAL_PATH=$cwd/pth; export ACLOCAL_PATH
+
+# We don't use '--install' here.  Our distcheck-hook should catch this.
+$ACLOCAL -I m4
+$AUTOCONF
+$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && Exit 1 # Sanity check.
+$AUTOMAKE
+
+check_no_spurious_error ()
+{
+  $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
+  # On failure, some make implementations (such as Solaris make) print the
+  # whole failed recipe on stdout.  The first grep works around this.
+  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
+  : To placate 'set -e'.
+}
+
+./configure
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+for x in bar baz zar; do
+  $EGREP "required m4 file.*not distributed.* $x.m4( |$)" output
+done
+check_no_spurious_error
+
+# Now we use '--install', and "make distcheck" should pass.
+$ACLOCAL -I m4 --install
+test -f m4/bar.m4 # Sanity check.
+test -f m4/baz.m4 # Likewise.
+test -f m4/zar.m4 # Likewise.
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+# We start to use new "third-party" macros from new .m4 files, but forget
+# to re-run "aclocal --install" by hand, relying on automatic remake rules.
+# Our distcheck-hook should catch this too.
+cat >> configure.ac << 'END'
+MY_QUX
+MY_BLA
+END
+
+$MAKE
+$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && Exit 1 # Sanity check.
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+$EGREP "required m4 file.*not distributed.* qux.m4( |$)" output
+$EGREP "required m4 file.*not distributed.* bla.m4( |$)" output
+check_no_spurious_error
+# Check that we don't complain for files that should have been found.
+$FGREP " (bar|baz|zar).m4" output && Exit 1
+
+# Now we again use '--install', and "make distcheck" should pass.
+$ACLOCAL -I m4 --install
+test -f m4/qux.m4 # Sanity check.
+test -f m4/bla.m4 # Likewise.
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+:
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
new file mode 100755
index 0000000..71ae3dd
--- /dev/null
+++ b/t/distcheck-outdated-m4.sh
@@ -0,0 +1,137 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that we can define a distcheck-hook to diagnose outdated m4
+# files in a dist tarball (interaction with '--install').
+# See automake bug#9037.
+
+. ./defs || Exit 1
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+
+cp "$am_testauxdir"/distcheck-hook-m4.am . \
+  || fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
+
+cat > Makefile.am << 'END'
+## The lack of '--install' here is meant.
+ACLOCAL_AMFLAGS = -I m4
+include $(srcdir)/distcheck-hook-m4.am
+END
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+MY_FOO
+MY_BAR
+MY_BAZ
+END
+
+mkdir m4 acdir
+echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
+echo 'AC_DEFUN([MY_BAR], [:])' > acdir/bar.m4
+cat > acdir/baz.m4 << 'END'
+# serial 1
+AC_DEFUN([MY_BAZ], [:])
+END
+
+ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
+
+# The use of '--install' here won't help when the installed file '.m4'
+# will become out-of-date w.r.t. the one in the system acdir.
+$ACLOCAL -I m4 --install
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distcheck # Sanity check.
+
+check_no_spurious_error ()
+{
+  $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
+  # On failure, some make implementations (such as Solaris make) print the
+  # whole failed recipe on stdout.  The first grep works around this.
+  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
+  : To placate 'set -e'.
+}
+
+# We start to use a new "third-party" macro in a new version
+# of a pre-existing third-party m4 file, but forget to re-run
+# "aclocal --install" by hand, relying on automatic remake
+# rules.  Our distcheck-hook should catch this too.
+echo MY_ZARDOZ >> configure.ac
+
+cat > acdir/baz.m4 << 'END'
+# serial 2
+AC_DEFUN([MY_BAZ], [:])
+AC_DEFUN([MY_ZARDOZ], [:])
+END
+
+$MAKE # Rebuild configure and makefiles.
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+
+$EGREP "required m4 file.* outdated.* baz.m4( |$)" output
+check_no_spurious_error
+# Check that we don't complain for files that aren't outdated.
+$EGREP " (foo|bar).m4" output && Exit 1
+
+# Now we again use '--install' explicitly, and "make distcheck"
+# should pass.
+$ACLOCAL -I m4 --install
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+# Similar to what have been done above, but this time we:
+#  - use ACLOCAL_PATH, and
+#  - do not add the use of a new macro.
+
+echo MY_FNORD >> configure.ac
+
+mkdir pth
+cat > pth/fnord.m4 << 'END'
+# serial 1
+AC_DEFUN([MY_FNORD], [:])
+END
+
+ACLOCAL_PATH="$cwd/pth"; export ACLOCAL_PATH
+
+# The explicit use of '--install' here won't help when the installed file
+# '.m4' will become out-of-date w.r.t. the one in the system acdir.
+$ACLOCAL -I m4 --install
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+# Only increase serial number, without changing the other contents; this
+# is deliberate.
+cat > pth/fnord.m4 << 'END'
+# serial 2
+AC_DEFUN([MY_FNORD], [:])
+END
+
+$MAKE # Rebuild configure and makefiles.
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+$EGREP "required m4 file.* outdated.* fnord.m4( |$)" output
+check_no_spurious_error
+# Check that we don't complain for files that aren't outdated.
+$EGREP " (foo|bar|baz).m4" output && Exit 1
+
+# Now we again use '--install' explicitly, and "make distcheck"
+# should pass.
+$ACLOCAL -I m4 --install
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+:
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
new file mode 100755
index 0000000..746b5f8
--- /dev/null
+++ b/t/distcheck-override-infodir.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we can override ${infodir} while having distcheck still
+# working.  Related to automake bug#9579.
+
+required='makeinfo tex texi2dvi install-info'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+infodir = ${prefix}/blah/blah/foobar
+info_TEXINFOS = main.texi
+## Sanity check.
+installcheck-local:
+       if test x$${infodir+set} != xset; then \
+         ls -l "$(DESTDIR)$(prefix)/blah/blah/foobar/" || exit 1; \
+         test -f "$(DESTDIR)$(prefix)/blah/blah/foobar/dir" || exit 1; \
+       else \
+         ls -l "$(DESTDIR)$$infodir/" || exit 1; \
+         test -f "$(DESTDIR)$$infodir/dir" || exit 1; \
+       fi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure
+$MAKE
+
+$MAKE distcheck
+infodir="`pwd`"/_info $MAKE -e distcheck
+test -f _info/dir || Exit 99 # Sanity check.
+
+:
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
new file mode 100755
index 0000000..1b6a322
--- /dev/null
+++ b/t/distcheck-pr10470.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure "make distcheck" does not experience racy failures on
+# systems (like MinGW/MSYS) that cannot remove a directory "in use"
+# by a process (e.g., that is its "current working directory").
+# See automake bug#10470.
+
+am_parallel_tests=no
+. ./defs || Exit 1
+
+mkdir foo.d
+sh -c "cd foo.d && sleep '4'" &
+# Without this sleep, the "rm -rf foo.d" below would reliably beat
+# the "cd foo.d" in the subshell above, and the test would be always
+# skipped, even on MinGW/MSYS.
+sleep '1'
+rm -rf foo.d && skip_ 'system is able to remove "in use" directories'
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<END
+TESTS = foo.test
+EXTRA_DIST= foo.test
+END
+
+cat > foo.test <<END
+#!/bin/sh
+sleep '4' &
+exit 0
+END
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+# We can build the distribution.
+$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
+cat output
+# Sanity check: verify that our code has hit a problem removing
+# the distdir, but has recovered from it.
+grep "rm:.*$destdir" output || fatal_ "expected code path not covered"
+
+:
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
new file mode 100755
index 0000000..8c78900
--- /dev/null
+++ b/t/distcheck-pr9579.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check against automake bug#9579: distcheck does not always detect
+# incomplete uninstall as advertised.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+# NOTE: the use of 'dir' as the name of the data file installed by hand
+# is deliberate, and enhances coverage -- see definition and comments of
+# lib/am/distdir.am:$(am__distuninstallcheck_listfiles).
+
+cat > Makefile.am << 'END'
+dist_data_DATA = foo
+EXTRA_DIST = dir
+install-data-local:
+       $(MKDIR_P) '$(DESTDIR)$(datadir)'
+       cp '$(srcdir)/dir' '$(DESTDIR)$(datadir)/dir'
+END
+
+: > foo
+: > dir
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure --prefix="`pwd`/inst"
+
+# Sanity checks.
+$MAKE install
+find inst -type f
+test -f inst/share/foo
+test -f inst/share/dir
+# We expect the uninstall target of our Makefile to be definitely broken.
+$MAKE uninstall
+test -f inst/share/dir
+rm -rf inst
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+
+$FGREP 'ERROR: files left after uninstall:' output
+grep '/share/dir *$' output
+
+# A few trickier corner cases.
+
+cat > Makefile.am << 'END'
+EXTRA_DIST = dir
+install-data-local:
+install-data-local:
+       $(MKDIR_P) '$(DESTDIR)$(prefix)/mu/share/info'
+       cp '$(srcdir)/dir' '$(DESTDIR)$(prefix)/mu/share/info'
+       $(MKDIR_P) '$(DESTDIR)$(infodir)/more'
+       cp '$(srcdir)/dir' '$(DESTDIR)$(infodir)/more'
+END
+
+$AUTOMAKE
+./config.status Makefile
+
+# Sanity checks, again.
+$MAKE install
+find inst -type f
+test -f inst/mu/share/info/dir
+test -f inst/share/info/more/dir
+# We expect the uninstall target of our Makefile to be definitely broken.
+$MAKE uninstall
+test -f inst/mu/share/info/dir
+test -f inst/share/info/more/dir
+rm -rf inst
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+
+$FGREP 'ERROR: files left after uninstall:' output
+grep '/mu/share/info/dir *$' output
+grep '/share/info/more/dir *$' output
+
+:
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
new file mode 100755
index 0000000..bbc50f4
--- /dev/null
+++ b/t/distcheck-writable-srcdir.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the user abuse 'distcheck-hook' to ensure his packages
+# is built by "make distcheck" with a writable srcdir.  This goes
+# against the GNU Coding Standards, but some package authors might
+# not care about them too much, and it's nice to support their use
+# case too (since it doesn't cost us anything but this test).
+# See automake bug#10878.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = old
+distcheck-hook:
+       find $(distdir) -exec chmod u+w '{}' ';'
+check-local:
+       test -f $(srcdir)/old
+       test ! -f $(srcdir)/new
+       test ! -r $(srcdir)/new
+## Don't do this in real life, or I'll kill you.
+       echo foo > $(srcdir)/old
+       echo bar > $(srcdir)/new
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+: > old
+$MAKE distcheck
+
+:
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
new file mode 100755
index 0000000..39197d7
--- /dev/null
+++ b/t/distcleancheck.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the suggested 'distcleancheck_listfiles' in the manual works.
+# The example Makefile.am we use is from the FAQ entry 'distcleancheck'.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# This Makefile.am is bogus.  See @node{distcleancheck} in the manual
+# for how to fix it properly.
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+dist_man_MANS = foo.1
+
+# We write './foo.1' inside the rule on purpose, to avoid VPATH rewriting
+# done by some 'make' implementations.
+foo.1: foo$(EXEEXT)
+       echo man page for foo$(EXEEXT) > ./foo.1
+
+## Ignore warnings about overridden variables
+AUTOMAKE_OPTIONS = -Wno-override
+distcleancheck_listfiles = \
+  find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
+       sh '{}' ';'
+END
+
+cat >foo.c <<'END'
+int main () { return 0; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+$MAKE distcheck
+
+# Now ensure that we really needed the override.
+sed '/distcleancheck_listfiles/,$d' Makefile.am > t
+mv -f t Makefile.am
+$AUTOMAKE
+./configure
+$MAKE
+$MAKE distcheck 2>stderr && { cat srderr >&2; Exit 1; }
+cat stderr >&2
+
+grep 'ERROR:.*files left in build directory after distclean' stderr
+grep '^\./foo\.1$' stderr
+
+:
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
new file mode 100755
index 0000000..4da74d0
--- /dev/null
+++ b/t/distcom-subdir.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that if an auxfile (here depcomp) is required
+# by a subdir Makefile.am, it is distributed by that Makefile.am.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([subdir/Makefile])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+END
+
+rm -f depcomp
+mkdir subdir
+
+: > subdir/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+test ! -f depcomp
+
+cat > subdir/Makefile.am << 'END'
+bin_PROGRAMS = foo
+END
+
+: > subdir/foo.c
+
+$AUTOMAKE -a subdir/Makefile
+test -f depcomp
+
+# FIXME: the logic of this check and other similar ones in other
+# FIXME: 'distcom*.test' files should be factored out in a common
+# FIXME: subroutine in 'defs'...
+sed -n -e "
+  /^DIST_COMMON =.*\\\\$/ {
+    :loop
+    p
+    n
+    t clear
+    :clear
+    s/\\\\$/\\\\/
+    t loop
+    s/$/ /
+    s/[$tab ][$tab ]*/ /g
+    p
+    n
+  }" subdir/Makefile.in > dc.txt
+cat dc.txt
+$FGREP ' $(top_srcdir)/depcomp ' dc.txt
+
+./configure
+$MAKE distdir
+test -f $distdir/depcomp
+
+:
diff --git a/t/distcom2.sh b/t/distcom2.sh
new file mode 100755
index 0000000..4b86f92
--- /dev/null
+++ b/t/distcom2.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that depcomp and compile are added to DIST_COMMON.
+# Report from Pavel Roskin.  Report of problems with '--no-force' from
+# Scott James Remnant (Debian #206299)
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_CONFIG_FILES([subdir/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+END
+
+mkdir subdir
+: > subdir/foo.c
+
+cat > subdir/Makefile.am << 'END'
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+foo_CFLAGS = -DBAR
+END
+
+$ACLOCAL
+
+for opt in '' --no-force; do
+
+  $AUTOMAKE $opt --add-missing
+
+  test -f compile
+  test -f depcomp
+
+  for dir in . subdir; do
+    # FIXME: the logic of this check and other similar ones in other
+    # FIXME: 'distcom*.test' files should be factored out in a common
+    # FIXME: subroutine in 'defs'...
+    sed -n -e "
+      /^DIST_COMMON =.*\\\\$/ {
+        :loop
+        p
+        n
+        t clear
+        :clear
+        s/\\\\$/\\\\/
+        t loop
+        s/$/ /
+        s/[$tab ][$tab ]*/ /g
+        p
+        n
+      }" $dir/Makefile.in > $dir/dc.txt
+  done
+
+  cat dc.txt # For debugging.
+  cat subdir/dc.txt # Likewise.
+
+  $FGREP ' $(top_srcdir)/depcomp ' subdir/dc.txt
+  # The 'compile' script will be listed in the DIST_COMMON of the top-level
+  # Makefile because it's required in configure.ac (by AM_PROG_CC_C_O).
+  $FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
+
+done
+
+:
diff --git a/t/distcom3.sh b/t/distcom3.sh
new file mode 100755
index 0000000..34ad709
--- /dev/null
+++ b/t/distcom3.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that non-existing common files are distributed
+# if they are buildable.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+README:
+       echo 'I bet you are reading me.' > README
+END
+
+# Files required by '--gnu'.
+: > NEWS
+: > AUTHORS
+: > ChangeLog
+
+$ACLOCAL
+
+# Should not warn about missing README, since it is a target.
+$AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output; Exit 1; }
+cat output
+grep README output && Exit 1
+
+sed -n -e '/^DIST_COMMON =.*\\$/ {
+   :loop
+   p
+   n
+   t clear
+   :clear
+   s/\\$/\\/
+   t loop
+   p
+   n
+   }' -e '/^DIST_COMMON =/ p' Makefile.in | grep README
+
+
+# Should warn about missing README.
+: > Makefile.am
+AUTOMAKE_fails --add-missing --gnu
+grep 'required file.*README.*not found' stderr
+
+:
diff --git a/t/distcom4.sh b/t/distcom4.sh
new file mode 100755
index 0000000..dc37fcf
--- /dev/null
+++ b/t/distcom4.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config files are distributed, and only once.
+# This tries to distribute a file from a subdirectory, without
+# Makefile in that directory.  distcom5.test performs the same
+# test with a Makefile in the directory.
+# Also make sure that README appears first in DIST_COMMON.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+   AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
+                   [chmod +x tests/autoconf])
+   AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
+                   [chmod +x tests/autoheader])
+   AC_CONFIG_FILES([tests/autom4te:tests/wrapper.in],
+                   [chmod +x tests/autom4te])
+   AC_CONFIG_FILES([tests/autoreconf:tests/wrapper.in],
+                   [chmod +x tests/autoreconf])
+   AC_CONFIG_FILES([tests/autoscan:tests/wrapper.in],
+                   [chmod +x tests/autoscan])
+   AC_CONFIG_FILES([tests/autoupdate:tests/wrapper.in],
+                   [chmod +x tests/autoupdate])
+   AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
+                   [chmod +x tests/ifnames])
+   AC_OUTPUT
+END
+
+mkdir tests
+: > README
+: > tests/wrapper.in
+cat > Makefile.am << 'END'
+.PHONY: test
+test: distdir
+       test -f $(distdir)/tests/wrapper.in
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE test
+
+sed -n -e '/^DIST_COMMON =.*\\$/ {
+   :loop
+   p
+   n
+   t clear
+   :clear
+   s/\\$/\\/
+   t loop
+   p
+   n
+   }' -e '/^DIST_COMMON =/ p' Makefile.in > dc.txt
+
+cat dc.txt # For debugging.
+
+test 1 = `grep tests dc.txt | wc -l`
+grep configure dc.txt
+# README must come first.
+grep 'DIST_COMMON = README' Makefile.in
+
+:
diff --git a/t/distcom5.sh b/t/distcom5.sh
new file mode 100755
index 0000000..adfbe52
--- /dev/null
+++ b/t/distcom5.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config files are distributed, and only once.
+# This tries to distribute a file from a subdirectory, with
+# a Makefile in that directory.  distcom4.test performs the same
+# test without Makefile in the directory.
+
+. ./defs || Exit 1
+
+extract_distcommon ()
+{
+  sed -n -e '/^DIST_COMMON =.*\\$/ {
+    :loop
+    p
+    n
+    t clear
+    :clear
+    s/\\$/\\/
+    t loop
+    p
+    n
+    }' -e '/^DIST_COMMON =/ p' ${1+"$@"}
+}
+
+cat >> configure.ac << 'END'
+   AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
+                   [chmod +x tests/autoconf])
+   AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
+                   [chmod +x tests/autoheader])
+   AC_CONFIG_FILES([tests/autom4te:tests/wrapper.in],
+                   [chmod +x tests/autom4te])
+   AC_CONFIG_FILES([tests/autoreconf:tests/wrapper.in],
+                   [chmod +x tests/autoreconf])
+   AC_CONFIG_FILES([tests/autoscan:tests/wrapper.in],
+                   [chmod +x tests/autoscan])
+   AC_CONFIG_FILES([tests/autoupdate:tests/wrapper.in],
+                   [chmod +x tests/autoupdate])
+   AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
+                   [chmod +x tests/ifnames])
+   AC_CONFIG_FILES([tests/Makefile])
+   AC_OUTPUT
+END
+
+mkdir tests
+: > tests/wrapper.in
+: > tests/Makefile.am
+cat > Makefile.am << 'END'
+SUBDIRS = tests
+.PHONY: test
+test: distdir
+       test -f $(distdir)/tests/wrapper.in
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE test
+
+extract_distcommon Makefile.in > top.txt
+extract_distcommon tests/Makefile.in > inner.txt
+
+# Might be useful for debugging.
+cat top.txt
+cat inner.txt
+
+test 0 = `grep tests top.txt | wc -l`
+test 1 = `grep wrapper inner.txt | wc -l`
+
+:
diff --git a/t/distdir.sh b/t/distdir.sh
new file mode 100755
index 0000000..0657928
--- /dev/null
+++ b/t/distdir.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure subdirs in EXTRA_DIST work.  Also tests to make
+# sure *srcdir is properly handled.  Note that using './', as in
+#   EXTRA_DIST = ./joe
+# does not work portably: it fails with HP-UX and Tru64 make.
+# Also test DISTFILES containing a directory and a file in it,
+# and repeated directories.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+include_HEADERS = some/file another/sub/subsub/file2 yet/another/file3
+EXTRA_DIST = foo/bar joe $(top_srcdir)/woo/doo $(srcdir)/dada \
+            some another/sub yet \
+            some another/sub yet
+
+
+all-local:
+       $(MKDIR_P) another/sub/subsub
+       touch another/sub/subsub/file2
+
+CLEANFILES = another/sub/subsub/file2
+
+check-local:
+       test -f $(srcdir)/foo/bar
+       test -f $(srcdir)/woo/doo
+       test -f $(srcdir)/joe
+       test -f $(srcdir)/dada
+       test -f $(srcdir)/some/file
+       test -f $(srcdir)/another/sub/subsub/file2 \
+       || test -f /another/sub/subsub/file2
+       test -f $(srcdir)/yet/another/file3
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+mkdir foo woo some another another/sub another/sub/subsub yet yet/another
+touch foo/bar joe woo/doo dada some/file another/sub/subsub/file2
+touch yet/another/file3
+
+mkdir build
+cd build
+../configure
+$MAKE distdir
+# Check to make sure 'foo' isn't made in build directory.
+test -d foo && Exit 1
+
+rm -rf $me-1.0
+# Remove the dot from VERSION for the next grep.
+VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir >stdout || :
+cat stdout
+
+# Make sure no './' appear in the directory names.  srcdir is '..', so
+# this also checks that no directory is created in the source tree.
+grep 'MKDIR_P.*\.' stdout && Exit 1
+
+cd ..
+./configure --prefix "`pwd`"
+$MAKE distcheck
+
+:
diff --git a/t/disthook.sh b/t/disthook.sh
new file mode 100755
index 0000000..9804e99
--- /dev/null
+++ b/t/disthook.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'dist-hook' works.  See automake bug#10878.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = write execute removed doc
+
+removed:
+       echo I will be deleted > $@
+DISTCLEANFILES = removed
+
+dist-hook:
+       chmod u+w $(distdir)/write $(distdir)/doc
+       chmod u+x $(distdir)/execute
+       rm -f $(distdir)/removed
+       rm -f $(distdir)/doc/HACKING
+       rm -f $(distdir)/doc/RELEASE-DATE
+       date > $(distdir)/doc/RELEASE-DATE
+       echo all is ok > $(distdir)/write
+
+check-local:
+       ls -l $(srcdir) $(srcdir)/doc
+       test "`cat $(srcdir)/write`" = "all is ok"
+       test -f $(srcdir)/doc/README
+       test -f $(srcdir)/doc/RELEASE-DATE
+       test ! -f $(srcdir)/removed
+       test ! -r $(srcdir)/removed
+       test ! -f $(srcdir)/doc/HACKING
+       test ! -r $(srcdir)/doc/HACKING
+       $(srcdir)/execute
+       $(srcdir)/execute | grep 'I run successfully'
+## Sanity check.
+       echo ok > $(srcdir)/../distcheck-run
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+mkdir doc
+: > doc/README
+: > doc/HACKING
+echo will be clobbered > write
+cat > execute <<'END'
+#!/bin/sh
+echo I run successfully
+END
+
+chmod a-w write
+chmod a-x execute
+
+$MAKE distdir
+ls -l $distdir $distdir/doc
+cd $distdir
+test "`cat write`" = "all is ok"
+test ! -f removed
+test ! -r removed
+test -f doc/README
+test -f doc/RELEASE-DATE
+test ! -f doc/HACING
+test ! -r doc/HACING
+./execute
+./execute | grep 'I run successfully'
+cd ..
+
+
+$MAKE distcheck
+test -f distcheck-run
+
+:
diff --git a/t/distlinks.sh b/t/distlinks.sh
new file mode 100755
index 0000000..08244c0
--- /dev/null
+++ b/t/distlinks.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that distributed symlinks in the source tree will be expanded
+# as regular files in $(distdir).
+
+. ./defs || Exit 1
+
+echo text > file
+
+ln -s file lnk || skip_ "cannot create symlinks to files"
+
+mkdir A
+mkdir B
+echo aaa > A/aaa
+cd B
+ln -s ../A/aaa bbb
+cd ..
+
+echo FooBarBaz > foo
+
+ln -s foo  bar1
+ln -s bar1 bar2
+ln -s bar2 bar3
+
+ln -s "`pwd`/foo" quux
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+echo "me = $me" > Makefile.am # For better failure messages.
+cat >> Makefile.am << 'END'
+EXTRA_DIST = lnk B/bbb bar1 bar2 bar3 quux
+.PHONY: test
+test: distdir
+       ls -l $(distdir) $(distdir)/B
+       fail() { echo "$(me): $$*" >&2; e=1; }; \
+       e=0; \
+       set file lnk A/aaa B/bbb foo quux foo bar1 foo bar2 foo bar3; \
+       while test $$# -ge 2; do \
+         file=$$1; shift; link=$(distdir)/$$1; shift; \
+         test -f $$link || fail "$$link is not a regular file"; \
+         test ! -h $$link || fail "$$link is a symlink"; \
+         diff $$file $$link || fail "$$link differs from $$file"; \
+       done; \
+       exit $$e;
+END
+
+ls -l . A B
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+:
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
new file mode 100755
index 0000000..b7732ca
--- /dev/null
+++ b/t/distlinksbrk.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that distributed broken symlinks cause 'make dist' to fail, and
+# to do so with (mostly) meaningful diagnostic.
+
+. ./defs || Exit 1
+
+# We need, for our broken symlinks, names that make it hard to get false
+# positives when grepping make output to look for them.
+lnk_base=BrknSymlnk
+lnk1=${lnk_base}__001
+lnk2=${lnk_base}__002
+lnka=${lnk_base}__aaa
+lnkb=${lnk_base}__bbb
+
+ln -s nonesuch $lnk1 || skip_ "cannot create broken symlinks"
+
+ln -s "`pwd`/nonesuch" $lnk2
+
+ln -s $lnk1 $lnka
+ln -s $lnka $lnkb
+
+# Sanity checks.  Use 'test -r', since Solaris Sh doesn't grok 'test -e'.
+test ! -r $lnk1
+test ! -r $lnk2
+test ! -r $lnka
+test ! -r $lnkb
+test -h $lnk1
+test -h $lnk2
+test -h $lnka
+test -h $lnkb
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+ls -l # For debugging.
+
+# Don't try to use "make -k", because some botched make implementations
+# (HP-UX, IRIX) might still exit on the first error in this situations.
+for lnk in $lnk1 $lnk2 $lnka $lnkb; do
+  echo "EXTRA_DIST = $lnk" > Makefile.am
+  $AUTOMAKE
+  ./configure
+  # Distribution must fail, with a decent error message.
+  $MAKE distdir >out 2>&1 && { cat out; Exit 1; }
+  cat out
+  $FGREP $lnk out
+done
+
+:
diff --git a/t/distname.sh b/t/distname.sh
new file mode 100755
index 0000000..0ef3cdb
--- /dev/null
+++ b/t/distname.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of names in tar file.
+# From Rainer Orth.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SRCDIR([a.c])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+END
+
+: > a.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --add-missing
+./configure
+$MAKE dist
+
+gzip -d $me-1.0.tar.gz
+tar tf $me-1.0.tar > stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP ./$me-1.0/a.c stdout && Exit 1
+
+:
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
new file mode 100755
index 0000000..2bf6a7c
--- /dev/null
+++ b/t/dmalloc.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Simple checks on the 'AM_WITH_DMALLOC' macro.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_HEADERS([config.h])
+AM_WITH_DMALLOC
+AC_SUBST([LDFLAGS])
+AC_OUTPUT
+END
+
+cat > config.h.in <<'END'
+#undef WITH_DMALLOC
+END
+
+cat > Makefile.am <<'END'
+check-with-dmalloc:
+## The AM_WITH_DMALLOC assumes that the user is a developer, so that
+## he is expected to install and make available the 'dmalloc' library
+## by his own.  So we just check that proper linker and libs flags get
+## added.
+       echo ' ' $(LDFLAGS) ' ' | grep ' -g '
+       echo ' ' $(LIBS) ' ' | grep ' -ldmalloc '
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+cat config.h # For debugging.
+grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
+
+./configure --without-dmalloc
+cat config.h # For debugging.
+grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
+
+./configure --with-dmalloc
+cat config.h # For debugging.
+grep '^# *define  *WITH_DMALLOC  *1 *$' config.h
+$MAKE check-with-dmalloc
+
+:
diff --git a/t/doc-parsing-buglets-colneq-subst.sh 
b/t/doc-parsing-buglets-colneq-subst.sh
new file mode 100755
index 0000000..8ff27f1
--- /dev/null
+++ b/t/doc-parsing-buglets-colneq-subst.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check a documented limitation of the Automake's Makefile parser
+# w.r.t. POSIX variable substitutions used in the name of targets.
+# See Section "General Operation" in the Automake manual.
+# If you cause some parts of this test to fail, chances are that you've
+# improved the Automake parser ;-)
+# See: <http://lists.gnu.org/archive/html/automake/2010-08/msg00074.html>
+# or: 
<http://thread.gmane.org/gmane.comp.sysutils.automake.general/11943/focus=11962>
+
+. ./defs || Exit 1
+
+cat > Makefile.am <<'END'
+$(FOO:=x): bar
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'bad characters.*variable name.*\$(FOO' stderr
+grep ':=.*assignments.*not portable' stderr
+
+:
diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh
new file mode 100755
index 0000000..22c981c
--- /dev/null
+++ b/t/doc-parsing-buglets-tabs.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the documented limitation of the Automake's Makefile parser w.r.t.
+# use of TAB characters; see Section "General Operation" in the Automake
+# manual, and automake bug#8360.
+# If you cause some parts of this test to fail, chances are that you've
+# improved the Automake parser ;-)
+
+. ./defs || Exit 1
+
+cat > Makefile.am <<END
+.PHONY: test
+test: all check
+
+fail:
address@hidden "'\$@ recipe executed'"; exit 1
+
+## This won't be recognized as a target+recipe by Automake.
+all-local${tab}:
address@hidden 1
+
+## This won't be recognized as a target+rdependency by Automake.
+all-local${tab}: fail
+
+just_to_separate: dummy deps
+
+## This won't be recognized as a variable assignment by Automake.
+${tab}bin_PROGRAMS = foo
+END
+
+echo AC_OUTPUT >> configure.ac
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP '$(EXEEEXT)' Makefile.in && Exit 1
+grep 'all:.*all-local' Makefile.in && Exit 1
+grep "^${tab}bin_PROGRAMS = foo" Makefile.in
+
+$AUTOCONF
+./configure
+
+$MAKE test
+
+:
diff --git a/t/dollar.sh b/t/dollar.sh
new file mode 100755
index 0000000..92ed26a
--- /dev/null
+++ b/t/dollar.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# We should support files with '$' characters in their names.
+# Java people need this.
+# PR/317, reported by Eric Siegerman and Philip Fong.
+
+# Require GNU make for this test.  SunOS Make does not support
+# '$$' in a target or a dependency (it outputs the empty string instead).
+required=GNUmake
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'EOF'
+mydir = $(prefix)/my
+dist_my_DATA = hello$$world
+
+check-dist: distdir
+       test -f '$(distdir)/hello$$world'
+EOF
+
+: > 'hello$world'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure --prefix "`pwd`/inst"
+$MAKE install
+test -f 'inst/my/hello$world'
+$MAKE check-dist
diff --git a/t/dollarvar.sh b/t/dollarvar.sh
new file mode 100755
index 0000000..940ef23
--- /dev/null
+++ b/t/dollarvar.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that -Wportability complains about recursive
+# variable expansions and variables containing '$', '$(...)', or
+# '${...}' in the name.  We support recursive variable expansions using
+# the latter two constructs for the 'silent-rules' option, and they are
+# rather widely supported in practice.  OTOH variable definitions
+# containing a '$' on the left hand side of an assignment are not
+# portable in practice, even though POSIX allows them.  :-/
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<'EOF'
+x = 1
+foo$x = 1
+bar$(x) = 1
+baz${x} = 1
+bla = $(foo$x)
+bli = $(foo$(x))
+blo = $(foo${x})
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails -Wportability
+grep 'Makefile.am:2' stderr
+grep 'Makefile.am:3' stderr
+grep 'Makefile.am:4' stderr
+grep 'Makefile.am:5' stderr
+grep 'Makefile.am:6' stderr
+grep 'Makefile.am:7' stderr
+
+# On the other hand, if we allow 'silent-rules' mode, then we need to
+# allow recursive variable expansion, too.
+
+# This should work with the AM_SILENT_RULES macro.
+$sleep
+echo 'AM_SILENT_RULES' >> configure.ac
+
+$ACLOCAL --force
+AUTOMAKE_fails -Wportability
+grep 'Makefile.am:2' stderr
+grep 'Makefile.am:3' stderr
+grep 'Makefile.am:4' stderr
+grep 'Makefile.am:5' stderr
+grep 'Makefile.am:6' stderr && Exit 1
+grep 'Makefile.am:7' stderr && Exit 1
+
+
+:
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
new file mode 100755
index 0000000..cef85bb
--- /dev/null
+++ b/t/dollarvar2.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that -Wportability turns on portability-recursive,
+# likewise for -Wno-...
+
+. ./defs || Exit 1
+
+#
+# First, try a setup where we have a 'portability-recursive' warning,
+# but no "simple" 'portability' warning.
+#
+
+cat >Makefile.am <<'EOF'
+x = 1
+bla = $(foo$(x))
+EOF
+
+$ACLOCAL
+
+# Enabling 'portability' warnings should enable 'portability-recursive'
+# warnings.
+AUTOMAKE_fails -Wnone -Wportability
+grep 'recursive variable expansion' stderr
+# 'portability-recursive' warnings can be enabled by themselves.
+AUTOMAKE_fails -Wnone -Wportability-recursive
+grep 'recursive variable expansion' stderr
+
+# Various ways to disable 'portability-recursive'.
+$AUTOMAKE -Wno-all
+$AUTOMAKE -Wno-portability
+$AUTOMAKE -Wall -Wno-portability-recursive
+
+# '-Wno-portability-recursive' after '-Wportability' correctly disables
+# 'portability-recursive' warnings.
+$AUTOMAKE -Wportability -Wno-portability-recursive
+
+# '-Wno-portability' disables 'portability-recursive' warnings; but
+# a later '-Wportability-recursive' re-enables them.  This time, we
+# use AUTOMAKE_OPTIONS to specify the warning levels.
+echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
+$AUTOMAKE
+echo 'AUTOMAKE_OPTIONS += -Wportability-recursive' >> Makefile.am
+AUTOMAKE_fails
+grep 'recursive variable expansion' stderr
+
+#
+# Now try a setup where we have both a 'portability' warning and
+# a 'portability-recursive' one.
+#
+
+cat >Makefile.am <<'EOF'
+x = 1
+bla = $(foo$(x))
+noinst_PROGRAMS = foo
+foo_CPPFLAGS = -Dwhatever
+EOF
+
+echo AC_PROG_CC >> configure.ac
+
+$ACLOCAL --force
+
+# Can disable both 'portability' and 'portability-recursive' warnings.
+$AUTOMAKE -Wno-portability
+
+# Disabling 'portability-recursive' warnings should not disable
+# 'portability' warnings.
+AUTOMAKE_fails -Wportability -Wno-portability-recursive
+grep AM_PROG_CC_C_O stderr
+grep 'recursive variable expansion' stderr && Exit 1
+
+# Enabling 'portability-recursive' warnings should not enable
+# all the 'portability' warning.
+AUTOMAKE_fails -Wno-portability -Wportability-recursive
+grep AM_PROG_CC_C_O stderr && Exit 1
+grep 'recursive variable expansion' stderr
+
+:
diff --git a/t/double.sh b/t/double.sh
new file mode 100755
index 0000000..7f353b7
--- /dev/null
+++ b/t/double.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure listing a program twice is ok.
+# Report from Manu Rouat.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/dup2.sh b/t/dup2.sh
new file mode 100755
index 0000000..d405828
--- /dev/null
+++ b/t/dup2.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure aclocal only warns about definitions overridden by acinclude.m4.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_FUNC_STRTOD
+END
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([AM_FUNC_STRTOD])
+END
+
+$ACLOCAL
diff --git a/t/else.sh b/t/else.sh
new file mode 100755
index 0000000..74d2158
--- /dev/null
+++ b/t/else.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure line numbers are correct in some error reports.
+
+. ./defs || Exit 1
+
+echo 'AM_CONDITIONAL(FOO, true)' >> configure.ac
+
+cat > Makefile.am << 'END'
+# Flag to tell us if apache dir is a source distribution.
+APACHE_DIR_IS_SRC = @APACHE_DIR_IS_SRC@
+
+# We only need to descend into the c dir if we're doing a 1.3 DSO
+# configuration.
+ifeq ("${APACHE_DIR_IS_SRC}","yes")
+SUBDIRS = java
+else
+SUBDIRS = c java
+endif
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:8:.*else without if' stderr
diff --git a/t/empty.sh b/t/empty.sh
new file mode 100755
index 0000000..795f922
--- /dev/null
+++ b/t/empty.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug where if the list of installables is empty, invalid sh
+# code is generated.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >>configure.ac
+echo 'data_DATA =' >Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure --prefix "`pwd`/inst"
+$MAKE install
diff --git a/t/empty2.sh b/t/empty2.sh
new file mode 100755
index 0000000..7d12423
--- /dev/null
+++ b/t/empty2.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure empty _SOURCES suppresses assumption about default
+# name.  Report from Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = pavel
+pavel_SOURCES =
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'pavel\.[co]' Makefile.in && Exit 1
+Exit 0
diff --git a/t/empty3.sh b/t/empty3.sh
new file mode 100755
index 0000000..6aabfba
--- /dev/null
+++ b/t/empty3.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# A test for missing _SOURCES variable.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = pavel
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'pavel\.[co]' Makefile.in
diff --git a/t/empty4.sh b/t/empty4.sh
new file mode 100755
index 0000000..8106426
--- /dev/null
+++ b/t/empty4.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure empty _SOURCES works.
+# From Paul Berrevoets.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_SUBST(ZOO_OBJ)
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = zoo
+zoo_SOURCES =
+EXTRA_zoo_SOURCES = bar.c foo.c
+zoo_DEPENDENCIES = $(ZOO_OBJ)
+zoo_LDADD = $(zoo_DEPENDENCIES)
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP zoo. Makefile.in && Exit 1
+Exit 0
diff --git a/t/exdir.sh b/t/exdir.sh
new file mode 100755
index 0000000..6e048d2
--- /dev/null
+++ b/t/exdir.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure new extended directory mechanism works.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+htmldir = $(prefix)/html
+html_DATA = zot.html
+pkgdata_DATA = qbert
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^DATA' Makefile.in | grep html
diff --git a/t/exdir2.sh b/t/exdir2.sh
new file mode 100755
index 0000000..ddaac58
--- /dev/null
+++ b/t/exdir2.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure undefined directories are invalid.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+quuz_DATA = zot.html
+pkgdata_DATA = qbert
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'pkgdatadir' stderr && Exit 1
+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr
diff --git a/t/exdir3.sh b/t/exdir3.sh
new file mode 100755
index 0000000..672548c
--- /dev/null
+++ b/t/exdir3.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure pkgdatadir can be overridden via AC_SUBST.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_SUBST([pkgdatadir], ["FOO"])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+showme:
+       @echo $(pkgdatadir)
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE showme | grep FOO
diff --git a/t/exeext.sh b/t/exeext.sh
new file mode 100755
index 0000000..42fa574
--- /dev/null
+++ b/t/exeext.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure '.' in an exe name doesn't fool us.
+# Report from Robert Collins.
+# Also make sure we rewrite conditionals variables.
+# Also check for PR/352.
+# Also make sure the old definitions of bin_PROGRAMS and friend
+# aren't left around.  Report from Jim Meyering.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([WANT_MT], [test -z "$revert"])
+AM_CONDITIONAL([WANT_RMT], [test -z "$revert"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+## Use a different dir for each to make grep easy.
+bin_PROGRAMS = maude
+sbin_PROGRAMS = maude.static
+## We don't define this one for now.  Probably it is an error.
+## noinst_PROGRAMS = maude2.exe
+check_PROGRAMS = maude3$(EXEEXT)
+
+if WANT_MT
+  bin_PROGRAMS += mt
+endif
+if WANT_RMT
+  libexec_PROGRAMS = rmt
+endif
+
+print:
+       @echo 1BEG: $(bin_PROGRAMS) :END1
+       @echo 2BEG: $(sbin_PROGRAMS) :END2
+       @echo 3BEG: $(check_PROGRAMS) :END3
+       @echo 4BEG: $(libexec_PROGRAMS) :END4
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+grep '^maude$(EXEEXT):' Makefile.in
+grep '^maude\.static$(EXEEXT):' Makefile.in
+grep '^maude3$(EXEEXT):' Makefile.in
+grep '^mt$(EXEEXT):' Makefile.in
+grep '^rmt$(EXEEXT):' Makefile.in
+test `grep '^bin_PROGRAMS =' Makefile.in | wc -l` = 1
+
+# Make sure $(EXEEXT) gets stripped before canonicalization.
+grep 'maude3__EXEEXT__OBJECTS' Makefile.in && Exit 1
+
+./configure
+
+EXEEXT=.foo $MAKE -e print > stdout
+cat stdout
+
+grep '1BEG: maude.foo mt.foo :END1' stdout
+grep '2BEG: maude.static.foo :END2' stdout
+grep '3BEG: maude3.foo :END3' stdout
+grep '4BEG: rmt.foo :END4' stdout
+
+./configure revert=yes
+
+EXEEXT=.foo $MAKE -e print > stdout
+cat stdout
+
+grep '1BEG: maude.foo :END1' stdout
+grep '2BEG: maude.static.foo :END2' stdout
+grep '3BEG: maude3.foo :END3' stdout
+grep '4BEG: :END4' stdout
diff --git a/t/exeext2.sh b/t/exeext2.sh
new file mode 100755
index 0000000..3315ad8
--- /dev/null
+++ b/t/exeext2.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure no-exeext option works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = maude
+
+maude:
+       yeah
+END
+
+$ACLOCAL
+
+$AUTOMAKE -Wnone
+AUTOMAKE_fails -Wnone -Wobsolete
+grep 'deprecated.*maude' stderr
+AUTOMAKE_fails -Wall
+grep 'deprecated.*maude' stderr
+grep 'overrid.*maude' stderr
+
+echo 'AUTOMAKE_OPTIONS = no-exeext' >> Makefile.am
+
+$AUTOMAKE -Wall -Wno-override
diff --git a/t/exeext3.sh b/t/exeext3.sh
new file mode 100755
index 0000000..1bc1a10
--- /dev/null
+++ b/t/exeext3.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we can override a program rule.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = maude 3dldf
+
+maude$(EXEEXT):
+       yeah
+
+3dldf$(EXEEXT):
+       yippie
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+
+$FGREP 'maude$(EXEEXT):' Makefile.in
+test 1 = `grep 'maude.*:' Makefile.in | wc -l`
+$FGREP '3dldf$(EXEEXT):' Makefile.in
+test 1 = `grep '3dldf.*:' Makefile.in | wc -l`
diff --git a/t/exeext4.sh b/t/exeext4.sh
new file mode 100755
index 0000000..298879d
--- /dev/null
+++ b/t/exeext4.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure $(EXEEXT) is appended to programs and to tests that are
+# programs, but not to @address@hidden
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [test -n "$cond"])
+AC_SUBST([programs], ['prg1$(EXEEXT) prg2$(EXEEXT)'])
+AC_SUBST([CC], [whocares])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+EXEEXT = .x
+if COND
+  BAR = bar
+  DEP = bar
+  BAZE = baz$(EXEEXT)
+  BAZ = baz $(DEP)
+endif
+bin_PROGRAMS = $(programs) @programs@ prg3 $(BAR) $(BAZE)
+EXTRA_PROGRAMS = prg1 prg2 prg3
+TESTS = prg1 prg3 prg4 $(BAZ)
+
+.PHONY: test-cond test-nocond
+test-nocond:
+       is $(bin_PROGRAMS) == prg1.x prg2.x prg1.x prg2.x prg3.x
+       is $(EXTRA_PROGRAMS) == prg1.x prg2.x prg3.x
+       is $(TESTS) == prg1.x prg3.x prg4
+test-cond:
+       is $(bin_PROGRAMS) == prg1.x prg2.x prg1.x prg2.x prg3.x bar.x baz.x
+       is $(EXTRA_PROGRAMS) == prg1.x prg2.x prg3.x
+       is $(TESTS) == prg1.x prg3.x prg4 baz.x bar.x
+       is $(BAR) $(BAZ) == bar baz bar
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing --copy
+
+./configure
+$MAKE test-nocond
+
+./configure cond=yes
+$MAKE test-cond
+
+# Only two am__EXEEXT_* variables are needed here: one for BAR, and one
+# BAZ.  The latter must use the former.
+test 2 = `grep '__EXEEXT_. =' Makefile.in | wc -l`
+grep 'am__EXEEXT_2 = .*am__EXEEXT_1' Makefile.in
+
+:
diff --git a/t/exsource.sh b/t/exsource.sh
new file mode 100755
index 0000000..15b274f
--- /dev/null
+++ b/t/exsource.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure EXTRA_..._SOURCES actually works.
+# Bug report from Henrik Frystyk Nielsen.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = www
+www_SOURCES = www.c
+EXTRA_www_SOURCES = xtra.c
+www_LDADD = @extra_stuff@
+END
+
+: > www.c
+: > xtra.c
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '@am__include@ .*/xtra\.P' Makefile.in
diff --git a/t/ext.sh b/t/ext.sh
new file mode 100755
index 0000000..dd92e85
--- /dev/null
+++ b/t/ext.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure extensions are set correctly for various languages.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+AC_PROG_FC
+AC_PROG_OBJC
+AM_PROG_UPC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = 1.f 2.for 3.f90 4.f95 5.F 6.F90 7.F95 8.r 9.m 10.upc
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+for ext in f for f90 f95 F F90 F95 r m upc
+do
+   # Some versions of the BSD shell wrongly exit when 'set -e' is active
+   # if the last command within a compound statement fails and is guarded
+   # by an && only.  So we play safe and use the following idiom, instead
+   # of the apparently simpler 'grep ... && Exit 1'.
+   if grep "^$ext\.o:" Makefile.in; then Exit 1; else :; fi
+   grep "^\.$ext\.o:" Makefile.in
+done
+Exit 0
diff --git a/t/ext2.sh b/t/ext2.sh
new file mode 100755
index 0000000..3df0282
--- /dev/null
+++ b/t/ext2.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for a bug reported by Ladislav Strojil.
+# Using different extensions for the same language should not
+# output the build rules several times.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CXX
+EOF
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = p q r
+p_SOURCES = a.cc b.cpp c.cxx
+q_SOURCES = sub/d.cc sub/e.cpp sub/f.cxx
+r_SOURCES = g.cc h.cpp i.cxx
+r_CXXFLAGS = -DFOO
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '\.o:' Makefile.in > rules
+cat rules
+
+# Here is an example of bogus output.  The rules are output several
+# times.
+#|  .cc.o:
+#|  d.o: sub/d.cc
+#|  e.o: sub/e.cpp
+#|  f.o: sub/f.cxx
+#|  r-g.o: g.cc
+#|  r-h.o: h.cpp
+#|  r-i.o: i.cxx
+#|  .cpp.o:
+#|  d.o: sub/d.cc
+#|  e.o: sub/e.cpp
+#|  f.o: sub/f.cxx
+#|  r-g.o: g.cc
+#|  r-h.o: h.cpp
+#|  r-i.o: i.cxx
+#|  .cxx.o:
+#|  #d.o: sub/d.cc
+#|  #e.o: sub/e.cpp
+#|  #f.o: sub/f.cxx
+#|  #r-g.o: g.cc
+#|  #r-h.o: h.cpp
+#|  #r-i.o: i.cxx
+
+# Bail out if we find a duplicate.
+$PERL -ne 'if (exists $a{$_}) { exit 1 } else { $a{$_} = 1 }' < rules
diff --git a/t/ext3.sh b/t/ext3.sh
new file mode 100755
index 0000000..bd5ed6d
--- /dev/null
+++ b/t/ext3.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Cover corner cases of derive_suffix wrt. file extensions:
+# - extension declared with SUFFIXES but with no suffix rule for it
+# - extension with a suffix rule but none that leads us to $(OBJEXT)
+# In both cases, we don't try to create a rule; but we shouldn't
+# fail either, because magic might be happening behind our back.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = foo.goo
+SUFFIXES = .goo
+bar_SOURCES = bar.woo
+.woo.zoo: ; making a zoo $@ from a woo $<
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+Exit 0
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
new file mode 100755
index 0000000..3ad6375
--- /dev/null
+++ b/t/extra-portability.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check interactions between the 'portability' and 'extra-portability'
+# warning categories:
+#   1. '-Wextra-portability' must imply '-Wportability'.
+#   2. '-Wno-portability' must imply '-Wno-extra-portability'.
+#   3. '-Wall' must imply '-Wextra-portability'.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+cat >>configure.ac <<END
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+$ACLOCAL
+
+#
+# First, a setup where only an extra-portability warning is present
+# (no "simple" portability-warnings are).
+#
+
+cat >Makefile.am <<END
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = sub/foo.c
+END
+
+# Sanity check: extra-portability warnings causes the expected error.
+AUTOMAKE_fails -Wextra-portability
+grep 'requires.*AM_PROG_AR' stderr
+
+# Warnings in extra-portability category are not enabled by default.
+$AUTOMAKE
+
+# -Wall enables extra-portability.
+AUTOMAKE_fails -Wall
+grep 'requires.*AM_PROG_AR' stderr
+
+# Disabling portability disables extra-portability as well.
+$AUTOMAKE -Wextra-portability -Wno-portability
+$AUTOMAKE -Wall -Wno-portability
+
+#
+# Now, a setup where also a "simple" portability warning is present.
+#
+
+# Per-target flags require the use of AM_PROG_CC_C_O in configure.ac.
+echo libfoo_a_CPPFLAGS = -Dwhatever >> Makefile.am
+
+# Enabling extra-portability enables portability as well ...
+AUTOMAKE_fails -Wextra-portability
+grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'requires.*AM_PROG_AR' stderr
+# ... even if it had been previously disabled.
+AUTOMAKE_fails -Wno-portability -Wextra-portability
+grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'requires.*AM_PROG_AR' stderr
+
+# Disabling extra-portability leaves portability intact (1).
+AUTOMAKE_fails -Wportability -Wno-extra-portability
+grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'requires.*AM_PROG_AR' stderr && Exit 1
+# Disabling extra-portability leaves portability intact (2).
+AUTOMAKE_fails -Wall -Wno-extra-portability
+grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'requires.*AM_PROG_AR' stderr && Exit 1
+
+# Enabling portability does not enable extra-portability.
+AUTOMAKE_fails -Wportability
+grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'requires.*AM_PROG_AR' stderr && Exit 1
+
+# Disabling portability disables extra-portability.
+$AUTOMAKE -Wno-portability
+$AUTOMAKE -Wextra-portability -Wno-portability
+$AUTOMAKE -Wall -Wno-portability
+
+:
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
new file mode 100755
index 0000000..2d33008
--- /dev/null
+++ b/t/extra-portability2.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that extra-portability warnings are not enabled by --gnits,
+# --gnu and --foreign.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+cat >>configure.ac <<END
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+
+# Make sure the test is useful.
+AUTOMAKE_fails -Wextra-portability \
+  || fatal_ "setup doesn't trigger 'extra-portability' warnings"
+
+$AUTOMAKE --foreign
+
+touch INSTALL NEWS README AUTHORS ChangeLog COPYING # Satisfy --gnu.
+$AUTOMAKE --gnu
+
+touch THANKS # Satisfy also --gnits.
+$AUTOMAKE --gnits
+
+:
diff --git a/t/extra-portability3.sh b/t/extra-portability3.sh
new file mode 100755
index 0000000..13d6084
--- /dev/null
+++ b/t/extra-portability3.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check interactions between the 'portability-recursive' and
+# 'extra-portability' warning categories.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+cat >>configure.ac <<END
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+$ACLOCAL
+
+cat >Makefile.am <<'END'
+baz = $(foo$(bar))
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+# 'extra-portability' implies 'portability-recursive'.
+AUTOMAKE_fails -Wextra-portability
+grep 'requires.*AM_PROG_AR' stderr
+grep 'recursive variable expansion' stderr
+
+# We can disable 'extra-portability' while leaving
+# 'portability-recursive' intact.
+AUTOMAKE_fails -Wportability-recursive -Wno-extra-portability
+grep 'requires.*AM_PROG_AR' stderr && Exit 1
+grep 'recursive variable expansion' stderr
+
+# We can disable 'portability-recursive' while leaving
+# 'extra-portability' intact.
+AUTOMAKE_fails -Wextra-portability -Wno-portability-recursive
+grep 'requires.*AM_PROG_AR' stderr
+grep 'recursive variable expansion' stderr && Exit 1
+
+# Disabling 'portability' disables 'portability-recursive' and
+# 'extra-portability'.
+$AUTOMAKE -Wextra-portability -Wno-portability
+
+:
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
new file mode 100755
index 0000000..37e1a2b
--- /dev/null
+++ b/t/extra-programs-empty.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that EXTRA_PROGRAMS doesn't get removed because it is empty.
+# This check has been introduced in commit 'Release-1-9-254-g9d0eaef'
+# into the former test 'subst2.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([Makefile2 Makefile3])
+AC_SUBST([prog])
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+EXTRA_PROGRAMS =
+END
+
+cat > Makefile2.am <<'END'
+bin_PROGRAMS = a @prog@ b
+EXTRA_PROGRAMS =
+END
+
+cat > Makefile3.am <<'END'
+empty =
+EXTRA_PROGRAMS = $(empty)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^EXTRA_PROGRAMS = *$' Makefile.in
+grep '^EXTRA_PROGRAMS = *$' Makefile2.in
+# Be laxer here, since EXTRA_PROGRAMS might be internally rewritten
+# by Automake when it contains references to other variables.
+grep '^EXTRA_PROGRAMS =' Makefile3.in
+
+:
diff --git a/t/extra.sh b/t/extra.sh
new file mode 100755
index 0000000..7bad9ef
--- /dev/null
+++ b/t/extra.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure EXTRA_ targets are generated.  This test used to
+# make sure the targets were *not* generated.  That is wrong; the
+# targets should always be generated.  However, they should not be
+# built by default.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = @foo@
+EXTRA_PROGRAMS = zardoz
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep "^zardoz" Makefile.in
+
+# Can't have EXTRA clean rules.
+grep 'clean.*EXTRA' Makefile.in && Exit 1
+Exit 0
diff --git a/t/extra10.sh b/t/extra10.sh
new file mode 100755
index 0000000..8fe7133
--- /dev/null
+++ b/t/extra10.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that wildcards in EXTRA_DIST are honoured.
+# Suggested by observations from Braden McDaniel.
+# See also sister test 'extra11.test', that check a similar usage
+# with the involvement of the $(wildcard) GNU make builtin.
+
+required=GNUmake
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = *.foo
+.PHONY: test
+test: distdir
+       diff a.foo $(distdir)/a.foo
+       diff b.foo $(distdir)/b.foo
+       test ! -r $(distdir)/c.bar
+check-local:
+       test -f $(srcdir)/a.foo
+       test -f $(srcdir)/b.foo
+       test ! -r $(srcdir)/c.bar
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+echo aaa > a.foo
+echo bbb > b.foo
+echo ccc > c.bar
+./configure
+$MAKE test
+
+:
diff --git a/t/extra11.sh b/t/extra11.sh
new file mode 100755
index 0000000..a645afb
--- /dev/null
+++ b/t/extra11.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for more complex usage of wildcards in EXTRA_DIST.
+# Suggested by observations from Braden McDaniel.
+
+required=GNUmake
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = -Wno-portability
+
+EXTRA_DIST = $(wildcard [!c-z].t d.t [ab].dir foo.* *zardoz*)
+
+.PHONY: prereq
+prereq:
+       echo a > a.t
+       echo b > b.t
+       echo c > c.t
+       echo d > d.t
+       echo m > m.t
+       echo z > z.t
+       mkdir a.dir b.dir c.dir
+       echo a1 > a.dir/f1
+       echo a2 > a.dir/f2
+       echo bb > b.dir/f
+       echo cc > c.dir/x
+       echo 0 > foo
+       echo 1 > foo.x
+       echo 2 > foo.bar
+       echo foo > _zardoz_
+
+.PHONY: test
+test: distdir
+       ls -l $(distdir) $(distdir)/*.dir ;: For debugging.
+       diff a.t $(distdir)/a.t
+       diff b.t $(distdir)/b.t
+       test ! -r $(distdir)/c.t
+       diff d.t $(distdir)/d.t
+       test ! -r $(distdir)/m.t
+       test ! -r $(distdir)/z.t
+       diff a.dir/f1 $(distdir)/a.dir/f1
+       diff a.dir/f2 $(distdir)/a.dir/f2
+       diff b.dir/f $(distdir)/b.dir/f
+       test ! -r $(distdir)/c.dir
+       diff foo.x $(distdir)/foo.x
+       diff foo.bar $(distdir)/foo.bar
+       test ! -r $(distdir)/foo
+       diff _zardoz_ $(distdir)/_zardoz_
+check-local:
+       ls -l . *.dir ;: For debugging.
+       test -f $(srcdir)/a.t
+       test -f $(srcdir)/b.t
+       test ! -r $(srcdir)/c.t
+       test -f $(srcdir)/d.t
+       test ! -r $(srcdir)/m.t
+       test ! -r $(srcdir)/z.t
+       test -f $(srcdir)/a.dir/f1
+       test -f $(srcdir)/a.dir/f2
+       test -f $(srcdir)/b.dir/f
+       test ! -r $(srcdir)/c.dir
+       test -f $(srcdir)/foo.x
+       test -f $(srcdir)/foo.bar
+       test ! -r $(srcdir)/foo
+       test -f $(srcdir)/_zardoz_
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE prereq
+ls -l . *.dir # For debugging.
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/extra12.sh b/t/extra12.sh
new file mode 100755
index 0000000..9794115
--- /dev/null
+++ b/t/extra12.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that wildcards in elements of EXTRA_DIST are honoured when
+# $srcdir != $builddir, if properly declared.
+# Suggested by observations from Braden McDaniel.
+
+required=GNUmake
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = *.foo $(srcdir)/*.foo $(builddir)/*.bar $(srcdir)/*.bar
+
+.PHONY: test
+test: distdir
+       ls -l $(srcdir) $(builddir) $(distdir)
+       diff $(srcdir)/a.foo $(distdir)/a.foo
+       diff $(srcdir)/b.bar $(distdir)/b.bar
+       diff $(builddir)/c.foo $(distdir)/c.foo
+       diff $(builddir)/d.bar $(distdir)/d.bar
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+echo aaa > a.foo
+echo bbb > b.bar
+mkdir build
+echo ccc > build/c.foo
+echo ddd > build/d.bar
+
+cd build
+../configure
+$MAKE test
diff --git a/t/extra2.sh b/t/extra2.sh
new file mode 100755
index 0000000..30eaeed
--- /dev/null
+++ b/t/extra2.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure EXTRA_foo_SOURCES not defined unnecessarily.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep EXTRA_foo_SOURCES Makefile.in && Exit 1
+Exit 0
diff --git a/t/extra3.sh b/t/extra3.sh
new file mode 100755
index 0000000..4065801
--- /dev/null
+++ b/t/extra3.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure EXTRA_DATA not required.
+
+. ./defs || Exit 1
+
+echo 'AC_SUBST(CODICIL)' >> configure.ac
+
+cat > Makefile.am << 'END'
+sysconf_DATA = @CODICIL@
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/extra4.sh b/t/extra4.sh
new file mode 100755
index 0000000..5b31b63
--- /dev/null
+++ b/t/extra4.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure EXTRA_DATA can be specified.
+
+. ./defs || Exit 1
+
+echo 'AC_SUBST(CODICIL)' >> configure.ac
+
+cat > Makefile.am << 'END'
+sysconf_DATA = @CODICIL@
+EXTRA_DATA = codicil.txt
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/extra5.sh b/t/extra5.sh
new file mode 100755
index 0000000..7fdd983
--- /dev/null
+++ b/t/extra5.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure EXTRA_DIST can contain a directory from $buildir.
+# From Dean Povey.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+EXTRA_DIST=foo
+
+foo:
+       mkdir foo
+       touch foo/bar
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+mkdir build
+cd build
+../configure
+$MAKE distdir
diff --git a/t/extra6.sh b/t/extra6.sh
new file mode 100755
index 0000000..6b51211
--- /dev/null
+++ b/t/extra6.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure EXTRA_DIST can contain a directory or
+# a subdirectory, in $(builddir) or $(srcdir).
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+EXTRA_DIST=foo/bar baz foo2/bar2 baz2
+
+check: distdir
+       test -f $(distdir)/foo/bar/baz
+       test -f $(distdir)/baz/foo
+       test -f $(distdir)/foo2/bar2/baz2
+       test -f $(distdir)/baz2/foo2
+END
+
+# Create some files in $(srcdir)
+mkdir foo
+mkdir foo/bar
+touch foo/bar/baz
+mkdir baz
+touch baz/foo
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+mkdir build
+cd build
+../configure
+
+# Create some files in $(builddir)
+mkdir foo2
+mkdir foo2/bar2
+touch foo2/bar2/baz2
+mkdir baz2
+touch baz2/foo2
+
+$MAKE check
diff --git a/t/extra7.sh b/t/extra7.sh
new file mode 100755
index 0000000..4ad7789
--- /dev/null
+++ b/t/extra7.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure that when distdir is invoked in a VPATH
+# configuration and has to distribute directory X, it actually merge
+# $(srcdir)/X and ./X, with the files from the later overriding the
+# files from the former.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+EXTRA_DIST=foo/bar baz
+
+check: distdir
+       test -f $(distdir)/foo/bar/baz
+       test -f $(distdir)/foo/bar/baz2
+       test -f $(distdir)/baz/foo
+       test -f $(distdir)/baz/foo2
+       grep source $(distdir)/foo/bar/baz
+       grep build $(distdir)/foo/bar/baz2
+       grep source $(distdir)/baz/foo
+       grep build $(distdir)/baz/foo2
+END
+
+# Create some files in $(srcdir)
+mkdir foo
+mkdir foo/bar
+echo source > foo/bar/baz
+echo source > foo/bar/baz2
+mkdir baz
+echo source > baz/foo
+echo source > baz/foo2
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+mkdir build
+cd build
+../configure
+
+# Create some files in $(builddir) that will override part of the
+# files if $(srcdir) when the distribution is made.
+mkdir foo
+mkdir foo/bar
+echo build > foo/bar/baz2
+mkdir baz
+echo build > baz/foo2
+
+$MAKE check
diff --git a/t/extra8.sh b/t/extra8.sh
new file mode 100755
index 0000000..9eef189
--- /dev/null
+++ b/t/extra8.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
+# and that referring to the same program with inconsistent addition
+# of $(EXEEXT) works, too.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+cat >Makefile.am <<'END'
+EXTRA_PROGRAMS = foo bar
+bin_PROGRAMS = $(EXTRA_PROGRAMS) baz
+noinst_PROGRAMS = baz$(EXEEXT)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/extra9.sh b/t/extra9.sh
new file mode 100755
index 0000000..b5a6007
--- /dev/null
+++ b/t/extra9.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure we warn about substitutions in bin_PROGRAMS if EXTRA_PROGRAMS
+# are missing; but only if the former is not AC_SUBSTed itself
+# (lib_LIBRARIES is in the same boat here).
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_SUBST([lib_LIBRARIES])
+AC_SUBST([bins])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = @bins@
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'bin_PROGRAMS.*contains configure substitution' stderr
+grep 'lib_LIBRARIES.*contains configure substitution' stderr && Exit 1
+
+Exit 0
diff --git a/t/extradep.sh b/t/extradep.sh
new file mode 100755
index 0000000..77b806a
--- /dev/null
+++ b/t/extradep.sh
@@ -0,0 +1,107 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test EXTRA_*_DEPENDENCIES.  See extradep2 for libtool variant.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_SUBST([deps], [bardep])
+AM_CONDITIONAL([COND], [test -n "$cond"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a
+EXTRA_libfoo_a_DEPENDENCIES = libfoodep
+libfoodep:
+       @echo making $@
+       @: > $@
+CLEANFILES = libfoodep
+
+bin_PROGRAMS = foo bar
+EXTRA_foo_DEPENDENCIES = foodep
+if COND
+EXTRA_foo_DEPENDENCIES += foodep2
+endif
+bar_LDADD = libfoo.a
+EXTRA_bar_DEPENDENCIES = $(deps)
+
+EXTRA_DIST = foodep bardep
+
+.PHONY: bar-has-been-updated
+bar-has-been-updated:
+       stat older bar$(EXEEXT) libfoo.a || : For debugging.
+       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
+END
+
+cat >libfoo.c <<'END'
+int libfoo () { return 0; }
+END
+
+cat >foo.c <<'END'
+int main () { return 0; }
+END
+
+cat >bar.c <<'END'
+extern int libfoo ();
+int main () { return libfoo (); }
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure cond=yes
+
+# Hypotheses:
+#  - EXTRA_*_DEPENDENCIES are honored.
+#  - Conditionals and substitutions are honored.
+#  - *_DEPENDENCIES are not overwritten by their EXTRA_* counterparts.
+
+: >foodep
+: >foodep2
+: >bardep
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'making libfoodep' stdout
+
+rm -f foodep
+$MAKE && Exit 1
+: >foodep
+
+rm -f foodep2
+$MAKE && Exit 1
+: >foodep2
+
+rm -f bardep
+$MAKE && Exit 1
+: >bardep
+
+$MAKE
+: > older
+$sleep
+touch libfoo.a
+$MAKE
+$MAKE bar-has-been-updated
+
+$MAKE distcheck
+
+:
diff --git a/t/extradep2.sh b/t/extradep2.sh
new file mode 100755
index 0000000..91722bd
--- /dev/null
+++ b/t/extradep2.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test EXTRA_*_DEPENDENCIES, libtool version; see extradep.test.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_SUBST([deps], [bardep])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = libfoo.la
+EXTRA_libfoo_la_DEPENDENCIES = libfoodep
+libfoodep:
+       @echo making $@
+       @: > $@
+CLEANFILES = libfoodep
+
+bin_PROGRAMS = bar
+bar_LDADD = libfoo.la
+EXTRA_bar_DEPENDENCIES = $(deps)
+
+EXTRA_DIST = bardep
+
+.PHONY: bar-has-been-updated
+bar-has-been-updated:
+       stat older bar$(EXEEXT) libfoo.la || : For debugging.
+       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
+END
+
+cat >libfoo.c <<'END'
+int libfoo () { return 0; }
+END
+
+cat >bar.c <<'END'
+extern int libfoo ();
+int main () { return libfoo (); }
+END
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+
+# Hypothesis: EXTRA_*_DEPENDENCIES are honored.
+
+: >foodep
+: >foodep2
+: >bardep
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'making libfoodep' stdout
+
+rm -f bardep
+$MAKE && Exit 1
+: >bardep
+
+$MAKE
+: > older
+$sleep
+touch libfoo.la
+$MAKE
+$MAKE bar-has-been-updated
+
+$MAKE distcheck
+
+:
diff --git a/t/f90only.sh b/t/f90only.sh
new file mode 100755
index 0000000..a65a91e
--- /dev/null
+++ b/t/f90only.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure programs with only Fortran 90 source are handled properly.
+# (copied from fonly.test) Mike Nolta <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_FC
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.f90
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'zardoz.f90' Makefile.in
diff --git a/t/flavor.sh b/t/flavor.sh
new file mode 100755
index 0000000..f532406
--- /dev/null
+++ b/t/flavor.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure flavors like 'cygnus', 'gnu', 'gnits' and command line
+# options like '--ignore-deps' and '--silent-rules' are preserved across
+# automake reruns.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+AC_OUTPUT
+END
+
+: > Makefile.am
+: > NEWS
+: > README
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOCONF
+# Order flavors so that all needed files are installed early.
+for flavor in --gnits --gnu --foreign --cygnus --ignore-deps
+do
+  $AUTOMAKE --add-missing $flavor
+  ./configure --enable-maintainer-mode
+  grep " $flavor" Makefile
+  $MAKE
+
+  # Two code paths in configure.am:
+  # - either a file in $(am__configure_deps) has been updated ...
+  $sleep
+  touch aclocal.m4
+  $MAKE
+  grep " $flavor" Makefile
+
+  # - ... or not; i.e., Makefile.am or an included file has.
+  $sleep
+  touch Makefile.am
+  $MAKE
+  grep " $flavor" Makefile
+done
+
+:
diff --git a/t/flibs.sh b/t/flibs.sh
new file mode 100755
index 0000000..4f5701b
--- /dev/null
+++ b/t/flibs.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'AC_F77_LIBRARY_LDFLAGS' works properly.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+AC_F77_LIBRARY_LDFLAGS
+END
+
+# Tue Aug 11 09:50:48 1998  Matthew D. Langston  <address@hidden>
+#
+# This test currently fails with automake v. 1.3 since automake assumes
+# that elements of 'bin_PROGRAMS' (e.g. zardoz) without a corresponding
+# '_SOURCES' (e.g. zardoz_SOURCES) should be compiled from 'zardoz.c'
+# whether or not 'zardoz.c' actually exists.  For example, even if the
+# file 'zardoz.c' doesn't exist but the file 'zardoz.f' does exist, this
+# tests would still fail.
+#
+# Therefore, for now I have put in the line 'zardoz_SOURCES = zardoz.f'
+# (see below) so that automake's top-level 'make check' won't fail, but
+# this line should be removed once automake handles this situation
+# correctly.
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.f
+zardoz_LDADD = @FLIBS@
+END
+
+: > zardoz.f
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '@FLIBS@' Makefile.in
diff --git a/t/fn99.sh b/t/fn99.sh
new file mode 100755
index 0000000..900b36b
--- /dev/null
+++ b/t/fn99.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the filename-length-max=99 option.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = filename-length-max=99
+EXTRA_DIST = 12345678
+END
+
+(for i in 1 2 3 4 5 6 7 8 9; do
+  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+done) || skip_ "failed to create deep directory hierarchy"
+
+# AIX 5.3 'cp -R' is too buggy for 'make dist'.
+cp -R 12345678 t \
+  || skip_ "'cp -R' failed to copy deep directory hierarchy"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+(for i in 1 2 3 4 5 6 7 8 9 10 11; do
+  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+done) || skip_ "failed to create deeper directory hierarchy"
+
+$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'filenames are too long' stderr
+test 2 = `grep 12345678 stderr | wc -l`
+
+:
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
new file mode 100755
index 0000000..beb0261
--- /dev/null
+++ b/t/fn99subdir.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# PR 507: Check the filename-length-max=99 option
+# in conjunction with AC_CONFIG_SUBDIRS.
+
+. ./defs || Exit 1
+
+# The name is so that 99 is exactly hit (including final \0).
+subdirname='cnfsubdir'
+
+cat >>configure.ac <<END
+AC_CONFIG_SUBDIRS([$subdirname])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+AUTOMAKE_OPTIONS = filename-length-max=99
+SUBDIRS = $subdirname
+END
+
+mkdir $subdirname
+
+cat >> $subdirname/configure.ac <<EOF
+AC_INIT([$subdirname], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
+cat >$subdirname/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = filename-length-max=99
+EXTRA_DIST = 12345678
+END
+
+(cd $subdirname || Exit 1
+for i in 1 2 3 4 5 6 7 8; do
+  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+done) || skip_ "failed to create deep directory hierarchy"
+
+# AIX 5.3 'cp -R' is too buggy for 'make dist'.
+cp -R $subdirname t \
+  || skip_ "'cp -R' failed to copy deep directory hierarchy"
+
+cd $subdirname
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+cd ..
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distcheck
+
+(cd $subdirname || Exit 1
+for i in 1 2 3 4 5 6 7 8 9; do
+  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+done) || skip_ "failed to create deeper directory hierarchy"
+
+$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'filenames are too long' stderr
+test 1 = `grep 12345678 stderr | wc -l`
+
+:
diff --git a/t/fnoc.sh b/t/fnoc.sh
new file mode 100755
index 0000000..fbd2135
--- /dev/null
+++ b/t/fnoc.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that pure Fortran 77 sources don't include
+# C-specific code.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.f jane.f
+END
+
+: > doe.f
+: > jane.f
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1
+Exit 0
diff --git a/t/fo.sh b/t/fo.sh
new file mode 100755
index 0000000..50b4f4a
--- /dev/null
+++ b/t/fo.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Fortran 77 files are rewritten to ".o" and not just "o".
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.f
+END
+
+: > doe.f
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/t/fonly.sh b/t/fonly.sh
new file mode 100755
index 0000000..c3ae614
--- /dev/null
+++ b/t/fonly.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure programs with only Fortran 77 source are handled properly.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.f
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'zardoz.f' Makefile.in
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
new file mode 100755
index 0000000..d7d0800
--- /dev/null
+++ b/t/forcemiss.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that 'automake --force-missing' works.
+
+. ./defs || Exit 1
+
+rm -f install-sh
+
+echo zot > install-sh
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE --add-missing --force-missing
+
+ls -l install-sh
+test -f install-sh
+grep zot install-sh && Exit 1
+
+:
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
new file mode 100755
index 0000000..3c75722
--- /dev/null
+++ b/t/forcemiss2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that 'automake --force-missing' works, even with
+# symlinked files.
+
+. ./defs || Exit 1
+
+rm -f install-sh
+
+echo zot > foo
+cp foo foo2
+
+ln -s foo2 install-sh || skip_ "cannot create symlinks to files"
+
+: > Makefile.am
+
+$ACLOCAL
+ls -l install-sh
+$AUTOMAKE --add-missing --force-missing
+ls -l install-sh
+
+test -f install-sh
+grep zot install-sh && Exit 1
+diff foo foo2
+
+:
diff --git a/t/fort1.sh b/t/fort1.sh
new file mode 100755
index 0000000..6bf58fe
--- /dev/null
+++ b/t/fort1.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that Automake suggests using AC_PROG_F77/FC if Fortran sources
+# are used.
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<END
+bin_PROGRAMS = hello
+hello_SOURCES = hello.f foo.f95
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AC_PROG_F77 stderr
+grep AC_PROG_FC stderr
diff --git a/t/fort2.sh b/t/fort2.sh
new file mode 100755
index 0000000..d345592
--- /dev/null
+++ b/t/fort2.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that AC_FC_SRCEXT(f9x) works as intended:
+# - $(FCFLAGS_f) will be used
+
+# Cf. fort1.test and link_f90_only.test.
+
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'END'
+AC_PROG_FC
+AC_FC_SRCEXT([f90])
+AC_FC_SRCEXT([f95])
+AC_FC_SRCEXT([f03])
+AC_FC_SRCEXT([f08])
+AC_FC_SRCEXT([blabla])
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello goodbye
+hello_SOURCES = hello.f90 foo.f95 sub/bar.f95 hi.f03 sub/howdy.f03 greets.f08 
sub/bonjour.f08
+goodbye_SOURCES = bye.f95 sub/baz.f90
+goodbye_FCFLAGS =
+END
+
+$ACLOCAL
+$AUTOMAKE
+# The following tests aren't fool-proof, but they don't
+# need a Fortran compiler.
+grep '.\$(LINK)'       Makefile.in && Exit 1
+grep '.\$(FCLINK)'     Makefile.in
+grep '.\$(FCCOMPILE)'  Makefile.in > stdout
+cat stdout
+grep -v '\$(FCFLAGS_f' stdout && Exit 1
+grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
+# Notice the TAB:
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f90' Makefile.in
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f95).*\.f95' Makefile.in
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f03).*\.f03' Makefile.in
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f08).*\.f08' Makefile.in
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && Exit 1
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && Exit 1
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && Exit 1
+grep '^[       ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && Exit 1
+
+:
diff --git a/t/fort4.sh b/t/fort4.sh
new file mode 100755
index 0000000..a23c9bd
--- /dev/null
+++ b/t/fort4.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test mixing Fortran 77 and Fortran (FC).
+
+# For now, require the GNU compilers (to avoid some Libtool/Autoconf
+# issues).
+required='g77 gfortran'
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >hello.f <<'END'
+      program hello
+      call foo
+      call bar
+      stop
+      end
+END
+
+cat >bye.f90 <<'END'
+program goodbye
+  call baz
+  stop
+end
+END
+
+cat >foo.f90 <<'END'
+      subroutine foo
+      return
+      end
+END
+
+sed s,foo,bar, foo.f90 > sub/bar.f90
+sed s,foo,baz, foo.f90 > sub/baz.f
+
+cat >>configure.ac <<'END'
+AC_PROG_F77
+AC_PROG_FC
+AC_FC_SRCEXT([f90], [],
+  [AC_MSG_FAILURE([$FC compiler cannot create executables], 77)])
+AC_FC_LIBRARY_LDFLAGS
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello goodbye
+hello_SOURCES = hello.f foo.f90 sub/bar.f90
+goodbye_SOURCES = bye.f90 sub/baz.f
+goodbye_FCFLAGS =
+LDADD = $(FCLIBS)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+# The Fortran 77 linker should be preferred:
+grep '.\$(FCLINK)' Makefile.in && Exit 1
+
+$AUTOCONF
+# ./configure may exit with status 77 if no compiler is found,
+# or if the compiler cannot compile Fortran 90 files).
+./configure
+$MAKE
+subobjs=`echo sub/*.o sub/*.obj`
+test "$subobjs" = 'sub/*.o sub/*.obj'
+$MAKE distcheck
+
+$MAKE distclean
+echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
+$AUTOMAKE
+./configure
+$MAKE
+test ! -f bar.o
+test ! -f bar.obj
+test ! -f baz.o
+test ! -f baz.obj
+test ! -f goodbye-baz.o
+test ! -f goodbye-baz.obj
+$MAKE distcheck
diff --git a/t/fort5.sh b/t/fort5.sh
new file mode 100755
index 0000000..4614b66
--- /dev/null
+++ b/t/fort5.sh
@@ -0,0 +1,105 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test mixing Fortran 77 and Fortran (FC), libtool version.
+
+# For now, require the GNU compilers (to avoid some Libtool/Autoconf
+# issues).
+required='libtoolize g77 gfortran'
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >hello.f <<'END'
+      program hello
+      call foo
+      call bar
+      call goodbye
+      stop
+      end
+END
+
+cat >bye.f90 <<'END'
+subroutine goodbye
+  call baz
+  return
+end
+END
+
+cat >foo.f90 <<'END'
+      subroutine foo
+      return
+      end
+END
+
+sed s,foo,bar, foo.f90 > sub/bar.f90
+sed s,foo,baz, foo.f90 > sub/baz.f
+
+cat >>configure.ac <<'END'
+AC_PROG_F77
+AC_PROG_FC
+AC_FC_SRCEXT([f90], [],
+  [AC_MSG_FAILURE([$FC compiler cannot create executables], 77)])
+AC_FC_LIBRARY_LDFLAGS
+AM_PROG_AR
+LT_PREREQ([2.0])
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello
+lib_LTLIBRARIES = libhello.la
+noinst_LTLIBRARIES = libgoodbye.la
+hello_SOURCES = hello.f
+hello_LDADD = libhello.la
+libhello_la_SOURCES = foo.f90 sub/bar.f90
+libhello_la_LIBADD = libgoodbye.la
+libgoodbye_la_SOURCES = bye.f90 sub/baz.f
+libgoodbye_la_FCFLAGS =
+LDADD = $(FCLIBS)
+END
+
+libtoolize --force
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+# This test requires Libtool >= 2.0.  Earlier Libtool does not
+# have the LT_PREREQ macro to cause autoconf failure.
+grep LT_PREREQ configure && skip_ "libtool is too old (probably < 2.0)"
+
+# Ensure we use --tag for f90, too.
+grep " --tag=FC" Makefile.in
+
+# ./configure may exit with status 77 if no compiler is found,
+# or if the compiler cannot compile Fortran 90 files).
+./configure
+$MAKE
+subobjs=`echo sub/*.lo`
+test "$subobjs" = 'sub/*.lo'
+$MAKE distcheck
+
+# The following will be fixed in a later patch:
+$MAKE distclean
+echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
+$AUTOMAKE -a
+./configure
+$MAKE
+test ! -f bar.lo
+test ! -f baz.lo
+test ! -f libgoodbye_la-baz.lo
+$MAKE distcheck
diff --git a/t/fortdep.sh b/t/fortdep.sh
new file mode 100755
index 0000000..d10644d
--- /dev/null
+++ b/t/fortdep.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependency tracking doesn't interfere with Fortran.
+# For PR 75.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SRCDIR([foo.f])
+AC_PROG_F77
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS=foo
+foo_SOURCES=foo.f
+END
+
+: > foo.f
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'foo\.Po' Makefile.in && Exit 1
+Exit 0
diff --git a/t/gcj.sh b/t/gcj.sh
new file mode 100755
index 0000000..b510f1c
--- /dev/null
+++ b/t/gcj.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of compiled java.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+_AM_DEPENDENCIES([GCJ])
+AC_SUBST([GCJ])
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = x/y/convert.java
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^x/y/convert' Makefile.in
+
+:
diff --git a/t/gcj2.sh b/t/gcj2.sh
new file mode 100755
index 0000000..2c4d60f
--- /dev/null
+++ b/t/gcj2.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure '..' invalid in subdir .o's.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+_AM_DEPENDENCIES(GCJ)
+AC_SUBST(GCJ)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = x/../convert.java
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:.*\.\.' stderr
diff --git a/t/gcj3.sh b/t/gcj3.sh
new file mode 100755
index 0000000..a8ec120
--- /dev/null
+++ b/t/gcj3.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure dependency tracking works for java.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+_AM_DEPENDENCIES([GCJ])
+AC_SUBST([GCJ])
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = x/y/convert.java
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+num=`grep depcomp Makefile.in | wc -l`
+test $num -gt 1
+
+:
diff --git a/t/gcj4.sh b/t/gcj4.sh
new file mode 100755
index 0000000..a860f89
--- /dev/null
+++ b/t/gcj4.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure dependency tracking works for Java.
+
+required=gcj
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_GCJ
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = convert.java
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure >stdout
+cat stdout
+
+# Configure must be checking the dependency style of gcj ...
+grep 'dependency style of gcj' stdout >filt
+cat filt
+
+# ... only once.
+test `wc -l < filt` = 1
+
+# Accept any outcome but 'none'
+# (at the time of writing it should be gcc or gcc3).
+grep -v none filt
+
+:
diff --git a/t/gcj5.sh b/t/gcj5.sh
new file mode 100755
index 0000000..f3c218f
--- /dev/null
+++ b/t/gcj5.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake suggests AM_PROG_GCJ when GCJ is needed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+_AM_DEPENDENCIES(GCJ)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = convert
+convert_SOURCES = convert.java
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AM_PROG_GCJ stderr
diff --git a/t/gcj6.sh b/t/gcj6.sh
new file mode 100755
index 0000000..3fe4a31
--- /dev/null
+++ b/t/gcj6.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
+
+required='gcj'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_GCJ
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = test
+test_SOURCES = Test.java
+test_LDFLAGS = --main=Test
+END
+
+cat >Test.java << 'END'
+public class Test {
+    public static void main(String[] argv) {
+        System.out.println("Hello, automake!");
+    }
+}
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+
+# These fail without e.g., AC_PROG_CC.
+$MAKE
+grep "OBJEXT = " Makefile
+grep "EXEEXT = " Makefile
+
+:
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
new file mode 100755
index 0000000..ac09a63
--- /dev/null
+++ b/t/get-sysconf.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Dummy test case, aimed at reporting useful system information in the
+# final 'test-suite.log'.  This way, if a user experiences a failure in
+# the Automake test suite and then only sends us the 'test-suite.log',
+# we won't have to ask him for more information to start analyzing the
+# failure (that had happened too many times in the past!).
+
+. ./defs || Exit 1
+
+st=0
+if test -d "$am_top_srcdir"/.git; then
+  # We are running from a git checkout.
+  (cd "$am_top_srcdir" && git log -1) || st=1
+elif test -f "$am_top_srcdir"/ChangeLog; then
+  # We are probably running from a distribution tarball.
+  awk '
+    BEGIN { first = 1 }
+    (first == 1) { print; first = 0; next; }
+    /^[^\t]/ { exit(0); }
+    { print }
+  ' "$am_top_srcdir"/ChangeLog || st=1
+else
+  # Some non-common but possibly valid setup (see for example the Homebrew
+  # problem reported in automake bug#10866); so just give an harmless
+  # warning instead of failing.
+  warn_ "no .git directory nor ChangeLog file found, some info won't" \
+        "be available"
+fi
+$PERL -V || st=1
+# It's OK for the user not to have the TAP::Parser module; this can
+# happen with older perl installation, or on MinGW/MSYS.
+$PERL -e 'use TAP::Parser; print $TAP::Parser::VERSION, "\n"' || :
+
+cat "$am_top_builddir/config.log" || st=1
+cat "$am_top_builddir/t/wrap/aclocal-$APIVERSION" || st=1
+cat "$am_top_builddir/t/wrap/automake-$APIVERSION" || st=1
+
+if test $st -eq 0; then
+  # This test SKIPs, so that all the information it has gathered and
+  # printed will get unconditionally copied into the 'test-suite.log'
+  # file.
+  Exit 77
+fi
+
+# Some unexpected error occurred; this must be reported as an hard
+# error by the testsuite driver.
+Exit 99
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
new file mode 100755
index 0000000..8adcb0d
--- /dev/null
+++ b/t/gettext-macros.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Try to find the gettext '.m4' files and make them easily accessed
+# to the test cases requiring them.
+# See also automake bug#9807.
+
+. ./defs || Exit 1
+
+extract_program_version ()
+{
+  "$1" --version | sed 1q | $PERL -ne '/(\d(?:\.\d+)+)/ and print "$1\n"'
+}
+
+echo "# Automatically generated by $me." > get.sh
+echo : >> get.sh
+
+# The 'gettextize' and 'autopoint' scripts will look into Makefile.am.
+echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+
+# Prefer autopoint to gettextize, since the more modern versions of the
+# latter might unconditionally require user interaction to complete;
+# yes, this means confirmation from /dev/tty (!) -- see:
+#  <http://lists.gnu.org/archive/html/bug-gettext/2011-12/msg00000.html>
+# Since this "forced interaction" behaviour of gettextize wasn't present
+# before the introduction of autopoint, we should be able to safely
+# fall back to calling gettextize non-interactively if autopoint is not
+# present.
+if autopoint --version; then
+  am_gettextize_command=autopoint
+else
+  am_gettextize_command=gettextize
+fi
+
+# We will need to specify the correct autopoint (or gettextize) version
+# in the AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint
+# (or gettextize) to setup the correct infrastructure -- in particular,
+# for what concerns us, to bring in all the required .m4 files.
+autopoint_version=`extract_program_version $am_gettextize_command` \
+  && test -n "$autopoint_version" \
+  || autopoint_version=0.10.35
+
+cat > configure.ac <<END
+AC_INIT([foo], [1.0])
+AC_PROG_CC
+# Both required by autopoint.
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([$autopoint_version])
+END
+
+if $am_gettextize_command --force && test -f m4/gettext.m4; then
+  echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
+  echo "export ACLOCAL_PATH" >> get.sh
+else
+  # Older versions of gettext might not have a gettextize program
+  # available, but this doesn't mean the user hasn't made the gettext
+  # macros available, e.g., by properly setting ACLOCAL_PATH.
+  rm -rf m4
+  mkdir m4
+  # See below for an explanation about the use the of '-Wno-syntax'.
+  if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/gettext.m4; then
+    : # Gettext macros already accessible by default.
+  else
+    echo "skip_all_ \"couldn't find or get gettext macros\"" >> get.sh
+  fi
+fi
+
+. ./get.sh
+
+$ACLOCAL --force -I m4 || cat >> get.sh <<'END'
+# We need to use '-Wno-syntax', since we do not want our test suite
+# to fail merely because some third-party '.m4' file is underquoted.
+ACLOCAL="$ACLOCAL -Wno-syntax"
+END
+
+# Remove any Makefile.in possibly created by gettextize/autopoint, to
+# avoid spurious maintainer-check failures.
+rm -f `find . -name Makefile.in`
+
+# The file gettextize or autopoint might have copied in the 'm4'
+# subdirectory of the test directory are going to be needed by
+# other tests, so we must not remove the test directory.
+keep_testdirs=yes
+
+:
diff --git a/t/gettext.sh b/t/gettext.sh
new file mode 100755
index 0000000..a9181e4
--- /dev/null
+++ b/t/gettext.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check gettext support.
+
+required='gettext'
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.14.3])
+AC_OUTPUT
+END
+
+: >Makefile.am
+mkdir po intl
+
+# config.rpath is required by versions >= 0.14.3.  We try to verify
+# this requirement, but only when we find we have a working and recent
+# gettext installation.
+
+# If aclocal fails here, it may be that gettext is too old to
+# provide AM_GNU_GETTEXT_VERSION.
+if $ACLOCAL; then
+
+  # autopoint will fail if it's from an older version.
+  # If gettext is too old to provide autopoint, this will
+  # fail as well, so we're safe here.
+  if autopoint -n; then
+    AUTOMAKE_fails --add-missing
+    grep 'required.*config.rpath' stderr
+  fi
+fi
+
+: >config.rpath
+sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+$ACLOCAL
+
+# po/ and intl/ are required.
+
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
+
+echo 'SUBDIRS = po' >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*intl' stderr
+
+echo 'SUBDIRS = intl' >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*po' stderr
+
+# Ok.
+
+echo 'SUBDIRS = po intl' >Makefile.am
+$AUTOMAKE --add-missing
+
+# Make sure distcheck runs './configure --with-included-gettext'.
+grep 'with-included-gettext' Makefile.in
+
+# 'SUBDIRS = po intl' isn't required if po/ doesn't exist.
+# PR/381.
+
+rmdir po
+mkdir sub
+echo 'SUBDIRS = sub' >Makefile.am
+$AUTOMAKE
+
+# Still, SUBDIRS must be defined.
+
+: >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
diff --git a/t/gettext2.sh b/t/gettext2.sh
new file mode 100755
index 0000000..8b8a062
--- /dev/null
+++ b/t/gettext2.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check gettext 'external' support.
+# PR/338, reported by Charles Wilson.
+
+required='gettext'
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AM_GNU_GETTEXT([external])
+AC_OUTPUT
+END
+
+: >Makefile.am
+mkdir foo po
+
+$ACLOCAL
+
+# config.rpath is required.
+: >config.rpath
+
+# po/ is required, but intl/ isn't.
+
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
+
+echo 'SUBDIRS = foo' >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*po' stderr
+
+# Ok.
+
+echo 'SUBDIRS = po' >Makefile.am
+$AUTOMAKE --add-missing
+
+# Don't try running ./configure --with-included-gettext if the
+# user is using AM_GNU_GETTEXT([external]).
+grep 'with-included-gettext' Makefile.in && Exit 1
+
+# intl/ isn't wanted with AM_GNU_GETTEXT([external]).
+
+mkdir intl
+echo 'SUBDIRS = po intl' >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'intl.*AM_GNU_GETTEXT' stderr
+
+:
diff --git a/t/gettext3.sh b/t/gettext3.sh
new file mode 100755
index 0000000..9a39af2
--- /dev/null
+++ b/t/gettext3.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check gettext 'AM_GNU_GETTEXT_INTL_SUBDIR' support.
+
+required='gettext'
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_INTL_SUBDIR
+AC_OUTPUT
+END
+
+echo 'SUBDIRS = po' >Makefile.am
+mkdir po
+
+# If aclocal fails, assume the gettext macros are too old and do not
+# define AM_GNU_GETTEXT_INTL_SUBDIR.
+$ACLOCAL || skip_ "your gettext macros are probably too old"
+
+# config.rpath is required.
+: >config.rpath
+
+# intl/ is required.
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
+
+mkdir intl
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
+
+echo 'SUBDIRS = po intl' > Makefile.am
+$AUTOMAKE --add-missing
diff --git a/t/gnits.sh b/t/gnits.sh
new file mode 100755
index 0000000..badb8b0
--- /dev/null
+++ b/t/gnits.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to ensure --gnits version checking is correct.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [3.5.3.2])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES(Makefile)
+END
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+AUTOMAKE_fails --gnits
+grep 'configure.ac:.*3\.5\.3\.2' stderr
diff --git a/t/gnits2.sh b/t/gnits2.sh
new file mode 100755
index 0000000..ef7078c
--- /dev/null
+++ b/t/gnits2.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to ensure std-options checking is correct.
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnits
+noinst_PROGRAMS = fubar2
+bin_PROGRAMS = fubar sub/fine
+nobase_bin_PROGRAMS = sub/fubar3
+fubar_SOURCES = fubar.c
+fubar2_SOURCES = fubar.c
+sub_fubar3_SOURCES = fubar.c
+sub_fine_SOURCES = fine.c
+bin_SCRIPTS = sub/scriptok.sh sub/scriptnok.sh
+
+grep-stderr:
+       grep 'pfubar$(EXEEXT) does not support' stderr
+       grep 'pfubar3$(EXEEXT) does not support' stderr
+       grep 'pscriptnok\.sh does not support' stderr
+## Only three failures please.
+       test `grep 'does not support --help' stderr | wc -l` = 3
+       test `grep 'does not support --version' stderr | wc -l` = 3
+
+test-install: install
+       test -f ../inst-dir/bin/pfine$(EXEEXT)
+       test ! -f ../inst-dir/bin/fine$(EXEEXT)
+END
+
+cat > fubar.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cat > fine.c << 'END'
+#include <stdio.h>
+int main (void)
+{
+  puts ("Which version? Which usage?");
+  return 0;
+}
+END
+
+mkdir sub
+
+cat >sub/scriptok.sh <<EOF
+#!/bin/sh
+echo "Which version? Which usage?"
+EOF
+
+# Not only does this script not support --help/--version, but
+# it will also hang when run without input.
+cat >sub/scriptnok.sh <<EOF
+#!/bin/sh
+cat
+EOF
+
+chmod +x sub/scriptok.sh
+chmod +x sub/scriptnok.sh
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+# The following file should not be distributed.
+# (alpha.test checks the case where it must be distributed.)
+: > README-alpha
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep README-alpha Makefile.in && Exit 1
+
+mkdir build
+cd build
+
+# Use --program-prefix to make sure the std-options check honors it.
+../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
+$MAKE all
+$MAKE test-install
+$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
+cat stderr >&2
+$MAKE grep-stderr
+
+:
diff --git a/t/gnits3.sh b/t/gnits3.sh
new file mode 100755
index 0000000..f479762
--- /dev/null
+++ b/t/gnits3.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+# We use the same basename for all targets on purpose.  This way
+# we make sure that 'AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = nok'
+# will not match anything containing 'nok'.
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnits
+
+nobase_bin_PROGRAMS = nok sub/nok
+nok_SOURCES = nok.c
+sub_nok_SOURCES = nok.c
+
+nobase_bin_SCRIPTS = nok.sh sub/nok.sh
+
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = nok$(EXEEXT) nok.sh
+
+grep-stderr:
+       grep 'sub/pnok$(EXEEXT) does not support' stderr
+       grep 'sub/pnok\.sh does not support' stderr
+## Only two failures please.
+       test `grep 'does not support --help' stderr | wc -l` = 2
+       test `grep 'does not support --version' stderr | wc -l` = 2
+END
+
+cat > nok.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+mkdir sub
+
+cat >nok.sh <<EOF
+#!/bin/sh
+echo "Which version? Which usage?"
+exit 1
+EOF
+
+cp nok.sh sub/nok.sh
+
+chmod +x nok.sh
+chmod +x sub/nok.sh
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+
+# Use --program-prefix to make sure the std-options check honors it.
+../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
+$MAKE
+$MAKE install
+$MAKE installcheck && Exit 1
+$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
+cat stderr >&2
+$MAKE grep-stderr
+
+# Make sure there is no more error when all targets are exempted.
+cd ..
+cat >> Makefile.am <<'END'
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += sub/nok$(EXEEXT) sub/nok.sh
+END
+$AUTOMAKE
+cd build
+./config.status  # Don't rely on the rebuild rules (they need GNU make).
+$MAKE installcheck
+
+:
diff --git a/t/gnumake.sh b/t/gnumake.sh
new file mode 100755
index 0000000..b1ea000
--- /dev/null
+++ b/t/gnumake.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Automake should not assume that make files are called Makefile.
+# Report from Braden McDaniel.
+
+required=GNUmake
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/GNUmakefile])
+AC_OUTPUT
+END
+
+mkdir sub
+
+echo SUBDIRS = sub > Makefile.am
+
+cat > sub/GNUmakefile.am <<'EOF'
+# In this project, the Makefile is an installed data file.
+dist_data_DATA = Makefile
+EOF
+
+echo 'this should not cause any problem' > sub/Makefile
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
new file mode 100755
index 0000000..5aac432
--- /dev/null
+++ b/t/gnuwarn.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that Automake warns about user variables being overridden.
+
+. ./defs || Exit 1
+
+# We need (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+# Needed by --gnu.
+: > NEWS
+: > README
+: > AUTHORS
+: > ChangeLog
+
+cat > Makefile.am << 'END'
+CFLAGS += -I..
+LDFLAGS = -lfoo
+CXXFLAGS = -Wall
+bin_PROGRAMS = bar
+END
+
+$ACLOCAL
+# Don't warn in foreign mode
+$AUTOMAKE --add-missing --foreign
+# Warn in gnu mode
+AUTOMAKE_fails --add-missing --gnu
+grep '^Makefile\.am:1:.*CFLAGS' stderr
+grep '^Makefile\.am:2:.*LDFLAGS' stderr
+# No reason to warn about CXXFLAGS since it's not used.
+grep CXXFLAGS stderr && Exit 1
+# Don't warn if -Wno-gnu.
+$AUTOMAKE --gnu -Wno-gnu
+
+:
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
new file mode 100755
index 0000000..6a68d65
--- /dev/null
+++ b/t/gnuwarn2.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check diagnostics about no-installman being disallowed in 'gnu'.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([gnuwarn2], [1.0])
+AM_INIT_AUTOMAKE([no-installman])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+# --gnu files
+: > NEWS
+: > README
+: > AUTHORS
+: > ChangeLog
+: > COPYING
+: > INSTALL
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'configure.ac:2:.*no-installman' stderr
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
new file mode 100755
index 0000000..1e31cd2
--- /dev/null
+++ b/t/hdr-vars-defined-once.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure header vars defined only once when including.
+# Report from Marcus G. Daniels.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+include Will_Be_Included_In_Makefile
+END
+
+: > Will_Be_Included_In_Makefile
+
+$ACLOCAL
+$AUTOMAKE
+len=`grep '^srcdir' Makefile.in | wc -l`
+test $len -eq 1
+
+# Also make sure include file is distributed.
+sed -n -e '/^DIST_COMMON =.*\\$/ {
+   :loop
+   p
+   n
+   t clear
+   :clear
+   s/\\$/\\/
+   t loop
+   p
+   n
+   }' -e '/^DIST_COMMON =/ p' Makefile.in | grep Will_Be_Included_In_Makefile
+
+:
diff --git a/t/header.sh b/t/header.sh
new file mode 100755
index 0000000..dc93ac8
--- /dev/null
+++ b/t/header.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 68.
+#
+# == Report ==
+#  If an autoconf substitution variable of the form "*_HEADERS" --
+#  for example "MY_HEADERS" -- is used in an "include_" variable
+#  in conjunction with EXTRA_HEADERS, $(MY_HEADERS) gets included
+#  in the HEADERS variable for *all* generated Makefile.ins in the
+#  project.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([MY_HEADERS])
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zoo
+zoo_SOURCES = joe.c
+END
+
+: > joe.c
+: > qq.h
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'address@hidden' Makefile.in && Exit 1
+Exit 0
diff --git a/t/help-depend.sh b/t/help-depend.sh
new file mode 100755
index 0000000..c69d564
--- /dev/null
+++ b/t/help-depend.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our private macro 'AM_DEP_TRACK' adds proper text to
+# the configure help screen.
+# Keep this in sync with sister test 'help-depend2.test'
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_DEP_TRACK
+END
+
+$ACLOCAL
+$AUTOCONF
+
+grep_configure_help --enable-dependency-tracking \
+                    ' not reject slow dependency extract'
+
+grep_configure_help --disable-dependency-tracking \
+                    ' speeds up one-time build'
+
+:
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
new file mode 100755
index 0000000..58a8342
--- /dev/null
+++ b/t/help-depend2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that when automake automatically activates support for
+# dependency tracking, it adds proper text to the configure help screen.
+# Keep this in sync with sister test 'help-depend.test'
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+END
+
+$ACLOCAL
+$AUTOCONF
+
+grep_configure_help --enable-dependency-tracking \
+                    ' not reject slow dependency extract'
+
+grep_configure_help --disable-dependency-tracking \
+                    ' speeds up one-time build'
+
+:
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
new file mode 100755
index 0000000..a9ab69f
--- /dev/null
+++ b/t/help-dmalloc.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_WITH_DMALLOC' adds proper text to
+# the configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_WITH_DMALLOC
+END
+
+$ACLOCAL
+$AUTOCONF
+
+grep_configure_help --with-dmalloc ' use dmalloc.*http://www\.dmalloc\.com'
+
+:
diff --git a/t/help-init.sh b/t/help-init.sh
new file mode 100755
index 0000000..d1cff1c
--- /dev/null
+++ b/t/help-init.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our grand macro 'AM_INIT_AUTOMAKE' add proper text
+# to the configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+END
+
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep '^  --program-prefix[= ]' stdout
+grep '^  --program-suffix[= ]' stdout
+grep '^  --program-transform-name[= ]' stdout
+
+:
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
new file mode 100755
index 0000000..ca1ddfc
--- /dev/null
+++ b/t/help-lispdir.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_PATH_LISPDIR' adds proper text to
+# the configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_PATH_LISPDIR
+END
+
+$ACLOCAL
+$AUTOCONF
+
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep_configure_help --with-lispdir ' override.*lisp directory'
+grep_configure_help EMACS          ' [eE]macs editor'
+grep_configure_help EMACSLOADPATH  ' [eE]macs library search path'
+
+:
diff --git a/t/help-multilib.sh b/t/help-multilib.sh
new file mode 100755
index 0000000..c2a8d3c
--- /dev/null
+++ b/t/help-multilib.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_ENABLE_MULTILIB' adds proper text to
+# the configure help screen.
+# FIXME: the features tested by this script has been moved in contrib.
+# FIXME: We should move this script accordingly.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_ENABLE_MULTILIB
+END
+
+cat "$am_top_srcdir"/contrib/multilib/multi.m4 > aclocal.m4
+$AUTOCONF
+
+grep_configure_help --enable-multilib ' many library versions \(default\)'
+
+:
diff --git a/t/help-python.sh b/t/help-python.sh
new file mode 100755
index 0000000..501b545
--- /dev/null
+++ b/t/help-python.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that macro 'AM_PATH_PYTHON' adds proper text to the
+# configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_PATH_PYTHON
+END
+
+$ACLOCAL
+$AUTOCONF
+
+grep_configure_help PYTHON 'the Python interpreter'
+
+:
diff --git a/t/help-silent.sh b/t/help-silent.sh
new file mode 100755
index 0000000..d5fc342
--- /dev/null
+++ b/t/help-silent.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_SILENT_RULES' adds proper text to
+# the configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_SILENT_RULES
+END
+
+$ACLOCAL
+
+mv -f configure.ac configure.tmpl
+
+q="[\`'\"]"
+
+for args in '' '([])' '([yes])' '([no])'; do
+  sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac
+  cat configure.ac
+  $AUTOCONF --force
+  grep_configure_help --enable-silent-rules \
+                      " less verbose build.*\\(undo.*${q}make V=1${q}"
+  grep_configure_help --disable-silent-rules \
+                      " verbose build.*\\(undo.*${q}make V=0${q}"
+done
+
+:
diff --git a/t/help-upc.sh b/t/help-upc.sh
new file mode 100755
index 0000000..b81b387
--- /dev/null
+++ b/t/help-upc.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_PROG_UPC' adds proper text to
+# the configure help screen.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_PROG_UPC
+END
+
+$ACLOCAL
+$AUTOCONF
+
+grep_configure_help UPC      '[Uu]nified Parallel C compiler command'
+grep_configure_help UPCFLAGS '[Uu]nified Parallel C compiler flags'
+
+:
diff --git a/t/help.sh b/t/help.sh
new file mode 100755
index 0000000..2f7c2d1
--- /dev/null
+++ b/t/help.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure --help and --version work, even when no configure.ac nor
+# configure.in is in the current directory.
+
+. ./defs || Exit 1
+
+# Ensure we run in an empty directory.
+mkdir emptydir
+cd emptydir
+
+# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# adding extra options.
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
+
+$ACLOCAL --version
+$ACLOCAL --help
+$AUTOMAKE --version
+$AUTOMAKE --help
+
+# Sanity checks: aclocal and automake cannot work without configure.ac
+# nor configure.in.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP configure.ac stderr
+$FGREP configure.in stderr
+AUTOMAKE_fails
+$FGREP configure.ac stderr
+$FGREP configure.in stderr
+
+:
diff --git a/t/help2.sh b/t/help2.sh
new file mode 100755
index 0000000..0d433f4
--- /dev/null
+++ b/t/help2.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure --help and --version work, even when the current directory
+# contains a broken configure.ac and a broken acinclude.m4.
+. ./defs || Exit 1
+
+# Ensure we run in a new, clean directory.
+mkdir cleandir
+cd cleandir
+
+# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# adding extra options.
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
+
+echo '[' > configure.ac
+echo '[' > acinclude.m4
+
+$AUTOMAKE --version
+$AUTOMAKE --help
+$ACLOCAL --version
+$ACLOCAL --help
+
+# Sanity check: aclocal cannot work with broken acinclude.m4.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP acinclude.m4 stderr
+
+rm -f acinclude.m4
+
+# Sanity checks: aclocal and automake cannot work with broken configure.ac.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP configure.ac stderr
+AUTOMAKE_fails
+$FGREP configure.ac stderr
+
+:
diff --git a/t/help3.sh b/t/help3.sh
new file mode 100755
index 0000000..54e06d5
--- /dev/null
+++ b/t/help3.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure --help and --version takes precedence over other options.
+
+. ./defs || Exit 1
+
+# We must have full control over the content of the current directory.
+mkdir cleandir
+cd cleandir
+
+# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# adding extra options.
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([.]) dnl prevent automake from looking into '..'
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am <<END
+# So that install-sh will be required.
+pkgdata_DATA =
+END
+
+$ACLOCAL --force --help --output=foo.m4
+test ! -r foo.m4
+$ACLOCAL --output=foo.m4 --version --force
+test ! -r foo.m4
+# Sanity check.
+$ACLOCAL --output=foo.m4 --force
+test -f foo.m4
+
+mv -f foo.m4 aclocal.m4 # autoconf will need aclocal.m4
+
+$AUTOMAKE --add-missing --help --copy
+test ! -r install-sh
+$AUTOMAKE --copy --version --add-mising
+test ! -r install-sh
+# Sanity check.
+$AUTOMAKE --add-missing --copy
+test -f install-sh
+
+:
diff --git a/t/help4.sh b/t/help4.sh
new file mode 100755
index 0000000..9747968
--- /dev/null
+++ b/t/help4.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the first among --help and --version to be specified on
+# the command line takes precedence over the following one.
+
+. ./defs || Exit 1
+
+# Ensure we run in an empty directory.
+mkdir emptydir
+cd emptydir
+
+# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# adding extra options.
+ACLOCAL=$am_original_ACLOCAL
+AUTOMAKE=$am_original_AUTOMAKE
+
+escape_dots () { sed 's/\./\\./g'; } # Avoid issues with "\" in backquotes.
+apiversion_rx=`echo "$APIVERSION" | escape_dots`
+
+$ACLOCAL --version --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep "^aclocal.*$apiversion_rx" stdout
+grep "^Usage" stdout && Exit 1
+
+$ACLOCAL --help --version >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep "^Usage" stdout
+grep "^aclocal.*$apiversion_rx" stdout && Exit 1
+
+$AUTOMAKE --version --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep "^automake.*$apiversion_rx" stdout
+grep "^Usage" stdout && Exit 1
+
+$AUTOMAKE --help --version >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep "^Usage" stdout
+grep "^automake.*$apiversion_rx" stdout && Exit 1
+
+:
diff --git a/t/hfs.sh b/t/hfs.sh
new file mode 100755
index 0000000..6000040
--- /dev/null
+++ b/t/hfs.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Automake should not think that ChangeLog == CHANGELOG on
+# case-preserving case-insensitive filesystems (such as HFS+, on
+# Darwin).
+# Report from Peter O'Gorman.
+
+. ./defs || Exit 1
+echo AC_OUTPUT >>configure.ac
+
+: >CHANGELOG
+echo 'EXTRA_DIST = CHANGELOG' >Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
diff --git a/t/implicit.sh b/t/implicit.sh
new file mode 100755
index 0000000..a9a068b
--- /dev/null
+++ b/t/implicit.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure implicit .o's are listed as appropriate.  Report
+# from Henrik Frystyk Nielsen.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = libapp_1
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
+
+:
diff --git a/t/info.sh b/t/info.sh
new file mode 100755
index 0000000..738ddfd
--- /dev/null
+++ b/t/info.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure info files are distributed correctly.
+# FIXME: This test is probably obsoleted, or wrong.  The generated
+#        Makefile.in seems not to define any 'INFOS' variable!
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foo.texi
+END
+
+echo '@setfilename foo.info' > foo.texi
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do
+   echo $i
+   case "$i" in
+    foo*)
+       ;;
+    *)
+       Exit 1
+       ;;
+   esac
+done
+
+:
diff --git a/t/init.sh b/t/init.sh
new file mode 100755
index 0000000..d576814
--- /dev/null
+++ b/t/init.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we give a sensible error message when AC_INIT and
+# AM_INIT_AUTOMAKE are both given less than two arguments.
+
+. ./defs || Exit 1
+
+for ac_init_args in '' '([x])'; do
+  for am_init_args in '' '([1.10])'; do
+    rm -rf aclocal.m4 autom4te*.cache
+    unindent >configure.ac <<END
+      AC_INIT$ac_init_args
+      AM_INIT_AUTOMAKE$am_init_args
+END
+    cat configure.ac # For debugging.
+    # The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
+    ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; }
+    cat stderr >&2
+    $FGREP AC_PACKAGE_VERSION stderr && Exit 1
+    grep 'configure\.ac:.* AC_INIT .*arguments' stderr
+  done
+done
+
+:
diff --git a/t/init2.sh b/t/init2.sh
new file mode 100755
index 0000000..44e79cb
--- /dev/null
+++ b/t/init2.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we give a sensible error message when AM_INIT_AUTOMAKE
+# contains junk.
+
+. ./defs || Exit 1
+
+cat >configure.ac <<END
+AC_INIT([init2], [1.0])
+AM_INIT_AUTOMAKE([nosuchoption])
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'nosuchoption.*recognized' stderr
+Exit 0
diff --git a/t/insh2.sh b/t/insh2.sh
new file mode 100755
index 0000000..cd74f82
--- /dev/null
+++ b/t/insh2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug where install-sh not included in distribution.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+.PHONY: test
+test: distdir
+       find $(distdir) ;: For debugging.
+       echo ' ' $(DISTFILES) ' ' | grep '[ /]install-sh '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]install-sh '
+       test -f $(distdir)/install-sh
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE test
+
+:
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
new file mode 100755
index 0000000..d8b32d8
--- /dev/null
+++ b/t/install-info-dir.sh
@@ -0,0 +1,181 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Checks on the 'install-info' target.
+# Details about the individual checks' purposes and motivations are
+# inlined, below.
+
+# FIXME: this test is a good candidate for a conversion to TAP,
+# FIXME: and could be merged with 'txinfo27.test'.
+
+required=makeinfo
+. ./defs || Exit 1
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+
+mkdir bin
+saved_PATH=$PATH; export saved_PATH
+PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foo.texi
+END
+
+cat > foo.texi << 'END'
+\input texinfo
address@hidden foo.info
address@hidden All the following directives might be required to allow older
address@hidden versions of the 'install-info' program (e.g., version 4.8) to
address@hidden create the 'dir' index file in ${infodir}.  Don't remove them.
address@hidden foo
address@hidden Dummy utilities
address@hidden
+* Foo: (foo).  Does nothing at all, but has a nice name.
address@hidden direntry
address@hidden Top
+Hello world!
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+instdir=_inst
+destdir=_dest
+
+./configure --prefix="$cwd/$instdir" --infodir="$cwd/$instdir/info"
+
+$MAKE info
+test -f foo.info
+
+if install-info --version; then
+  have_installinfo=yes
+else
+  have_installinfo=no
+fi
+
+# The 'install-info' target updates the '${infodir}/dir' file
+# by default (if the 'install-info' program is available).
+# This should happen in a normal as well as in a DESTDIR installation.
+if test $have_installinfo = yes; then
+
+  $MAKE install-info
+  test -f $instdir/info/foo.info
+  test -f $instdir/info/dir
+  $FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
+
+  $MAKE uninstall
+  test ! -f $instdir/info/foo.info
+  $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+
+  dir="$destdir/$cwd/$instdir/info"
+
+  $MAKE DESTDIR="$cwd/$destdir" install-info
+  test -f "$dir"/foo.info
+  test -f "$dir"/dir
+  $FGREP 'Does nothing at all, but has a nice name' "$dir"/dir
+  $MAKE DESTDIR="$cwd/$destdir" uninstall
+  test ! -f "$dir"/foo.info
+  $FGREP 'but has a nice name' "$dir"/dir && Exit 1
+
+  unset dir
+
+fi
+
+rm -rf $instdir $destdir
+
+# The 'install-info' target doesn't fail if the 'install-info'
+# program is not available.
+cat > bin/install-info <<'END'
+#!/bin/sh
+echo error from install-info >&2
+exit 127
+END
+chmod a+x bin/install-info
+$MAKE install-info >output 2>&1 || { cat output; Exit 1; }
+cat output
+test -f $instdir/info/foo.info
+test ! -f $instdir/info/dir
+grep 'error from install-info' output && Exit 1
+
+rm -rf $instdir output
+
+if test $have_installinfo = yes; then
+  # The 'install-info' target doesn't try to guess whether the 'install-info'
+  # is the GNU or debian version.
+  unindent > bin/install-info <<'END'
+    #!/bin/sh
+    set -e; set -u;
+    for fd in 1 2; do
+      for str in dpkg debian Debian; do
+        eval "echo This is $str install-info >&$fd"
+      done
+    done
+    PATH=$saved_PATH; export PATH
+    exec install-info ${1+"$@"}
+END
+  $MAKE install-info
+  test -f $instdir/info/foo.info
+  test -f $instdir/info/dir
+  $MAKE uninstall
+  test ! -f $instdir/info/foo.info
+  test -f $instdir/info/dir
+  $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+  : For shells with busted 'set -e'.
+fi
+
+rm -rf $instdir bin/install-info
+
+# The 'AM_UPDATE_INFO_DIR' environment variable can be used to
+# prevent the creation or update of the '${infodir}/dir' file,
+# if set to a "no" value.
+for val in no NO n; do
+  rm -rf $instdir
+  env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
+  test -f $instdir/info/foo.info
+  test ! -f $instdir/info/dir
+done
+
+$MAKE install-info
+if test $have_installinfo != yes; then
+  echo 'Does nothing at all, but has a nice name' > $instdir/info/dir
+fi
+
+chmod a-w $instdir/info/dir
+for val in no NO n; do
+  env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
+  $FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
+done
+
+if test $have_installinfo = yes; then
+  for val in 'yes' 'who cares!'; do
+    rm -rf $instdir
+    env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
+    test -f $instdir/info/foo.info
+    test -f $instdir/info/dir
+    env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
+    test ! -f $instdir/info/foo.info
+    $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+    : For shells with busted 'set -e'.
+  done
+fi
+
+:
diff --git a/t/install2.sh b/t/install2.sh
new file mode 100755
index 0000000..f1992e8
--- /dev/null
+++ b/t/install2.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in 'make dist'
+# From Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+dnl Prevent automake from looking in .. and ../..
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE(foo, 0.1)
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = .
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+chmod 000 Makefile.am
+
+# On some systems (like DOS and Windows), files are always readable.
+test ! -r Makefile.am || skip_ "cannot drop file read permissions"
+
+./configure
+
+# 'dist' should fail because we can't copy Makefile.am.
+if $MAKE dist; then
+  Exit 1
+else
+  Exit 0
+fi
diff --git a/t/installdir.sh b/t/installdir.sh
new file mode 100755
index 0000000..dc83ee3
--- /dev/null
+++ b/t/installdir.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 203.
+# See also automake bug#11030.
+#
+# == Original Report for PR/203 ==
+# Some standard targets are missing '-local' hooks.  For instance,
+# installdirs is missing this.  Ideally this would be an automatic
+# feature of any exported target.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+foodir = $(datadir)/$(distdir)
+installdirs-local:
+       $(MKDIR_P) $(DESTDIR)$(foodir)
+install-data-hook: installdirs-local
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+test `grep installdirs-local Makefile.in | wc -l` -eq 4
+
+cwd=`pwd` || fatal_ "getting current working directory"
+
+$AUTOCONF
+./configure --prefix="$cwd/inst"
+
+$MAKE installdirs
+test -d inst/share/$me-1.0
+rm -rf inst
+
+$MAKE install
+test -d inst/share/$me-1.0
+rm -rf inst
+
+./configure --prefix=/foo
+
+$MAKE installdirs DESTDIR="$cwd/dest"
+test -d dest/foo/share/$me-1.0
+rm -rf dest
+
+$MAKE install DESTDIR="$cwd/dest"
+test -d dest/foo/share/$me-1.0
+rm -rf dest
+
+:
diff --git a/t/instdat.sh b/t/instdat.sh
new file mode 100755
index 0000000..0754a09
--- /dev/null
+++ b/t/instdat.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to see if defining INSTALL_DATA causes problems.  From EGCS
+# list.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_SUBST([INSTALL_DATA])
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^DATA =' Makefile.in | grep 'INSTALL_DATA' && Exit 1
+Exit 0
diff --git a/t/instdat2.sh b/t/instdat2.sh
new file mode 100755
index 0000000..8773fc3
--- /dev/null
+++ b/t/instdat2.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that installing under $exec_prefix is handled by install-exec.
+# Testing with headers for instance.
+
+. ./defs || Exit 1
+
+cat >Makefile.am << 'EOF'
+# User directories.
+inclexecdir = $(exec_prefix)/include
+inclexec_HEADERS = my-config.h
+
+incldatadir = $(prefix)/include
+incldata_HEADERS = my-data.h
+
+## Standard directories: _DATA
+## Commented out are invalid combinations.
+##bin_DATA = data
+##sbin_DATA = data
+##libexec_DATA = data
+data_DATA = data
+sysconf_DATA = data
+localstate_DATA = data
+##lib_DATA = data
+##info_DATA = data
+##man_DATA = data
+##include_DATA = data
+##oldinclude_DATA = data
+pkgdata_DATA = data
+##pkglib_DATA = data
+##pkginclude_DATA = data
+
+## Standard directories: _SCRIPTS
+## Commented out are invalid combinations.
+bin_SCRIPTS = script
+sbin_SCRIPTS = script
+libexec_SCRIPTS = script
+##data_SCRIPTS = script
+##sysconf_SCRIPTS = script
+##localstate_SCRIPTS = script
+##lib_SCRIPTS = script
+##info_SCRIPTS = script
+##man_SCRIPTS = script
+##include_SCRIPTS = script
+##oldinclude_SCRIPTS = script
+pkgdata_SCRIPTS = script
+##pkglib_SCRIPTS = script
+##pkginclude_SCRIPTS = script
+EOF
+
+$ACLOCAL || Exit 1
+$AUTOMAKE
+
+# install-SCRIPTS targets.
+sed -n '/^install-data-am/,/^  /p' Makefile.in > produced
+
+cat > expected <<'EOF'
+install-data-am: install-dataDATA install-incldataHEADERS \
+       install-pkgdataDATA install-pkgdataSCRIPTS
+EOF
+
+diff expected produced
+
+
+# install-exec targets.
+sed -n '/^install-exec-am/,/^  /p' Makefile.in > produced
+
+cat > expected <<'EOF'
+install-exec-am: install-binSCRIPTS install-inclexecHEADERS \
+       install-libexecSCRIPTS install-localstateDATA \
+EOF
+
+diff expected produced
+
+Exit 0
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
new file mode 100755
index 0000000..2965ff1
--- /dev/null
+++ b/t/instdir-cond.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check against automake bug#10997: directories holding only
+# conditionally-installed files should not be created unconditionally.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([ENABLE_FOO], [false])
+AC_OUTPUT
+END
+
+: > foo
+: > bar
+
+cat > Makefile.am << 'END'
+pkglibexec_SCRIPTS =
+if ENABLE_FOO
+pkgdata_DATA = foo
+pkglibexec_SCRIPTS += bar
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure --prefix="`pwd`/inst"
+
+$MAKE install
+test ! -d inst/share/instdir-cond
+test ! -d inst/libexec/instdir-cond
+
+:
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
new file mode 100755
index 0000000..1fc24b7
--- /dev/null
+++ b/t/instdir-cond2.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check against automake bug#10997: directories holding only
+# conditionally-installed files should not be created unconditionally.
+# FIXME: this test tries to check that the above also hold for the
+# FIXME: "installdirs" target, but that doesn't currently work :-(
+# FIXME: So this test is still xfailing.
+# See sister test 'instdir-cond.test' for the succeeding part.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([ENABLE_FOO], [false])
+AC_OUTPUT
+END
+
+: > foo
+: > bar
+
+cat > Makefile.am << 'END'
+pkglibexec_SCRIPTS =
+if ENABLE_FOO
+pkgdata_DATA = foo
+pkglibexec_SCRIPTS += bar
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure --prefix="`pwd`/inst"
+
+$MAKE installdirs
+test ! -d inst || { find inst; Exit 1; }
+
+:
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
new file mode 100755
index 0000000..4d47d19
--- /dev/null
+++ b/t/instdir-java.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(javadir) is the empty string, then nothing should be installed there.
+
+required=javac
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+javadir = $(datarootdir)/java
+java_JAVA = foo.java
+END
+
+cat >foo.java <<'END'
+class foo {
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+
+javadir=
+export javadir
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
new file mode 100755
index 0000000..f019504
--- /dev/null
+++ b/t/instdir-lisp.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(lispdir) is the empty string, then nothing should be installed there.
+
+required=emacs
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_PATH_LISPDIR
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+lisp_LISP = l.el
+END
+
+: >l.el
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+
+lispdir=
+export lispdir
+
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
new file mode 100755
index 0000000..ded16cd
--- /dev/null
+++ b/t/instdir-ltlib.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(libdir) or $(pyexecdir) is the empty string, then nothing should
+# be installed there.
+# This test exercises the libtool code paths.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = p
+nobase_bin_PROGRAMS = np sub/np
+lib_LTIBRARIES = libfoo.la
+nobase_lib_LTLIBRARIES = libnfoo.la sub/libnfoo.la
+pyexec_LTIBRARIES = libpy.la
+nobase_pyexec_LTLIBRARIES = libnpy.la sub/libnpy.la
+END
+
+cat >p.c <<'END'
+int main () { return 0; }
+END
+cp p.c np.c
+cp p.c sub/np.c
+cp p.c libfoo.c
+cp p.c libnfoo.c
+cp p.c sub/libnfoo.c
+cp p.c libpy.c
+cp p.c libnpy.c
+cp p.c sub/libnpy.c
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir" PYTHON="echo" \
+             am_cv_python_pythondir="$instdir/python" \
+             am_cv_python_pyexecdir="$instdir/pyexec"
+$MAKE
+
+bindir= libdir= pyexecdir=
+export bindir libdir pyexecdir
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+# Creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
+cat stdout
+# Creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
+
+:
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
new file mode 100755
index 0000000..d93add8
--- /dev/null
+++ b/t/instdir-no-empty.sh
@@ -0,0 +1,121 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# An empty "foo_PRIMARY" declaration should *not* cause "make install"
+# to create directory $(foodir).  See automake bug#10997 and bug#11030.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_SUBST([CC], [whatever])
+AC_SUBST([JAVAC], [whatever])
+AM_PATH_PYTHON(,,:)
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+mydir = $(prefix)/my
+myexecdir = $(prefix)/myexec
+javadir = $(prefix)/java
+END
+
+# Write Makefile.am.
+{
+
+  for dir in sbin bin libexec pkglibexec myexec; do
+    for dst in '' dist_ nodist_; do
+      echo "${dst}${dir}_SCRIPTS ="
+    done
+    echo "${dir}_PROGRAMS ="
+  done
+
+  for dir in lib pkglib myexec my; do
+    echo "${dir}_LIBRARIES ="
+    echo "${dir}_LTLIBRARIES ="
+  done
+
+  for p1 in '' notrans_; do
+    for p2 in '' dist_ nodist_; do
+      for s in '' 1 2 3 4 5 6 7 8 9; do
+        echo "${p1}${p2}man${s}_MANS ="
+      done
+    done
+  done
+
+  for dst in '' dist_ nodist_; do
+    for dir in dataroot data pkgdata doc lisp my; do
+      echo "${dst}${dir}_DATA ="
+    done
+    for dir in include pkginclude oldinclude my; do
+      echo "${dst}${dir}_HEADERS ="
+    done
+    for dir in python my; do
+      echo "${dst}${dir}_PYTHON ="
+    done
+    for dir in info my; do
+      echo "${dst}${dir}_TEXINFOS ="
+    done
+    for dir in java my; do
+      echo "${dst}${dir}_JAVA ="
+    done
+    for dir in lisp my; do
+      echo "${dst}${dir}_LISP ="
+    done
+  done
+
+} > t
+
+cat t >> Makefile.am
+sed 's/^/nobase_/' t >> Makefile.am
+rm -f t
+
+cat Makefile.am # For debugging.
+
+# Sanity check.
+grep '^oldinclude_HEADERS =' Makefile.am \
+  && grep '^nodist_my_PYTHON =' Makefile.am \
+  && grep '^notrans_dist_man5_MANS =' Makefile.am \
+  || fatal_ "creating Makefile.am"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cwd=`pwd` || fatal_ "getting current working directory"
+
+doinst ()
+{
+  $MAKE install install-pdf install-ps install-dvi ${1+"$@"}
+}
+
+: > foo.sh
+
+./configure --prefix="$cwd/inst"
+doinst
+test ! -d inst || { find inst; Exit 1; }
+$MAKE uninstall
+doinst bin_SCRIPTS=foo.sh AM_MAKEFLAGS='bin_SCRIPTS=foo.sh'
+test -f inst/bin/foo.sh
+
+./configure
+doinst DESTDIR="$cwd/dest"
+test ! -d dest || { find dest; Exit 1; }
+$MAKE uninstall
+doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh AM_MAKEFLAGS='bin_SCRIPTS=foo.sh'
+test -f dest/usr/local/bin/foo.sh
+
+:
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
new file mode 100755
index 0000000..e0948c0
--- /dev/null
+++ b/t/instdir-prog.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(bindir), $(libdir) or $(pyexecdir) is the empty string, then
+# nothing should be installed there.
+# This test exercises the prog and libs code paths.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = p
+nobase_bin_PROGRAMS = np sub/np
+lib_LIBRARIES = libfoo.a
+nobase_lib_LIBRARIES = libnfoo.a sub/libnfoo.a
+pyexec_PROGRAMS = py
+nobase_pyexec_PROGRAMS = npy sub/npy
+END
+
+cat >p.c <<'END'
+int main () { return 0; }
+END
+cp p.c np.c
+cp p.c sub/np.c
+cp p.c libfoo.c
+cp p.c libnfoo.c
+cp p.c sub/libnfoo.c
+cp p.c py.c
+cp p.c npy.c
+cp p.c sub/npy.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir" PYTHON="echo" \
+             am_cv_python_pythondir="$instdir/python" \
+             am_cv_python_pyexecdir="$instdir/pyexec"
+$MAKE
+
+bindir= libdir= pyexecdir=
+export bindir libdir pyexecdir
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+# Creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
+cat stdout
+# Creative quoting below to please maintainer-check.
+grep 'rm'' ' stdout && Exit 1
+
+:
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
new file mode 100755
index 0000000..f48353d
--- /dev/null
+++ b/t/instdir-python.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(pythondir) is the empty string, then nothing should be installed there.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<'END'
+python_PYTHON = one.py
+END
+
+cat >one.py <<'END'
+def one(): return 1
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+
+pythondir=
+export pythondir
+
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
new file mode 100755
index 0000000..4e4887a
--- /dev/null
+++ b/t/instdir-texi.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(infodir) is the empty string, then nothing should be installed there.
+# Likewise for the other install-* targets used for texinfo files.
+
+required='makeinfo-html tex texi2dvi'
+. ./defs || Exit 1
+
+dvips --help \
+  || skip_ "dvips is missing"
+pdfetex --version || pdftex --version \
+  || skip_ "pdeftex and pdftex are both missing"
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+info_TEXINFOS = foo.texi
+END
+
+cat >foo.texi << 'END'
+\input texinfo
address@hidden foo.info
address@hidden foo
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE all dvi ps pdf html
+ls -l
+
+infodir= htmldir= dvidir= psdir= pdfdir=
+export infodir htmldir dvidir psdir pdfdir
+
+$MAKE -e install install-html install-dvi install-ps install-pdf
+test ! -d "$instdir"
+$MAKE -e install install-html install-dvi install-ps install-pdf 
DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instdir.sh b/t/instdir.sh
new file mode 100755
index 0000000..f09fdfa
--- /dev/null
+++ b/t/instdir.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(foodir) is the empty string, then nothing should be installed there.
+# This test only ensures this if $(foo_PRIMARY) is also empty, see
+# instdir2.test and siblings instdir-*.test for nonempty contents.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_SUBST([foodir], ['${datadir}'/foo])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_SCRIPTS =
+nobase_bin_SCRIPTS =
+data_DATA =
+nobase_data_DATA =
+include_HEADERS =
+nobase_include_HEADERS =
+foo_DATA =
+nobase_foo_DATA =
+bardir = $(datadir)/bar
+bar_DATA =
+nobase_bar_DATA =
+man1_MANS =
+man_MANS =
+notrans_man1_MANS =
+notrans_man_MANS =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+
+bindir= datadir= includedir= foodir= bardir= man1dir= man2dir=
+export bindir datadir includedir foodir bardir man1dir man2dir
+
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instdir2.sh b/t/instdir2.sh
new file mode 100755
index 0000000..bdfa809
--- /dev/null
+++ b/t/instdir2.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If $(foodir) is the empty string, then nothing should be installed there.
+# This test ensures this also if $(foo_PRIMARY) is nonempty, see
+# instdir.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_SUBST([foodir], ['${datadir}'/foo])
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<'END'
+bin_SCRIPTS = s
+nobase_bin_SCRIPTS = ns sub/ns
+data_DATA = d
+nobase_data_DATA = nd sub/nd
+include_HEADERS = h
+nobase_include_HEADERS = nh sub/nh
+foo_DATA = f
+nobase_foo_DATA = nf sub/nf
+bardir = $(datadir)/bar
+bar_DATA = b
+nobase_bar_DATA = nb sub/nb
+man1_MANS = m1.1
+man_MANS = m.2
+notrans_man1_MANS = nm1.1
+notrans_man_MANS = nm.2
+END
+
+: >s
+: >ns
+: >sub/ns
+: >d
+: >nd
+: >sub/nd
+: >h
+: >nh
+: >sub/nh
+: >f
+: >nf
+: >sub/nf
+: >b
+: >nb
+: >sub/nb
+: >m1.1
+: >m.2
+: >nm1.1
+: >nm.2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+destdir=`pwd`/dest
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+
+bindir= datadir= includedir= foodir= bardir= man1dir= man2dir=
+export bindir datadir includedir foodir bardir man1dir man2dir
+
+$MAKE -e install
+test ! -d "$instdir"
+$MAKE -e install DESTDIR="$destdir"
+test ! -d "$instdir"
+test ! -d "$destdir"
+$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'rm -f' stdout && Exit 1
+$MAKE -e uninstall DESTDIR="$destdir"
+
+:
diff --git a/t/instexec.sh b/t/instexec.sh
new file mode 100755
index 0000000..c033ecd
--- /dev/null
+++ b/t/instexec.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for this bug: when a Makefile.am builds nothing, no
+# install-exec target is generated.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^install-exec:' Makefile.in
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
new file mode 100755
index 0000000..58aef97
--- /dev/null
+++ b/t/instfail-info.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The install rule should honor failures of the install program.
+# Some of these are already caught by instmany.test.
+
+# This test has a few sister tests, for java, info, libtool.
+
+required='makeinfo'
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+info_TEXINFOS = info1.texi info2.texi info3.texi
+END
+
+for n in 1 2 3; do
+  cat >info$n.texi <<END
+\input texinfo
address@hidden info$n.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+./configure --prefix="$instdir"
+$MAKE
+
+$MAKE install
+$MAKE uninstall
+
+for file in info1.info
+do
+  chmod a-r $file
+  test ! -r $file || skip_ "cannot drop file read permissions"
+  $MAKE install-data && Exit 1
+  chmod u+r $file
+done
+
+:
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
new file mode 100755
index 0000000..0ae80f5
--- /dev/null
+++ b/t/instfail-java.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The install rule should honor failures of the install program.
+# Some of these are already caught by instmany.test.
+
+# This is the java sister test of instfail.test.
+
+required=javac
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+javadir = $(datadir)/java
+java_JAVA = java1.java java2.java java3.java
+END
+
+for n in 1 2 3; do
+  echo "class java$n { }" >java$n.java
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+./configure --prefix="$instdir"
+$MAKE
+
+$MAKE install
+$MAKE uninstall
+
+for file in java1.class
+do
+  chmod a-r $file
+  test ! -r $file || skip_ "cannot drop file read permissions"
+  $MAKE install-data && Exit 1
+  chmod u+r $file
+done
+
+:
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
new file mode 100755
index 0000000..0acfd2c
--- /dev/null
+++ b/t/instfail-libtool.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The install rule should honor failures of the install program.
+# Some of these are already caught by instmany.test.
+
+# This is the libtool sister test of instfail.test
+
+required='cc libtool libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = prog1 prog2 prog3
+nobase_bin_PROGRAMS = progn1 progn2 progn3
+lib_LTLIBRARIES = liblt1.la liblt2.la liblt3.la
+nobase_lib_LTLIBRARIES = libltn1.la libltn2.la libltn3.la
+unreadable-prog:
+       chmod a-r prog1$(EXEEXT)
+readable-prog:
+       chmod a+r prog1$(EXEEXT)
+unreadable-progn:
+       chmod a-r progn1$(EXEEXT)
+readable-progn:
+       chmod a+r progn1$(EXEEXT)
+END
+
+for n in 1 2 3; do
+  echo "int main () { return 0; }" > prog$n.c
+  echo "int main () { return 0; }" > progn$n.c
+  echo "int foolt$n () { return 0; }" > liblt$n.c
+  echo "int fooltn$n () { return 0; }" > libltn$n.c
+done
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+./configure --prefix="$instdir"
+$MAKE
+
+$MAKE install
+$MAKE uninstall
+
+for file in liblt1.la libltn1.la
+do
+  chmod a-r $file
+  test ! -r $file || skip_ "cannot drop file read permissions"
+  $MAKE install-exec && Exit 1
+  chmod u+r $file
+done
+
+$MAKE unreadable-prog
+$MAKE install-exec && Exit 1
+$MAKE readable-prog
+
+$MAKE unreadable-progn
+$MAKE install-exec && Exit 1
+$MAKE readable-progn
+
+:
diff --git a/t/instfail.sh b/t/instfail.sh
new file mode 100755
index 0000000..1e5a340
--- /dev/null
+++ b/t/instfail.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The install rule should honor failures of the install program.
+# Some of these are already caught by instmany.test.
+
+# This test has a few sister tests, for java, info, libtool.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_PATH_LISPDIR
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = prog1 prog2 prog3
+nobase_bin_PROGRAMS = progn1 progn2 progn3
+lisp_LISP = lisp1.el lisp2.el lisp3.el
+nobase_lisp_LISP = lispn1.el lispn2.el lispn3.el
+lib_LIBRARIES = lib1.a lib2.a lib3.a
+nobase_lib_LIBRARIES = libn1.a libn2.a libn3.a
+unreadable-prog:
+       chmod a-r prog1$(EXEEXT)
+readable-prog:
+       chmod a+r prog1$(EXEEXT)
+unreadable-progn:
+       chmod a-r progn1$(EXEEXT)
+readable-progn:
+       chmod a+r progn1$(EXEEXT)
+END
+
+for n in 1 2 3; do
+  echo "int main () { return 0; }" > prog$n.c
+  echo "int main () { return 0; }" > progn$n.c
+  echo "int foo$n () { return 0; }" > lib$n.c
+  echo "int foon$n () { return 0; }" > libn$n.c
+  echo >lisp$n.el
+  echo >lispn$n.el
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+./configure --prefix="$instdir"
+$MAKE
+
+$MAKE install
+$MAKE uninstall
+
+for file in lib1.a libn1.a
+do
+  chmod a-r $file
+  test ! -r $file || skip_ "cannot drop file read permissions"
+  $MAKE install-exec && Exit 1
+  chmod u+r $file
+done
+
+$MAKE unreadable-prog
+$MAKE install-exec && Exit 1
+$MAKE readable-prog
+
+$MAKE unreadable-progn
+$MAKE install-exec && Exit 1
+$MAKE readable-progn
+
+if grep "^EMACS = no" Makefile; then :; else
+  for file in lisp1.el lisp1.elc
+  do
+    chmod a-r $file
+    $MAKE install-data && Exit 1
+    chmod u+r $file
+  done
+fi
+
+:
diff --git a/t/insthook.sh b/t/insthook.sh
new file mode 100755
index 0000000..23bc4e0
--- /dev/null
+++ b/t/insthook.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the install-exec-hook example we give in the manual works.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_PROG_LN_S
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<'END'
+dist_bin_SCRIPTS = foo
+
+install-exec-hook:
+       cd "$(DESTDIR)$(bindir)" && \
+       mv -f foo foo-$(VERSION) && \
+       $(LN_S) foo-$(VERSION) foo
+
+installcheck-local:
+       test -f "$(bindir)/foo"
+       test -f "$(bindir)/foo-$(VERSION)"
+       : > $(top_srcdir)/../ok
+
+uninstall-hook:
+       rm -f $(DESTDIR)$(bindir)/foo-$(VERSION)
+END
+
+echo 1 > foo
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distcheck
+# Sanity check to make sure installcheck-local was run.
+test -f ok
+
+# Make sure that installing a second version doesn't erase the first
+# one.  (This is error prone since 'foo' symlinks to 'foo-1.0' and the
+# second version will overwrite 'foo'.  Hopefully 'install' and 'install-sh'
+# are smart enough to erase the 'foo' symlink before installing the new
+# version.)
+./configure "--bindir=`pwd`/bin"
+$MAKE install
+echo 2 > foo
+VERSION=2.0 $MAKE -e install
+grep 1 bin/foo-1.0
+grep 2 bin/foo-2.0
+grep 2 bin/foo
+
+# install-hook is an error.
+cat >>Makefile.am <<EOF
+install-hook:
+       echo test
+EOF
+
+AUTOMAKE_fails
+grep install-data-hook stderr
+grep install-exec-hook stderr
+
+:
diff --git a/t/instman.sh b/t/instman.sh
new file mode 100755
index 0000000..7871045
--- /dev/null
+++ b/t/instman.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the MKDIR_P invocation is correct in install-man
+# target.  Bug reported by Gordon Irlam <address@hidden>.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'EOF'
+man_MANS = frob.8
+EOF
+
+: > frob.8
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '[^(/]MKDIR_P' Makefile.in > out
+test `wc -l < out` -eq 1
diff --git a/t/instman2.sh b/t/instman2.sh
new file mode 100755
index 0000000..04663db
--- /dev/null
+++ b/t/instman2.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure mkinstalldirs invocation correct in install-man
+# target.  Bug reported by Gordon Irlam <address@hidden>.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+man8_MANS = frob.8
+EOF
+
+: > frob.8
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^install-man' Makefile.in
+
+:
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
new file mode 100755
index 0000000..ceb3a9e
--- /dev/null
+++ b/t/instmany-mans.sh
@@ -0,0 +1,141 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Installing many files should not exceed the command line length limit.
+
+# This is the mans sister test of instmany.test, see there for details.
+
+. ./defs || Exit 1
+
+# In order to have a useful test on modern systems (which have a high
+# limit, if any), use a fake install program that errors out for more
+# than 2K characters in a command line.  The POSIX limit is 4096, but
+# that may include space taken up by the environment.
+
+limit=2500
+subdir=long_subdir_name_with_many_characters
+nfiles=81
+list=`seq_ 1 $nfiles`
+
+sed "s|@limit@|$limit|g" >myinstall.in <<'END'
+#! /bin/sh
+# Fake install script.  This doesn't really install
+# (the INSTALL path below would be wrong outside this directory).
address@hidden@
+INSTALL='@INSTALL@'
+len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exit 0
+END
+
+# Creative quoting in the next line to please maintainer-check.
+sed "s|@limit@|$limit|g" >'rm' <<'END'
+#! /bin/sh
address@hidden@
+PATH=$save_PATH
+export PATH
+RM='rm -f'
+len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exec $RM "$@"
+exit 1
+END
+
+chmod +x rm
+
+cat >>configure.ac <<END
+AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
+AC_CONFIG_FILES([$subdir/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+SUBDIRS = $subdir
+END
+
+mkdir $subdir
+cd $subdir
+
+cat >Makefile.am <<'END'
+man_MANS =
+man3_MANS =
+notrans_man_MANS =
+notrans_man3_MANS =
+END
+
+for n in $list; do
+  unindent >>Makefile.am <<END
+    man_MANS += page$n.1
+    man3_MANS += page$n.man
+    notrans_man_MANS += npage$n.1
+    notrans_man3_MANS += npage$n.man
+END
+  echo >page$n.1
+  echo >page$n.man
+  echo >npage$n.1
+  echo >npage$n.man
+done
+
+cd ..
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+# Try whether native install (or install-sh) works.
+$MAKE install
+# Multiple uninstall should work, too.
+$MAKE uninstall
+$MAKE uninstall
+test `find "$instdir" -type f -print | wc -l` = 0
+
+# Try whether we don't exceed the low limit.
+INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
+env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
+
+cd $subdir
+srcdir=../../$subdir
+
+# Ensure 'make install' fails when 'install' fails.
+
+# We cheat here, for efficiency, knowing the internal rule names.
+# For correctness, one should '$MAKE install' here always, or at
+# least use install-exec or install-data.
+
+for file in page3.1 page$nfiles.1 npage3.1 npage$nfiles.1; do
+  chmod a-r $srcdir/$file
+  test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
+  $MAKE install-man1 && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in page3.man page$nfiles.man npage3.man npage$nfiles.man; do
+  chmod a-r $srcdir/$file
+  $MAKE install-man3 && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+:
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
new file mode 100755
index 0000000..d0c5b1a
--- /dev/null
+++ b/t/instmany-python.sh
@@ -0,0 +1,130 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Installing many files should not exceed the command line length limit.
+
+# This is the python sister test of instmany.test, see there for details.
+
+required='python'
+. ./defs || Exit 1
+
+limit=2500
+subdir=long_subdir_name_with_many_characters
+nfiles=81
+list=`seq_ 1 $nfiles`
+
+sed "s|@limit@|$limit|g" >myinstall.in <<'END'
+#! /bin/sh
+# Fake install script.  This doesn't really install
+# (the INSTALL path below would be wrong outside this directory).
address@hidden@
+INSTALL='@INSTALL@'
+len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exit 0
+END
+
+# Creative quoting in the next line to please maintainer-check.
+sed "s|@limit@|$limit|g" >'rm' <<'END'
+#! /bin/sh
address@hidden@
+PATH=$save_PATH
+export PATH
+RM='rm -f'
+len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exec $RM "$@"
+exit 1
+END
+
+chmod +x rm
+
+cat >>configure.ac <<END
+AM_PATH_PYTHON
+AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
+AC_CONFIG_FILES([$subdir/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+SUBDIRS = $subdir
+END
+
+mkdir $subdir
+cd $subdir
+
+cat >Makefile.am <<'END'
+python_PYTHON =
+nobase_python_PYTHON =
+END
+
+for n in $list; do
+  unindent >>Makefile.am <<END
+    python_PYTHON += python$n.py
+    nobase_python_PYTHON += npython$n.py
+END
+  echo >python$n.py
+  echo >npython$n.py
+done
+
+cd ..
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+# Try whether native install (or install-sh) works.
+$MAKE install
+# Multiple uninstall should work, too.
+$MAKE uninstall
+$MAKE uninstall
+test `find "$instdir" -type f -print | wc -l` = 0
+
+# Try whether we don't exceed the low limit.
+INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
+env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
+
+cd $subdir
+srcdir=../../$subdir
+
+# Ensure 'make install' fails when 'install' fails.
+
+for file in python3.py python$nfiles.py
+do
+  chmod a-r $srcdir/$file
+  test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
+  $MAKE install && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in npython3.py npython$nfiles.py
+do
+  chmod a-r $srcdir/$file
+  $MAKE install && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+:
diff --git a/t/instmany.sh b/t/instmany.sh
new file mode 100755
index 0000000..d334ebe
--- /dev/null
+++ b/t/instmany.sh
@@ -0,0 +1,185 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Installing many files should not exceed the command line length limit.
+# Here, the main issue is that we may prepend '$(srcdir)/' to each file,
+# which may cause much longer command lines.  The list of files must
+# anyway remain below the limit, otherwise 'make' won't be able to even
+# fork the command.
+#
+# Further, the install rule should honor failures of the install program.
+
+# Python is done in the sister test.
+# For texinfos, we expand names using $(srcdir) in the first place.
+# Let's hope nobody uses many texinfos.
+
+. ./defs || Exit 1
+
+# In order to have a useful test on modern systems (which have a high
+# limit, if any), use a fake install program that errors out for more
+# than 2K characters in a command line.  The POSIX limit is 4096, but
+# that may include space taken up by the environment.
+
+limit=2500
+subdir=long_subdir_name_with_many_characters
+nfiles=81
+list=`seq_ 1 $nfiles`
+
+sed "s|@limit@|$limit|g" >myinstall.in <<'END'
+#! /bin/sh
+# Fake install script.  This doesn't really install
+# (the INSTALL path below would be wrong outside this directory).
address@hidden@
+INSTALL='@INSTALL@'
+len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exit 0
+END
+
+# Creative quoting in the next line to please maintainer-check.
+sed "s|@limit@|$limit|g" >'rm' <<'END'
+#! /bin/sh
address@hidden@
+PATH=$save_PATH
+export PATH
+RM='rm -f'
+len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
+if test $len -ge $limit; then
+  echo "$0: safe command line limit of $limit characters exceeded" >&2
+  exit 1
+fi
+exec $RM "$@"
+exit 1
+END
+
+chmod +x rm
+
+cat >>configure.ac <<END
+AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
+AC_CONFIG_FILES([$subdir/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+SUBDIRS = $subdir
+END
+
+mkdir $subdir
+cd $subdir
+
+cat >Makefile.am <<'END'
+bin_SCRIPTS =
+nobase_bin_SCRIPTS =
+data_DATA =
+nobase_data_DATA =
+include_HEADERS =
+nobase_include_HEADERS =
+END
+
+for n in $list; do
+  unindent >>Makefile.am <<END
+    bin_SCRIPTS += script$n
+    nobase_bin_SCRIPTS += nscript$n
+    data_DATA += data$n
+    nobase_data_DATA += ndata$n
+    include_HEADERS += header$n.h
+    nobase_include_HEADERS += nheader$n.h
+END
+  echo >script$n
+  echo >nscript$n
+  echo >data$n
+  echo >ndata$n
+  echo >header$n.h
+  echo >nheader$n.h
+done
+
+cd ..
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+instdir=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="$instdir"
+$MAKE
+# Try whether native install (or install-sh) works.
+$MAKE install
+# Multiple uninstall should work, too.
+$MAKE uninstall
+$MAKE uninstall
+test `find "$instdir" -type f -print | wc -l` = 0
+
+# Try whether we don't exceed the low limit.
+INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
+env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
+
+cd $subdir
+srcdir=../../$subdir
+
+# Ensure 'make install' fails when 'install' fails.
+
+# We cheat here, for efficiency, knowing the internal rule names.
+# For correctness, one should '$MAKE install' here always, or at
+# least use install-exec or install-data.
+
+for file in script3 script$nfiles
+do
+  chmod a-r $srcdir/$file
+  test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
+  $MAKE install-binSCRIPTS && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in nscript3 nscript$nfiles
+do
+  chmod a-r $srcdir/$file
+  $MAKE install-nobase_binSCRIPTS && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in data3 data$nfiles
+do
+  chmod a-r $srcdir/$file
+  $MAKE install-dataDATA && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in ndata3 ndata$nfiles
+do
+  chmod a-r $srcdir/$file
+  $MAKE install-nobase_dataDATA && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in header3.h header$nfiles.h
+do
+  chmod a-r $srcdir/$file
+  $MAKE install-includeHEADERS && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+for file in nheader3.h nheader$nfiles.h
+do
+  chmod a-r $srcdir/$file
+  $MAKE install-nobase_includeHEADERS && Exit 1
+  chmod u+r $srcdir/$file
+done
+
+:
diff --git a/t/instsh.sh b/t/instsh.sh
new file mode 100755
index 0000000..1fd1b3b
--- /dev/null
+++ b/t/instsh.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for this bug:
+# automake: Makefile.am: required file "../../install-sh" not found; installing
+# This also makes sure that install-sh is created in the correct directory.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+rm -f install-sh
+
+# Since the default path includes '../..', we must run this test in
+# yet another subdir.
+mkdir frob
+mv Makefile.am configure.ac frob/
+cd frob
+
+$ACLOCAL
+$AUTOMAKE --add-missing > output 2>&1
+
+# Only one '/' should appear in the output.
+cat output
+grep '/.*/' output && Exit 1
+
+test -f install-sh
diff --git a/t/instsh2.sh b/t/instsh2.sh
new file mode 100755
index 0000000..054beb9
--- /dev/null
+++ b/t/instsh2.sh
@@ -0,0 +1,118 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Various install-sh checks.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script install-sh
+
+# Basic errors.
+./install-sh && Exit 1
+./install-sh -m 644 dest && Exit 1
+
+# Directories.
+
+# It should be OK to create no directory.  We sometimes need
+# this when directory are conditionally defined.
+./install-sh -d
+# One directory.
+./install-sh -d d0
+test -d d0
+# Multiple directories (for make installdirs).
+./install-sh -d d1 d2 d3 d4
+test -d d1
+test -d d2
+test -d d3
+test -d d4
+# Subdirectories.
+./install-sh -d p1/p2/p3 p4//p5//p6//
+test -d p1/p2/p3
+test -d p4/p5/p6
+
+# Files.
+: > x
+./install-sh -c -m 644 x y
+test -f x
+test -f y
+./install-sh -m 644 y z
+test -f y
+test -f z
+# Multiple files.
+./install-sh -m 644 -c x z d1
+test -f x
+test -f z
+test -f d1/x
+test -f d1/z
+./install-sh -m 644 x z d2//
+test -f x
+test -f z
+test -f d2/x
+test -f d2/z
+./install-sh -t d3 -m 644 x z
+test -f x
+test -f z
+test -f d3/x
+test -f d3/z
+./install-sh -t d4// -m 644 x z
+test -f x
+test -f z
+test -f d4/x
+test -f d4/z
+./install-sh -T x d3/y
+test -f x
+test -f d3/y
+./install-sh -T x d3 && Exit 1
+./install-sh -T x d4// && Exit 1
+
+# Ensure that install-sh works with names that include spaces.
+touch 'a  b'
+mkdir 'x  y'
+./install-sh 'a  b' 'x  y'
+test -f x\ \ y/a\ \ b
+test -f 'a  b'
+
+# Ensure we do not run into 'test' operator precedence bugs with Tru64 sh.
+for c in = '(' ')' '!'; do
+  ./install-sh $c 2>stderr && { cat stderr >&2; Exit 1; }
+  cat stderr >&2
+  grep 'test: ' stderr && Exit 1
+  # Skip tests if the file system is not capable.
+  mkdir ./$c || continue
+  rmdir ./$c
+  ./install-sh -d $c/$c/$c
+  rm -rf ./$c
+  ./install-sh -d $c d5/$c/$c
+  test -d ./$c
+  test -d d5/$c/$c
+  ./install-sh x $c
+  test -f ./$c/x
+  rm -f ./$c/x
+  ./install-sh -t $c x
+  test -f ./$c/x
+  rm -rf ./$c
+  ( : > ./$c ) || continue
+  ./install-sh $c x d5/$c/$c
+  test -f d5/$c/$c/x
+  test -f d5/$c/$c/$c
+  rm -f d5/$c/$c/?
+  ./install-sh -t d5/$c/$c $c x
+  test -f d5/$c/$c/x
+  test -f d5/$c/$c/$c
+done
+
+:
diff --git a/t/instsh3.sh b/t/instsh3.sh
new file mode 100755
index 0000000..3a527cb
--- /dev/null
+++ b/t/instsh3.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# More install-sh checks: check -C.
+
+am_create_testdir=empty
+required=non-root
+. ./defs || Exit 1
+
+# Solaris /usr/ucb/touch does not accept -t.
+touch -t $old_timestamp foo \
+  || skip_ "touch utility doesn't accept '-t' option"
+
+get_shell_script install-sh
+
+./install-sh -d d1
+
+# Do not change the timestamps when using -C.
+echo foo >file
+./install-sh -C file d1
+TZ=UTC0 touch -t $old_timestamp d1/file
+./install-sh -C file d1
+is_newest file d1/file
+echo foo1 >file
+./install-sh -C file d1
+diff file d1/file
+# Rights must be updated.
+./install-sh -C -m 444 file d1
+test -r d1/file
+test ! -w d1/file
diff --git a/t/instspc.tap b/t/instspc.tap
new file mode 100755
index 0000000..cbe0fdf
--- /dev/null
+++ b/t/instspc.tap
@@ -0,0 +1,335 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that building from, or installing to, directories with shell
+# metacharacters succeed.
+# Original report from James Amundson about file names with spaces.
+# Other characters added by Paul Eggert.
+
+. ./defs || Exit 99
+
+# Usage: is_in_list ITEM [LIST...]
+is_in_list ()
+{
+  item=$1; shift;
+  case " $* " in
+    *[\ \      ]"$item"[\ \    ]*) return 0;;
+    *) return 1;;
+  esac
+}
+
+# Helper subroutine for test data definition.
+# Usage: define_problematic_string NAME STRING
+define_problematic_string ()
+{
+  tst=$1; shift
+  eval "instspc__$tst=\$1" \
+    || fatal_ "define_problematic_string: bad argument: '$tst'"
+  shift
+  all_test_names_list="$all_test_names_list $tst"
+  # Some of the "problematic" characters cannot be used in the name of
+  # a build or install directory on a POSIX host.  These lists should
+  # be empty, but are not due to limitations in Autoconf, Automake, Make,
+  # M4, or the shell.
+  if is_in_list fail-builddir "$@"; then
+    builddir_xfails="$builddir_xfails $tst"
+  fi
+  if is_in_list fail-destdir "$@"; then
+    destdir_xfails="$destdir_xfails $tst"
+  fi
+}
+
+# Be sure to avoid interferences from the environment.
+all_test_names_list=''
+builddir_xfails=''
+destdir_xfails=''
+
+expected_to_fail ()
+{
+   case $1 in
+     build) is_in_list "$2" $builddir_xfails;;
+      dest) is_in_list "$2" $destdir_xfails;;
+         *) fatal_ "incorrect 'expected_to_fail' usage";;
+   esac
+}
+
+# Helper subroutines for creation of input data files.
+create_input_data ()
+{
+  mkdir sub
+
+  unindent >> configure.ac << 'EOF'
+    AC_PROG_CC
+    AM_PROG_AR
+    AC_PROG_RANLIB
+    AC_OUTPUT
+EOF
+
+  : > sub/base.h
+  : > sub/nobase.h
+  : > sub/base.dat
+  : > sub/nobase.dat
+  : > sub/base.sh
+  : > sub/nobase.sh
+
+  unindent > source.c << 'EOF'
+    int
+    main (int argc, char **argv)
+    {
+      return 0;
+    }
+EOF
+
+  unindent > Makefile.am << 'EOF'
+    foodir = $(prefix)/foo
+    fooexecdir = $(prefix)/foo
+
+    foo_HEADERS = sub/base.h
+    nobase_foo_HEADERS = sub/nobase.h
+
+    dist_foo_DATA = sub/base.dat
+    nobase_dist_foo_DATA = sub/nobase.dat
+
+    dist_fooexec_SCRIPTS = sub/base.sh
+    nobase_dist_fooexec_SCRIPTS = sub/nobase.sh
+
+    fooexec_PROGRAMS = sub/base
+    nobase_fooexec_PROGRAMS = sub/nobase
+    sub_base_SOURCES = source.c
+    sub_nobase_SOURCES = source.c
+
+    fooexec_LIBRARIES = sub/libbase.a
+    nobase_fooexec_LIBRARIES = sub/libnobase.a
+    sub_libbase_a_SOURCES = source.c
+    sub_libnobase_a_SOURCES = source.c
+
+    .PHONY: test-inst
+    test-inst: install
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.h'
+       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.h'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.h'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.dat'
+       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.dat'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.dat'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.sh'
+       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.sh'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.sh'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase$(EXEEXT)'
+       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase$(EXEEXT)'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/base$(EXEEXT)'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/libnobase.a'
+       test ! -f '$(DESTDIR)/$(file)-prefix/foo/libnobase.a'
+       test   -f '$(DESTDIR)/$(file)-prefix/foo/libbase.a'
+EOF
+
+  $ACLOCAL     || framework_failure_ "aclocal failed"
+  $AUTOCONF    || framework_failure_ "autoconf failed"
+  $AUTOMAKE -a || framework_failure_ "automake failed"
+}
+
+# ================= #
+#  Test data begin  #
+# ----------------- #
+
+# Some control characters that are white space.
+bs=''   # back space
+cr='
'   # carriage return
+ff=''   # form feed
+ht='   ' # horizontal tab
+lf='
+'         # line feed (aka newline)
+
+# Hack to save typing and make code visually clearer.
+def=define_problematic_string
+
+$def    squote          \'          fail-builddir  fail-destdir
+$def    dquote          '"'         fail-builddir  fail-destdir
+$def    bquote          '`'         fail-builddir  fail-destdir
+$def    sharp           '#'         fail-builddir  fail-destdir
+$def    dollar          '$'         fail-builddir  fail-destdir
+$def    bang            '!'
+$def    bslash          '\'         fail-builddir
+$def    ampersand       '&'         fail-builddir
+$def    percent         '%'
+$def    leftpar         '('
+$def    rightpar        ')'
+$def    pipe            '|'
+$def    caret           '^'
+$def    tilde           '~'
+$def    qmark           '?'
+$def    star            '*'
+$def    plus            '+'
+$def    minus           '-'
+$def    comma           ','
+$def    colon           ':'
+$def    semicol         ';'
+$def    equal           '='
+$def    less            '<'
+$def    more            '>'
+$def    at              '@'
+$def    lqbrack         '['
+$def    rqbrack         ']'
+$def    lcbrack         '{'
+$def    rcbrack         '}'
+$def    space           ' '
+$def    tab             "$ht"
+$def    linefeed        "$lf"       fail-builddir  fail-destdir
+$def    backspace       "$bs"
+$def    formfeed        "$ff"
+$def    carriageret     "$cr"
+$def    quadrigraph0    '@&t@'      fail-builddir
+$def    quadrigraph1    '@<:@'
+$def    quadrigraph2    '@:>@'
+$def    quadrigraph3    '@S|@'
+$def    quadrigraph4    '@%:@'
+$def    a_b             'a b'
+$def    a__b            'a  b'
+$def    a_lf_b          "a${lf}b"   fail-builddir  fail-destdir
+$def    dotdotdot       '...'
+$def    dosdrive        'a:'
+$def    miscglob1       '?[a-z]*'
+$def    miscglob2       '.*?[0-9]'
+
+unset def
+
+# --------------- #
+#  Test data end  #
+# =============== #
+
+# Allow the user to select a subset of the tests.
+if test $# -gt 0; then
+  test_names_list=$*
+  for test_name in $test_names_list; do
+    case " $all_test_names_list " in
+      *" $test_name "*);;
+      *) fatal_ "invalid user-specified test_name '$test_name'"
+    esac
+  done
+  # We need to determine the TAP plan adaptively.
+  n=`for t in $test_names_list; do echo $t; done | wc -l`
+  plan_ `expr $n '*' 2` # Two tests per "problematic string".
+  unset n
+else
+  test_names_list=$all_test_names_list
+  # Prefer static TAP plan if possible, it minimizes the chance of errors.
+  plan_ 94
+fi
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+create_input_data
+
+for test_name in $test_names_list; do
+
+  eval "test_string=\${instspc__$test_name}" \
+    || fatal_ "invalid test name: '$test_name'"
+
+  if test x"$test_string" = x; then
+    if test x"$test_name" != xcarriageret; then
+      fatal_ "invalid test name: '$test_name'"
+    else
+      # MSYS version 1.0.17 still mishandles carriage returns; see
+      # automake bug#7849.
+      skip_ -r "carriage-return treated as null char" "$test_name in builddir"
+      skip_ -r "carriage-return treated as null char" "$test_name in destdir"
+      continue
+    fi
+  fi
+
+  # Skip the next checks if this system doesn't support the required
+  # characters in file names.
+
+  mkdir "./$test_string" || {
+    skip_ -r "mkdir failed" "$test_name in builddir"
+    skip_ -r "mkdir failed" "$test_name in destdir"
+    continue
+  }
+
+  case $test_string in
+  *:*)
+    # On MSYS 1.0.17, "mkdir ./a:" creates ./a, and "cd ./a:" takes you
+    # to a strange directory with pwd equal to "a".  But only for
+    # interactive shells.  Or something?  In this script, "cd ./a:" fails
+    # on MSYS.  Marvelous.
+    ( cd "./$test_string" ) || {
+      rmdir "./$test_string" || fatal_ "removing directory"
+      skip_ -r "cd failed" "$test_name in builddir"
+      skip_ -r "cd failed" "$test_name in destdir"
+      continue
+    }
+    ;;
+  esac
+
+  # Where are the "weird" characters going to be used, in $(builddir)
+  # or in $(DESTDIR)?  They are always going to be used in $(prefix)
+  # though; should we maybe separate this into a dedicated check?
+  for where in build dest; do
+
+    case $where in
+      build)
+        build=./$test_string
+        dest=$ocwd/dest-$test_name
+        ;;
+      dest)
+        build=build-$test_name
+        dest=$ocwd/$test_string
+        mkdir "$build" || fatal_ "cannot create '$build'"
+        ;;
+      *)
+        fatal_ "invalid where '$where'"
+        ;;
+    esac
+
+    cd "$build" || fatal_ "cannot chdir into '$build'"
+
+    # Some make implementations eliminate leading and trailing whitespace
+    # from macros passed on the command line, and some eliminate leading
+    # whitespace from macros set from environment variables, so prepend
+    # './' and use the latter here.
+    r=ok
+    ../configure --prefix "/$test_string-prefix" \
+      && $MAKE all \
+      && DESTDIR="$dest" file="./$test_string" $MAKE -e test-inst \
+      || r='not ok'
+
+    description="$test_name in ${where}dir"
+    if expected_to_fail "$where" "$test_name"; then
+      directive=TODO
+      reason="long-standing limitation"
+    else
+      directive=
+      reason=
+    fi
+    # Test case outcome is here.
+    result_ "$r" -D "$directive" -r "$reason" -- "$description"
+
+    cd "$ocwd" || fatal_ "cannot chdir back to test directory"
+
+    # Remove subdirectories for tests that have passed, to avoid ending up
+    # with a too big test directory.  This is especially important since
+    # some tests in this tests are expected to fail, and this will cause
+    # the test directory not to be removed when the script terminates.
+    if not am_keeping_testdirs && test "$r" = ok; then
+      rm_rf_ "$build" "$dest" || fatal_ "removing temporary subdirectory"
+    else
+      : For lesser shells with broken 'set -e'.
+    fi
+
+  done # $instspc_action
+
+done # $test_name
+
+:
diff --git a/t/interp.sh b/t/interp.sh
new file mode 100755
index 0000000..b45d449
--- /dev/null
+++ b/t/interp.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure variable interpolation works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+xs = a.c b.c
+foo_SOURCES = c.c $(xs)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP ' a.$(OBJEXT)' Makefile.in
+$FGREP ' b.$(OBJEXT)' Makefile.in
+$FGREP ' c.$(OBJEXT)' Makefile.in
+
+:
diff --git a/t/interp2.sh b/t/interp2.sh
new file mode 100755
index 0000000..3ce33e2
--- /dev/null
+++ b/t/interp2.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure variable interpolation doesn't break other
+# features.  Report from Joel N. Weber, II.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PATH_X
+AC_PATH_XTRA
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = x
+x_SOURCES = x.c
+x_LDADD = $(X_EXTRA_LIBS)
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/java-check.sh b/t/java-check.sh
new file mode 100755
index 0000000..230fb96
--- /dev/null
+++ b/t/java-check.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that check_JAVA causes *.class files to be built only with
+# "make check", and not also with "make all".
+# See automake bug#8234.
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+check_JAVA = One.java Two.java
+END
+
+cat > One.java <<'END'
+class One { }
+END
+
+cat > Two.java <<'END'
+class Two { // Deliberately missing closing bracket.
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+inst=`pwd`/_inst
+
+./configure --prefix="$inst"
+
+$MAKE
+ls | $EGREP '\.(class|stamp)$' && Exit 1
+
+# Make Two.java compilable.
+echo '}' >> Two.java
+
+# "make check" should compile files in $(check_JAVA) ...
+$MAKE check
+ls -l # For debugging.
+test -f One.class
+test -f Two.class
+# ... but should *not* install them.
+$FGREP checkdir Makefile && Exit 1
+$MAKE install
+test -d _inst && Exit 1
+
+:
diff --git a/t/java-clean.sh b/t/java-clean.sh
new file mode 100755
index 0000000..2399201
--- /dev/null
+++ b/t/java-clean.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test cleaning of Java class files and timestamps.
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+
+java_JAVA = Class.java
+dist_java_JAVA = ClassDist.java
+nodist_java_JAVA = ClassNodist.java
+
+nobase_java_JAVA = ClassNobase.java
+nobase_dist_java_JAVA = ClassNobaseDist.java
+nobase_nodist_java_JAVA = ClassNobaseNodist.java
+END
+
+for base in '' Nobase; do
+  for dist in '' Dist Nodist; do
+    echo "class Class$base$dist {}" > Class$base$dist.java
+  done
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+ls -l
+test -f classjava.stamp
+for base in '' Nobase; do
+  for dist in '' Dist Nodist; do
+    test -f Class$base$dist.class
+  done
+done
+$MAKE clean
+find . -name '*.class' -o -name '*.stamp' | grep . && Exit 1
+# We should not remove unrelated stamp files.
+echo timestamp > classjava2.stamp
+echo timestamp > classdist_java.stamp
+$MAKE clean
+test -f classjava2.stamp
+test -f classdist_java.stamp
+
+:
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
new file mode 100755
index 0000000..f3340ff
--- /dev/null
+++ b/t/java-compile-install.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on compilation and installation of Java class files.
+
+required=javac
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+java_JAVA = Foo.java
+nobase_java_JAVA = Foo2.java
+nobase_dist_java_JAVA = Bar.java
+nodist_java_JAVA = Baz.java
+
+# Java files are not distributed by default, so we distribute
+# one "by hand" ...
+EXTRA_DIST = Foo.java
+# ... and make the other one generated.
+Foo2.java:
+       rm -f $@ address@hidden
+       echo 'class bClass {}' > address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+# Explicitly declared as 'nodist_', so generate it.
+Baz.java:
+       rm -f $@ address@hidden
+       echo 'class Baz {}' > address@hidden
+       echo 'class Baz2 {}' >> address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+test:
+       ls -l $(srcdir) . ;: For debugging.
+       test   -f $(srcdir)/Foo.java
+       test   -f $(srcdir)/Bar.java
+       test   -f Foo2.java
+       test   -f Baz.java
+       test   -f aClass.class
+       test   -f bClass.class
+       test   -f Zardoz.class
+       test   -f Baz.class
+       test   -f Baz2.class
+       test ! -r Foo.class
+       test ! -r Bar.class
+       test   -f classjava.stamp
+
+test-install:
+       ls -l $(javadir) ;: For debugging.
+       test   -f '$(javadir)/bClass.class'
+       test   -f '$(javadir)/aClass.class'
+       test   -f '$(javadir)/Zardoz.class'
+       test   -f '$(javadir)/Baz.class'
+       test   -f '$(javadir)/Baz2.class'
+       test ! -r '$(javadir)/Foo.class'
+       test ! -r '$(javadir)/Bar.class'
+       if find $(prefix) | grep '\.stamp$$'; then exit 1; else :; fi
+
+check-local: test
+installcheck-local: test-install
+
+.PHONY: test test-install
+
+DISTCLEANFILES = Baz.java Foo2.java
+END
+
+echo 'class aClass {}' > Foo.java
+echo 'class Zardoz {}' > Bar.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --prefix="`pwd`"/_inst
+$MAKE
+$MAKE test
+$MAKE install
+$MAKE test-install
+$MAKE distcheck
+
+:
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
new file mode 100755
index 0000000..79083af
--- /dev/null
+++ b/t/java-compile-run-flat.sh
@@ -0,0 +1,241 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on compilation and execution of Java class files.
+# Also meddle with wrapper scripts, as would be probably seen in a real
+# "UNIX-style" use case.
+# This test uses a "flat" setup for the source tree (i.e., everything in
+# the top-level directory), and forces the use of the old, non-parallel
+# testsuite driver.  The sister test 'java-compile-run-nested.test' do
+# similar checks with a more usual, "nested" setup, and using the newer
+# 'parallel-tests' driver.
+
+required='java javac'
+am_parallel_tests=no
+. ./defs || Exit 1
+
+echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
+
+cat >> configure.ac <<'END'
+AC_SUBST([JAVA], [java])
+AC_CONFIG_SRCDIR([PkgLocation.jin])
+AC_CONFIG_FILES([PkgLocation.java:PkgLocation.jin])
+AC_OUTPUT
+END
+
+## TOP-LEVEL SETUP AND TARGETS ##
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = # Will be updated later.
+
+test-built:
+       ls -l $(srcdir)               ;: For debugging.
+       test $(srcdir) = . || ls -l . ;: Likewise.
+       test -f $(srcdir)/Main.java
+       test -f $(srcdir)/HelloStream.java
+       test -f $(srcdir)/PkgLocation.jin
+       test -f PkgLocation.java
+       test -f HelloStream.class
+       test -f PkgLocation.class
+       test -f Main.class
+       test -f classjava.stamp
+
+test-installed:
+       ls -l $(javadir) ;: For debugging.
+       test -f $(javadir)/HelloStream.class
+       test -f $(javadir)/PkgLocation.class
+       test -f $(javadir)/Main.class
+       if find $(prefix) | grep '\.stamp$$'; then exit 1; else :; fi
+
+run-installed:
+       jprog_doing_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+
+check-local: test-built
+installcheck-local: test-installed run-installed
+
+.PHONY: test-built test-installed run-installed
+END
+
+## WRAPPER SCRIPT ##
+
+cat >> Makefile.am <<'END'
+bin_SCRIPTS = jprog
+
+edit_script = sed -e 's|address@hidden@|$(JAVA)|g' \
+                  -e 's|address@hidden@|$(javadir)|g' \
+                  -e 's|address@hidden@|$(SHELL)|g' \
+                  -e 's|address@hidden@|$(PATH_SEPARATOR)|g'
+
+jprog: jprog.sh
+       rm -f $@ address@hidden
+       $(edit_script) `test -f 'address@hidden' || echo 
$(srcdir)/address@hidden >address@hidden
+       chmod a-w address@hidden && chmod a+x address@hidden && mv -f 
address@hidden $@
+       sed 's/^/ | /' $@ ;: for debugging.
+
+EXTRA_DIST += jprog.sh
+CLEANFILES = jprog
+END
+
+cat > jprog.sh <<'END'
address@hidden@
+CLASSPATH=${jprog_classpath-'@javadir@'}${CLASSPATH+"@address@hidden"}
+export CLASSPATH
+case $# in
+  0) exec @JAVA@ Main;;
+  *) exec @JAVA@ Main "$@";;
+esac
+END
+
+## JAVA SOURCES ##
+
+cat >> Makefile.am <<'END'
+javadir = $(pkgdatadir)/java
+
+dist_java_JAVA = Main.java HelloStream.java
+nodist_java_JAVA = PkgLocation.java
+END
+
+cat > PkgLocation.jin <<'END'
+public class PkgLocation {
+    public static String prefix() {
+        return new String("@prefix@");
+    }
+}
+END
+
+cat > Main.java <<'END'
+public class Main {
+    public static void main(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equals("--print-prefix")) {
+                System.out.println(PkgLocation.prefix());
+            } else if (args[i].equals("--hello-stdout")) {
+                HelloStream.to(System.out);
+            } else if (args[i].equals("--hello-stderr")) {
+                HelloStream.to(System.err);
+            } else {
+               System.err.println("jprog: invalid option '" + args[i] +
+                                  "'");
+               System.exit(2);
+            }
+        }
+        System.exit(0);
+    }
+}
+END
+
+cat > HelloStream.java <<'END'
+import java.io.PrintStream;
+class HelloStream {
+    public static void to(PrintStream stream) {
+        stream.println("Hello, Stream!");
+    }
+}
+END
+
+## TESTS ##
+
+cat >> Makefile.am <<'END'
+## We must use 'TESTS_ENVIRONMENT', not 'AM_TESTS_ENVIRONMENT',
+## because the latter is not hnoured by the old serial test
+## harness.
+TESTS_ENVIRONMENT = \
+    if test x"$$jprog_doing_installcheck" != x"yes"; then \
+        jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
+        export jprog_classpath; \
+        PATH='$(abs_top_builddir)$(PATH_SEPARATOR)'$$PATH; \
+        export PATH; \
+    else \
+        unset jprog_classpath || :; \
+        PATH='$(prefix)/bin$(PATH_SEPARATOR)'$$PATH; \
+        export PATH; \
+    fi; \
+    config_time_prefix='@prefix@'; export config_time_prefix;
+
+TESTS = \
+  simple.test \
+  prefix.test \
+  stdout.test \
+  stderr.test \
+  badarg.test
+
+XFAIL_TESTS = badarg.test
+
+EXTRA_DIST += $(TESTS)
+END
+
+cat > simple.test <<'END'
+#!/bin/sh
+jprog
+END
+
+cat > prefix.test <<'END'
+#!/bin/sh
+jprefix=`jprog --print-prefix` || exit 1
+echo "$0: exp prefix: $config_time_prefix"
+echo "$0: got prefix: $jprefix"
+test x"$jprefix" = x"$config_time_prefix"
+END
+
+cat > stdout.test <<'END'
+#!/bin/sh
+rc=0
+jprog --hello-stdout >stdout.out 2>stdout.err || { echo \$?=$?; rc=1; }
+sed 's/^/out:/' <stdout.out      # For debugging.
+sed 's/^/err:/' <stdout.err >&2  # Likewise.
+test -s stdout.err && rc=1
+test "`cat stdout.out`" = 'Hello, Stream!' || rc=1
+rm -f stdout.out stdout.err || rc=1
+exit $rc
+END
+
+cat > stderr.test <<'END'
+#!/bin/sh
+rc=0
+jprog --hello-stderr >stderr.out 2>stderr.err || { echo \$?=$?; rc=1; }
+sed 's/^/out:/' <stderr.out      # For debugging.
+sed 's/^/err:/' <stderr.err >&2  # Likewise.
+test -s stderr.out && rc=1
+test "`cat stderr.err`" = 'Hello, Stream!' || rc=1
+rm -f stderr.out stderr.err || rc=1
+exit $rc
+END
+
+cat > badarg.test <<'END'
+#!/bin/sh
+jprog --bad-argument
+END
+
+chmod a+x *.test
+
+## DO CHECKS ##
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# To have the parallel testsuite more verbose.
+VERBOSE=yes; export VERBOSE
+
+./configure --prefix="`pwd`/_inst"
+cat PkgLocation.java # For debugging.
+$MAKE check
+$MAKE install
+$MAKE test-installed
+$MAKE run-installed
+$MAKE distcheck
+
+:
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
new file mode 100755
index 0000000..d4a7800
--- /dev/null
+++ b/t/java-compile-run-nested.sh
@@ -0,0 +1,251 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on compilation and execution of Java class files.
+# Also meddle with wrapper scripts, as would be probably seen in a real
+# "UNIX-style" use case.
+# This test uses a typical "nested" source tree setup (i.e., different
+# components/aspects are separated into different subdirectories),
+# and uses the 'parallel-tests' testsuite driver.  The sister test
+# 'java-compile-run-flat.test' do similar checks with a "flat" setup
+# (i.e., everything in the top-level directory), and forcing the use
+# of the older non-parallel 'simple-tests' driver.
+
+required='java javac'
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
+
+cat >> configure.ac <<'END'
+AC_SUBST([JAVA], [java])
+AC_CONFIG_SRCDIR([jprog/PkgLocation.jin])
+AC_SUBST([jprogdatadir],  ['${pkgdatadir}'])
+AC_SUBST([jprogclassdir], ['${jprogdatadir}/jprog'])
+AC_CONFIG_FILES([jprog/PkgLocation.java:jprog/PkgLocation.jin])
+AC_CONFIG_FILES([jprog/Makefile bin/Makefile tests/Makefile])
+AC_OUTPUT
+END
+
+## TOP-LEVEL SETUP AND TARGETS ##
+
+cat > Makefile.am <<'END'
+SUBDIRS = bin jprog tests
+
+test-built:
+       ls -l $(srcdir)/*             ;: For debugging.
+       test $(srcdir) = . || ls -l * ;: Likewise.
+       test -f $(srcdir)/jprog/Main.java
+       test -f $(srcdir)/jprog/HelloStream.java
+       test -f $(srcdir)/jprog/PkgLocation.jin
+       test -f jprog/PkgLocation.java
+       test -f jprog/HelloStream.class
+       test -f jprog/Main.class
+       test -f jprog/PkgLocation.class
+       test -f jprog/classjprogclass.stamp
+
+test-installed:
+       ls -l $(jprogclassdir) ;: For debugging.
+       test -f $(jprogclassdir)/HelloStream.class
+       test -f $(jprogclassdir)/Main.class
+       test -f $(jprogclassdir)/PkgLocation.class
+       if find $(prefix) | grep '\.stamp$$'; then exit 1; else :; fi
+
+run-installed:
+       jprog_doing_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+
+check-local: test-built
+installcheck-local: test-installed run-installed
+
+.PHONY: test-built test-installed run-installed
+END
+
+## WRAPPER SCRIPT ##
+
+mkdir bin
+
+cat > bin/Makefile.am <<'END'
+bin_SCRIPTS = jprog
+
+edit_script = sed -e 's|address@hidden@|$(JAVA)|g' \
+                  -e 's|address@hidden@|$(jprogdatadir)|g' \
+                  -e 's|address@hidden@|$(SHELL)|g' \
+                  -e 's|address@hidden@|$(PATH_SEPARATOR)|g'
+
+jprog: jprog.sh
+       rm -f $@ address@hidden
+       $(edit_script) `test -f 'address@hidden' || echo 
$(srcdir)/address@hidden >address@hidden
+       chmod a-w address@hidden && chmod a+x address@hidden && mv -f 
address@hidden $@
+       sed 's/^/ | /' $@ ;: for debugging.
+
+EXTRA_DIST = jprog.sh
+CLEANFILES = jprog
+END
+
+cat > bin/jprog.sh <<'END'
address@hidden@
+CLASSPATH=${jprog_classpath-'@jprogdatadir@'}${CLASSPATH+"@address@hidden"}
+export CLASSPATH
+case $# in
+  0) exec @JAVA@ jprog.Main;;
+  *) exec @JAVA@ jprog.Main "$@";;
+esac
+END
+
+## JAVA SOURCES ##
+
+mkdir jprog
+
+cat > jprog/Makefile.am <<'END'
+dist_jprogclass_JAVA = Main.java HelloStream.java
+nodist_jprogclass_JAVA = PkgLocation.java
+END
+
+cat > jprog/PkgLocation.jin <<'END'
+package jprog;
+public class PkgLocation {
+    public static String prefix() {
+        return new String("@prefix@");
+    }
+}
+END
+
+cat > jprog/Main.java <<'END'
+package jprog;
+import jprog.PkgLocation;
+import jprog.HelloStream;
+public class Main {
+    public static void main(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equals("--print-prefix")) {
+                System.out.println(PkgLocation.prefix());
+            } else if (args[i].equals("--hello-stdout")) {
+                HelloStream.to(System.out);
+            } else if (args[i].equals("--hello-stderr")) {
+                HelloStream.to(System.err);
+            } else {
+               System.err.println("jprog: invalid option '" + args[i] +
+                                  "'");
+               System.exit(2);
+            }
+        }
+        System.exit(0);
+    }
+}
+END
+
+cat > jprog/HelloStream.java <<'END'
+package jprog;
+import java.io.PrintStream;
+class HelloStream {
+    public static void to(PrintStream stream) {
+        stream.println("Hello, Stream!");
+    }
+}
+END
+
+## TESTS ##
+
+mkdir tests
+
+cat > tests/Makefile.am <<'END'
+AM_TESTS_ENVIRONMENT = \
+    if test x"$$jprog_doing_installcheck" != x"yes"; then \
+        jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
+        export jprog_classpath; \
+        PATH='$(abs_top_builddir)/bin$(PATH_SEPARATOR)'$$PATH; \
+        export PATH; \
+    else \
+        unset jprog_classpath || :; \
+        PATH='$(prefix)/bin$(PATH_SEPARATOR)'$$PATH; \
+        export PATH; \
+    fi; \
+    config_time_prefix='@prefix@'; export config_time_prefix;
+
+TESTS = \
+  simple.test \
+  prefix.test \
+  stdout.test \
+  stderr.test \
+  badarg.test
+
+XFAIL_TESTS = badarg.test
+
+EXTRA_DIST = $(TESTS)
+END
+
+cat > tests/simple.test <<'END'
+#!/bin/sh
+jprog
+END
+
+cat > tests/prefix.test <<'END'
+#!/bin/sh
+jprefix=`jprog --print-prefix` || exit 1
+echo "$0: exp prefix: $config_time_prefix"
+echo "$0: got prefix: $jprefix"
+test x"$jprefix" = x"$config_time_prefix"
+END
+
+cat > tests/stdout.test <<'END'
+#!/bin/sh
+rc=0
+jprog --hello-stdout >stdout.out 2>stdout.err || { echo \$?=$?; rc=1; }
+sed 's/^/out:/' <stdout.out      # For debugging.
+sed 's/^/err:/' <stdout.err >&2  # Likewise.
+test -s stdout.err && rc=1
+test "`cat stdout.out`" = 'Hello, Stream!' || rc=1
+rm -f stdout.out stdout.err || rc=1
+exit $rc
+END
+
+cat > tests/stderr.test <<'END'
+#!/bin/sh
+rc=0
+jprog --hello-stderr >stderr.out 2>stderr.err || { echo \$?=$?; rc=1; }
+sed 's/^/out:/' <stderr.out      # For debugging.
+sed 's/^/err:/' <stderr.err >&2  # Likewise.
+test -s stderr.out && rc=1
+test "`cat stderr.err`" = 'Hello, Stream!' || rc=1
+rm -f stderr.out stderr.err || rc=1
+exit $rc
+END
+
+cat > tests/badarg.test <<'END'
+#!/bin/sh
+jprog --bad-argument
+END
+
+chmod a+x tests/*.test
+
+## DO CHECKS ##
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# To have the parallel testsuite more verbose.
+VERBOSE=yes; export VERBOSE
+
+./configure --prefix="`pwd`/_inst"
+cat jprog/PkgLocation.java # For debugging.
+$MAKE check
+$MAKE install
+$MAKE test-installed
+$MAKE run-installed
+$MAKE distcheck
+
+:
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
new file mode 100755
index 0000000..9ec48b2
--- /dev/null
+++ b/t/java-empty-classpath.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Java compilation works also when CLASSPATH is unset or empty at
+# compilation time.  See automake bug#9306.
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_SRCDIR([org/gnu/bug/Library.java])
+AC_CONFIG_FILES([
+    org/Makefile
+    org/gnu/Makefile
+    org/gnu/bug/Makefile
+])
+AC_OUTPUT
+END
+
+mkdir org org/gnu org/gnu/bug
+cat > Makefile.am <<END
+CLEANFILES = *.class
+SUBDIRS = org
+END
+echo SUBDIRS = gnu > org/Makefile.am
+echo SUBDIRS = bug > org/gnu/Makefile.am
+cat > org/gnu/bug/Makefile.am <<'END'
+JAVAROOT = ../../..
+dist_noinst_JAVA = Library.java Application.java
+END
+
+cat > org/gnu/bug/Library.java <<'END'
+package org.gnu.bug;
+public class Library
+{
+    public Library ()
+    {
+      // Nothing to do.
+    }
+    public static void doSomethingUseful (String arg)
+    {
+      System.out.println (arg);
+    }
+}
+END
+
+cat > org/gnu/bug/Application.java <<'END'
+import org.gnu.bug.*;
+public class Application
+{
+    public static void main (String args[])
+    {
+        Library lib = new Library ();
+        lib.doSomethingUseful ("PLUGH");
+    }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+unset CLASSPATH || :
+$MAKE
+$MAKE clean
+
+CLASSPATH=''; export CLASSPATH
+$MAKE
+$MAKE clean
+
+unset CLASSPATH || :
+$MAKE distcheck
+
+:
diff --git a/t/java-extra.sh b/t/java-extra.sh
new file mode 100755
index 0000000..f2fc76d
--- /dev/null
+++ b/t/java-extra.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check use of EXTRA with the JAVA primary.  Also test interaction
+# of JAVA with conditionals (it's natural to test it here, since
+# EXTRA_JAVA exists mostly for ensuring interoperation with Automake
+# conditionals).
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+javadir = $(pkgdatadir)/java
+
+EXTRA_JAVA = Class1.java Class2.java Class3.java
+
+java_JAVA = Class1.java
+
+if COND
+java_JAVA += Class2.java
+else !COND
+java_JAVA += Class3.java
+endif !COND
+
+Class3.java: Makefile
+       echo 'class Class3 {}' > $@
+CLEANFILES = Class3.java
+END
+
+echo "class Class1 {}" > Class1.java
+echo "class Class2 {}" > Class2.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure cond=yes
+$MAKE
+ls -l
+test -f Class1.class
+test -f Class2.class
+test ! -f Class3.class
+test ! -f Class3.java
+
+$MAKE distclean
+
+./configure cond=no
+$MAKE
+ls -l
+test -f Class1.class
+test ! -f Class2.class
+test -f Class3.class
+test -f Class3.java
+
+:
diff --git a/t/java-mix.sh b/t/java-mix.sh
new file mode 100755
index 0000000..6ec9185
--- /dev/null
+++ b/t/java-mix.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the JAVA primary can be used freely in the same Makefile.am
+# with proper combinations of the 'dist_', 'nodist_' and 'nobase_'
+# modifiers.  Also check that '.java' files are not distributed by
+# default.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# This test does not require compilation of *.java files.
+JAVAC = false
+javadir = $(prefix)
+
+java_JAVA = Class.java
+dist_java_JAVA = ClassDist.java
+nodist_java_JAVA = ClassNodist.java
+
+nobase_java_JAVA = ClassNobase.java
+nobase_dist_java_JAVA = ClassNobaseDist.java
+nobase_nodist_java_JAVA = ClassNobaseNodist.java
+
+Class.java ClassNodist.java ClassNobase.java ClassNobaseNodist.java:
+       @echo '$@ should not be generated!' >&2; exit 1
+END
+
+: > ClassDist.java
+: > ClassNobaseDist.java
+
+$ACLOCAL
+$AUTOCONF
+# Automake used to display non-fatal warnings with this test, but
+# they were unexpected, so we want to consider them as failures in
+# this test.
+$AUTOMAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+test ! -s stderr
+
+./configure
+
+$MAKE distdir
+ls -l $distdir # For debugging.
+test ! -f $distdir/Class.java
+test -f $distdir/ClassDist.java
+test ! -f $distdir/ClassNobase.java
+test -f $distdir/ClassNobaseDist.java
+test ! -f $distdir/ClassNodist.java
+test ! -f $distdir/ClassNobaseNodist.java
+
+:
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
new file mode 100755
index 0000000..416fdb9
--- /dev/null
+++ b/t/java-no-duplicate.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that some Java-related variables and rules are not repeatedly
+# defined.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+java_JAVA = a.java
+dist_java_JAVA = b.java
+nodist_java_JAVA = c.java
+nobase_java_JAVA = d.java
+nobase_dist_java_JAVA = e.java
+nobase_nodist_java_JAVA = f.java
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP -i '\.stamp|\.class|java|classpath' Makefile.in # For debugging.
+
+for var in JAVAC JAVAROOT CLASSPATH_ENV am__java_sources; do
+  grep "^$var =" Makefile.in
+  test `grep -c "^[$sp$tab]*$var[$sp$tab]*=" Makefile.in` = 1
+done
+
+grep '^classjava\.stamp:' Makefile.in
+test `grep -c "class.*java.*\.stamp.*:" Makefile.in` = 1
+
+:
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
new file mode 100755
index 0000000..ff72a13
--- /dev/null
+++ b/t/java-nobase.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test support of 'nobase_' with the 'JAVA' primary.
+
+required=javac
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+nobase_java_JAVA = sub/subsub/Foo.java
+nobase_dist_java_JAVA = sub/Bar.java
+nobase_nodist_java_JAVA = sub2/Baz.java
+
+# Java files are not distributed by default.
+EXTRA_DIST = sub/subsub/Foo.java
+
+sub2/Baz.java:
+       rm -f $@ address@hidden
+       test -d sub2 || mkdir sub2
+       echo 'class Baz {}' > address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+.PHONY: test-install
+test-install:
+       find $(prefix) ;: For debugging.
+       test   -f $(javadir)/sub/subsub/Foo.class
+       test   -f $(javadir)/sub/Bar.class
+       test   -f $(javadir)/sub2/Baz.class
+installcheck-local: test-install
+DISTCLEANFILES = sub2/Baz.java
+END
+
+mkdir sub sub/subsub
+echo 'class Foo {}' > sub/subsub/Foo.java
+echo 'class Bar {}' > sub/Bar.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --prefix="`pwd`"/_inst
+$MAKE check
+$MAKE install
+$MAKE test-install
+$MAKE distcheck
+
+:
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
new file mode 100755
index 0000000..b11e6a0
--- /dev/null
+++ b/t/java-noinst.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that noinst_JAVA causes generated *.class files not to
+# be installed.
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+noinst_JAVA = 1.java
+dist_noinst_JAVA = 2.java
+nodist_noinst_JAVA = 3.java
+nobase_noinst_JAVA = 4.java
+nobase_dist_noinst_JAVA = 5.java
+nobase_nodist_noinst_JAVA = 6.java
+END
+
+for i in 1 2 3 4 5 6; do
+  echo "class Class$i {}" > $i.java
+done
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure --prefix="`pwd`/_inst"
+
+$MAKE
+ls -l
+for i in 1 2 3 4 5 6; do
+  test -f Class$i.class
+done
+
+$MAKE install
+test -d _inst && { ls -l _inst; Exit 1; }
+
+:
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
new file mode 100755
index 0000000..7672943
--- /dev/null
+++ b/t/java-rebuild.sh
@@ -0,0 +1,124 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test rebuild rules for Java class files.
+
+required='javac'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AM_JAVACFLAGS = -verbose
+foodir = $(datadir)/java
+foo_JAVA = a.java
+dist_foo_JAVA = d.java
+nodist_foo_JAVA = n.java
+nobase_foo_JAVA = Nobase.java
+nobase_dist_foo_JAVA = NobaseDist.java
+nobase_nodist_foo_JAVA = NobaseNoDist.java
+END
+
+echo 'class _x {}' > a.java
+echo 'class x_ {}' > d.java
+echo 'class a {} class d {}' > n.java
+echo 'class Nobase_Foo {} class Nobase_Bar {}' > Nobase.java
+echo 'class NobaseDist {}' > NobaseDist.java
+echo 'class NobaseNoDist {}' > NobaseNoDist.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+all_classes='_x x_ a d Nobase_Foo Nobase_Bar NobaseDist NobaseNoDist'
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE
+  ls -l # For debugging.
+
+  # Sanity check.
+  test -f classfoo.stamp
+  for cls in $all_classes; do
+    test -f $cls.class
+  done
+
+  # When the stampfile is removed, all the *.class files should
+  # be considered out-of-date.
+  echo timestamp > older
+  $sleep
+  rm -f classfoo.stamp
+  $MAKE
+  for cls in $all_classes; do
+    is_newest $cls.class older
+  done
+
+  # When only a java file is modified, only the *.class files derived from
+  # it should be updated.
+  # The strings we loop on here have the following format:
+  # "JAVA-FILES-TO-BE-TOUCHED -- CLASSES-THAT-SHOULD-BE-UPDATED"
+  for args in \
+    'a -- _x' \
+    'd -- x_' \
+    'n -- a d' \
+    'a d Nobase -- _x x_ Nobase_Foo Nobase_Bar' \
+    'n NobaseDist -- a d NobaseDist' \
+    'd NobaseNoDist -- x_ NobaseNoDist' \
+    "a d n Nobase NobaseDist NobaseNoDist -- $all_classes" \
+  ; do
+    set $args
+    touched_javas=
+    while test $# -gt 0; do
+      if test x"$1" = x"--"; then
+        shift
+        break
+      else
+        touched_javas="$touched_javas $1"
+        shift
+      fi
+    done
+    updated_classes=$*
+    echo timestamp > older
+    $sleep
+    for j in $touched_javas; do
+      touch $srcdir/$j.java
+    done
+    $MAKE
+    is_newest classfoo.stamp older
+    for cls in $all_classes; do
+      case " $updated_classes " in
+        *" $cls "*) is_newest $cls.class older;;
+        *) is_newest older $cls.class;;
+      esac
+    done
+  done # $args ...
+
+  cd $srcdir
+
+done # $vpath ...
+
+:
diff --git a/t/java-sources.sh b/t/java-sources.sh
new file mode 100755
index 0000000..2de9683
--- /dev/null
+++ b/t/java-sources.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test definition of automake-generated private Makefile variable
+# '$(am__java_sources)'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foodir = $(prefix)
+
+foo_JAVA = a.java
+dist_foo_JAVA = b.java
+nodist_foo_JAVA = c.java
+nobase_foo_JAVA = d.java
+nobase_dist_foo_JAVA = e.java
+nobase_nodist_foo_JAVA = f.java
+
+.PHONY: debug
+debug:
+       @echo 'am__java_sources: "$(am__java_sources)"'
+got:
+       @lst='$(am__java_sources)'; \
+         for f in $$lst; do echo $$f; done | sort > $@
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+cat > exp << 'END'
+a.java
+b.java
+c.java
+d.java
+e.java
+f.java
+END
+
+./configure
+$MAKE debug
+$MAKE got
+
+cat got
+cat exp
+diff exp got
+
+:
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
new file mode 100755
index 0000000..fb6bfa1
--- /dev/null
+++ b/t/java-uninstall.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check uninstallation of Java class files.
+
+required=javac
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+javadir = $(prefix)/java
+java_JAVA = Foo.java
+nobase_java_JAVA = Foo2.java
+nobase_dist_java_JAVA = Bar.java
+nodist_java_JAVA = Baz.java
+
+# Java files are not distributed by default, so we distribute
+# one "by hand" ...
+EXTRA_DIST = Foo.java
+# ... and make the other one generated.
+Foo2.java:
+       rm -f $@ address@hidden
+       echo 'class bClass {}' > address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+# Explicitly declared as 'nodist_', so generate it.
+Baz.java:
+       rm -f $@ address@hidden
+       echo 'class Baz {}' > address@hidden
+       echo 'class Baz2 {}' >> address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+DISTCLEANFILES = Baz.java Foo2.java
+END
+
+echo 'class aClass {}' > Foo.java
+echo 'class Zardoz {}' > Bar.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --prefix="`pwd`"/_inst
+javadir=_inst/java
+
+check_uninstallation()
+{
+  test ! -r $javadir/aClass.class
+  test ! -r $javadir/bClass.class
+  test ! -r $javadir/Zardoz.class
+  test ! -r $javadir/Baz.class
+  test ! -r $javadir/Baz2.class
+  test   -f $javadir/Foo.class
+  test   -f $javadir/Bar.class
+  test   -f $javadir/xClass.class
+}
+
+$MAKE
+ls -l
+$MAKE install
+: > $javadir/Foo.class
+: > $javadir/Bar.class
+: > $javadir/xClass.class
+ls -l $javadir
+$MAKE uninstall
+ls -l $javadir
+check_uninstallation
+
+# FIXME: "make uninstall" should continue to work also after "make clean",
+#        but currently this doesn't happen.  See automake bug#8540.
+$MAKE install
+ls -l $javadir
+$MAKE clean
+ls -l
+$MAKE uninstall
+ls -l $javadir
+#check_uninstallation
+
+$MAKE distcheck
+
+:
diff --git a/t/java.sh b/t/java.sh
new file mode 100755
index 0000000..16b1250
--- /dev/null
+++ b/t/java.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Minimal test of Java functionality.
+
+required=javac
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+dist_java_JAVA = a.java b.java
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+$EGREP '\.stamp|class' Makefile.in # For debugging.
+grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in
+test `grep -c '^all[-a-z]*:.*classjava\.stamp' Makefile.in` -eq 1
+
+cat >a.java <<EOF
+class a
+{
+}
+EOF
+
+cat >b.java <<EOF
+class b
+{
+}
+EOF
+
+./configure --prefix "`pwd`"
+$MAKE distcheck
diff --git a/t/java2.sh b/t/java2.sh
new file mode 100755
index 0000000..c0b9f95
--- /dev/null
+++ b/t/java2.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Java rules doesn't attempt to run javac when there is
+# no classes to compile.
+# Report from Braden McDaniel.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL(WITH_JDK, false)
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+JAVAC = false
+JAVAROOT = $(top_builddir)/java
+
+JAVA_FILES = MyClass1.java
+
+if WITH_JDK
+noinst_JAVA = $(JAVA_FILES)
+endif
+
+EXTRA_DIST = $(JAVA_FILES)
+END
+
+: >MyClass1.java
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
diff --git a/t/java3.sh b/t/java3.sh
new file mode 100755
index 0000000..7d94635
--- /dev/null
+++ b/t/java3.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Java rules don't attempt to compile or install
+# *.java files when there are none.
+# Report from Johannes Nicolai (PR/441).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([WHO_CARES], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if WHO_CARES
+JAVA_FILES = MyClass1.java
+endif
+
+javadir = $(prefix)/java
+java_JAVA = $(JAVA_FILES)
+END
+
+cat > MyClass1.java << 'END'
+class MyClass1 { // Deliberately missing right curly bracket.
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE
+$MAKE install
+ls -l .
+find . -name '*.class' | grep . && Exit 1
+# If we have nothing to install, we shouldn't create any installation
+# directory.  Related to automake bug#11030.
+test ! -d _inst
+$MAKE uninstall
+$MAKE distcheck
+
+:
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
new file mode 100755
index 0000000..e2ed7f6
--- /dev/null
+++ b/t/javadir-undefined.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Use of JAVA primary should not allow the use of the 'java_' prefix
+# when $(javadir) is undefined.  Otherwise, we could silently end up
+# with a broken Makefile.in (where "make install" doesn't install
+# the *.class files).
+# See automake bug#8461.
+
+. ./defs || Exit 1
+
+$ACLOCAL
+
+echo java_JAVA = a.java > Makefile.am
+AUTOMAKE_fails
+grep '^Makefile\.am:1:.*java_JAVA.*javadir.* undefined' stderr
+$EGREP '(uninitialized|line) ' stderr && Exit 1
+
+echo javadir = a-dummy-value >> Makefile.am
+$AUTOMAKE
+
+:
diff --git a/t/javaflags.sh b/t/javaflags.sh
new file mode 100755
index 0000000..364b21f
--- /dev/null
+++ b/t/javaflags.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for $(JAVACFLAGS) and $(AM_JAVACFLAGS).
+
+. ./defs || Exit 1
+
+cat > fake-javac <<'END'
+#!/bin/sh
+echo "$*" > javaflags.list
+END
+chmod a+x fake-javac
+
+# Remove JAVAC from the environment, so that it won't interfere
+# with 'make -e' below.
+unset JAVAC || :
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+# Simulate presence of the java compiler using our fake-javac script.
+AC_SUBST([JAVAC], ['$(abs_top_srcdir)'/fake-javac])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+foodir = $(prefix)
+foo_JAVA = bar.java
+AM_JAVACFLAGS = __am_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '\$(JAVACFLAGS).*\$(AM_JAVACFLAGS)' Makefile.in && Exit 1
+
+: > bar.java
+
+$AUTOCONF
+./configure
+env JAVACFLAGS=__user_flags__ $MAKE -e
+
+ls -l
+
+cat javaflags.list
+grep '__am_flags__.*__user_flags__' javaflags.list
+
+:
diff --git a/t/javaprim.sh b/t/javaprim.sh
new file mode 100755
index 0000000..fe55535
--- /dev/null
+++ b/t/javaprim.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure JAVA variable can be defined by AC_SUBST.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([JAVA])
+END
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+java_JAVA = a.java b.java c.java
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep -i java Makefile.in # For debugging.
+grep '^JAVA = address@hidden@ *$' Makefile.in
+
+:
diff --git a/t/javasubst.sh b/t/javasubst.sh
new file mode 100755
index 0000000..455b8c6
--- /dev/null
+++ b/t/javasubst.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure redefining JAVAC with AC_SUBST works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([JAVAC])
+END
+
+cat > Makefile.am << 'END'
+javadir = $(datadir)/java
+java_JAVA = a.java b.java c.java
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep -i java Makefile.in # For debugging.
+grep '^JAVAC = address@hidden@ *$' Makefile.in
+
+:
diff --git a/t/ldadd.sh b/t/ldadd.sh
new file mode 100755
index 0000000..8e16fb3
--- /dev/null
+++ b/t/ldadd.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure incorrect LDADD usage is diagnosed.
+
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_SUBST([LTLIBOBJS], [q.lo])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libtu.la
+libtu_la_SOURCES = foo.c
+libtu_la_LDADD = @LTLIBOBJS@
+END
+
+: > ltconfig
+: > ltmain.sh
+: > config.guess
+: > config.sub
+: > q.c
+
+$ACLOCAL || Exit 1
+AUTOMAKE_fails -Wno-extra-portability
+grep "libtu_la_LDADD" stderr
+grep " use 'libtu_la_LIBADD'" stderr
+
+:
diff --git a/t/ldflags.sh b/t/ldflags.sh
new file mode 100755
index 0000000..269af34
--- /dev/null
+++ b/t/ldflags.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for LDFLAGS in conditional.
+# PR 77.
+
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_SUBST([LTLIBOBJS], [q.o])
+AM_CONDITIONAL([USE_SWIG], [:])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if USE_SWIG
+lib_LTLIBRARIES = libtu.la
+libtu_la_SOURCES = foo.c
+libtu_la_LDFLAGS = -module
+endif
+END
+
+: > ltconfig
+: > ltmain.sh
+: > ar-lib
+: > config.guess
+: > config.sub
+: > q.c
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
new file mode 100755
index 0000000..1c57524
--- /dev/null
+++ b/t/lex-clean-cxx.sh
@@ -0,0 +1,127 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that C++ source and header files derived from non-distributed
+# Yacc sources are cleaned by "make clean", while C++ source and
+# header files derived from distributed Yacc sources are cleaned by
+# "make maintainer-clean".
+# See also sister test 'lex-clean.test'.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = mainfoo.cc parsefoo.lxx
+
+bar_SOURCES = mainbar.cpp parsebar.ll
+bar_LFLAGS = $(AM_LFLAGS)
+
+baz_SOURCES = mainbaz.c++
+nodist_baz_SOURCES = parsebaz.l++
+
+qux_SOURCES = mainqux.cxx
+nodist_qux_SOURCES = parsequx.lpp
+qux_LFLAGS = $(AM_LFLAGS)
+
+parsebaz.l++ parsequx.lpp:
+       cp $(srcdir)/parsefoo.lxx $@
+
+CLEANFILES = parsebaz.l++ parsequx.lpp
+
+LDADD = $(LEXLIB)
+END
+
+cat > parsefoo.lxx << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+int isatty (int fd) { return 0; }
+%}
+%%
+"GOOD"   return EOF;
+.
+%%
+int yywrap (void)
+{
+  return 1;
+}
+END
+cp parsefoo.lxx parsebar.ll
+
+cat > mainfoo.cc << 'END'
+// This file should contain valid C++ but invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+  extern int yylex (void);
+  return yylex ();
+}
+END
+cp mainfoo.cc mainbar.cpp
+cp mainfoo.cc mainbaz.c++
+cp mainfoo.cc mainqux.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l
+# Sanity checks.
+test -f parsefoo.cxx
+test -f bar-parsebar.cc
+test -f parsebaz.l++
+test -f parsebaz.c++
+test -f parsequx.lpp
+test -f qux-parsequx.cpp
+
+for target in clean distclean; do
+  $MAKE $target
+  ls -l
+  test -f parsefoo.cxx
+  test -f bar-parsebar.cc
+  test ! -r parsebaz.l++
+  test ! -r parsebaz.c++
+  test ! -r parsequx.lpp
+  test ! -r qux-parsequx.cpp
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l
+test -f parsefoo.lxx
+test -f parsebar.ll
+test ! -r parsefoo.cxx
+test ! -r bar-parsebar.cc
+test -f parsefoo.lxx
+test -f parsebar.ll
+test ! -r parsefoo.cxx
+test ! -r bar-parsebar.cc
+
+:
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
new file mode 100755
index 0000000..9b23f01
--- /dev/null
+++ b/t/lex-clean.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that .c files derived from non-distributed .l sources
+# are cleaned by "make clean", while .c files derived from
+# distributed .l sources are cleaned by "make maintainer-clean".
+# See also sister test 'lex-clean-cxx.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = main.c lexer.l
+
+bar_SOURCES = main.c lexer.l
+bar_LFLAGS = $(AM_LFLAGS)
+
+baz_SOURCES = main.c
+nodist_baz_SOURCES = baz.l
+
+qux_SOURCES = main.c
+nodist_qux_SOURCES = baz.l
+qux_LFLAGS = $(AM_LFLAGS)
+
+baz.l:
+       cp $(srcdir)/lexer.l $@
+
+CLEANFILES = baz.l
+
+LDADD = $(LEXLIB)
+END
+
+cat > lexer.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"GOOD"   return EOF;
+.
+END
+
+cat > main.c << 'END'
+int main (void)
+{
+  return yylex ();
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l
+# Sanity checks.
+test -f lexer.l
+test -f lexer.c
+test -f bar-lexer.c
+test -f baz.l
+test -f baz.c
+test -f qux-baz.c
+
+for target in clean distclean; do
+  $MAKE $target
+  ls -l
+  test -f lexer.l
+  test -f lexer.c
+  test -f bar-lexer.c
+  test ! -r baz.l
+  test ! -r baz.c
+  test ! -r qux-baz.c
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l
+test -f lexer.l
+test ! -r lexer.c
+test ! -r bar-lexer.c
+
+:
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
new file mode 100755
index 0000000..490516f
--- /dev/null
+++ b/t/lex-depend-cxx.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependencies work with Lex/C++.
+# Test synthesized from PR automake/6.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = joe moe
+joe_SOURCES = joe.ll
+moe_SOURCES = moe.l++
+LDADD = $(LEXLIB)
+
+.PHONY: test-deps-exist
+test-deps-exist:
+       ls -l $(DEPDIR) ;: For debugging.
+       test -f $(DEPDIR)/joe.Po
+       test -f $(DEPDIR)/moe.Po
+
+.PHONY: test-obj-updated
+test-obj-updated: joe.$(OBJEXT) moe.$(OBJEXT)
+       stat older my-hdr.hxx joe.$(OBJEXT) moe.$(OBJEXT) || :
+       test `ls -t older joe.$(OBJEXT) | sed 1q` = joe.$(OBJEXT)
+       test `ls -t older moe.$(OBJEXT) | sed 1q` = moe.$(OBJEXT)
+END
+
+cat > joe.ll << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+int isatty (int fd) { return 0; }
+%}
+%%
+"foo" return EOF;
+.
+%%
+#include "my-hdr.hxx"
+int yywrap (void)
+{
+  return 1;
+}
+int main (int argc, char **argv)
+{
+  printf("Hello, World!\n");
+  return 0;
+}
+END
+
+cp joe.ll moe.l++
+
+cat > my-hdr.hxx <<'END'
+// This header contains deliberetly invalid C (but valid C++)
+#include <cstdio>
+using namespace std;
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$FGREP joe.Po Makefile.in
+$FGREP moe.Po Makefile.in
+
+$AUTOCONF
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+
+$MAKE test-deps-exist
+$MAKE
+
+: > older
+$sleep
+touch my-hdr.hxx
+$MAKE test-obj-updated
+
+:
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
new file mode 100755
index 0000000..0fe32ed
--- /dev/null
+++ b/t/lex-depend-grep.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependencies for Lex and C/C++ does not break
+# in obvious ways.  See PR automake/6, and related semantic tests
+# 'lex-depend.test' and 'lex-depend-cxx.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_LEX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zoo foo
+zoo_SOURCES = joe.ll
+foo_SOURCES = moe.l
+noinst_PROGRAMS = zardoz
+zardoz_SOURCES = _0.l _1.ll _2.lxx _3.l++ _4.lpp
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$EGREP '([mj]oe|_[01234]|include|\.P)' Makefile.in # For debugging.
+
+for x in joe moe _0 _1 _2 _3 _4; do
+  grep "include.*$x\.Po" Makefile.in
+done
+
+:
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
new file mode 100755
index 0000000..9487f4a
--- /dev/null
+++ b/t/lex-depend.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure automatic dependency tracking work with Lex/C.
+# Test suggested by PR automake/6.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zoo
+zoo_SOURCES = joe.l
+LDADD = $(LEXLIB)
+
+.PHONY: test-deps-exist
+test-deps-exist:
+       ls -l $(DEPDIR) ;: For debugging.
+       test -f $(DEPDIR)/joe.Po
+
+.PHONY: test-obj-updated
+test-obj-updated: joe.$(OBJEXT)
+       stat older my-hdr.h joe.$(OBJEXT) || : For debugging.
+       test `ls -t older joe.$(OBJEXT) | sed 1q` = joe.$(OBJEXT)
+END
+
+cat > joe.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"foo" return EOF;
+.
+%%
+#include "my-hdr.h"
+int main (void)
+{
+  printf("%s\n", MESSAGE);
+  return 0;
+}
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+cat > my-hdr.h <<'END'
+#include <stdio.h>
+#define MESSAGE "Hello, World!"
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$FGREP joe.Po Makefile.in
+
+$AUTOCONF
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+
+$MAKE test-deps-exist
+$MAKE
+
+: > older
+$sleep
+touch my-hdr.h
+$MAKE test-obj-updated
+
+:
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
new file mode 100755
index 0000000..21802c5
--- /dev/null
+++ b/t/lex-lib-external.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we can get use the 'yywrap' function from a system-wide
+# library, if that's available.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lexer
+lexer_SOURCES = foo.l
+lexer_LDADD = $(LEXLIB)
+
+.PHONY: have-lexlib
+have-lexlib:
+       test x'$(LEXLIB)' != x
+       echo 'int main (void) { return yywrap (); }' > x.c
+       $(CC) -c x.c
+       $(CC) x.$(OBJEXT) $(LEXLIB)
+       rm -f x.c *.$(OBJEXT) *.o *.out *.exe
+END
+
+cat > foo.l <<'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"GOOD"   return EOF;
+.
+%%
+int main (void)
+{
+  /* We don't use a 'while' loop here (like a real lexer would do)
+     to avoid possible hangs. */
+  if (yylex () == EOF)
+    return 0;
+  else
+    return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE have-lexlib || skip_ "no system-wide lex library found"
+
+# Program should build and run and distribute.
+$MAKE all
+if cross_compiling; then :; else
+  echo GOOD | ./lexer
+  echo BAD | ./lexer && Exit 1
+  : For shells with busted 'set -e'.
+fi
+yl_distcheck
+
+:
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
new file mode 100755
index 0000000..0320f75
--- /dev/null
+++ b/t/lex-lib.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we can provide a personal 'yywrap' function in a custom
+# library.
+# See also test 'lex-lib-external.test'.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+LEXLIB=libmylex.a
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lexer
+lexer_SOURCES = foo.l
+lexer_LDADD = $(LEXLIB)
+EXTRA_lexer_DEPENDENCIES = $(LEXLIB)
+noinst_LIBRARIES = libmylex.a
+libmylex_a_SOURCES = mu.c
+END
+
+cat > mu.c << 'END'
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+cat > foo.l <<'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END" return EOF;
+.
+%%
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+test -f foo.c
+test -f libmylex.a
+
+:
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
new file mode 100755
index 0000000..3f4b860
--- /dev/null
+++ b/t/lex-libobj.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we can provide a personal 'yywrap' function through the
+# LIBOBJ machinery.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_LEX
+save_LIBS=$LIBS
+LIBS="$LEXLIB $LIBS"
+AC_REPLACE_FUNCS([yywrap])
+LIBS=$save_LIBS
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.l
+foo_LDADD = $(LEXLIB) $(LIBOBJS)
+END
+
+cat > yywrap.c << 'END'
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+cat > foo.l <<'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END" return EOF;
+.
+%%
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+grep LIBOBJS Makefile # For debugging.
+$MAKE
+$MAKE distclean
+
+# Force "no system lex library".  Setting LEXLIB to a non-empty value
+# ensures that configure won't search for a "lex library", and simply
+# rely on the LEXLIB to provide it, if needed.  So, by setting LEXLIB
+# to a blank but non-empty value we can fool configure into thinking
+# that no system-level library providing a 'yywrap' function is
+# available.  See also discussion on automake bug#11306.
+./configure LEXLIB=' '
+grep LIBOBJS Makefile # For debugging.
+grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check.
+$MAKE
+
+yl_distcheck
+
+:
diff --git a/t/lex-line.sh b/t/lex-line.sh
new file mode 100755
index 0000000..05b6f99
--- /dev/null
+++ b/t/lex-line.sh
@@ -0,0 +1,123 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake lex support ensures that lex-generated C
+# files use correct "#line" directives.  Try also with the
+# 'subdir-object' option enabled.
+# See also sister test 'yacc-line.test'.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+mkdir dir sub sub/dir
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo bar
+LDADD = $(LEXLIB)
+bar_LFLAGS = -v
+foo_SOURCES = zardoz.l
+bar_SOURCES = dir/quux.l
+## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
+END
+
+cat > sub/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+## We already used $(LEXLIB) above, so try @LEXLIB@ now.
+LDADD = @LEXLIB@
+foo_LFLAGS = -v
+foo_SOURCES = zardoz.l
+bar_SOURCES = dir/quux.l
+## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
+dir/address@hidden@: dir/quux.c
+END
+
+cat > zardoz.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"  return EOF;
+.
+%%
+int main ()
+{
+  while (yylex () != EOF)
+    ;
+  return 0;
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+cp zardoz.l dir/quux.l
+cp zardoz.l sub/zardoz.l
+cp zardoz.l sub/dir/quux.l
+
+c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE
+
+  # For debugging,
+  ls -l . sub sub/dir
+  $FGREP '.l' $c_outputs
+
+  # Adjusted "#line" should not contain reference to the builddir.
+  $EGREP '#.*line.*(build|\.\.).*\.l' $c_outputs && Exit 1
+  # Adjusted "#line" should not contain reference to the default
+  # output file names, e.g., 'lex.yy.c'.
+  $EGREP '#.*line.*lex\.yy' $c_outputs && Exit 1
+  # Don't be excessively strict in grepping, to avoid spurious failures.
+  grep '#.*line.*zardoz\.l' zardoz.c
+  grep '#.*line.*quux\.l' bar-quux.c
+  grep '#.*line.*zardoz\.l' sub/foo-zardoz.c
+  grep '#.*line.*quux\.l' sub/dir/quux.c
+  cd $srcdir
+
+done
+
+:
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
new file mode 100755
index 0000000..99e6b7b
--- /dev/null
+++ b/t/lex-nodist.sh
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Checks for .c files derived from non-distributed .l sources.
+# The test 'lex-pr204.test' does similar check with AM_MAINTAINER_MODE
+# enabled.
+# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
+# for yacc-generated .c and .h files.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+dnl Sister test 'lex-pr204.test' should use 'AC_PROG_LEX' instead.
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+.PHONY: test-build test-dist
+test-build: all
+       ls -l
+       test -f lexer.l
+       test -f lexer.c
+test-dist: distdir
+       ls -l $(distdir)
+       test ! -r $(distdir)/lexer.l
+       test ! -r $(distdir)/lexer.c
+check-local: test-build test-dist
+
+lexer.l:
+       rm -f $@ address@hidden
+       :; { : \
+         && echo '%{' \
+         && echo '#define YY_NO_UNISTD_H 1' \
+         && echo '%}' \
+         && echo '%%' \
+         && echo '"GOOD" return EOF;' \
+         && echo '.'; \
+       } > address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+bin_PROGRAMS = prog
+prog_SOURCES = main.c
+nodist_prog_SOURCES = lexer.l
+prog_LDADD = $(LEXLIB)
+CLEANFILES = $(nodist_prog_SOURCES)
+END
+
+cat > main.c << 'END'
+int main ()
+{
+  return yylex ();
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+$MAKE test-build
+$MAKE test-dist
+
+# But the distribution must work correctly, assuming the user has
+# the proper tools to process yacc files.
+$MAKE distcheck
+
+:
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
new file mode 100755
index 0000000..1c4a13b
--- /dev/null
+++ b/t/lex-noyywrap.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check Lex support with flex using the '%noyywrap' option.
+
+required='cc flex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.l
+
+.PHONY: test-no-lexlib
+check-local: test-no-lexlib
+test-no-lexlib:
+       test x'$(LEXLIB)' = x'none needed'
+END
+
+cat > foo.l << 'END'
+%option noyywrap
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"GOOD"   return EOF;
+.
+%%
+int main (void)
+{
+  /* We don't use a 'while' loop here (like a real lexer would do)
+     to avoid possible hangs. */
+  if (yylex () == EOF)
+    return 0;
+  else
+    return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure LEXLIB="none needed"
+
+# Program should build and run.
+$MAKE
+if cross_compiling; then :; else
+  echo GOOD | ./foo
+  echo BAD | ./foo && Exit 1
+  : For shells with busted 'set -e'.
+fi
+
+# Sanity check on distribution.
+yl_distcheck DISTCHECK_CONFIGURE_FLAGS='LEXLIB="none needed"'
+
+:
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
new file mode 100755
index 0000000..2e1b4e3
--- /dev/null
+++ b/t/lex-pr204.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Related to PR 204.
+# C sources derived from nodist_ lex sources should not be distributed.
+# See also related test 'lex-nodist.test'.
+# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
+# for yacc-generated .c and .h files.
+
+required=lex
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_MAINTAINER_MODE
+AC_PROG_CC
+dnl We use AC_PROG_LEX deliberately.
+dnl Sister 'lex-nodist.test' should use 'AM_PROG_LEX' instead.
+AC_PROG_LEX
+AC_OUTPUT
+EOF
+
+# The LEXER2 intermediate variable is there to make sure Automake
+# matches 'nodist_' against the right variable name...
+cat > Makefile.am << 'EOF'
+EXTRA_PROGRAMS = foo
+LEXER2 = lexer2.l
+nodist_foo_SOURCES = lexer.l $(LEXER2)
+
+distdirtest: distdir
+       test ! -f $(distdir)/lexer.c
+       test ! -f $(distdir)/lexer.l
+       test ! -f $(distdir)/lexer.h
+       test ! -f $(distdir)/lexer2.c
+       test ! -f $(distdir)/lexer2.l
+       test ! -f $(distdir)/lexer2.h
+EOF
+
+cat > lexer.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"GOOD"   return EOF;
+.
+%%
+int main (void)
+{
+  return yylex ();
+}
+END
+
+cp lexer.l lexer2.l
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE distdirtest
+
+# Make sure lexer.c and lexer2.c are still targets.
+$MAKE lexer.c lexer2.c
+test -f lexer.c
+test -f lexer2.c
+
+# Ensure the rebuild rule works despite AM_MAINTAINER_MODE, because
+# it's a nodist_ lexer.
+$sleep
+touch lexer.l lexer2.l
+$sleep
+$MAKE lexer.c lexer2.c
+stat lexer.c lexer.l lexer2.c lexer2.l || : # For debugging.
+test `ls -t lexer.c lexer.l | sed 1q` = lexer.c
+test `ls -t lexer2.c lexer2.l | sed 1q` = lexer2.c
+
+:
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
new file mode 100755
index 0000000..44c9776
--- /dev/null
+++ b/t/lex-subobj-nodep.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure subdirs for subdir scanners are generated when subdir-objects
+# are used, even when dependency tracking is disabled.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >>configure.ac <<\END
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat >Makefile.am <<\END
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = p1 p2
+p1_SOURCES = sub1/s1.l
+p2_SOURCES = sub2/s2.l
+p2_CPPFLAGS = -DWHATEVER
+END
+
+mkdir sub1 sub2
+
+cat >sub1/s1.l <<\END
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+.
+%%
+int main (void)
+{
+  while (yylex () != EOF)
+    ;
+  return 0;
+}
+
+int yywrap(void)
+{
+  return 1;
+}
+END
+
+cp sub1/s1.l sub2/s2.l
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+mkdir build
+cd build
+../configure --disable-dependency-tracking
+$MAKE sub1/s1.c
+$MAKE sub2/s2.c
+rm -rf sub1 sub2
+$MAKE
+
+:
diff --git a/t/lex.sh b/t/lex.sh
new file mode 100755
index 0000000..d3d256a
--- /dev/null
+++ b/t/lex.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_LEX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zot
+zot_SOURCES = joe.l
+LDADD = @LEXLIB@
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# Test to make sure that lex source generates correct target.
+$FGREP '$(LEX)' Makefile.in
+
+# Test to make sure that lex source generates correct clean rule.
+# From Ralf Corsepius.
+$FGREP joel Makefile.in && Exit 1
+
+:
diff --git a/t/lex2.sh b/t/lex2.sh
new file mode 100755
index 0000000..4b20d14
--- /dev/null
+++ b/t/lex2.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Automake suggest using AM_PROG_LEX when a lexer is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zot
+zot_SOURCES = joe.l
+END
+
+$ACLOCAL
+AUTOMAKE_fails -a
+grep 'LEX.* undefined' stderr
+grep 'add .*AM_PROG_LEX' stderr
+
+:
diff --git a/t/lex3.sh b/t/lex3.sh
new file mode 100755
index 0000000..125152b
--- /dev/null
+++ b/t/lex3.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic semantic checks on Lex support.
+# Test associated with PR 19.
+# From Matthew D. Langston.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.l
+END
+
+cat > foo.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"GOOD"   return EOF;
+.
+%%
+
+int main (void)
+{
+  /* We don't use a 'while' loop here (like a real lexer would do)
+     to avoid possible hangs. */
+  if (yylex () == EOF)
+    return 0;
+  else
+    return 1;
+}
+
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# Program should build and run.
+$MAKE
+if cross_compiling; then :; else
+  echo GOOD | ./foo
+  echo BAD | ./foo && Exit 1
+  : For shells with busted 'set -e'.
+fi
+
+# The generated file 'foo.c' must be shipped.
+$MAKE distdir
+test -f $distdir/foo.c
+
+# Sanity check on distribution.
+yl_distcheck
+
+# While we are at it, make sure that foo.c is erased by
+# maintainer-clean, and not by distclean.
+test -f foo.c
+$MAKE distclean
+test -f foo.c
+./configure # Re-create 'Makefile'.
+$MAKE maintainer-clean
+test ! -f foo.c
+
+:
diff --git a/t/lex5.sh b/t/lex5.sh
new file mode 100755
index 0000000..4b0663d
--- /dev/null
+++ b/t/lex5.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for subdir lexers.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS  = subdir-objects
+LDADD             = @LEXLIB@
+
+bin_PROGRAMS    = foo/foo
+foo_foo_SOURCES = foo/foo.l
+END
+
+mkdir foo
+
+cat > foo/foo.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+.
+%%
+int
+main ()
+{
+  while (yylex () != EOF)
+    ;
+
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# We expect ylwrap to be used and distributed even if there is
+# only one lexer.
+test -f ylwrap
+
+mkdir sub
+cd sub
+../configure
+$MAKE foo/foo.o
+ls -l # For debugging.
+
+test -f foo/foo.c
+test -f foo/foo.o
+
+# Now, adds another lexer to test ylwrap.
+
+cd ..
+cp foo/foo.l foo/foo2.l
+cat >> Makefile.am << 'END'
+EXTRA_foo_foo_SOURCES = foo/foo2.l
+END
+
+# Make sure Makefile.in has a new time stamp: the rebuild rules are
+# used below.  We do this after updating Makefile.am, that way we can
+# ensure that automake, even with --no-force, is not confused if the
+# new Makefile.am has the same time stamp as the older one (since the
+# output will change, --no-force should have no effect).
+$sleep
+
+$AUTOMAKE -a --no-force
+
+cd sub
+using_gmake || $MAKE Makefile
+$MAKE foo/foo2.o
+ls -l # For debugging.
+test -f foo/foo2.c
+test -f foo/foo2.o
+
+:
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
new file mode 100755
index 0000000..717be0e
--- /dev/null
+++ b/t/lexcpp.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Lex + C++ is supported.
+# Please keep this is sync with sister test yaccpp.test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_LEX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+foo_SOURCES = foo.l++
+bar_SOURCES = bar.lpp
+baz_SOURCES = baz.ll
+qux_SOURCES = qux.lxx
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
+$FGREP ' foo.c++ ' mk
+$FGREP ' bar.cpp ' mk
+$FGREP ' baz.cc '  mk
+$FGREP ' qux.cxx ' mk
+
+:
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
new file mode 100755
index 0000000..c731692
--- /dev/null
+++ b/t/lexvpath.sh
@@ -0,0 +1,128 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This test checks that dependent files are updated before including
+# in the distribution.  'lexer.c' depends on 'lexer.l'.  The latter is
+# updated so that 'lexer.c' should be rebuild.  Then we are running
+# 'make' and 'make distdir' and check whether the version of 'lexer.c'
+# to be distributed is up to date.
+
+# Please keep this in sync with sister test 'yaccvapth.test'.
+
+required='cc lex'
+. ./defs || Exit 1
+
+cat > lexoutroot.in << 'END'
+LEX_OUTPUT_ROOT='@LEX_OUTPUT_ROOT@'
+END
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([lexoutroot])
+AC_PROG_CC
+AC_PROG_LEX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = lexer.l foo.c
+LDADD = $(LEXLIB)
+END
+
+# Original lexer, with a "foobar" comment
+cat > lexer.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END" return EOF;
+.
+%%
+/*foobar*/
+END
+
+cat > foo.c << 'END'
+int main (void)
+{
+  return 0;
+}
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir sub
+
+# We must run configure early, to find out why $LEX_OUTPUT_ROOT is.
+cd sub
+../configure
+. ./lexoutroot
+test -n "$LEX_OUTPUT_ROOT" # Sanity check.
+cd ..
+
+$LEX lexer.l
+mv "$LEX_OUTPUT_ROOT".c lexer.c
+
+cd sub
+
+# Ensure that lexer.l will be newer than lexer.c.
+$sleep
+
+# New lexer, with 'fubar' comment.
+cat > ../lexer.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END" return EOF;
+.
+%%
+/*fubar*/
+END
+
+$MAKE
+$MAKE distdir
+$FGREP '/*fubar*/' $distdir/lexer.c
+
+#
+# Now check to make sure that 'make dist' will rebuilt the parser.
+#
+
+# Ensure that lexer.l will be newer than lexer.c.
+$sleep
+
+# New lexer, with 'maude' comment.
+cat > ../lexer.l << 'END'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END" return EOF;
+.
+%%
+/*maude*/
+END
+
+$MAKE distdir
+$FGREP '/*maude*/' $distdir/lexer.c
+
+:
diff --git a/t/lflags.sh b/t/lflags.sh
new file mode 100755
index 0000000..bb939a7
--- /dev/null
+++ b/t/lflags.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
+# $(foo_LFLAGS).
+# Please keep this in sync with the sister tests lflags2.test, yflags.test
+# and yflags2.test.
+
+required=cc
+. ./defs || Exit 1
+
+cat >fake-lex <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >lex.yy.c
+echo 'extern int dummy;' >> lex.yy.c
+END
+chmod a+x fake-lex
+
+# Remove Lex from the environment, so that it won't interfere
+# with 'make -e' below.
+unset LEX || :
+
+cat >> configure.ac <<'END'
+AC_SUBST([CC], [false])
+# Simulate presence of Lex using our fake-lex script.
+AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
+AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
+AC_SUBST([LEXLIB], [''])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.c foo.l
+bar_SOURCES = main.c bar.l
+AM_LFLAGS = __am_flags__
+bar_LFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+
+: > foo.l
+: > bar.l
+
+$AUTOCONF
+./configure
+env LFLAGS=__user_flags__ $MAKE -e foo.c bar-bar.c
+
+cat foo.c
+cat bar-bar.c
+
+grep '__am_flags__.*__user_flags__' foo.c
+grep '__bar_flags__.*__user_flags__' bar-bar.c
+
+:
diff --git a/t/lflags2.sh b/t/lflags2.sh
new file mode 100755
index 0000000..57b7b67
--- /dev/null
+++ b/t/lflags2.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
+# $(foo_LFLAGS).
+# Please keep this in sync with the sister tests lflags.test, yflags.test
+# and yflags2.test.
+
+. ./defs || Exit 1
+
+cat >fake-lex <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >lex.yy.c
+echo 'extern int dummy;' >> lex.yy.c
+END
+chmod a+x fake-lex
+
+# Remove Lex from the environment, so that it won't interfere
+# with 'make -e' below.
+unset LEX || :
+
+cat >> configure.ac <<'END'
+AC_SUBST([CXX], [false])
+# Simulate presence of Lex using our fake-lex script.
+AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
+AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
+AC_SUBST([LEXLIB], [''])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.cc foo.ll
+bar_SOURCES = main.cc bar.l++
+AM_LFLAGS = __am_flags__
+bar_LFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+
+: > foo.ll
+: > bar.l++
+
+$AUTOCONF
+./configure
+env LFLAGS=__user_flags__ $MAKE -e foo.cc bar-bar.c++
+
+cat foo.cc
+cat bar-bar.c++
+
+grep '__am_flags__.*__user_flags__' foo.cc
+grep '__bar_flags__.*__user_flags__' bar-bar.c++
+
+:
diff --git a/t/libexec.sh b/t/libexec.sh
new file mode 100755
index 0000000..24a934d
--- /dev/null
+++ b/t/libexec.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# PROGRAMS and LIBRARIES can be installed in (pkg)libexecdir.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+libexec_PROGRAMS = foo
+pkglibexec_PROGRAMS = bar
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+: > foo.c
+: > bar.c
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
new file mode 100755
index 0000000..1165f1e
--- /dev/null
+++ b/t/libobj-basic.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_LIBSOURCE and AC_LIBSOURCES work.
+
+required=cc
+. ./defs || Exit 1
+
+mv configure.ac configure.proto
+cat >> configure.proto << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES = foo.c
+libtu_a_LIBADD = $(LIBOBJS)
+
+include extra-checks.am
+.PHONY: $(extra_checks) pre-test
+
+pre-test: distdir
+       ls -l $(srcdir) $(builddir) $(distdir)
+       $(AR) tv libtu.a
+$(extra_checks): pre-test
+check-local: $(extra_checks)
+
+maude-src:
+       grep dummy_maude $(srcdir)/maude.c
+maude-dist:
+       grep dummy_maude $(distdir)/maude.c
+liver-src:
+       grep dummy_liver $(srcdir)/liver.c
+liver-dist:
+       grep dummy_liver $(distdir)/liver.c
+liver-not-dist:
+       test -d $(distdir)
+       test ! -r $(distdir)/liver.c
+maude-not-dist:
+       test -d $(distdir)
+       test ! -r $(distdir)/maude.c
+END
+
+cat > foo.c << 'END'
+extern int dummy_foo;
+END
+
+cat > maude.c << 'END'
+extern int dummy_maude;
+END
+
+cat > liver.c << 'END'
+extern int dummy_liver;
+END
+
+# AC_LIBSOURCE should work also if called after AC_OUTPUT.
+cat configure.proto - > configure.ac <<END
+AC_LIBSOURCE([maude.c])
+END
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist liver-not-dist
+END
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+$MAKE distclean
+# Avoid timestamp-related differences.
+rm -rf autom4te*.cache
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist liver-src liver-dist
+END
+
+# AC_LIBSOURCES should work also if called after AC_OUTPUT.
+cat configure.proto - > configure.ac <<END
+AC_LIBSOURCES([maude.c, liver.c])
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/libobj10.sh b/t/libobj10.sh
new file mode 100755
index 0000000..f19de74
--- /dev/null
+++ b/t/libobj10.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Do not complain about the nonexistence of a source for LIBOBJS if
+# it's in BUILT_SOURCES.  Reported by Erez Zadok.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBOBJ([foo])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a
+libfoo_a_SOURCES =
+libfoo_a_LIBADD = $(LIBOBJS)
+BUILT_SOURCES = foo.c
+CLEANFILES = foo.c
+foo.c:
+       echo 'extern int dummy;' > $@
+.PHONY: debugging
+debugging:
+       $(AR) t libfoo.a
+END
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE
+$MAKE debugging
+$MAKE distcheck
+
+:
diff --git a/t/libobj12.sh b/t/libobj12.sh
new file mode 100755
index 0000000..c3c0057
--- /dev/null
+++ b/t/libobj12.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if a file can be mentioned in LIBOBJS and explicitly.
+# (See libobj13.test for the LTLIBRARIES check.)
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBOBJ([foo])
+AC_LIBOBJ([bar])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a libbar.a
+noinst_PROGRAMS = p1 p2
+
+libfoo_a_SOURCES =
+libfoo_a_LIBADD = @LIBOBJS@
+
+libbar_a_SOURCES = foo.c
+
+p1_SOURCES =
+p1_LDADD = @LIBOBJS@
+
+p2_SOURCES = bar.c
+END
+
+: > ar-lib
+: > foo.c
+: > bar.c
+
+$ACLOCAL
+
+# This however should be diagnosed, since foo.c and bar.c are in 
@address@hidden
+cat >> Makefile.am << 'END'
+libfoo_a_SOURCES += foo.c
+p1_SOURCES += bar.c
+END
+
+AUTOMAKE_fails
+grep 'foo\.c.*explicitly mentioned' stderr
+grep 'bar\.c.*explicitly mentioned' stderr
+
+# Global 'LDADD' can also come into play.
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = a b
+LDADD = @LIBOBJS@
+END
+
+$AUTOMAKE
+grep 'a_DEPENDENCIES.*LIBOBJS' Makefile.in
+
+cat >> Makefile.am << 'END'
+a_SOURCES = foo.c
+END
+AUTOMAKE_fails
+grep 'foo\.c.*explicitly mentioned' stderr
+
+:
diff --git a/t/libobj13.sh b/t/libobj13.sh
new file mode 100755
index 0000000..ef63d8b
--- /dev/null
+++ b/t/libobj13.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test if a file can be mentioned in LTLIBOBJS and explicitly.
+# (Like libobj12.test, but for Libtool libraries.)
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_LIBOBJ([foo])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = libfoo.la libbar.la
+
+libfoo_la_SOURCES =
+libfoo_la_LIBADD = @LTLIBOBJS@
+
+libbar_la_SOURCES = foo.c
+END
+
+: > foo.c
+
+$ACLOCAL
+: > ltmain.sh
+$AUTOMAKE --add-missing
+
+# This however should be diagnosed, since foo.c is in @address@hidden
+echo 'libfoo_la_SOURCES += foo.c' >> Makefile.am
+AUTOMAKE_fails
+grep 'foo\.c.*explicitly mentioned' stderr
+
+:
diff --git a/t/libobj14.sh b/t/libobj14.sh
new file mode 100755
index 0000000..50554de
--- /dev/null
+++ b/t/libobj14.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for an internal error when @LIBOBJS@ is used in
+# a variable that is not defined in the same conditions as the _LDADD
+# that uses it.
+# Report from Bill Davidson.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_PROG_CC
+AC_LIBSOURCE([bar.c])
+AM_CONDITIONAL([CASE], [:])
+AC_OUTPUT
+EOF
+
+: >bar.c
+
+cat >>Makefile.am <<'EOF'
+COMMON_LIBS = @LIBOBJS@
+bin_PROGRAMS = foo
+if ! CASE
+foo_LDADD = $(COMMON_LIBS)
+endif
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
new file mode 100755
index 0000000..d306b71
--- /dev/null
+++ b/t/libobj15a.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Nonexistent sources for AC_LIBOBJ should cause an Automake failure.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBOBJ([foobar])
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
+
+:
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
new file mode 100755
index 0000000..f0466fd
--- /dev/null
+++ b/t/libobj15b.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Nonexistent source for AC_LIBSOURCE should cause Automake to fail.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBSOURCE([foobar.c])
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
+
+:
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
new file mode 100755
index 0000000..8fe521d
--- /dev/null
+++ b/t/libobj15c.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Nonexistent sources for AC_LIBSOURCES should cause Automake to fail.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_LIBSOURCES([foobar.c, bazquux.c])
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+# Don't trip on errors due to missing 'AM_PROG_AR'.
+AUTOMAKE="$AUTOMAKE -Wno-extra-portability"
+
+$ACLOCAL
+
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
+grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
+
+: > foobar.c
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
+grep 'foobar\.c' stderr && Exit 1
+
+:
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
new file mode 100755
index 0000000..2e1da26
--- /dev/null
+++ b/t/libobj16a.sh
@@ -0,0 +1,139 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_LIBOBJ and friends work.
+# Please keep this in sync with sister test 'libobj16b.test'.
+
+required=cc
+. ./defs || Exit 1
+
+mv configure.ac configure.proto
+cat >> configure.proto << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+%LIBOBJ-STUFF% # Will be activated later.
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+
+include extra-checks.am
+.PHONY: $(extra_checks) pre-test
+
+pre-test: distdir
+       ls -l $(srcdir) $(builddir) $(distdir)
+       $(AR) tv libtu.a
+$(extra_checks): pre-test
+check-local: $(extra_checks)
+
+maude-src:
+       grep dummy_maude $(srcdir)/maude.c
+maude-dist:
+       grep dummy_maude $(distdir)/maude.c
+liver-src:
+       grep dummy_liver $(srcdir)/liver.c
+liver-dist:
+       grep dummy_liver $(distdir)/liver.c
+liver-not-dist: distdir
+       test ! -r $(distdir)/liver.c
+maude-not-dist: distdir
+       test ! -r $(distdir)/maude.c
+maude-lib:
+       $(AR) t libtu.a | grep maude
+maude-not-lib:
+       $(AR) t libtu.a | grep maude && exit 1; exit 0
+liver-lib:
+       $(AR) t libtu.a | grep liver
+liver-not-lib:
+       $(AR) t libtu.a | grep liver && exit 1; exit 0
+END
+
+cat > maude.c << 'END'
+extern int dummy_maude;
+END
+
+cat > liver.c << 'END'
+extern int dummy_liver;
+END
+
+sed '/%LIBOBJ-STUFF%/{
+s/.*//
+i\
+AC_LIBOBJ([maude])
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist maude-lib liver-not-dist
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+# Avoid timestamp-related differences.
+rm -rf autom4te*.cache
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist liver-src liver-dist
+if MAUDE_COND
+extra_checks += maude-lib liver-not-lib
+else
+extra_checks += maude-not-lib liver-lib
+endif
+END
+
+sed '/%LIBOBJ-STUFF%/{
+s/.*//
+i\
+AM_CONDITIONAL([MAUDE_COND], [test x"$MAUDE" = x"yes"])\
+if test x"$MAUDE" = x"yes"; then\
+  AC_LIBOBJ([maude])\
+else\
+  AC_LIBOBJ([liver])\
+fi\
+AC_LIBSOURCES([maude.c, liver.c])
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure MAUDE=yes
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+./configure MAUDE=no
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+:
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
new file mode 100755
index 0000000..110ba19
--- /dev/null
+++ b/t/libobj16b.sh
@@ -0,0 +1,140 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_LIBOBJ and friends work.
+# Please keep this in sync with sister test 'libobj16a.test'.
+
+required=cc
+. ./defs || Exit 1
+
+mv configure.ac configure.proto
+cat >> configure.proto << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+%LIBOBJ-STUFF% # Will be activated later.
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @LIBOBJS@
+
+include extra-checks.am
+.PHONY: $(extra_checks) pre-test
+
+pre-test: distdir
+       ls -l $(srcdir) $(builddir) $(distdir)
+       $(AR) tv libtu.a
+$(extra_checks): pre-test
+check-local: $(extra_checks)
+
+maude-src:
+       grep dummy_maude $(srcdir)/maude.c
+maude-dist:
+       grep dummy_maude $(distdir)/maude.c
+liver-src:
+       grep dummy_liver $(srcdir)/liver.c
+liver-dist:
+       grep dummy_liver $(distdir)/liver.c
+liver-not-dist: distdir
+       test ! -r $(distdir)/liver.c
+maude-not-dist: distdir
+       test ! -r $(distdir)/maude.c
+maude-lib:
+       $(AR) t libtu.a | grep maude
+maude-not-lib:
+       $(AR) t libtu.a | grep maude && exit 1; exit 0
+liver-lib:
+       $(AR) t libtu.a | grep liver
+liver-not-lib:
+       $(AR) t libtu.a | grep liver && exit 1; exit 0
+END
+
+cat > maude.c << 'END'
+extern int dummy_maude;
+END
+
+cat > liver.c << 'END'
+extern int dummy_liver;
+END
+
+sed '/%LIBOBJ-STUFF%/{
+s/.*//
+i\
+AC_LIBOBJ(maude) dnl: do not quote this!
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist maude-lib liver-not-dist
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+# Avoid timestamp-related differences.
+rm -rf autom4te*.cache
+
+cat > extra-checks.am << 'END'
+extra_checks = maude-src maude-dist liver-src liver-dist
+if MAUDE_COND
+extra_checks += maude-lib liver-not-lib
+else
+extra_checks += maude-not-lib liver-lib
+endif
+END
+
+sed '/%LIBOBJ-STUFF%/{
+s/.*//
+i\
+AM_CONDITIONAL([MAUDE_COND], [test x"$MAUDE" = x"yes"])\
+if test x"$MAUDE" = x"yes"; then\
+  AC_LIBOBJ(maude) dnl: do not quote this!\
+else\
+  AC_LIBOBJ(liver) dnl: do not quote this!\
+fi\
+AC_LIBSOURCE(maude.c) dnl: do not quote this!\
+AC_LIBSOURCE(liver.c) dnl: do not quote this!
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure MAUDE=yes
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+./configure MAUDE=no
+$MAKE
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+:
diff --git a/t/libobj17.sh b/t/libobj17.sh
new file mode 100755
index 0000000..6c54a28
--- /dev/null
+++ b/t/libobj17.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_LIBOBJ accept non-literal arguments.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AM_PROG_AR
+foo=${FOO-oops}
+AC_LIBSOURCES([quux.c, zardoz.c])
+AC_LIBOBJ([$foo])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+.PHONY: check-quux check-zardoz
+check-quux:
+       $(AR) t libtu.a | grep quux
+       $(AR) t libtu.a | grep zardoz && exit 1; exit 0
+check-zardoz:
+       $(AR) t libtu.a | grep zardoz
+       $(AR) t libtu.a | grep quux && exit 1; exit 0
+END
+
+cat > quux.c <<'END'
+extern int dummy;
+END
+
+cat > zardoz.c <<'END'
+extern int dummy;
+END
+
+# These might print warnings, but should not error out.
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure FOO=quux
+$MAKE
+ls -l # For debugging.
+test -f libtu.a
+$MAKE check-quux
+
+$MAKE distclean
+
+./configure FOO=zardoz
+$MAKE
+ls -l # For debugging.
+test -f libtu.a
+$MAKE check-zardoz
+
+:
diff --git a/t/libobj18.sh b/t/libobj18.sh
new file mode 100755
index 0000000..0ac7438
--- /dev/null
+++ b/t/libobj18.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_LIBSOURCE and AC_LIBSOURCES use arguments literally.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+foo=dummy bar=dummy baz=dummy
+AC_LIBSOURCE([$foo.c])
+AC_LIBSOURCES([$bar.c, $baz.c])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+: > dummy.c
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*\$foo\.c.*not found' stderr
+grep 'configure\.ac:.*required file.*\$bar\.c.*not found' stderr
+grep 'configure\.ac:.*required file.*\$baz\.c.*not found' stderr
+
+:
diff --git a/t/libobj19.sh b/t/libobj19.sh
new file mode 100755
index 0000000..4d9e283
--- /dev/null
+++ b/t/libobj19.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test support for AC_CONFIG_LIBOBJ_DIR.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_LIBOBJ_DIR([libobj-dir])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBOBJ([foobar])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+## Hack with this variable ans with extra make recursion in the check-local
+## rule are required for when we move this Makefile in a subdir, later.
+my_distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)
+check-local:
+       (cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) distdir)
+       ls -l $(top_srcdir)/* $(top_builddir)/* $(my_distdir)/*
+       test -f libtu.a
+       test ! -r $(top_srcdir)/foobar.c
+       test -f $(top_srcdir)/libobj-dir/foobar.c
+       test ! -r $(my_distdir)/foobar.c
+       test -f $(my_distdir)/libobj-dir/foobar.c
+       $(AR) t libtu.a
+       $(AR) t libtu.a | grep foobar
+END
+
+mkdir libobj-dir
+cat > libobj-dir/foobar.c << 'END'
+extern int dummy;
+END
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+cp "$am_scriptdir/compile" . || fatal_ "fetching auxiliary script 'compile'"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE
+$MAKE check
+$MAKE distcheck
+
+# Same check, but with the Makefile.am using $(LIBOBJS) not being
+# the top-level one.
+
+$MAKE distclean
+rm -rf autom4te*.cache aclocal.m4 configure
+
+mkdir sub
+mv -f Makefile.am sub
+echo SUBDIRS = sub > Makefile.am
+
+sed '/^AC_OUTPUT/i\
+AC_CONFIG_FILES([sub/Makefile])
+' configure.ac > t
+mv -f t configure.ac
+cat configure.ac # For debugging.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/libobj2.sh b/t/libobj2.sh
new file mode 100755
index 0000000..ce655c2
--- /dev/null
+++ b/t/libobj2.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure LIBOBJS works in subdirs.
+# Bug from Josh MacDonald.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([subdir/Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR], [ar])
+AC_LIBOBJ([fsusage])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+check-local: distdir
+       ls -l $(srcdir) $(srcdir)/subdir
+       ls -l $(distdir) $(distdir)/subdir
+       ls -l $(builddir) $(builddir)/subdir
+       test -f $(srcdir)/subdir/fsusage.c
+       test -f $(distdir)/subdir/fsusage.c
+       $(AR) tv $(builddir)/subdir/libtu.a
+END
+
+mkdir subdir
+
+cat > subdir/Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @LIBOBJS@
+END
+
+cat > subdir/fsusage.c << 'END'
+extern int dummy;
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Older grepping check, kept "just to be sure".
+$FGREP 'fsusage.c' subdir/Makefile.in
+
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/libobj20a.sh b/t/libobj20a.sh
new file mode 100755
index 0000000..d56be31
--- /dev/null
+++ b/t/libobj20a.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
+# See also sister tests 'libobj20b.test' and 'libobj20c.test' .
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_LIBOBJ_DIR([libobj-dir])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBOBJ([foo])
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+mkdir libobj-dir
+: > libobj-dir/foo.c
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'LIBOBJS.*used outside.*libobj-dir' stderr
+grep 'subdir-objects.*not set' stderr
+
+:
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
new file mode 100755
index 0000000..f8ca600
--- /dev/null
+++ b/t/libobj20b.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
+# See also sister tests 'libobj20a.test' and 'libobj20c.test' .
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_LIBOBJ_DIR([libobj-dir])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_LIBSOURCE([foobar.c])
+# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
+#       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7635>
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+: > ar-lib
+
+$ACLOCAL
+
+AUTOMAKE_fails
+grep 'configure\.ac:.*required directory.*libobj-dir' stderr
+
+mkdir libobj-dir
+: > foobar.c # Oops, it should be in libobj-dir!
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*libobj-dir/foobar.c.*' stderr
+
+rm -f foobar.c
+
+: > libobj-dir/foobar.c
+$AUTOMAKE # Now we should succeed.
+
+:
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
new file mode 100755
index 0000000..7ae51bf
--- /dev/null
+++ b/t/libobj20c.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
+# See also sister tests 'libobj20a.test' and 'libobj20b.test' .
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_LIBOBJ_DIR([libobj-dir])
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_LIBOBJ([foobar])
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = $(LIBOBJS)
+END
+
+$ACLOCAL
+
+# Don't trip on errors due to missing 'AM_PROG_AR'.
+AUTOMAKE="$AUTOMAKE -Wno-extra-portability"
+
+AUTOMAKE_fails
+grep 'configure\.ac:.*required directory.*\./libobj-dir' stderr
+
+mkdir libobj-dir
+: > foobar.c # Oops, it should be in libobj-dir!
+AUTOMAKE_fails
+grep 'configure\.ac:.*required file.*libobj-dir/foobar.c.*' stderr
+
+rm -f foobar.c
+
+: > libobj-dir/foobar.c
+$AUTOMAKE # Now we should succeed.
+
+:
diff --git a/t/libobj3.sh b/t/libobj3.sh
new file mode 100755
index 0000000..37ec6bf
--- /dev/null
+++ b/t/libobj3.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we complain if @LIBOBJS@ is used without being set in
+# configure.ac.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AM_PROG_AR
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @LIBOBJS@
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile\.am:3:.*LIBOBJS' stderr
+
+:
diff --git a/t/libobj4.sh b/t/libobj4.sh
new file mode 100755
index 0000000..68711af
--- /dev/null
+++ b/t/libobj4.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure LIBOBJS error only occurs if LIBOBJS seen.  Report
+# from Jim Meyering.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_REPLACE_FUNCS([foo])
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/libobj5.sh b/t/libobj5.sh
new file mode 100755
index 0000000..036ae56
--- /dev/null
+++ b/t/libobj5.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AC_REPLACE_FUNCS works across lines.  Report from
+# Jim Meyering.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = joe
+LDADD = @LIBOBJS@
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_REPLACE_FUNCS(\
+   foo_bar_quux)
+END
+
+: > foo_bar_quux.c
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP foo_bar_quux.c Makefile.in
+
+:
diff --git a/t/libobj7.sh b/t/libobj7.sh
new file mode 100755
index 0000000..46f0f98
--- /dev/null
+++ b/t/libobj7.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for multiple replacement functions.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+# 'am__dummy_function' is there to ensure that at least one function is
+# replaced, to avoid creating an empty archive which can cause problems
+# with e.g. Solaris ar.
+AC_REPLACE_FUNCS([basename dirname am__dummy_function])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtu.a
+libtu_a_SOURCES =
+libtu_a_LIBADD = @LIBOBJS@
+check-local: test1 test2 test3
+.PHONY: test1 test2 test3
+test1: all
+       $(AR) tv libtu.a
+test2:
+       @echo DIST_COMMON = $(DIST_COMMON)
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]basename\.c '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]dirname\.c '
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]am__dummy_function\.c '
+test3: distdir
+       test -f $(distdir)/basename.c
+       test -f $(distdir)/dirname.c
+       test -f $(distdir)/am__dummy_function.c
+END
+
+cat > basename.c <<'END'
+extern int dummy1;
+END
+cat > dirname.c <<'END'
+extern int dummy2;
+END
+cat > am__dummy_function.c <<'END'
+extern int dummy3;
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+
+$MAKE
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/library.sh b/t/library.sh
new file mode 100755
index 0000000..dffe658
--- /dev/null
+++ b/t/library.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for _DEPENDENCIES with libraries.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AM_PROG_AR
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu cygnus
+lib_LIBRARIES = libfoo.a
+libfoo_a_DEPENDENCIES = libzot.a
+END
+
+: > ar-lib
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/library2.sh b/t/library2.sh
new file mode 100755
index 0000000..dfa8758
--- /dev/null
+++ b/t/library2.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+EXTRA_LIBRARIES = libfoo.a
+END
+
+$ACLOCAL
+AUTOMAKE_fails -Wno-portability
+grep AC_PROG_RANLIB stderr
diff --git a/t/library3.sh b/t/library3.sh
new file mode 100755
index 0000000..27a2b15
--- /dev/null
+++ b/t/library3.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake simplify conditions in diagnostics.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AM_CONDITIONAL([A], [:])
+AM_CONDITIONAL([B], [:])
+AM_CONDITIONAL([C], [:])
+AM_CONDITIONAL([D], [:])
+EOF
+
+cat > Makefile.am << 'END'
+if A
+if !B
+  RANLIB = anb
+else
+  RANLIB = ab
+endif
+endif
+if C
+  RANLIB = c
+endif
+if !C
+if D
+  RANLIB = ncd
+endif
+endif
+EXTRA_LIBRARIES = libfoo.a
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile.am:.*:   !A and !C and !D$' stderr
+# Is there only one missing condition?
+test `grep ':   !' stderr | wc -l` = 1 || Exit 1
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
new file mode 100755
index 0000000..0218ef3
--- /dev/null
+++ b/t/libtoo10.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure .libs directories are removed for _PROGRAMS.
+# Report from Guillermo Ontañón.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = lib/libfoo.la
+lib_libfoo_la_SOURCES = foo.c
+bin_PROGRAMS = src/main
+check_PROGRAMS = check/test
+src_main_SOURCES = main.c
+check_test_SOURCES = main.c
+LDADD = lib/libfoo.la
+END
+
+mkdir lib src check
+cat > foo.c << 'END'
+int foo () { return 0; }
+END
+
+cat > main.c << 'END'
+extern int foo ();
+int main () { return foo (); }
+END
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+./configure
+$MAKE all check
+$MAKE clean
+test ! -d src/.libs
+test ! -d src/_libs
+test ! -d check/.libs
+test ! -d check/_libs
+$MAKE distcheck
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
new file mode 100755
index 0000000..cd55cc0
--- /dev/null
+++ b/t/libtoo11.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
+# Report by Charles Wilson.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
new file mode 100755
index 0000000..e5c77ac
--- /dev/null
+++ b/t/libtool-macros.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Try to find the libtool '.m4' files and make them easily accessed
+# to the test cases requiring them.
+# See also automake bug#9807.
+
+. ./defs || Exit 1
+
+echo "# Automatically generated by $me." > get.sh
+echo : >> get.sh
+
+# The 'libtoolize' script will look into Makefile.am.
+echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+
+if libtoolize --copy --install && test -f m4/libtool.m4; then
+  echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
+  echo "export ACLOCAL_PATH" >> get.sh
+else
+  # Libtoolize from libtool < 2.0 didn't support the '--install' option,
+  # but this doesn't mean the user hasn't made the libtool macros
+  # available, e.g., by properly setting ACLOCAL_PATH.
+  rm -rf m4
+  mkdir m4
+  echo AC_PROG_LIBTOOL >> configure.ac
+  # See below for an explanation about the use the of '-Wno-syntax'.
+  if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then
+    : # Libtool macros already accessible by default.
+  else
+    echo "skip_all_ \"couldn't find or get libtool macros\"" >> get.sh
+  fi
+fi
+
+. ./get.sh
+
+$ACLOCAL --force -I m4 || cat >> get.sh <<'END'
+# We need to use '-Wno-syntax', since we do not want our test suite
+# to fail merely because some third-party '.m4' file is underquoted.
+ACLOCAL="$ACLOCAL -Wno-syntax"
+END
+
+# The file libtoolize might have just copied in the 'm4' subdirectory of
+# the test directory are going to be needed by other tests, so we must
+# not remove the test directory.
+keep_testdirs=yes
+
+:
diff --git a/t/libtool.sh b/t/libtool.sh
new file mode 100755
index 0000000..7b267a7
--- /dev/null
+++ b/t/libtool.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure libtool is removed.
+# Report from Kevin Dalley.
+
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_LIBTOOL_DLOPEN
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+AC_SUBST([LIBTOOL_DEPS])
+END
+
+: > Makefile.am
+
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'rm -f libtool' Makefile.in
+
+:
diff --git a/t/libtool2.sh b/t/libtool2.sh
new file mode 100755
index 0000000..3b8a78b
--- /dev/null
+++ b/t/libtool2.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure libtool clean targets exist.
+# Report from Eric Magnien.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIR = subdir
+lib_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = foo.c
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+lib_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = foo.c
+END
+
+$ACLOCAL
+: > ltmain.sh
+$AUTOMAKE -a
+
+grep 'rm -f .*\.lo' sub/Makefile.in
+
+:
diff --git a/t/libtool3.sh b/t/libtool3.sh
new file mode 100755
index 0000000..dbcd519
--- /dev/null
+++ b/t/libtool3.sh
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Try to build and package a program linked to a Libtool library.
+# Also make sure we do not bloat the Makefile with unneeded rules.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AM_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = lib0.la liba/liba.la
+lib0_la_SOURCES = 0.c
+liba_liba_la_SOURCES = liba/a.c
+
+bin_PROGRAMS = 1
+1_SOURCES = sub/1.c
+1_LDADD = lib0.la liba/liba.la
+END
+
+mkdir liba sub
+
+cat > 0.c << 'END'
+int
+zero (void)
+{
+   return 0;
+}
+END
+
+cat > sub/1.c << 'END'
+int zero ();
+
+int
+main (void)
+{
+   return zero ();
+}
+END
+
+cat > liba/a.c << 'END'
+int
+a (void)
+{
+   return 'a';
+}
+END
+
+# Use --copy to workaround a bug in Cygwin's 'cp -p' during distcheck.
+# (This bug is already exhibited by subobj9.test.)  In brief: Cygwin's
+# 'cp -p' tries to preserve group and owner of the source and fails
+# to do so under normal accounts.  With --copy we ensure we own all files.
+
+libtoolize --force --copy
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing --copy
+
+# We need explicit rules to build 1.o and a.lo.  Make sure
+# Automake did not output additional rules for 1.lo and and a.lo.
+$FGREP '1.o:' Makefile.in
+$FGREP '1.lo:' Makefile.in && Exit 1
+$FGREP 'a.o:' Makefile.in && Exit 1
+$FGREP 'a.lo:' Makefile.in
+
+./configure
+
+$MAKE
+$MAKE distcheck
+
+:
diff --git a/t/libtool4.sh b/t/libtool4.sh
new file mode 100755
index 0000000..2ce92dd
--- /dev/null
+++ b/t/libtool4.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+END
+
+cat > Makefile.am << 'END'
+EXTRA_LTLIBRARIES = liblib.la
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '[Ll]ibtool library .*LIBTOOL.* undefined' stderr
+grep 'define .*LIBTOOL.* add .*LT_INIT' stderr
+
+:
diff --git a/t/libtool5.sh b/t/libtool5.sh
new file mode 100755
index 0000000..b9e778b
--- /dev/null
+++ b/t/libtool5.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure it's ok to install a library under different conditions
+# in the same directory.
+# Report from Harlan Stenn.
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [false])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+if COND1
+  lib_LTLIBRARIES = liba.la
+endif
+if COND2
+  lib_LTLIBRARIES = liba.la
+endif
+END
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
diff --git a/t/libtool6.sh b/t/libtool6.sh
new file mode 100755
index 0000000..13dbc73
--- /dev/null
+++ b/t/libtool6.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure it's OK to install a library under different conditions
+# in different directories.  PR/285.
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [false])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+if COND1
+  lib_LTLIBRARIES = liba.la
+endif
+if COND2
+  pkglib_LTLIBRARIES = liba.la
+endif
+END
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+# am_liba_la_rpath is defined twice, and used once
+test 3 = `grep 'am_liba_la_rpath' Makefile.in | wc -l`
diff --git a/t/libtool7.sh b/t/libtool7.sh
new file mode 100755
index 0000000..bc8eaca
--- /dev/null
+++ b/t/libtool7.sh
@@ -0,0 +1,108 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we allow Libtool's -dlopen/-dlpreopen
+# Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+AM_LIBTOOLFLAGS = --silent
+lib_LTLIBRARIES = libmod1.la mod2.la
+libmod1_la_SOURCES = sub/mod1.c
+libmod1_la_LDFLAGS = -module
+libmod1_la_LIBADD = -dlopen mod2.la
+mod2_la_SOURCES = mod2.c
+mod2_la_LDFLAGS = -module
+mod2_la_LIBTOOLFLAGS =
+
+bin_PROGRAMS = prg
+prg_SOURCES = prg.c
+prg_LDADD = -dlopen libmod1.la -dlpreopen mod2.la
+
+.PHONY: print
+print:
+       @echo 1BEG: $(prg_DEPENDENCIES) :END1
+       @echo 2BEG: $(libmod1_la_DEPENDENCIES) :END2
+       @echo 3BEG: $(LTCOMPILE) :END3
+END
+
+mkdir sub liba
+
+cat > sub/mod1.c << 'END'
+int mod1 (void)
+{
+   return 1;
+}
+END
+
+cat > mod2.c << 'END'
+int mod2 (void)
+{
+   return 2;
+}
+END
+
+cat > prg.c << 'END'
+int main (void)
+{
+   return 0;
+}
+END
+
+libtoolize --force --copy
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing --copy
+
+./configure "--prefix=`pwd`/_inst"
+env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || {
+  cat output
+  Exit 1
+}
+cat output
+grep '1BEG: libmod1.la mod2.la :END1' output
+grep '2BEG: mod2.la :END2' output
+grep '3BEG: .*silent.*silent.* :END3' output
+test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l`
+$MAKE
+
+env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || {
+  cat output
+  Exit 1
+}
+cat output
+grep 'silent.*silent.*prg' output
+grep 'silent.*silent.*libmod1' output
+
+env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
+  cat output
+  Exit 1
+}
+cat output
+grep 'silent.*silent.*libmod1' output
+
+:
diff --git a/t/libtool8.sh b/t/libtool8.sh
new file mode 100755
index 0000000..9182c27
--- /dev/null
+++ b/t/libtool8.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake diagnoses conflicting installations.
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [false])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+if COND1
+  lib_LTLIBRARIES = liba.la
+  EXTRA_LTLIBRARIES = libc.la libc.la libb.la
+else
+  lib_LTLIBRARIES = libb.la
+endif
+if COND2
+if COND1
+    pkglib_LTLIBRARIES = liba.la
+endif
+LIBTOOLFLAGS = ouch
+endif
+END
+
+libtoolize
+$ACLOCAL
+AUTOMAKE_fails --add-missing
+grep libb stderr && Exit 1
+grep 'Makefile.am:3:.*libc.la.*multiply defined' stderr
+grep "Makefile.am:9:.*'pkglib" stderr
+grep "Makefile.am:2:.*'lib" stderr
+grep 'Makefile.am:11:.*AM_LIBTOOLFLAGS' stderr
diff --git a/t/libtool9.sh b/t/libtool9.sh
new file mode 100755
index 0000000..b4d7baa
--- /dev/null
+++ b/t/libtool9.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure xxx_LINK is defined for each target that requires specific
+# flags.
+# Quite similar to libtool7.test, using AM_LDFLAGS in addition to
+# xxx_LDFLAGS.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AM_LDFLAGS = -module
+lib_LTLIBRARIES = libmod1.la mod2.la
+libmod1_la_SOURCES = mod1.c
+libmod1_la_LDFLAGS =
+libmod1_la_LIBADD = -dlopen mod2.la
+mod2_la_SOURCES = mod2.c
+
+bin_PROGRAMS = prg prg2
+prg_SOURCES = prg.c
+prg_LDADD = -dlopen libmod1.la -dlpreopen mod2.la
+prg_CPPFLAGS = -DXYZ=1
+prg2_SOURCES = prg.c
+prg2_CFLAGS =
+
+print:
+       @echo 1BEG: $(prg_DEPENDENCIES) :END1
+       @echo 2BEG: $(libmod1_la_DEPENDENCIES) :END2
+       @echo 3BEG: $(libmod1_la_LINK) :END3
+       @echo 4BEG: $(mod2_la_LINK) :END4
+       @echo 5BEG: $(prg_LINK) :END5
+       @echo 6BEG: $(prg2_LINK) :END6
+
+END
+
+mkdir liba
+
+cat > mod1.c << 'END'
+int mod1 (void)
+{
+   return 1;
+}
+END
+
+cat > mod2.c << 'END'
+int mod2 (void)
+{
+   return 2;
+}
+END
+
+cat > prg.c << 'END'
+int main (void)
+{
+   return 0;
+}
+END
+
+libtoolize --force --copy
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing --copy
+
+./configure
+env LDFLAGS=ldflags AM_LDFLAGS=am_ldflags libmod1_la_LDFLAGS=lm1_la_ldflags \
+    CFLAGS=cflags AM_CFLAGS=am_cflags prg2_CFLAGS=prg2_cflags \
+    $MAKE -e print >output 2>&1 || { cat output; Exit 1; }
+cat output
+grep '1BEG: libmod1.la mod2.la :END1' output
+grep '2BEG: mod2.la :END2' output
+grep '3BEG:.* am_cflags cflags .*lm1_la_ldflags ldflags.* :END3' output
+grep '3BEG: .*am_ldflags.* :END3' output && Exit 1
+grep '4BEG: :END4' output
+grep '5BEG: :END5' output
+grep '6BEG:.* prg2_cflags cflags .*am_ldflags ldflags.* :END6' output
+grep '6BEG: .*am_cflags.* :END6' output && Exit 1
+$MAKE
+
+:
diff --git a/t/license.sh b/t/license.sh
new file mode 100755
index 0000000..c3dad69
--- /dev/null
+++ b/t/license.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure COPYING is not overwritten, even with -a -f.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >>configure.ac
+
+cat >Makefile.am <<\EOF
+test1: distdir
+       grep 'GNU GENERAL PUBLIC LICENSE' $(distdir)/COPYING
+test2: distdir
+       grep 'MY-OWN-LICENSE' $(distdir)/COPYING
+test3: distdir
+       test ! -f $(distdir)/COPYING
+       grep 'MY-OWN-LICENSE' $(distdir)/COPYING.LIB
+EOF
+
+:> NEWS
+:> AUTHORS
+:> ChangeLog
+:> README
+
+test ! -f COPYING
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --gnu --add-missing
+
+./configure
+$MAKE test1
+
+# Use 'rm' before 'echo', because COPYING is likely to be a symlink to
+# the real COPYING...
+rm -f COPYING
+echo 'MY-OWN-LICENSE' >COPYING
+$MAKE test2
+
+$AUTOMAKE --gnu --add-missing --force-missing
+./configure
+$MAKE test2
+
+rm -f COPYING
+echo 'MY-OWN-LICENSE' >COPYING.LIB
+$AUTOMAKE --gnu --add-missing --force-missing
+./configure
+$MAKE test3
diff --git a/t/license2.sh b/t/license2.sh
new file mode 100755
index 0000000..d447eba
--- /dev/null
+++ b/t/license2.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that installing 'COPYING' outputs a warning.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
+END
+
+: >AUTHORS
+: >NEWS
+: >README
+: >ChangeLog
+: >INSTALL
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'COPYING' stderr
+
+AUTOMAKE_run --add-missing
+grep 'COPYING' stderr
+grep 'GNU General Public License' stderr
+grep 'Consider adding.*version control' stderr
+test -f COPYING
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
new file mode 100755
index 0000000..a3dac1b
--- /dev/null
+++ b/t/link_c_cxx.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the C++ linker is used when appropriate.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.c lamp.cxx
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the C++ linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(CXXLINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(FLINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'  Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_cond.sh b/t/link_cond.sh
new file mode 100755
index 0000000..71733ba
--- /dev/null
+++ b/t/link_cond.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automatic determination of the linker works well with
+# conditional use of languages in a single program.
+# This currently doesn't truly work, but we have an easy workaround
+# at least, that is tested here.
+# See automake bug#11089.
+
+required='cc c++'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_CONDITIONAL([HAVE_CXX], [test $have_cxx = yes])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+if HAVE_CXX
+foo_SOURCES = more.c++
+else
+foo_SOURCES = less.c
+endif
+## FIXME: ideally, this workaround shouldn't be needed.
+if HAVE_CXX
+foo_LINK = $(CXXLINK)
+else
+foo_LINK = $(LINK)
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+rm -f *.c++
+cat > less.c <<'END'
+/* Valid C but deliberately invalid C++ */
+main ()
+{
+  int new = 0;
+  return new;
+}
+END
+
+./configure have_cxx=no
+CXX=false $MAKE -e
+
+# Sanity check.
+rm -f foo foo.exe
+CC=false $MAKE -e && Exit 99
+
+$MAKE distclean
+
+rm -f *.c
+cat > more.c++ <<'END'
+/* Valid C++ but deliberately invalid C */
+using namespace std;
+int main (void)
+{
+  return 0;
+}
+END
+
+./configure have_cxx=yes
+CC=false $MAKE -e
+
+# Sanity check.
+rm -f foo foo.exe
+CXX=false $MAKE -e && Exit 99
+
+:
diff --git a/t/link_dist.sh b/t/link_dist.sh
new file mode 100755
index 0000000..8ba05df
--- /dev/null
+++ b/t/link_dist.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the linker for a dist_*_SOURCES can override that for
+# *_SOURCES
+# Richard Boulton <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.c
+dist_lavalamp_SOURCES = lamp.cxx
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the C++ linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(CXXLINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(FLINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'  Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
new file mode 100755
index 0000000..a34d6c6
--- /dev/null
+++ b/t/link_f90_only.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the Fortran 90 linker is used when appropriate.
+# (copied from link_f_only.test) Mike Nolta <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_FC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lamp.f90
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the Fortran linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(FCLINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(CXXLINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'    Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
new file mode 100755
index 0000000..25f3ef9
--- /dev/null
+++ b/t/link_f_only.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the Fortran 77 linker is used when appropriate.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lamp.f
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the Fortran linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(F77LINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(CXXLINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'    Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_fc.sh b/t/link_fc.sh
new file mode 100755
index 0000000..6cf8b8b
--- /dev/null
+++ b/t/link_fc.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the Fortran 77 linker is used when appropriate.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.c lamp.f
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the Fortran 77 linker in the rules of
+# 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(F77LINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(LINK)'    Makefile.in && Exit 1
+grep '.\$(CXXLINK)' Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
new file mode 100755
index 0000000..ede7b5a
--- /dev/null
+++ b/t/link_fccxx.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the C++ linker is used when appropriate.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.c lamp.cxx lamp2.f
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the C++ linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(CXXLINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(F77LINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'    Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
new file mode 100755
index 0000000..545f6a6
--- /dev/null
+++ b/t/link_fcxx.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the C++ linker is used when appropriate.
+# Matthew D. Langston <address@hidden>
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = lavalamp
+lavalamp_SOURCES = lava.cxx lamp.f
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# We should only see the C++ linker in the rules of 'Makefile.in'.
+
+# Look for this macro not at the beginning of any line; that will have
+# to be good enough for now.
+grep '.\$(CXXLINK)' Makefile.in
+
+# We should not see these patterns:
+grep '.\$(F77LINK)' Makefile.in && Exit 1
+grep '.\$(LINK)'    Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/link_override.sh b/t/link_override.sh
new file mode 100755
index 0000000..48d32a2
--- /dev/null
+++ b/t/link_override.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure _LINK variables are detected and used as documented.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz boo
+foo_LINK = $(LINK)
+bar_LINK = $(LINK)
+bar_LDFLAGS = $(AM_LDFLAGS)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# We should use foo_LINK not LINK.
+grep '.\$(foo_LINK)' Makefile.in
+grep '.\$(LINK).*foo' Makefile.in && Exit 1
+
+# We should not override the user definition of bar_LINK.
+# IOW, bar_LDFLAGS is useless unless bar_LINK refers to it.
+grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && Exit 1
+grep '.\$(bar_LINK).*bar' Makefile.in
+
+Exit 0
diff --git a/t/lisp2.sh b/t/lisp2.sh
new file mode 100755
index 0000000..25d174f
--- /dev/null
+++ b/t/lisp2.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
+
+. ./defs || Exit 1
+
+
+: TRY 1 -- We lack both EMACS and lispdir.
+
+cat > Makefile.am << 'END'
+lisp_LISP = foo.el
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AM_PATH_LISPDIR stderr
+grep '[Ll]isp source.*EMACS.* undefined' stderr
+grep '[Ll]isp source.*lispdir.* undefined' stderr
+grep ' add .*AM_PATH_LISPDIR' stderr
+
+
+: TRY 2 -- Setting lispdir should not be enough.
+
+cat > Makefile.am << 'END'
+lispdir = /usr/share/emacs/site-lisp
+lisp_LISP = foo.el
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'lispdir.*undefined' stderr && Exit 1
+grep '[Ll]isp source.*EMACS.* undefined' stderr
+grep 'define .*EMACS.* add .*AM_PATH_LISPDIR' stderr
+
+
+: TRY 3 -- Setting EMACS should not be enough.
+
+cat > Makefile.am << 'END'
+EMACS = emacs
+lisp_LISP = foo.el
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'EMACS.*undefined' stderr && Exit 1
+grep '[Ll]isp source.*lispdir.* undefined' stderr
+grep 'define .*lispdir.* add .*AM_PATH_LISPDIR' stderr
+
+
+: TRY 4 -- Setting both EMACS and lispdir is OK.
+
+cat > Makefile.am << 'END'
+lispdir = /usr/share/emacs/site-lisp
+EMACS = emacs
+lisp_LISP = foo.el
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+:
diff --git a/t/lisp3.sh b/t/lisp3.sh
new file mode 100755
index 0000000..a1531d3
--- /dev/null
+++ b/t/lisp3.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that compiling interdependent elisp files works.
+
+required=emacs
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+lisp_LISP = am-one.el am-two.el am-three.el
+EXTRA_DIST = am-one.el am-two.el
+am-three.el:
+       echo "(provide 'am-three)" > $@
+CLEANFILES = am-three.el
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+# am-three.el is a built source
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --prefix="`pwd`/_inst"
+
+$MAKE
+
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+# Make sure we can recover from a deletion.
+rm -f am-one.elc
+$MAKE
+test -f am-one.elc
+
+# Test installation/deinstallation.
+
+$MAKE install
+
+find _inst # For debugging.
+
+# Keep thin in sync with m4/lispdir.m4.
+for dir in lib/emacs lib/xemacs share/emacs share/xemacs :; do
+  if test $dir = :; then
+    Exit 1
+  elif test -d _inst/$dir/site-lisp; then
+    break
+  fi
+done
+
+test -f _inst/$dir/site-lisp/am-one.el
+test -f _inst/$dir/site-lisp/am-one.elc
+test -f _inst/$dir/site-lisp/am-two.el
+test -f _inst/$dir/site-lisp/am-two.elc
+test -f _inst/$dir/site-lisp/am-three.el
+test -f _inst/$dir/site-lisp/am-three.elc
+
+$MAKE uninstall
+find _inst | $EGREP '\.elc?$' && Exit 1
+
+# Make sure we build all files when any of them change.
+# (We grep a message to make sure the compilation happens.)
+unique=0a3346e2af8a689b85002b53df09142a
+$sleep
+echo "(message \"$unique\")(provide 'am-three)" > am-three.el
+$MAKE >output 2>&1 || { cat output; Exit 1; }
+cat output
+grep $unique output
+
+# It should also work for VPATH-builds.
+$MAKE distcheck
+
+:
diff --git a/t/lisp4.sh b/t/lisp4.sh
new file mode 100755
index 0000000..8d2de59
--- /dev/null
+++ b/t/lisp4.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure setting ELCFILES= disable byte-compilation as documented.
+# Report from Simon Josefsson.
+
+required=emacs
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+lisp_LISP = am-one.el am-two.el am-three.el
+EXTRA_DIST = am-one.el am-two.el
+ELCFILES=
+am-three.el:
+       echo "(provide 'am-three)" > $@
+CLEANFILES = am-three.el
+
+test:
+       test ! -f am-one.elc
+       test ! -f am-two.elc
+       test ! -f am-three.elc
+       test ! -f elc-stamp
+
+install-test: install
+       test -f "$(lispdir)/am-one.el"
+       test -f "$(lispdir)/am-two.el"
+       test -f "$(lispdir)/am-three.el"
+       test ! -f "$(lispdir)/am-one.elc"
+       test ! -f "$(lispdir)/am-two.elc"
+       test ! -f "$(lispdir)/am-three.elc"
+
+not-installed:
+       find "$(lispdir)" | grep '\.el$$' && exit 1; :
+       find "$(lispdir)" | grep '\.elc$$' && exit 1; :
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+# am-tree.el is a built source
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --prefix "`pwd`"
+$MAKE
+$MAKE test
+$MAKE install-test
+$MAKE uninstall
+$MAKE not-installed
+
+# Fake the absence of emacs.
+# *.el files should not be installed, but "make install" and
+# "make uninstall" should continue to work.
+./configure EMACS=no --prefix "`pwd`"
+$MAKE
+$MAKE test
+$MAKE install
+$MAKE not-installed
+$MAKE uninstall
+
+:
diff --git a/t/lisp5.sh b/t/lisp5.sh
new file mode 100755
index 0000000..997a56e
--- /dev/null
+++ b/t/lisp5.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Same as lisp4.test, but using the now-recommended way to install
+# non-bytecompiled *.el files.
+
+required=emacs
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+lisp_DATA = am-one.el am-two.el am-three.el
+EXTRA_DIST = am-one.el am-two.el
+am-three.el:
+       echo "(provide 'am-three)" > $@
+CLEANFILES = am-three.el
+
+test:
+       test ! -f am-one.elc
+       test ! -f am-two.elc
+       test ! -f am-three.elc
+       test ! -f elc-stamp
+
+install-test: install
+       test -f "$(lispdir)/am-one.el"
+       test -f "$(lispdir)/am-two.el"
+       test -f "$(lispdir)/am-three.el"
+       test ! -f "$(lispdir)/am-one.elc"
+       test ! -f "$(lispdir)/am-two.elc"
+       test ! -f "$(lispdir)/am-three.elc"
+
+not-installed:
+       find "$(lispdir)" | grep '\.el$$' && exit 1; :
+       find "$(lispdir)" | grep '\.elc$$' && exit 1; :
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+# am-tree.el is a built source
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --prefix "`pwd`"
+$MAKE
+$MAKE test
+$MAKE install-test
+$MAKE uninstall
+$MAKE not-installed
+
+# Fake the absence of emacs.
+# *.el files SHOULD be installed by "make install" (and uninstalled
+# by "make uninstall").
+./configure EMACS=no --prefix "`pwd`"
+$MAKE
+$MAKE test
+$MAKE install-test
+$MAKE uninstall
+$MAKE not-installed
+
+:
diff --git a/t/lisp6.sh b/t/lisp6.sh
new file mode 100755
index 0000000..9635ea2
--- /dev/null
+++ b/t/lisp6.sh
@@ -0,0 +1,105 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for conditional _LISP.
+
+required=emacs
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+dist_lisp_LISP = am-one.el
+if WANT_TWO
+  dist_lisp_LISP += am-two.el
+endif
+dist_noinst_LISP = am-three.el
+
+dist-test: distdir
+       test -f $(distdir)/am-one.el
+       test -f $(distdir)/am-two.el
+       test -f $(distdir)/am-three.el
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_CONDITIONAL([WANT_TWO], [test -n "$want_two"])
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(provide 'am-one)" > am-one.el
+echo "(require 'am-one)" > am-two.el
+echo "(require 'am-one)" > am-three.el
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure "--with-lispdir=`pwd`/lisp"
+
+$MAKE
+test -f am-one.elc
+test ! -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+$MAKE install
+test -f lisp/am-one.el
+test -f lisp/am-one.elc
+test ! -f lisp/am-two.el
+test ! -f lisp/am-two.elc
+test ! -f lisp/am-three.el
+test ! -f lisp/am-three.elc
+
+$MAKE dist-test
+
+$MAKE distclean
+test ! -f am-one.elc
+test ! -f am-two.elc
+test ! -f am-three.elc
+test ! -f elc-stamp
+
+./configure "--with-lispdir=`pwd`/lisp" want_two=1
+
+$MAKE
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+# Let's mutilate the source tree, to check the recover rule.
+rm -f am-*.elc
+$MAKE
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+$MAKE install
+test -f lisp/am-one.el
+test -f lisp/am-one.elc
+test -f lisp/am-two.el
+test -f lisp/am-two.elc
+test ! -f lisp/am-three.el
+test ! -f lisp/am-three.elc
+
+$MAKE dist-test
+
+$MAKE distclean
+test ! -f am-one.elc
+test ! -f am-two.elc
+test ! -f am-three.elc
+test ! -f elc-stamp
+
+:
diff --git a/t/lisp7.sh b/t/lisp7.sh
new file mode 100755
index 0000000..79799d1
--- /dev/null
+++ b/t/lisp7.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that lisp_LISP also works when emacs is not installed.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+dist_lisp_LISP = am-one.el am-two.el am-three.el
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+EMACS=no # Simulate no emacs.
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+echo "(provide 'am-three)" > am-three.el
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
+
+test ! -f am-one.elc
+test ! -f am-two.elc
+test ! -f am-three.elc
+test -f elc-stamp
+
+$MAKE distcheck
+
+:
diff --git a/t/lisp8.sh b/t/lisp8.sh
new file mode 100755
index 0000000..299ecd0
--- /dev/null
+++ b/t/lisp8.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the recover rule of lisp_LISP with parallel make.
+
+required='GNUmake emacs'
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+dist_lisp_LISP = am-one.el am-two.el am-three.el
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+echo "(provide 'am-three)" > am-three.el
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+
+: >stdout
+$MAKE -j >>stdout || { cat stdout; Exit 1; }
+
+cat stdout
+test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
+
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+rm -f am-*.elc
+
+: >stdout
+$MAKE -j >>stdout || { cat stdout; Exit 1; }
+
+cat stdout
+test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+:
diff --git a/t/lispdry.sh b/t/lispdry.sh
new file mode 100755
index 0000000..a89ffe1
--- /dev/null
+++ b/t/lispdry.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that 'make -n' works with the lisp_LISP recover rule.
+
+required='emacs non-root'
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+dist_lisp_LISP = am-one.el am-two.el am-three.el
+EOF
+
+cat >> configure.ac << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+echo "(provide 'am-three)" > am-three.el
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+
+$MAKE
+
+test -f am-one.elc
+test -f am-two.elc
+test -f am-three.elc
+test -f elc-stamp
+
+rm -f am-*.elc elc-stamp
+
+chmod a-w .
+
+$MAKE -n
+
+test ! -f am-one.elc
+test ! -f am-two.elc
+test ! -f am-three.elc
+test ! -f elc-stamp
+
+:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
new file mode 100644
index 0000000..fef7165
--- /dev/null
+++ b/t/list-of-tests.mk
@@ -0,0 +1,1279 @@
+## Makefile fragment that holds the list of test scripts of the automake
+## testsuite.  This fragment is meant to be included by the Makefile.am,
+## but also to be executed directly by make when bootstrapping automake.
+
+## Copyright (C) 2011-2012 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# FIXME: this "expected failures" are in truth an hack used to
+# FIXME: to verify that some incorrect usages of our perl libraries
+# FIXME: raise an error.  We should find a cleaner way to check that.
+perl_fake_XFAIL_TESTS = \
+t/pm/Cond2.pl \
+t/pm/Cond3.pl \
+t/pm/DisjCon2.pl \
+t/pm/DisjCon3.pl \
+t/pm/Version2.pl \
+t/pm/Version3.pl
+
+XFAIL_TESTS = \
+t/all.sh \
+t/yacc-bison-skeleton-cxx.sh \
+t/yacc-bison-skeleton.sh \
+t/cond17.sh \
+t/gcj6.sh \
+t/override-conditional-2.sh \
+t/dist-pr109765.sh \
+t/instdir-cond2.sh \
+t/java-nobase.sh \
+t/objext-pr10128.sh \
+t/parallel-tests-many.sh \
+t/pr8365-remake-timing.sh \
+t/lex-subobj-nodep.sh \
+t/remake-am-pr10111.sh \
+t/remake-m4-pr10111.sh \
+t/txinfo5.sh \
+$(perl_fake_XFAIL_TESTS)
+
+perl_TESTS = \
+t/pm/Cond2.pl \
+t/pm/Cond3.pl \
+t/pm/Condition.pl \
+t/pm/Condition-t.pl \
+t/pm/DisjCon2.pl \
+t/pm/DisjCon3.pl \
+t/pm/DisjConditions.pl \
+t/pm/DisjConditions-t.pl \
+t/pm/Version.pl \
+t/pm/Version2.pl \
+t/pm/Version3.pl \
+t/pm/Wrap.pl
+
+# The order here is mostly alphabetical, with the deliberate exception
+# that tests having a high runtime (especially TAP tests that run various
+# checks sequentially) are listed early; this improves performance on
+# concurrent testsuite runs.
+handwritten_TESTS = \
+t/get-sysconf.sh \
+$(perl_TESTS) \
+t/instspc.tap \
+t/aclocal.sh \
+t/aclocal3.sh \
+t/aclocal4.sh \
+t/aclocal5.sh \
+t/aclocal6.sh \
+t/aclocal7.sh \
+t/aclocal8.sh \
+t/aclocal9.sh \
+t/acloca10.sh \
+t/acloca11.sh \
+t/acloca12.sh \
+t/acloca13.sh \
+t/acloca14.sh \
+t/acloca15.sh \
+t/acloca16.sh \
+t/acloca17.sh \
+t/acloca18.sh \
+t/acloca19.sh \
+t/acloca20.sh \
+t/acloca21.sh \
+t/acloca22.sh \
+t/acloca23.sh \
+t/aclocal-acdir.sh \
+t/aclocal-install-absdir.sh \
+t/aclocal-print-acdir.sh \
+t/aclocal-path.sh \
+t/aclocal-path-install.sh \
+t/aclocal-path-install-serial.sh \
+t/aclocal-path-nonexistent.sh \
+t/aclocal-path-precedence.sh \
+t/aclocal-install-fail.sh \
+t/aclocal-install-mkdir.sh \
+t/aclocal-no-install-no-mkdir.sh \
+t/aclocal-verbose-install.sh \
+t/ac-output-old.tap \
+t/acsilent.sh \
+t/acsubst.sh \
+t/acsubst2.sh \
+t/add-missing.tap \
+t/all.sh \
+t/all2.sh \
+t/alloca.sh \
+t/alloca2.sh \
+t/alpha.sh \
+t/alpha2.sh \
+t/amhello-cflags.sh \
+t/amhello-cross-compile.sh \
+t/amhello-binpkg.sh \
+t/amassign.sh \
+t/ammissing.sh \
+t/amopt.sh \
+t/amopts-location.sh \
+t/amopts-variable-expansion.sh \
+t/amsubst.sh \
+t/ansi2knr-no-more.sh \
+t/ar-lib.sh \
+t/ar-lib2.sh \
+t/ar-lib3.sh \
+t/ar-lib4.sh \
+t/ar-lib5a.sh \
+t/ar-lib5b.sh \
+t/ar-lib6a.sh \
+t/ar-lib6b.sh \
+t/ar-lib7.sh \
+t/ar.sh \
+t/ar2.sh \
+t/ar3.sh \
+t/ar4.sh \
+t/ar5.sh \
+t/asm.sh \
+t/asm2.sh \
+t/asm3.sh \
+t/autodist.sh \
+t/autodist-subdir.sh \
+t/autodist-acconfig.sh \
+t/autodist-acconfig-no-subdir.sh \
+t/autodist-aclocal-m4.sh \
+t/autodist-config-headers.sh \
+t/autodist-configure-no-subdir.sh \
+t/autodist-no-duplicate.sh \
+t/autodist-stamp-vti.sh \
+t/autohdr.sh \
+t/autohdr2.sh \
+t/autohdr3.sh \
+t/autohdr4.sh \
+t/autohdrdry.sh \
+t/automake-cmdline.tap \
+t/auxdir.sh \
+t/auxdir6.sh \
+t/auxdir7.sh \
+t/auxdir8.sh \
+t/auxdir-autodetect.sh \
+t/auxdir-computed.tap \
+t/auxdir-misplaced.sh \
+t/auxdir-nonexistent.sh \
+t/auxdir-unportable.tap \
+t/backcompat.sh \
+t/backcompat2.sh \
+t/backcompat3.sh \
+t/backcompat4.sh \
+t/backcompat5.sh \
+t/backcompat6.sh \
+t/backsl.sh \
+t/backsl2.sh \
+t/backsl3.sh \
+t/backsl4.sh \
+t/badline.sh \
+t/badopt.sh \
+t/badprog.sh \
+t/block.sh \
+t/bsource.sh \
+t/candist.sh \
+t/canon.sh \
+t/canon2.sh \
+t/canon3.sh \
+t/canon4.sh \
+t/canon5.sh \
+t/canon6.sh \
+t/canon7.sh \
+t/canon8.sh \
+t/canon-name.sh \
+t/ccnoco.sh \
+t/ccnoco2.sh \
+t/ccnoco3.sh \
+t/check.sh \
+t/check2.sh \
+t/check3.sh \
+t/check4.sh \
+t/check5.sh \
+t/check6.sh \
+t/check7.sh \
+t/check8.sh \
+t/check10.sh \
+t/check11.sh \
+t/check12.sh \
+t/check-subst.sh \
+t/check-subst-prog.sh \
+t/check-exported-srcdir.sh \
+t/check-fd-redirect.sh \
+t/check-tests-in-builddir.sh \
+t/check-no-test-driver.sh \
+t/check-concurrency-bug9245.sh \
+t/checkall.sh \
+t/clean.sh \
+t/clean2.sh \
+t/colneq.sh \
+t/colneq2.sh \
+t/colneq3.sh \
+t/colon.sh \
+t/colon2.sh \
+t/colon3.sh \
+t/colon4.sh \
+t/colon5.sh \
+t/colon6.sh \
+t/colon7.sh \
+t/color.sh \
+t/color2.sh \
+t/comment.sh \
+t/comment2.sh \
+t/comment3.sh \
+t/comment4.sh \
+t/comment5.sh \
+t/comment6.sh \
+t/comment7.sh \
+t/comment8.sh \
+t/comment9.sh \
+t/commen10.sh \
+t/commen11.sh \
+t/comments-in-var-def.sh \
+t/compile.sh \
+t/compile2.sh \
+t/compile3.sh \
+t/compile4.sh \
+t/compile5.sh \
+t/compile6.sh \
+t/compile_f90_c_cxx.sh \
+t/compile_f_c_cxx.sh \
+t/cond-basic.sh \
+t/cond.sh \
+t/cond2.sh \
+t/cond3.sh \
+t/cond4.sh \
+t/cond5.sh \
+t/cond6.sh \
+t/cond7.sh \
+t/cond8.sh \
+t/cond9.sh \
+t/cond10.sh \
+t/cond11.sh \
+t/cond13.sh \
+t/cond14.sh \
+t/cond15.sh \
+t/cond16.sh \
+t/cond17.sh \
+t/cond18.sh \
+t/cond19.sh \
+t/cond20.sh \
+t/cond21.sh \
+t/cond22.sh \
+t/cond23.sh \
+t/cond24.sh \
+t/cond25.sh \
+t/cond26.sh \
+t/cond27.sh \
+t/cond28.sh \
+t/cond29.sh \
+t/cond30.sh \
+t/cond31.sh \
+t/cond32.sh \
+t/cond33.sh \
+t/cond34.sh \
+t/cond35.sh \
+t/cond36.sh \
+t/cond37.sh \
+t/cond38.sh \
+t/cond39.sh \
+t/cond40.sh \
+t/cond41.sh \
+t/cond42.sh \
+t/cond43.sh \
+t/cond44.sh \
+t/cond45.sh \
+t/cond46.sh \
+t/condd.sh \
+t/condhook.sh \
+t/condhook2.sh \
+t/condinc.sh \
+t/condinc2.sh \
+t/condlib.sh \
+t/condman2.sh \
+t/condman3.sh \
+t/configure.sh \
+t/confdeps.sh \
+t/conff.sh \
+t/conff2.sh \
+t/conffile-leading-dot.sh \
+t/confh.sh \
+t/confh4.sh \
+t/confh5.sh \
+t/confh6.sh \
+t/confh7.sh \
+t/confh8.sh \
+t/confincl.sh \
+t/conflnk.sh \
+t/conflnk2.sh \
+t/conflnk3.sh \
+t/conflnk4.sh \
+t/confsub.sh \
+t/confvar.sh \
+t/confvar2.sh \
+t/copy.sh \
+t/cscope.tap \
+t/cscope2.sh \
+t/cscope3.sh \
+t/cxx.sh \
+t/cxx2.sh \
+t/cxxcpp.sh \
+t/cxxlibobj.sh \
+t/cxxlink.sh \
+t/cxxnoc.sh \
+t/cxxo.sh \
+t/cygnus-check-without-all.sh \
+t/cygnus-dependency-tracking.sh \
+t/cygnus-imply-foreign.sh \
+t/cygnus-no-dist.sh \
+t/cygnus-no-installinfo.sh \
+t/cygnus-requires-maintainer-mode.sh \
+t/cygwin32.sh \
+t/dash.sh \
+t/defun.sh \
+t/defun2.sh \
+t/dejagnu.sh \
+t/dejagnu2.sh \
+t/dejagnu3.sh \
+t/dejagnu4.sh \
+t/dejagnu5.sh \
+t/dejagnu6.sh \
+t/dejagnu7.sh \
+t/dejagnu-absolute-builddir.sh \
+t/dejagnu-relative-srcdir.sh \
+t/dejagnu-siteexp-extend.sh \
+t/dejagnu-siteexp-append.sh \
+t/dejagnu-siteexp-useredit.sh \
+t/deleted-am.sh \
+t/deleted-m4.sh \
+t/depacl2.sh \
+t/depcomp.sh \
+t/depcomp2.sh \
+t/depcomp8a.sh \
+t/depcomp8b.sh \
+t/depdist.sh \
+t/depend.sh \
+t/depend3.sh \
+t/depend4.sh \
+t/depend5.sh \
+t/depend6.sh \
+t/deprecated-acinit.sh \
+t/destdir.sh \
+t/dirlist.sh \
+t/dirlist2.sh \
+t/dirlist-abspath.sh \
+t/discover.sh \
+t/dist-formats.tap \
+t/dist-auxdir-many-subdirs.sh \
+t/dist-auxfile-2.sh \
+t/dist-auxfile.sh \
+t/dist-included-parent-dir.sh \
+t/dist-missing-am.sh \
+t/dist-missing-included-m4.sh \
+t/dist-missing-m4.sh \
+t/dist-readonly.sh \
+t/dist-repeated.sh \
+t/dist-pr109765.sh \
+t/distcleancheck.sh \
+t/distcom2.sh \
+t/distcom3.sh \
+t/distcom4.sh \
+t/distcom5.sh \
+t/distcom-subdir.sh \
+t/distdir.sh \
+t/disthook.sh \
+t/distlinks.sh \
+t/distlinksbrk.sh \
+t/distname.sh \
+t/distcheck-configure-flags.sh \
+t/distcheck-configure-flags-am.sh \
+t/distcheck-configure-flags-subpkg.sh \
+t/distcheck-hook.sh \
+t/distcheck-hook2.sh \
+t/distcheck-writable-srcdir.sh \
+t/distcheck-missing-m4.sh \
+t/distcheck-outdated-m4.sh \
+t/distcheck-override-infodir.sh \
+t/distcheck-pr9579.sh \
+t/distcheck-pr10470.sh \
+t/dmalloc.sh \
+t/doc-parsing-buglets-colneq-subst.sh \
+t/doc-parsing-buglets-tabs.sh \
+t/dollar.sh \
+t/dollarvar.sh \
+t/dollarvar2.sh \
+t/double.sh \
+t/dup2.sh \
+t/else.sh \
+t/empty.sh \
+t/empty2.sh \
+t/empty3.sh \
+t/empty4.sh \
+t/exdir.sh \
+t/exdir2.sh \
+t/exdir3.sh \
+t/exeext.sh \
+t/exeext2.sh \
+t/exeext3.sh \
+t/exeext4.sh \
+t/exsource.sh \
+t/ext.sh \
+t/ext2.sh \
+t/ext3.sh \
+t/extra.sh \
+t/extra2.sh \
+t/extra3.sh \
+t/extra4.sh \
+t/extra5.sh \
+t/extra6.sh \
+t/extra7.sh \
+t/extra8.sh \
+t/extra9.sh \
+t/extra10.sh \
+t/extra11.sh \
+t/extra12.sh \
+t/extra-programs-empty.sh \
+t/extra-portability.sh \
+t/extra-portability2.sh \
+t/extra-portability3.sh \
+t/extradep.sh \
+t/extradep2.sh \
+t/f90only.sh \
+t/flavor.sh \
+t/flibs.sh \
+t/fn99.sh \
+t/fn99subdir.sh \
+t/fnoc.sh \
+t/fo.sh \
+t/forcemiss.sh \
+t/forcemiss2.sh \
+t/fort1.sh \
+t/fort2.sh \
+t/fort4.sh \
+t/fort5.sh \
+t/fonly.sh \
+t/fortdep.sh \
+t/gcj.sh \
+t/gcj2.sh \
+t/gcj3.sh \
+t/gcj4.sh \
+t/gcj5.sh \
+t/gcj6.sh \
+t/gettext.sh \
+t/gettext2.sh \
+t/gettext3.sh \
+t/gnumake.sh \
+t/gnuwarn.sh \
+t/gnuwarn2.sh \
+t/gnits.sh \
+t/gnits2.sh \
+t/gnits3.sh \
+t/hdr-vars-defined-once.sh \
+t/header.sh \
+t/help.sh \
+t/help2.sh \
+t/help3.sh \
+t/help4.sh \
+t/help-depend.sh \
+t/help-depend2.sh \
+t/help-dmalloc.sh \
+t/help-init.sh \
+t/help-lispdir.sh \
+t/help-multilib.sh \
+t/help-python.sh \
+t/help-silent.sh \
+t/help-upc.sh \
+t/hfs.sh \
+t/implicit.sh \
+t/info.sh \
+t/init.sh \
+t/init2.sh \
+t/insh2.sh \
+t/install2.sh \
+t/installdir.sh \
+t/instsh.sh \
+t/instsh2.sh \
+t/instsh3.sh \
+t/instdat.sh \
+t/instdat2.sh \
+t/instdir.sh \
+t/instdir2.sh \
+t/instdir-cond.sh \
+t/instdir-cond2.sh \
+t/instdir-no-empty.sh \
+t/instdir-java.sh \
+t/instdir-lisp.sh \
+t/instdir-ltlib.sh \
+t/instdir-prog.sh \
+t/instdir-python.sh \
+t/instdir-texi.sh \
+t/instexec.sh \
+t/instfail.sh \
+t/instfail-info.sh \
+t/instfail-java.sh \
+t/instfail-libtool.sh \
+t/insthook.sh \
+t/instman.sh \
+t/instman2.sh \
+t/instmany.sh \
+t/instmany-mans.sh \
+t/instmany-python.sh \
+t/install-info-dir.sh \
+t/interp.sh \
+t/interp2.sh \
+t/java.sh \
+t/java2.sh \
+t/java3.sh \
+t/javadir-undefined.sh \
+t/javaflags.sh \
+t/java-check.sh \
+t/java-clean.sh \
+t/java-compile-install.sh \
+t/java-compile-run-flat.sh \
+t/java-compile-run-nested.sh \
+t/java-empty-classpath.sh \
+t/javaprim.sh \
+t/javasubst.sh \
+t/java-extra.sh \
+t/java-mix.sh \
+t/java-no-duplicate.sh \
+t/java-nobase.sh \
+t/java-noinst.sh \
+t/java-rebuild.sh \
+t/java-sources.sh \
+t/java-uninstall.sh \
+t/ldadd.sh \
+t/ldflags.sh \
+t/lex.sh \
+t/lex2.sh \
+t/lex3.sh \
+t/lex5.sh \
+t/lexcpp.sh \
+t/lexvpath.sh \
+t/lex-subobj-nodep.sh \
+t/lex-lib.sh \
+t/lex-lib-external.sh \
+t/lex-libobj.sh \
+t/lex-noyywrap.sh \
+t/lex-clean-cxx.sh \
+t/lex-clean.sh \
+t/lex-depend-cxx.sh \
+t/lex-depend-grep.sh \
+t/lex-depend.sh \
+t/lex-line.sh \
+t/lex-nodist.sh \
+t/lex-pr204.sh \
+t/lflags.sh \
+t/lflags2.sh \
+t/libexec.sh \
+t/libobj-basic.sh \
+t/libobj2.sh \
+t/libobj3.sh \
+t/libobj4.sh \
+t/libobj5.sh \
+t/libobj7.sh \
+t/libobj10.sh \
+t/libobj12.sh \
+t/libobj13.sh \
+t/libobj14.sh \
+t/libobj15a.sh \
+t/libobj15b.sh \
+t/libobj15c.sh \
+t/libobj16a.sh \
+t/libobj16b.sh \
+t/libobj17.sh \
+t/libobj18.sh \
+t/libobj19.sh \
+t/libobj20a.sh \
+t/libobj20b.sh \
+t/libobj20c.sh \
+t/library.sh \
+t/library2.sh \
+t/library3.sh \
+t/libtool.sh \
+t/libtool2.sh \
+t/libtool3.sh \
+t/libtool4.sh \
+t/libtool5.sh \
+t/libtool6.sh \
+t/libtool7.sh \
+t/libtool8.sh \
+t/libtool9.sh \
+t/libtoo10.sh \
+t/libtoo11.sh \
+t/license.sh \
+t/license2.sh \
+t/link_c_cxx.sh \
+t/link_cond.sh \
+t/link_dist.sh \
+t/link_f90_only.sh \
+t/link_fc.sh \
+t/link_fccxx.sh \
+t/link_fcxx.sh \
+t/link_f_only.sh \
+t/link_override.sh \
+t/lisp2.sh \
+t/lisp3.sh \
+t/lisp4.sh \
+t/lisp5.sh \
+t/lisp6.sh \
+t/lisp7.sh \
+t/lisp8.sh \
+t/lispdry.sh \
+t/listval.sh \
+t/location.sh \
+t/longline.sh \
+t/longlin2.sh \
+t/ltcond.sh \
+t/ltcond2.sh \
+t/ltconv.sh \
+t/ltdeps.sh \
+t/ltinit.sh \
+t/ltinstloc.sh \
+t/ltlibobjs.sh \
+t/ltlibsrc.sh \
+t/ltorder.sh \
+t/lzma.sh \
+t/m4-inclusion.sh \
+t/maintclean.sh \
+t/maintclean-vpath.sh \
+t/maintmode-configure-msg.sh \
+t/make.sh \
+t/makefile-deps.sh \
+t/makej.sh \
+t/makej2.sh \
+t/maken.sh \
+t/maken3.sh \
+t/make-dryrun.tap \
+t/makevars.sh \
+t/man.sh \
+t/man2.sh \
+t/man3.sh \
+t/man4.sh \
+t/man5.sh \
+t/man6.sh \
+t/man7.sh \
+t/man8.sh \
+t/mdate.sh \
+t/mdate2.sh \
+t/mdate3.sh \
+t/mdate4.sh \
+t/mdate5.sh \
+t/mdate6.sh \
+t/missing.sh \
+t/missing2.sh \
+t/missing3.sh \
+t/missing4.sh \
+t/missing5.sh \
+t/missing6.sh \
+t/missing-auxfile-stops-makefiles-creation.sh \
+t/mkinstall.sh \
+t/mkinst2.sh \
+t/mkinst3.sh \
+t/mmode.sh \
+t/mmodely.sh \
+t/multlib.sh \
+t/no-extra-makefile-code.sh \
+t/no-outdir-option.sh \
+t/nobase.sh \
+t/nobase-libtool.sh \
+t/nobase-python.sh \
+t/nobase-nodist.sh \
+t/nodef.sh \
+t/nodef2.sh \
+t/nodep.sh \
+t/nodep2.sh \
+t/nodepcomp.sh \
+t/nodist.sh \
+t/nodist2.sh \
+t/nodist3.sh \
+t/noinst.sh \
+t/noinstdir.sh \
+t/nolink.sh \
+t/nostdinc.sh \
+t/notrans.sh \
+t/number.sh \
+t/objc.sh \
+t/objc2.sh \
+t/objext-pr10128.sh \
+t/obsolete.sh \
+t/oldvars.sh \
+t/order.sh \
+t/output.sh \
+t/output2.sh \
+t/output3.sh \
+t/output4.sh \
+t/output5.sh \
+t/output6.sh \
+t/output7.sh \
+t/output8.sh \
+t/output9.sh \
+t/output10.sh \
+t/output11.sh \
+t/output12.sh \
+t/output13.sh \
+t/output-order.sh \
+t/override-conditional-1.sh \
+t/override-conditional-2.sh \
+t/override-html.sh \
+t/override-suggest-local.sh \
+t/parallel-am.sh \
+t/parallel-am2.sh \
+t/parallel-am3.sh \
+t/serial-tests.sh \
+t/parallel-tests.sh \
+t/parallel-tests2.sh \
+t/parallel-tests3.sh \
+t/parallel-tests5.sh \
+t/parallel-tests6.sh \
+t/parallel-tests8.sh \
+t/parallel-tests9.sh \
+t/parallel-tests10.sh \
+t/parallel-tests-recheck-depends-on-all.sh \
+t/parallel-tests-exeext.sh \
+t/parallel-tests-suffix.sh \
+t/parallel-tests-suffix-prog.sh \
+t/parallel-tests-log-compiler-1.sh \
+t/parallel-tests-log-compiler-2.sh \
+t/parallel-tests-dry-run-1.sh \
+t/parallel-tests-dry-run-2.sh \
+t/parallel-tests-fd-redirect.sh \
+t/parallel-tests-fd-redirect-exeext.sh \
+t/parallel-tests-extra-programs.sh \
+t/parallel-tests-unreadable.sh \
+t/parallel-tests-subdir.sh \
+t/parallel-tests-interrupt.tap \
+t/parallel-tests-reset-term.sh \
+t/parallel-tests-harderror.sh \
+t/parallel-tests-log-override-1.sh \
+t/parallel-tests-log-override-2.sh \
+t/parallel-tests-log-override-recheck.sh \
+t/parallel-tests-log-compiler-example.sh \
+t/parallel-tests-cmdline-override.sh \
+t/parallel-tests-fork-bomb.sh \
+t/parallel-tests-empty-testlogs.sh \
+t/parallel-tests-driver-install.sh \
+t/parallel-tests-no-color-in-log.sh \
+t/parallel-tests-no-spurious-summary.sh \
+t/parallel-tests-exit-statuses.sh \
+t/parallel-tests-console-output.sh \
+t/parallel-tests-once.sh \
+t/parallel-tests-trailing-bslash.sh \
+t/parallel-tests-many.sh \
+t/tests-environment.sh \
+t/am-tests-environment.sh \
+t/tests-environment-backcompat.sh \
+t/testsuite-summary-color.sh \
+t/testsuite-summary-count.sh \
+t/testsuite-summary-count-many.sh \
+t/testsuite-summary-reference-log.sh \
+t/test-driver-acsubst.sh \
+t/test-driver-cond.sh \
+t/test-driver-custom-no-extra-driver.sh \
+t/test-driver-custom.sh \
+t/test-driver-custom-xfail-tests.sh \
+t/test-driver-custom-multitest.sh \
+t/test-driver-custom-multitest-recheck.sh \
+t/test-driver-custom-multitest-recheck2.sh \
+t/test-driver-create-log-dir.sh \
+t/test-driver-strip-vpath.sh \
+t/test-driver-trs-suffix-registered.sh \
+t/test-driver-fail.sh \
+t/test-driver-is-distributed.sh \
+t/test-harness-vpath-rewrite.sh \
+t/test-log.sh \
+t/test-logs-repeated.sh \
+t/test-metadata-global-log.sh \
+t/test-metadata-global-result.sh \
+t/test-metadata-recheck.sh \
+t/test-metadata-results.sh \
+t/test-missing.sh \
+t/test-missing2.sh \
+t/test-trs-basic.sh \
+t/test-trs-recover.sh \
+t/test-trs-recover2.sh \
+t/test-extensions.sh \
+t/test-extensions-cond.sh \
+t/parse.sh \
+t/percent.sh \
+t/percent2.sh \
+t/phony.sh \
+t/pluseq.sh \
+t/pluseq2.sh \
+t/pluseq3.sh \
+t/pluseq4.sh \
+t/pluseq5.sh \
+t/pluseq6.sh \
+t/pluseq7.sh \
+t/pluseq8.sh \
+t/pluseq9.sh \
+t/pluseq10.sh \
+t/pluseq11.sh \
+t/posixsubst-data.sh \
+t/posixsubst-extradist.sh \
+t/posixsubst-ldadd.sh \
+t/posixsubst-libraries.sh \
+t/posixsubst-ltlibraries.sh \
+t/posixsubst-programs.sh \
+t/posixsubst-scripts.sh \
+t/posixsubst-sources.sh \
+t/posixsubst-tests.sh \
+t/postproc.sh \
+t/ppf77.sh \
+t/pr2.sh \
+t/pr9.sh \
+t/pr72.sh \
+t/pr87.sh \
+t/pr211.sh \
+t/pr220.sh \
+t/pr224.sh \
+t/pr229.sh \
+t/pr243.sh \
+t/pr266.sh \
+t/pr279.sh \
+t/pr279-2.sh \
+t/pr287.sh \
+t/pr300-lib.sh \
+t/pr300-ltlib.sh \
+t/pr300-prog.sh \
+t/pr307.sh \
+t/pr401.sh \
+t/pr401b.sh \
+t/pr401c.sh \
+t/prefix.sh \
+t/primary.sh \
+t/primary2.sh \
+t/primary3.sh \
+t/primary-prefix-invalid-couples.tap \
+t/primary-prefix-valid-couples.sh \
+t/primary-prefix-couples-force-valid.sh \
+t/primary-prefix-couples-documented-valid.sh \
+t/print-libdir.sh \
+t/proginst.sh \
+t/programs-primary-rewritten.sh \
+t/py-compile-basic.sh \
+t/py-compile-basic2.sh \
+t/py-compile-basedir.sh \
+t/py-compile-destdir.sh \
+t/py-compile-env.sh \
+t/py-compile-option-terminate.sh \
+t/py-compile-usage.sh \
+t/python.sh \
+t/python2.sh \
+t/python3.sh \
+t/python4.sh \
+t/python5.sh \
+t/python5b.sh \
+t/python6.sh \
+t/python7.sh \
+t/python8.sh \
+t/python9.sh \
+t/python10.sh \
+t/python11.sh \
+t/python12.sh \
+t/python-dist.sh \
+t/python-vars.sh \
+t/python-virtualenv.sh \
+t/python-pr10995.sh \
+t/recurs.sh \
+t/recurs2.sh \
+t/relativize.tap \
+t/remake.sh \
+t/remake1a.sh \
+t/remake2.sh \
+t/remake3.sh \
+t/remake3a.sh \
+t/remake4.sh \
+t/remake5.sh \
+t/remake6.sh \
+t/remake7.sh \
+t/remake8a.sh \
+t/remake8b.sh \
+t/remake9a.sh \
+t/remake9b.sh \
+t/remake9c.sh \
+t/remake9d.sh \
+t/remake10a.sh \
+t/remake10b.sh \
+t/remake10c.sh \
+t/remake11.sh \
+t/remake12.sh \
+t/remake-all-1.sh \
+t/remake-all-2.sh \
+t/remake-subdir-from-subdir.sh \
+t/remake-subdir-gnu.sh \
+t/remake-subdir.sh \
+t/remake-subdir2.sh \
+t/remake-subdir-long-time.sh \
+t/remake-gnulib-add-acsubst.sh \
+t/remake-gnulib-add-header.sh \
+t/remake-gnulib-remove-header.sh \
+t/remake-moved-m4-file.sh \
+t/remake-deleted-m4-file.sh \
+t/remake-renamed-m4-file.sh \
+t/remake-renamed-m4-macro-and-file.sh \
+t/remake-renamed-m4-macro.sh \
+t/remake-am-pr10111.sh \
+t/remake-m4-pr10111.sh \
+t/remake-deleted-am-2.sh \
+t/remake-deleted-am-subdir.sh \
+t/remake-deleted-am.sh \
+t/remake-renamed-am.sh \
+t/pr8365-remake-timing.sh \
+t/req.sh \
+t/reqd.sh \
+t/reqd2.sh \
+t/repeated-options.sh \
+t/rst-formatting.sh \
+t/rulepat.sh \
+t/self-check-cleanup.tap \
+t/self-check-configure-help.sh \
+t/self-check-dir.tap \
+t/self-check-env-sanitize.tap \
+t/self-check-exit.tap \
+t/self-check-explicit-skips.sh \
+t/self-check-is_newest.tap \
+t/self-check-me.tap \
+t/self-check-reexec.tap \
+t/self-check-report.sh \
+t/self-check-sanity.sh \
+t/self-check-seq.tap \
+t/self-check-is-blocked-signal.tap \
+t/self-check-tap.sh \
+t/self-check-unindent.tap \
+t/sanity.sh \
+t/scripts.sh \
+t/seenc.sh \
+t/silent.sh \
+t/silent2.sh \
+t/silent3.sh \
+t/silent4.sh \
+t/silent6.sh \
+t/silent7.sh \
+t/silent8.sh \
+t/silent9.sh \
+t/silentcxx.sh \
+t/silentcxx-gcc.sh \
+t/silentf77.sh \
+t/silentf90.sh \
+t/silent-amopts.sh \
+t/silent-many-gcc.sh \
+t/silent-many-generic.sh \
+t/silent-nowarn.sh \
+t/silent-configsite.sh \
+t/silent-nested-vars.sh \
+t/silent-lex.sh \
+t/silent-yacc.sh \
+t/silent-yacc-headers.sh \
+t/srcsub.sh \
+t/srcsub2.sh \
+t/space.sh \
+t/specflg.sh \
+t/specflg2.sh \
+t/specflg3.sh \
+t/specflg6.sh \
+t/specflg7.sh \
+t/specflg8.sh \
+t/specflg9.sh \
+t/specflg10.sh \
+t/specflg-dummy.sh \
+t/spell.sh \
+t/spell2.sh \
+t/spell3.sh \
+t/spelling.sh \
+t/spy.sh \
+t/spy-rm.tap \
+t/stdinc.sh \
+t/stamph2.sh \
+t/stdlib.sh \
+t/stdlib2.sh \
+t/strictness-override.sh \
+t/strictness-precedence.sh \
+t/strip.sh \
+t/strip2.sh \
+t/strip3.sh \
+t/subdir.sh \
+t/subdir2.sh \
+t/subdir3.sh \
+t/subdir4.sh \
+t/subdir5.sh \
+t/subdir6.sh \
+t/subdir7.sh \
+t/subdir8.sh \
+t/subdir9.sh \
+t/subdir10.sh \
+t/subdirbuiltsources.sh \
+t/subcond.sh \
+t/subcond2.sh \
+t/subcond3.sh \
+t/subobj.sh \
+t/subobj2.sh \
+t/subobj4.sh \
+t/subobj5.sh \
+t/subobj6.sh \
+t/subobj7.sh \
+t/subobj8.sh \
+t/subobj9.sh \
+t/subobj10.sh \
+t/subobj11a.sh \
+t/subobj11b.sh \
+t/subobj11c.sh \
+t/subobjname.sh \
+t/subpkg.sh \
+t/subpkg2.sh \
+t/subpkg3.sh \
+t/subpkg4.sh \
+t/subpkg-yacc.sh \
+t/subst.sh \
+t/subst3.sh \
+t/subst4.sh \
+t/subst5.sh \
+t/subst-no-trailing-empty-line.sh \
+t/substref.sh \
+t/substre2.sh \
+t/substtarg.sh \
+t/suffix.sh \
+t/suffix2.sh \
+t/suffix3.tap \
+t/suffix4.sh \
+t/suffix5.sh \
+t/suffix6.sh \
+t/suffix6b.sh \
+t/suffix6c.sh \
+t/suffix7.sh \
+t/suffix8.tap \
+t/suffix9.sh \
+t/suffix10.tap \
+t/suffix11.tap \
+t/suffix12.sh \
+t/suffix13.sh \
+t/suffix-chain.tap \
+t/symlink.sh \
+t/symlink2.sh \
+t/syntax.sh \
+t/tap-ambiguous-directive.sh \
+t/tap-autonumber.sh \
+t/tap-bailout.sh \
+t/tap-bailout-leading-space.sh \
+t/tap-bailout-and-logging.sh \
+t/tap-bailout-suppress-badexit.sh \
+t/tap-bailout-suppress-later-diagnostic.sh \
+t/tap-bailout-suppress-later-errors.sh \
+t/tap-color.sh \
+t/tap-deps.sh \
+t/tap-diagnostic.sh \
+t/tap-empty-diagnostic.sh \
+t/tap-empty.sh \
+t/tap-escape-directive.sh \
+t/tap-escape-directive-2.sh \
+t/tap-exit.sh \
+t/tap-signal.tap \
+t/tap-fancy.sh \
+t/tap-fancy2.sh \
+t/tap-global-log.sh \
+t/tap-global-result.sh \
+t/tap-log.sh \
+t/tap-msg0-result.sh \
+t/tap-msg0-directive.sh \
+t/tap-msg0-planskip.sh \
+t/tap-msg0-bailout.sh \
+t/tap-msg0-misc.sh \
+t/tap-merge-stdout-stderr.sh \
+t/tap-no-merge-stdout-stderr.sh \
+t/tap-no-disable-hard-error.sh \
+t/tap-no-spurious-summary.sh \
+t/tap-no-spurious-numbers.sh \
+t/tap-no-spurious.sh \
+t/tap-not-ok-skip.sh \
+t/tap-number-wordboundary.sh \
+t/tap-numeric-description.sh \
+t/tap-negative-numbers.sh \
+t/tap-numbers-leading-zero.sh \
+t/tap-out-of-order.sh \
+t/tap-passthrough.sh \
+t/tap-passthrough-exit.sh \
+t/tap-plan.sh \
+t/tap-plan-corner.sh \
+t/tap-plan-errors.sh \
+t/tap-plan-middle.sh \
+t/tap-plan-whitespace.sh \
+t/tap-plan-leading-zero.sh \
+t/tap-plan-malformed.sh \
+t/tap-missing-plan-and-bad-exit.sh \
+t/tap-planskip.sh \
+t/tap-planskip-late.sh \
+t/tap-planskip-and-logging.sh \
+t/tap-planskip-unplanned.sh \
+t/tap-planskip-unplanned-corner.sh \
+t/tap-planskip-case-insensitive.sh \
+t/tap-planskip-whitespace.sh \
+t/tap-planskip-badexit.sh \
+t/tap-planskip-bailout.sh \
+t/tap-planskip-later-errors.sh \
+t/tap-realtime.sh \
+t/tap-test-number-0.sh \
+t/tap-recheck-logs.sh \
+t/tap-result-comment.sh \
+t/tap-todo-skip-together.sh \
+t/tap-todo-skip-whitespace.sh \
+t/tap-todo-skip.sh \
+t/tap-unplanned.sh \
+t/tap-whitespace-normalization.sh \
+t/tap-with-and-without-number.sh \
+t/tap-xfail-tests.sh \
+t/tap-common-setup.sh \
+t/tap-bad-prog.tap \
+t/tap-basic.sh \
+t/tap-diagnostic-custom.sh \
+t/tap-driver-stderr.sh \
+t/tap-doc.sh \
+t/tap-doc2.sh \
+t/tap-more.sh \
+t/tap-more2.sh \
+t/tap-recheck.sh \
+t/tap-summary.sh \
+t/tap-summary-color.sh \
+t/tags.sh \
+t/tags2.sh \
+t/tagsub.sh \
+t/tar.sh \
+t/tar2.sh \
+t/tar3.sh \
+t/tar-override.sh \
+t/target-cflags.sh \
+t/targetclash.sh \
+t/tests-environment-fd-redirect.sh \
+t/tests-environment-and-log-compiler.sh \
+t/txinfo.sh \
+t/txinfo2.sh \
+t/txinfo3.sh \
+t/txinfo4.sh \
+t/txinfo5.sh \
+t/txinfo5b.sh \
+t/txinfo6.sh \
+t/txinfo7.sh \
+t/txinfo8.sh \
+t/txinfo9.sh \
+t/txinfo10.sh \
+t/txinfo13.sh \
+t/txinfo16.sh \
+t/txinfo17.sh \
+t/txinfo19.sh \
+t/txinfo20.sh \
+t/txinfo21.sh \
+t/txinfo22.sh \
+t/txinfo23.sh \
+t/txinfo24.sh \
+t/txinfo25.sh \
+t/txinfo26.sh \
+t/txinfo27.sh \
+t/txinfo28.sh \
+t/txinfo29.sh \
+t/txinfo30.sh \
+t/txinfo31.sh \
+t/txinfo32.sh \
+t/txinfo33.sh \
+t/txinfo-no-clutter.sh \
+t/txinfo-unrecognized-extension.sh \
+t/transform.sh \
+t/transform2.sh \
+t/transform3.sh \
+t/uninstall-fail.sh \
+t/uninstall-pr9578.sh \
+t/unused.sh \
+t/upc.sh \
+t/upc2.sh \
+t/upc3.sh \
+t/vala.sh \
+t/vala2.sh \
+t/vala3.sh \
+t/vala4.sh \
+t/vala5.sh \
+t/vala-vapi.sh \
+t/vala-headers.sh \
+t/vala-libs.sh \
+t/vala-vpath.sh \
+t/vala-mix.sh \
+t/vala-mix2.sh \
+t/vala-parallel.sh \
+t/vars.sh \
+t/vars3.sh \
+t/vartar.sh \
+t/vartypos.sh \
+t/vartypo2.sh \
+t/version.sh \
+t/version2.sh \
+t/version3.sh \
+t/version4.sh \
+t/version6.sh \
+t/version7.sh \
+t/version8.sh \
+t/vpath.sh \
+t/vtexi.sh \
+t/vtexi2.sh \
+t/vtexi3.sh \
+t/vtexi4.sh \
+t/warnings-override.sh \
+t/warnings-precedence.sh \
+t/warnings-strictness-interactions.sh \
+t/warnings-unknown.sh \
+t/warnopts.sh \
+t/warnings-win-over-strictness.sh \
+t/warning-groups-win-over-strictness.sh \
+t/werror.sh \
+t/werror2.sh \
+t/werror3.sh \
+t/werror4.sh \
+t/whoami.sh \
+t/xsource.sh \
+t/yacc.sh \
+t/yacc2.sh \
+t/yacc4.sh \
+t/yacc5.sh \
+t/yacc7.sh \
+t/yacc8.sh \
+t/yaccdry.sh \
+t/yaccpp.sh \
+t/yaccvpath.sh \
+t/yacc-auxdir.sh \
+t/yacc-basic.sh \
+t/yacc-cxx.sh \
+t/yacc-bison-skeleton-cxx.sh \
+t/yacc-bison-skeleton.sh \
+t/yacc-clean.sh \
+t/yacc-clean-cxx.sh \
+t/yacc-d-basic.sh \
+t/yacc-d-cxx.sh \
+t/yacc-d-vpath.sh \
+t/yacc-deleted-headers.sh \
+t/yacc-depend.sh \
+t/yacc-depend2.sh \
+t/yacc-dist-nobuild-subdir.sh \
+t/yacc-dist-nobuild.sh \
+t/yacc-line.sh \
+t/yacc-mix-c-cxx.sh \
+t/yacc-nodist.sh \
+t/yacc-pr204.sh \
+t/yacc-weirdnames.sh \
+t/yflags.sh \
+t/yflags2.sh \
+t/yflags-cmdline-override.sh \
+t/yflags-conditional.sh \
+t/yflags-d-false-positives.sh \
+t/yflags-force-conditional.sh \
+t/yflags-force-override.sh \
+t/yflags-var-expand.sh \
+t/libtool-macros.sh \
+t/gettext-macros.sh
+
+print-list-of-tests:
+       @echo $(handwritten_TESTS)
+.PHONY: print-list-of-tests
diff --git a/t/listval.sh b/t/listval.sh
new file mode 100755
index 0000000..5e2f9a6
--- /dev/null
+++ b/t/listval.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure variable is expanded properly.
+# From Adam J. Richter.
+
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([LTLIBOBJS])
+AM_PROG_AR
+AC_PROG_LIBTOOL
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libpanel_applet.la
+libpanel_applet_la_SOURCES = \
+       applet-widget.c
+libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
+libpanel_applet_la_LIBADD = -lm
+END
+
+: > ltconfig
+: > ltmain.sh
+: > ar-lib
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/location.sh b/t/location.sh
new file mode 100755
index 0000000..e496ca6
--- /dev/null
+++ b/t/location.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for locations in error messages.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = libfoo.a
+if COND2
+  lib_LIBRARIES = libfoo.a
+endif
+if COND1
+  bin_PROGRAMS += ctags
+endif
+VAR = 1 \
+      2 \
+      3
+
+VAR = 1 \
+      2 \
+      3
+END
+
+: > ar-lib
+
+# Smash the useless difference of lib file locations.
+smash_useless_diffs ()
+{
+  # FIXME: we could get rid of the second 's|||' once we improve our
+  # wrapper scripts ...
+  sed -e "s|^$am_amdir/\\([a-z]*\.am\\)|\\1|" \
+      -e "s|^automake-$APIVERSION:|automake:|" ${1+"$@"};
+}
+
+$ACLOCAL
+AUTOMAKE_fails -Wno-error
+
+smash_useless_diffs stderr >observed
+
+cat >expected <<\EOF
+Makefile.am:12: warning: VAR multiply defined in condition TRUE ...
+Makefile.am:8: ... 'VAR' previously defined here
+automake: error: libfoo_a_OBJECTS should not be defined
+Makefile.am:3:   while processing library 'libfoo.a'
+automake: error: use 'libfoo_a_LDADD', not 'libfoo_a_LIBADD'
+Makefile.am:3:   while processing library 'libfoo.a'
+library.am: warning: deprecated feature: target 'libfoo.a' overrides 
'libfoo.a$(EXEEXT)'
+library.am: change your target to read 'libfoo.a$(EXEEXT)'
+Makefile.am:3:   while processing library 'libfoo.a'
+program.am: target 'libfoo.a$(EXEEXT)' was defined here
+Makefile.am:1:   while processing program 'libfoo.a'
+program.am: warning: redefinition of 'libfoo.a$(EXEEXT)' ...
+Makefile.am:1:   while processing program 'libfoo.a'
+library.am: ... 'libfoo.a' previously defined here
+Makefile.am:3:   while processing library 'libfoo.a'
+tags.am: warning: redefinition of 'ctags' ...
+program.am: ... 'ctags$(EXEEXT)' previously defined here
+Makefile.am:6:   while processing program 'ctags'
+EOF
+
+cat expected
+cat observed
+diff expected observed || Exit 1
+
+AUTOMAKE_fails -Werror
+smash_useless_diffs stderr >observed
+(echo 'automake: warnings are treated as errors' && cat expected) > t
+mv -f t expected
+
+cat expected
+cat observed
+
+diff expected observed || Exit 1
+
+:
diff --git a/t/longlin2.sh b/t/longlin2.sh
new file mode 100755
index 0000000..1ba8072
--- /dev/null
+++ b/t/longlin2.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Long lines should be wrapped.
+# Report from Albert Chin.
+
+. ./defs || Exit 1
+
+n=1
+files=
+match=
+while test $n -le 100
+do
+  files="$files filename$n"
+  match="..........$match"
+  n=`expr $n + 1`
+done
+files2=`echo "$files" | sed s/filename/filenameb/g`
+
+cat >Makefile.am <<EOF
+FOO = $files $files2 \
+  grepme
+EOF
+
+# The 'FOO = ...' line is 2293-byte long.  More than what a POSIX
+# conformant system is expected to support.  So do not use grep
+# on the non-text file.
+
+# grep $match Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep $match Makefile.in && Exit 1
+grep 'filenameb100 grepme' Makefile.in
diff --git a/t/longline.sh b/t/longline.sh
new file mode 100755
index 0000000..dd5664d
--- /dev/null
+++ b/t/longline.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Long lines of += should be wrapped.
+# Report from Simon Josefsson.
+
+. ./defs || Exit 1
+
+(echo DUMMY = some_long_filename_1;
+for i in 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20;
+do
+  echo DUMMY += some_long_filename_$i
+done) > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+test 80 -ge `grep DUMMY Makefile.in | wc -c`
diff --git a/t/ltcond.sh b/t/ltcond.sh
new file mode 100755
index 0000000..d5098ea
--- /dev/null
+++ b/t/ltcond.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for conditional libtool libraries.
+# This combines two examples from the manual.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([WANT_LIBFOO], [true])
+AM_CONDITIONAL([WANT_LIBBAR], [false])
+AC_SUBST([WANTEDLIBS], ['lib1foo.la lib1bar.la'])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+EXTRA_LTLIBRARIES = lib1foo.la lib1bar.la lib3bar.la
+lib_LTLIBRARIES = $(WANTEDLIBS)
+lib1foo_la_SOURCES = foo.c
+lib1foo_la_LDFLAGS = -rpath '$(libdir)'
+lib1bar_la_SOURCES = bar.c
+lib1bar_la_LDFLAGS = -rpath '$(libdir)'
+lib3bar_la_SOURCES = bar.c
+
+if WANT_LIBFOO
+lib_LTLIBRARIES += lib2foo.la
+check_LTLIBRARIES = lib3foo.la
+endif
+if WANT_LIBBAR
+lib_LTLIBRARIES += lib2bar.la
+endif
+lib2foo_la_SOURCES = foo.c
+lib2bar_la_SOURCES = bar.c
+lib3foo_la_SOURCES = foo.c
+END
+
+echo 'int one () { return 1; }' >foo.c
+echo 'int two () { return 2; }' >bar.c
+
+mkdir empty
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Install libraries in lib/, and the rest in empty/.
+# (in fact there is no "rest", so as the name imply empty/ is
+# expected to remain empty).
+./configure "--prefix=`pwd`/empty" "--libdir=`pwd`/lib"
+
+$MAKE
+test -f lib1foo.la
+test -f lib1bar.la
+test -f lib2foo.la
+test ! -f lib2bar.la
+test ! -f lib3foo.la
+test ! -f lib3bar.la
+
+$MAKE check
+test ! -f lib2bar.la
+test -f lib3foo.la
+test ! -f lib3bar.la
+
+$MAKE install
+test -f lib/lib1foo.la
+test -f lib/lib1bar.la
+test -f lib/lib2foo.la
+test ! -f lib/lib3foo.la
+find empty -type f -print > empty.lst
+cat empty.lst
+test 0 = `wc -l < empty.lst`
+
+$MAKE uninstall
+find lib -type f -print > lib.lst
+test 0 = `wc -l < lib.lst`
+test -f lib1foo.la
+test -f lib1bar.la
+test -f lib2foo.la
+test -f lib3foo.la
+
+$MAKE clean
+test ! -f lib1foo.la
+test ! -f lib1bar.la
+test ! -f lib2foo.la
+test ! -f lib3foo.la
+
+:
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
new file mode 100755
index 0000000..4a72394
--- /dev/null
+++ b/t/ltcond2.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in conditionals.
+
+required='cc native libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_SUBST([HELLO_SYSTEM], [hello-generic.lo])
+AM_CONDITIONAL([LINUX], [true])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libhello.la
+libhello_la_SOURCES = hello-common.c
+EXTRA_libhello_la_SOURCES = hello-linux.c hello-generic.c
+libhello_la_LIBADD = $(HELLO_SYSTEM)
+libhello_la_DEPENDENCIES = $(HELLO_SYSTEM)
+
+lib_LTLIBRARIES += libhello2.la
+libhello2_la_SOURCES = hello-common.c
+if LINUX
+libhello2_la_SOURCES += hello-linux.c
+else
+libhello2_la_SOURCES += hello-generic.c
+endif
+
+bin_PROGRAMS = hello hello2
+hello_SOURCES = main.c
+hello_LDADD = libhello.la
+hello2_SOURCES = main.c
+hello2_LDADD = libhello2.la
+
+check-local:
+       ./hello$(EXEEXT) | grep hello-generic
+       ./hello2$(EXEEXT) | grep hello-linux
+       : > check-ok
+END
+
+cat > hello-linux.c <<'END'
+const char* str (void)
+{
+  return "hello-linux";
+}
+END
+
+cat > hello-generic.c <<'END'
+const char* str (void)
+{
+  return "hello-generic";
+}
+END
+
+cat > hello-common.c <<'END'
+#include <stdio.h>
+const char* str (void);
+void print (void)
+{
+  puts (str ());
+}
+END
+
+cat > main.c <<'END'
+int main (void)
+{
+  print();
+  return 0;
+}
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE check
+test -f check-ok
+
+:
diff --git a/t/ltconv.sh b/t/ltconv.sh
new file mode 100755
index 0000000..19ed8b3
--- /dev/null
+++ b/t/ltconv.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for libtool convenience libraries.
+# This example is taken from the manual.
+
+required='cc native libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES([sub1/Makefile
+                 sub2/Makefile
+                 sub2/sub21/Makefile
+                 sub2/sub22/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub1
+mkdir sub2
+mkdir sub2/sub21
+mkdir sub2/sub22
+mkdir empty
+
+cat >Makefile.am <<'END'
+SUBDIRS = sub1 sub2
+lib_LTLIBRARIES = libtop.la
+libtop_la_SOURCES =
+libtop_la_LIBADD = \
+  sub1/libsub1.la \
+  sub2/libsub2.la
+
+bin_PROGRAMS = ltconvtest
+ltconvtest_SOURCES = test.c
+ltconvtest_LDADD = libtop.la
+
+check-local:
+       ./ltconvtest$(EXEEXT)
+       : > check-ok
+installcheck-local:
+       $(bindir)/ltconvtest$(EXEEXT)
+       : > installcheck-ok
+END
+
+cat >sub1/Makefile.am <<'END'
+noinst_LTLIBRARIES = libsub1.la
+libsub1_la_SOURCES = sub1.c
+END
+
+echo 'int sub1 () { return 1; }' > sub1/sub1.c
+
+cat >sub2/Makefile.am <<'END'
+SUBDIRS = sub21 sub22
+noinst_LTLIBRARIES = libsub2.la
+libsub2_la_SOURCES = sub2.c
+libsub2_la_LIBADD = \
+  sub21/libsub21.la \
+  sub22/libsub22.la
+END
+
+echo 'int sub2 () { return 2; }' > sub2/sub2.c
+
+cat >sub2/sub21/Makefile.am <<'END'
+noinst_LTLIBRARIES = libsub21.la
+libsub21_la_SOURCES = sub21.c
+END
+
+echo 'int sub21 () { return 21; }' > sub2/sub21/sub21.c
+
+cat >sub2/sub22/Makefile.am <<'END'
+noinst_LTLIBRARIES = libsub22.la
+libsub22_la_SOURCES = sub22.c
+END
+
+echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c
+
+cat >test.c <<'EOF'
+#include <stdio.h>
+int main ()
+{
+  if (1 != sub1 ())
+    return 1;
+  if (2 != sub2 ())
+    return 2;
+  if (21 != sub21 ())
+    return 3;
+  if (22 != sub22 ())
+    return 4;
+  return 0;
+}
+EOF
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Install libraries in lib/, programs in bin/, and the rest in empty/.
+# (in fact there is no "rest", so as the name imply empty/ is
+# expected to remain empty).
+./configure "--prefix=`pwd`/empty" "--libdir=`pwd`/lib" "--bindir=`pwd`/bin"
+
+$MAKE
+test -f libtop.la
+test -f sub1/libsub1.la
+test -f sub2/libsub2.la
+test -f sub2/sub21/libsub21.la
+test -f sub2/sub22/libsub22.la
+$MAKE check
+test -f check-ok
+rm -f check-ok
+
+$MAKE install
+test -f lib/libtop.la
+$MAKE installcheck
+test -f installcheck-ok
+rm -f installcheck-ok
+
+find empty -type f -print > empty.lst
+cat empty.lst
+test 0 = `wc -l < empty.lst`
+
+$MAKE clean
+test ! -f libtop.la
+test ! -f sub1/libsub1.la
+test ! -f sub2/libsub2.la
+test ! -f sub2/sub21/libsub21.la
+test ! -f sub2/sub22/libsub22.la
+test ! -f ltconvtest
+
+$MAKE installcheck
+test -f installcheck-ok
+rm -f installcheck-ok
+
+$MAKE uninstall
+find lib -type f -print > lib.lst
+test 0 = `wc -l < lib.lst`
+find bin -type f -print > bin.lst
+test 0 = `wc -l < bin.lst`
+
+:
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
new file mode 100755
index 0000000..100d045
--- /dev/null
+++ b/t/ltdeps.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure libtool library dependencies are correct.
+# Report from Lars J. Aas.
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_PROG_CXX
+AM_CONDITIONAL(HACKING_COMPACT_BUILD, whatever)
+END
+
+cat > Makefile.am << 'END'
+RegularSources = \
+        SbBSPTree.cpp \
+        SbBox2f.cpp \
+        SbBox2s.cpp
+
+LinkHackSources = \
+        all.cpp
+
+if HACKING_COMPACT_BUILD
+BuildSources = $(LinkHackSources)
+else
+BuildSources = $(RegularSources)
+endif
+
+noinst_LTLIBRARIES = libbase.la
+libbase_la_SOURCES = $(BuildSources)
+
+EXTRA_libbase_la_SOURCES = \
+        $(RegularSources) $(LinkHackSources)
+END
+
+: > ltconfig
+: > ltmain.sh
+: > ar-lib
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'OBJECTS =$' Makefile.in && Exit 1
+Exit 0
diff --git a/t/ltinit.sh b/t/ltinit.sh
new file mode 100755
index 0000000..49ddbe0
--- /dev/null
+++ b/t/ltinit.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that libtool support works correctly when "newer" libtool
+# interface (with LT_INIT etc.) is used (this interface has been
+# present since libtool 1.9b, circa 2004).
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+dnl Older libtool versions don't define LT_PREREQ :-(
+m4_ifdef([LT_PREREQ],
+    [LT_PREREQ([2.0])],
+    [m4_fatal([Libtool version too old], [63])])
+LT_INIT([dlopen])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+lib_LTLIBRARIES = libfoo.la
+END
+
+cat > libfoo.c <<'END'
+int foo (void)
+{
+  return 1;
+}
+END
+
+libtoolize
+# Skip if older libtool (pre-2.0) is used.
+{ $ACLOCAL && $AUTOCONF; } || {
+  if test $? -eq 63; then
+    skip_ "libtool is too old (probably < 2.0)"
+  else
+    Exit 1
+  fi
+}
+$EGREP 'LT_(INIT|PREREQ)' configure && Exit 1 # Sanity check.
+$AUTOMAKE -a
+
+cwd=`pwd`
+./configure --prefix="$cwd/inst" >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking.*dlfcn\.h.* no$' stdout || grep '^checking.*dlopen' stdout
+
+$MAKE
+$MAKE install
+$MAKE distcheck
+
+:
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
new file mode 100755
index 0000000..6906994
--- /dev/null
+++ b/t/ltinstloc.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for libtool errors for multiple install locations, esp. with nobase.
+
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AM_CONDITIONAL([COND], [:])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+if COND
+lib_LTLIBRARIES = liba1.la sub/liba2.la
+#else
+pkglib_LTLIBRARIES = liba1.la
+nobase_lib_LTLIBRARIES = sub/liba2.la
+endif
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails --add-missing
+
+# libtoolize might have installed config.guess and config.sub already,
+# and autom4te might warn about bugs in Libtool macro files, so filter
+# out warnings about Makefile.am only.  We don't care in this test
+# whether automake installs config.guess, config.sub and ar-lib.
+
+cat >expected <<'END'
+Makefile.am:5: error: sub/liba2.la multiply defined in condition COND
+Makefile.am:5: 'sub/liba2.la' should be installed below 'lib' in condition 
COND ...
+Makefile.am:2: ... and should also be installed in 'lib' in condition COND.
+Makefile.am:4: error: liba1.la multiply defined in condition COND
+Makefile.am:4: 'liba1.la' should be installed in 'pkglib' in condition COND ...
+Makefile.am:2: ... and should also be installed in 'lib' in condition COND.
+Makefile.am:2: Libtool libraries can be built for only one destination
+END
+
+grep '^Makefile.am' stderr | diff - expected
+
+sed 's/#//' < Makefile.am > t
+mv -f t Makefile.am
+
+$AUTOMAKE
+grep ' -rpath \$(libdir)/sub' Makefile.in
+
+:
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
new file mode 100755
index 0000000..5cdccf0
--- /dev/null
+++ b/t/ltlibobjs.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure LTLIBOBJS alone works ok.
+# Report from Vadim Zeitlin.
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([LTLIBOBJS])
+AM_PROG_AR
+AC_PROG_LIBTOOL
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libtu.la
+libtu_la_SOURCES = foo.c
+libtu_la_LIBADD = @LTLIBOBJS@
+END
+
+: > ltconfig
+: > ltmain.sh
+: > ar-lib
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
new file mode 100755
index 0000000..11e2a1d
--- /dev/null
+++ b/t/ltlibsrc.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure a sensible default source for libraries is used.
+
+required='cc libtool'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+mkdir zoo.d
+
+cat > Makefile.am << 'END'
+AM_LDFLAGS = -module
+pkglib_LTLIBRARIES = zoo.d/bar.la old.la
+noinst_LTLIBRARIES = foo.la zoo.d/old2.la
+
+$(srcdir)/zoo_d_old2_la.c: $(srcdir)/old_la.c
+       cp $(srcdir)/old_la.c $@
+END
+
+cat > foo.c << 'END'
+int foo (void)
+{
+  return 0;
+}
+END
+
+cp foo.c zoo.d/bar.c
+cp foo.c old_la.c
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails -a
+grep '^Makefile\.am:2:.*old_la\.c' stderr
+grep '^Makefile\.am:2:.*old\.c' stderr
+grep '^Makefile\.am:3:.*zoo_d_old2_la\.c' stderr
+grep '^Makefile\.am:3:.*zoo\.d/old2\.c' stderr
+
+$AUTOMAKE -Wno-obsolete
+
+mkdir sub
+cd sub
+
+../configure
+$MAKE
+
+test -f foo.la
+test -f zoo.d/bar.la
+test -f old.la
+test -f zoo.d/old2.la
+
+$MAKE distcheck
+
+:
diff --git a/t/ltorder.sh b/t/ltorder.sh
new file mode 100755
index 0000000..358e620
--- /dev/null
+++ b/t/ltorder.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for correct installation order of nobase libtool libraries.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+nobase_lib_LTLIBRARIES = liba1.la sub/liba2.la sub/liba3.la liba4.la liba5.la
+sub_liba2_la_LIBADD = liba1.la
+sub_liba3_la_LIBADD = sub/liba2.la
+liba4_la_LIBADD = sub/liba3.la
+liba5_la_LIBADD = liba4.la
+bin_PROGRAMS = p
+p_LDADD = liba5.la
+END
+
+mkdir sub
+echo 'int a1 () { return 1; }' >liba1.c
+echo 'extern int a1 (); int a2 () { return a1 (); }' >sub/liba2.c
+echo 'extern int a2 (); int a3 () { return a2 (); }' >sub/liba3.c
+echo 'extern int a3 (); int a4 () { return a3 (); }' >liba4.c
+echo 'extern int a4 (); int a5 () { return a4 (); }' >liba5.c
+echo 'extern int a5 (); int main () { return a5 (); }' >p.c
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure "--prefix=`pwd`/inst"
+
+$MAKE
+$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'has not been installed' stderr && Exit 1
+
+$MAKE uninstall
+test `find inst -type f -print | wc -l` -eq 0
+
+:
diff --git a/t/lzma.sh b/t/lzma.sh
new file mode 100755
index 0000000..8e78f86
--- /dev/null
+++ b/t/lzma.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for no-dist-gzip with lzma.
+
+. ./defs || Exit 1
+
+errmsg='support for lzma.*removed'
+
+echo AUTOMAKE_OPTIONS = dist-lzma > Makefile.am
+$ACLOCAL --force
+AUTOMAKE_fails -Wnone -Wno-error
+grep "^Makefile\\.am:1:.*$errmsg" stderr
+
+cat > configure.ac << 'END'
+AC_INIT([lzma], [1.0])
+AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+: > Makefile.am
+
+rm -rf autom4te*.cache
+$ACLOCAL
+AUTOMAKE_fails -Wnone -Wno-error
+grep "^configure\\.ac:2:.*$errmsg" stderr
+
+:
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
new file mode 100755
index 0000000..52dae22
--- /dev/null
+++ b/t/m4-inclusion.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to see if 'm4_sinclude' and 'm4_include' works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+sinclude([doesntexist.m4])
+EOF
+
+mkdir sub
+
+cat > sub/p.m4 << 'END'
+AC_SUBST([MAGICALPIG])
+END
+
+cat > sub/h.m4 << 'END'
+AC_SUBST([MAGICALHOG])
+END
+
+cat > sub/g.m4 << 'END'
+AC_SUBST([GREPME])
+END
+
+: > Makefile.am
+
+echo 'sinclude([sub/g.m4])' >> acinclude.m4
+echo 'm4_sinclude([sub/doesntexist.m4])' >> acinclude.m4
+
+$ACLOCAL
+
+echo 'm4_sinclude([sub/p.m4])' >> aclocal.m4
+echo 'm4_include([sub/h.m4])' >> aclocal.m4
+
+$AUTOMAKE
+
+grep doesntexist Makefile.in && Exit 1
+grep MAGICALPIG Makefile.in
+grep MAGICALHOG Makefile.in
+grep GREPME Makefile.in
+
+:
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
new file mode 100755
index 0000000..11e97a6
--- /dev/null
+++ b/t/maintclean-vpath.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure distclean and maintainer-clean erase the right files.
+# This test is for VPATH builds; see sister test 'maintclean.test'
+# for in-tree builds.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([bar sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+noinst_DATA = foo.c
+foo.c:
+       touch foo.c
+MAINTAINERCLEANFILES = foo.c
+END
+
+mkdir sub
+cat > sub/Makefile.am <<'END'
+noinst_SCRIPTS = zap
+zap: zap.sh
+       cp $(srcdir)/zap.sh $@ && chmod a+x $@
+MAINTAINERCLEANFILES = zap
+END
+
+: > bar.in
+: > sub/zap.sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Users can disable autom4te.cache.
+if test -d autom4te.cache; then
+  test_cache='test -d ../autom4te.cache'
+else
+  test_cache=:
+fi
+
+mkdir build
+
+chmod a-w . sub
+
+cd build
+
+../configure
+test -f bar
+
+$MAKE
+test -f foo.c
+test -f sub/zap
+$test_cache
+
+$MAKE distclean
+test ! -f bar
+test ! -f Makefile
+test ! -f sub/Makefile
+test ! -f config.status
+test -f foo.c
+test -f sub/zap
+test -f ../sub/zap.sh
+$test_cache
+
+../configure
+test -f bar
+
+$MAKE foo.c
+test -f foo.c
+cd sub
+$MAKE zap
+test -f zap
+cd ..
+
+chmod u+w ..
+
+$MAKE maintainer-clean
+test -f ../sub/zap.sh
+test ! -f bar
+test ! -f foo.c
+test ! -f sub/zap
+test ! -f Makefile
+test ! -f sub/Makefile
+test ! -f config.status
+test ! -d ../autom4te.cache
+
+:
diff --git a/t/maintclean.sh b/t/maintclean.sh
new file mode 100755
index 0000000..c5d3d0e
--- /dev/null
+++ b/t/maintclean.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure distclean and maintainer-clean erase the right files.
+# This test is for in-tree builds; see sister test 'maintclean-vpath.test'
+# for VPATH builds.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([bar sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+noinst_DATA = foo.c
+foo.c:
+       touch foo.c
+MAINTAINERCLEANFILES = foo.c
+END
+
+mkdir sub
+cat > sub/Makefile.am <<'END'
+noinst_SCRIPTS = zap
+zap: zap.sh
+       cp $(srcdir)/zap.sh $@ && chmod a+x $@
+MAINTAINERCLEANFILES = zap
+END
+
+: > bar.in
+: > sub/zap.sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Users can disable autom4te.cache.
+if test -d autom4te.cache; then
+  test_cache='test -d autom4te.cache'
+else
+  test_cache=:
+fi
+
+./configure
+test -f bar
+
+$MAKE
+test -f foo.c
+test -f sub/zap
+$test_cache
+
+$MAKE distclean
+test ! -f bar
+test ! -f Makefile
+test ! -f sub/Makefile
+test ! -f config.status
+test -f foo.c
+test -f sub/zap
+test -f sub/zap.sh
+$test_cache
+
+./configure
+test -f bar
+
+$MAKE foo.c
+test -f foo.c
+cd sub
+$MAKE zap
+test -f zap
+cd ..
+
+$MAKE maintainer-clean
+test -f sub/zap.sh
+test ! -f bar
+test ! -f foo.c
+test ! -f sub/zap
+test ! -f Makefile
+test ! -f sub/Makefile
+test ! -f config.status
+test ! -d autom4te.cache
+
+:
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
new file mode 100755
index 0000000..8a7c451
--- /dev/null
+++ b/t/maintmode-configure-msg.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that our macro 'AM_MAINTAINER_MODE' adds proper text to
+# the configure help screen.  Also make sure the "checking ..." messages
+# related to the enabling/disabling of maintainer mode are correct (see
+# automake bug#9890).
+
+. ./defs || Exit 1
+
+set_maintmode ()
+{
+  rm -rf autom4te*.cache # Just to be sure not to use a stale cache.
+  echo "AC_INIT([$me], [1.0])" > configure.ac
+  case $1 in
+    DEFAULT) echo AM_MAINTAINER_MODE;;
+          *) echo "AM_MAINTAINER_MODE([$*])";;
+  esac >> configure.ac
+}
+
+check_configure_message_with ()
+{
+  answer=$1; shift
+  ./configure ${1+"$@"} >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  grep "^checking whether to enable maintainer-specific.*\\.\\.\\. $answer$" 
stdout
+  test `grep -c 'checking.*maint' stdout` -eq 1
+  :
+}
+
+set_maintmode "DEFAULT"
+
+$ACLOCAL
+
+$AUTOCONF --force
+
+grep_configure_help --enable-maintainer-mode 'enable make rules'
+
+check_configure_message_with "no"
+check_configure_message_with "yes" --enable-maintainer-mode
+
+set_maintmode "disable"
+
+$AUTOCONF --force
+grep_configure_help --enable-maintainer-mode 'enable make rules'
+
+check_configure_message_with "no"
+check_configure_message_with "yes" --enable-maintainer-mode
+
+set_maintmode "enable"
+
+$AUTOCONF --force
+./configure --help >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep_configure_help --disable-maintainer-mode 'disable make rules'
+
+check_configure_message_with "yes"
+check_configure_message_with "no" --disable-maintainer-mode
+
+:
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
new file mode 100755
index 0000000..3769205
--- /dev/null
+++ b/t/make-dryrun.tap
@@ -0,0 +1,125 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(am__make_dryrun) works as expected.
+
+am_parallel_tests=yes # Avoid generation of a useless wrapper test.
+. ./defs || Exit 1
+
+plan_ 14
+
+if echo "all: ; @+printf %sbb%s aa cc" | $MAKE -n -f - | grep aabbcc; then
+  make_plus_silence () { return 0; }
+else
+  make_plus_silence () { return 1; }
+fi
+
+mkdir sub
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+all:
+       : Dummy, nothing to do.
+foo:
+       $(MAKE) all
+notdry:
+       @echo ":: $$MAKEFLAGS ::"; : For debugging.
+       $(am__make_dryrun) && exit 1; exit 0
+dry:
+       address@hidden ":: $$MAKEFLAGS ::"; : For debugging.
+       +$(am__make_dryrun) || exit 1; echo ok > from-dry-mode
+END
+
+$ACLOCAL    || fatal_ "aclocal failed"
+$AUTOCONF   || fatal_ "autoconf failed"
+$AUTOMAKE   || fatal_ "automake failed"
+./configure || fatal_ "configure failed"
+
+# ----------------------------------------------------------------------
+
+check_no_dryrun ()
+{
+  command_ok_ "dry-run ($cnt)" $MAKE notdry ${1+"$@"}
+  cnt=`expr $cnt + 1`
+}
+cnt=1
+
+check_no_dryrun
+
+# Test against a known regression.  This was especially heinous, since
+# make running in normal mode was sometimes mistaken for make running
+# in dry mode.
+check_no_dryrun TESTS="n1.test n2.test"
+check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS="TESTS='n1 n2'"
+check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS='TESTS="n1 n2"'
+check_no_dryrun FOOFLAGS="-n -n -knf2 n --none -n"
+check_no_dryrun MYFLAGS="-n --dryrun -n --dry-run -n"
+
+# ----------------------------------------------------------------------
+
+check_dryrun ()
+{
+  r=ok directive=
+  case $1 in
+    -C) condition=$2 reason=$3; shift; shift; shift;;
+     *) condition=: reason=;;
+  esac
+  if $condition; then
+    $MAKE dry ${1+"$@"}   || r='not ok'
+    test -f from-dry-mode || r='not ok'
+    rm -f from-dry-mode   || fatal_ "cleaning up"
+  else
+    directive=SKIP
+  fi
+  result_ "$r" -D "$directive" -r "$reason" "not dry-run ($cnt)"
+  unset r directive reason
+  cnt=`expr $cnt + 1`
+}
+cnt=1
+
+check_dryrun -C make_plus_silence 'recipe prefix "+" unsupported' -n
+check_dryrun -C using_gmake "\$MAKE is not GNU make" --dry-run -k
+
+# ----------------------------------------------------------------------
+
+# Test for when shell metacharacters or backslashes are in $(MAKEFLAGS).
+
+check_metachars ()
+{
+  r=ok
+  $MAKE notdry ${1+"$@"} || r='not ok'
+  if test -f bad; then
+    r='not ok'
+  else
+    rm -f bad || fatal_ "cleaning up"
+  fi
+  result_ "$r" "dry-run, with shell metachars ($cnt)"
+  unset r
+  cnt=`expr $cnt + 1`
+}
+cnt=1
+
+check_metachars MYFLAGS="-n \"n\" '-n' --none -n"
+check_metachars MYFLAGS='-knf2\ n\ \\n'
+check_metachars MYFLAGS="(&) | ; \" \` '"
+check_metachars MYFLAGS=" ' # ' "
+check_metachars MYFLAGS='$(foo)'
+check_metachars MYFLAGS='`touch bad`'
+
+# ----------------------------------------------------------------------
+
+:
diff --git a/t/make.sh b/t/make.sh
new file mode 100755
index 0000000..e292e38
--- /dev/null
+++ b/t/make.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure 'make' check works.
+# From Ralf Corsepius.
+
+required=GNUmake
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAKE_INCLUDE
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+export ACLOCAL
+export AUTOCONF
+export AUTOMAKE
+
+# Do the test twice -- once with make and once with make -w.
+# This tests for a bug reported by Rainer Orth (see PR 175).
+
+save="$MAKE"
+for flag in '' -w; do
+   MAKE="$save $flag" ./configure
+   $FGREP 'am__include = include' Makefile
+   $sleep
+   touch configure.ac
+   $MAKE $flag
+   $FGREP 'am__include = include' Makefile
+   rm -f config.cache
+done
+
+Exit 0
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
new file mode 100755
index 0000000..83f3cae
--- /dev/null
+++ b/t/makefile-deps.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we don't emit a rule with empty target if list of
+# automatically-computed dependencies for Makefile.in is empty.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep "^ *:" Makefile.in && Exit 1
+
+:
diff --git a/t/makej.sh b/t/makej.sh
new file mode 100755
index 0000000..64c5f28
--- /dev/null
+++ b/t/makej.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 'make -j' used to fail with Autoconf < 2.58, because tools like
+# autoconf and automake can try to update autom4te's cache in parallel.
+#
+# Note that failures might not be reproducible systematically as they
+# depend on the time at which autoconf and automake update the cache
+# via autom4te.
+
+required=GNUmake
+. ./defs || Exit 1
+
+cat >configure.ac <<END
+m4_include([version.m4])
+AC_INIT([$me], [THE_VERSION])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+echo 'm4_define([THE_VERSION], [2.718])' > version.m4
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE --add-missing
+./configure --version | grep '2\.718'
+./configure
+$MAKE
+
+$sleep
+echo 'm4_define([THE_VERSION], [3.141])' > version.m4
+$MAKE -j
+./configure --version | grep '3\.141'
+
+:
diff --git a/t/makej2.sh b/t/makej2.sh
new file mode 100755
index 0000000..8183887
--- /dev/null
+++ b/t/makej2.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure known BSD 'make -jN' issues are fixed:
+# without -B, it may reuse the same shell for separate commands in a
+# rule, which can lead to interesting results.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+test-distdir-removed:
+       test ! -d $(distdir)
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+mkdir build
+cd build
+../configure "--prefix=`pwd`/inst"
+
+$MAKE -j2 || skip_ "$MAKE failed to run with two parallel jobs"
+$MAKE -j2 distcheck
+$MAKE test-distdir-removed
+
+Exit 0
diff --git a/t/maken.sh b/t/maken.sh
new file mode 100755
index 0000000..bb64444
--- /dev/null
+++ b/t/maken.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure that 'make -n dist' and 'make -n distcheck' do not change files
+# on disk, due to GNU make executing rules containing '$(MAKE)'.
+# Also, ensure that 'make -n dist' and 'make -n distcheck' show what
+# would happen, at least when using GNU make.
+
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+distcheck-hook:
+       @: > stamp-distcheck-hook
+test-no-distdir:
+       test ! -d $(distdir)
+       test ! -f stamp-distcheck-hook
+       test ! -f sub/stamp-sub-dist-hook
+END
+cat >sub/Makefile.am <<'END'
+dist-hook:
+       @: > stamp-sub-dist-hook
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$sleep
+echo stamp > stampfile
+$sleep
+for target in dist distcheck; do
+  $MAKE -n $target
+  if using_gmake; then
+    $MAKE -n $target | grep stamp-sub-dist-hook || Exit 1
+  fi
+  $MAKE test-no-distdir
+  test `ls -1t | sed 1q` = stampfile
+done
+
+Exit 0
diff --git a/t/maken3.sh b/t/maken3.sh
new file mode 100755
index 0000000..2018549
--- /dev/null
+++ b/t/maken3.sh
@@ -0,0 +1,190 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test 'make -n' for various targets, to ensure that:
+#
+#  1. no files or directories are created or removed, and
+#
+#  2. if using GNU make or a make implementation supporting the .MAKE
+#     special target, the output from make is sufficiently complete.
+#
+# This test exercises the GCS-mandated targets (except for dist)
+# as well as tags, TAGS.
+
+. ./defs || Exit 1
+
+# Does $MAKE support the '.MAKE' special target?
+have_dotmake=false
+if using_gmake; then
+  have_dotmake=: # GNU make must support it.
+else
+  unindent > mk.tmp << 'END'
+    targ.tmp:
+       : > $@
+    .MAKE: targ.tmp
+END
+  if $MAKE -n -f mk.tmp targ.tmp && test -f targ.tmp; then
+    have_dotmake=:
+  fi
+fi
+
+mkdir sub sub2
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = foo.test
+SUBDIRS = sub sub2
+##BUILT_SOURCES = foo
+foo:
+foo.test:
+all-local:
+       @: > stamp-all
+install-data-local:
+       @: > stamp-install
+uninstall-local:
+       @: > stamp-uninstall
+clean-local:
+       @: > stamp-clean
+distclean-local:
+       @: > stamp-distclean
+info-local:
+       @: > stamp-info
+html-local:
+       @: > stamp-html
+dvi-local:
+       @: > stamp-dvi
+ps-local:
+       @: > stamp-ps
+pdf-local:
+       @: > stamp-pdf
+check-local:
+       @: > stamp-check
+installcheck-local:
+       @: > stamp-installcheck
+mostlyclean-local:
+       @: > stamp-mostlyclean
+maintainer-clean-local:
+       @: > stamp-maintainer-clean
+END
+cat >sub/Makefile.am <<'END'
+all-local:
+       @: > stamp-all-sub
+install-data-local:
+       @: > stamp-install-sub
+uninstall-local:
+       @: > stamp-uninstall-sub
+clean-local:
+       @: > stamp-clean-sub
+distclean-local:
+       @: > stamp-distclean-sub
+info-local:
+       @: > stamp-info-sub
+html-local:
+       @: > stamp-html-sub
+dvi-local:
+       @: > stamp-dvi-sub
+ps-local:
+       @: > stamp-ps-sub
+pdf-local:
+       @: > stamp-pdf-sub
+check-local:
+       @: > stamp-check-sub
+installcheck-local:
+       @: > stamp-installcheck-sub
+tags:
+       @: > stamp-tags-sub
+TAGS:
+       @: > stamp-TAGS-sub
+mostlyclean-local:
+       @: > stamp-mostlyclean-sub
+maintainer-clean-local:
+       @: > stamp-maintainer-clean-sub
+END
+cat >sub2/Makefile.am <<'END'
+all install uninstall clean check:
+       @: > address@hidden
+info dvi pdf ps:
+       @: > address@hidden
+html:
+       @: > address@hidden
+install-info install-html install-dvi install-pdf install-ps:
+       @: > address@hidden
+installcheck installdirs tags TAGS mostlyclean:
+       @: > address@hidden
+## These targets cannot be overridden like this:
+## install-strip distclean maintainer-clean
+END
+
+$ACLOCAL
+$AUTOCONF
+
+check_targets ()
+{
+  for target in \
+    all install install-strip uninstall clean distclean check \
+    info html dvi pdf ps \
+    install-info install-html install-dvi install-pdf install-ps \
+    installcheck installdirs tags TAGS mostlyclean maintainer-clean
+  do
+    $MAKE -n $target >stdout || { cat stdout; Exit 1; }
+    cat stdout
+    case $target in
+    install-* | installdirs | tags | TAGS ) ;;
+    *)
+      if $have_dotmake; then
+        grep "stamp-$target$" stdout || Exit 1
+      fi
+      test ! -f "stamp-$target$" || Exit 1
+      ;;
+    esac
+    case $target in
+    install-* | installdirs ) ;;
+    *)
+      if $have_dotmake; then
+        grep "stamp-$target-sub" stdout || Exit 1
+      fi
+      test ! -f "sub/stamp-$target-sub" || Exit 1
+      ;;
+    esac
+    case $target in
+    distclean | maintainer-clean ) ;;
+    *)
+      if $have_dotmake; then
+        grep "should-not-be-executed" stdout || Exit 1
+      fi
+      test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
+      ;;
+    esac
+  done
+}
+
+$AUTOMAKE -a -Wno-override
+./configure
+check_targets || Exit 1
+
+# Now, introduce BUILT_SOURCES into the toplevel Makefile
+# TODO: add BUILT_SOURCES to sub2, fix fallout.
+sed 's/##//' < Makefile.am > t
+mv -f t Makefile.am
+$AUTOMAKE -Wno-override --force Makefile
+./configure
+check_targets || Exit 1
+
+Exit 0
diff --git a/t/makevars.sh b/t/makevars.sh
new file mode 100755
index 0000000..ad18830
--- /dev/null
+++ b/t/makevars.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that automake includes the needed variables,
+# but not too many.
+
+. ./defs || Exit 1
+
+# Find the macros wanted by Automake.
+$ACLOCAL
+
+# Create some dummy Makefile.in.
+: > Makefile.am
+
+$AUTOMAKE
+
+# We are definitely not needing a compiler or preprocessor.
+$EGREP '^ *(CC|CPP|CXX|CXXCPP) *=' Makefile.in && Exit 1
+
+:
diff --git a/t/man.sh b/t/man.sh
new file mode 100755
index 0000000..d2e5dd6
--- /dev/null
+++ b/t/man.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure 'dist' prefix works with man pages.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+dist_man_MANS = foo.1
+nodist_man1_MANS = bar.man
+END
+
+: > foo.1
+: > bar.man
+
+$ACLOCAL
+$AUTOMAKE
+grep '^MANS *=' Makefile.in
+
+:
diff --git a/t/man2.sh b/t/man2.sh
new file mode 100755
index 0000000..38c3992
--- /dev/null
+++ b/t/man2.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that man pages listed in man_MANS are installed and
+# renamed as documented.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+man_MANS = foo.2
+man4_MANS = foo.4 bar.man
+END
+
+: > foo.2
+: > foo.4
+: > bar.man
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Let's play with $DESTDIR too, it shouldn't hurt.
+./configure --prefix='' --mandir=/man
+$MAKE DESTDIR="`pwd`/_inst" install
+
+test -f ./_inst/man/man2/foo.2
+test -f ./_inst/man/man4/foo.4
+test -f ./_inst/man/man4/bar.4
+
+$MAKE DESTDIR="`pwd`/_inst" uninstall
+
+test ! -f ./_inst/man/man2/foo.2
+test ! -f ./_inst/man/man4/foo.4
+test ! -f ./_inst/man/man4/bar.4
+
+:
diff --git a/t/man3.sh b/t/man3.sh
new file mode 100755
index 0000000..a842d38
--- /dev/null
+++ b/t/man3.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# PR 516: Prefer generated manpages to distributed ones.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+dist_man_MANS = foo.1
+installcheck-local:
+       grep bar "$(mandir)/man1/foo.1"
+END
+
+cat >>configure.ac <<'END'
+: ${foo=foo}
+AC_SUBST([foo])
+AC_CONFIG_FILES([foo.1])
+AC_OUTPUT
+END
+
+cat > foo.1.in <<'END'
address@hidden@
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
+
+:
diff --git a/t/man4.sh b/t/man4.sh
new file mode 100755
index 0000000..c7333b9
--- /dev/null
+++ b/t/man4.sh
@@ -0,0 +1,105 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure 'make dist' fails when help2man replacement man pages are created.
+#
+# The assumption here is the following: if the developer uses help2man to
+# generate man pages from --help output, then these man pages may not be
+# stored in VCS.  However, they should be distributed, so that the end user
+# that receives the tarball doesn't have to install help2man.  If they are
+# not distributed, then the developer should make help2man a prerequisite
+# to building the package from a tarball, e.g., with a configure check for
+# help2man that errors out if it is unavailable.  In both cases it is
+# sufficient to check only distributed man pages.
+#
+# Idea of this whole shenanigan is to allow somebody to check out sources from
+# a VCS and build and install them without needing help2man installed.  The
+# installed man pages will be bogus in this case.  Typically, this happens
+# when developers ask users to try out a fix from VCS; the developers 
themselves
+# will usually have help2man installed (or should install it).
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+dist_man_MANS = $(srcdir)/foo.1 bar.1
+dist_bin_SCRIPTS = foo bar
+$(srcdir)/foo.1:
+       $(HELP2MAN) --output=$@ $(srcdir)/foo
+bar.1:
+       $(HELP2MAN) --output=$(srcdir)/bar.1 $(srcdir)/bar
+END
+
+cat >>configure.ac <<'END'
+AM_MISSING_PROG([HELP2MAN], [help2man])
+AC_OUTPUT
+END
+
+cat > foo <<'END'
+#! /bin/sh
+while test $# -gt 0; do
+  case $1 in
+    -h | --help) echo "usage: $0 [OPTIONS]..."; exit 0;;
+    -v | --version) echo "$0 1.0"; exit 0;;
+  esac
+  shift
+done
+END
+cp foo bar
+chmod +x foo bar
+
+mkdir bin
+cat > bin/help2man <<'END'
+#! /bin/sh
+# Fake help2man script that lets 'missing' think it is not installed.
+exit 127
+END
+chmod +x bin/help2man
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH
+
+grep_error_messages()
+{
+  grep ' man pages contain.*missing help2man.* replacement text' stderr \
+   && grep 'install help2man' stderr \
+   && grep 'regenerate the man pages' stderr \
+   || Exit 1
+}
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE
+$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep_error_messages
+$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep_error_messages
+$MAKE distclean
+
+mkdir build
+cd build
+../configure
+$MAKE
+$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep_error_messages
+$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep_error_messages
+
+:
diff --git a/t/man5.sh b/t/man5.sh
new file mode 100755
index 0000000..674ea03
--- /dev/null
+++ b/t/man5.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure to extract the correct mansection from files in man_MANS.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+man_MANS = foo-1.4.5/foo.2 foo-1.4.5/bar.3 baz-1.4.2
+notrans_man_MANS = foo-1.4.5/nfoo.2 foo-1.4.5/nbar.3 nbaz-1.4.2
+END
+
+mkdir foo-1.4.5
+
+: > foo-1.4.5/foo.2
+: > foo-1.4.5/nfoo.2
+: > foo-1.4.5/bar.3
+: > foo-1.4.5/nbar.3
+: > baz-1.4.2
+: > nbaz-1.4.2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Let's play with $DESTDIR too, it shouldn't hurt.
+./configure --mandir=/man
+$MAKE DESTDIR="`pwd`/_inst" install
+
+test -f ./_inst/man/man2/foo.2
+test -f ./_inst/man/man2/nfoo.2
+test -f ./_inst/man/man2/baz-1.4.2
+test -f ./_inst/man/man2/nbaz-1.4.2
+test -f ./_inst/man/man3/bar.3
+test -f ./_inst/man/man3/nbar.3
+
+test ! -d ./_inst/man/man1
+test ! -d ./_inst/man/man4
+test ! -d ./_inst/man/man5
+
+$MAKE DESTDIR="`pwd`/_inst" uninstall
+
+test ! -f ./_inst/man/man2/foo.2
+test ! -f ./_inst/man/man2/nfoo.2
+test ! -f ./_inst/man/man2/baz-1.4.2
+test ! -f ./_inst/man/man2/nbaz-1.4.2
+test ! -f ./_inst/man/man3/bar.3
+test ! -f ./_inst/man/man3/nbar.3
+
+:
diff --git a/t/man6.sh b/t/man6.sh
new file mode 100755
index 0000000..1a7b267
--- /dev/null
+++ b/t/man6.sh
@@ -0,0 +1,101 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure 'make distcheck' passes when help2man generates man pages,
+# even if the 'missing' script is involved.
+
+required=help2man
+. ./defs || Exit 1
+
+# Avoid a spurious failure due to a known FreeBSD make incompatibility.
+useless_vpath_rebuild \
+  && skip_ "VPATH useless rebuild detected (see bug#7884)"
+
+cat > Makefile.am << 'END'
+dist_man_MANS = $(srcdir)/foobar.1 bazquux.1 zardoz.1
+dist_bin_SCRIPTS = foobar bazquux zardoz
+$(srcdir)/foobar.1:
+       $(HELP2MAN) --output=$@ $(srcdir)/foobar
+bazquux.1:
+       $(HELP2MAN) --output=$@ $(srcdir)/bazquux
+zardoz.1:
+       $(HELP2MAN) --output=$(srcdir)/zardoz.1 $(srcdir)/zardoz
+END
+
+cat >> configure.ac <<'END'
+AM_MISSING_PROG([HELP2MAN], [help2man])
+AC_OUTPUT
+END
+
+cat > foobar <<'END'
+#! /bin/sh
+while test $# -gt 0; do
+  case $1 in
+    -h | --help) echo "usage: $0 [OPTIONS]..."; exit 0;;
+    -v | --version) echo "$0 1.0"; exit 0;;
+  esac
+  shift
+done
+END
+
+cp foobar bazquux
+cp foobar zardoz
+
+chmod +x foobar bazquux zardoz
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+mkdir build
+cd build
+
+../configure
+# Sanity check.
+grep '^HELP2MAN *=.*/missing --run help2man' Makefile
+
+$MAKE
+$FGREP foobar ../foobar.1
+$FGREP bazquux ./bazquux.1
+$FGREP zardoz ../zardoz.1
+
+$MAKE distdir
+$FGREP foobar  $me-1.0/foobar.1
+$FGREP bazquux $me-1.0/bazquux.1
+$FGREP zardoz  $me-1.0/zardoz.1
+
+$MAKE distcheck
+
+cd ..
+rm -f *.1 # Remove leftover generated manpages.
+
+./configure
+# Sanity check.
+grep '^HELP2MAN *=.*/missing --run help2man' Makefile
+
+$MAKE
+$FGREP foobar  foobar.1
+$FGREP bazquux bazquux.1
+$FGREP zardoz  zardoz.1
+
+$MAKE distdir
+$FGREP foobar  $me-1.0/foobar.1
+$FGREP bazquux $me-1.0/bazquux.1
+$FGREP zardoz  $me-1.0/zardoz.1
+
+$MAKE distcheck
+
+:
diff --git a/t/man7.sh b/t/man7.sh
new file mode 100755
index 0000000..37bec90
--- /dev/null
+++ b/t/man7.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for a bug in maintainer-clean w.r.t. generated manpages.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+dist_man_MANS = $(srcdir)/foo.1 bar.1
+$(srcdir)/foo.1 bar.1:
+       : > $@
+MAINTAINERCLEANFILES = $(dist_man_MANS)
+END
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+
+$MAKE
+test -f bar.1
+test -f ../foo.1
+
+$MAKE maintainer-clean
+test ! -f bar.1
+test ! -f ../foo.1
+
+cd ..
+./configure
+
+$MAKE
+test -f bar.1
+test -f foo.1
+
+$MAKE maintainer-clean
+test ! -f bar.1
+test ! -f foo.1
+
+:
diff --git a/t/man8.sh b/t/man8.sh
new file mode 100755
index 0000000..14c190b
--- /dev/null
+++ b/t/man8.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for a bug in distcheck w.r.t. generated manpages.
+
+. ./defs || Exit 1
+
+# Avoid a spurious failure due to a known FreeBSD make incompatibility.
+useless_vpath_rebuild \
+  && skip_ "VPATH useless rebuild detected (see bug#7884)"
+
+cat > Makefile.am << 'END'
+dist_man_MANS = foo.1
+foo.1:
+## This 'rm' command will fail if $(srcdir) is unwritable.
+       rm -f $(srcdir)/$@
+       : > $(srcdir)/$@
+END
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+
+$MAKE
+test -f ../foo.1
+$MAKE distdir
+test -f $me-1.0/foo.1
+$MAKE distcheck
+
+cd ..
+rm -f foo.1
+./configure
+
+$MAKE
+test -f foo.1
+$MAKE distdir
+test -f $me-1.0/foo.1
+$MAKE distcheck
+
+:
diff --git a/t/mdate.sh b/t/mdate.sh
new file mode 100755
index 0000000..b33bf63
--- /dev/null
+++ b/t/mdate.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that mdate-sh is required when Texinfo used and version.texi needed.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
+END
+
+# Required when using Texinfo.
+: > texinfo.tex
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'required file.*mdate-sh.*not found' stderr
+
+:
diff --git a/t/mdate2.sh b/t/mdate2.sh
new file mode 100755
index 0000000..093de5e
--- /dev/null
+++ b/t/mdate2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure mdate-sh is included in distribution.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > textutils.texi << 'END'
address@hidden version.texi
+END
+
+# Required when using Texinfo.
+: > texinfo.tex
+: > mdate-sh
+echo '@setfilename textutils' > textutils.texi
+
+# Use "././" to confuse Automake into thinking this is a subdir build.
+$ACLOCAL
+$AUTOMAKE ././Makefile
+
+grep 'mdate-sh' Makefile.in | grep -v SHELL
+
+:
diff --git a/t/mdate3.sh b/t/mdate3.sh
new file mode 100755
index 0000000..a37e60b
--- /dev/null
+++ b/t/mdate3.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure mdate-sh run correctly.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([foo])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
+END
+
+mkdir foo
+
+# Required when using Texinfo.
+: > foo/texinfo.tex
+: > foo/mdate-sh
+mv install-sh foo
+mv missing foo
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '[^/]mdate-sh' Makefile.in && Exit 1
+Exit 0
diff --git a/t/mdate4.sh b/t/mdate4.sh
new file mode 100755
index 0000000..ac1be3a
--- /dev/null
+++ b/t/mdate4.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that mdate-sh is added to the right directory.
+# Report from Kevin Dalley.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+
+cat > sub/Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > sub/textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+ls -l sub
+test -f sub/mdate-sh
+
+:
diff --git a/t/mdate5.sh b/t/mdate5.sh
new file mode 100755
index 0000000..4cef952
--- /dev/null
+++ b/t/mdate5.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure mdate-sh works correctly.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script mdate-sh
+
+set x `./mdate-sh mdate-sh`
+shift
+echo "$*" # For debugging.
+
+# Check that mdate output looks like a date:
+test $# = 3
+case $1$3 in *[!0-9]*) Exit 1;; esac
+test $1 -lt 32
+# Hopefully automake will be obsolete in 80 years ;-)
+case $3 in 20[0-9][0-9]) :;; *) Exit 1;; esac
+case $2 in
+  January|February|March|April|May|June|July|August) ;;
+  September|October|November|December) ;;
+  *) Exit 1
+esac
+
+# Stricter checks on the year required a POSIX date(1) command.
+if year=`date +%Y` && test $year -gt 2010; then
+  test $year = $3 || Exit 1
+fi
+
+:
diff --git a/t/mdate6.sh b/t/mdate6.sh
new file mode 100755
index 0000000..ca3ca21
--- /dev/null
+++ b/t/mdate6.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# mdate-sh can work with weird file names, doesn't eval too much.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+a=
+file='file  name $a'
+( : > "$file" ) \
+  || skip_ "file name with spaces and metacharacters not accepted"
+
+get_shell_script mdate-sh
+
+./mdate-sh "$file" >stdout 2>stderr ||
+  { cat stdout; cat stderr >&2; Exit 1; }
+cat stdout
+cat stderr >&2
+grep '[12][0-9]\{3\}' stdout
+test ! -s stderr
+
+:
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh 
b/t/missing-auxfile-stops-makefiles-creation.sh
new file mode 100755
index 0000000..d708081
--- /dev/null
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Automake should stop the creation of Makefile.in files at the first
+# encountered error due to a required auxiliary file not found.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AM_PATH_PYTHON
+END
+
+echo SUBDIRS = > Makefile.am
+
+for i in 1 2 3 4 5; do
+  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
+  echo "SUBDIRS += sub$i" >> Makefile.am
+  mkdir sub$i
+  echo python_PYTHON = foo.py > sub$i/Makefile.am
+done
+
+: > sub1/Makefile.am
+
+$ACLOCAL
+
+unset AUTOMAKE_JOBS || :
+
+AUTOMAKE_fails
+ls -l Makefile.in */Makefile.in || : # For debugging.
+# Top-level Makefile.in might be created or not, we don't want to set
+# too strict semantics here, so don't check for it.  But the later
+# files shouldn't exist.
+test -f sub1/Makefile.in
+test ! -f sub2/Makefile.in
+test ! -f sub3/Makefile.in
+test ! -f sub4/Makefile.in
+test ! -f sub5/Makefile.in
+
+rm -f Makefile.in */Makefile.in
+
+: > sub2/Makefile.am
+: > sub3/Makefile.am
+
+AUTOMAKE_fails
+ls -l Makefile.in */Makefile.in || : # For debugging.
+test -f sub1/Makefile.in
+test -f sub2/Makefile.in
+test -f sub3/Makefile.in
+test ! -f sub4/Makefile.in
+test ! -f sub5/Makefile.in
+
+:
diff --git a/t/missing.sh b/t/missing.sh
new file mode 100755
index 0000000..473d041
--- /dev/null
+++ b/t/missing.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test missing with version mismatches.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+get_shell_script missing
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Make sure we do use missing, even if the user exported AUTOCONF.
+# (We cannot export this new value, because it would be used by Automake
+# when tracing, and missing is no good for this.)
+MYAUTOCONF="./missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
+$MAKE
+$sleep
+# Hopefully the install version of Autoconf cannot compete with this one...
+echo 'AC_PREREQ(9999)' >> aclocal.m4
+$MAKE distdir
+
+# Try version number suffixes if we can add them safely.
+case $MYAUTOCONF in *autoconf)
+  ./configure AUTOCONF="${MYAUTOCONF}6789"
+  $MAKE
+  $sleep
+  # Hopefully the install version of Autoconf cannot compete with this one...
+  echo 'AC_PREREQ(9999)' >> aclocal.m4
+  $MAKE distdir
+esac
+
+# Run again, but without missing, to ensure that timestamps were updated.
+export AUTOMAKE ACLOCAL
+./configure AUTOCONF="$MYAUTOCONF"
+$MAKE
+
+# Make sure $MAKE fails when timestamps aren't updated and missing is not used.
+$sleep
+touch aclocal.m4
+$MAKE && Exit 1
+
+:
diff --git a/t/missing2.sh b/t/missing2.sh
new file mode 100755
index 0000000..89e9a5d
--- /dev/null
+++ b/t/missing2.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test missing with version mismatches.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+m4_include([v.m4])
+AC_OUTPUT
+EOF
+
+: > v.m4
+
+: > Makefile.am
+
+get_shell_script missing
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# See missing.test for explanations about this.
+MYAUTOCONF="./missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
+
+$MAKE
+$sleep
+# Hopefully the install version of Autoconf cannot compete with this one...
+echo 'AC_PREREQ(9999)' > v.m4
+$MAKE distdir
+
+# Run again, but without missing, to ensure that timestamps were updated.
+export AUTOMAKE ACLOCAL
+./configure AUTOCONF="$MYAUTOCONF"
+$MAKE
+
+# Make sure $MAKE fail when timestamps aren't updated and missing is not used.
+$sleep
+touch v.m4
+$MAKE && Exit 1
+
+:
diff --git a/t/missing3.sh b/t/missing3.sh
new file mode 100755
index 0000000..a26f954
--- /dev/null
+++ b/t/missing3.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test missing when running a tool's --version.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script missing
+
+# b7cb8259 assumed not to exist.
+
+./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep . stderr && Exit 1
+./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep WARNING stderr
+
+./missing --run b7cb8259 --version && Exit 1
+./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep WARNING stderr
+
+# missing itself it known to exist :)
+
+./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep . stderr && Exit 1
+./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep WARNING stderr
+
+./missing --run ./missing --version 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep . stderr && Exit 1
+./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep WARNING stderr && Exit 1
+grep Unknown stderr
diff --git a/t/missing4.sh b/t/missing4.sh
new file mode 100755
index 0000000..01321c3
--- /dev/null
+++ b/t/missing4.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# See how well the rebuild rule handles an aclocal.m4 that was
+# generated for another version of autoconf.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >>configure.ac
+
+touch Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+sed '1,20 s/m4_defn(\[AC_AUTOCONF_VERSION\]),/9999,/' < aclocal.m4 > 
aclocal.tmp
+cmp aclocal.m4 aclocal.tmp && Exit 1
+
+mv aclocal.tmp aclocal.m4
+
+$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for' stderr
+
+$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'You have another version of autoconf' stderr && Exit 1
+grep 'aclocal.m4:.*this file was generated for' stderr && Exit 1
+
+:
diff --git a/t/missing5.sh b/t/missing5.sh
new file mode 100755
index 0000000..80bba36
--- /dev/null
+++ b/t/missing5.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test how well 'missing' finds output file names of various tools.
+# PR automake/483.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+get_shell_script missing
+
+# These programs may be invoked by 'missing'.
+needed_tools='chmod find sed test touch'
+needed_tools_csep=`echo $needed_tools | sed 's/ /, /g'`
+
+cat >configure.ac <<EOF
+AC_INIT([missing4], [1.0])
+m4_foreach([tool], [$needed_tools_csep],
+          [AC_PATH_PROG(tool, tool, [false])
+           AC_CONFIG_FILES(tool, chmod +x tool)
+          ])
+AC_OUTPUT
+EOF
+
+for tool in $needed_tools; do
+  unindent >$tool.in <<EOF
+    #! /bin/sh
+    exec @$tool@ "\$@"
+EOF
+done
+
+$AUTOCONF
+./configure
+
+echo output-file > output-file
+cp output-file my--output--file-o
+
+save_PATH=$PATH
+PATH=.
+export PATH
+missing --help
+missing --version
+for tool in autom4te help2man makeinfo; do
+  missing --run $tool -o my--output--file-o input
+  missing --run $tool --output my--output--file-o input
+done
+PATH=$save_PATH
+export PATH
+diff output-file my--output--file-o
+test ! -f ./--file-o
+test ! -f input
diff --git a/t/missing6.sh b/t/missing6.sh
new file mode 100755
index 0000000..8173f81
--- /dev/null
+++ b/t/missing6.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure autoconf version checks in aclocal.m4 are robust.
+
+am_create_testdirs=empty
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+m4_define([AC_AUTOCONF_VERSION], [9999a])
+dnl!! m4_define([a], [oops])
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for' stderr
+$AUTOMAKE -a
+./configure
+$MAKE
+
+sed 's/^dnl!! //' < configure.ac > configure.tmp
+cmp configure.ac configure.tmp && fatal_ 'failed to edit configure.ac'
+mv -f configure.tmp configure.ac
+
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'You have another version of autoconf' stderr
+grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
+
+:
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
new file mode 100755
index 0000000..6582836
--- /dev/null
+++ b/t/mkinst2.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure no-installman suppresses man dir creation.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-installman
+man_MANS = foo.1
+END
+
+: > foo.1
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure --prefix "`pwd`/sub"
+
+$MAKE installdirs
+test ! -d sub/man
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
new file mode 100755
index 0000000..fbe01c6
--- /dev/null
+++ b/t/mkinst3.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test mkinstalldirs with spaces in directory names.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+# Make sure the directory we will create can be created...
+mkdir '~a b' && mkdir '~a b/-x  y' \
+  || skip_ "directory names with spaces and metacharacters not accepted"
+rm -rf '~a b'
+
+get_shell_script mkinstalldirs
+
+# Test mkinstalldirs with the installed mkdir.
+
+./mkinstalldirs '~a b/-x  y'
+test -d '~a b/-x  y'
+rm -rf '~a b'
+
+# Trick mkinstalldirs into thinking mkdir does not support -p.
+
+mkdir bin
+cat >bin/mkdir <<'EOF'
+#!/bin/sh
+for arg
+do
+  case $arg in
+  -p) exit 1;;
+  esac
+done
+PATH=$AM_PATH
+export PATH
+exec mkdir "$@"
+EOF
+
+chmod +x bin/mkdir
+AM_PATH=$PATH
+export AM_PATH
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH
+export PATH
+
+# Test mkinstalldirs without mkdir -p.
+
+./mkinstalldirs '~a b/-x  y'
+test -d '~a b/-x  y'
+rm -rf '~a b'
+
+./mkinstalldirs "`pwd`///~a b//-x  y"
+test -d "`pwd`/~a b/-x  y"
+rm -rf '~a b'
diff --git a/t/mkinstall.sh b/t/mkinstall.sh
new file mode 100755
index 0000000..e6b3bc2
--- /dev/null
+++ b/t/mkinstall.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug where mkinstalldirs variable can be set incorrectly.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+# The "././" prefix confuses Automake into thinking it is doing a
+# subdir build.  Yes, this is hacky.
+$ACLOCAL
+$AUTOMAKE ././Makefile
+
+grep ' /mkinstalldirs' Makefile.in && Exit 1
+Exit 0
diff --git a/t/mmode.sh b/t/mmode.sh
new file mode 100755
index 0000000..6c80399
--- /dev/null
+++ b/t/mmode.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for AM_MAINTAINER_MODE defaults.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+AC_OUTPUT
+END
+
+: >Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+grep '^MAINT.*#' Makefile
+
+./configure --disable-maintainer-mode
+grep '^MAINT.*#' Makefile
+
+./configure --enable-maintainer-mode
+grep '^MAINT.*#' Makefile && Exit 1
+
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.int
+mv -f configure.int configure.ac
+mv configure configure1
+$AUTOCONF --force
+diff configure configure1
+
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.int
+mv -f configure.int configure.ac
+$AUTOCONF --force
+
+./configure
+grep '^MAINT.*#' Makefile && Exit 1
+
+./configure --enable-maintainer-mode
+grep '^MAINT.*#' Makefile && Exit 1
+
+./configure --disable-maintainer-mode
+grep '^MAINT.*#' Makefile
+
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.ac > configure.int
+mv -f configure.int configure.ac
+$AUTOCONF --force -Werror && Exit 1
+
+:
diff --git a/t/mmodely.sh b/t/mmodely.sh
new file mode 100755
index 0000000..6c61915
--- /dev/null
+++ b/t/mmodely.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Verify that intermediate files are only built from Yacc and Lex
+# sources in maintainer mode.
+# From Derek R. Price.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AM_PROG_LEX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+YACC = false
+LEX = false
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.y joe.l
+LDADD = @LEXLIB@
+END
+
+# The point of this test is that it is not dependent on a working lex
+# or yacc.
+cat > joe.c <<EOF
+int joe (int arg)
+{
+    return arg * 2;
+}
+EOF
+# On systems which link in libraries non-lazily and whose linkers
+# complain about unresolved symbols by default, such as Solaris, an
+# yylex function needs to be defined to avoid an error due to an
+# unresolved symbol.
+cat > zardoz.c <<EOF
+int joe (int arg);
+int yylex (void)
+{
+    return 0;
+}
+int main (int argc, char **argv)
+{
+    return joe (argc);
+}
+EOF
+
+# Ensure a later timestamp for our Lex & Yacc sources.
+$sleep
+: > joe.l
+: > zardoz.y
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+
+cat >myyacc.sh <<'END'
+#! /bin/sh
+echo "$@" >y.tab.c
+END
+cat >mylex.sh <<'END'
+echo "$@" >lex.yy.c
+END
+chmod +x myyacc.sh mylex.sh
+PATH="`pwd`$PATH_SEPARATOR$PATH"
+
+# "make maintainer-clean; ./configure; make" should always work,
+# per GNU Standard.
+$MAKE maintainer-clean
+./configure
+YACC="myyacc.sh" LEX="mylex.sh" \
+   LEX_OUTPUT_ROOT='lex.yy' $MAKE -e zardoz.c joe.c
+grep zardoz.y zardoz.c
+grep joe.l joe.c
diff --git a/t/multlib.sh b/t/multlib.sh
new file mode 100755
index 0000000..0295ccc
--- /dev/null
+++ b/t/multlib.sh
@@ -0,0 +1,162 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check multilib support.
+# Based on a test case from Ralf Corsepius.
+# FIXME: the features tested by this script has been moved in contrib.
+# FIXME: We should move this script accordingly.
+
+required='gcc GNUmake'
+. ./defs || Exit 1
+
+mldir=$am_top_srcdir/contrib/multilib
+mkdir m4
+cp "$mldir"/config-ml.in "$mldir"/symlink-tree .
+cp "$mldir"/multi.m4 m4
+
+ACLOCAL_PATH=${ACLOCAL_PATH+"$ACLOCAL_PATH:"}`pwd`/m4
+export ACLOCAL_PATH
+
+cat >configure.ac <<'END'
+AC_INIT([multlib], [1.0])
+AC_CONFIG_SRCDIR(libfoo/foo.c)
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_SUBDIRS(libfoo)
+AC_CONFIG_SUBDIRS(libbar)
+AC_OUTPUT
+END
+
+cat >mycc <<'END'
+#! /bin/sh
+case ${1+"$@"} in
+ *-print-multi-lib*)
+  echo ".;"
+  echo "debug;@g"
+  exit 0 ;;
+esac
+gcc ${1+"$@"}
+END
+
+chmod +x mycc
+PATH=`pwd`$PATH_SEPARATOR$PATH
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = @subdirs@
+EXTRA_DIST = config-ml.in symlink-tree
+check-all:
+       test -f debug/libfoo/libfoo.a
+       test -f debug/libbar/libbar.a
+       test -f libfoo/libfoo.a
+       test -f libbar/libbar.a
+EOF
+
+# libfoo tests multilib supports when there are no subdirectories
+# libbar tests multilib supports when there are subdirectories
+
+mkdir libfoo
+cp "$mldir"/multilib.am libfoo/
+
+cat >libfoo/configure.ac <<'END'
+AC_PREREQ(2.57)
+AC_INIT(libfoo, 0.1, address@hidden)
+AC_CONFIG_SRCDIR(foo.c)
+# Apparently it doesn't work to have auxdir=.. when
+# multilib uses symlinked trees.
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_ENABLE_MULTILIB(Makefile,[..])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat >libfoo/Makefile.am <<'END'
+noinst_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+include $(top_srcdir)/multilib.am
+END
+
+: > libfoo/foo.c
+
+mkdir libbar
+cp "$mldir"/multilib.am libbar/
+
+cat >libbar/configure.ac <<'END'
+AC_PREREQ(2.57)
+AC_INIT(libbar, 0.1, address@hidden)
+# Apparently it doesn't work to have auxdir=.. when
+# multilib uses symlinked trees.
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_ENABLE_MULTILIB(Makefile,[..])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+
+cat >libbar/Makefile.am <<'END'
+SUBDIRS = sub
+noinst_LIBRARIES = libbar.a
+libbar_a_SOURCES = bar.c
+include $(top_srcdir)/multilib.am
+END
+
+mkdir libbar/sub
+echo 'include $(top_srcdir)/multilib.am' >libbar/sub/Makefile.am
+: > libbar/bar.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+cd libfoo
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+cd ..
+
+cd libbar
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+cd ..
+
+# Check VPATH builds
+mkdir build
+cd build
+../configure --enable-multilib CC=mycc
+$MAKE
+test -f debug/libfoo/libfoo.a
+test -f debug/libbar/libbar.a
+test -f libfoo/libfoo.a
+test -f libbar/libbar.a
+$MAKE install
+$MAKE distcleancheck
+
+# Check standard builds.
+cd ..
+# Why to I have to specify --with-target-subdir?
+./configure --enable-multilib --with-target-subdir=. CC=mycc
+$MAKE check
+DISTCHECK_CONFIGURE_FLAGS='--enable-multilib CC=mycc' $MAKE distcheck
+
+:
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
new file mode 100755
index 0000000..1742dc4
--- /dev/null
+++ b/t/no-extra-makefile-code.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we don't emit harmless but useless code in the generated
+# Makefile.in when the project does not use compiled languages.  Motivated
+# by a regression caused by removal of automatic de-ANSI-fication support:
+# <http://lists.gnu.org/archive/html/automake-patches/2011-08/msg00200.html>
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+: > Makefile.am
+
+rm -f depcomp compile
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP 'DEFAULT_INCLUDES|@am__isrc@|-compile|\$\(OBJEXT\)|tab\.[ch]' \
+  Makefile.in && Exit 1
+
+:
diff --git a/t/no-outdir-option.sh b/t/no-outdir-option.sh
new file mode 100755
index 0000000..6212534
--- /dev/null
+++ b/t/no-outdir-option.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the '-o' aka '--output-dir' option is not recognized anymore.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+AUTOMAKE_fails -Wno-error --output-dir=foo
+grep 'unrecognized option.*--output-dir' stderr
+
+AUTOMAKE_fails -Wno-error -o foo
+grep 'unrecognized option.*-o' stderr
+
+:
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
new file mode 100755
index 0000000..38008cd
--- /dev/null
+++ b/t/nobase-libtool.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure nobase_* works for libtool libraries and programs as well.
+# This is just the libtool equivalent of nobase.test, split
+# up for greater exposure of nobase.test.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+fooexecdir = $(prefix)/foo
+fooexec_LTLIBRARIES = sub/libbase.la
+nobase_fooexec_LTLIBRARIES = sub/libnobase.la
+fooexec_PROGRAMS = sub/base
+nobase_fooexec_PROGRAMS = sub/nobase
+sub_libbase_la_SOURCES = source2.c
+sub_libnobase_la_SOURCES = source2.c
+sub_base_SOURCES = source.c
+sub_nobase_SOURCES = source.c
+
+test-install-data: install-data
+       test ! -f inst/foo/sub/libnobase.la
+       test ! -f inst/foo/libbase.la
+
+test-install-exec: install-exec
+       test   -f inst/foo/sub/libnobase.la
+       test ! -f inst/foo/libnobase.la
+       test   -f inst/foo/libbase.la
+
+.PHONY: test-install-exec test-install-data
+EOF
+
+mkdir sub
+
+cat >source.c <<'EOF'
+int
+main (int argc, char *argv[])
+{
+  return 0;
+}
+EOF
+cp source.c source2.c
+
+rm -f install-sh
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a --copy
+./configure --prefix "`pwd`/inst" --program-prefix=p
+
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+
+test `find inst/foo -type f -print | wc -l` = 0
+
+$MAKE install-strip
+
+# Likewise, in a VPATH build.
+
+$MAKE uninstall
+$MAKE distclean
+mkdir build
+cd build
+../configure --prefix "`pwd`/inst" --program-prefix=p
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+test `find inst/foo -type f -print | wc -l` = 0
+
+:
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
new file mode 100755
index 0000000..54b940b
--- /dev/null
+++ b/t/nobase-nodist.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Interaction of 'nobase_' and 'nodist_' prefixes.
+
+. ./defs || Exit 1
+
+# Simulate no emacs and no python (it shouldn't be needed in this test).
+EMACS="no" PYTHON=":"; export EMCAS PYTHON
+
+cat >> configure.ac << 'END'
+AM_PATH_LISPDIR
+AM_PATH_PYTHON([], [], [:])
+# Simulate no javac (it shouldn't be needed in this test).
+AC_SUBST([JAVAC], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+nobase_nodist_noinst_PYTHON = baz1.py sub/baz2.py
+# Lisp and Java sources are not distributed by default, so try both
+# with and without the 'nodist_' prefix, for more coverage.
+nobase_noinst_LISP = foo1.el sub/foo2.el
+nobase_nodist_noinst_LISP = foo3.el sub/foo4.el
+nobase_noinst_JAVA = bar1.java sub/bar2.java
+nobase_nodist_noinst_JAVA = bar3.java sub/bar4.java
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE distdir
+
+ls -l $distdir $distdir/* # For debugging.
+test ! -f $distdir/foo1.el
+test ! -f $distdir/sub/foo2.el
+test ! -f $distdir/foo3.el
+test ! -f $distdir/sub/foo4.el
+test ! -f $distdir/bar1.java
+test ! -f $distdir/sub/bar2.java
+test ! -f $distdir/bar3.java
+test ! -f $distdir/sub/bar4.java
+test ! -f $distdir/baz1.py
+test ! -f $distdir/sub/baz2.py
+
+:
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
new file mode 100755
index 0000000..2850901
--- /dev/null
+++ b/t/nobase-python.sh
@@ -0,0 +1,79 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure nobase_* works for python files.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'END'
+mydir=$(prefix)/my
+my_PYTHON = one.py sub/base.py
+nobase_my_PYTHON = two.py sub/nobase.py
+
+test-install-data: install-data
+       find inst -print; : For debugging.
+       test   -f inst/my/one.py
+       test   -f inst/my/one.pyc
+       test   -f inst/my/two.py
+       test   -f inst/my/two.pyc
+       test   -f inst/my/base.py
+       test   -f inst/my/base.pyc
+       test   -f inst/my/sub/nobase.py
+       test   -f inst/my/sub/nobase.pyc
+       test ! -f inst/my/nobase.py
+       test ! -f inst/my/nobase.pyc
+END
+
+mkdir sub
+
+for file in one.py sub/base.py two.py sub/nobase.py
+do
+  echo 'def one(): return 1' >$file
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure --prefix "`pwd`/inst" --program-prefix=p
+
+$MAKE
+$MAKE test-install-data
+$MAKE uninstall
+
+find inst/my -type f -print | grep . && Exit 1
+
+$MAKE install-strip
+
+# Likewise, in a VPATH build.
+
+$MAKE uninstall
+$MAKE distclean
+mkdir build
+cd build
+../configure --prefix "`pwd`/inst" --program-prefix=p
+$MAKE
+$MAKE test-install-data
+$MAKE uninstall
+find inst/my -type f -print | grep . && Exit 1
+
+:
diff --git a/t/nobase.sh b/t/nobase.sh
new file mode 100755
index 0000000..e7661c0
--- /dev/null
+++ b/t/nobase.sh
@@ -0,0 +1,147 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure nobase_* works.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+foodir = $(prefix)/foo
+fooexecdir = $(prefix)/foo
+
+foo_HEADERS = sub/base.h sub/base-gen.h
+nobase_foo_HEADERS = sub/nobase.h sub/nobase-gen.h
+
+dist_foo_DATA = sub/base.dat sub/base-gen.dat
+nobase_dist_foo_DATA = sub/nobase.dat sub/nobase-gen.dat
+
+dist_fooexec_SCRIPTS = sub/base.sh sub/base-gen.sh
+nobase_dist_fooexec_SCRIPTS = sub/nobase.sh sub/nobase-gen.sh
+
+fooexec_PROGRAMS = sub/base
+nobase_fooexec_PROGRAMS = sub/nobase
+sub_base_SOURCES = source.c
+sub_nobase_SOURCES = source.c
+
+fooexec_LIBRARIES = sub/libbase.a
+nobase_fooexec_LIBRARIES = sub/libnobase.a
+sub_libbase_a_SOURCES = source.c
+sub_libnobase_a_SOURCES = source.c
+
+generated_files = sub/base-gen.h sub/nobase-gen.h sub/base-gen.dat \
+sub/nobase-gen.dat sub/base-gen.sh sub/nobase-gen.sh
+
+$(generated_files):
+       $(MKDIR_P) sub
+       echo "generated file $@" > $@
+
+CLEANFILES = $(generated_files)
+
+test-install-data: install-data
+       test   -f inst/foo/sub/nobase.h
+       test ! -f inst/foo/nobase.h
+       test   -f inst/foo/sub/nobase-gen.h
+       test ! -f inst/foo/nobase-gen.h
+       test   -f inst/foo/base.h
+       test   -f inst/foo/base-gen.h
+       test   -f inst/foo/sub/nobase.dat
+       test ! -f inst/foo/nobase.dat
+       test   -f inst/foo/sub/nobase-gen.dat
+       test ! -f inst/foo/nobase-gen.dat
+       test   -f inst/foo/base.dat
+       test   -f inst/foo/base-gen.dat
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/sub/pnobase-gen.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/pbase-gen.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libbase.a
+
+test-install-exec: install-exec
+       test   -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pnobase.sh
+       test   -f inst/foo/sub/pnobase-gen.sh
+       test ! -f inst/foo/pnobase-gen.sh
+       test   -f inst/foo/pbase.sh
+       test   -f inst/foo/pbase-gen.sh
+       test   -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pnobase$(EXEEXT)
+       test   -f inst/foo/pbase$(EXEEXT)
+       test   -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libnobase.a
+       test   -f inst/foo/libbase.a
+
+.PHONY: test-install-exec test-install-data
+EOF
+
+mkdir sub
+
+: > sub/base.h
+: > sub/nobase.h
+: > sub/base.dat
+: > sub/nobase.dat
+: > sub/base.sh
+: > sub/nobase.sh
+
+cat >source.c <<'EOF'
+int
+main (int argc, char *argv[])
+{
+  return 0;
+}
+EOF
+cp source.c source2.c
+
+rm -f install-sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a --copy
+./configure --prefix "`pwd`/inst" --program-prefix=p
+
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+
+test `find inst/foo -type f -print | wc -l` = 0
+
+$MAKE install-strip
+
+# Likewise, in a VPATH build.
+
+$MAKE uninstall
+$MAKE distclean
+mkdir build
+cd build
+../configure --prefix "`pwd`/inst" --program-prefix=p
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+test `find inst/foo -type f -print | wc -l` = 0
+
+:
diff --git a/t/nodef.sh b/t/nodef.sh
new file mode 100755
index 0000000..3c55745
--- /dev/null
+++ b/t/nodef.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
+
+. ./defs || Exit 1
+
+# -------------------------------------------------------------------
+# Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE
+# forms.  The day these obsolete AC_INIT and AM_INIT_AUTOMAKE forms
+# are dropped, just erase the file.
+# nodef2.test contains the modern version of this test.
+# -------------------------------------------------------------------
+
+# First, check that PACKAGE and VERSION are output by default.
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
+AC_OUTPUT(output)
+END
+
+echo 'DEFS = @DEFS@' > output.in
+
+$ACLOCAL
+$AUTOCONF
+./configure
+
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output
+
+# Then, check that PACKAGE and VERSION are not output if requested.
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN], [no])
+AC_OUTPUT(output)
+END
+
+$ACLOCAL
+$AUTOCONF
+./configure
+
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
+
+:
diff --git a/t/nodef2.sh b/t/nodef2.sh
new file mode 100755
index 0000000..1af7b0d
--- /dev/null
+++ b/t/nodef2.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
+
+. ./defs || Exit 1
+
+# First, check that PACKAGE and VERSION are output by default.
+
+cat > configure.ac << 'END'
+AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
+AM_INIT_AUTOMAKE
+AC_OUTPUT(output)
+END
+
+echo 'DEFS = @DEFS@' > output.in
+
+$ACLOCAL
+$AUTOCONF
+./configure
+
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output
+
+# Then, check that PACKAGE and VERSION are not output if requested.
+
+cat > configure.ac << 'END'
+AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
+AM_INIT_AUTOMAKE([no-define])
+AC_OUTPUT(output Makefile)
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE # Dummy call to make sure Automake grok 'no-define' silently.
+./configure
+
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
+
+:
diff --git a/t/nodep.sh b/t/nodep.sh
new file mode 100755
index 0000000..5dcad1c
--- /dev/null
+++ b/t/nodep.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure no-dependencies option does the right thing.
+# Bug report from Greg A. Woods.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = y.c
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+mkdir x
+
+: > y.c
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '%' Makefile.in && Exit 1
+Exit 0
diff --git a/t/nodep2.sh b/t/nodep2.sh
new file mode 100755
index 0000000..edf0fa9
--- /dev/null
+++ b/t/nodep2.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another test to make sure no-dependencies option does the right thing.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = a.c b.cpp c.m d.S e.java f.upc
+END
+
+cat > configure.ac << 'END'
+AC_INIT([nodep2], [1], address@hidden)
+AM_INIT_AUTOMAKE([no-dependencies])
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_OBJC
+AM_PROG_AS
+AM_PROG_GCJ
+AM_PROG_UPC
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep DEPMODE Makefile.in && Exit 1
+
+:
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
new file mode 100755
index 0000000..4691efa
--- /dev/null
+++ b/t/nodepcomp.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure depcomp isn't always required.
+
+. ./defs || Exit 1
+
+rm -f depcomp
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/nodist.sh b/t/nodist.sh
new file mode 100755
index 0000000..92cc2f7
--- /dev/null
+++ b/t/nodist.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dist_*_SOURCES and nodist_*_SOURCES work.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = eyeball
+
+eyeball_SOURCES = a.c
+nodist_eyeball_SOURCES = b.c
+dist_eyeball_SOURCES = c.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^am_eyeball_OBJECTS' Makefile.in
+grep '^DIST_SOURCES =' Makefile.in
+grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1
+
+:
diff --git a/t/nodist2.sh b/t/nodist2.sh
new file mode 100755
index 0000000..36851be
--- /dev/null
+++ b/t/nodist2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure nodist_noinst_HEADERS work.
+# For PR 249.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+nodist_noinst_HEADERS = baz.h
+EOF
+
+: > baz.h
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure --prefix "`pwd`/install"
+$MAKE install-data
+
+:
diff --git a/t/nodist3.sh b/t/nodist3.sh
new file mode 100755
index 0000000..23becc1
--- /dev/null
+++ b/t/nodist3.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure no-dist option works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dist
+bin_PROGRAMS = eyeball
+eyeball_SOURCES = a.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^dist:' Makefile.in && Exit 1
+grep '^DIST_SOURCES =' Makefile.in && Exit 1
+
+:
diff --git a/t/noinst.sh b/t/noinst.sh
new file mode 100755
index 0000000..887c7a7
--- /dev/null
+++ b/t/noinst.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure "make install" will build all in directory with
+# nothing to install.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+all-local:
+       exit 1
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^install[-a-z]*:.* all' Makefile.in
+
+:
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
new file mode 100755
index 0000000..39abdc7
--- /dev/null
+++ b/t/noinstdir.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that noinst_* and check_* are not installed.
+# From Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+noinst_SCRIPTS = foo.sh
+noinst_DATA = foo.xpm
+noinst_LIBRARIES = libfoo.a
+noinst_PROGRAMS = foo
+noinst_HEADERS = foo.h
+check_SCRIPTS = bar.sh
+check_DATA = bar.xpm
+check_LIBRARIES = libbar.a
+check_PROGRAMS = bar
+check_HEADERS = bar.h
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'noinstdir' Makefile.in && Exit 1
+grep 'checkdir' Makefile.in && Exit 1
+
+:
diff --git a/t/nolink.sh b/t/nolink.sh
new file mode 100755
index 0000000..dea6271
--- /dev/null
+++ b/t/nolink.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake does not emit a link rule for unknown languages.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-exeext
+
+bin_PROGRAMS = meal
+meal_SOURCES = beans.veg beef.meat
+
+meal: beans.veg beef.meat
+       cat beans.veg beef.meat > meal
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+
+grep '^meal.*:' Makefile.in | grep -v beef.meat && Exit 1
+
+Exit 0
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
new file mode 100755
index 0000000..8b780a6
--- /dev/null
+++ b/t/nostdinc.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure nostdinc option works correctly.
+
+# We don't require a C compiler explicitly, because the first part of the
+# test (where 'Makefile.in' is grepped) does not require one.  Insted, we
+# just skip the rest of the test if configure fails to find a working C
+# compiler.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = nostdinc
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP '(-I *\.|-I.*srcdir|am__isrc)' Makefile.in && Exit 1
+
+# We'll test the fully-processed Makefile too.
+$AUTOCONF
+
+# Test with $builddir != $srcdir
+mkdir build
+cd build
+../configure || Exit $?
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+
+# Test with $builddir = $srcdir
+cd ..
+./configure || Exit $?
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+
+Exit 0
diff --git a/t/notrans.sh b/t/notrans.sh
new file mode 100755
index 0000000..487b66f
--- /dev/null
+++ b/t/notrans.sh
@@ -0,0 +1,131 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check all notrans_, dist_, nodist_ prefix combinations for MANS
+# primary and install-man dependencies.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'EOF'
+man_MANS = foo.1 foo2.1
+dist_man_MANS = bar.2 bar2.2
+nodist_man_MANS = baz.3 baz2.3
+notrans_man_MANS = x-foo.4 x-foo2.4
+notrans_dist_man_MANS = x-bar.5 x-bar2.5
+notrans_nodist_man_MANS = x-baz.6 x-baz2.6
+man7_MANS = y-foo.man y-foo2.man
+dist_man5_MANS = y-bar.man y-bar2.man
+nodist_man4_MANS = y-baz.man y-baz2.man
+notrans_man3_MANS = z-foo.man z-foo2.man
+notrans_dist_man2_MANS = z-bar.man z-bar2.man
+notrans_nodist_man1_MANS = z-baz.man z-baz2.man
+
+# These two are ignored.
+dist_notrans_man_MANS = nosuch.8
+nodist_notrans_man9_MANS = nosuch.man
+
+y-foo.man y-foo2.man:
+       : >$@
+y-bar.man y-bar2.man:
+       : >$@
+y-baz.man y-baz2.man:
+       : >$@
+z-foo.man z-foo2.man:
+       : >$@
+z-bar.man z-bar2.man:
+       : >$@
+z-baz.man z-baz2.man:
+       : >$@
+
+test-install: install
+       test -f inst/man/man1/gnu-foo.1
+       test -f inst/man/man1/gnu-foo2.1
+       test -f inst/man/man2/gnu-bar.2
+       test -f inst/man/man2/gnu-bar2.2
+       test -f inst/man/man3/gnu-baz.3
+       test -f inst/man/man3/gnu-baz2.3
+       test -f inst/man/man4/x-foo.4
+       test -f inst/man/man4/x-foo2.4
+       test -f inst/man/man5/x-bar.5
+       test -f inst/man/man5/x-bar2.5
+       test -f inst/man/man6/x-baz.6
+       test -f inst/man/man6/x-baz2.6
+       test -f inst/man/man7/gnu-y-foo.7
+       test -f inst/man/man7/gnu-y-foo2.7
+       test -f inst/man/man5/gnu-y-bar.5
+       test -f inst/man/man5/gnu-y-bar2.5
+       test -f inst/man/man4/gnu-y-baz.4
+       test -f inst/man/man4/gnu-y-baz2.4
+       test -f inst/man/man3/z-foo.3
+       test -f inst/man/man3/z-foo2.3
+       test -f inst/man/man2/z-bar.2
+       test -f inst/man/man2/z-bar2.2
+       test -f inst/man/man1/z-baz.1
+       test -f inst/man/man1/z-baz2.1
+       if test -d inst/man/man8; then (exit 1); else :; fi
+       if test -d inst/man/man9; then (exit 1); else :; fi
+EOF
+
+: > foo.1
+: > foo2.1
+: > bar.2
+: > bar2.2
+: > baz.3
+: > baz2.3
+: > x-foo.4
+: > x-foo2.4
+: > x-bar.5
+: > x-bar2.5
+: > x-baz.6
+: > x-baz2.6
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+grep '^install-man1:' Makefile.in | grep '\$(man_MANS)'
+grep '^install-man2:' Makefile.in | grep '\$(dist_man_MANS)'
+grep '^install-man3:' Makefile.in | grep '\$(nodist_man_MANS)'
+grep '^install-man4:' Makefile.in | grep '\$(notrans_man_MANS)'
+grep '^install-man5:' Makefile.in | grep '\$(notrans_dist_man_MANS)'
+grep '^install-man6:' Makefile.in | grep '\$(notrans_nodist_man_MANS)'
+
+if grep '^install-man8:' Makefile.in; then Exit 1; else :; fi
+if grep '^install-man9:' Makefile.in; then Exit 1; else :; fi
+
+./configure --program-prefix=gnu- --prefix "`pwd`"/inst --mandir 
"`pwd`"/inst/man
+$MAKE
+$MAKE test-install
+test `find inst/man -type f -print | wc -l` = 24
+$MAKE uninstall
+test `find inst/man -type f -print | wc -l` = 0
+
+# Opportunistically test for installdirs.
+rm -rf inst
+$MAKE installdirs
+test -d inst/man/man1
+test -d inst/man/man2
+test -d inst/man/man3
+test -d inst/man/man4
+test -d inst/man/man5
+test -d inst/man/man6
+test -d inst/man/man7
+if test -d inst/man/man8; then Exit 1; else :; fi
+if test -d inst/man/man9; then Exit 1; else :; fi
diff --git a/t/number.sh b/t/number.sh
new file mode 100755
index 0000000..b96e118
--- /dev/null
+++ b/t/number.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure _OBJECTS only generated once.  Bug reported by
+# Joerg-Martin Schwarz.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^zardoz_OBJECTS' Makefile.in
+count=`grep -c '^zardoz_OBJECTS' Makefile.in`
+test $count -eq 1
+
+:
diff --git a/t/objc.sh b/t/objc.sh
new file mode 100755
index 0000000..f56c76d
--- /dev/null
+++ b/t/objc.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that '.m' extension works.
+# From Ralf Corsepius (for C++).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_OBJC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.m
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^\.SUFFIXES:.*\.m' Makefile.in
+
+:
diff --git a/t/objc2.sh b/t/objc2.sh
new file mode 100755
index 0000000..290bf26
--- /dev/null
+++ b/t/objc2.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that Automake suggests using AC_PROG_OBJC if Objective C sources
+# are used.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >>configure.ac
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.m
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AC_PROG_OBJC stderr
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
new file mode 100755
index 0000000..2fe2dfd
--- /dev/null
+++ b/t/objext-pr10128.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for automake bug#10128: $(OBJEXT) redefinition causes
+# $(foo_OBJECTS) to be defined as empty.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+LINK = echo >$@ Linked $@ from
+OBJEXT = fasl
+EXEEXT =
+
+noinst_PROGRAMS = foo zardoz
+foo_SOURCES = foo.lisp
+zardoz_SOURCES = mu1.lisp mu2.lisp
+
+## Un-commenting this is enough to make the test pass.  Weird!
+##.lisp.o:
+
+.lisp.fasl:
+       touch $@
+
+.PHONY: test
+test:
+       is $(foo_OBJECTS) == foo.fasl
+       is $(zardoz_OBJECTS) == mu1.fasl mu2.fasl
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE test
+touch foo.lisp mu1.lisp mu2.lisp
+$MAKE all
+cat foo
+cat zardoz
+test "`cat foo`"    = "Linked foo from foo.fasl"
+test "`cat zardoz`" = "Linked zardoz from mu1.fasl mu2.fasl"
+
+:
diff --git a/t/obsolete.sh b/t/obsolete.sh
new file mode 100755
index 0000000..c4240c2
--- /dev/null
+++ b/t/obsolete.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure obsolete macros can be autoupdated.
+
+# We need the following indirection in case someone exported e.g.
+# AUTOUPDATE='autoupdate --verbose'.
+set x ${AUTOUPDATE-autoupdate}
+required=$2
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+END
+
+$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
+  "$am_automake_acdir/obsolete.m4" > obs
+cat obs >> configure.ac
+$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
+$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2
+echo : >> obs.1 # Since it will be sourced, it must end with a success.
+echo : >> obs.2 # Likewise.
+
+cat configure.ac # For debugging.
+cat obs.1        # Likewise.
+cat obs.2        # Likewise.
+
+# Sanity check.  Make sure we have added something to configure.ac.
+test `wc -l <configure.ac` -gt 1
+
+$ACLOCAL
+
+# Expect Autoconf to complain about each of the macros in obs.
+$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; }
+cat output
+. ./obs.1
+# Make sure Autoupdate remove each of these macros.
+$AUTOUPDATE
+. ./obs.2
+
+# Autoconf should be able to grok the updated configure.ac.
+$AUTOCONF
+
+:
diff --git a/t/oldvars.sh b/t/oldvars.sh
new file mode 100755
index 0000000..87d9cf1
--- /dev/null
+++ b/t/oldvars.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Use of these variables is deprecated:
+# LISP, HEADERS, DATA, SCRIPTS, LTLIBRARIES, LIBRARIES, PROGRAMS, MANS.
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<\EOF
+DATA =
+HEADERS =
+LIBRARIES =
+LISP =
+LTLIBRARIES =
+MANS =
+PROGRAMS =
+SCRIPTS =
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+test `grep -c anachronism stderr` -eq 8
diff --git a/t/order.sh b/t/order.sh
new file mode 100755
index 0000000..2383403
--- /dev/null
+++ b/t/order.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure AC_DEFUN is handled correctly.  This test isn't named very
+# well.  Report from Jim Meyering.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+jm_TEST
+FOO
+END
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([jm_TEST])
+AC_DEFUN([FOO], [AC_REQUIRE([jm_TEST])])
+END
+
+$ACLOCAL
diff --git a/t/output-order.sh b/t/output-order.sh
new file mode 100755
index 0000000..879b678
--- /dev/null
+++ b/t/output-order.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that 'automake -a' output order is stable.
+# From report by Bruno Haible.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+: >Makefile.am
+: >AUTHORS
+: >ChangeLog
+: >NEWS
+: >README
+
+cat >.autom4te.cfg <<'END'
+begin-language: "Autoconf"
+args: --no-cache
+end-language: "Autoconf"
+begin-language: "Autoconf-without-aclocal-m4"
+args: --no-cache
+end-language: "Autoconf-without-aclocal-m4"
+END
+
+$ACLOCAL
+$AUTOCONF
+rm -f missing install-sh
+$AUTOMAKE --add-missing --copy 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+for i in 1 2 3 4 5 6; do
+  rm -f missing install-sh INSTALL COPYING
+  # The grep prevents a Heisenbug with the HP-UX shell and VERBOSE=yes.
+  $AUTOMAKE --add-missing --copy 2>&1 >/dev/null |
+  grep -v /dev/null |
+  diff - stderr
+done
diff --git a/t/output.sh b/t/output.sh
new file mode 100755
index 0000000..faf877b
--- /dev/null
+++ b/t/output.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure files listed in AC_OUTPUT are found.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([Makefile frob/zardoz])
+END
+
+: > Makefile.am
+
+mkdir frob
+: > frob/zardoz.in
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/output10.sh b/t/output10.sh
new file mode 100755
index 0000000..92492f6
--- /dev/null
+++ b/t/output10.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
+# This is comparable to output9.test, but testing Makefile rules.
+# PR/411
+
+. ./defs || Exit 1
+
+cat >> configure.ac << END
+AC_SUBST([FOO], [top])
+AC_SUBST([BAR], [bot])
+AC_CONFIG_FILES([a/top])
+AC_CONFIG_FILES([a/bot])
+AC_CONFIG_FILES([b/Makefile:a/top:b/Makefile.in:a/bot])
+AC_OUTPUT
+END
+
+mkdir a
+mkdir b
+
+cat >Makefile.am <<\EOF
+SUBDIRS = b
+dist-hook:
+       test ! -f $(distdir)/a/top
+       test ! -f $(distdir)/a/bot
+EOF
+
+cat >b/Makefile.am <<\EOF
+output:
+       echo $(TOP)$(BOT) > ok
+EOF
+
+echo address@hidden@ >a/top.in
+echo address@hidden@ >a/bot.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+mkdir build
+cd build
+../configure
+cd b
+$MAKE output
+grep topbot ok
+cd ..
+$MAKE distcheck
diff --git a/t/output11.sh b/t/output11.sh
new file mode 100755
index 0000000..4413f97
--- /dev/null
+++ b/t/output11.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure an AC_CONFIG_FILES ignore filenames with shell variables.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << \END
+AC_SUBST([FOO], [foo])
+file1=this.in
+echo @FOO@ >$file1
+file2=that
+file3=mumble
+file4=foo
+AC_CONFIG_FILES([this:$file1],, [file1=$file1])
+AC_CONFIG_FILES([sub/this:$file1])
+AC_CONFIG_FILES([${file2}:this],, [file2=$file2])
+AC_CONFIG_FILES([$file3],, [file3=$file3])
+AC_CONFIG_FILES([$file4:foo.in],, [file4=$file4])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<\EOF
+SUBDIRS = sub
+EXTRA_DIST = mumble.in
+DISTCLEANFILES = this.in that mumble foo
+dist-hook:
+       test -f $(distdir)/foo.in
+       test ! -f $(distdir)/this
+EOF
+
+echo @FOO@ >mumble.in
+echo @FOO@ >foo.in
+: >sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+$FGREP ' $file' Makefile.in sub/Makefile.in && Exit 1
+
+./configure
+$MAKE distcheck
+cd sub
+rm -f this
+$MAKE this
+grep foo this
diff --git a/t/output12.sh b/t/output12.sh
new file mode 100755
index 0000000..a3693cc
--- /dev/null
+++ b/t/output12.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << \END
+AC_SUBST([FOO], [foo])
+AC_SUBST([file1], [this.in])
+echo @FOO@ >$file1
+AC_SUBST([file2], [that])
+AC_SUBST([file3], [mumble])
+AC_SUBST([file4], [foo])
+AC_CONFIG_FILES([this:$file1],, [file1=$file1])
+AC_CONFIG_FILES([sub/this:$file1])
+AC_CONFIG_FILES([${file2}:this],, [file2=$file2])
+AC_CONFIG_FILES([${file3}],, [file3=$file3])
+AC_CONFIG_FILES([${file4}:foo.in],, [file4=$file4])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat >Makefile.am <<\EOF
+SUBDIRS = sub
+DISTCLEANFILES = $(file1)
+dist-hook:
+       test -f $(distdir)/foo.in
+       test ! -f $(distdir)/this
+EOF
+
+echo @FOO@ >mumble.in
+echo @FOO@ >foo.in
+: >sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distcheck
+cd sub
+rm -f this
+$MAKE this
+grep foo this
diff --git a/t/output13.sh b/t/output13.sh
new file mode 100755
index 0000000..065bdb5
--- /dev/null
+++ b/t/output13.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure an AC_CONFIG_FILES, AC_CONFIG_LINKS, and AC_CONFIG_COMMANDS
+# are not prerequisites of 'all'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << \END
+AC_SUBST([FOO], [foo])
+if $create; then
+  AC_CONFIG_FILES([file])
+  AC_CONFIG_LINKS([link:input])
+  AC_CONFIG_COMMANDS([stamp], [echo stamp > stamp])
+fi
+AC_OUTPUT
+END
+
+: >Makefile.am
+
+echo link > input
+echo @FOO@ >file.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure create=false
+$MAKE
+test ! -f file
+test ! -f link
+test ! -f stamp
+
+./configure create=:
+test -f file
+test -f link
+test -f stamp
diff --git a/t/output2.sh b/t/output2.sh
new file mode 100755
index 0000000..41c81bf
--- /dev/null
+++ b/t/output2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another AC_OUTPUT test.  From report by Ulrich Drepper.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([Makefile intl/intlh.inst po/Makefile.in misc/gettextize])
+END
+
+: > Makefile.am
+
+mkdir intl po misc
+: > intl/intlh.inst.in
+: > po/Makefile.in.am
+: > misc/gettextize.in
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^gettextize' Makefile.in && Exit 1
+Exit 0
diff --git a/t/output3.sh b/t/output3.sh
new file mode 100755
index 0000000..dd7aaef
--- /dev/null
+++ b/t/output3.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Yet another AC_OUTPUT test.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([Makefile
+tests/Makefile tests/defs],
+[blah])
+END
+
+: > Makefile.am
+
+mkdir tests
+: > tests/Makefile.am
+: > tests/defs.in
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/output4.sh b/t/output4.sh
new file mode 100755
index 0000000..fa6a95e
--- /dev/null
+++ b/t/output4.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# It's hard to believe there are so many AC_OUTPUT-related bugs.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_OUTPUT([tests/Makefile tests/defs])
+END
+
+mkdir tests
+: > tests/defs.in
+: > tests/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep tests/defs.in tests/Makefile.in && Exit 1
+Exit 0
diff --git a/t/output5.sh b/t/output5.sh
new file mode 100755
index 0000000..8bf9403
--- /dev/null
+++ b/t/output5.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake complains when there is no Makefile specified.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([foo], [bar], [baz])
+AM_INIT_AUTOMAKE
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'AC_CONFIG_FILES(.Makefile.)' stderr
diff --git a/t/output6.sh b/t/output6.sh
new file mode 100755
index 0000000..b55f5e3
--- /dev/null
+++ b/t/output6.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for support for colon-separated input files in AC_CONFIG_FILES.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([foo:a.in:b.in:c.in:d.in])
+AC_OUTPUT
+END
+
+cat >a.in <<'EOF'
+a = A
+b = A
+c = A
+d = A
+EOF
+
+cat >b.in <<'EOF'
+b = B
+c = B
+d = B
+EOF
+
+cat >c.am <<'EOF'
+c = C
+d = C
+
+.PHONY: test1 test2
+test1:
+       test $(a)$(b)$(c)$(d) = ABCD
+test2:
+       test $(a)$(b)$(c)$(d) = GFCD
+EOF
+
+echo 'd = D' > d.in
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE -f foo test1
+
+$sleep
+cat >b.in <<'EOF'
+a = G
+b = F
+c = F
+d = F
+EOF
+
+using_gmake || $MAKE -f foo
+$MAKE -f foo test2
+
+:
diff --git a/t/output7.sh b/t/output7.sh
new file mode 100755
index 0000000..0f4725f
--- /dev/null
+++ b/t/output7.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for support for colon separated input files in AC_CONFIG_FILES,
+# with sources in sub directories.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([
+  Makefile:mk/toplevel.in
+  sub/Makefile:mk/sub.in
+  mk/Makefile
+])
+AC_OUTPUT
+END
+
+mkdir mk sub
+cat >mk/Makefile.am <<'EOF'
+all-local:
+       @echo in--mk
+EOF
+
+cat >mk/sub.am <<'EOF'
+EXTRA_DIST = foo
+all-local:
+       @echo in--sub
+EOF
+
+cat >mk/toplevel.am <<'EOF'
+all-local:
+       @echo at--toplevel
+SUBDIRS = mk sub
+EOF
+
+# We have to distribute something in foo, because some versions
+# of tar do not archive empty directories when passed the 'o'
+# flags.  (This was fixed in GNU tar 1.12, but older
+# versions are still used: NetBSD 1.6.1 ships with tar 1.11.2).
+#
+# If sub/ is missing from the archive, config.status will fail
+# to compute $ac_abs_srcdir during a VPATH build: config.status
+# is able to create sub/ in the build tree, but it assumes the
+# directory already exists in the source tree.
+echo bar > sub/foo
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE >output
+cat output
+grep in--mk output
+grep in--sub output
+grep at--toplevel output
+
+$MAKE distcheck
diff --git a/t/output8.sh b/t/output8.sh
new file mode 100755
index 0000000..1339c67
--- /dev/null
+++ b/t/output8.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check AC_CONFIG_FILES support for files starting with '../'.
+# Report from Bruno Haible.
+
+. ./defs || Exit 1
+
+mkdir testdir
+cd testdir
+
+mv ../configure.ac .
+cat >> configure.ac << END
+AC_CONFIG_FILES([a/foo.sh:../testdir/a/foo.sh.in])
+AC_CONFIG_FILES([a/Makefile])
+AC_OUTPUT
+END
+
+mkdir a
+
+echo SUBDIRS = a >Makefile.am
+: >a/Makefile.am
+
+echo foo >a/foo.sh.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+$MAKE
+test "`cat a/foo.sh`" = foo
+
+$sleep
+echo 'bar' >a/foo.sh.in
+
+cd a
+$MAKE foo.sh
+test "`cat foo.sh`" = bar
diff --git a/t/output9.sh b/t/output9.sh
new file mode 100755
index 0000000..f075910
--- /dev/null
+++ b/t/output9.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << END
+AC_CONFIG_FILES([a/mid.in:a/input.in.in])
+AC_CONFIG_FILES([b/out:a/mid.in])
+AC_CONFIG_FILES([a/Makefile b/Makefile])
+AC_OUTPUT
+END
+
+mkdir a
+mkdir b
+
+
+cat >Makefile.am <<\EOF
+SUBDIRS = a b
+dist-hook:
+       test -f $(distdir)/a/input.in.in
+       test ! -f $(distdir)/a/mid.in
+       if test ! -f check; then :; else : > ok; fi
+EOF
+
+: >a/Makefile.am
+: >b/Makefile.am
+
+echo foo >a/input.in.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+: > check
+$MAKE distcheck
+test -f ok
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
new file mode 100755
index 0000000..1f66d3f
--- /dev/null
+++ b/t/override-conditional-1.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for conditionally-defined overrides.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foobar:
+       : > $@
+if COND
+ps: foobar
+       :
+endif
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+
+# "ps:" should be output in two conditions
+test `grep '[^-]ps:' Makefile.in | wc -l` = 2
+grep '@address@hidden: *foobar' Makefile.in
+grep '@address@hidden: *ps-am' Makefile.in
+
+$AUTOCONF
+
+./configure cond=no
+$MAKE ps
+test ! -r foobar
+
+./configure cond=yes
+$MAKE ps
+test -f foobar
+
+:
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
new file mode 100755
index 0000000..4f06888
--- /dev/null
+++ b/t/override-conditional-2.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that conditional overrides are diagnosed.
+# This test is still xfailing; see the FIXME in Automake::Rule::define.
+# Once that is fixed, the test should succeed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [:])
+END
+
+cat > Makefile.am << 'END'
+if COND
+all:
+       :
+endif
+END
+
+$ACLOCAL
+
+AUTOMAKE_fails
+grep ':.*overrides.*all' stderr
+
+:
diff --git a/t/override-html.sh b/t/override-html.sh
new file mode 100755
index 0000000..6438c99
--- /dev/null
+++ b/t/override-html.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that overriding 'html' target causes only one "html:" rule to
+# be output.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+html:
+       :
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+
+# Overriding 'html' should cause only one "html:" rule to be output.
+test `grep '^html:' Makefile.in | wc -l` = 1
+
+:
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
new file mode 100755
index 0000000..286c888
--- /dev/null
+++ b/t/override-suggest-local.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure automake -Woverride suggests using TARGET-local instead
+# of TARGET when possible.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+install:
+       :
+installcheck:
+       :
+html:
+       :
+clean-am:
+       :
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+AUTOMAKE_fails
+# There is no such thing as 'install-local'.
+grep ':.*install-local' stderr && Exit 1
+grep ':.*installcheck-local' stderr
+grep ':.*html-local' stderr
+# Make sure overriding *-am targets suggest using *-local, not *-am.
+grep ':.*clean-am-local' stderr && Exit 1
+grep ':.*clean-local' stderr
+
+:
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
new file mode 100755
index 0000000..db184b2
--- /dev/null
+++ b/t/parallel-am.sh
@@ -0,0 +1,103 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test parallel automake execution.
+
+# There are several hypotheses to be tested:  Independently of the number
+# of threads used by automake,
+# 0) the generated Makefile.in files must be identical without --add-missing,
+# 1) the Makefile.in that distributes auxiliary files must be generated
+#    after all other ones, so all installed aux files are caught,
+# 2) normal automake output should have identical content and be ordered
+#    in the same way, when --add-missing is not passed, or when
+#    --add-missing is passed but there are no concurrent file requirements
+#    (i.e., two Makefile.am files call for the same needed aux file)
+# 3) normal automake output should be identical and ordered in the same way
+#    with --add-missing, even with concurrent file requirements, and the
+#    installation of aux files should be race-free,
+# 4) warning and normal error output should be identical, in that duplicate
+#    warnings should be omitted in the same way as without threads,
+# 5) fatal error and debug messages could be identical.  This is not
+#    intended, though.
+#
+# This test checks (0), (1), and (2).  See sister tests for further coverage.
+
+required=perl-threads
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([parallel-am], [1.0])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PATH_LISPDIR
+AM_PATH_PYTHON
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS =
+END
+
+list='1 2 3 4 5 6 7 8 9'
+for i in $list; do
+  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
+  echo "SUBDIRS += sub$i" >> Makefile.am
+  mkdir sub$i
+  echo > sub$i/Makefile.am
+done
+# Use an include chain to cause a nontrivial location object to be
+# serialized through a thread queue.
+echo 'include foo.am' >> sub7/Makefile.am
+echo 'include bar.am' > sub7/foo.am
+echo 'python_PYTHON = foo.py' > sub7/bar.am
+echo 'lisp_LISP = foo.el' >> sub8/Makefile.am
+echo 'bin_PROGRAMS = p' >> sub9/Makefile.am
+
+rm -f install-sh missing depcomp
+mkdir build-aux
+
+$ACLOCAL
+
+# This test may have to be run several times in order to expose the
+# race that, when the last Makefile.in (the toplevel one) is created
+# before the other ones have finished, not all auxiliary files may
+# be installed yet, thus some may not be distributed.
+#
+# Further, automake output should be stable.
+
+# Generate expected output using the non-threaded code.
+unset AUTOMAKE_JOBS || :
+AUTOMAKE_run --add-missing
+mv stderr expected
+Makefile_ins=`find . -name Makefile.in`
+for file in $Makefile_ins; do
+  mv $file $file.exp
+done
+
+AUTOMAKE_JOBS=5
+export AUTOMAKE_JOBS
+
+for run in 1 2 3 4 5 6 7; do
+  rm -f build-aux/* sub*/Makefile.in
+  AUTOMAKE_run --add-missing
+  diff stderr expected
+  for file in $Makefile_ins; do
+    diff $file $file.exp
+  done
+done
+
+:
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
new file mode 100755
index 0000000..a8ee1b9
--- /dev/null
+++ b/t/parallel-am2.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test parallel automake execution.
+
+# This tests:
+# 4) warning and normal error output should be identical, in that duplicate
+#    warnings should be omitted in the same way as without threads.
+
+required=perl-threads
+. ./defs || Exit 1
+
+mkdir sub
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = main
+main_SOURCES = sub/main.c
+SUBDIRS =
+END
+
+list='1 2 3'
+for i in $list; do
+  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
+  echo "SUBDIRS += sub$i" >> Makefile.am
+  mkdir sub$i sub$i/sub
+  unindent > sub$i/Makefile.am << END
+    AUTOMAKE_OPTIONS = subdir-objects
+    bin_PROGRAMS = sub$i
+    sub${i}_SOURCES = sub/main$i.c
+END
+done
+
+mkdir build-aux
+
+$ACLOCAL
+
+# Independently of the number of worker threads, automake output
+# should be
+# - stable (multiple runs should produce the same output),
+# - properly uniquified,
+# - complete (output from worker threads should not be lost).
+#
+# The parts output by --add-missing are unstable not only wrt. order
+# but also wrt. content: any of the Makefile.am files may cause the
+# depcomp script to be installed (or several of them).
+# Thus we install the auxiliary files in a prior step.
+
+# Generate expected output using non-threaded code.
+unset AUTOMAKE_JOBS || :
+rm -f install-sh missing depcomp
+AUTOMAKE_fails --add-missing
+mv stderr expected
+
+AUTOMAKE_JOBS=5
+export AUTOMAKE_JOBS
+
+for i in 1 2 3 4 5 6 7 8; do
+  rm -f install-sh missing depcomp
+  AUTOMAKE_fails --add-missing
+  diff expected stderr
+done
+
+:
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
new file mode 100755
index 0000000..d630290
--- /dev/null
+++ b/t/parallel-am3.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test parallel automake execution.
+
+# This tests:
+# 3) normal automake output should be identical and ordered in the same way
+#    with --add-missing, even with concurrent file requirements, and the
+#    installation of aux files should be race-free.
+
+required=perl-threads
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([parallel-am], [1.0])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PATH_LISPDIR
+AM_PATH_PYTHON
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS =
+END
+
+list='1 2 3'
+for i in $list; do
+  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
+  echo "SUBDIRS += sub$i" >> Makefile.am
+  mkdir sub$i
+  unindent > sub$i/Makefile.am <<END
+    python_PYTHON = foo$i.py
+    lisp_LISP = foo$i.el
+    bin_PROGRAMS = p$i
+END
+done
+
+rm -f install-sh missing depcomp
+mkdir build-aux
+
+$ACLOCAL
+
+# Generate expected output using the non-threaded code.
+unset AUTOMAKE_JOBS || :
+AUTOMAKE_run --add-missing
+mv stderr expected
+mv Makefile.in Makefile.in.exp
+
+AUTOMAKE_JOBS=3
+export AUTOMAKE_JOBS
+
+for run in 1 2 3 4 5 6 7; do
+  rm -f build-aux/* sub*/Makefile.in
+  AUTOMAKE_run --add-missing
+  diff stderr expected
+  diff Makefile.in Makefile.in.exp
+done
+
+:
diff --git a/t/parallel-tests-cmdline-override.sh 
b/t/parallel-tests-cmdline-override.sh
new file mode 100755
index 0000000..86b0c94
--- /dev/null
+++ b/t/parallel-tests-cmdline-override.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that we can use indirections when overriding TESTS and
+# TEST_LOGS from the command line.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .test .t
+TEST_LOG_COMPILER = cat
+T_LOG_COMPILER = cat
+TESTS = bad.test
+var1 = b.test $(var2)
+var2 = c.test
+var3 = d.d
+var4 = e
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+rm -f config.log # Do not create false positives below.
+
+cat > exp-log <<'END'
+a.log
+b.log
+c.log
+d.log
+e.log
+test-suite.log
+END
+
+cat > exp-out <<'END'
+PASS: a.t
+PASS: b.test
+PASS: c.test
+PASS: d.t
+PASS: e.test
+END
+
+do_check ()
+{
+  env "$@" $MAKE -e check >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  grep '^PASS:' stdout | LC_ALL=C sort > got-out
+  cat got-out
+  ls . | grep '\.log$' | LC_ALL=C sort > got-log
+  cat got-log
+  st=0
+  diff exp-out got-out || st=1
+  diff exp-log got-log || st=1
+  return $st
+}
+
+tests='a.t $(var1) $(var3:.d=.t) $(var4:=.test)'
+test_logs='a.log $(var1:.test=.log) $(var3:.d=.log) $(var4:=.log)'
+
+touch a.t b.test c.test d.t e.test
+
+do_check TESTS="$tests"
+do_check TEST_LOGS="$test_logs"
+
+:
diff --git a/t/parallel-tests-console-output.sh 
b/t/parallel-tests-console-output.sh
new file mode 100755
index 0000000..ac43b25
--- /dev/null
+++ b/t/parallel-tests-console-output.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests: some checks on console output about testsuite
+# progress.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+XFAIL_TESTS = sub/xpass.test xfail.test error.test
+TESTS = $(XFAIL_TESTS) fail.test pass.test a/b/skip.test sub/error2.test
+pass.log: fail.log
+error.log: pass.log
+sub/xpass.log: error.log
+sub/error2.log: xfail.log
+a/b/skip.log: sub/error2.log
+END
+
+cat > exp <<'END'
+FAIL: fail.test
+PASS: pass.test
+ERROR: error.test
+XPASS: sub/xpass.test
+XFAIL: xfail.test
+ERROR: sub/error2.test
+SKIP: a/b/skip.test
+END
+
+mkdir sub a a/b
+
+cat > pass.test << 'END'
+#!/bin/sh
+exit 0
+END
+cp pass.test sub/xpass.test
+
+cat > fail.test << 'END'
+#!/bin/sh
+exit 1
+END
+
+cat > xfail.test << 'END'
+#!/bin/sh
+# The sleep should ensure expected execution order of tests
+# even when make is run in parallel mode.
+# Creative quoting below to plase maintainer-check.
+sleep '10'
+exit 1
+END
+
+cat > error.test << 'END'
+#!/bin/sh
+exit 99
+END
+cp error.test sub/error2.test
+
+cat > a/b/skip.test << 'END'
+#!/bin/sh
+exit 77
+END
+
+chmod a+x pass.test fail.test xfail.test sub/xpass.test \
+          a/b/skip.test error.test sub/error2.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+  $srcdir/configure
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  LC_ALL=C grep '^[A-Z][A-Z]*:' stdout > got
+  cat got
+  diff $srcdir/exp got
+  cd $srcdir
+done
+
+:
diff --git a/t/parallel-tests-driver-install.sh 
b/t/parallel-tests-driver-install.sh
new file mode 100755
index 0000000..b538799
--- /dev/null
+++ b/t/parallel-tests-driver-install.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that auxiliary script 'test-driver' gets automatically installed
+# in the correct directory by 'parallel-tests' option.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+: Try first with parallel-tests defined in AM_INIT_AUTOMAKE.
+
+mkdir am-init-automake
+cd am-init-automake
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([my_aux_dir])
+AM_INIT_AUTOMAKE([parallel-tests])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub my_aux_dir
+
+cat > Makefile.am <<END
+SUBDIRS = sub
+TESTS = foo.test
+END
+
+cat > sub/Makefile.am <<END
+TESTS = bar.test
+END
+
+$ACLOCAL
+$AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+ls -l . sub my_aux_dir # For debugging.
+test -f my_aux_dir/test-driver
+test ! -r test-driver
+test ! -r sub/test-driver
+
+grep '^configure\.ac:3:.*installing.*my_aux_dir/test-driver' stderr
+
+cd ..
+
+: Now try with parallel-tests defined in AUTOMAKE_OPTIONS.
+
+mkdir automake-options
+cd automake-options
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([dir/GNUmakefile])
+AC_OUTPUT
+END
+
+mkdir build-aux dir
+
+cat > dir/GNUmakefile.am <<END
+TESTS = foo.test
+AUTOMAKE_OPTIONS = parallel-tests
+TESTS += bar.test
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing --copy dir/GNUmakefile 2>stderr \
+  || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+ls -l . dir build-aux # For debugging.
+test -f build-aux/test-driver
+test ! -r test-driver
+test ! -r dir/test-driver
+
+grep '^dir/GNUmakefile\.am:2:.*installing.*build-aux/test-driver' stderr
+
+:
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
new file mode 100755
index 0000000..b094c18
--- /dev/null
+++ b/t/parallel-tests-dry-run-1.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests interactions with "make -n".
+# See also sister test 'parallel-tests-dry-run-2.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+TESTS = foo.test bar.test
+$(TESTS):
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# Avoid confusion with test logs.
+rm -f config.log
+
+log_files='test-suite.log foo.log bar.log'
+
+all_exist ()
+{
+  st=0
+  for i in $*; do
+    test -f $i || { echo File $i not found; st=1; }
+  done
+  test $st -eq 0
+}
+
+none_exist ()
+{
+  st=0
+  for i in $*; do
+    if test -r $i || test -f $i; then
+      echo File $i found
+      st=1
+    fi
+  done
+  test $st -eq 0
+}
+
+for targ in check recheck $log_files; do
+  $MAKE -n "$targ"
+  none_exist $log_files
+done
+
+touch $log_files
+
+$MAKE -n mostlyclean
+all_exist $log_files
+$MAKE -n clean
+all_exist $log_files
+
+cat > foo.test <<'END'
+#! /bin/sh
+exit 0
+END
+
+cat > bar.test <<'END'
+#! /bin/sh
+exit 1
+END
+
+chmod a+x foo.test bar.test
+
+$MAKE check && Exit 1
+
+for targ in recheck clean mostlyclean distclean; do
+  $MAKE -n "$targ"
+  all_exist $log_files
+done
+
+:
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
new file mode 100755
index 0000000..0d13677
--- /dev/null
+++ b/t/parallel-tests-dry-run-2.sh
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests interactions with "make -n".
+# See also sister test 'parallel-tests-dry-run-1.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = foo.test bar.test
+TEST_LOG_COMPILER = $(SHELL)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure
+
+make_n_ ()
+{
+  st=0
+  $MAKE -n "$@" >output 2>&1 || { cat output; ls -l; Exit 1; }
+  cat output
+  # Look out for possible errors from common tools used by recipes.
+  $EGREP -i ' (exist|permission|denied|no .*(such|file))' output && Exit 1
+  $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output && Exit 1
+  :
+}
+
+: > output
+
+files='foo.log bar.log foo.trs bar.trs'
+
+for target in check recheck test-suite.log; do
+  test ! -f foo.log
+  test ! -f foo.trs
+  test ! -f bar.log
+  test ! -f bar.trs
+  test ! -f test-suite.log
+done
+
+# Creative quoting below to please maintainer-check.
+echo exit '0' > foo.test
+echo exit '1' > bar.test
+
+$MAKE check && Exit 1
+
+chmod a-w .
+
+make_n_ clean
+test -f foo.log
+test -f foo.trs
+test -f foo.log
+test -f bar.trs
+
+# Creative quoting below to please maintainer-check.
+cat > foo.test <<END
+echo this is bad
+exit 1
+END
+echo exit '0' > bar.test
+
+for target in check recheck test-suite.log; do
+  make_n_ $target
+  grep '^:test-result: *FAIL' bar.trs
+  grep 'this is bad' foo.log test-suite.log && Exit 1
+  : For shells with busted 'set -e'.
+done
+
+chmod a-rw $files
+if test -r foo.log; then
+  : You can still read unreadable files!  Skip these checks.
+else
+  for target in check recheck test-suite.log; do
+    make_n_ $target
+    for f in $files; do
+      test -f $f && test ! -r $f || Exit 1
+    done
+  done
+fi
+chmod u+r $files
+
+chmod u+w .
+rm -f foo.log bar.trs
+chmod a-w .
+for target in check recheck test-suite.log $files; do
+  make_n_ $target
+  test ! -f foo.log
+  test -f foo.trs
+  test ! -f bar.trs
+  test -f bar.log
+done
+
+:
diff --git a/t/parallel-tests-empty-testlogs.sh 
b/t/parallel-tests-empty-testlogs.sh
new file mode 100755
index 0000000..0ea6db8
--- /dev/null
+++ b/t/parallel-tests-empty-testlogs.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - empty TESTS
+# - empty TEST_LOGS
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub1 sub2
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am << 'END'
+TESTS =
+END
+
+# When $(TESTS) is empty, NetBSD 5.1 make ends up defining $(TESTS_LOGS)
+# to ".log" rather than to the empty string (as would be expected).
+# But our recipes are smart enough to work around such a botched-up
+# substitution, so let's not bother too much about it.
+if using_gmake; then
+  unindent >> sub1/Makefile.am << 'END'
+    check-local:
+       echo $(TEST_LOGS) | grep . && exit 1; exit 0
+END
+fi
+
+cat > sub2/Makefile.am << 'END'
+TESTS = foo.test
+END
+
+cat > sub2/foo.test <<'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x sub2/foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+no_test_has_run ()
+{
+  ls -1 *.log | grep -v '^test-suite\.log$' | grep . && Exit 1
+  grep '^# TOTAL: *0$' test-suite.log
+  :
+}
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+  $srcdir/configure
+  cd sub1
+  VERBOSE=yes $MAKE check
+  no_test_has_run
+  cd ../sub2
+  VERBOSE=yes TESTS='' $MAKE -e check
+  no_test_has_run
+  VERBOSE=yes TEST_LOGS='' $MAKE -e check
+  no_test_has_run
+  cd ..
+  $MAKE check
+  cat sub2/foo.log
+  $MAKE distclean
+  cd $srcdir
+done
+
+:
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
new file mode 100755
index 0000000..e93f5f1
--- /dev/null
+++ b/t/parallel-tests-exeext.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests:
+#   - check2.am and interaction with $(EXEEXT)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+dnl We need to fool the init.m4 internals a little.
+AC_DEFUN([_AM_FOO],
+  [m4_provide([_AM_COMPILER_EXEEXT])
+  AC_SUBST([CC], [false])
+  AC_SUBST([EXEEXT])])
+_AM_FOO
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = x y a.test b.test
+LOG_COMPILER = true
+TEST_LOG_COMPILER = true
+## We also need to fool the automake internals a little.
+EXTRA_PROGRAMS = y
+y_SOURCES =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+$EGREP 'EXEEXT|\.log|\.test' Makefile.in # For debugging.
+
+./configure EXEEXT=
+touch x y a.test b.test
+$MAKE check
+
+$MAKE distclean
+rm -f x y a.test b.test *.log *.trs
+
+./configure EXEEXT=.bin
+touch x y.bin a.test b.test.bin
+$MAKE check
+ls -l # For debugging.
+test -f y.log
+test ! -r y.bin.log
+test -f b.log
+test ! -r b.test.log
+
+$EGREP '^y\.log: y(\$\(EXEEXT\)|\.bin)' Makefile
+$EGREP '^\.test(\$\(EXEEXT\)|\.bin)\.log:' Makefile
+
+:
diff --git a/t/parallel-tests-exit-statuses.sh 
b/t/parallel-tests-exit-statuses.sh
new file mode 100755
index 0000000..688ff84
--- /dev/null
+++ b/t/parallel-tests-exit-statuses.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features: normal and special exit statuses
+# in the test scripts.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+# $failure_statuses should be defined to the list of all integers between
+# 1 and 255 (inclusive), excluded 77 and 99.
+failure_statuses=`seq_ 1 255 | $EGREP -v '^(77|99)$' | tr "$nl" ' '`
+# For debugging.
+echo "failure_statuses: $failure_statuses"
+# Sanity check.
+test `for st in $failure_statuses; do echo $st; done | wc -l` -eq 253 \
+  || fatal_ "initializing list of exit statuses for simple failures"
+
+cat > Makefile.am <<END
+LOG_COMPILER = ./do-exit
+fail_tests = $failure_statuses
+TESTS = 0 77 99 $failure_statuses
+\$(TESTS):
+END
+
+cat > do-exit <<'END'
+#!/bin/sh
+echo "$0: $1"
+case $1 in
+  [0-9]|[0-9][0-9]|[0-9][0-9][0-9]) st=$1;;
+  */[0-9]|*/[0-9][0-9]|*/[0-9][0-9][0-9]) st=`echo x"$1" | sed 's|.*/||'`;;
+  *) st=99;;
+esac
+exit $st
+END
+chmod a+x do-exit
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+{
+  echo PASS: 0
+  echo SKIP: 77
+  echo ERROR: 99
+  for st in $failure_statuses; do
+    echo "FAIL: $st"
+  done
+} | LC_ALL=C sort > exp-fail
+
+sed 's/^FAIL:/XFAIL:/' exp-fail | LC_ALL=C sort > exp-xfail-1
+sed '/^ERROR:/d' exp-xfail-1 > exp-xfail-2
+
+sort exp-fail
+sort exp-xfail-1
+sort exp-xfail-2
+
+./configure
+
+st=1
+$MAKE check >stdout && st=0
+cat stdout
+cat test-suite.log
+test $st -gt 0 || Exit 1
+LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-fail
+diff exp-fail got-fail
+
+st=1
+XFAIL_TESTS="$failure_statuses 99" $MAKE -e check >stdout && st=0
+cat stdout
+cat test-suite.log
+test $st -gt 0 || Exit 1
+LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-xfail-1
+diff exp-xfail-1 got-xfail-1
+
+st=0
+XFAIL_TESTS="$failure_statuses" TESTS="0 77 $failure_statuses" \
+  $MAKE -e check >stdout || st=$?
+cat stdout
+cat test-suite.log
+test $st -eq 0 || Exit 1
+LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-xfail-2
+diff exp-xfail-2 got-xfail-2
+
+:
diff --git a/t/parallel-tests-extra-programs.sh 
b/t/parallel-tests-extra-programs.sh
new file mode 100755
index 0000000..d95d184
--- /dev/null
+++ b/t/parallel-tests-extra-programs.sh
@@ -0,0 +1,182 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Parallel test harness: check that $(TESTS) can lazily depend on
+# (or even be) $(EXTRA_PROGRAMS).
+
+required='cc native'
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+# Will be extended later.
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .bin .test
+EXTRA_PROGRAMS =
+TESTS =
+END
+
+#
+# Now try various kinds of test dependencies ...
+#
+
+# 1. A program that is also a test, and whose source files
+#    already exist.
+
+cat >> Makefile.am <<'END'
+EXTRA_PROGRAMS += foo.bin
+TESTS += foo.bin
+foo_bin_SOURCES = foo.c
+END
+
+cat > foo.c <<'END'
+#include <stdio.h>
+int main (void)
+{
+  printf ("foofoofoo\n");
+  return 0;
+}
+END
+
+# 2. A program that is also a test, and whose source files
+#    are buildable by make.
+cat >> Makefile.am <<'END'
+EXTRA_PROGRAMS += bar.bin
+TESTS += bar.bin
+bar_bin_SOURCES = bar.c
+bar.c: foo.c
+       sed -e 's/foofoofoo/barbarbar/' foo.c > $@
+END
+
+# 3. A test script that already exists, whose execution depends
+#    on a program whose source files already exist and which is
+#    not itself a test.
+cat >> Makefile.am <<'END'
+EXTRA_PROGRAMS += y
+TESTS += baz.test
+baz.log: y$(EXEEXT)
+END
+
+cat > baz.test <<'END'
+#!/bin/sh
+$srcdir/y "$@" | sed 's/.*/&ep&ep&ep/'
+END
+chmod a+x baz.test
+
+cat > y.c <<'END'
+#include <stdio.h>
+int main (void)
+{
+  printf ("y\n");
+  return 0;
+}
+END
+
+# 4. A program that is also a test, but whose source files
+#    do not exit and are not buildable by make.
+
+cat >> Makefile.am <<'END'
+EXTRA_PROGRAMS += none.bin
+TESTS += none.bin
+none_bin_SOURCES = none.c
+END
+
+#
+# Setup done, go with the tests.
+#
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# What we check now:
+#  1. even if we cannot build the 'none.bin' program, all the other
+#     test programs should be built, and all the other tests should
+#     be run;
+#  2. still, since we cannot create the 'none.log' file, the
+#    'test-suite.log' file shouldn't be created (as it depends
+#     on *all* the test logs).
+
+st=0
+$MAKE -k check >stdout 2>stderr || st=$?
+cat stdout
+cat stderr >&2
+ls -l
+if using_gmake; then
+  test $st -gt 0 || Exit 1
+else
+  # Don't trust exit status of "make -k" for non-GNU make.
+  $MAKE check && Exit 1
+  : For shells with busted 'set -e'.
+fi
+
+# Files that should have been created, with the expected content.
+cat bar.c
+grep foofoofoo foo.log
+grep barbarbar bar.log
+grep yepyepyep baz.log
+# Files that shouldn't have been created.
+test ! -f none.log
+test ! -f test-suite.log
+# Expected testsuite progress output.
+grep '^PASS: baz\.test$' stdout
+# Don't anchor the end of the next two patterns, to allow for non-empty
+# $(EXEEXT).
+grep '^PASS: foo\.bin' stdout
+grep '^PASS: bar\.bin' stdout
+# Expected error messages from make.  Some make implementations (e.g.,
+# FreeBSD make) seem to print the error on stdout instead, so check for
+# it there as well.
+$EGREP 'none\.(bin|o|c)' stderr stdout
+
+# What we check now:
+#  1. if we make the last EXTRA_PROGRAM buildable, the failed tests
+#     pass;
+#  2. on a lazy re-run, the passed tests are not re-run, and
+#  3. their log files are not updated or touched.
+
+: > stamp
+$sleep
+
+echo 'int main (void) { return 0; }' > none.c
+
+st=0
+RECHECK_LOGS= $MAKE -e check >stdout || st=$?
+cat stdout
+ls -l
+test $st -eq 0 || Exit 1
+
+# For debugging.
+stat stamp foo.log bar.log baz.log || :
+
+# Files that shouldn't have been updated or otherwise touched.
+is_newest stamp foo.log bar.log baz.log
+# Files that should have been created now.
+test -f none.log
+test -f test-suite.log
+# Tests that shouldn't have been re-run.
+$EGREP '(foo|bar)\.bin|baz\.test$' stdout && Exit 1
+# Tests that should have been run.  Again, we don't anchor the end
+# of the next pattern, to allow for non-empty $(EXEEXT).
+grep '^PASS: none\.bin' stdout
+
+:
diff --git a/t/parallel-tests-fd-redirect-exeext.sh 
b/t/parallel-tests-fd-redirect-exeext.sh
new file mode 100755
index 0000000..56d7f59
--- /dev/null
+++ b/t/parallel-tests-fd-redirect-exeext.sh
@@ -0,0 +1,118 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests support: redirection of file descriptors with
+# AM_TESTS_FD_REDIRECT, for tests which are binary executables
+# We use some tricks to ensure that all code paths in 'lib/am/check2.am'
+# are covered, even on platforms where $(EXEEXT) would be naturally empty.
+# See also the more generic test 'check-fd-redirect.test', and
+# sister test 'parallel-tests-fd-redirect.test'.
+
+required='cc native'
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+# Calls like "write(9, ...)" are unlikely to work for MinGW-compiled
+# programs.  We must skip this test if this is the case.
+am__ok=no
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[#include <unistd.h>]],
+                     [[write (9, "foobar\n", 7); return 0;]])],
+    [AM_RUN_LOG([./conftest$EXEEXT 9>&1]) \
+dnl Leading ":;" required to avoid having two nested subshells starting
+dnl with '((' in the generated configure: that is unportable and could
+dnl confuse some shells (e.g., NetBSD 5.1 /bin/ksh) into thinking we are
+dnl trying to perform an arithmetic operation.
+       && AM_RUN_LOG([:; (./conftest$EXEEXT 9>&1) | grep "^foobar"]) \
+       && am__ok=yes])
+test $am__ok = yes || AS_EXIT([63])
+AM_CONDITIONAL([real_EXEEXT], [test -n "$EXEEXT"])
+test -n "$EXEEXT" || EXEEXT=.bin
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AM_TESTS_FD_REDIRECT = 9>&1
+TESTS = $(check_PROGRAMS)
+check_PROGRAMS = baz qux.test
+qux_test_SOURCES = zardoz.c
+
+## Sanity check.
+if !real_EXEEXT
+check-local:
+       test -f baz.bin
+       test -f qux.test.bin
+endif
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cat > baz.c <<'END'
+#include <stdio.h>
+#include <unistd.h>
+int main (void)
+{
+  ssize_t res = write (9, " bazbazbaz\n", 11);
+  if (res < 0)
+    perror("write failed");
+  return res != 11;
+}
+END
+
+cat > zardoz.c <<'END'
+#include <stdio.h>
+#include <unistd.h>
+int main (void)
+{
+  ssize_t res = write (9, " quxquxqux\n", 11);
+  if (res < 0)
+    perror("write failed");
+  return res != 11;
+}
+END
+
+st=0; ./configure || st=$?
+cat config.log # For debugging, as we do tricky checks in configure.
+if test $st -eq 63; then
+  skip_ "fd redirect in compiled program unsupported"
+elif test $st -eq 0; then
+  : Continue.
+else
+  fatal_ "unexpected error in ./configure"
+fi
+
+# Sanity checks.
+st=0
+grep '^baz\.log:.*baz\$(EXEEXT)' Makefile || st=1
+grep '^\.test\$(EXEEXT)\.log:' Makefile || st=1
+grep '^qux\.log:' Makefile && st=1
+test $st -eq 0 || fatal_ "doesn't cover expected code paths"
+
+st=0
+$MAKE check >stdout || st=1
+cat stdout
+cat baz.log
+cat qux.log
+test $st -eq 0
+grep "^ bazbazbaz$" stdout
+grep "^ quxquxqux$" stdout
+$EGREP '(bazbazbaz|quxquxqux)' *.log && Exit 1
+
+:
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
new file mode 100755
index 0000000..cf7acce
--- /dev/null
+++ b/t/parallel-tests-fd-redirect.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests support: redirection of file descriptors with
+# AM_TESTS_FD_REDIRECT, even when using tests without suffix.
+# The sister 'parallel-tests-fd-redirect-exeext.test' do a similar
+# check for tests that are binary executables.
+# See also the more generic test 'check-fd-redirect.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AM_TESTS_FD_REDIRECT = 9>&1
+TEST_EXTENSIONS = .test .sh
+TESTS = foo.sh bar
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cat > foo.sh <<'END'
+#!/bin/sh
+echo " foofoofoo" >&9
+END
+chmod a+x foo.sh
+
+cat > bar <<'END'
+#!/bin/sh
+echo " barbarbar" >&9
+END
+
+chmod a+x foo.sh bar
+
+./configure
+
+# Sanity checks.
+st=0
+grep '^bar\.log:.*bar' Makefile || st=1
+grep '^foo\.log:' Makefile && st=1
+test $st -eq 0 || fatal_ "doesn't cover expected code paths"
+
+st=0; $MAKE check >stdout || st=1
+cat stdout
+cat foo.log
+cat bar.log
+test $st -eq 0
+grep "^ foofoofoo$" stdout
+grep "^ barbarbar$" stdout
+$EGREP '(foofoofoo|barbarbar)' *.log && Exit 1
+
+:
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
new file mode 100755
index 0000000..2f0016b
--- /dev/null
+++ b/t/parallel-tests-fork-bomb.sh
@@ -0,0 +1,144 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+#  - If $(TEST_SUITE_LOG) is in $(TEST_LOGS), we get a diagnosed
+#    error, not a make hang or a system freeze.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+# The tricky part of this test is to avoid that make hangs or even
+# freezes the system in case infinite recursion (which is the bug we
+# are testing against) is encountered.  The following hacky makefile
+# should minimize the probability of that happening.
+cat > Makefile.am << 'END'
+TEST_LOG_COMPILER = true
+TESTS =
+
+errmsg = ::OOPS:: Recursion too deep
+
+if IS_GNU_MAKE
+
+ is_too_deep := $(shell test $(MAKELEVEL) -lt 10 && echo no)
+
+## Indenteation here required to avoid confusing Automake.
+ ifeq ($(is_too_deep),no)
+ else
+ $(error $(errmsg), $(MAKELEVEL) levels)
+ endif
+
+else !IS_GNU_MAKE
+
+# We use mkdir to detect the level of recursion, since it is easy
+# to use and assured to be portably atomical.  Also use an higher
+# number than with GNU make above, since the level used here can
+# be incremented by tow or more per recursion.
+recursion-not-too-deep:
+       @ok=no; \
+       for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 \
+                18 19 20 21 22 23 24 25 26 27 28 29; \
+       do \
+         echo " mkdir rec-$$i.d"; \
+         if mkdir rec-$$i.d; then \
+           ok=yes; break; \
+         else :; fi; \
+       done; \
+       test $$ok = yes || { echo '$(errmsg)' >&2; exit 1; }
+.PHONY: recursion-not-too-deep
+clean-local:
+       rmdir rec-[0-9].d
+
+targets = all check recheck $(TESTS) $(TEST_LOGS) $(TEST_SUITE_LOG)
+$(targets): recursion-not-too-deep
+
+# For BSD make.
+.BEGIN: recursion-not-too-deep
+
+endif !IS_GNU_MAKE
+END
+
+if using_gmake; then
+  cond=:
+else
+  cond=false
+fi
+
+cat >> configure.ac << END
+AM_CONDITIONAL([IS_GNU_MAKE], [$cond])
+AC_OUTPUT
+END
+
+# Another helpful idiom to avoid hanging on capable systems.  The subshell
+# is needed since 'ulimit' might be a special shell builtin.
+if (ulimit -t 8); then ulimit -t 8; fi
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a -Wno-portability
+
+./configure
+
+do_check ()
+{
+  st=0
+  log=$1; shift
+  env "$@" $MAKE -e check >output 2>&1 || st=$?
+  cat output
+  $FGREP '::OOPS::' output && Exit 1 # Possible infinite recursion.
+  # Check that at least we don't create a botched global log file.
+  test ! -f "$log"
+  if using_gmake; then
+    grep "[Cc]ircular.*dependency" output | $FGREP "$log"
+    test $st -gt 0
+  else
+    # Look for possible error messages about circular dependencies from
+    # either make or our own recipes.  At least one such a message must
+    # be present.  OTOH, some make implementations (e.g., NetBSD's), while
+    # smartly detecting the circular dependency early and diagnosing it,
+    # still exit with a successful exit status (yikes!).  So don't check
+    # the exit status of non-GNU make, to avoid spurious failures.
+    # this case.
+    err_seen=no
+    for err_rx in \
+      'circular.* depend' \
+      'depend.* circular' \
+      'graph cycle' \
+      'infinite (loop|recursion)' \
+      'depend.* on itself' \
+    ; do
+      $EGREP -i "$err_rx" output | $FGREP "$log" || continue
+      err_seen=yes
+      break
+    done
+    test $err_seen = yes || Exit 1
+  fi
+}
+
+: > test-suite.test
+do_check test-suite.log TESTS=test-suite.test
+rm -f *.log *.test
+
+: > 0.test
+: > 1.test
+: > 2.test
+: > 3.test
+: > foobar.test
+do_check foobar.log TEST_LOGS='0.log 1.log foobar.log 2.log 3.log' \
+                    TEST_SUITE_LOG=foobar.log
+rm -f *.log *.test
+
+:
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
new file mode 100755
index 0000000..7b66251
--- /dev/null
+++ b/t/parallel-tests-harderror.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features: DISABLE_HARD_ERRORS
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat > Makefile.am << 'END'
+SUBDIRS = . sub
+TESTS = foo.test
+XFAIL_TESTS = foo.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > sub/Makefile.am << 'END'
+TESTS = bar.test
+XFAIL_TESTS = $(TESTS)
+EXTRA_DIST = $(TESTS)
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+exit 99
+END
+chmod a+x foo.test
+cp foo.test sub/bar.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# DISABLE_HARD_ERRORS is not defined as a make variable, so that it
+# should be possible to define either from the environment or from
+# command-line, also when recursive make invocations are involved,
+# and also without using the '-e' make flag; this should work also
+# for non-GNU make. Moreover, it shouldn't be necessary to define
+# DISABLE_HARD_ERRORS to "yes" to really disable hard errors: any
+# non-empty value should do.
+$MAKE check DISABLE_HARD_ERRORS=yes
+DISABLE_HARD_ERRORS=x $MAKE check
+
+# But an empty values for DISABLE_HARD_ERRORS means that hard errors
+# are not to be counted like normal failures.
+
+$MAKE check DISABLE_HARD_ERRORS='' && Exit 1
+cat test-suite.log
+grep '^ERROR: foo$' test-suite.log
+
+cd sub
+# The '-e' is wanted here.
+DISABLE_HARD_ERRORS='' $MAKE -e check && Exit 1
+cat test-suite.log
+grep '^ERROR: bar$' test-suite.log
+cd ..
+
+# Check the distributions.
+$MAKE DISABLE_HARD_ERRORS=y distcheck
+
+# Finally, DISABLE_HARD_ERRORS should work also when the developer
+# sets it directly in Makefile.am or Makefile.  And its effects
+# should remain local to that specific Makefile, obviously.
+
+echo 'DISABLE_HARD_ERRORS = yes' >> Makefile.am
+$AUTOMAKE Makefile
+./config.status Makefile
+VERBOSE=yes $MAKE check && Exit 1
+grep '^FAIL' test-suite.log && Exit 1
+grep '^ERROR: bar$' sub/test-suite.log
+
+echo 'DISABLE_HARD_ERRORS = zardoz' >> sub/Makefile
+VERBOSE=yes $MAKE check
+
+:
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
new file mode 100755
index 0000000..39a04a7
--- /dev/null
+++ b/t/parallel-tests-interrupt.tap
@@ -0,0 +1,117 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the parallel-tests driver removed incomplete log files
+# when interrupt upon some signal.  This test is definitely too hacky,
+# but we couldn't find a better way to deal with inter-processes
+# signals and the whole process-synchronization mess.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+plan_ 16
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test
+## Provide more debugging info.
+TEST_LOG_COMPILER = $(SHELL) -x
+## Required by foo.test; see below.
+AM_TESTS_FD_REDIRECT = 9>&1
+END
+
+# This is hacky and ugly, but has the great advantage of avoiding us a lot
+# of pain with background processes and related synchronization issues.
+
+cat - "$am_scriptdir"/test-driver > test-driver <<'END'
+#!/bin/sh
+echo $$ > pid
+END
+
+cat > foo.test << 'END'
+#!/bin/sh -e
+
+# We expect the test driver to be terminated by a signal, and so
+# to exit with non-zero status, thus causing "make check" to fail.
+# Exiting with status 0 from this test script is thus a good way to
+# make unexpected behaviours more evident, since this will likely
+# cause and unexpected success in "make check".
+trap 'exit 0' 0;
+stop_test () { exit 0; }
+
+# We need the "foo is starting to run" string flushed to standard output
+# ASAP, because we are soon going to grep for that string in the log file
+# where the test driver is redirecting this script's stdout.  The safest
+# way force this flushing portably is to rely on perl I/O capabilities.
+$PERL -e 'BEGIN { $| = 1 }; print "foo is starting to run\n"' || stop_test
+
+ls -l >&9 || stop_test
+
+bailout ()
+{
+  # Print this to the original stdout (saved in the fd 9), so that the
+  # emitted "Bail out!" directive will be interpreted by the test driver
+  # running the Automake testsuite.
+  echo "Bail out! $*" >&9
+  stop_test
+}
+
+test $sig -gt 0 || bailout "\$sig not exported to test script"
+
+res=ok; cat foo.log >&9 || res="not ok"
+echo "$res - logfile created and readable [SIG $sig]" >&9
+
+res=ok; grep '^foo is starting to run$' foo.log >&9 || res='not ok'
+echo "$res - logfile contains output from test script [SIG $sig]" >&9
+
+cat pid >&9 || bailout "cannot get PID of test driver"
+kill -$sig `cat pid` || bailout "cannot send signal $sig to test driver"
+
+stop_test
+END
+chmod a+x foo.test
+
+$ACLOCAL  || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE || fatal_ "automake failed"
+
+./configure || fatal_ "./configure failed"
+
+# The only signals that can be trapped portable are 1 "SIGHUP",
+# 2 "SIGINT", 13 "SIGPIPE" and 15 "SIGTERM".
+trapped_signals='1 2 13 15'
+
+for sig in $trapped_signals; do
+  if is_blocked_signal $sig; then
+    for i in 1 2 3 4; do echo "ok # SKIP signal $sig is blocked"; done
+    continue
+  fi
+  rm -f pid fail *.log
+  r=ok; env PERL="$PERL" sig="$sig" $MAKE check && r='not ok'
+  echo "$r - signal $sig to test driver causes \"make check\" to fail"
+  ls -l
+  # These files shouldn't exist, but in case they do, their content might
+  # provide helpful information about the causes of the failure(s).
+  cat foo.log || :
+  cat test-suite.log || :
+  r=ok; ls | $EGREP 'foo.*\.(log|tmp)' && r='not ok'
+  echo "$r - test driver clean up log and tmp files after signal $sig"
+done
+
+:
diff --git a/t/parallel-tests-log-compiler-1.sh 
b/t/parallel-tests-log-compiler-1.sh
new file mode 100755
index 0000000..77bdac4
--- /dev/null
+++ b/t/parallel-tests-log-compiler-1.sh
@@ -0,0 +1,126 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - per-extension "test runners" a.k.a. "log compilers" (xxx_LOG_COMPILER
+#   and xxx_LOG_FLAGS), also with AC_SUBST'd stuff.
+# See also related test 'parallel-tests-log-compiler-2.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([acsubst_compiler], [t-compiler])
+AC_CONFIG_LINKS([chk-compiler:chk-compiler])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# Note that automake should not match the '/test' part of 'sub/test'
+# as '.test' suffix.
+TESTS = foo.chk bar.test baz bla.t bli.suff sub/test
+
+TEST_EXTENSIONS = .chk .test .t
+
+CHK_LOG_COMPILER = ./chk-compiler
+TEST_LOG_COMPILER = $(SHELL) $(srcdir)/test-compiler
+T_LOG_COMPILER = @acsubst_compiler@
+LOG_COMPILER = @SHELL@ -x $(srcdir)/noext-compiler
+
+CHK_LOG_FLAGS = --chk
+
+AM_TEST_LOG_FLAGS = --am-test
+
+T_LOG_FLAGS = --t
+AM_T_LOG_FLAGS = --am-t
+
+AM_LOG_FLAGS = -a
+LOG_FLAGS = -b
+
+# 't-compiler' is deliberately not distributed; it should be available
+# in PATH also from "make distcheck".
+EXTRA_DIST = $(TESTS) chk-compiler test-compiler noext-compiler
+END
+
+mkdir sub
+
+cat > chk-compiler <<'END'
+#! /bin/sh
+test x"$1" = x"--chk" || {
+  echo "$0: invalid command line: $*" >&2
+  exit 1
+}
+shift
+exec "$@"
+exit 127
+END
+sed 's/--chk/--am-test/' chk-compiler > test-compiler
+
+mkdir bin
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+
+cat > bin/t-compiler <<'END'
+#! /bin/sh
+if test x"$1,$2" != x"--am-t,--t"; then
+  echo "$0: invalid command line: $*" >&2
+  exit 1
+fi
+shift; shift
+exec "$@"
+exit 127
+END
+sed 's/--am-t,--t/-a,-b/' bin/t-compiler > noext-compiler
+
+chmod a+x chk-compiler chk-compiler test-compiler bin/t-compiler noext-compiler
+
+cat >foo.chk << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x foo.chk
+cp foo.chk bar.test
+cp foo.chk baz
+cp foo.chk bla.t
+cp foo.chk bli.suff
+cp foo.chk sub/test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check || { cat test-suite.log; Exit 1; }
+ls -l . sub
+cat test-suite.log
+test -f foo.log
+test -f bar.log
+test -f baz.log
+test -f bla.log
+test -f bli.suff.log
+test -f sub/test.log
+
+T_LOG_FLAGS=--bad $MAKE -e check && Exit 1
+cat test-suite.log
+cat bla.log
+# With the above flag overridden, bla.t should fail ...
+$EGREP '(^ *|/)t-compiler:.* invalid .*--bad' bla.log
+# ... but no other test should.
+grep -v '^FAIL: bla\.t ' bla.log | grep 'FAIL:' && Exit 1
+
+# Try also with a VPATH build.
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests-log-compiler-2.sh 
b/t/parallel-tests-log-compiler-2.sh
new file mode 100755
index 0000000..7443e26
--- /dev/null
+++ b/t/parallel-tests-log-compiler-2.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - per-extension "test runners" a.k.a. "log compilers" (xxx_LOG_COMPILER
+#   and xxx_LOG_FLAGS), when some tests are PROGRAMS.
+# See also related test 'parallel-tests-log-compiler-1.test'.
+
+am_parallel_tests=yes
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+## Note that automake should not match the '/test' part
+## of 'sub/test' as '.test' suffix.
+TESTS = foo.chk bar.test $(check_PROGRAMS) sub/test
+check_PROGRAMS = baz bla.test bli.suff
+TEST_EXTENSIONS = .chk .test
+CHK_LOG_COMPILER = ./chk-compiler
+TEST_LOG_COMPILER = ./test-compiler
+LOG_COMPILER = ./noext-compiler
+AM_CHK_LOG_FLAGS = 1
+CHK_LOG_FLAGS = 2
+AM_TEST_LOG_FLAGS = 3
+TEST_LOG_FLAGS = 4
+AM_LOG_FLAGS = 5
+LOG_FLAGS = 6
+END
+
+mkdir sub
+
+cat >chk-compiler <<'END'
+#! /bin/sh
+echo $0 "$@"
+shift
+shift
+exec "$@"
+exit 127
+END
+chmod a+x chk-compiler
+cp chk-compiler test-compiler
+cp chk-compiler noext-compiler
+
+cat >foo.chk << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x foo.chk
+cp foo.chk bar.test
+cp foo.chk sub/test
+
+cat >baz.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+cp baz.c bla.c
+cp baz.c bli.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE
+$MAKE check || { cat test-suite.log; Exit 1; }
+ls -l . sub
+cat test-suite.log
+grep 'chk-compiler  *1  *2' foo.log
+grep 'test-compiler  *3  *4' bar.log
+grep 'noext-compiler  *5  *6' baz.log
+grep 'test-compiler  *3  *4' bla.log
+grep 'noext-compiler  *5  *6' bli.suff.log
+grep 'noext-compiler  *5  *6' sub/test.log
+
+:
diff --git a/t/parallel-tests-log-compiler-example.sh 
b/t/parallel-tests-log-compiler-example.sh
new file mode 100755
index 0000000..8b45758
--- /dev/null
+++ b/t/parallel-tests-log-compiler-example.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the example of usage of generic and extension-specific
+# LOG_COMPILER and LOG_FLAGS given in the manual.
+
+am_parallel_tests=yes
+required=python
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_SUBST([PERL], ['$PERL'])
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.pl bar.py baz
+TEST_EXTENSIONS = .pl .py
+PL_LOG_COMPILER = $(PERL)
+AM_PL_LOG_FLAGS = -w
+PY_LOG_COMPILER = $(PYTHON)
+AM_PY_LOG_FLAGS = -v
+LOG_COMPILER = ./wrapper-script
+AM_LOG_FLAGS = -d
+END
+
+echo 'my $a =+ 2; exit (0);' > foo.pl
+echo 'import sys; sys.exit(0);' > bar.py
+: > baz
+
+cat > wrapper-script <<'END'
+#!/bin/sh
+echo "wrapper args: $*"
+END
+chmod a+x wrapper-script
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+st=0
+$MAKE check || st=$?
+cat foo.log
+cat bar.log
+cat baz.log
+test $st -eq 0 || Exit $st
+
+# Check that the wrappers have been run with the expected flags.
+grep '[rR]eversed.*+=.*operator.*foo\.pl' foo.log
+grep '^# *[cC]lear.*sys\.argv' bar.log
+grep '^wrapper args:.* -d .*baz' baz.log
+
+:
diff --git a/t/parallel-tests-log-override-1.sh 
b/t/parallel-tests-log-override-1.sh
new file mode 100755
index 0000000..f76d193
--- /dev/null
+++ b/t/parallel-tests-log-override-1.sh
@@ -0,0 +1,110 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = pass.test skip.test xfail.test
+XFAIL_TESTS = xfail.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > pass.test <<'END'
+#! /bin/sh
+exit 0
+END
+
+cat > skip.test <<'END'
+#! /bin/sh
+echo "% test skipped %"
+exit 77
+END
+
+cat > xfail.test <<'END'
+#! /bin/sh
+echo "# expected failure #"
+exit 1
+END
+
+chmod a+x *.test
+
+test_log_edit ()
+{
+  sed -e "s|^  *$me 1\.0:.*$|  $me 1.0: ???|" \
+      -e "s|^=====*|=======================|" $*
+}
+
+test_log_expected ()
+{
+  test_log_edit orig > exp
+  test_log_edit $1   > got
+  diff exp got || Exit 1
+  rm -f exp got
+}
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check
+ls -l
+cat test-suite.log
+cp test-suite.log orig
+
+$MAKE clean
+test -f test-suite.log && Exit 99 # Sanity check.
+
+# Check that we can override the testsuite log file at runtime.
+TEST_SUITE_LOG=zardoz.log $MAKE -e check
+ls -l
+test ! -f test-suite.log
+cat zardoz.log
+test_log_expected zardoz.log
+# Sanity check the distribution too (this also does minimal checks on
+# VPATH support).
+TEST_SUITE_LOG=zardoz.log $MAKE -e distcheck
+
+# Check that cleanup rules remove the correct file even when
+# user overrides are in place.
+cp orig test-suite.log
+TEST_SUITE_LOG=zardoz.log $MAKE -e clean
+ls -l
+test ! -f zardoz.log
+diff orig test-suite.log
+
+# Check that the default testsuite log doesn't get unduly modified.
+# Also check that the testsuite log file doesn't need to be named
+# accordingly to the '*.log' pattern.
+chmod a-w test-suite.log
+TEST_SUITE_LOG=TheLogFile $MAKE -e check
+ls -l
+diff orig test-suite.log
+test_log_expected TheLogFile
+TEST_SUITE_LOG=TheLogFile $MAKE -e clean
+ls -l
+test ! -f TheLogFile
+diff orig test-suite.log
+
+:
diff --git a/t/parallel-tests-log-override-2.sh 
b/t/parallel-tests-log-override-2.sh
new file mode 100755
index 0000000..ca0b59f
--- /dev/null
+++ b/t/parallel-tests-log-override-2.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features: runtime redefinition of:
+#  - $(TEST_SUITE_LOG) and $(TESTS)
+#  - $(TEST_SUITE_LOG) and $(TEST_LOGS)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = pass.test pass2.test skip.test skip2.test fail.test
+END
+
+cat > pass.test <<'END'
+#! /bin/sh
+exit 0
+END
+
+cp pass.test pass2.test
+
+cat > skip.test <<'END'
+#! /bin/sh
+echo "% skipped test %"
+exit 77
+END
+
+cp skip.test skip2.test
+
+cat > fail.test <<'END'
+#! /bin/sh
+exit 1
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+for test_list_override in \
+  'TESTS=pass.test skip.test' \
+  'TEST_LOGS=pass.log skip.log'
+do
+  env TEST_SUITE_LOG=partial.log "$test_list_override" \
+    $MAKE -e check >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  ls -l
+  count_test_results total=2 pass=1 fail=0 skip=1 xfail=0 xpass=0 error=0
+  cat pass.log
+  cat skip.log
+  cat partial.log
+  test ! -f test-suite.log
+  test ! -f pass2.log
+  test ! -f skip2.log
+  test ! -f fail.log
+  grep '^PASS: pass\.test$' stdout
+  grep '^SKIP: skip\.test$' stdout
+  $FGREP 'SKIP: skip' partial.log
+  $FGREP '% skipped test %' partial.log
+  $EGREP '(pass2|skip2|fail)\.test' stdout && Exit 1
+  $EGREP '(pass2|skip2|fail)' partial.log && Exit 1
+  rm -f *.log
+done
+
+:
diff --git a/t/parallel-tests-log-override-recheck.sh 
b/t/parallel-tests-log-override-recheck.sh
new file mode 100755
index 0000000..c7c1b2b
--- /dev/null
+++ b/t/parallel-tests-log-override-recheck.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG)
+# for the recheck target.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TESTS = foofoo.test barbar.test bazbaz.test
+END
+
+cat > foofoo.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 0
+END
+
+cat > barbar.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 99
+END
+
+cat > bazbaz.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit ${BAZ_EXIT_STATUS-1}
+END
+
+chmod a+x *.test
+
+unset BAZ_EXIT_STATUS || :
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Filter make output before grepping it, for make implementations that,
+# like Solaris' one, print the whole of the failed recipe on failure.
+filter_stdout ()
+{
+  grep -v 'bases=.*;' stdout > t && mv -f t stdout
+}
+
+./configure
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+chmod a-rw test-suite.log
+TEST_SUITE_LOG=my.log $MAKE -e recheck >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+ls -l
+filter_stdout
+count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1
+for x in stdout my.log; do
+  $FGREP foofoo $x && Exit 1
+  $FGREP barbar $x
+  $FGREP bazbaz $x
+done
+
+chmod a-rw my.log
+BAZ_EXIT_STATUS=0 TEST_SUITE_LOG=my2.log $MAKE -e recheck >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+ls -l
+count_test_results total=2 pass=1 fail=0 skip=0 xfail=0 xpass=0 error=1
+filter_stdout
+$FGREP foofoo stdout && Exit 1
+$FGREP barbar stdout
+$FGREP bazbaz stdout
+$FGREP foofoo my2.log && Exit 1
+$FGREP barbar my2.log
+$FGREP bazbaz my2.log && Exit 1
+
+chmod u+r test-suite.log my.log
+$FGREP bazbaz test-suite.log
+$FGREP bazbaz my.log
+
+:
diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh
new file mode 100755
index 0000000..a09dbe5
--- /dev/null
+++ b/t/parallel-tests-many.sh
@@ -0,0 +1,190 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the parallel-tests harness does not hit errors due to
+# an exceeded command line length when there are many tests.
+# For automake bug#7868.  This test is currently expected to fail.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+# Sanity check that the $(TESTS) is going to exceed the system
+# command line length.
+# Extra quoting and indirections below are required to ensure the
+# various make implementations (e.g, GNU make or Sun Distributed Make)
+# will truly spawn a shell to execute this command, instead of relying
+# on optimizations that might mask the "Argument list too long" error
+# we expect.
+this-will-fail:
+       @":" && ":" $(TEST_LOGS)
+TEST_LOG_COMPILER = true
+include list-of-tests.am
+# So that we won't have to create a ton of dummy test cases.
+$(TESTS):
+END
+
+# The real instance will be dynamically created later.
+echo TESTS = foo.test > list-of-tests.am
+
+$ACLOCAL && $AUTOCONF && $AUTOMAKE -a \
+  || framework_failure_ "unexpected autotools failure"
+./configure \
+  || framework_failure_ "unexpected configure failure"
+
+# We want to hit the system command-line length limit without hitting
+# the filename length limit or the PATHMAX limit; so we use longish
+# (but not too long) names for the testcase, and place them in a nested
+# (but not too deeply) directory.
+# We also prefer to use the minimal(ish) number of test cases that can
+# make us hit the command-line length limit, since the more the test
+# cases are, the more time "automake" and "make check" will take to run
+# (especially on Cygwin and MinGW/MSYS).
+
+tname="wow-this-is-a-very-long-name-for-a-simple-dummy-test-case"
+dname="and-this-too-is-a-very-long-name-for-a-dummy-directory"
+
+deepdir=.
+depth=0
+for i in 1 2 3 4 5 6 7 8 9 10 12 13 14 15 16 17 18 19 29 21 22 23 24; do
+  new_deepdir=$deepdir/$dname.d$i
+  mkdir $new_deepdir || break
+  tmpfile=$new_deepdir/$tname-some-more-chars-for-good-measure
+  if touch $tmpfile; then
+    rm -f $tmpfile || Exit 99
+  else
+    rmdir $new_deepdir || Exit 99
+  fi
+  deepdir=$new_deepdir
+  unset tmpfile new_deepdir
+  depth=$i
+done
+
+cat <<END
+*********************************************************************
+Our tests will be in the following directory (depth = $depth)
+*********************************************************************
+$deepdir
+*********************************************************************
+END
+
+setup_data ()
+{
+  # Use perl, not awk, to avoid errors like "awk: string too long"
+  # (seen e.g. with Solaris 10 /usr/bin/awk).
+  count=$count deepdir=$deepdir tname=$tname $PERL -e '
+    use warnings FATAL => "all";
+    use strict;
+    print "TESTS = \\\n";
+    my $i = 0;
+    while (++$i)
+      {
+        print "  $ENV{deepdir}/$ENV{tname}-$i.test";
+        if ($i >= $ENV{count})
+          {
+            print "\n";
+            last;
+          }
+        else
+          {
+            print " \\\n";
+          }
+      }
+  ' > list-of-tests.am || Exit 99
+  sed 20q list-of-tests.am || Exit 99 # For debugging.
+  $AUTOMAKE Makefile \
+    || framework_failure_ "unexpected automake failure"
+  ./config.status Makefile \
+    || framework_failure_ "unexpected config.status failure"
+}
+
+for count in 1 2 4 8 12 16 20 24 28 32 48 64 96 128 E_HUGE; do
+  test $count = E_HUGE && break
+  count=`expr $count '*' 100` || Exit 99
+  setup_data
+  if $MAKE this-will-fail; then
+    continue
+  else
+    # We have managed to find a number of test cases large enough to
+    # hit the system command-line limits; we can stop.  But first, for
+    # good measure, increase the number of tests of some 20%, to be
+    # "even more sure" of really tickling command line length limits.
+    count=`expr '(' $count '*' 12 ')' / 10` || Exit 99
+    setup_data
+    break
+  fi
+done
+
+if test $count = E_HUGE; then
+  framework_failure_ "system has a too-high limit on command line length"
+else
+  cat <<END
+*********************************************************************
+               Number of tests we will use: $count
+*********************************************************************
+END
+fi
+
+env TESTS=$deepdir/$tname-1.test $MAKE -e check \
+  && test -f $deepdir/$tname-1.log \
+  || framework_failure_ "\"make check\" with one single tests"
+
+rm -f $deepdir/* || Exit 99
+
+$MAKE check > stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep "^# TOTAL: $count$" stdout
+grep "^# PASS:  $count$" stdout
+
+grep "^PASS: .*$tname-[0-9][0-9]*\.test" stdout > grp
+ls -1 $deepdir | grep '\.log$' > lst
+
+sed 20q lst # For debugging.
+sed 20q grp # Likewise.
+
+test `cat <grp | wc -l` -eq $count
+test `cat <lst | wc -l` -eq $count
+
+# We need to simulate a failure of two tests.
+st=0
+env TESTS="$deepdir/$tname-1.test $deepdir/$tname-2.test" \
+    TEST_LOG_COMPILER=false $MAKE -e check > stdout && st=1
+cat stdout
+test `grep -c '^FAIL:' stdout` -eq 2 || st=1
+test $st -eq 0 || fatal_ "couldn't simulate failure of two tests"
+unset st
+
+$MAKE recheck > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep "^PASS: .*$tname-1\.test" stdout
+grep "^PASS: .*$tname-2\.test" stdout
+test `LC_ALL=C grep -c "^[A-Z][A-Z]*:" stdout` -eq 2
+grep "^# TOTAL: 2$" stdout
+grep "^# PASS:  2$" stdout
+
+# "make clean" might ignore some failures, so we prefer to also grep its
+# output to ensure that no "Argument list too long" error was encountered.
+$MAKE clean >output 2>&1 || { cat output; Exit 1; }
+cat output
+grep -i 'list.* too long' output && Exit 1
+ls $deepdir | grep '\.log$' && Exit 1
+
+:
diff --git a/t/parallel-tests-no-color-in-log.sh 
b/t/parallel-tests-no-color-in-log.sh
new file mode 100755
index 0000000..17115b9
--- /dev/null
+++ b/t/parallel-tests-no-color-in-log.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Colorized output from the testsuite report shouldn't end up in log files.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+esc=''
+
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$esc" | $FGREP "$esc"` in
+  "$esc") ;;
+# Creative quoting below to please maintainer-check.
+  *) echo "$me: f""grep can't parse nonprinting characters" >&2; Exit 77;;
+esac
+
+TERM=ansi; export TERM
+
+cat >>configure.ac <<END
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+LOG_COMPILER = $(SHELL)
+AUTOMAKE_OPTIONS = color-tests parallel-tests
+TESTS = pass fail skip xpass xfail error
+XFAIL_TESTS = xpass xfail
+END
+
+# Creative quoting to please maintainer-check.
+echo exit '0' > pass
+echo exit '0' > xpass
+echo exit '1' > fail
+echo exit '1' > xfail
+echo exit '77' > skip
+echo exit '99' > error
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+mv config.log config-log # Avoid possible false positives below.
+AM_COLOR_TESTS=always $MAKE -e check && Exit 1
+$FGREP "$esc" *.log && Exit 1
+
+:
diff --git a/t/parallel-tests-no-spurious-summary.sh 
b/t/parallel-tests-no-spurious-summary.sh
new file mode 100755
index 0000000..62b4ef6
--- /dev/null
+++ b/t/parallel-tests-no-spurious-summary.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that ':test-results:' directives in test scripts' output doesn't
+# originate spurious results in the testsuite summary.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+echo :test-result:XFAIL
+echo :test-result: SKIP
+echo :test-result:ERROR
+exit 0
+END
+cat > bar.test <<'END'
+#! /bin/sh
+echo :test-result: ERROR
+echo :test-result:FAIL
+echo :test-result: XPASS
+exit 0
+END
+chmod a+x foo.test bar.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+st=0
+$MAKE check >stdout || st=$?
+cat stdout
+cat test-suite.log
+cat foo.log
+cat bar.log
+test $st -eq 0 || Exit $st
+
+grep '^:test-result:XFAIL$'  foo.log
+grep '^:test-result: SKIP$'  foo.log
+grep '^:test-result:FAIL$'   bar.log
+grep '^:test-result: XPASS$' bar.log
+
+count_test_results total=2 pass=2 fail=0 skip=0 xfail=0 xpass=0 error=0
+
+:
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
new file mode 100755
index 0000000..53ee677
--- /dev/null
+++ b/t/parallel-tests-once.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests shouldn't be run multiple times by a simple "make check" in a
+# clean directory.  An early implementation of the '.trs' intermediate
+# files incurred a similar problem.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+test -f foo.run && Exit 1
+: > foo.run
+END
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check
+test -f foo.run # Sanity check.
+
+:
diff --git a/t/parallel-tests-recheck-depends-on-all.sh 
b/t/parallel-tests-recheck-depends-on-all.sh
new file mode 100755
index 0000000..6c9e4cb
--- /dev/null
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The parallel-tests 'recheck' target must depend on the 'all' target.
+# See automake bug#11252.
+
+am_parallel_tests=yes
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+all-local:
+       test ! -f status || echo okokok > status
+bin_PROGRAMS = foo
+TESTS = a.test b.test c.test
+END
+
+cat > foo.c << 'END'
+#include <stdio.h>
+int main (void)
+{
+  printf ("failure :-(" "\n");
+  return 1;
+}
+END
+
+cat > a.test << 'END'
+#!/bin/sh
+exit 0
+END
+
+cat > b.test << 'END'
+#!/bin/sh
+grep okokok status
+END
+
+cat > c.test << 'END'
+#!/bin/sh
+./foo
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=3 pass=1 fail=2 skip=0 xfail=0 xpass=0 error=0
+test ! -f status
+
+$sleep
+: > status
+cat > foo.c << 'END'
+#include <stdio.h>
+int main (void)
+{
+  printf ("success :-)" "\n");
+  return 0;
+}
+END
+
+$MAKE recheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=2 pass=2 fail=0 skip=0 xfail=0 xpass=0 error=0
+grep '^PASS: b\.test$' stdout
+grep '^PASS: c\.test$' stdout
+
+$MAKE recheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=0 pass=0 fail=0 skip=0 xfail=0 xpass=0 error=0
+
+:
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
new file mode 100755
index 0000000..6307f6e
--- /dev/null
+++ b/t/parallel-tests-reset-term.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the parallel-tests driver correctly handle overrides of the
+# TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+esc='['
+
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$esc" | $FGREP "$esc"` in
+  "$esc") ;;
+  *) skip_ "$FGREP can't parse nonprinting characters" ;;
+esac
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AM_COLOR_TESTS = always
+AUTOMAKE_OPTIONS = color-tests
+TESTS = foobar
+END
+
+cat > foobar << 'END'
+#!/bin/sh
+echo "TERM='$TERM'"
+echo "expected_term='$expected_term'"
+test x"$TERM" = x"$expected_term"
+END
+chmod a+x foobar
+
+mkcheck ()
+{
+  if env AM_COLOR_TESTS=always $* $MAKE check > stdout; then
+    rc=0
+  else
+    rc=1
+  fi
+  cat stdout
+  cat foobar.log
+  cat test-suite.log
+  return $rc
+}
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+
+TERM=ansi; export TERM
+expected_term=dumb; export expected_term
+mkcheck TESTS_ENVIRONMENT='TERM=dumb'
+cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
+
+TERM=dumb; export TERM
+expected_term=ansi; export expected_term
+mkcheck TESTS_ENVIRONMENT='TERM=ansi'
+cat stdout | $FGREP "$esc" && Exit 1
+
+TERM=ansi; export TERM
+expected_term=dumb; export expected_term
+mkcheck AM_TESTS_ENVIRONMENT='TERM=dumb'
+cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
+
+TERM=dumb; export TERM
+expected_term=ansi; export expected_term
+mkcheck AM_TESTS_ENVIRONMENT='TERM=ansi'
+cat stdout | $FGREP "$esc" && Exit 1
+
+:
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
new file mode 100755
index 0000000..6848edb
--- /dev/null
+++ b/t/parallel-tests-subdir.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the parallel-tests driver creates parent directories for
+# the log files when needed.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = dir1/foo.test dir2/dir3/foo.test
+TEST_LOG_COMPILER = sh
+END
+
+mkdir dir1 dir2 dir2/dir3
+echo : > dir1/foo.test
+echo : > dir2/dir3/foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+../configure
+$MAKE check
+find . # For debugging.
+test -f test-suite.log
+test -f dir1/foo.log
+test -f dir1/foo.trs
+test -f dir2/dir3/foo.log
+test -f dir2/dir3/foo.trs
+
+:
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
new file mode 100755
index 0000000..abd4a5c
--- /dev/null
+++ b/t/parallel-tests-suffix-prog.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - suffix rules, with PROGRAMS involved
+# See also sister test 'parallel-tests-suffix.test'.
+
+am_parallel_tests=yes
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+## Note that automake should not match the '/test' part of 'sub/test' as
+## '.test' suffix, nor the '/chk' part of 'sub/chk' as '.chk' suffix.
+TESTS = $(dist_TESTS) $(check_PROGRAMS)
+dist_TESTS = foo.chk bar.test sub/test
+check_PROGRAMS = baz bla.test bli.suff sub/chk
+TEST_EXTENSIONS = .chk .test
+EXTRA_DIST = $(dist_TESTS)
+END
+
+mkdir sub
+
+cat >foo.chk << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x foo.chk
+cp foo.chk bar.test
+cp foo.chk sub/test
+
+cat >baz.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+cp baz.c bla.c
+cp baz.c bli.c
+cp baz.c sub/chk.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+ls -l . sub
+test -f foo.log
+test -f bar.log
+test -f baz.log
+test -f bla.log
+test -f bli.suff.log
+test -f sub/chk.log
+test -f sub/test.log
+
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
new file mode 100755
index 0000000..bd72d0d
--- /dev/null
+++ b/t/parallel-tests-suffix.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - suffix rules
+# See also sister test 'parallel-tests-suffix-prog.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+## Note that automake should not match the '/test' part
+## of 'sub/test' as '.test' suffix.
+TESTS = foo.chk bar.test baz bli.suff sub/test
+TEST_EXTENSIONS = .chk .test
+EXTRA_DIST = $(TESTS)
+END
+
+mkdir sub
+
+cat >foo.chk << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x foo.chk
+cp foo.chk bar.test
+cp foo.chk baz
+cp foo.chk bli.suff
+cp foo.chk sub/test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+ls -l . sub
+test -f foo.log
+test -f bar.log
+test -f baz.log
+test -f bli.suff.log
+test -f sub/test.log
+
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests-trailing-bslash.sh 
b/t/parallel-tests-trailing-bslash.sh
new file mode 100755
index 0000000..4b3bdf8
--- /dev/null
+++ b/t/parallel-tests-trailing-bslash.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the new testsuite harness do not generate recipes that can
+# have a trailing '\', since that can cause spurious syntax errors with
+# older bash versions (e.g., bash 2.05b).
+# See automake bug#10436.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+TESTS = foo.test
+EXTRA_DIST = $(TESTS)
+am__backslash = \\ # foo
+.PHONY: bad-recipe
+bad-recipe:
+       @printf '%s\n' $(am__backslash)
+END
+
+cat > foo.test <<'END'
+#!/bin/sh
+exit 0
+END
+chmod +x foo.test
+
+am__SHELL=$SHELL; export am__SHELL
+am__PERL=$PERL; export am__PERL
+
+cat > my-shell <<'END'
+#!/bin/sh -e
+set -u
+tab='  '
+nl='
+'
+am__shell_flags=
+am__shell_command=; unset am__shell_command
+while test $# -gt 0; do
+  case $1 in
+    # If the shell is invoked by make e.g. as "sh -ec" (seen on
+    # GNU make in POSIX mode) or "sh -ce" (seen on Solaris make).
+    -*c*)
+        flg=`echo x"$1" | sed -e 's/^x-//' -e 's/c//g'`
+        if test x"$flg" != x; then
+          am__shell_flags="$am__shell_flags -$flg"
+        fi
+        am__shell_command=$2
+        shift
+        ;;
+    -?*)
+        am__shell_flags="$am__shell_flags $1"
+        ;;
+      *)
+        break
+        ;;
+  esac
+  shift
+done
+if test x${am__shell_command+"set"} != x"set"; then
+  # Some make implementations, like *BSD's, pass the recipes to the shell
+  # through its standard input.  Trying to run our extra checks in this
+  # case would be too tricky, so we just skip them.
+  exec $am__SHELL $am__shell_flags ${1+"$@"}
+else
+  am__tweaked_shell_command=`printf '%s\n' "$am__shell_command" \
+    | tr -d " $tab$nl"`
+  case ${am__tweaked_shell_command-} in
+    *\\)
+      echo "my-shell: recipe ends with backslash character" >&2
+      printf '%s\n' "=== BEGIN recipe" >&2
+      printf '%s\n' "${am__shell_command-}" >&2
+      printf '%s\n' "=== END recipe" >&2
+      exit 99
+      ;;
+  esac
+  exec $am__SHELL $am__shell_flags -c "$am__shell_command" ${1+"$@"}
+fi
+END
+chmod a+x my-shell
+
+cat my-shell
+
+CONFIG_SHELL=`pwd`/my-shell; export CONFIG_SHELL
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure CONFIG_SHELL="$CONFIG_SHELL"
+
+st=0
+$MAKE bad-recipe 2>stderr && st=1
+cat stderr >&2
+$FGREP "my-shell: recipe ends with backslash character" stderr || st=1
+test $st -eq 0 || skip_ "can't catch trailing backslashes in make recipes"
+
+$MAKE check
+
+:
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
new file mode 100755
index 0000000..7ddb9db
--- /dev/null
+++ b/t/parallel-tests-unreadable.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the testsuite driver copes well with unreadable '.log'
+# and '.trs' files.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+: > t
+chmod a-r t && test ! -r t || skip_ "you can still read unreadable files"
+rm -f t
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+echo foofoofoo
+exit 0
+END
+
+cat > bar.test << 'END'
+#! /bin/sh
+echo barbarbar
+exit 77
+END
+
+chmod a+x foo.test bar.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+for files in \
+  'foo.log bar.log' \
+  'foo.trs bar.trs' \
+  'foo.trs bar.log' \
+  'foo.log bar.trs' \
+; do
+  $MAKE check
+  rm -f test-suite.log
+  chmod a-r $files
+  $MAKE test-suite.log || { ls -l; Exit 1; }
+  ls -l
+  grep '^foofoofoo$' foo.log
+  grep '^:test-result: PASS' foo.trs
+  grep '^barbarbar$' bar.log
+  grep '^:test-result: SKIP' bar.trs
+  grep '^SKIP: bar' test-suite.log
+  grep '^barbarbar$' test-suite.log
+  $EGREP ':.*foo|foofoofoo' test-suite.log && Exit 1
+  : For shells with busted 'set -e'.
+done
+
+:
diff --git a/t/parallel-tests.sh b/t/parallel-tests.sh
new file mode 100755
index 0000000..891d7bd
--- /dev/null
+++ b/t/parallel-tests.sh
@@ -0,0 +1,152 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic checks on parallel-tests support:
+#  - console output
+#  - log files, and what goes in 'test-suite.log'
+#  - make clean
+#  - dependencies between tests
+#  - TESTS redefinition at runtime
+#  - TEST_LOGS redefinition at runtime
+#  - RECHECK_LOGS redefinition at runtime
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test baz.test
+XFAIL_TESTS = bar.test
+foo.log: bar.log
+bar.log: baz.log
+END
+
+# foo.test and bar.test sleep to ensure their logs are always strictly newer
+# than the logs of their prerequisites, for HP-UX make.  The quoting pleases
+# maintainer-check.
+cat > foo.test <<'END'
+#! /bin/sh
+echo "this is $0"
+sleep '1'
+exit 0
+END
+cat > bar.test <<'END'
+#! /bin/sh
+echo "this is $0"
+sleep '1'
+exit 99
+END
+cat > baz.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 1
+END
+chmod a+x foo.test bar.test baz.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=3 pass=1 fail=1 skip=0 xfail=0 xpass=0 error=1
+test -f test-suite.log
+cat test-suite.log
+test `grep -c '^FAIL:' test-suite.log` -eq 1
+test `grep -c '^ERROR:' test-suite.log` -eq 1
+$EGREP '^(X?PASS|XFAIL|SKIP)' test-suite.log && Exit 1
+test -f baz.log
+test -f bar.log
+test -f foo.log
+
+$MAKE clean
+test ! -f baz.log
+test ! -f bar.log
+test ! -f foo.log
+test ! -f test-suite.log
+
+# Check dependencies: baz.test needs to run before bar.test,
+# but foo.test is not needed.
+# Note that this usage has a problem: the summary will only
+# take bar.log into account, because the $(TEST_SUITE_LOG) rule
+# does not "see" baz.log.  Hmm.
+env TESTS='bar.test' $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^FAIL: baz\.test$' stdout
+grep '^ERROR: bar\.test$' stdout
+
+test -f baz.log
+test -f bar.log
+test ! -f foo.log
+test -f test-suite.log
+
+# Upon a lazy rerun, foo.test should be run, but the others shouldn't.
+# Note that the lazy rerun still exits with a failure, due to the previous
+# test failures.
+# Note that the previous test and this one taken together expose the timing
+# issue that requires the check-TESTS rule to always remove TEST_SUITE_LOG
+# before running the tests lazily.
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+test -f foo.log
+grep '^PASS: foo\.test$' stdout
+grep bar.test stdout && Exit 1
+grep baz.test stdout && Exit 1
+grep '^# PASS: *1$' stdout
+grep '^# FAIL: *1$' stdout
+grep '^# ERROR: *1$' stdout
+
+# Now, explicitly retry with all test logs already updated, and ensure
+# that the summary is still displayed.
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep foo.test stdout && Exit 1
+grep bar.test stdout && Exit 1
+grep baz.test stdout && Exit 1
+grep '^# PASS: *1$' stdout
+grep '^# FAIL: *1$' stdout
+grep '^# ERROR: *1$' stdout
+
+# Lazily rerunning only foo should only rerun this one test.
+env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep foo.test stdout
+grep bar.test stdout && Exit 1
+grep baz.test stdout && Exit 1
+grep '^# PASS: *1$' stdout
+grep '^# FAIL: *1$' stdout
+grep '^# ERROR: *1$' stdout
+
+$MAKE clean
+env TEST_LOGS=baz.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep foo.test stdout && Exit 1
+grep bar.test stdout && Exit 1
+grep baz.test stdout
+
+$MAKE clean
+env TESTS=baz.test $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep foo.test stdout && Exit 1
+grep bar.test stdout && Exit 1
+grep baz.test stdout
+
+:
diff --git a/t/parallel-tests10.sh b/t/parallel-tests10.sh
new file mode 100755
index 0000000..2396482
--- /dev/null
+++ b/t/parallel-tests10.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - trailing whitespace in TESTS
+# GNU make 3.80 may expand trailing white space to '.log'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo $(BAR)
+BAR =
+END
+
+cat >foo <<'END'
+#! /bin/sh
+exit 0
+END
+
+chmod +x ./foo
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+
+:
diff --git a/t/parallel-tests2.sh b/t/parallel-tests2.sh
new file mode 100755
index 0000000..73daf43
--- /dev/null
+++ b/t/parallel-tests2.sh
@@ -0,0 +1,149 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+#  - check-html
+#  - recheck-html
+# FIXME: the features tested by this script has been moved in contrib.
+# FIXME: We should move this script accordingly.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+# Try the variants that are tried in check-html.am.
+while :; do
+  for r2h in $RST2HTML rst2html rst2html.py; do
+    echo "$me: running $r2h --version"
+    # Don't use "&&" here, or a bug of 'set -e' present in some
+    # versions of the BSD shell will be triggered.  We add the
+    # dummy "else" branch for extra safety.
+    if $r2h --version; then break 2; else :; fi
+  done
+  skip_all_ "no proper rst2html program found"
+done
+unset r2h
+
+cp "$am_top_srcdir"/contrib/check-html.am . \
+  || fatal_ "cannot fetch 'check-html.am' from contrib"
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_SUITE_LOG = mylog.log
+TESTS = foo.test bar.test baz.test
+check_SCRIPTS = bla
+bla:
+       echo bla > $@
+CLEANFILES = bla
+include $(srcdir)/check-html.am
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+echo "this is $0"
+test -f bla || exit 1
+exit 0
+END
+
+cat > bar.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 99
+END
+
+cat > baz.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 1
+END
+
+chmod a+x foo.test bar.test baz.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check-html && Exit 1
+test -f mylog.html
+# check-html should cause check_SCRIPTS to be created.
+test -f bla
+
+# "make clean" should remove HTML files.
+$MAKE clean
+test ! -f mylog.html
+test ! -f bla
+
+# Always create the HTML output, even if there were no failures.
+rm -f mylog.html
+env TESTS=foo.test $MAKE -e check-html
+test -f mylog.html
+
+# Create summarizing HTML output also with recheck-html.
+rm -f mylog.html
+env TESTS=foo.test $MAKE -e recheck-html
+test -f mylog.html
+
+# Create HTML output for an individual test.
+$MAKE foo.html
+grep 'this is .*foo\.test' foo.html
+test ! -f bar.html
+test ! -f baz.html
+
+# Create HTML output for individual tests.  Since the pre-existing log
+# files are expected to be used for the HTML conversion, this should
+# go smoothly even for failed tests.
+$MAKE bar.html baz.html
+grep 'this is .*bar\.test' bar.html
+grep 'this is .*baz\.test' baz.html
+
+# HTML output removed by mostlyclean.
+$MAKE mostlyclean
+test ! -f foo.html
+test ! -f bar.html
+test ! -f baz.html
+test ! -f mylog.html
+
+# check-html and recheck-html should cause check_SCRIPTS to be created,
+# and recheck-html should rerun no tests if check has not been run.
+
+$MAKE clean
+test ! -f mylog.html
+env TEST_LOGS=foo.log $MAKE -e check-html
+test -f bla
+test -f foo.log
+test ! -f bar.log
+test ! -f baz.log
+test -f mylog.html
+
+$MAKE clean
+env TESTS=foo.test $MAKE -e recheck-html
+test -f bla
+test ! -f foo.log
+test -f mylog.html
+
+$MAKE clean
+$MAKE recheck-html
+test -f bla
+test ! -f foo.log
+test ! -f bar.log
+test ! -f baz.log
+test -f mylog.html
+
+:
diff --git a/t/parallel-tests3.sh b/t/parallel-tests3.sh
new file mode 100755
index 0000000..f06d093
--- /dev/null
+++ b/t/parallel-tests3.sh
@@ -0,0 +1,116 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - concurrent parallel execution
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+case $MAKE in
+  *\ -j*) skip_ "\$MAKE contains '-j'";;
+esac
+
+if using_gmake; then
+  j=-j
+else
+  unindent > Makefile <<END
+    all: one two
+    one:
+       $sleep && test -f two
+    two:
+       echo ok > \$@
+END
+  for j in "-j" "-j " NONE; do
+    if test x"$j" = xNONE; then
+      skip_ "can't run make in parallel mode"
+    fi
+    $MAKE ${j}2 all >output 2>&1 || continue
+    $EGREP -i "(warning|error):|-j[\"\'\` ]" output && continue
+    break
+  done
+  rm -f one output Makefile
+fi
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS =
+END
+
+cat > x <<'END'
+#! /bin/sh
+echo "this is $0"
+# Creative quoting below to please maintainer-check.
+sleep '1'
+exit 0
+END
+chmod a+x ./x
+
+mkdir sub
+for i in 1 2 3; do
+  echo "TESTS += foo$i.test" >> Makefile.am
+  cp x foo$i.test
+  echo "TESTS += zap$i" >> Makefile.am
+  cp x zap$i
+  echo "TESTS += sub/bar$i.test" >> Makefile.am
+  cp x sub/bar$i.test
+  echo "TESTS += sub/mu$i" >> Makefile.am
+  cp x sub/mu$i
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for build in serial parallel; do
+  mkdir $build
+  cd $build
+  ../configure
+  $MAKE
+  cd ..
+done
+
+cd serial
+$MAKE ${j}1 check &
+cd ../parallel
+$sleep
+# Use append mode here to avoid dropping output.
+# Yes, this actually happens.
+: >stdout
+$MAKE ${j}4 check >> stdout
+cd ..
+# Ensure the tests are really being run in parallel mode: if this is
+# the case, the serial run of the dummy testsuite started above should
+# still be ongoing when the parallel one has terminated.
+kill -0 $!
+cat parallel/stdout
+test `grep -c '^PASS:' parallel/stdout` -eq 12
+
+# Wait long enough so that there are no open files any more when the
+# post-test cleanup runs.  But exit after we've waited for two minutes
+# or more, to avoid testsuite hangs in unusual situations (this has
+# already happened).
+i=1
+while test ! -f serial/test-suite.log && test $i -le 120; do
+  i=`expr $i + 1`
+  sleep '1' # Extra quoting to please maintainer-check.
+done
+$sleep
+
+:
diff --git a/t/parallel-tests5.sh b/t/parallel-tests5.sh
new file mode 100755
index 0000000..9f0a966
--- /dev/null
+++ b/t/parallel-tests5.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - concurrent program compilation and testing (with EXTRA_PROGRAMS)
+#
+# Actually, this test doesn't ensure that things happen concurrently.
+# It merely serves as demonstration.  :-)
+
+am_parallel_tests=yes
+required='cc native GNUmake'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = $(programs) $(scripts)
+EXTRA_PROGRAMS = $(programs)
+CLEANFILES = $(EXTRA_PROGRAMS)
+dist_noinst_SCRIPTS = $(scripts)
+programs =
+scripts =
+END
+
+for i in 1 2 3 4 5 6 7 8; do
+  echo "scripts += foo$i.test" >> Makefile.am
+  echo "programs += foo$i.prog" >> Makefile.am
+  unindent >foo$i.test <<'END'
+    #! /bin/sh
+    echo "this is $0"
+    exit 0
+END
+  cat >foo$i.c <<'END'
+    int main (void)
+    {
+      return 0;
+    }
+END
+  chmod a+x foo$i.test
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE -j4 check
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests6.sh b/t/parallel-tests6.sh
new file mode 100755
index 0000000..eee6538
--- /dev/null
+++ b/t/parallel-tests6.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - empty TESTS
+# BSD make will expand '$(TESTS:=.log)' to '.log' unless overridden.
+# See parallel-tests10.test for a similar issue.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+for x in TOTAL PASS FAIL XPASS FAIL SKIP ERROR; do
+  grep "^# $x: *0$" stdout
+done
+
+Exit 0
diff --git a/t/parallel-tests8.sh b/t/parallel-tests8.sh
new file mode 100755
index 0000000..8e35b6b
--- /dev/null
+++ b/t/parallel-tests8.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - generated distributed tests.
+# - listing $(srcdir)/ or $(top_srcdir)/ in TESTS doesn't work ATM,
+#   and is thus diagnosed.
+
+# TODO: this test should also ensure that the 'make' implementation
+#       properly adheres to rules in all cases.  See the Autoconf
+#       manual for the ugliness in this area, when VPATH comes into
+#       play.  :-/
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test
+## the next line will cause automake to error out:
+TESTS += $(srcdir)/bar.test $(top_srcdir)/baz.test
+.in.test:
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+       chmod +x $@
+check_SCRIPTS = $(TESTS)
+EXTRA_DIST = foo.in foo.test
+DISTCLEANFILES = foo.test
+END
+
+cat > foo.in <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 0
+END
+
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails -a
+grep '$(srcdir).*TESTS.*bar\.test' stderr
+grep '$(top_srcdir).*TESTS.*baz\.test' stderr
+
+sed '/^TESTS +=.*srcdir/d' < Makefile.am > t
+mv -f t Makefile.am
+$AUTOMAKE -a
+
+./configure
+$MAKE check
+$MAKE distcheck
+$MAKE distclean
+
+mkdir build
+cd build
+../configure
+$MAKE check
+test ! -f ../foo.log
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests9.sh b/t/parallel-tests9.sh
new file mode 100755
index 0000000..f22be8d
--- /dev/null
+++ b/t/parallel-tests9.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+# - recheck
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_SUITE_LOG = mylog.log
+TESTS = foo.test bar.test baz.test
+check_SCRIPTS = bla
+CLEANFILES = bla
+bla:
+       echo bla > $@
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+echo "this is $0"
+test -f bla || exit 1
+exit 0
+END
+cat > bar.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 99
+END
+cat > baz.test <<'END'
+#! /bin/sh
+echo "this is $0"
+exit 1
+END
+chmod a+x foo.test bar.test baz.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=3 pass=1 fail=1 skip=0 xfail=0 xpass=0 error=1
+
+$MAKE recheck >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1
+grep 'foo\.test' stdout && Exit 1
+grep '^ERROR: bar\.test$' stdout
+grep '^FAIL: baz\.test$' stdout
+
+# Ensure that recheck builds check_SCRIPTS, and that
+# recheck reruns nothing if check has not been run.
+$MAKE clean
+$MAKE recheck
+test -f bla
+test ! -f foo.log
+test ! -f bar.log
+test ! -f baz.log
+test -f mylog.log
+
+:
diff --git a/t/parse.sh b/t/parse.sh
new file mode 100755
index 0000000..20ac2fe
--- /dev/null
+++ b/t/parse.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure backslash-newline is treated as whitespace.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zot
+zot_SOURCES = \
+zar.c\
+doz.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP zar.cdoz Makefile.in && Exit 1
+Exit 0
diff --git a/t/percent.sh b/t/percent.sh
new file mode 100755
index 0000000..bdba44e
--- /dev/null
+++ b/t/percent.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that -Wportability understands %-style pattern
+# rules.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+EOF
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = liver
+liver_SOURCES = foo.c
+
+%.o: %.c
+       echo "gnu make extension"
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails -Wportability
+grep 'Makefile.am:4:.*%' stderr
diff --git a/t/percent2.sh b/t/percent2.sh
new file mode 100755
index 0000000..19af61a
--- /dev/null
+++ b/t/percent2.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another test for -Wportability warning about %-style rules, plus
+# make sure we don't warn about duplicate definition for
+# '${ARCH}/%.$(OBJEXT):'.
+# Report from Ralf Corsepius.
+
+. ./defs || Exit 1
+
+cat >>Makefile.am << 'EOF'
+${ARCH}/%.$(OBJEXT): %.S
+       test -d ${ARCH} || mkdir ${ARCH}
+       ${CCASCOMPILE} -o $@ -c $<
+
+${ARCH}/%.$(OBJEXT): %.c
+       test -d ${ARCH} || mkdir ${ARCH}
+       ${COMPILE} -o $@ -c $<
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '%.*pattern.*rules' stderr
+
+# No error otherwise.
+$AUTOMAKE -Wno-portability
diff --git a/t/phony.sh b/t/phony.sh
new file mode 100755
index 0000000..a818cfb
--- /dev/null
+++ b/t/phony.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure .PHONY can be given dependencies several times.
+# From Ralf Corsepius.
+
+. ./defs || Exit 1
+
+cat >Makefile.am << 'EOF'
+.PHONY: foo
+.PHONY: bar
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+test `$FGREP .PHONY: Makefile.in | wc -l` = 3
diff --git a/t/pluseq.sh b/t/pluseq.sh
new file mode 100755
index 0000000..7a8df81
--- /dev/null
+++ b/t/pluseq.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test '+=' functionality.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+data_DATA = zar
+data_DATA += doz
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP 'zar doz' Makefile.in
+
+:
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
new file mode 100755
index 0000000..e9ce944
--- /dev/null
+++ b/t/pluseq10.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for += and backslashes.
+# Reported by Ralf Corsepius.
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'END'
+AM_CONDITIONAL([A], [true])
+AM_CONDITIONAL([B], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foo =  0.h
+if A
+foo += a0.h \
+  a1.h
+foo += a2.h \
+  a3.h
+endif
+if B
+foo += b0.h \
+  b1.h
+endif
+
+.PHONY: print
+print:
+       @echo BEG: $(foo) :END
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE print >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
+
+:
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
new file mode 100755
index 0000000..4c0b888
--- /dev/null
+++ b/t/pluseq11.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for bug in variable concatenation with '+=': an extra backslash
+# is erroneously retained in the final value.
+# See also sister test pluseq11b.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+## Use more line continuation to ensure we are robust and can (hopefully)
+## cope any number of them, and not just one
+FOO = \
+\
+\
+bar
+## Both these two variable additions are required to trigger the bug.
+FOO +=
+FOO += baz
+
+.PHONY: test
+test:
+       case '$(FOO)' in *\\*) exit 1;; *) exit 0;; esac
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^ *FOO *=.*\\.' Makefile.in && Exit 1
+
+$AUTOCONF
+./configure
+$MAKE test
+
+:
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
new file mode 100755
index 0000000..102076a
--- /dev/null
+++ b/t/pluseq2.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test '+=' with conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
+
+cat > Makefile.am << 'END'
+
+if CHECK
+data_DATA = zar
+else
+data_DATA =
+endif
+
+if CHECK
+data_DATA += doz
+else
+data_DATA += dog
+endif
+
+END
+
+$ACLOCAL
+$AUTOMAKE
+grep 'CHECK_TRUE.*zar doz' Makefile.in
+grep 'CHECK_FALSE.*dog' Makefile.in
+
+:
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
new file mode 100755
index 0000000..fc7a496
--- /dev/null
+++ b/t/pluseq3.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another '+=' test with conditionals.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
+
+cat > Makefile.am << 'END'
+
+if CHECK
+data_DATA = zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+else
+data_DATA =
+endif
+
+if CHECK
+data_DATA += \
+ doz
+else
+data_DATA += dog
+endif
+
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'address@hidden@data_DATA = 
zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$' 
Makefile.in
+grep "address@hidden@${tab}doz$" Makefile.in
+
+grep 'address@hidden@data_DATA = dog$' Makefile.in
+
+:
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
new file mode 100755
index 0000000..59c82d8
--- /dev/null
+++ b/t/pluseq4.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Yet another '+=' test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+CC += -Dwhatever
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP '@CC@ -Dwhatever' Makefile.in
+
+:
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
new file mode 100755
index 0000000..5db9c47
--- /dev/null
+++ b/t/pluseq5.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for another '+=' problem.  Report from Brian Jones.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
+
+cat > Makefile.am << 'END'
+if CHECK
+INCLUDES = abc
+endif
+INCLUDES += def
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+
+# We expect the following diagnostic:
+#
+# Makefile.am:4: cannot apply '+=' because 'INCLUDES' is not defined in
+# Makefile.am:4: the following conditions:
+# Makefile.am:4:   !CHECK
+# Makefile.am:4: either define 'INCLUDES' in these conditions, or use
+# Makefile.am:4: '+=' in the same conditions as the definitions.
+
+# Is !CHECK mentioned?
+grep ':.*!CHECK$' stderr
+# Is there only one missing condition?
+test `grep ':  ' stderr | wc -l` = 1
+
+# By the way, Automake should suggest using AM_CPPFLAGS,
+# because INCLUDES is an obsolete name.
+grep AM_CPPFLAGS stderr
+
+# A way to suppress the obsolete warning is to use
+# -Wno-obsolete:
+echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am
+AUTOMAKE_fails
+grep AM_CPPFLAGS stderr && Exit 1
+# !CHECK should still be mentioned.
+grep ':.*!CHECK$' stderr
+
+:
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
new file mode 100755
index 0000000..7a8f187
--- /dev/null
+++ b/t/pluseq6.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that '+=' works with standard header-vars.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([ZZZ])
+END
+
+# If you do this in a real Makefile.am, I will kill you.
+cat > Makefile.am << 'END'
+mandir += foo
+zq = zzz
+END
+
+$ACLOCAL
+$AUTOMAKE
+$FGREP '@mandir@ foo' Makefile.in
+
+num=`grep '^mandir =' Makefile.in | wc -l`
+test $num -eq 1
+
+:
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
new file mode 100755
index 0000000..7f5a32e
--- /dev/null
+++ b/t/pluseq7.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that '+=' fails when required.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+END
+
+# If you do this in a real Makefile.am, I will kill you.
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libq.a
+libq_a_SOURCES = q.c
+AR += qq
+END
+
+$ACLOCAL
+AUTOMAKE_fails -Wno-portability
+q="[\`'\"]"
+grep "^Makefile\.am:3:.* AR .* with $q=$q before .*$q+=$q" stderr
+
+:
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
new file mode 100755
index 0000000..724e4d5
--- /dev/null
+++ b/t/pluseq8.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another '+=' test.  From Paul Berrevoets.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+VAR = \
+    one \
+    two
+VAR += three
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+sed -n -e '/^VAR =/ {
+   :loop
+    p
+    n
+    t clear
+    :clear
+    s/\\$/\\/
+    t loop
+    p
+    n
+   }' Makefile.in | grep three
+
+:
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
new file mode 100755
index 0000000..f3c8021
--- /dev/null
+++ b/t/pluseq9.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the += diagnostics.
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AM_CONDITIONAL([COND3], [true])
+END
+
+cat > Makefile.am << 'END'
+if COND1
+  C = c
+if COND2
+    A = a
+    B = aa
+    C += cc
+else
+    A = b
+    B = bb
+endif
+  A += c
+else
+  A = d
+endif
+A += e
+
+if COND3
+  A += f
+  B = cc
+endif
+B += dd
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+
+# We expect the following diagnostic:
+#
+# Makefile.am:19: cannot apply '+=' because 'B' is not defined in
+# Makefile.am:19: the following conditions:
+# Makefile.am:19:   !COND1 and !COND3
+# Makefile.am:19: either define 'B' in these conditions, or use
+# Makefile.am:19: '+=' in the same conditions as the definitions.
+#
+# It would be nice if Automake could print only COND3_FALSE and
+# COND1_FALSE (merging the last two conditions), so we'll support
+# this case in the check too.
+
+grep '[cC]annot apply.*+=' stderr
+grep ':   !COND1 and !COND3$' stderr
+# Make sure there is exactly one missing condition.
+test `grep ':  ' stderr | wc -l` = 1
+
+:
diff --git a/t/pm/Cond2.pl b/t/pm/Cond2.pl
new file mode 100644
index 0000000..2bed028
--- /dev/null
+++ b/t/pm/Cond2.pl
@@ -0,0 +1,22 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Catch common programming error:
+# A Condition passed as a string to 'new'.
+
+use Automake::Condition;
+
+my $cond = new Automake::Condition ('TRUE');
+new Automake::Condition ($cond);
diff --git a/t/pm/Cond3.pl b/t/pm/Cond3.pl
new file mode 100644
index 0000000..518eea8
--- /dev/null
+++ b/t/pm/Cond3.pl
@@ -0,0 +1,22 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Catch common programming error:
+# A Condition passed as a string to 'new'.
+
+use Automake::Condition;
+
+my $cond = new Automake::Condition ("COND1_TRUE");
+new Automake::Condition ("$cond");
diff --git a/t/pm/Condition-t.pl b/t/pm/Condition-t.pl
new file mode 100644
index 0000000..d29407a
--- /dev/null
+++ b/t/pm/Condition-t.pl
@@ -0,0 +1,327 @@
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+BEGIN {
+  use Config;
+  if (eval { require 5.007_002; }      # for CLONE support
+      && $Config{useithreads}
+      && !$ENV{WANT_NO_THREADS})
+    {
+      require threads;
+      import threads;
+    }
+  else
+    {
+      exit 77;
+    }
+}
+use Automake::Condition qw/TRUE FALSE/;
+
+sub test_basics ()
+{
+  my @tests = (# [[Conditions], is_true?, is_false?, string, subst-string, 
human]
+              [[], 1, 0, 'TRUE', '', 'TRUE'],
+              [['TRUE'], 1, 0, 'TRUE', '', 'TRUE'],
+              [['FALSE'], 0, 1, 'FALSE', '#', 'FALSE'],
+              [['A_TRUE'], 0, 0, 'A_TRUE', '@A_TRUE@', 'A'],
+              [['A_TRUE', 'B_FALSE'],
+               0, 0, 'A_TRUE B_FALSE', '@A_TRUE@@B_FALSE@', 'A and !B'],
+              [['B_TRUE', 'FALSE'], 0, 1, 'FALSE', '#', 'FALSE'],
+              [['B_TRUE', 'B_FALSE'], 0, 1, 'FALSE', '#', 'FALSE']);
+
+  for (@tests)
+    {
+      my $a = new Automake::Condition @{$_->[0]};
+      return 1
+        if threads->new(sub {
+         return 1 if $_->[1] != $a->true;
+         return 1 if $_->[1] != ($a == TRUE);
+         return 1 if $_->[2] != $a->false;
+         return 1 if $_->[2] != ($a == FALSE);
+         return 1 if $_->[3] ne $a->string;
+         return 1 if $_->[4] ne $a->subst_string;
+         return 1 if $_->[5] ne $a->human;
+       })->join;
+    }
+  return 0;
+}
+
+sub test_true_when ()
+{
+  my $failed = 0;
+
+  my @tests = (# [When,
+              #  [Implied-Conditions],
+              #  [Not-Implied-Conditions]]
+              [['TRUE'],
+               [['TRUE']],
+               [['A_TRUE'], ['A_TRUE', 'B_FALSE'], ['FALSE']]],
+              [['A_TRUE'],
+               [['TRUE'], ['A_TRUE']],
+               [['A_TRUE', 'B_FALSE'], ['FALSE']]],
+              [['A_TRUE', 'B_FALSE'],
+               [['TRUE'], ['A_TRUE'], ['B_FALSE'], ['A_TRUE', 'B_FALSE']],
+               [['FALSE'], ['C_FALSE'], ['C_FALSE', 'A_TRUE']]]);
+
+  for my $t (@tests)
+    {
+      my $a = new Automake::Condition @{$t->[0]};
+      return 1
+        if threads->new(sub {
+         for my $u (@{$t->[1]})
+           {
+             my $b = new Automake::Condition @$u;
+             return threads->new(sub {
+               if (! $b->true_when ($a))
+                 {
+                   print "`" . $b->string .
+                     "' not implied by `" . $a->string . "'?\n";
+                   $failed = 1;
+                 }
+             })->join;
+           }
+         for my $u (@{$t->[2]})
+           {
+             my $b = new Automake::Condition @$u;
+             return threads->new(sub {
+               if ($b->true_when ($a))
+                 {
+                   print "`" . $b->string .
+                     "' implied by `" . $a->string . "'?\n";
+                   $failed = 1;
+                 }
+
+               return threads->new(sub {
+                 return 1 if $b->true_when ($a);
+               })->join;
+             })->join;
+           }
+        })->join;
+    }
+  return $failed;
+}
+
+sub test_reduce_and ()
+{
+  my @tests = (# If no conditions are given, TRUE should be returned
+              [[], ["TRUE"]],
+              # An empty condition is TRUE
+              [[""], ["TRUE"]],
+              # A single condition should be passed through unchanged
+              [["FOO"], ["FOO"]],
+              [["FALSE"], ["FALSE"]],
+              [["TRUE"], ["TRUE"]],
+              # TRUE and false should be discarded and overwhelm
+              # the result, respectively
+              [["FOO", "TRUE"], ["FOO"]],
+              [["FOO", "FALSE"], ["FALSE"]],
+              # Repetitions should be removed
+              [["FOO", "FOO"], ["FOO"]],
+              [["TRUE", "FOO", "FOO"], ["FOO"]],
+              [["FOO", "TRUE", "FOO"], ["FOO"]],
+              [["FOO", "FOO", "TRUE"], ["FOO"]],
+              # Two different conditions should be preserved,
+              # but TRUEs should be removed
+              [["FOO", "BAR"], ["BAR,FOO"]],
+              [["TRUE", "FOO", "BAR"], ["BAR,FOO"]],
+              [["FOO", "TRUE", "BAR"], ["BAR,FOO"]],
+              [["FOO", "BAR", "TRUE"], ["BAR,FOO"]],
+              # A condition implied by another condition should be removed.
+              [["FOO BAR", "BAR"], ["FOO BAR"]],
+              [["BAR", "FOO BAR"], ["FOO BAR"]],
+              [["TRUE", "FOO BAR", "BAR"], ["FOO BAR"]],
+              [["FOO BAR", "TRUE", "BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR", "TRUE"], ["FOO BAR"]],
+
+              [["BAR FOO", "BAR"], ["BAR FOO"]],
+              [["BAR", "BAR FOO"], ["BAR FOO"]],
+              [["TRUE", "BAR FOO", "BAR"], ["BAR FOO"]],
+              [["BAR FOO", "TRUE", "BAR"], ["BAR FOO"]],
+              [["BAR FOO", "BAR", "TRUE"], ["BAR FOO"]],
+
+              # Check that reduction happens even when there are
+              # two conditions to remove.
+              [["FOO", "FOO BAR", "BAR"], ["FOO BAR"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["FOO BAR", "FOO BAZ"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
+               ["FOO BAZ BAR"]],
+
+              # Duplicated conditionals should be removed.
+              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
+
+              # Equivalent conditions in different forms should be
+              # reduced: which one is left is unfortunately order
+              # dependent.
+              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
+
+  my $failed = 0;
+  foreach (@tests)
+    {
+      my ($inref, $outref) = @$_;
+      my @inconds = map { new Automake::Condition $_ } @$inref;
+      return 1
+        if threads->new(sub {
+         my @outconds = map { (new Automake::Condition $_)->string } @$outref;
+         return threads->new(sub {
+           my @res =
+             map { $_->string } (Automake::Condition::reduce_and (@inconds));
+           return threads->new(sub {
+             my $result = join (",", sort @res);
+             my $exresult = join (",", @outconds);
+
+             if ($result ne $exresult)
+               {
+                 print '"' . join(",", @$inref) . '" => "' .
+                   $result . '" expected "' .
+                     $exresult . '"' . "\n";
+                 $failed = 1;
+               }
+             return $failed;
+           })->join;
+         })->join;
+       })->join;
+    }
+  return $failed;
+}
+
+sub test_reduce_or ()
+{
+  my @tests = (# If no conditions are given, FALSE should be returned
+              [[], ["FALSE"]],
+              # An empty condition is TRUE
+              [[""], ["TRUE"]],
+              # A single condition should be passed through unchanged
+              [["FOO"], ["FOO"]],
+              [["FALSE"], ["FALSE"]],
+              [["TRUE"], ["TRUE"]],
+              # FALSE and TRUE should be discarded and overwhelm
+              # the result, respectively
+              [["FOO", "TRUE"], ["TRUE"]],
+              [["FOO", "FALSE"], ["FOO"]],
+              # Repetitions should be removed
+              [["FOO", "FOO"], ["FOO"]],
+              [["FALSE", "FOO", "FOO"], ["FOO"]],
+              [["FOO", "FALSE", "FOO"], ["FOO"]],
+              [["FOO", "FOO", "FALSE"], ["FOO"]],
+              # Two different conditions should be preserved,
+              # but FALSEs should be removed
+              [["FOO", "BAR"], ["BAR,FOO"]],
+              [["FALSE", "FOO", "BAR"], ["BAR,FOO"]],
+              [["FOO", "FALSE", "BAR"], ["BAR,FOO"]],
+              [["FOO", "BAR", "FALSE"], ["BAR,FOO"]],
+              # A condition implying another condition should be removed.
+              [["FOO BAR", "BAR"], ["BAR"]],
+              [["BAR", "FOO BAR"], ["BAR"]],
+              [["FALSE", "FOO BAR", "BAR"], ["BAR"]],
+              [["FOO BAR", "FALSE", "BAR"], ["BAR"]],
+              [["FOO BAR", "BAR", "FALSE"], ["BAR"]],
+
+              [["BAR FOO", "BAR"], ["BAR"]],
+              [["BAR", "BAR FOO"], ["BAR"]],
+              [["FALSE", "BAR FOO", "BAR"], ["BAR"]],
+              [["BAR FOO", "FALSE", "BAR"], ["BAR"]],
+              [["BAR FOO", "BAR", "FALSE"], ["BAR"]],
+
+              # Check that reduction happens even when there are
+              # two conditions to remove.
+              [["FOO", "FOO BAR", "BAR"], ["BAR,FOO"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["BAZ,FOO"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
+               ["BAZ,FOO"]],
+
+              # Duplicated conditionals should be removed.
+              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
+
+              # Equivalent conditions in different forms should be
+              # reduced: which one is left is unfortunately order
+              # dependent.
+              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
+
+  my $failed = 0;
+  foreach (@tests)
+    {
+      my ($inref, $outref) = @$_;
+      my @inconds = map { new Automake::Condition $_ } @$inref;
+      return 1
+        if threads->new(sub {
+         my @outconds = map { (new Automake::Condition $_)->string } @$outref;
+         return threads->new(sub {
+           my @res =
+             map { $_->string } (Automake::Condition::reduce_or (@inconds));
+           return threads->new(sub {
+             my $result = join (",", sort @res);
+             my $exresult = join (",", @outconds);
+
+             if ($result ne $exresult)
+               {
+                 print '"' . join(",", @$inref) . '" => "' .
+                   $result . '" expected "' .
+                     $exresult . '"' . "\n";
+                 $failed = 1;
+               }
+             return $failed;
+           })->join;
+         })->join;
+       })->join;
+    }
+  return $failed;
+}
+
+sub test_merge ()
+{
+  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
+  return threads->new(sub {
+      my $other = new Automake::Condition "COND3_FALSE";
+      return threads->new(sub {
+       my $both = $cond->merge ($other);
+       return threads->new(sub {
+         my $both2 = $cond->merge_conds ("COND3_FALSE");
+         return threads->new(sub {
+           $cond = $both->strip ($other);
+           my @conds = $cond->conds;
+           return 1 if $both->string ne "COND1_TRUE COND2_FALSE COND3_FALSE";
+           return 1 if $cond->string ne "COND1_TRUE COND2_FALSE";
+           return 1 if $both != $both2;
+         })->join;
+       })->join;
+      })->join;
+    })->join;
+  return 0;
+}
+
+exit (test_basics
+      || test_true_when
+      || test_reduce_and
+      || test_reduce_or
+      || test_merge);
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/pm/Condition.pl b/t/pm/Condition.pl
new file mode 100644
index 0000000..5041a84
--- /dev/null
+++ b/t/pm/Condition.pl
@@ -0,0 +1,277 @@
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use Automake::Condition qw/TRUE FALSE/;
+
+sub test_basics ()
+{
+  my @tests = (# [[Conditions], is_true?, is_false?, string, subst-string, 
human]
+              [[], 1, 0, 'TRUE', '', 'TRUE'],
+              [['TRUE'], 1, 0, 'TRUE', '', 'TRUE'],
+              [['FALSE'], 0, 1, 'FALSE', '#', 'FALSE'],
+              [['A_TRUE'], 0, 0, 'A_TRUE', '@A_TRUE@', 'A'],
+              [['A_TRUE', 'B_FALSE'],
+               0, 0, 'A_TRUE B_FALSE', '@A_TRUE@@B_FALSE@', 'A and !B'],
+              [['B_TRUE', 'FALSE'], 0, 1, 'FALSE', '#', 'FALSE'],
+              [['B_TRUE', 'B_FALSE'], 0, 1, 'FALSE', '#', 'FALSE']);
+
+  for (@tests)
+    {
+      my $a = new Automake::Condition @{$_->[0]};
+      return 1 if $_->[1] != $a->true;
+      return 1 if $_->[1] != ($a == TRUE);
+      return 1 if $_->[2] != $a->false;
+      return 1 if $_->[2] != ($a == FALSE);
+      return 1 if $_->[3] ne $a->string;
+      return 1 if $_->[4] ne $a->subst_string;
+      return 1 if $_->[5] ne $a->human;
+    }
+  return 0;
+}
+
+sub test_true_when ()
+{
+  my $failed = 0;
+
+  my @tests = (# [When,
+              #  [Implied-Conditions],
+              #  [Not-Implied-Conditions]]
+              [['TRUE'],
+               [['TRUE']],
+               [['A_TRUE'], ['A_TRUE', 'B_FALSE'], ['FALSE']]],
+              [['A_TRUE'],
+               [['TRUE'], ['A_TRUE']],
+               [['A_TRUE', 'B_FALSE'], ['FALSE']]],
+              [['A_TRUE', 'B_FALSE'],
+               [['TRUE'], ['A_TRUE'], ['B_FALSE'], ['A_TRUE', 'B_FALSE']],
+               [['FALSE'], ['C_FALSE'], ['C_FALSE', 'A_TRUE']]]);
+
+  for my $t (@tests)
+    {
+      my $a = new Automake::Condition @{$t->[0]};
+      for my $u (@{$t->[1]})
+       {
+         my $b = new Automake::Condition @$u;
+         if (! $b->true_when ($a))
+           {
+             print "`" . $b->string .
+               "' not implied by `" . $a->string . "'?\n";
+             $failed = 1;
+           }
+       }
+      for my $u (@{$t->[2]})
+       {
+         my $b = new Automake::Condition @$u;
+         if ($b->true_when ($a))
+           {
+             print "`" . $b->string .
+               "' implied by `" . $a->string . "'?\n";
+             $failed = 1;
+           }
+
+         return 1 if $b->true_when ($a);
+       }
+    }
+  return $failed;
+}
+
+sub test_reduce_and ()
+{
+  my @tests = (# If no conditions are given, TRUE should be returned
+              [[], ["TRUE"]],
+              # An empty condition is TRUE
+              [[""], ["TRUE"]],
+              # A single condition should be passed through unchanged
+              [["FOO"], ["FOO"]],
+              [["FALSE"], ["FALSE"]],
+              [["TRUE"], ["TRUE"]],
+              # TRUE and false should be discarded and overwhelm
+              # the result, respectively
+              [["FOO", "TRUE"], ["FOO"]],
+              [["FOO", "FALSE"], ["FALSE"]],
+              # Repetitions should be removed
+              [["FOO", "FOO"], ["FOO"]],
+              [["TRUE", "FOO", "FOO"], ["FOO"]],
+              [["FOO", "TRUE", "FOO"], ["FOO"]],
+              [["FOO", "FOO", "TRUE"], ["FOO"]],
+              # Two different conditions should be preserved,
+              # but TRUEs should be removed
+              [["FOO", "BAR"], ["BAR,FOO"]],
+              [["TRUE", "FOO", "BAR"], ["BAR,FOO"]],
+              [["FOO", "TRUE", "BAR"], ["BAR,FOO"]],
+              [["FOO", "BAR", "TRUE"], ["BAR,FOO"]],
+              # A condition implied by another condition should be removed.
+              [["FOO BAR", "BAR"], ["FOO BAR"]],
+              [["BAR", "FOO BAR"], ["FOO BAR"]],
+              [["TRUE", "FOO BAR", "BAR"], ["FOO BAR"]],
+              [["FOO BAR", "TRUE", "BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR", "TRUE"], ["FOO BAR"]],
+
+              [["BAR FOO", "BAR"], ["BAR FOO"]],
+              [["BAR", "BAR FOO"], ["BAR FOO"]],
+              [["TRUE", "BAR FOO", "BAR"], ["BAR FOO"]],
+              [["BAR FOO", "TRUE", "BAR"], ["BAR FOO"]],
+              [["BAR FOO", "BAR", "TRUE"], ["BAR FOO"]],
+
+              # Check that reduction happens even when there are
+              # two conditions to remove.
+              [["FOO", "FOO BAR", "BAR"], ["FOO BAR"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["FOO BAR", "FOO BAZ"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
+               ["FOO BAZ BAR"]],
+
+              # Duplicated conditionals should be removed.
+              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
+
+              # Equivalent conditions in different forms should be
+              # reduced: which one is left is unfortunately order
+              # dependent.
+              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
+
+  my $failed = 0;
+  foreach (@tests)
+    {
+      my ($inref, $outref) = @$_;
+      my @inconds = map { new Automake::Condition $_ } @$inref;
+      my @outconds = map { (new Automake::Condition $_)->string } @$outref;
+      my @res =
+       map { $_->string } (Automake::Condition::reduce_and (@inconds));
+      my $result = join (",", sort @res);
+      my $exresult = join (",", @outconds);
+
+      if ($result ne $exresult)
+       {
+         print '"' . join(",", @$inref) . '" => "' .
+           $result . '" expected "' .
+             $exresult . '"' . "\n";
+         $failed = 1;
+       }
+    }
+  return $failed;
+}
+
+sub test_reduce_or ()
+{
+  my @tests = (# If no conditions are given, FALSE should be returned
+              [[], ["FALSE"]],
+              # An empty condition is TRUE
+              [[""], ["TRUE"]],
+              # A single condition should be passed through unchanged
+              [["FOO"], ["FOO"]],
+              [["FALSE"], ["FALSE"]],
+              [["TRUE"], ["TRUE"]],
+              # FALSE and TRUE should be discarded and overwhelm
+              # the result, respectively
+              [["FOO", "TRUE"], ["TRUE"]],
+              [["FOO", "FALSE"], ["FOO"]],
+              # Repetitions should be removed
+              [["FOO", "FOO"], ["FOO"]],
+              [["FALSE", "FOO", "FOO"], ["FOO"]],
+              [["FOO", "FALSE", "FOO"], ["FOO"]],
+              [["FOO", "FOO", "FALSE"], ["FOO"]],
+              # Two different conditions should be preserved,
+              # but FALSEs should be removed
+              [["FOO", "BAR"], ["BAR,FOO"]],
+              [["FALSE", "FOO", "BAR"], ["BAR,FOO"]],
+              [["FOO", "FALSE", "BAR"], ["BAR,FOO"]],
+              [["FOO", "BAR", "FALSE"], ["BAR,FOO"]],
+              # A condition implying another condition should be removed.
+              [["FOO BAR", "BAR"], ["BAR"]],
+              [["BAR", "FOO BAR"], ["BAR"]],
+              [["FALSE", "FOO BAR", "BAR"], ["BAR"]],
+              [["FOO BAR", "FALSE", "BAR"], ["BAR"]],
+              [["FOO BAR", "BAR", "FALSE"], ["BAR"]],
+
+              [["BAR FOO", "BAR"], ["BAR"]],
+              [["BAR", "BAR FOO"], ["BAR"]],
+              [["FALSE", "BAR FOO", "BAR"], ["BAR"]],
+              [["BAR FOO", "FALSE", "BAR"], ["BAR"]],
+              [["BAR FOO", "BAR", "FALSE"], ["BAR"]],
+
+              # Check that reduction happens even when there are
+              # two conditions to remove.
+              [["FOO", "FOO BAR", "BAR"], ["BAR,FOO"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["BAZ,FOO"]],
+              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
+               ["BAZ,FOO"]],
+
+              # Duplicated conditionals should be removed.
+              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
+
+              # Equivalent conditions in different forms should be
+              # reduced: which one is left is unfortunately order
+              # dependent.
+              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
+              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
+
+  my $failed = 0;
+  foreach (@tests)
+    {
+      my ($inref, $outref) = @$_;
+      my @inconds = map { new Automake::Condition $_ } @$inref;
+      my @outconds = map { (new Automake::Condition $_)->string } @$outref;
+      my @res =
+       map { $_->string } (Automake::Condition::reduce_or (@inconds));
+      my $result = join (",", sort @res);
+      my $exresult = join (",", @outconds);
+
+      if ($result ne $exresult)
+       {
+         print '"' . join(",", @$inref) . '" => "' .
+           $result . '" expected "' .
+             $exresult . '"' . "\n";
+         $failed = 1;
+       }
+    }
+  return $failed;
+}
+
+sub test_merge ()
+{
+  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
+  my $other = new Automake::Condition "COND3_FALSE";
+  my $both = $cond->merge ($other);
+  my $both2 = $cond->merge_conds ("COND3_FALSE");
+  $cond = $both->strip ($other);
+  my @conds = $cond->conds;
+  return 1 if $both->string ne "COND1_TRUE COND2_FALSE COND3_FALSE";
+  return 1 if $cond->string ne "COND1_TRUE COND2_FALSE";
+  return 1 if $both != $both2;
+  return 0;
+}
+
+exit (test_basics
+      || test_true_when
+      || test_reduce_and
+      || test_reduce_or
+      || test_merge);
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
new file mode 100644
index 0000000..2d28749
--- /dev/null
+++ b/t/pm/DisjCon2.pl
@@ -0,0 +1,24 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Catch common programming error:
+# A non-Condition reference passed to new.
+
+use Automake::Condition;
+use Automake::DisjConditions;
+
+my $cond = new Automake::Condition ('TRUE');
+my $cond2 = new Automake::DisjConditions ($cond);
+new Automake::DisjConditions ($cond2);
diff --git a/t/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
new file mode 100644
index 0000000..ede5ab7
--- /dev/null
+++ b/t/pm/DisjCon3.pl
@@ -0,0 +1,23 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Catch common programming error:
+# A non-reference passed to new.
+
+use Automake::Condition qw/TRUE FALSE/;
+use Automake::DisjConditions;
+
+my $cond = new Automake::Condition ("COND1_TRUE");
+new Automake::DisjConditions ("$cond");
diff --git a/t/pm/DisjConditions-t.pl b/t/pm/DisjConditions-t.pl
new file mode 100644
index 0000000..b49ae2e
--- /dev/null
+++ b/t/pm/DisjConditions-t.pl
@@ -0,0 +1,461 @@
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+BEGIN {
+  use Config;
+  if (eval { require 5.007_002; }      # for CLONE support
+      && $Config{useithreads}
+      && !$ENV{WANT_NO_THREADS})
+    {
+      require threads;
+      import threads;
+    }
+  else
+    {
+      exit 77;
+    }
+}
+use Automake::Condition qw/TRUE FALSE/;
+use Automake::DisjConditions;
+
+sub test_basics ()
+{
+  my $true = new Automake::DisjConditions TRUE;
+  my $false = new Automake::DisjConditions FALSE;
+  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
+  return threads->new (sub {
+    my $other = new Automake::Condition "COND3_FALSE";
+    my $another = new Automake::Condition "COND3_TRUE", "COND4_FALSE";
+    return threads->new (sub {
+      my $set1 = new Automake::DisjConditions $cond, $other;
+      return threads->new (sub {
+       my $set2 = new Automake::DisjConditions $other, $cond;
+       my $set3 = new Automake::DisjConditions FALSE, $another;
+       return 1 unless $set1 == $set2;
+       return 1 if $set1->false;
+       return 1 if $set1->true;
+       return 1 unless (new Automake::DisjConditions)->false;
+       return 1 if (new Automake::DisjConditions)->true;
+       return 1 unless $true->human eq 'TRUE';
+       return 1 unless $false->human eq 'FALSE';
+       return 1 unless $set1->human eq "(COND1 and !COND2) or (!COND3)";
+       return 1 unless $set2->human eq "(COND1 and !COND2) or (!COND3)";
+       my $one_cond_human = $set1->one_cond->human;
+       return 1 unless $one_cond_human eq "!COND3"
+                       || $one_cond_human eq "COND1 and !COND2";
+       return 1 unless $set1->string eq "COND1_TRUE COND2_FALSE | COND3_FALSE";
+
+       my $merged1 = $set1->merge ($set2);
+       my $merged2 = $set1->merge ($cond);
+       my $mult1 = $set1->multiply ($set3);
+       return threads->new (sub {
+         my $mult2 = $set1->multiply ($another);
+         return threads->new (sub {
+           return 1 unless $merged1->simplify->string eq "COND1_TRUE 
COND2_FALSE | COND3_FALSE";
+           return 1 unless $merged2->simplify->string eq "COND1_TRUE 
COND2_FALSE | COND3_FALSE";
+           return 1 unless $mult1->string eq "COND1_TRUE COND2_FALSE 
COND3_TRUE COND4_FALSE";
+           return 1 unless $mult1 == $mult2;
+           return 0;
+         })->join;
+       })->join;
+      })->join;
+    })->join;
+  })->join;
+}
+
+sub build_set (@)
+{
+  my @conds = @_;
+  my @set = ();
+  for my $cond (@conds)
+    {
+      push @set, new Automake::Condition @$cond;
+    }
+  return new Automake::DisjConditions @set;
+}
+
+sub test_invert ()
+{
+  my @tests = ([[["FALSE"]],
+               [["TRUE"]]],
+
+              [[["TRUE"]],
+               [["FALSE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["COND3_FALSE", "COND2_TRUE"]],
+               [["COND2_FALSE"],
+                ["COND1_FALSE", "COND3_TRUE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["TRUE"]],
+               [["FALSE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["FALSE"]],
+               [["COND1_FALSE"],
+                ["COND2_FALSE"]]],
+
+              [[["COND1_TRUE"],
+                ["COND2_FALSE"]],
+               [["COND1_FALSE", "COND2_TRUE"]]]
+              );
+
+  for my $t (@tests)
+    {
+      my $set = build_set @{$t->[0]};
+      return 1
+        if threads->new(sub {
+         my $res = build_set @{$t->[1]};
+         my $inv = $set->invert;
+         if ($inv != $res)
+           {
+             print " (I) " . $set->string . "\n\t"
+               . $inv->string . ' != ' . $res->string . "\n";
+             return 1;
+           }
+         return 0
+       })-> join;
+    }
+  return 0;
+}
+
+sub test_simplify ()
+{
+  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"]],
+               [["FOO_TRUE", "BAR_FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_TRUE", "BAR_TRUE"]],
+               [["FOO_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_TRUE", "BAR_TRUE"],
+                ["FOO_FALSE"]],
+               [["TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                            ["BAR_TRUE",  "BAZ_TRUE"],
+                            ["BAR_FALSE", "BAZ_TRUE"]],
+               [["BAZ_TRUE"], ["FOO_TRUE", "BAR_FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                            ["BAR_TRUE",  "BAZ_TRUE"],
+                            ["BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               [["FOO_FALSE"], ["BAZ_TRUE"], ["BAR_FALSE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_TRUE"]],
+               [["B_TRUE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE"]],
+               [["A_FALSE"], ["B_TRUE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE"],
+                ["A_TRUE", "B_FALSE"]],
+               [["TRUE"]]],
+
+              [[["A_TRUE", "B_TRUE"],
+                ["A_TRUE", "B_FALSE"],
+                ["A_TRUE", "C_FALSE", "D_FALSE"]],
+               [["A_TRUE"]]],
+
+              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"]],
+               [           ["B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                           ["B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                           ["B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                           ["B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"]]],
+
+              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"]],
+               [["C_FALSE", "E_FALSE"],
+                ["C_TRUE", "E_TRUE"]]],
+
+              [[["A_FALSE"],
+                ["A_TRUE", "B_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE", "F_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE"]],
+               [["TRUE"]]],
+
+              # Simplify should work with up to 31 variables.
+              [[["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_TRUE"],
+                ["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_FALSE"],
+                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_TRUE"],
+                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_FALSE"]],
+               [[            "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE"
+                 ]]]);
+
+  for my $t (@tests)
+    {
+      my $set = build_set @{$t->[0]};
+      return 1
+       if threads->new(sub {
+         my $res = build_set @{$t->[1]};
+         return threads->new(sub {
+
+           # Make sure simplify() yields the expected result.
+           my $sim = $set->simplify;
+           return threads->new(sub {
+             if ($sim != $res)
+               {
+                 print " (S1) " . $set->string . "\n\t"
+                   . $sim->string . ' != ' . $res->string . "\n";
+                 return 1;
+               }
+
+             # Make sure simplify() is idempotent.
+             my $sim2 = $sim->simplify;
+             return threads->new(sub {
+               if ($sim2 != $sim)
+                 {
+                   print " (S2) " . $sim->string . "\n\t"
+                     . $sim2->string . ' != ' . $sim->string . "\n";
+                   return 1;
+                 }
+
+               # Also exercise invert() while we are at it.
+
+               my $inv1 = $set->invert->simplify;
+               return threads->new(sub {
+                 my $inv2 = $sim->invert->simplify;
+                 return threads->new(sub {
+                   if ($inv1 != $inv2)
+                     {
+                       print " (S3) " . $set->string . ", " . $sim->string . 
"\n\t"
+                         . $inv1->string . ' -= ' . $inv2->string . "\n";
+                       return 1;
+                     }
+                 })->join;
+               })->join;
+             })->join;
+           })->join;
+         })->join;
+       })->join;
+    }
+
+  return 0;
+}
+
+sub test_sub_conditions ()
+{
+  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE"],
+               [["BAR_FALSE", "BAZ_FALSE"],
+                ["BAR_FALSE", "BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_FALSE"],
+               [["BAZ_FALSE"],
+                ["BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE"],
+                ["FOO_TRUE", "BAR_TRUE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["TRUE"]]],
+
+              [[["TRUE"]],
+               ["TRUE"],
+               [["TRUE"]]],
+
+              [[["FALSE"]],
+               ["TRUE"],
+               [["FALSE"]]],
+
+              [[["FALSE"]],
+               ["FALSE"],
+               [["FALSE"]]]);
+
+  for my $t (@tests)
+    {
+      my $t1 = build_set @{$t->[0]};
+      return 1
+        if threads->new(sub {
+         my $t2 = new Automake::Condition @{$t->[1]};
+         return threads->new(sub {
+           my $t3 = build_set @{$t->[2]};
+           return threads->new(sub {
+
+             # Make sure sub_conditions() yields the expected result.
+             my $s = $t1->sub_conditions ($t2);
+             threads->new(sub {
+               if ($s != $t3)
+                 {
+                   print " (SC) " . $t1->string . "\n\t"
+                     . $s->string . ' != ' . $t3->string . "\n";
+                   return 1;
+                 }
+             })->join;
+           })->join;
+         })->join;
+       })->join;
+    }
+}
+
+sub test_ambig ()
+{
+  my @tests = ([[["TRUE"]],
+               ["TRUE"],
+               "multiply defined"],
+              [[["C1_TRUE"]],
+               ["C1_TRUE"],
+               "multiply defined"],
+              [[["TRUE"]],
+                ["C1_FALSE"],
+               "which includes"],
+              [[["C1_TRUE"]],
+               ["C1_TRUE", "C2_TRUE"],
+               "which includes"],
+              [[["C1_TRUE", "C2_TRUE"]],
+               ["C2_TRUE"],
+               "which is included in"],
+              [[["C1_TRUE"]],
+               ["C2_TRUE"],
+               ''],
+              [[["C1_TRUE"],
+                ["C2_FALSE"]],
+               ["C1_FALSE", "C2_TRUE"],
+               '']);
+
+  my $failed = 0;
+  for my $t (@tests)
+    {
+      my $t1 = build_set @{$t->[0]};
+      $failed = 1
+        if threads->new(sub {
+         my $t2 = new Automake::Condition @{$t->[1]};
+         my $t3 = $t->[2];
+         return threads->new(sub {
+           my ($ans, $cond) = $t1->ambiguous_p ("FOO", $t2);
+           return threads->new(sub {
+             if ($t3 && $ans !~ /FOO.*$t3/)
+               {
+                 print " (A1) " . $t1->string . " vs. " . $t2->string . "\n\t"
+                   . "Error message '$ans' does not match '$t3'\n";
+                 return 1;
+               }
+             if (!$t3 && $ans ne '')
+               {
+                 print " (A2) " . $t1->string . " vs. " . $t2->string . "\n\t"
+                   . "Unexpected error message: $ans\n";
+                 return 1;
+               }
+           })->join;
+         })->join;
+       })->join;
+    }
+  return $failed;
+}
+
+exit (test_basics
+      || test_invert
+      || test_simplify
+      || test_sub_conditions
+      || test_ambig);
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/pm/DisjConditions.pl b/t/pm/DisjConditions.pl
new file mode 100644
index 0000000..e7c9775
--- /dev/null
+++ b/t/pm/DisjConditions.pl
@@ -0,0 +1,404 @@
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use Automake::Condition qw/TRUE FALSE/;
+use Automake::DisjConditions;
+
+sub test_basics ()
+{
+  my $true = new Automake::DisjConditions TRUE;
+  my $false = new Automake::DisjConditions FALSE;
+  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
+  my $other = new Automake::Condition "COND3_FALSE";
+  my $another = new Automake::Condition "COND3_TRUE", "COND4_FALSE";
+  my $set1 = new Automake::DisjConditions $cond, $other;
+  my $set2 = new Automake::DisjConditions $other, $cond;
+  my $set3 = new Automake::DisjConditions FALSE, $another;
+  return 1 unless $set1 == $set2;
+  return 1 if $set1->false;
+  return 1 if $set1->true;
+  return 1 unless (new Automake::DisjConditions)->false;
+  return 1 if (new Automake::DisjConditions)->true;
+  return 1 unless $true->human eq 'TRUE';
+  return 1 unless $false->human eq 'FALSE';
+  return 1 unless $set1->human eq "(COND1 and !COND2) or (!COND3)";
+  return 1 unless $set2->human eq "(COND1 and !COND2) or (!COND3)";
+  my $one_cond_human = $set1->one_cond->human;
+  return 1 unless $one_cond_human eq "!COND3"
+                  || $one_cond_human eq "COND1 and !COND2";
+  return 1 unless $set1->string eq "COND1_TRUE COND2_FALSE | COND3_FALSE";
+
+  my $merged1 = $set1->merge ($set2);
+  my $merged2 = $set1->merge ($cond);
+  my $mult1 = $set1->multiply ($set3);
+  my $mult2 = $set1->multiply ($another);
+  return 1 unless $merged1->simplify->string eq "COND1_TRUE COND2_FALSE | 
COND3_FALSE";
+  return 1 unless $merged2->simplify->string eq "COND1_TRUE COND2_FALSE | 
COND3_FALSE";
+  return 1 unless $mult1->string eq "COND1_TRUE COND2_FALSE COND3_TRUE 
COND4_FALSE";
+  return 1 unless $mult1 == $mult2;
+
+  return 0;
+}
+
+sub build_set (@)
+{
+  my @conds = @_;
+  my @set = ();
+  for my $cond (@conds)
+    {
+      push @set, new Automake::Condition @$cond;
+    }
+  return new Automake::DisjConditions @set;
+}
+
+sub test_invert ()
+{
+  my @tests = ([[["FALSE"]],
+               [["TRUE"]]],
+
+              [[["TRUE"]],
+               [["FALSE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["COND3_FALSE", "COND2_TRUE"]],
+               [["COND2_FALSE"],
+                ["COND1_FALSE", "COND3_TRUE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["TRUE"]],
+               [["FALSE"]]],
+
+              [[["COND1_TRUE", "COND2_TRUE"],
+                ["FALSE"]],
+               [["COND1_FALSE"],
+                ["COND2_FALSE"]]],
+
+              [[["COND1_TRUE"],
+                ["COND2_FALSE"]],
+               [["COND1_FALSE", "COND2_TRUE"]]]
+              );
+
+  for my $t (@tests)
+    {
+      my $set = build_set @{$t->[0]};
+      my $res = build_set @{$t->[1]};
+      my $inv = $set->invert;
+      if ($inv != $res)
+       {
+         print " (I) " . $set->string . "\n\t"
+           . $inv->string . ' != ' . $res->string . "\n";
+         return 1;
+       }
+    }
+  return 0;
+}
+
+sub test_simplify ()
+{
+  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"]],
+               [["FOO_TRUE", "BAR_FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_TRUE", "BAR_TRUE"]],
+               [["FOO_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_TRUE", "BAR_TRUE"],
+                ["FOO_FALSE"]],
+               [["TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                            ["BAR_TRUE",  "BAZ_TRUE"],
+                            ["BAR_FALSE", "BAZ_TRUE"]],
+               [["BAZ_TRUE"], ["FOO_TRUE", "BAR_FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                            ["BAR_TRUE",  "BAZ_TRUE"],
+                            ["BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               [["FOO_FALSE"], ["BAZ_TRUE"], ["BAR_FALSE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_TRUE"]],
+               [["B_TRUE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE"]],
+               [["A_FALSE"], ["B_TRUE"]]],
+
+              [[["B_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE"],
+                ["A_TRUE", "B_FALSE"]],
+               [["TRUE"]]],
+
+              [[["A_TRUE", "B_TRUE"],
+                ["A_TRUE", "B_FALSE"],
+                ["A_TRUE", "C_FALSE", "D_FALSE"]],
+               [["A_TRUE"]]],
+
+              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"]],
+               [           ["B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                           ["B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                           ["B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                           ["B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"]]],
+
+              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"],
+                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
+                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
+                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"]],
+               [["C_FALSE", "E_FALSE"],
+                ["C_TRUE", "E_TRUE"]]],
+
+              [[["A_FALSE"],
+                ["A_TRUE", "B_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE", "F_FALSE"],
+                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE"]],
+               [["TRUE"]]],
+
+              # Simplify should work with up to 31 variables.
+              [[["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_TRUE"],
+                ["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_FALSE"],
+                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_TRUE"],
+                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
+                 "V31_FALSE"]],
+               [[            "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
+                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
+                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
+                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
+                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
+                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE"
+                 ]]]);
+
+  for my $t (@tests)
+    {
+      my $set = build_set @{$t->[0]};
+      my $res = build_set @{$t->[1]};
+
+      # Make sure simplify() yields the expected result.
+      my $sim = $set->simplify;
+      if ($sim != $res)
+       {
+         print " (S1) " . $set->string . "\n\t"
+           . $sim->string . ' != ' . $res->string . "\n";
+         return 1;
+       }
+
+      # Make sure simplify() is idempotent.
+      my $sim2 = $sim->simplify;
+      if ($sim2 != $sim)
+       {
+         print " (S2) " . $sim->string . "\n\t"
+           . $sim2->string . ' != ' . $sim->string . "\n";
+         return 1;
+       }
+
+      # Also exercise invert() while we are at it.
+
+      my $inv1 = $set->invert->simplify;
+      my $inv2 = $sim->invert->simplify;
+      if ($inv1 != $inv2)
+       {
+         print " (S3) " . $set->string . ", " . $sim->string . "\n\t"
+           . $inv1->string . ' != ' . $inv2->string . "\n";
+         return 1;
+       }
+    }
+
+  return 0;
+}
+
+sub test_sub_conditions ()
+{
+  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE"],
+               [["BAR_FALSE", "BAZ_FALSE"],
+                ["BAR_FALSE", "BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_FALSE"],
+               [["BAZ_FALSE"],
+                ["BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["FALSE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
+                ["FOO_TRUE", "BAZ_TRUE"],
+                ["FOO_FALSE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["BAZ_TRUE"]]],
+
+              [[["FOO_TRUE", "BAR_FALSE"],
+                ["FOO_TRUE", "BAR_TRUE"]],
+               ["FOO_TRUE", "BAR_TRUE"],
+               [["TRUE"]]],
+
+              [[["TRUE"]],
+               ["TRUE"],
+               [["TRUE"]]],
+
+              [[["FALSE"]],
+               ["TRUE"],
+               [["FALSE"]]],
+
+              [[["FALSE"]],
+               ["FALSE"],
+               [["FALSE"]]]);
+
+  for my $t (@tests)
+    {
+      my $t1 = build_set @{$t->[0]};
+      my $t2 = new Automake::Condition @{$t->[1]};
+      my $t3 = build_set @{$t->[2]};
+
+      # Make sure sub_conditions() yields the expected result.
+      my $s = $t1->sub_conditions ($t2);
+      if ($s != $t3)
+       {
+         print " (SC) " . $t1->string . "\n\t"
+           . $s->string . ' != ' . $t3->string . "\n";
+         return 1;
+       }
+    }
+}
+
+sub test_ambig ()
+{
+  my @tests = ([[["TRUE"]],
+               ["TRUE"],
+               "multiply defined"],
+              [[["C1_TRUE"]],
+               ["C1_TRUE"],
+               "multiply defined"],
+              [[["TRUE"]],
+                ["C1_FALSE"],
+               "which includes"],
+              [[["C1_TRUE"]],
+               ["C1_TRUE", "C2_TRUE"],
+               "which includes"],
+              [[["C1_TRUE", "C2_TRUE"]],
+               ["C2_TRUE"],
+               "which is included in"],
+              [[["C1_TRUE"]],
+               ["C2_TRUE"],
+               ''],
+              [[["C1_TRUE"],
+                ["C2_FALSE"]],
+               ["C1_FALSE", "C2_TRUE"],
+               '']);
+
+  for my $t (@tests)
+    {
+      my $t1 = build_set @{$t->[0]};
+      my $t2 = new Automake::Condition @{$t->[1]};
+      my $t3 = $t->[2];
+      my ($ans, $cond) = $t1->ambiguous_p ("FOO", $t2);
+      if ($t3 && $ans !~ /FOO.*$t3/)
+       {
+         print " (A1) " . $t1->string . " vs. " . $t2->string . "\n\t"
+           . "Error message '$ans' does not match '$t3'\n";
+         return 1;
+       }
+      if (!$t3 && $ans ne '')
+       {
+         print " (A2) " . $t1->string . " vs. " . $t2->string . "\n\t"
+           . "Unexpected error message: $ans\n";
+         return 1;
+       }
+    }
+  return 0;
+}
+
+exit (test_basics
+      || test_invert
+      || test_simplify
+      || test_sub_conditions
+      || test_ambig);
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/pm/Version.pl b/t/pm/Version.pl
new file mode 100644
index 0000000..293badc
--- /dev/null
+++ b/t/pm/Version.pl
@@ -0,0 +1,129 @@
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use Automake::Version;
+
+my $failed = 0;
+
+sub test_version_compare
+{
+  my ($left, $right, $result) = @_;
+  my @leftver = Automake::Version::split ($left);
+  my @rightver = Automake::Version::split ($right);
+  if ($#leftver == -1)
+  {
+    print "can't grok \"$left\"\n";
+    $failed = 1;
+    return;
+  }
+  if ($#rightver == -1)
+  {
+    print "can't grok \"$right\"\n";
+    $failed = 1;
+    return;
+  }
+  my $res = Automake::Version::compare (@leftver, @rightver);
+  if ($res != $result)
+  {
+    print "compare (\"$left\", \"$right\") = $res! (not $result?)\n";
+    $failed = 1;
+  }
+
+  my $check_expected = ($result == 0 || $result == 1) ? 0 : 1;
+  # Exception for 'foo' fork.
+  $check_expected = 1
+    if ($right =~ /foo/ && !($left =~ /foo/));
+
+  my $check = Automake::Version::check ($left, $right);
+  if ($check != $check_expected)
+  {
+    print "check (\"$left\", \"$right\") = $check! (not $check_expected?)\n";
+    $failed = 1;
+  }
+}
+
+sub test_bad_versions
+{
+  my ($ver) = @_;
+  my @version = Automake::Version::split ($ver);
+  if ($#version != -1)
+  {
+    print "shouldn't grok \"$ver\"\n";
+    $failed = 1;
+  }
+}
+
+my @tests = (
+# basics
+  ['1.0', '2.0', -1],
+  ['2.0', '1.0', 1],
+  ['1.2', '1.2', 0],
+  ['1.1', '1.2', -1],
+  ['1.2', '1.1', 1],
+# alphas
+  ['1.4', '1.4g', -1],
+  ['1.4g', '1.5', -1],
+  ['1.4g', '1.4', 1],
+  ['1.5', '1.4g', 1],
+  ['1.4a', '1.4g', -1],
+  ['1.5a', '1.3g', 1],
+  ['1.6a', '1.6a', 0],
+# micros
+  ['1.5.1', '1.5', 1],
+  ['1.5.0', '1.5', 0],
+  ['1.5.4', '1.6.1', -1],
+# micros and alphas
+  ['1.5a', '1.5.1', 1],
+  ['1.5a', '1.5.1a', 1],
+  ['1.5a', '1.5.1f', 1],
+  ['1.5', '1.5.1a', -1],
+  ['1.5.1a', '1.5.1f', -1],
+  ['1.5.1f', '1.5.1a', 1],
+  ['1.5.1f', '1.5.1f', 0],
+# special exceptions
+  ['1.6-p5a', '1.6.5a', 0],
+  ['1.6', '1.6-p5a', -1],
+  ['1.6-p4b', '1.6-p5a', -1],
+  ['1.6-p4b', '1.6-foo', 1],
+  ['1.6-p4b', '1.6a-foo', -1],
+  ['1.6-p5', '1.6.5', 0],
+  ['1.6a-foo', '1.6a-foo', 0],
+);
+
+my @bad_versions = (
+  '', 'a', '1', '1a', '1.2.3.4', '-1.2'
+);
+
+test_version_compare (@{$_}) foreach @tests;
+test_bad_versions ($_) foreach @bad_versions;
+
+exit $failed;
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/pm/Version2.pl b/t/pm/Version2.pl
new file mode 100644
index 0000000..b452e47
--- /dev/null
+++ b/t/pm/Version2.pl
@@ -0,0 +1,20 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# prog_error due to invalid $VERSION.
+
+use Automake::Version;
+
+Automake::Version::check ('', '1.2.3');
diff --git a/t/pm/Version3.pl b/t/pm/Version3.pl
new file mode 100644
index 0000000..2f7d413
--- /dev/null
+++ b/t/pm/Version3.pl
@@ -0,0 +1,20 @@
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# prog_error due to invalid $REQUIRED.
+
+use Automake::Version;
+
+Automake::Version::check ('1.2.3', '');
diff --git a/t/pm/Wrap.pl b/t/pm/Wrap.pl
new file mode 100644
index 0000000..a929a6a
--- /dev/null
+++ b/t/pm/Wrap.pl
@@ -0,0 +1,112 @@
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use Automake::Wrap qw/wrap makefile_wrap/;
+
+my $failed = 0;
+
+sub test_wrap
+{
+  my ($in, $exp_out) = @_;
+
+  my $out = &wrap (@$in);
+  if ($out ne $exp_out)
+    {
+      print STDERR "For: @$in\nGot:\n$out\nInstead of:\n$exp_out\n---\n";
+      ++$failed;
+    }
+}
+
+sub test_makefile_wrap
+{
+  my ($in, $exp_out) = @_;
+
+  my $out = &makefile_wrap (@$in);
+  if ($out ne $exp_out)
+    {
+      print STDERR "For: @$in\nGot:\n$out\nInstead of:\n$exp_out\n---\n";
+      ++$failed;
+    }
+}
+
+my @tests = (
+  [["HEAD:", "NEXT:", "CONT", 13, "v" ,"a", "l", "ue", "s", "values"],
+"HEAD:v aCONT
+NEXT:l ueCONT
+NEXT:sCONT
+NEXT:values
+"],
+  [["rule: ", "\t", " \\", 20, "dep1" ,"dep2", "dep3", "dep4", "dep5",
+    "dep06", "dep07", "dep08"],
+"rule: dep1 dep2 \\
+\tdep3 dep4 \\
+\tdep5 dep06 \\
+\tdep07 \\
+\tdep08
+"],
+  [["big header:", "big continuation:", " END", 5, "diag1", "diag2", "diag3"],
+"big header:diag1 END
+big continuation:diag2 END
+big continuation:diag3
+"],
+  [["big header:", "cont: ", " END", 16, "word1", "word2"],
+"big header: END
+cont: word1 END
+cont: word2
+"],
+  [["big header:", "", " END", 16, "w1", "w2 ", "w3"],
+"big header: END
+w1 w2 w3
+"]);
+
+my @makefile_tests = (
+  [["target:"],
+"target:
+"],
+  [["target:", "\t"],
+"target:
+"],
+  [["target:", "\t", "prereq1", "prereq2"],
+"target: prereq1 prereq2
+"],
+  [["target: ", "\t", "this is a long list of prerequisites ending in space",
+    "so that there is no need for another space before the backslash",
+    "unlike in the second line"],
+"target: this is a long list of prerequisites ending in space \\
+\tso that there is no need for another space before the backslash \\
+\tunlike in the second line
+"]);
+
+test_wrap (@{$_}) foreach @tests;
+test_makefile_wrap (@{$_}) foreach @makefile_tests;
+
+exit $failed;
+
+### Setup "GNU" style for perl-mode and cperl-mode.
+## Local Variables:
+## perl-indent-level: 2
+## perl-continued-statement-offset: 2
+## perl-continued-brace-offset: 0
+## perl-brace-offset: 0
+## perl-brace-imaginary-offset: 0
+## perl-label-offset: -2
+## cperl-indent-level: 2
+## cperl-brace-offset: 0
+## cperl-continued-brace-offset: 0
+## cperl-label-offset: -2
+## cperl-extra-newline-before-brace: t
+## cperl-merge-trailing-else: nil
+## cperl-continued-statement-offset: 2
+## End:
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
new file mode 100755
index 0000000..c2c2d7e
--- /dev/null
+++ b/t/posixsubst-data.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works
+# in when used with the DATA primary.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foodir = $(prefix)
+
+t1 = foo1 foo2
+t2 = barx
+t3 = baz.y
+
+bar.data bazzardoz:
+       : > $@
+CLEANFILES = bar.data bazzardoz
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+dist_foo_DATA = $(t1:=.txt)
+foo_DATA = $(t2:x=.data)
+nodist_foo_DATA = $(t3:.y=zardoz)
+
+check-local: test
+.PHONY: test
+test: distdir
+       ls -l $(distdir)
+       test ! -r $(distdir)/foo.data
+       test ! -r $(distdir)/bazzardoz
+
+installcheck-local:
+       ls -l $(prefix)
+       test -f $(prefix)/foo1.txt
+       test -f $(prefix)/foo2.txt
+       test -f $(prefix)/bar.data
+       test -f $(prefix)/bazzardoz
+END
+
+: > foo1.txt
+: > foo2.txt
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE install
+test -f bar.data
+test -f bazzardoz
+$MAKE test
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
new file mode 100755
index 0000000..7e3cf2f
--- /dev/null
+++ b/t/posixsubst-extradist.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# in EXTRA_DIST.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+t1 = foo1 foo2
+t2 = bar.x
+t3 = baz-y
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+EXTRA_DIST = $(t1:=.c) $(t2:.x=.f) $(t3:-y=ar)
+bazar bar.f:
+       : > $@
+.PHONY: test
+test: distdir
+       ls -l $(distdir)
+       test -f $(distdir)/foo1.c
+       test -f $(distdir)/foo2.c
+       test -f $(distdir)/bar.f
+       test -f $(distdir)/bazar
+END
+
+: > foo1.c
+: > foo2.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+:
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
new file mode 100755
index 0000000..f1cc55b
--- /dev/null
+++ b/t/posixsubst-ldadd.sh
@@ -0,0 +1,78 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works
+# when used in LDADD.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AM_PROG_AR
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+u = libquux1.lib libquux2.lib
+v = libquux1
+w = none
+
+zardozdir = $(prefix)/zardoz
+zardoz_PROGRAMS = foo bar
+
+noinst_LIBRARIES = libquux1.a libquux2.a libquux3.a
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+LDADD = $(u:.lib=.a)
+bar_LDADD = $(v:=.a) libquux2.a $(w:none=libquux3.a)
+
+libquux1.c:
+       echo 'int quux1(void) { return 0; }' > $@
+CLEANFILES = libquux1.c # For FreeBSD make.
+END
+
+cat > foo.c <<'END'
+int main(void)
+{
+  int quux1(void), quux2(void);
+  return quux1() + quux2();
+}
+END
+
+cat > bar.c <<'END'
+int main(void)
+{
+  int quux1(void), quux2(void), quux3(void);
+  return quux1() + quux2() + quux3();
+}
+END
+
+echo 'int quux2(void) { return 0; }' > libquux2.c
+echo 'int quux3(void) { return 0; }' > libquux3.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+test -f libquux1.c
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
new file mode 100755
index 0000000..f437571
--- /dev/null
+++ b/t/posixsubst-libraries.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the LIBRARIES primary in a "simple" way.
+# Keep this in sync with sister test 'posixsubst-ltlibraries.test'.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AM_PROG_AR
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foolibs = libfoo1 libfoo2
+barlibs = libbaz
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+lib_LIBRARIES = $(foolibs:=.a) $(barlibs:z=r.a)
+
+libbar.c:
+       echo 'int bar(void) { return 0; }' > $@
+CLEANFILES = libbar.c # For FreeBSD make.
+
+installcheck-local:
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.a
+       test -f $(libdir)/libfoo2.a
+       test -f $(libdir)/libbar.a
+END
+
+echo 'int bar1(void) { return 0; }' > libfoo1.c
+echo 'int bar2(void) { return 0; }' > libfoo2.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE
+test -f libfoo2.c
+$MAKE install
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
new file mode 100755
index 0000000..b4b2a92
--- /dev/null
+++ b/t/posixsubst-ltlibraries.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the LTLIBRARIES primary in a "simple" way.
+# Keep this in sync with sister test 'posixsubst-libraries.test'.
+
+required='cc libtool libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+foolibs = libfoo1 libfoo2
+barlibs = libbaz
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+lib_LTLIBRARIES = $(foolibs:=.la) $(barlibs:z=r.la)
+
+libbar.c:
+       echo 'int bar(void) { return 0; }' > $@
+CLEANFILES = libbar.c # For FreeBSD make.
+
+installcheck-local:
+       ls -l $(libdir)
+       test -f $(libdir)/libfoo1.la
+       test -f $(libdir)/libfoo2.la
+       test -f $(libdir)/libbar.la
+END
+
+echo 'int bar1(void) { return 0; }' > libfoo1.c
+echo 'int bar2(void) { return 0; }' > libfoo2.c
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE
+test -f libfoo2.c
+$MAKE install
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
new file mode 100755
index 0000000..a02cb92
--- /dev/null
+++ b/t/posixsubst-programs.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the PROGRAMS primary.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+t1 = foo1 foo2
+t2 = barx bar2
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+bin_PROGRAMS = $(t1:=-p) $(t2:2=y)
+
+installcheck-local:
+       ls -l $(prefix)/bin
+       test -f $(prefix)/bin/foo1-p$(EXEEXT)
+       test -x $(prefix)/bin/foo1-p$(EXEEXT)
+       test -f $(prefix)/bin/foo2-p$(EXEEXT)
+       test -x $(prefix)/bin/foo2-p$(EXEEXT)
+       test -f $(prefix)/bin/barx$(EXEEXT)
+       test -x $(prefix)/bin/barx$(EXEEXT)
+       test -f $(prefix)/bin/bary$(EXEEXT)
+       test -x $(prefix)/bin/bary$(EXEEXT)
+END
+
+for f in foo1-p.c foo2-p.c barx.c bary.c; do
+  echo 'int main(void) { return 0; }' > $f
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE
+$MAKE install
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
new file mode 100755
index 0000000..cda515f
--- /dev/null
+++ b/t/posixsubst-scripts.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the SCRIPTS primary.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+# We have to be careful with 'test -x' commands on MinGW/MSYS, because
+# the file system does not actually have execute permission information.
+# Instead, that is emulated by looking at the file content, and returning
+# 0 if the file starts with, e.g., a COFF header or with '#!'.
+# So we need to create actual scripts in the make rules and in the file
+# creation below.
+
+cat > Makefile.am << 'END'
+t1 = foo1 foo2
+t2 = bar1x bar2
+t3 = quu-baz
+
+bar1 bar2:
+       (echo '#!/bin/sh' && echo 'exit 0') > $@
+quux.pl:
+       (echo '#!/bin/perl' && echo '1;') > $@
+CLEANFILES = bar1 bar2 quux.pl
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+dist_sbin_SCRIPTS = $(t1:=.sh)
+libexec_SCRIPTS = $(t2:x=)
+nodist_bin_SCRIPTS = $(t3:-baz=x.pl)
+
+check-local: test1 test2
+.PHONY: test1 test2
+test1:
+       ls -l
+       test -f bar1
+       test -f bar2
+       test -f quux.pl
+test2: distdir
+       ls -l $(distdir)
+## The scripts foo1.sh and foo2.sh should be distributed.
+       test -f $(distdir)/foo1.sh
+       test -f $(distdir)/foo2.sh
+## The scripts bar1, bar2 and quux.pl shouldn't be distributed.
+       test ! -r $(distdir)/bar1
+       test ! -r $(distdir)/bar2
+       test ! -r $(distdir)/quux.pl
+
+installcheck-local:
+       ls -l $(libexecdir) $(bindir) $(sbindir)
+       test -f $(sbindir)/foo1.sh
+       test -x $(sbindir)/foo1.sh
+       test -f $(sbindir)/foo2.sh
+       test -x $(sbindir)/foo2.sh
+       test -f $(libexecdir)/bar1
+       test -x $(libexecdir)/bar1
+       test -f $(libexecdir)/bar2
+       test -x $(libexecdir)/bar2
+       test -f $(bindir)/quux.pl
+       test -x $(bindir)/quux.pl
+END
+
+cat > foo1.sh <<'END'
+#!/bin/sh
+exit 0
+END
+cp foo1.sh foo2.sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cwd=`pwd` || Exit 1
+./configure --prefix="$cwd/_inst"
+$MAKE
+$MAKE test1 test2
+$MAKE install
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
new file mode 100755
index 0000000..ccd61b9
--- /dev/null
+++ b/t/posixsubst-sources.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the SOURCES primary.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+
+FOO = foo.cxx
+BAR = bar__
+BAZ = baz.
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+foo_SOURCES = main.c $(FOO:.cxx=.c)
+dist_foo_SOURCES = $(BAR:__=.c)
+nodist_foo_SOURCES = $(BAZ:=c)
+
+bar.c baz.c:
+       echo 'int $@ (void) { return 0; }' | sed 's/\.c //' > $@
+CLEANFILES = baz.c
+CLEANFILES += bar.c # For FreeBSD make.
+
+.PHONY: test test2
+check-local: test1 test2
+test1:
+       ls -l . $(srcdir)
+       test -f $(srcdir)/bar.c
+       test -f baz.c
+test2: distdir
+       ls -l $(distdir)
+## These sources should be distributed ...
+       test -f $(distdir)/bar.c
+       test -f $(distdir)/foo.c
+       test -f $(distdir)/main.c
+## ... and this shouldn't.
+       test ! -r $(distdir)/baz.c
+END
+
+cat > main.c <<'END'
+int main(void)
+{
+  int foo(void), bar(void), baz(void);
+  return foo() + bar() + baz();
+}
+END
+
+echo 'int foo(void) { return 0; }' > foo.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+$MAKE test1 test2
+$MAKE distcheck
+
+:
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
new file mode 100755
index 0000000..27a451d
--- /dev/null
+++ b/t/posixsubst-tests.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that POSIX variable expansion '$(var:str=rpl)' works when used
+# with the TESTS special variable.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+t1 = foo1 foo2
+t2 = barx
+t3 = bar2
+
+foo2.test barz:
+       (echo '#!/bin/sh' && echo 'exit 0') > $@ && chmod a+x $@
+CLEANFILES = foo2.test barz # For FreeBSD make.
+
+# Also try an empty match suffix, to ensure that the ':=' in there is
+# not confused by the parser with an unportable assignment operator.
+TESTS = $(t1:=.test) $(t2:x=y) $(t3:2=z)
+
+EXTRA_DIST = $(TESTS)
+MOSTLYCLEANFILES = *.out
+END
+
+cat > foo1.test <<'END'
+#!/bin/sh
+touch foo1.out
+test x"${TESTSUITE_OK-no}" = x"yes"
+END
+sed 's/foo1/bary/g' foo1.test > bary
+chmod +x foo1.test bary
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE check >out 2>&1 && { cat out; Exit 1; }
+cat out
+ls -l
+grep '^FAIL: foo1\.test *$' out
+grep '^PASS: foo2\.test *$' out
+grep '^FAIL: bary *$' out
+grep '^PASS: barz *$' out
+test -f foo1.out
+test -f bary.out
+
+TESTSUITE_OK=yes $MAKE distcheck
+
+:
diff --git a/t/postproc.sh b/t/postproc.sh
new file mode 100755
index 0000000..7eaa4f8
--- /dev/null
+++ b/t/postproc.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check to make sure we recognize a Makefile.in, even if post-processed
+# and renamed.
+
+required=cc
+. ./defs || Exit 1
+
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_FILES([myMakefile])
+AC_OUTPUT
+END
+
+cat > myMakefile.am << 'END'
+bin_PROGRAMS = fred
+fred_SOURCES = fred.c
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -- myMakefile
+
+mv myMakefile.in myMakefile.old
+echo '# Post-processed by post-processor 3.14.' > myMakefile.in
+cat myMakefile.old >> myMakefile.in
+
+./configure
+
+test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1
+
+:
diff --git a/t/ppf77.sh b/t/ppf77.sh
new file mode 100755
index 0000000..70266d6
--- /dev/null
+++ b/t/ppf77.sh
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure preprocessed F77 works.
+# Report from Jochen Kuepper.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_F77
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = ppf
+ppf_SOURCES = foo.F q.r
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/pr2.sh b/t/pr2.sh
new file mode 100755
index 0000000..ffe4a81
--- /dev/null
+++ b/t/pr2.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported in PR 2.
+# "make dist" fails for AC_OUTPUT(README.foo:templ/README.foo.in).
+#
+# == Report ==
+# When my AC_OUTPUT macro in configure.ac contains something
+# like the following (among the Makefiles)
+#       README.foo:templ/README.foo.in
+# the generated dist target in the Makefile.in fails,
+# because DIST_COMMON will contain templ/README.foo.in
+# and the dist target will try to copy templ/README.foo.in
+# to the distribution directory before it creates a templ
+# subdirectory in the distribution directory.
+
+. ./defs || Exit 1
+
+# Please keep this underquoted and old-style.
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT(README.foo:templ/README.foo.in Makefile)
+END
+
+: > Makefile.am
+
+mkdir templ
+: > templ/README.foo.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distdir
+test -f nonesuch-nonesuch/templ/README.foo.in
+
+:
diff --git a/t/pr211.sh b/t/pr211.sh
new file mode 100755
index 0000000..97e28eb
--- /dev/null
+++ b/t/pr211.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 211.
+#
+# == Description ==
+# Suppose you have a library and an ltlibrary in the same
+# directory which use the same source:
+#
+#   libfoo_la_SOURCES = foo.c
+#   libbar_a_SOURCES = foo.c
+#
+# In this case foo.c will be compiled twice but using different
+# compilers.  This is a conflict.  In this case the user should
+# rename one of the 'foo.o' files.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = helldl
+lib_LTLIBRARIES = libfoo.la
+helldl_SOURCES = foo.c
+libfoo_la_SOURCES = foo.c
+END
+
+libtoolize
+$ACLOCAL
+AUTOMAKE_fails -Wnone -a
+$FGREP 'foo.$(OBJEXT)' stderr
+
+:
diff --git a/t/pr220.sh b/t/pr220.sh
new file mode 100755
index 0000000..657221d
--- /dev/null
+++ b/t/pr220.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR automake/220.
+# Test for problems when conditionals are not actually defined.
+# Check that the problems is diagnosed by configure.
+# This isn't perfect (ideally we'd like an error from autoconf),
+# but it is the best we can do.  It certainly makes it easier
+# to debug the problem.
+# Note that this should be also in the documentation.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+if NEVER_TRUE
+NEVER_DEFINED = foo.txt
+endif
+data_DATA = $(NEVER_DEFINED)
+EOF
+
+cat >> configure.ac << 'EOF'
+AC_ARG_ENABLE([foo],
+[  --enable-foo          Enable foo],
+[ if test "foo" = "bar" ; then
+    AM_CONDITIONAL([NEVER_TRUE], [true])
+  else
+    AM_CONDITIONAL([NEVER_TRUE], [false])
+  fi
+])
+AC_OUTPUT
+EOF
+
+mkdir build
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cd build
+# configure should fail since we've done something invalid.
+../configure 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'conditional.*NEVER_TRUE' stderr
+
+:
diff --git a/t/pr224.sh b/t/pr224.sh
new file mode 100755
index 0000000..51e3c17
--- /dev/null
+++ b/t/pr224.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR automake/224: $(top_srcdir) w.r.t. dependencies.
+#
+# == Description ==
+# Dependency tracking data should be stored in in the relative path
+# of the source file, as opposed the object file.
+# I.e., for 'foo.c' in '$(top_srcdir)/bar', being built in
+# '$(top_srcdir)/build', the location of the '.deps' directory
+# should be '$(top_builddir)/bar/.deps'.
+
+required=cc
+. ./defs || Exit 1
+
+mkdir foo
+
+cat >foo/main.c <<'EOF'
+int main (void)
+{
+  return 0;
+}
+EOF
+
+cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = bar
+bar_SOURCES = foo/main.c
+EOF
+
+cat >>configure.ac <<'EOF'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+EOF
+
+mkdir build
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+cd build
+../configure
+
+$MAKE
+test -d foo/.deps
+$MAKE distclean
+test -d foo/.deps && Exit 1
+
+:
diff --git a/t/pr229.sh b/t/pr229.sh
new file mode 100755
index 0000000..cacdb82
--- /dev/null
+++ b/t/pr229.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR automake/229.
+# Make sure AC_CYGWIN requires config.{sub,guess}.
+# Reported by James Youngman.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<EOF
+AC_CYGWIN
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+
+test -f config.sub
+test -f config.guess
+
+:
diff --git a/t/pr243.sh b/t/pr243.sh
new file mode 100755
index 0000000..01ba644
--- /dev/null
+++ b/t/pr243.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 243.
+# AM_OUTPUT_DEPENDENCY_COMMANDS doesn't handle
+# 'Makefile:Makefile.in:tail.mk' in AC_OUTPUT.
+#
+# == Report ==
+# If configure.ac has something like:
+#       AC_OUTPUT(Makefile:Makefile.in:tail.mk)
+# then config.status cannot parse the Makefile to build the
+# dependency files in the .deps directory.  This is because
+# the AM_OUTPUT_DEPENDENCY_COMMANDS macro cannot cope with
+# the colon in the CONFIG_FILES variable.
+
+required=cc
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_FILES([Makefile:Makefile.in:tail.mk])
+AC_OUTPUT
+END
+
+: > tail.mk
+
+cat > Makefile.am << 'END'
+include_HEADERS  = 3dfx.h linutil.h
+noinst_HEADERS   = fx64.h fxdll.h fximg.h fxglob.h \
+                   fxos.h fxver.h glob.h
+noinst_PROGRAMS = fxmisc
+fxmisc_SOURCES  = fx64.c fximg.c fxos.c linutil.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+
+test -f .deps/fx64.Po
+
+:
diff --git a/t/pr266.sh b/t/pr266.sh
new file mode 100755
index 0000000..ac56878
--- /dev/null
+++ b/t/pr266.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 266.
+# Dependency tracking -vs- nonstandard Makefile names
+
+required=cc
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CONFIG_FILES([Maudefile])
+AC_OUTPUT
+END
+
+cat > Maudefile.am << 'END'
+include_HEADERS = 3dfx.h linutil.h
+noinst_HEADERS  = fx64.h fxdll.h fximg.h fxglob.h \
+                  fxos.h fxver.h glob.h
+noinst_PROGRAMS = fxmisc
+fxmisc_SOURCES  = fx64.c fximg.c fxos.c linutil.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure --enable-dependency-tracking
+
+test -f .deps/fx64.Po
+
+:
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
new file mode 100755
index 0000000..5618d76
--- /dev/null
+++ b/t/pr279-2.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another test related to PR 279.
+# Multiple DEPENDENCIES on conditionals.
+# Please keep this in sync with sister test pr279.test.
+#
+# == Report ==
+# When defining xxx_LDADD and xxx_DEPENDENCIES variables where the
+# xxx_LDADD one contains values set in conditionals, automake will
+# fail with messages like:
+#       foo_DEPENDENCIES was already defined in condition TRUE, ...
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([FOOTEST], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if FOOTEST
+foo_LDADD = zardoz
+else
+foo_LDADD = maude
+endif
+
+bin_PROGRAMS = foo
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep 'address@hidden@foo_DEPENDENCIES *= *zardoz$' Makefile.in
+grep 'address@hidden@foo_DEPENDENCIES *= *maude$' Makefile.in
+
+:
diff --git a/t/pr279.sh b/t/pr279.sh
new file mode 100755
index 0000000..3383131
--- /dev/null
+++ b/t/pr279.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 279.
+# Multiple DEPENDENCIES on conditionals.
+# Please keep this in sync with sister test pr279-2.test.
+#
+# == Report ==
+# When defining xxx_LDADD and xxx_DEPENDENCIES variables where the
+# xxx_LDADD one contains values set in conditionals, automake will
+# fail with messages like:
+#       foo_DEPENDENCIES was already defined in condition TRUE, ...
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([FOOTEST], [false])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+if FOOTEST
+xtralib =
+else
+xtralib =
+endif
+
+bin_PROGRAMS = foo
+foo_LDADD = ${xtralib}
+foo_DEPENDENCIES =
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/pr287.sh b/t/pr287.sh
new file mode 100755
index 0000000..681f6d6
--- /dev/null
+++ b/t/pr287.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 287: empty SUBDIRS.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS =
+bin_SCRIPTS = foo
+END
+
+cat > foo << 'END'
+#! /bin/sh
+echo Maude
+END
+
+chmod +x foo
+
+mkdir install
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure "--prefix=`cd install && pwd`"
+
+$MAKE
+$MAKE distdir
+
+:
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
new file mode 100755
index 0000000..b655cf0
--- /dev/null
+++ b/t/pr300-lib.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that installing subdirectory libraries works.
+# PR/300
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AC_PROG_CC
+AM_PROG_AR
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = subdir/liba.a
+subdir_liba_a_SOURCES = a.c
+
+nobase_lib_LIBRARIES = subdir/libb.a
+subdir_libb_a_SOURCES = a.c
+END
+
+cat > a.c << 'END'
+int i = 3;
+END
+
+## A rule in the Makefile should create subdir
+# mkdir subdir
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+# We pass '--libdir' explicitly, to avoid spurious failures due to users
+# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+# as is the case with openSUSE 12.1).  See automake bug#10426.
+cwd=`pwd` || Exit 99
+./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
+
+$MAKE
+
+test -f subdir/liba.a
+test -f subdir/libb.a
+
+$MAKE install
+
+test -f inst/lib/liba.a
+test -f inst/lib/subdir/libb.a
+
+$MAKE uninstall
+
+test -f inst/lib/liba.a && Exit 1
+test -f inst/lib/subdir/libb.a && Exit 1
+
+$MAKE install-strip
+
+test -f inst/lib/liba.a
+test -f inst/lib/subdir/libb.a
+
+:
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
new file mode 100755
index 0000000..8db6b07
--- /dev/null
+++ b/t/pr300-ltlib.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that installing subdirectory libtool libraries works.
+# PR/300
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = subdir/liba.la
+subdir_liba_la_SOURCES = a.c
+
+nobase_lib_LTLIBRARIES = subdir/libb.la
+subdir_libb_la_SOURCES = a.c
+END
+
+cat > a.c << 'END'
+int i = 3;
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+# We pass '--libdir' explicitly, to avoid spurious failures due to users
+# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+# as is the case with openSUSE 12.1).  See automake bug#10426.
+cwd=`pwd` || Exit 99
+./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
+
+# A rule in the Makefile should create subdir.
+test ! -d subdir
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -d subdir
+
+grep 'liba.la .*-rpath .*lib' stdout
+grep 'liba.la .*-rpath .*lib/subdir' stdout && Exit 1
+grep 'libb.la .*-rpath .*lib/subdir' stdout
+
+test -f subdir/liba.la
+test -f subdir/libb.la
+
+$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'remember.*--finish' stderr && Exit 1
+
+test -f inst/lib/liba.la
+test -f inst/lib/subdir/libb.la
+
+$MAKE uninstall
+
+test -f inst/lib/liba.la && Exit 1
+test -f inst/lib/subdir/libb.la && Exit 1
+
+$MAKE install-strip
+
+test -f inst/lib/liba.la
+test -f inst/lib/subdir/libb.la
+
+:
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
new file mode 100755
index 0000000..6812231
--- /dev/null
+++ b/t/pr300-prog.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that installing subdirectory programs works.
+# PR/300
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = subdir/wish
+subdir_wish_SOURCES = a.c
+
+nobase_bin_PROGRAMS = subdir/want
+subdir_want_SOURCES = a.c
+
+test-all: all
+       test -f subdir/wish$(EXEEXT)
+       test -f subdir/want$(EXEEXT)
+test-install: install
+       test -f inst/bin/wish$(EXEEXT)
+       test -f inst/bin/subdir/want$(EXEEXT)
+test-uninstall: uninstall
+       test ! -f inst/bin/wish$(EXEEXT)
+       test ! -f inst/bin/subdir/want$(EXEEXT)
+test-install-strip: install-strip
+       test -f inst/bin/wish$(EXEEXT)
+       test -f inst/bin/subdir/want$(EXEEXT)
+END
+
+cat > a.c << 'END'
+#include <stdio.h>
+int main ()
+{
+   printf ("hi liver!\n");
+   return 0;
+}
+END
+
+## A rule in the Makefile should create subdir
+# mkdir subdir
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+
+./configure --prefix "`pwd`/inst"
+
+$MAKE test-all
+$MAKE test-install
+$MAKE test-uninstall
+$MAKE test-install-strip
+
+:
diff --git a/t/pr307.sh b/t/pr307.sh
new file mode 100755
index 0000000..abcff80
--- /dev/null
+++ b/t/pr307.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 307: depcomp with depmode=dashmstdout libtool race condition
+# Report from Laurent Morichetti.
+# (Also exercises check_LTLIBRARIES.)
+#
+# == Report ==
+#  The dashmstdout depmode calls libtool in parallel to generate the
+#  dependencies (with -M flag) and to build the objfile (both have
+#  --mode=compile and -o).
+#  The process with 'libtool --mode=compile .* -M' can corrupt the objfile
+#  as none is generated by the compiler.  Since --mode=compile and -o are
+#  set libtool assumes that a objfile should be generated and will execute
+#  invalid $mv & $LN_S.
+#
+# == Fix ==
+#  Now 'depcomp' never compute dependencies in the background, as this can
+#  cause races with libtool.  Compute the dependencies after the actual
+#  compilation.
+
+required='libtoolize gcc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+check_LTLIBRARIES = librace.la
+librace_la_SOURCES = a.c b.c c.c d.c e.c f.c g.c h.c
+
+# Make sure the dependencies are updated.
+check-local:
+       for i in $(librace_la_SOURCES:.c=.Plo); do \
+         echo "checking ./$(DEPDIR)/$$i"; \
+         grep 'foo\.h' ./$(DEPDIR)/$$i >tst || exit 1; \
+         test `wc -l <tst` -eq 2 || exit 1; \
+       done
+END
+
+: >foo.h
+
+for i in a b c d e f g h; do
+  unindent >$i.c <<EOF
+    #include "foo.h"
+    int $i () { return 0; }
+EOF
+done
+
+libtoolize --force
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Sanity check: make sure the variable we are attempting to force
+# is indeed used by configure.
+grep am_cv_CC_dependencies_compiler_type configure
+
+./configure am_cv_CC_dependencies_compiler_type=dashmstdout
+
+$MAKE
+test -f librace.la && Exit 1
+$MAKE check
+
+# The failure we check usually occurs during the above build,
+# with an output such as:
+#
+#   mv -f .libs/f.lo f.lo
+#   mv: cannot stat '.libs/f.lo': No such file or directory
+#
+# (This may happen on 'f' or on some other files.)
+
+test -f librace.la
+test -f tst # A proof that check-local was run.
+
+:
diff --git a/t/pr401.sh b/t/pr401.sh
new file mode 100755
index 0000000..a143498
--- /dev/null
+++ b/t/pr401.sh
@@ -0,0 +1,189 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
+# (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
+
+am_parallel_tests=no
+required=cc
+. ./defs || Exit 1
+
+mkdir lib src
+
+cat >lib/feep.c <<'EOF'
+const char *feep (void)
+{
+  return "feep";
+}
+EOF
+
+cat >src/main.c <<'EOF'
+#include <stdio.h>
+
+extern const char *feep (void);
+
+int main (void)
+{
+  puts (feep ());
+  return 0;
+}
+EOF
+
+cat >>configure.ac << 'EOF'
+## These lines are activated for later tests
+#: AC_CONFIG_LIBOBJ_DIR([lib])
+AC_PROG_CC
+#x AM_PROG_CC_C_O
+AC_LIBOBJ([feep])
+AC_LIBSOURCE([feep.c])
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_CONFIG_FILES([lib/Makefile src/Makefile])
+AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes])
+AC_OUTPUT
+EOF
+
+## ------------------------------------------ ##
+## First a test of traditional LIBOBJS usage. ##
+## ------------------------------------------ ##
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib src
+EOF
+
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = libfeep.a
+libfeep_a_SOURCES =
+libfeep_a_LIBADD = $(LIBOBJS)
+EOF
+
+cat >src/Makefile.am <<'EOF'
+check_PROGRAMS = main
+main_LDADD = ../lib/libfeep.a
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+## ------------------------------------------ ##
+## Traditional LIBOBJS with LIBOBJDIR set.    ##
+## ------------------------------------------ ##
+
+# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
+# unrelated to Automake or Makefile.am layout.
+
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+test ! -d lib/lib
+$MAKE distcheck
+
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
+
+
+## -------------------------------------------- ##
+## Test using LIBOBJS from a sibling directory. ##
+## -------------------------------------------- ##
+
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = src
+EOF
+
+cat > src/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LIBRARIES = libfeep.a
+libfeep_a_SOURCES =
+libfeep_a_LIBADD = $(LIBOBJS)
+
+check_PROGRAMS = main
+main_LDADD = libfeep.a
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+test ! -d src/lib
+test ! -d 'src/$(top_builddir)'
+$MAKE
+$MAKE check
+$MAKE distclean
+
+
+## ----------------------------------------- ##
+## Test using LIBOBJS from parent directory. ##
+## ----------------------------------------- ##
+
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LIBRARIES = lib/libfeep.a
+lib_libfeep_a_SOURCES =
+lib_libfeep_a_LIBADD = $(LIBOBJS)
+
+check_PROGRAMS = src/main
+src_main_SOURCES = src/main.c
+src_main_LDADD = lib/libfeep.a
+
+if !CROSS_COMPILING
+TESTS = src/main
+endif
+
+check-local:
+       test -f src/main.$(OBJEXT)
+       test -f lib/feep.$(OBJEXT)
+       test ! -f src/$(DEPDIR)/feep.Po
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/pr401b.sh b/t/pr401b.sh
new file mode 100755
index 0000000..3d15671
--- /dev/null
+++ b/t/pr401b.sh
@@ -0,0 +1,189 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
+# (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
+
+am_parallel_tests=no
+required='cc libtoolize'
+. ./defs || Exit 1
+
+mkdir lib src
+
+cat >lib/feep.c <<'EOF'
+const char *feep (void)
+{
+  return "feep";
+}
+EOF
+
+cat >src/main.c <<'EOF'
+#include <stdio.h>
+
+extern const char *feep (void);
+
+int main (void)
+{
+  puts (feep ());
+  return 0;
+}
+EOF
+
+cat >>configure.ac << 'EOF'
+## These lines are activated for later tests
+#: AC_CONFIG_LIBOBJ_DIR([lib])
+AC_PROG_CC
+#x AM_PROG_CC_C_O
+AC_LIBOBJ([feep])
+AC_LIBSOURCE([feep.c])
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES([lib/Makefile src/Makefile])
+AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes])
+AC_OUTPUT
+EOF
+
+## -------------------------------------------- ##
+## First a test of traditional LTLIBOBJS usage. ##
+## -------------------------------------------- ##
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib src
+EOF
+
+cat >lib/Makefile.am <<'EOF'
+noinst_LTLIBRARIES = libfeep.la
+libfeep_la_SOURCES =
+libfeep_la_LIBADD = $(LTLIBOBJS)
+EOF
+
+cat >src/Makefile.am <<'EOF'
+check_PROGRAMS = main
+main_LDADD = ../lib/libfeep.la
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE distcheck
+
+## ----------------------------------------- ##
+## Traditional LTLIBOBJS with LIBOBJDIR set. ##
+## ----------------------------------------- ##
+
+# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
+# unrelated to Automake or Makefile.am layout.
+
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+test ! -d lib/lib
+$MAKE distcheck
+
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
+
+## ---------------------------------------------- ##
+## Test using LTLIBOBJS from a sibling directory. ##
+## ---------------------------------------------- ##
+
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = src
+EOF
+
+cat > src/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LTLIBRARIES = libfeep.la
+libfeep_la_SOURCES =
+libfeep_la_LIBADD = $(LTLIBOBJS)
+
+check_PROGRAMS = main
+main_LDADD = libfeep.la
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+test ! -d src/lib
+test ! -d 'src/$(top_builddir)'
+$MAKE
+$MAKE check
+$MAKE distclean
+
+
+## ------------------------------------------- ##
+## Test using LTLIBOBJS from parent directory. ##
+## ------------------------------------------- ##
+
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LTLIBRARIES = lib/libfeep.la
+lib_libfeep_la_SOURCES =
+lib_libfeep_la_LIBADD = $(LTLIBOBJS)
+
+check_PROGRAMS = src/main
+src_main_SOURCES = src/main.c
+src_main_LDADD = lib/libfeep.la
+
+if !CROSS_COMPILING
+TESTS = src/main
+endif
+
+check-local:
+       test -f src/main.$(OBJEXT)
+       test -f lib/feep.lo
+       test ! -f src/$(DEPDIR)/feep.Po
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/pr401c.sh b/t/pr401c.sh
new file mode 100755
index 0000000..1f238f6
--- /dev/null
+++ b/t/pr401c.sh
@@ -0,0 +1,192 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
+# (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
+
+am_parallel_tests=no
+required=cc
+. ./defs || Exit 1
+
+mkdir lib src
+
+ac_cv_func_alloca_works=no
+export  ac_cv_func_alloca_works
+
+cat >lib/alloca.c <<'EOF'
+const char *feep (void)
+{
+  return "feep";
+}
+EOF
+
+cat >src/main.c <<'EOF'
+#include <stdio.h>
+
+extern const char *feep (void);
+
+int main (void)
+{
+  puts (feep ());
+  return 0;
+}
+EOF
+
+cat >>configure.ac << 'EOF'
+## These lines are activated for later tests.
+#: AC_CONFIG_LIBOBJ_DIR([lib])
+AC_PROG_CC
+#x AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_FUNC_ALLOCA
+AC_CONFIG_FILES([lib/Makefile src/Makefile])
+AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes])
+AC_OUTPUT
+EOF
+
+## ----------------------------------------- ##
+## First a test of traditional ALLOCA usage. ##
+## ----------------------------------------- ##
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib src
+EOF
+
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = libfeep.a
+libfeep_a_SOURCES =
+libfeep_a_LIBADD = $(ALLOCA)
+EOF
+
+cat >src/Makefile.am <<'EOF'
+check_PROGRAMS = main
+main_LDADD = ../lib/libfeep.a
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+
+## --------------------------------------- ##
+## Traditional ALLOCA with LIBOBJDIR set.  ##
+## --------------------------------------- ##
+
+# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
+# unrelated to Automake or Makefile.am layout.
+
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+test ! -d lib/lib
+$MAKE distcheck
+
+## -------------------------------------------- ##
+## Error message with usage in wrong directory. ##
+## -------------------------------------------- ##
+
+mv -f src/Makefile.am src/t
+sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
+AUTOMAKE_fails
+grep 'cannot be used outside.*lib' stderr
+mv -f src/t src/Makefile.am
+
+
+## ------------------------------------------- ##
+## Test using ALLOCA from a sibling directory. ##
+## ------------------------------------------- ##
+
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = src
+EOF
+
+cat > src/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LIBRARIES = libfeep.a
+libfeep_a_SOURCES =
+libfeep_a_LIBADD = $(ALLOCA) $(LIBOBJS) # Add LIBOBJS for fun.
+
+check_PROGRAMS = main
+main_LDADD = libfeep.a
+
+if !CROSS_COMPILING
+TESTS = main
+endif
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE
+test ! -d src/lib
+test ! -d 'src/$(top_builddir)'
+$MAKE check
+$MAKE distclean
+
+
+## ---------------------------------------- ##
+## Test using ALLOCA from parent directory. ##
+## ---------------------------------------- ##
+
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
+
+cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+
+noinst_LIBRARIES = lib/libfeep.a
+lib_libfeep_a_SOURCES =
+lib_libfeep_a_LIBADD = $(ALLOCA)
+
+check_PROGRAMS = src/main
+src_main_SOURCES = src/main.c
+src_main_LDADD = lib/libfeep.a
+
+if !CROSS_COMPILING
+TESTS = src/main
+endif
+
+check-local:
+       test -f src/main.$(OBJEXT)
+       test -f lib/alloca.$(OBJEXT)
+       test ! -f src/$(DEPDIR)/alloca.Po
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/pr72.sh b/t/pr72.sh
new file mode 100755
index 0000000..b16e879
--- /dev/null
+++ b/t/pr72.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 72
+# Empty _SOURCES results in $(LINK) undefined.
+
+required=libtool
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libviewer.la
+libviewer_la_SOURCES =
+libviewer_la_LIBADD = libphony.la
+END
+
+: > ltconfig
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+$AUTOMAKE -Wno-extra-portability
+
+grep '^LINK =' Makefile.in
+
+:
diff --git a/t/pr8365-remake-timing.sh b/t/pr8365-remake-timing.sh
new file mode 100755
index 0000000..2feaf6d
--- /dev/null
+++ b/t/pr8365-remake-timing.sh
@@ -0,0 +1,107 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for automake bug#8365, related to Makefile remake rules.
+# The bug is due to subtle timestamp issues and limitations in
+# make's behaviour, and is very unlikely to be triggered (we have
+# to resort to timestamp edit hacks to consistently expose it); in
+# any account, it is nigh to impossible to trigger it by running
+# make by hand.  Thus, fixing it would not be worth the hassle, but
+# we prefer to keep it exposed anyway.
+
+. ./defs || Exit 1
+
+# We'll use calls to stat to get debugging information.
+if stat /dev/null; then stat=stat; else stat=:; fi
+
+cat >> configure.ac << 'END'
+FOOBAR=zardoz
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+# Run automake *before* autoconf, because we want to ensure that
+# Makefile.in is not newer than configure.
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE Makefile
+# Sanity check.
+$EGREP 'FOOBAR|zardoz' Makefile && fatal_ 'unexpected AC_SUBST in Makefile'
+
+echo 'AC_SUBST([FOOBAR])' >> configure.ac
+
+# Modified configure dependencies must have the same timestamp of
+# config.status and Makefile in order to trigger the bug.
+# We also re-touch config.status, because "touch -r" can truncate
+# timestamps on file systems with sub-second resolutions (see the
+# autoconf manual).  Finally, we also sleep before touching, to ensure
+# that the (possibly truncated) timestamps of config.status etc. are
+# strictly newer than the non-truncated configure timestamp.
+$stat config.status Makefile configure.ac
+$sleep
+touch config.status
+touch -r config.status config.status Makefile configure.ac
+$stat config.status Makefile configure.ac
+
+# Also, the race condition is triggered only when aclocal, automake
+# and aclocal run fast enough to keep the timestamp of the generated
+# aclocal.m4, Makefile.in and configure equal to the timestamp of
+# Makefile & config.status.  To reproduce this race consistently, we
+# need the following hackish wrappers.
+
+cat > aclocal-wrap <<END
+#!/bin/sh
+set -ex
+# aclocal shouldn't use our autoconf wrapper when extracting
+# the races from configure.ac.
+AUTOCONF='$AUTOCONF'; export AUTOCONF
+$ACLOCAL "\$@"
+touch -r config.status aclocal.m4
+$stat aclocal.m4
+END
+
+cat > automake-wrap <<END
+#!/bin/sh
+set -ex
+# automake shouldn't use our autoconf wrapper when extracting
+# the races from configure.ac.
+AUTOCONF='$AUTOCONF'; export AUTOCONF
+$AUTOMAKE "\$@"
+touch -r config.status Makefile.in
+$stat Makefile.in
+END
+
+cat > autoconf-wrap <<END
+#!/bin/sh
+set -ex
+$AUTOCONF "\$@"
+touch -r config.status configure
+$stat configure
+END
+
+chmod a+x aclocal-wrap automake-wrap autoconf-wrap
+
+env \
+  ACLOCAL=./aclocal-wrap AUTOMAKE=./automake-wrap AUTOCONF=./autoconf-wrap \
+  $MAKE -e Makefile
+grep '^FOOBAR =' Makefile.in
+grep '^FOOBAR *= *zardoz *$' Makefile
+
+:
diff --git a/t/pr87.sh b/t/pr87.sh
new file mode 100755
index 0000000..d98b661
--- /dev/null
+++ b/t/pr87.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR automake/87.
+# "make distcheck" fails when two source dirs exist.
+
+required=cc
+. ./defs || Exit 1
+
+subdirs="foo bar"
+
+for i in $subdirs; do
+    mkdir $i
+    unindent >$i/$i.c <<EOF
+      int main (void)
+      {
+        return 0;
+      }
+EOF
+    unindent >$i/Makefile.am <<EOF
+      bin_PROGRAMS = $i
+      ${i}_SOURCES = $i.c
+EOF
+done
+
+echo "SUBDIRS = $subdirs" > Makefile.am
+cat >configure.ac <<EOF
+AC_INIT(`echo $subdirs | sed 's|\([a-z][a-z]*\).*|\1/\1.c|'`)
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE($me, 1.0)
+AC_PROG_CC
+AC_OUTPUT(Makefile `echo $subdirs | sed 's|\([a-z][a-z]*\)|\1/Makefile|g'`)
+EOF
+
+mkdir build
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Regression test for bug where '.c.o:' is followed by blank line.
+(while read line; do
+    if test "$line" = ".c.o:"; then
+       read next
+       if test -z "$next"; then
+         Exit 1
+       else
+          : # For shells with broken 'set -e'.
+       fi
+       break
+    fi
+ done) < foo/Makefile.in || Exit 1
+
+cd build
+../configure
+$MAKE distcheck
+
+:
diff --git a/t/pr9.sh b/t/pr9.sh
new file mode 100755
index 0000000..36a9f7e
--- /dev/null
+++ b/t/pr9.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in PR 9.
+# "make dist" incorrect when AC_CONFIG_AUX_DIR is present.
+#
+# == Report ==
+# When AC_CONFIG_AUX_DIR is set (in my case to 'support'), make dist
+# no longer automatically includes config.guess, config.sub, install-sh,
+# ltconfig, ltmain.sh, mdate-sh, missing, and mkinstalldirs.  In fact,
+# the entire 'support/' directory is omitted.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([support])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+mkdir support
+
+$ACLOCAL
+
+$AUTOCONF
+$AUTOMAKE -a -c
+./configure
+$MAKE
+$MAKE distcheck
+
+gzip -d $distdir.tar.gz
+
+tar tf $distdir.tar | $FGREP support
+
+tar xf $distdir.tar
+ls -l . $distdir # For debugging.
+test -d $distdir/support
+ls -l $distdir/support # For debugging.
+test -f $distdir/support/install-sh
+
+:
diff --git a/t/prefix.sh b/t/prefix.sh
new file mode 100755
index 0000000..26c088a
--- /dev/null
+++ b/t/prefix.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure range of prefixes can be extended
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'EOF'
+bnidir = $(prefix)/bni
+bni_PROGRAMS = zardoz
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/primary-prefix-couples-documented-valid.sh 
b/t/primary-prefix-couples-documented-valid.sh
new file mode 100755
index 0000000..7b0021a
--- /dev/null
+++ b/t/primary-prefix-couples-documented-valid.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the "uncommon" prefix/primary combinations used in
+# examples in the Automake manual do not cause obvious errors.
+# Please keep this test in sync with the automake manual.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AM_PROG_GCJ
+AM_PATH_PYTHON
+END
+
+# Fake libtool availability.
+: > ltmain.sh
+cat > acinclude.m4 <<'END'
+AC_DEFUN([AC_PROG_LIBTOOL],
+         [AC_SUBST([LIBTOOL], [:])])
+END
+
+cat > Makefile.am <<'END'
+xmldir = $(datadir)/xml
+xml_DATA = file.xml
+
+data_DATA = file1 file2 file3
+data2dir = $(datadir)
+data2_DATA = file4 file5 file6
+
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = mymacro.m4 myothermacro.m4
+
+imagesdir = $(pkgdatadir)/images
+soundsdir = $(pkgdatadir)/sounds
+dist_images_DATA = images/vortex.pgm
+dist_sounds_DATA = sounds/whirl.ogg
+
+lisp_DATA = file1.el file2.el
+
+javadir = $(datadir)/java
+dist_java_JAVA = a.java b.java c.java
+
+pkgpython_PYTHON = foo.py
+
+pyexec_LTLIBRARIES = quaternion.la
+quaternion_la_SOURCES = quaternion.c support.c support.h
+quaternion_la_LDFLAGS = -avoid-version -module
+
+myexecbindir = /exec
+myexecbin_PROGRAMS = zardoz
+
+foodir = $(prefix)/foo
+barexecdir = $(prefix)/bar/binaries
+foo_SCRIPTS = foo.sh
+barexec_SCRIPTS = quux.pl
+
+my_execbindir = $(pkglibdir)
+my_doclibdir = $(docdir)
+my_execbin_PROGRAMS = foo
+my_doclib_LIBRARIES = libquux.a
+END
+
+$ACLOCAL
+
+# Both these two invocations are meant.
+# They exercise both code paths concerning auxiliary files.
+$AUTOMAKE -a
+$AUTOMAKE
+
+:
diff --git a/t/primary-prefix-couples-force-valid.sh 
b/t/primary-prefix-couples-force-valid.sh
new file mode 100755
index 0000000..064db2b
--- /dev/null
+++ b/t/primary-prefix-couples-force-valid.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that a user who wants to use an invalid prefix/primary
+# combination can do so with a proper workaround.
+# For example, this:
+#   lib_PROGRAMS = foo
+# is expected to cause an automake error, but this:
+#   bardir = $(libdir)
+#   bar_PROGRAMS = foo
+# should work.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+my_libdir = $(libdir)
+my_lib_PROGRAMS = foo
+
+foodir = $(bindir)
+foo_LIBRARIES = libquux.a
+
+xdir = $(libexecdir)
+x_HEADERS = bar.h
+
+installcheck-local: test
+.PHONY: test
+test:
+       (cd '$(prefix)' && find .);: For debugging.
+       ls -l '$(libdir)/foo$(EXEEXT)'
+       test -f '$(libdir)/foo$(EXEEXT)'
+       test -x '$(libdir)/foo$(EXEEXT)'
+       ls -l '$(bindir)/libquux.a'
+       test -f '$(bindir)/libquux.a'
+       ls -l '$(libexecdir)/bar.h'
+       test -f '$(libexecdir)/bar.h'
+       test ! -x '$(libexecdir)/bar.h'
+END
+
+cat > foo.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cat > libquux.c <<'END'
+int quux(void)
+{
+  return 1;
+}
+END
+
+: > bar.h
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+./configure --prefix="$cwd/_inst"
+
+$MAKE install
+$MAKE installcheck
+$MAKE distcheck
+
+:
diff --git a/t/primary-prefix-invalid-couples.tap 
b/t/primary-prefix-invalid-couples.tap
new file mode 100755
index 0000000..407c873
--- /dev/null
+++ b/t/primary-prefix-invalid-couples.tap
@@ -0,0 +1,194 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Not all primaries/directories combinations are valid.
+# Automake should flag them as errors.
+# Originated from PR/294, extended later (following bug #7647) to
+# cover more cases.
+# See also test 'primary-prefix-valid-couples.test'.
+
+. ./defs || Exit 1
+
+plan_ "later"
+
+oIFS=$IFS # Saved for later.
+
+: > ar-lib
+: > ltmain.sh
+: > texinfo.tex
+: > elisp-comp
+: > py-compile
+: > config.guess
+: > config.sub
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_SUBST([LIBTOOL], [:]) dnl So that we don't have to require Libtool.
+AM_PROG_GCJ
+AM_PATH_PYTHON
+AM_PATH_LISPDIR
+END
+
+$ACLOCAL || fatal_ "aclocal failure"
+
+# Please keep this list in sync with the list of "Directory Variables"
+# in the GNU Coding Standards and with the list additional directory
+# variables provided by autoconf and/or automake (pkgdatadir, pkglibdir,
+# ...).   See also the hash '%standard_prefix' in the automake script.
+prefixes='bin data dataroot doc dvi exec html include info lib libexec
+          lisp locale localstate man man1 man2 man3 man4 man5 man6 man7
+          man8 man9 oldinclude pdf pkgdata pkginclude pkglib pkglibexec
+          ps sbin sharedstate sysconf'
+# Please keep this list in sync with the list of primaries documented in
+# the Automake manual (see the "The Uniform Naming Scheme" section).
+primaries='PROGRAMS LIBRARIES LTLIBRARIES LISP PYTHON JAVA SCRIPTS DATA
+           HEADERS MANS TEXINFOS'
+
+# Use files, not variables, to hold the list of all the possible
+# prefix_PRIMARY couples and the list of those couples valid for
+# automake, to avoid having unreadable very verbose traces.
+
+set +x # Don't be overly verbose.
+
+for prefix in $prefixes; do
+  for primary in $primaries; do
+    echo ${prefix} ${primary}
+  done
+done >all.list
+
+for primary in $primaries; do
+  prefixes_ok=''
+  case $primary in
+    LIBRARIES|LTLIBRARIES)
+      prefixes_ok='lib pkglib'
+      ;;
+    PROGRAMS)
+      prefixes_ok='bin sbin libexec pkglibexec'
+      ;;
+    SCRIPTS)
+      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
+      ;;
+    DATA)
+      prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
+                   sysconf sharedstate localstate lisp'
+      ;;
+    HEADERS)
+      prefixes_ok='include oldinclude pkginclude'
+      ;;
+    LISP)
+      prefixes_ok='lisp'
+      ;;
+    PYTHON)
+      prefixes_ok='python'
+      ;;
+    JAVA)
+      prefixes_ok='java'
+      ;;
+    MANS)
+      # FIXME: Here we'd like to have:
+      #   prefixes_ok='man man1 man2 man3 man4 man5 man6 man7 man8 man9'
+      # but Automake currently fails on that, as it allows the MANS
+      # primary to be coupled to any prefix.
+      # See also Automake bug#7656.
+      # We should dig out how automake had come to behave this way, and
+      # if such a behaviour can be safely changed.
+      prefixes_ok=$prefixes
+      ;;
+    TEXINFOS)
+      # FIXME: Here we'd like to have:
+      #   prefixes_ok='info'
+      # but Automake currently fails on that, as it allows the use of
+      # 'foo_TEXINFOS' to declare extra Texinfo sources for the 'foo'
+      # Texinfo manual, as in e.g.:
+      #   info_TEXINFOS = foo.texi
+      #   foo_TEXINFOS = gpl.texi
+      # See also Automake bug#7657.
+      prefixes_ok=$prefixes
+      ;;
+    *)
+      fatal_ "unrecognized primary '$primary'"
+      ;;
+  esac
+  for prefix in $prefixes_ok; do
+    echo ${prefix}_${primary}
+  done
+done >allow.list
+
+# 'html_TEXINFOS' is not yet supported, and might never be.
+grep -v '^html TEXINFOS$' all.list | awk '{print NR, $0}' > t
+mv -f t all.list
+
+# For debugging.
+echo '=== all.list ==='
+cat all.list
+echo '=== allow.list ==='
+cat allow.list
+
+# Create the Makefile.am.
+while read lineno prefix primary; do
+  test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
+    || fatal_ "internal error in 'all.list'"
+  pfx='' ext=''
+  case $primary in
+    LTLIBRARIES) pfx=lib ext=la;;
+    LIBRARIES) pfx=lib ext=a;;
+    MANS) ext=man;;
+    HEADERS) ext=h;;
+    JAVA) ext=java;;
+    PYTHON) ext=py;;
+    LISP) ext=el;;
+    TEXINFOS) ext=texi;;
+  esac
+  test -z "$ext" || ext=.$ext
+  if test $primary = TEXINFOS; then
+    echo @setfilename foo$lineno.info > foo$lineno.texi
+  fi
+  echo ${prefix}_${primary} = ${pfx}foo${lineno}${ext}
+done <all.list >Makefile.am
+
+# For debugging.
+echo '=== Makefile.am ==='
+cat Makefile.am
+
+set -x # Restore shell xtraces from now on.
+
+AUTOMAKE_fails \
+  -d "'automake -a' error out on mismatched prefix/primary couples" \
+  -- --add-missing
+
+while read lineno prefix primary; do
+  test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
+    || fatal_ "internal error in 'all.list'"
+  grep "^${prefix}_${primary}$" allow.list >/dev/null && continue
+  errmsg_rx=".*${prefix}dir.* not a legitimate directory .*$primary"
+  command_ok_ \
+    "mismatched prefix/primary in ${prefix}_${primary}" \
+    grep "^Makefile\\.am:$lineno: $errmsg_rx" stderr
+done <all.list
+
+# Check that automake really failed only for the expected reason(s).
+grep -v 'dir.* not a legitimate directory' stderr && Exit 1
+
+# Check that the same failures are present without the '--add-missing'
+# option.
+mv stderr stderr.old
+AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
+command_ok_ "... and with the same diagnostic of 'automake -a'" \
+            diff stderr.old stderr
+
+:
diff --git a/t/primary-prefix-valid-couples.sh 
b/t/primary-prefix-valid-couples.sh
new file mode 100755
index 0000000..989ca4b
--- /dev/null
+++ b/t/primary-prefix-valid-couples.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for valid prefix/primary combinations.
+# See also test 'primary-prefix-invalid-couples.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AM_PATH_PYTHON
+AM_PATH_LISPDIR
+END
+
+# Fake libtool availability.
+: > ltmain.sh
+: > config.sub
+: > config.guess
+cat > acinclude.m4 <<'END'
+AC_DEFUN([AC_PROG_LIBTOOL],
+         [AC_SUBST([LIBTOOL], [:])])
+END
+
+# Other required files.
+echo '@setfilename foo' > foo.texi
+: > texinfo.tex
+: > py-compile
+: > elisp-comp
+: > ar-lib
+
+# Setup Makefile.am.
+
+: > Makefile.am
+
+for p in bin sbin libexec pkglibexec; do
+  echo "${p}_PROGRAMS = prog-$p" >> Makefile.am
+done
+
+for p in lib pkglib; do
+  echo "${p}_LIBRARIES = libs-$p.a" >> Makefile.am
+  echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
+done
+
+for p in bin sbin libexec pkglibexec pkgdata; do
+  echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
+done
+
+for p in data dataroot pkgdata doc html dvi pdf ps sysconf \
+         sharedstate localstate lisp; do
+  echo "${p}_DATA = $p.dat" >> Makefile.am
+done
+
+for p in include oldinclude pkginclude; do
+  echo "${p}_HEADERS = $p.h" >> Makefile.am
+done
+
+for p in man man1 man2 man3 man4 man5 man6 man7 man8 man9; do
+  echo "${p}_MANS = bar.$p"
+done
+
+echo "info_TEXINFOS = foo.texi" >> Makefile.am
+echo "lisp_LISP = foo.el" >> Makefile.am
+echo "python_PYTHON = foo.py" >> Makefile.am
+
+awk '{print NR ":" $0}' Makefile.am # For debugging.
+
+# Go with the tests.
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/primary.sh b/t/primary.sh
new file mode 100755
index 0000000..e1a8f44
--- /dev/null
+++ b/t/primary.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure errors in am_install_var work.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = @programs@
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'bin_PROGRAMS.*configure substitution' stderr
+grep 'EXTRA_PROGRAMS.*not defined' stderr
+
+:
diff --git a/t/primary2.sh b/t/primary2.sh
new file mode 100755
index 0000000..f9417d8
--- /dev/null
+++ b/t/primary2.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure errors in am_install_var work.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = @programs@
+EXTRA_PROGRAMS = joe @more@
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'EXTRA_PROGRAMS.*configure substitution' stderr
+
+:
diff --git a/t/primary3.sh b/t/primary3.sh
new file mode 100755
index 0000000..80dab29
--- /dev/null
+++ b/t/primary3.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we can build programs ending in '.la'
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo.la
+foo_la_SOURCES = foo.c
+.PHONY: test
+test: all
+       test -f foo.la$(EXEEXT)
+END
+
+echo 'int main () { return 0; }' > foo.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE test
+
+:
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
new file mode 100755
index 0000000..f5764b3
--- /dev/null
+++ b/t/print-libdir.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test on automake options '--print-data-dir' and '--print-script-dir'.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+libdir=`$AUTOMAKE --print-libdir` || Exit 1
+case $libdir in /*);; *) Exit 1;; esac
+test -d "$libdir"
+test "$libdir" = "$am_pkgvdatadir"
+test "$libdir" = "$am_scriptdir"
+
+: > Makefile.am
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+touch ChangeLog README NEWS AUTHORS COPYING
+
+$ACLOCAL
+$AUTOMAKE --gnu --add-missing
+ls -l
+
+diff missing "$libdir"/missing
+diff INSTALL "$libdir"/INSTALL
+
+:
diff --git a/t/proginst.sh b/t/proginst.sh
new file mode 100755
index 0000000..4008b47
--- /dev/null
+++ b/t/proginst.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug where when multiple scripts are installed,
+# the check for AC_PROG_INSTALL fails.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_SCRIPTS = zardoz qbert brownie
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
new file mode 100755
index 0000000..7de6d99
--- /dev/null
+++ b/t/programs-primary-rewritten.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure xxx_PROGRAMS gets properly rewritten where needed.  These
+# checks have been introduced in commit 'Release-1-9-254-g9d0eaef' into
+# the former test 'subst2.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([FOO], [c])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+EXEEXT = .bin
+
+check_PROGRAMS = a
+bin_PROGRAMS = b @FOO@
+noinst_PROGRAMS = $(bar) $(baz:=de)
+EXTRA_PROGRAMS =
+
+bar = zardoz
+baz = mau
+
+.PHONY: test
+test:
+       is $(check_PROGRAMS) == a.bin
+       is $(bin_PROGRAMS) == b.bin c
+       is $(noinst_PROGRAMS) == zardoz.bin maude.bin
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep PROGRAMS Makefile.in # For debugging.
+
+# Check that no useless indirections are used.
+grep '^check_PROGRAMS = a$(EXEEXT)$' Makefile.in
+grep '^bin_PROGRAMS = b$(EXEEXT) @address@hidden' Makefile.in
+
+$AUTOCONF
+./configure
+$MAKE test
+
+:
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
new file mode 100755
index 0000000..1504f55
--- /dev/null
+++ b/t/py-compile-basedir.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the '--basedir' option of the 'py-compile' script,
+
+required=python
+. ./defs || Exit 1
+
+# We'll need to create files in '..', so we need one more subdirectory
+# level in order not to clutter up the top-level tests directory.
+mkdir sandbox
+cd sandbox
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+f=__init__
+for d in foo foo/bar "`pwd`/foo" . .. ../foo ''; do
+  if test -z "$d"; then
+    d2=.
+  else
+    d2=$d
+  fi
+  ../install-sh -d "$d2" "$d2/sub" || Exit 99
+  : > "$d2/$f.py"
+  : > "$d2/sub/$f.py"
+  ./py-compile --basedir "$d" "$f.py" "sub/$f.py"
+  ls -l "$d2" "$d2/sub" # For debugging.
+  test -f "$d2/$f.pyc"
+  test -f "$d2/$f.pyo"
+  test -f "$d2/sub/$f.pyc"
+  test -f "$d2/sub/$f.pyo"
+  rm -f "$d2/$f.pyc" "$d2/$f.pyo" "$d2/sub/$f.pyc" "$d2/sub/$f.pyo"
+  find . | grep '\.py[co]$' && Exit 1
+done
+
+:
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
new file mode 100755
index 0000000..5fa3bf6
--- /dev/null
+++ b/t/py-compile-basic.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test more basic functionalities of the 'py-compile' script,
+# with "believable" python sources.  See also related test
+# 'py-compile-basic2.test'.
+
+required=python
+. ./defs || Exit 1
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+cat > foo.py <<'END'
+# Try out some non-trivial syntax in here.
+
+'''Module docstring'''
+
+def foo (*args, **kwargs):
+  """Function docstring
+  with embedded newline"""
+  return 1
+
+class Foo:
+  r"""Class docstring"""
+  def __init__(self):
+    r'''Method docstring
+        with
+        embedded
+        newlines'''
+    pass
+
+bar = baz = (1, (2,), [3, 4]); zardoz = 0;
+END
+
+cat > bar.py <<'END'
+# Import of non-existent modules, or assertion of false conditions,
+# shouldn't cause problems, as it should be enough for the code to
+# be syntactically correct.
+import Automake.No.Such.Module
+assert False
+END
+
+./py-compile foo.py bar.py
+test -f foo.pyc
+test -f foo.pyo
+test -f bar.pyc
+test -f bar.pyo
+
+:
diff --git a/t/py-compile-basic2.sh b/t/py-compile-basic2.sh
new file mode 100755
index 0000000..dfa992c
--- /dev/null
+++ b/t/py-compile-basic2.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test more basic functionalities of the 'py-compile' script, with
+# dummy python sources, but more complex directory layouts.  See also
+# related test 'py-compile-basic.test'.
+
+required=python
+. ./defs || Exit 1
+
+ocwd=`pwd` || Exit 99
+
+pyfiles="
+  foo.py
+  ./foo1.py
+  ../foo2.py
+  ../dir/foo3.py
+  $ocwd/foo4.py
+  sub/bar.py
+  sub/subsub/barbar.py
+  __init__.py
+  sub/__init__.py
+  1.py
+  .././_.py
+"
+
+lst='
+  dir/foo
+  dir/foo1
+  foo2
+  dir/foo3
+  foo4
+  dir/sub/bar
+  dir/sub/subsub/barbar
+  dir/__init__
+  dir/sub/__init__
+  dir/1
+  _
+'
+
+mkdir dir
+cd dir
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+mkdir sub sub/subsub
+touch $pyfiles
+./py-compile $pyfiles
+cd "$ocwd"
+
+for x in $lst; do echo $x.pyc; echo $x.pyo; done | sort > exp
+find . -name '*.py[co]' | sed 's|^\./||' | sort > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
new file mode 100755
index 0000000..ab3fe77
--- /dev/null
+++ b/t/py-compile-destdir.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the '--destdir' option of the 'py-compile' script,
+
+required=python
+. ./defs || Exit 1
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+# Should not give false positives when grepping for it, so use
+# an "uncommon" string (with ugly CamelCase).
+destdir=TheDestDir
+
+mkdir sub $destdir $destdir/sub
+echo 'def foo (): return "foo"' > $destdir/foo.py
+echo 'def bar (): return "bar"' > $destdir/sub/bar.py
+
+./py-compile --destdir $destdir foo.py sub/bar.py
+ls -l $destdir $destdir/sub # For debugging.
+ls . sub | grep '\.py[co]$' && Exit 1
+test -f $destdir/foo.pyc
+test -f $destdir/foo.pyo
+test -f $destdir/sub/bar.pyc
+test -f $destdir/sub/bar.pyo
+strings $destdir/*.py[co] $destdir/sub/*.py[co] || : # For debugging.
+$FGREP $destdir $destdir/*.py[co] $destdir/sub/*.py[co] && Exit 1
+
+:
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
new file mode 100755
index 0000000..5dd7e5f
--- /dev/null
+++ b/t/py-compile-env.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'py-compile' honours the PYTHON environment variable.
+
+. ./defs || Exit 1
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+cat > my-py <<'END'
+#!/bin/sh
+: > my-py.run
+END
+chmod a+x my-py
+
+mkdir sub1
+cd sub1
+
+PYTHON=: ../py-compile foo.py
+ls | grep . && Exit 1
+
+PYTHON=false ../py-compile foo.py && Exit 1
+ls | grep . && Exit 1
+
+PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py
+PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py | grep 'GrEpMe AndMeToo'
+ls | grep . && Exit 1
+
+cd ..
+mkdir sub2
+cd sub2
+
+PYTHON=../my-py ../py-compile foo.py
+test -f my-py.run
+ls | grep -v '^my-py\.run$' | grep . && Exit 1
+
+cd ..
+mkdir sub3
+cd sub3
+PATH=..$PATH_SEPARATOR$PATH; export PATH
+PYTHON=my-py py-compile foo.py
+test -f my-py.run
+ls | grep -v '^my-py\.run$' | grep . && Exit 1
+
+:
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
new file mode 100755
index 0000000..f54ffc7
--- /dev/null
+++ b/t/py-compile-option-terminate.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that a non-option argument and the '--' special argument
+# explicitly terminate the option list for 'py-compile'.
+
+required=python
+. ./defs || Exit 1
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+: > ./-o.py
+: > ./--foo.py
+./py-compile -- -o.py --foo.py
+test -f ./-o.pyc
+test -f ./-o.pyo
+test -f ./--foo.pyc
+test -f ./--foo.pyo
+rm -f ./-*.py[co]
+: > x.py
+./py-compile x.py -o.py --foo.py
+test -f ./x.pyc
+test -f ./x.pyo
+test -f ./-o.pyc
+test -f ./-o.pyo
+test -f ./--foo.pyc
+test -f ./--foo.pyo
+
+:
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
new file mode 100755
index 0000000..19883b0
--- /dev/null
+++ b/t/py-compile-usage.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test 'py-compile --help', 'py-compile --version', and that 'py-compile'
+# correctly complains on wrong usage.
+
+. ./defs || Exit 1
+
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
+
+# --help
+
+./py-compile --help >stdout 2>stderr \
+  || { cat stdout; cat stderr >&2; Exit 1; }
+cat stdout
+test -s stderr && { cat stderr >&2; Exit 1; }
+grep '^Usage: py-compile .' stdout
+$FGREP ' [--basedir DIR]' stdout
+$FGREP ' [--destdir DIR]' stdout
+
+# --version
+
+./py-compile --version >stdout 2>stderr \
+  || { cat stdout; cat stderr >&2; Exit 1; }
+cat stdout
+test -s stderr && { cat stderr >&2; Exit 1; }
+year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
+month='(0[0-9]|1[012])'
+day='([012][0-9]|3[01])'
+hour='([01][0-9]|2[0123])'
+LC_ALL=C $EGREP "^py-compile $year-$month-$day\.$hour" stdout
+test `wc -l <stdout` -eq 1
+
+# Unknown option.
+
+for opt in -b -d --foo; do
+  ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
+  cat stderr >&2
+  grep "^py-compile: unrecognized option ['\`]$opt'" stderr
+  grep "^Try [\`']py-compile --help' for more information" stderr
+done
+
+# Missing option argument.
+
+for opt in --basedir --destdir; do
+  ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
+  cat stderr >&2
+  grep "^py-compile: option ['\`]$opt' requires an argument" stderr
+  grep "^Try [\`']py-compile --help' for more information" stderr
+done
+
+# Missing files.
+
+for args in '' '--basedir dir' '--destdir dir'; do
+  ./py-compile $args 2>stderr && { cat stderr >&2; Exit 1; }
+  cat stderr >&2
+  grep '^py-compile: no files given' stderr
+  grep "^Try [\`']py-compile --help' for more information" stderr
+done
+
+:
diff --git a/t/python-dist.sh b/t/python-dist.sh
new file mode 100755
index 0000000..25dd4fe
--- /dev/null
+++ b/t/python-dist.sh
@@ -0,0 +1,78 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test distribution of *_PYTHON files.
+
+# This test does not require python.
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PATH_PYTHON([], [:], [:])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+python_PYTHON = python.py
+dist_python_PYTHON = python-dist.py
+nodist_python_PYTHON = python-nodist.py
+
+pkgpython_PYTHON = pkgpython.py
+dist_pkgpython_PYTHON = pkgpython-dist.py
+nodist_pkgpython_PYTHON = pkgpython-nodist.py
+
+mydir = $(prefix)/my
+my_PYTHON = my.py
+dist_my_PYTHON = my-dist.py
+nodist_my_PYTHON = my-nodist.py
+
+my.py my-dist.py my-nodist.py:
+       : > $@
+
+.PHONY: disttest
+disttest: distdir
+       ls -l $(distdir)
+       test -f $(distdir)/python.py
+       test -f $(distdir)/python-dist.py
+       test ! -f $(distdir)/python-nodist.py
+       test -f $(distdir)/pkgpython.py
+       test -f $(distdir)/pkgpython-dist.py
+       test ! -f $(distdir)/pkgpython-nodist.py
+       test -f $(distdir)/my.py
+       test -f $(distdir)/my-dist.py
+       test ! -f $(distdir)/my-nodist.py
+END
+
+: > python.py
+: > python-dist.py
+: > python-nodist.py
+
+: > pkgpython.py
+: > pkgpython-dist.py
+: > pkgpython-nodist.py
+
+: > py-compile
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE disttest
+# It's not distributed, hence it shouldn't be needlessly generated.
+test ! -f my-nodist.py
+
+:
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
new file mode 100755
index 0000000..3efa5d0
--- /dev/null
+++ b/t/python-pr10995.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test automake bug#10995: am__py_compile doesn't get correctly defined
+# when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
+# declaration.
+
+required=python
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'END'
+yesinstdir = $(prefix)/py
+noinst_PYTHON = no.py
+yesinst_PYTHON = yes.py
+disttest: distdir
+       test -f $(distdir)/no.py
+       test -f $(distdir)/yes.py
+END
+
+echo 'def foo(): return 1' > yes.py
+# no.py shouldn't be byte-compiled, so lets make it syntactically invalid.
+echo 'if' > no.py
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+test -f py-compile
+
+inst=`pwd`/inst
+
+./configure --prefix="$inst"
+$MAKE install
+test -f "$inst/py/yes.py"
+test -f "$inst/py/yes.pyc"
+test ! -f "$inst/py/no.py"
+test ! -f "$inst/py/no.pyc"
+
+$MAKE disttest
+
+:
diff --git a/t/python-vars.sh b/t/python-vars.sh
new file mode 100755
index 0000000..56c2b61
--- /dev/null
+++ b/t/python-vars.sh
@@ -0,0 +1,107 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that AM_PATH_PYTHON correctly sets all the output variables
+# advertised in the manual.
+
+required=python
+. ./defs || Exit 1
+
+# In case the user's config.site defines pythondir or pyexecdir.
+CONFIG_SITE=/dev/null; export CONFIG_SITE
+
+PYTHON=python
+
+# Update the definition below if the documentation changes.
+# Note that the value of the 'pythondir' and 'pyexecdir' variables can
+# vary among different python installations, so we need more relaxed
+# and ad-hoc checks for them.  Also, more proper "functional" checks
+# on them should be done in the 'python-virtualenv.test' test.
+PYTHON_VERSION=`$PYTHON -c 'import sys; print(sys.version[:3])'` || Exit 1
+PYTHON_PLATFORM=`$PYTHON -c 'import sys; print(sys.platform)'` || Exit 1
+PYTHON_EXEC_PREFIX='${exec_prefix}'
+PYTHON_PREFIX='${prefix}'
+pkgpythondir="\${pythondir}/$me"
+pkgpyexecdir="\${pyexecdir}/$me"
+
+pyvars='PYTHON_VERSION PYTHON_PLATFORM PYTHON_PREFIX PYTHON_EXEC_PREFIX
+        pkgpythondir pkgpyexecdir'
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([vars-got pythondir pyexecdir])
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+cat > my.py << 'END'
+def my():
+    return 1
+END
+
+cat > Makefile.am << 'END'
+
+python_PYTHON = my.py
+
+EXTRA_DIST = vars-exp
+
+check-local: test-in test-am
+.PHONY: test-in test-am
+
+test-in:
+       cat pythondir
+       case `cat pythondir` in '$${prefix}'/*);; *) exit 1;; esac
+       cat pyexecdir
+       case `cat pyexecdir` in '$${exec_prefix}'/*);; *) exit 1;; esac
+       cat $(srcdir)/vars-exp
+       cat $(builddir)/vars-got
+       diff $(srcdir)/vars-exp $(builddir)/vars-got
+
+## Note: this target's rules will be extended in the "for" loop below.
+test-am:
+       case '$(pythondir)' in '$(prefix)'/*);; *) exit 1;; esac
+       case '$(pyexecdir)' in '$(exec_prefix)'/*);; *) exit 1;; esac
+END
+
+echo @pythondir@ > pythondir.in
+echo @pyexecdir@ > pyexecdir.in
+
+: > vars-exp
+: > vars-got.in
+
+for var in $pyvars; do
+  eval val=\$$var
+  echo "var=$val" >> vars-exp
+  echo "address@hidden@" >> vars-got.in
+  echo "${tab}test x'\$($var)' = x'$val'" >> Makefile.am
+done
+
+cat Makefile.am
+cat vars-got.in
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+for var in pythondir pyexecdir $pyvars; do
+  grep "^$var *=" Makefile.in
+done
+
+$AUTOCONF
+./configure PYTHON="$PYTHON"
+
+$MAKE test-in test-am
+$MAKE distcheck
+
+:
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
new file mode 100755
index 0000000..c534e8d
--- /dev/null
+++ b/t/python-virtualenv.sh
@@ -0,0 +1,187 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that python support can work well with virtualenvs.
+# This test also works as a mild stress-test on the python support.
+
+required='cc python virtualenv'
+. ./defs || Exit 1
+
+# In case the user's config.site defines pythondir or pyexecdir.
+CONFIG_SITE=/dev/null; export CONFIG_SITE
+
+# Skip the test if a proper virtualenv cannot be created.
+virtualenv --verbose virtenv && test -f virtenv/bin/activate \
+  || skip_ "coulnd't create python virtual environment"
+
+# Activate the virtualenv.
+. ./virtenv/bin/activate
+# Sanity check.
+if test -z "$VIRTUAL_ENV"; then
+  framework_failure_ "can't activate python virtual environment"
+fi
+
+cwd=`pwd`
+py_version=`python -c 'import sys; print("%u.%u" % 
tuple(sys.version_info[:2]))'`
+py_site=$VIRTUAL_ENV/lib/python$py_version/site-packages
+
+# We need control over the package name.
+cat > configure.ac << END
+AC_INIT([am_virtenv], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_SUBST([MY_VIRTENV], ['$cwd/virtenv'])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AM_PATH_PYTHON
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+python_PYTHON = am_foo.py
+pkgpython_PYTHON = __init__.py
+pyexec_LIBRARIES = libquux.a
+libquux_a_SOURCES = foo.c
+pkgpyexec_LIBRARIES = libzardoz.a
+libzardoz_a_SOURCES = foo.c
+
+py_site = $(MY_VIRTENV)/lib/python$(PYTHON_VERSION)/site-packages
+
+.PYTHON: debug test-run test-install test-uninstall
+debug:
+       @echo PYTHON: $(PYTHON)
+       @echo PYTHON_VERSION: $(PYTHON_VERSION)
+       @echo prefix: $(prefix)
+       @echo pythondir: $(pythondir)
+       @echo pkgpythondir: $(pkgpythondir)
+       @echo pyexecdir: $(pyexecdir)
+       @echo pkgpyexecdir: $(pkgpyexecdir)
+test-run:
+       ## In a virtualenv, the default python must be the custom
+       ## virtualenv python.
+       @: \
+         && py1=`python -c 'import sys; print(sys.executable)'` \
+         && py2=`$(PYTHON) -c 'import sys; print(sys.executable)'` \
+         && echo "py1: $$py1" \
+         && echo "py2: $$py2" \
+         && test -n "$$py1" \
+         && test -n "$$py2" \
+         && test x"$$py1" = x"$$py2"
+       ## Check that modules installed in the virtualenv are readily
+       ## available.
+       python -c 'from am_foo import foo_func; assert (foo_func () == 12345)'
+       python -c 'from am_virtenv import old_am; assert (old_am () == 
"AutoMake")'
+test-install:
+       test -f $(py_site)/am_foo.py
+       test -f $(py_site)/am_foo.pyc
+       test -f $(py_site)/am_foo.pyo
+       test -f $(py_site)/am_virtenv/__init__.py
+       test -f $(py_site)/am_virtenv/__init__.pyc
+       test -f $(py_site)/am_virtenv/__init__.pyo
+       test -f $(py_site)/libquux.a
+       test -f $(py_site)/am_virtenv/libzardoz.a
+test-uninstall:
+       test ! -f $(py_site)/am_foo.py
+       test ! -f $(py_site)/am_foo.pyc
+       test ! -f $(py_site)/am_foo.pyo
+       test ! -f $(py_site)/am_virtenv/__init__.py
+       test ! -f $(py_site)/am_virtenv/__init__.pyc
+       test ! -f $(py_site)/am_virtenv/__init__.pyo
+       test ! -f $(py_site)/libquux.a
+       test ! -f $(py_site)/am_virtenv/libzardoz.a
+all-local: debug
+END
+
+cat > am_foo.py << 'END'
+def foo_func ():
+    return 12345
+END
+
+cat > __init__.py << 'END'
+def old_am ():
+    return 'AutoMake'
+END
+
+cat > foo.c << 'END'
+int foo (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Try a VPATH build.
+mkdir build
+cd build
+../configure --prefix="$VIRTUAL_ENV"
+$MAKE install
+$MAKE test-install
+$MAKE test-run
+$MAKE uninstall
+$MAKE test-uninstall
+cd ..
+
+# Try an in-tree build.
+./configure --prefix="$VIRTUAL_ENV"
+$MAKE install
+$MAKE test-install
+$MAKE test-run
+$MAKE uninstall
+$MAKE test-uninstall
+
+$MAKE distclean
+
+# Overriding pythondir and pyexecdir with cache variables should work.
+./configure am_cv_python_pythondir="$py_site" \
+            am_cv_python_pyexecdir="$py_site"
+$MAKE install
+$MAKE test-install
+$MAKE test-run
+$MAKE uninstall
+$MAKE test-uninstall
+
+$MAKE distclean
+
+# Overriding pythondir and pyexecdir at make time should be enough.
+./configure --prefix="$cwd/bad-prefix"
+pythondir=$py_site pyexecdir=$py_site
+export pythondir pyexecdir
+$MAKE -e install
+test ! -d bad-prefix
+$MAKE -e test-install
+$MAKE test-run
+$MAKE -e uninstall
+$MAKE -e test-uninstall
+unset pythondir pyexecdir
+
+# Also check that the distribution is self-contained, for completeness.
+$MAKE distcheck
+
+# Finally, check that if we disable the virtualenv, we shouldn't be
+# able to access to the installed modules anymore.
+cd build
+$MAKE install
+python -c 'import am_foo; print(am_foo.__file__)'
+python -c 'import am_virtenv; print(am_virtenv.__file__)'
+deactivate "nondestructive"
+python -c 'import am_foo' && Exit 1
+python -c 'import am_virtenv' && Exit 1
+
+:
diff --git a/t/python.sh b/t/python.sh
new file mode 100755
index 0000000..de8c0bb
--- /dev/null
+++ b/t/python.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure py_compile and am__py_compile are correctly defined.
+
+. ./defs || Exit 1
+
+echo 'AM_PATH_PYTHON' >> configure.ac
+
+cat > Makefile.am << 'END'
+python_PYTHON = foo.py
+END
+
+cat > Makefile2.am << 'END'
+python_PYTHON = a.py
+nodist_python_PYTHON = b.py
+nobase_python_PYTHON = x/c.py
+mydir = ${prefix}
+my_PYTHON = d.py
+END
+
+# For automake bug#10995.
+cat > Makefile3.am << 'END'
+noinst_PYTHON = un.py
+python_PYTHON = in.py
+END
+
+$ACLOCAL
+
+AUTOMAKE_fails
+grep '^Makefile\.am:1:.* required file.*py-compile' stderr
+
+$AUTOMAKE -a
+grep '^py_compile *=' Makefile.in
+test -f py-compile
+
+$AUTOMAKE Makefile2
+$AUTOMAKE Makefile3
+
+grep "py" Makefile.in Makefile2.in Makefile3.in # For debugging.
+
+for f in Makefile.in Makefile2.in Makefile3.in; do
+  test `grep -c '^py_compile =' $f` -eq 1
+  test `grep -c '^am__py_compile =' $f` -eq 1
+done
+
+:
diff --git a/t/python10.sh b/t/python10.sh
new file mode 100755
index 0000000..b28c3a4
--- /dev/null
+++ b/t/python10.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test _PYTHON with conditionals.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_PATH_PYTHON
+AM_CONDITIONAL([ONE], [test "x$one" = x1])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'END'
+if ONE
+mydir=$(prefix)/my
+my_PYTHON = one.py
+else
+yourdir=$(prefix)/your
+your_PYTHON = two.py
+endif
+
+one.py:
+       echo 'def one(): return 1' >$@
+two.py:
+       echo 'def two(): return 1' >$@
+
+.PHONY: disttest
+disttest: distdir
+       ls -l $(distdir)
+       test -f $(distdir)/one.py
+       test -f $(distdir)/two.py
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+mkdir inst
+inst=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="$inst"
+$MAKE install
+test -f "$inst/your/two.py"
+test -f "$inst/your/two.pyc"
+test -f "$inst/your/two.pyo"
+test ! -f "$inst/my/one.py"
+test ! -f "$inst/my/one.pyc"
+test ! -f "$inst/my/one.pyo"
+$MAKE uninstall
+test ! -f "$inst/your/two.py"
+test ! -f "$inst/your/two.pyc"
+test ! -f "$inst/your/two.pyo"
+
+../configure --prefix="$inst" one=1
+$MAKE install
+test ! -f "$inst/your/two.py"
+test ! -f "$inst/your/two.pyc"
+test ! -f "$inst/your/two.pyo"
+test -f "$inst/my/one.py"
+test -f "$inst/my/one.pyc"
+test -f "$inst/my/one.pyo"
+$MAKE uninstall
+test ! -f "$inst/my/one.py"
+test ! -f "$inst/my/one.pyc"
+test ! -f "$inst/my/one.pyo"
+
+$MAKE disttest
+
+:
diff --git a/t/python11.sh b/t/python11.sh
new file mode 100755
index 0000000..aff3c9c
--- /dev/null
+++ b/t/python11.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test missing python.
+
+# Python is not required for this test.
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
+AM_PATH_PYTHON
+# The following be executed only after the first run, once a
+# third argument has been added to the previous macro.
+echo PYTHON = $PYTHON
+test "$PYTHON" = : || exit 1
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+
+./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; }
+cat stdout
+cat stderr >&2
+grep 'checking for IShouldNotExist1' stdout
+grep 'checking for IShouldNotExist2' stdout
+grep 'no suitable Python interpreter found' stderr
+
+sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.int
+mv -f configure.int configure.ac
+$ACLOCAL --force
+$AUTOCONF --force
+# This one should define PYTHON as ":" and exit successfully.
+./configure
+
+# Any user setting should be used.
+./configure PYTHON=foo >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep 'PYTHON = foo' stdout
+
+:
diff --git a/t/python12.sh b/t/python12.sh
new file mode 100755
index 0000000..3faeb45
--- /dev/null
+++ b/t/python12.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure DESTDIR is not included in byte-compiled files.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<'END'
+mydir = $(datadir)/my
+my_PYTHON = my.py
+
+my.py:
+       echo 'def my(): return 1' >$@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+rm -rf inst build
+mkdir inst
+instdir=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="/usr"
+$MAKE install DESTDIR=$instdir
+
+# Perfunctory test that the files were created.
+test -f "$instdir/usr/share/my/my.py"
+test -f "$instdir/usr/share/my/my.pyc"
+test -f "$instdir/usr/share/my/my.pyo"
+
+# If DESTDIR has made it into the byte compiled files, fail the test.
+$FGREP "$instdir" "$instdir/usr/share/my/my.pyo" \
+                  "$instdir/usr/share/my/my.pyc" && Exit 1
+
+:
diff --git a/t/python2.sh b/t/python2.sh
new file mode 100755
index 0000000..3b13b33
--- /dev/null
+++ b/t/python2.sh
@@ -0,0 +1,106 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Automake suggests using AM_PATH_PYTHON.
+
+. ./defs || Exit 1
+
+$ACLOCAL
+
+echo 1. pythondir not defined
+
+cat > Makefile.am <<'END'
+PYTHON = x
+python_PYTHON = foo.py
+END
+
+AUTOMAKE_fails -a
+grep 'pythondir.*undefined' stderr
+grep AM_PATH_PYTHON stderr
+
+
+echo 2. pkgpythondir not defined
+
+cat > Makefile.am <<'END'
+PYTHON = x
+pkgpython_PYTHON = foo.py
+END
+
+AUTOMAKE_fails -a
+grep 'pkgpythondir.*undefined' stderr
+grep AM_PATH_PYTHON stderr
+
+
+echo 3. pyexecdir not defined
+
+cat > Makefile.am <<'END'
+PYTHON = x
+pyexec_PYTHON = foo.py
+END
+
+AUTOMAKE_fails -a
+grep 'pyexecdir.*undefined' stderr
+grep AM_PATH_PYTHON stderr
+
+
+echo 4. pkgpyexecdir not defined
+
+cat > Makefile.am <<'END'
+PYTHON = x
+pkgpyexec_PYTHON = foo.py
+END
+
+AUTOMAKE_fails -a
+grep 'pkgpyexecdir.*undefined' stderr
+grep AM_PATH_PYTHON stderr
+
+
+echo 5. PYTHON not defined.
+
+cat > Makefile.am <<'END'
+pkgpyexecdir = /here/we/go
+pkgpyexec_PYTHON = foo.py
+END
+
+AUTOMAKE_fails -a
+grep 'PYTHON.*undefined' stderr
+grep AM_PATH_PYTHON stderr
+
+
+echo 6. Ok.
+
+cat > Makefile.am <<'END'
+PYTHON = x
+pkgpyexecdir = /here/we/go
+pkgpyexec_PYTHON = foo.py
+END
+
+rm -f py-compile
+$AUTOMAKE -a
+test -f py-compile
+
+
+echo 7. Ok again.
+
+cat > Makefile.am <<'END'
+PYTHON = x
+fubardir = /here/we/go
+fubar_PYTHON = foo.py
+END
+
+$AUTOMAKE -a
+
+:
diff --git a/t/python3.sh b/t/python3.sh
new file mode 100755
index 0000000..72021cd
--- /dev/null
+++ b/t/python3.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we install built python files.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'END'
+mydir=$(prefix)/my
+my_PYTHON = one.py
+
+one.py:
+       echo 'def one(): return 1' >$@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+mkdir inst
+inst=`pwd`/inst
+mkdir build
+cd build
+../configure --prefix="$inst"
+$MAKE install
+test -f "$inst/my/one.py"
+test -f "$inst/my/one.pyc"
+test -f "$inst/my/one.pyo"
+
+:
diff --git a/t/python4.sh b/t/python4.sh
new file mode 100755
index 0000000..4294bb2
--- /dev/null
+++ b/t/python4.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test detection of missing Python.
+
+# Python is not required for this test.
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Simulate no Python.
+./configure PYTHON=: 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'no suitable Python interpreter found' stderr
+
+# Again, but from the environment this time.
+env PYTHON=: ./configure 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'no suitable Python interpreter found' stderr
+
+:
diff --git a/t/python5.sh b/t/python5.sh
new file mode 100755
index 0000000..80429f9
--- /dev/null
+++ b/t/python5.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test detection of missing Python.
+# Same as python4.test, but requiring a version.
+
+# Python is not required for this test.
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+# Hopefully the Python team will never release such a version.
+AM_PATH_PYTHON([9999.9])
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure >stdout 2>stderr && {
+  cat stdout
+  cat stderr >&2
+  Exit 1
+}
+cat stdout
+cat stderr >&2
+$EGREP 'checking for a Python interpreter with version >= 9999\.9\.\.\. 
no(ne)? *$' stdout
+grep 'no suitable Python interpreter found' stderr
+
+:
diff --git a/t/python5b.sh b/t/python5b.sh
new file mode 100755
index 0000000..b382b38
--- /dev/null
+++ b/t/python5b.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test detection of missing Python.
+# Same as python5.test, but with the user forcing the python to use.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac << 'END'
+# Hopefully the Python team will never release such a version.
+AM_PATH_PYTHON([9999.9])
+AC_OUTPUT
+END
+
+mkdir bin
+cat > bin/my-python << 'END'
+#! /bin/sh
+exec python ${1+"$@"}
+END
+chmod a+x bin/my-python
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure PYTHON=my-python >stdout 2>stderr && {
+  cat stdout
+  cat stderr >&2
+  Exit 1
+}
+cat stdout
+cat stderr >&2
+grep 'whether my-python version is >= 9999\.9\.\.\. no *$' stdout
+grep '[Pp]ython interpreter is too old' stderr
+
+:
diff --git a/t/python6.sh b/t/python6.sh
new file mode 100755
index 0000000..0e09a43
--- /dev/null
+++ b/t/python6.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test detection of missing Python.
+# Same as python4.test, but using a custom ACTION-IF-NOT-FOUND.
+
+# Python is not required for this test.
+. ./defs || Exit 1
+
+cat >>configure.ac <<\EOF
+AM_PATH_PYTHON(,, [echo "$PYTHON" > py])
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Simulate no Python.
+./configure PYTHON=:
+test x"`cat py`" = x:
+
+:
diff --git a/t/python7.sh b/t/python7.sh
new file mode 100755
index 0000000..ec0ac07
--- /dev/null
+++ b/t/python7.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test detection of missing Python.
+# Same as python6.test, but requiring a version.
+
+# Python is not required for this test.
+. ./defs || Exit 1
+
+cat >>configure.ac <<\EOF
+# Hopefully the Python team will never release such a version.
+AM_PATH_PYTHON([9999.9], [], [echo "$PYTHON" > py])
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+test x"`cat py`" = x:
+
+:
diff --git a/t/python8.sh b/t/python8.sh
new file mode 100755
index 0000000..f999cb6
--- /dev/null
+++ b/t/python8.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
+AM_PATH_PYTHON(, [$PYTHON -V >py-version 2>&1])
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+grep '^Python [0-9]\.[0-9][0-9]*\.[0-9]' py-version
+
+:
diff --git a/t/python9.sh b/t/python9.sh
new file mode 100755
index 0000000..e567adc
--- /dev/null
+++ b/t/python9.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
+# Similar to python8.test, but requiring a version.
+
+required=python
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
+AM_PATH_PYTHON([0.0], [$PYTHON -c 'print("%u:%u" % (1-1, 2**0))' > py.out])
+AC_OUTPUT
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+test x"`cat py.out`" = x0:1
+
+:
diff --git a/t/recurs.sh b/t/recurs.sh
new file mode 100755
index 0000000..5a9c165
--- /dev/null
+++ b/t/recurs.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure recursive variable definitions die.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL(ONE, true)
+AM_CONDITIONAL(TWO, false)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = $(foo)
+foo = $(bin_PROGRAMS)
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile\.am:.*bin_PROGRAMS.*recursively defined' stderr
+
+:
diff --git a/t/recurs2.sh b/t/recurs2.sh
new file mode 100755
index 0000000..e2c5213
--- /dev/null
+++ b/t/recurs2.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure recursive variable definitions die.
+# From Jim Meyering.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+man_MANS = chgrp.1
+man_aux = $(man_MANS:.1=.x)
+EXTRA_DIST = $(man_aux) $(man_MANS)
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/relativize.tap b/t/relativize.tap
new file mode 100755
index 0000000..8f53b6c
--- /dev/null
+++ b/t/relativize.tap
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test Automake-provided internal make macro $(am__relativize).
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+plan_ later
+
+mkdir uber uber/top
+cd uber/top
+
+: > install-sh
+: > missing
+
+cat >> configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# The 'am__relitivize' definition is only brought in when
+# SUBDIRS are defined.
+SUBDIRS = .
+
+.PHONY: test
+test:
+       @$(am__relativize); echo "result: '$$reldir'"; set -x; \
+        case $${reldir:-.} in "$$exp"|"$$exp/.") ;; *) exit 1;; esac
+END
+
+$ACLOCAL && $AUTOMAKE && $AUTOCONF && ./configure || fatal_ "setup failure"
+
+rel_ ()
+{
+   case $1 in -x) directive=TODO; shift;; *) directive=;; esac
+   test $# -eq 4 && test x"$3" = x"=" || fatal_ "rel_: incorrect usage"
+   command_ok_ "$1/{$4} = $2" -D "$directive" \
+               env dir1=$1 dir2=$2 exp=$4 $MAKE test
+}
+
+# am__relativize
+# ~~~~~~~~~~~~~~
+# Computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
+# Input:
+#   - DIR1     relative pathname, relative to the current directory
+#   - DIR2     relative pathname, relative to the current directory
+# Output:
+#   - reldir   relative pathname of DIR2, relative to DIR1
+
+rel_ . .  = .
+rel_ . .. = ..
+rel_ .. . = top
+
+for d in x long-longer a/b 1/2/3/4/5; do
+  rel_ $d $d = .
+  for d2 in . .. x r/s/t; do
+    rel_ $d $d/$d2 = $d2
+  done
+done
+
+rel_ one two     = ../two
+rel_ a   b/c     = ../b/c
+rel_ a/b .       = ../..
+rel_ a/b foo     = ../../foo
+rel_ a/b foo/bar = ../../foo/bar
+rel_ a/b a/c     = ../c
+rel_ a/b a/c/d   = ../c/d
+
+rel_ foo/bar/baz foo/bar/qux/zap   = ../qux/zap
+
+rel_ ../foo       .      = ../top
+rel_ ../..        .      = uber/top
+rel_ ../../foo    .      = ../uber/top
+rel_ ../../x      ok     = ../uber/top/ok
+rel_ ../../x      bo/ba  = ../uber/top/bo/ba
+rel_ ../../x      ../ok2 = ../uber/top/../ok2
+rel_ ../a/b/c/d/e .      = ../../../../../top
+
+:
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
new file mode 100755
index 0000000..f1a85bc
--- /dev/null
+++ b/t/remake-all-1.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the "all" target triggers rebuilt of outdated Makefiles.
+# See also sister test 'remake-all-2.test'.
+
+. ./defs || Exit 1
+
+mkfile=Makefile
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([$mkfile sub/$mkfile])
+FOO='$magic1'
+AC_OUTPUT
+END
+
+mkdir sub
+echo SUBDIRS = sub > $mkfile.am
+: > sub/$mkfile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in
+
+$AUTOCONF
+./configure
+
+$FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
+
+# Two code paths in configure.am:
+
+# - either a file in $(am__configure_deps) has been updated ...
+$sleep
+echo "AC_SUBST([FOO])" >> configure.ac
+$MAKE
+$FGREP FOO $mkfile # For debugging.
+$FGREP $magic1 $mkfile
+
+# - ... or not; i.e., Makefile.am or an included file has.
+$sleep
+echo "# $magic2" >> $mkfile.am
+echo "# $magic3" >> sub/$mkfile.am
+$MAKE
+$FGREP $magic2 $mkfile
+$FGREP $magic3 sub/$mkfile
+
+:
diff --git a/t/remake-all-2.sh b/t/remake-all-2.sh
new file mode 100755
index 0000000..9306532
--- /dev/null
+++ b/t/remake-all-2.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the "all" target triggers rebuilt of outdated makefiles.
+# This handle the case in which the makefiles are not called 'Makefile'.
+# See also sister test 'remake-all-1.test'.
+
+. ./defs || Exit 1
+
+mkfile=foobar
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([$mkfile sub/$mkfile])
+FOO='$magic1'
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat > $mkfile.am <<END
+SUBDIRS = sub
+AM_MAKEFLAGS = -f $mkfile
+END
+
+cat > sub/$mkfile.am <<END
+AM_MAKEFLAGS = -f $mkfile
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in
+
+$AUTOCONF
+./configure
+
+$FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
+
+# Two code paths in configure.am:
+
+# - either a file in $(am__configure_deps) has been updated ...
+$sleep
+echo "AC_SUBST([FOO])" >> configure.ac
+$MAKE -f $mkfile
+$FGREP FOO $mkfile # For debugging.
+$FGREP $magic1 $mkfile
+
+# - ... or not; i.e., Makefile.am or an included file has.
+$sleep
+echo "# $magic2" >> $mkfile.am
+echo "# $magic3" >> sub/$mkfile.am
+$MAKE -f $mkfile
+$FGREP $magic2 $mkfile
+$FGREP $magic3 sub/$mkfile
+
+:
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
new file mode 100755
index 0000000..c567608
--- /dev/null
+++ b/t/remake-am-pr10111.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that our remake rules doesn't give spurious successes in
+# some corner case situations where they should actually fail.
+# See automake bug#10111.
+# To be clear, we are speaking about *very* corner-case situations here,
+# and the fact that the remake rules might get confused in them is not a
+# big deal in practice (in fact, this test *currently fails*).  Still,
+# keeping the limitation exposed is a good idea anyway.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+: > foobar.am
+
+cat > Makefile.am <<'END'
+include $(srcdir)/foobar.am
+$(srcdir)/foobar.am:
+## Creative quoting is to avoid spurious matches in the grepping
+## of Makefile.in, later.
+       echo "mu =" foobar "was here =" > $@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# OK, so the developer wants to interactively try out how the
+# "distributed form" of his package behaves.
+$MAKE distdir
+cd $distdir
+# He's interested in trying out a VPATH build.
+mkdir build
+cd build
+../configure
+# He wants to verify that the rules he's written to rebuild a file
+# included by configure.ac works also in VPATH builds.
+rm -f ../foobar.am
+$MAKE
+grep '= foobar was here =' ../Makefile.in
+$MAKE distcheck
+
+:
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
new file mode 100755
index 0000000..1d048be
--- /dev/null
+++ b/t/remake-deleted-am-2.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that inclusion of '.am' fragments by automake does not suffer
+# of the "deleted header problem".  This test checks deeper inclusion
+# stacks, and use VPATH builds.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+$ACLOCAL
+$AUTOCONF
+
+cat > Makefile.am <<'END'
+include $(srcdir)/foo.am
+END
+
+cat > foo.am <<'END'
+# this is foo
+include sub/bar.am
+include baz.am
+END
+
+mkdir sub
+echo 'include $(top_srcdir)/sub/zardoz.am' > sub/bar.am
+echo '# this is zardoz' > sub/zardoz.am
+
+echo 'include fnord.am' > baz.am
+echo '# you are not seeing this' > fnord.am
+
+$AUTOMAKE
+# Sanity checks.
+$FGREP 'this is zardoz' Makefile.in
+$FGREP 'you are not seeing this' Makefile.in
+
+mkdir build
+cd build
+
+srcdir=..
+
+$srcdir/configure
+$MAKE
+
+$sleep
+echo '# this is baz' > $srcdir/baz.am
+rm -f $srcdir/fnord.am
+$MAKE
+# Sanity checks.
+$FGREP 'you are not seeing this' $srcdir/Makefile.in Makefile && Exit 1
+$FGREP 'this is baz' $srcdir/Makefile.in
+$FGREP 'this is baz' Makefile
+
+$sleep
+rm -rf $srcdir/sub $srcdir/foo.am $srcdir/baz.am
+echo '# no more inclusions' > $srcdir/Makefile.am
+$MAKE
+# Sanity checks.
+$EGREP 'this is (foo|bar|baz)' Makefile $srcdir/Makefile.in && Exit 1
+$FGREP 'no more inclusions' Makefile
+
+:
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
new file mode 100755
index 0000000..3ca8507
--- /dev/null
+++ b/t/remake-deleted-am-subdir.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that inclusion of '.am' fragments by automake does not suffer
+# of the "deleted header problem".  This test does the check when the
+# SUBDIRS variable is involved.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+cat > Makefile.am <<'END'
+include foo.am
+SUBDIRS = sub1 sub2
+END
+
+echo '# this is foo.am' > foo.am
+
+mkdir sub1 sub2
+
+echo 'include $(srcdir)/bar.am' > sub1/Makefile.am
+echo '# this is bar.am' > sub1/bar.am
+
+echo 'include $(top_srcdir)/foo.am' > sub2/Makefile.am
+
+$AUTOMAKE
+# Sanity checks.
+$FGREP 'this is foo.am' Makefile.in
+$FGREP 'this is bar.am' sub1/Makefile.in
+$FGREP 'this is foo.am' sub2/Makefile.in
+
+./configure
+$MAKE # Should be no-op.
+
+$sleep
+echo '# this is sub1/Makefile.am' > sub1/Makefile.am
+rm -f sub1/bar.am
+$MAKE all
+# Sanity checks.
+$FGREP 'this is bar' sub1/Makefile.in sub1/Makefile && Exit 1
+$FGREP 'this is sub1/Makefile.am' sub1/Makefile.in
+$FGREP 'this is sub1/Makefile.am' sub1/Makefile
+
+$sleep
+for d in . sub2; do
+  sed "s|.*include.*foo\.am.*|# this is $d/Makefile.am|" $d/Makefile.am > t
+  mv -f t $d/Makefile.am
+done
+rm -f foo.am
+$MAKE all
+# Sanity checks.
+$FGREP 'this is foo' sub*/Makefile* Makefile* && Exit 1
+for d in . sub1 sub2; do
+  $FGREP "this is $d/Makefile.am" $d/Makefile.in
+  $FGREP "this is $d/Makefile.am" $d/Makefile
+done
+
+:
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
new file mode 100755
index 0000000..4bd77d6
--- /dev/null
+++ b/t/remake-deleted-am.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that inclusion of '.am' fragments by automake does not suffer
+# of the "deleted header problem".  Basic checks are done here.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+$ACLOCAL
+$AUTOCONF
+
+cat > Makefile.am <<'END'
+include foo.am
+include $(srcdir)/bar.am
+include $(top_srcdir)/baz.am
+END
+
+echo '# this is foo' > foo.am
+echo '# this is bar' > bar.am
+echo '# this is baz' > baz.am
+
+$AUTOMAKE
+# Sanity checks.
+$FGREP 'this is foo' Makefile.in
+$FGREP 'this is bar' Makefile.in
+$FGREP 'this is baz' Makefile.in
+
+./configure
+$MAKE # Should be no-op.
+
+$sleep
+sed '/^include foo\.am$/d' Makefile.am > t
+mv -f t Makefile.am
+rm -f foo.am
+$MAKE Makefile
+# Sanity checks.
+$FGREP 'this is foo' Makefile.in Makefile && Exit 1
+$FGREP 'this is bar' Makefile.in
+$FGREP 'this is bar' Makefile
+$FGREP 'this is baz' Makefile.in
+$FGREP 'this is baz' Makefile
+
+$sleep
+echo '# empty empty' > Makefile.am
+rm -f bar.am baz.am
+$MAKE Makefile
+# Sanity checks.
+$FGREP 'empty empty' Makefile.in
+$FGREP 'empty empty' Makefile
+grep 'this is ba[rz]' Makefile Makefile.in && Exit 1
+
+:
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
new file mode 100755
index 0000000..975d503
--- /dev/null
+++ b/t/remake-deleted-m4-file.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when an m4 file gets removed and the macros it
+# defined get inlined into the caller.  Try with both an indirect
+# call and a direct one.  This can be seen as testing the "deleted
+# header file" issue w.r.t. aclocal.m4 dependencies.  See also related
+# test 'acloca22.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+FOO_MACRO
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+.PHONY: test
+test:
+       test '$(the_answer)' -eq 42
+END
+
+macro_value='the_answer=42; AC_SUBST([the_answer])'
+
+mkdir m4
+
+cat > m4/foo.m4 <<'END'
+AC_DEFUN([FOO_MACRO], [BAR_MACRO])
+END
+
+cat > m4/bar.m4 <<END
+AC_DEFUN([BAR_MACRO], [$macro_value])
+END
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+$sleep
+
+sed -e "s|BAR_MACRO|$macro_value|" m4/foo.m4 > t
+mv -f t m4/foo.m4
+rm -f m4/bar.m4
+
+using_gmake || $MAKE Makefile
+$MAKE test
+
+$sleep
+
+sed -e "s|FOO_MACRO|$macro_value|" configure.ac > t
+mv -f t configure.ac
+rm -f m4/foo.m4
+
+using_gmake || $MAKE Makefile
+$MAKE test
+
+:
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
new file mode 100755
index 0000000..23a02bc
--- /dev/null
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -0,0 +1,133 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when a new AC_SUBST'd variable is added, and C header
+# files are involved.
+# This test overlaps with others, and is not strictly necessary per se,
+# but it exercises a real use case (from gnulib, see:
+#  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
+# for more info).
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+MY_MACROS
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+BUILT_SOURCES = foo.h
+edit_h = sed -e 's|address@hidden@|@foovar@|g'
+foo.h: foo.in.h
+       $(edit_h) < $(srcdir)/foo.in.h > address@hidden
+       cat address@hidden;: For debugging.
+       mv -f address@hidden $@
+EXTRA_DIST = foo.in.h
+MOSTLYCLEANFILES = foo.h foo.h-t
+END
+
+mkdir m4
+
+cat > m4/foo.m4 <<'END'
+AC_DEFUN([MY_MACROS], [
+     FOO_MACRO
+dnl: ZAP_MACRO
+])
+END
+
+cat > m4/bar.m4 <<'END'
+AC_DEFUN([FOO_MACRO], [
+     foovar=42; AC_SUBST([foovar])
+dnl: barvar=47; AC_SUBST([barvar])
+])
+END
+
+cat > foo.in.h <<'END'
+#define foo @foovar@
+END
+
+cat > foo.c <<'END'
+#include "foo.h"
+int main (void) { return 0; }
+typedef int checkfoo[1 - 2 * (foo != 42)];
+END
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+
+: AC_SUBST @barvar@ and add it to foo.h.
+
+$sleep
+
+sed -e 's/^dnl:/   /' m4/bar.m4 > t
+mv -f t m4/bar.m4
+cat m4/bar.m4
+
+cat >> foo.in.h <<'END'
+#define bar @barvar@
+END
+
+cat >> foo.c <<'END'
+typedef int checkbar[1 - 2 * (bar != 47)];
+END
+
+cat >> Makefile.am <<'END'
+edit_h += -e 's|address@hidden@|@barvar@|g'
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+
+: AC_SUBST @zapvar@ and add it to foo.h.
+# Do it in a slightly different way from how it was done for @address@hidden
+
+$sleep
+
+cat >> Makefile.am <<'END'
+edit_h += -e 's|address@hidden@|$(zapvar)|g'
+END
+
+cat >> foo.c <<'END'
+typedef int checkzap[1 - 2 * (zap != 163)];
+END
+
+sed -e 's/^dnl://' m4/foo.m4 > t
+mv -f t m4/foo.m4
+cat m4/foo.m4
+
+cat >> foo.in.h <<'END'
+#define zap @zapvar@
+END
+
+cat >> m4/bar.m4 <<'END'
+AC_DEFUN([ZAP_MACRO], [zapvar=163; AC_SUBST([zapvar])])
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+
+$MAKE distcheck
+
+:
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
new file mode 100755
index 0000000..97f0c03
--- /dev/null
+++ b/t/remake-gnulib-add-header.sh
@@ -0,0 +1,109 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when a new C header "guarded" by AC_SUBST'd
+# variables is added.
+# This test overlaps with others, and is not strictly necessary per se,
+# but it exercises a real use case (from gnulib, see:
+#  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
+# for more info).
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_HEADERS([config.h])
+AC_PROG_CC
+MY_MACROS
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I .
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+BUILT_SOURCES = $(STDIO_H)
+stdio.h: stdio.in.h
+       cp $(srcdir)/stdio.in.h $@
+MOSTLYCLEANFILES = stdio.h
+EXTRA_DIST = stdio.in.h
+check-local:
+       ls -l . $(srcdir)
+       if test -n '$(STDIO_H)'; then \
+           test -f stdio.h || exit 1; \
+       else \
+           test ! -f stdio.h || exit 1; \
+       fi
+END
+
+cat > macros.m4 <<'END'
+AC_DEFUN([MY_MACROS], [
+  override_stdio=false
+  if $override_stdio; then
+    STDIO_H=stdio.h
+    use_dummies=1
+  else
+    STDIO_H=
+    use_dummies=0
+  fi
+  AC_SUBST([STDIO_H])
+  AC_DEFINE_UNQUOTED([USE_DUMMIES], [$use_dummies],
+    [Whether to use dummy types.])
+])
+END
+
+cat > stdio.in.h <<'END'
+typedef struct dummyfile { void *p; } DUMMYFILE;
+END
+
+cat > foo.c <<'END'
+#include <config.h>
+#include <stdio.h>
+#if USE_DUMMIES
+DUMMYFILE *f;
+#else
+FILE *f;
+#endif
+int main () { return 0; }
+END
+
+$ACLOCAL -I .
+$AUTOHEADER
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+
+$MAKE
+ls -l
+test ! -f stdio.h
+# Also try our build rules in a VPATH build.
+$MAKE distcheck
+
+# No need to sleep here: "./configure" and "make distcheck" above
+# have already slept enough.
+
+sed -e 's/^\( *override_stdio\)=.*$/\1=:/' macros.m4 > t
+mv -f t macros.m4
+
+using_gmake || $MAKE Makefile
+$MAKE
+ls -l
+test -f stdio.h
+# Also try our build rules in a VPATH build.
+$MAKE distcheck
+
+:
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
new file mode 100755
index 0000000..04f3410
--- /dev/null
+++ b/t/remake-gnulib-remove-header.sh
@@ -0,0 +1,136 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when a C header "guarded" by AC_SUBST'd variables
+# is not needed anymore, or when it's needed again.
+# This test requires some user-level machinery, overlaps with other tests,
+# and is not strictly necessary per se, but it exercises a real, important
+# use case (from gnulib, see:
+#  <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00005.html>
+# for more info).
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_CONFIG_HEADERS([config.h])
+AC_PROG_CC
+MY_MACROS
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I .
+noinst_PROGRAMS = foo
+foo_SOURCES = foo.c
+BUILT_SOURCES = $(STDIO_H)
+if REPLACE_STDIO_H
+stdio.h: stdio.in.h $(top_builddir)/config.status
+       cp $(srcdir)/stdio.in.h $@
+else
+stdio.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES = stdio.h
+END
+
+cat > macros.m4 <<'END'
+AC_DEFUN([MY_MACROS], [
+  override_stdio=:
+  if $override_stdio; then
+    STDIO_H=stdio.h
+    use_dummies=1
+  else
+    STDIO_H=
+    use_dummies=0
+  fi
+  AC_SUBST([STDIO_H])
+  AC_DEFINE_UNQUOTED([USE_DUMMIES], [$use_dummies],
+    [Whether to use dummy types.])
+  AM_CONDITIONAL([REPLACE_STDIO_H], [test -n "$STDIO_H"])
+])
+END
+
+cat > stdio.in.h <<'END'
+typedef struct dummyfile { void *p; } DUMMYFILE;
+END
+
+cat > foo.c <<'END'
+#include <config.h>
+#include <stdio.h>
+#if USE_DUMMIES
+DUMMYFILE *f;
+#else
+FILE *f;
+#endif
+int main () { return 0; }
+END
+
+$ACLOCAL -I .
+$AUTOHEADER
+$AUTOMAKE
+$AUTOCONF
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  # Do not reject slow dependency extractors: we need dependency tracking.
+  $srcdir/configure --enable-dependency-tracking
+  if $FGREP 'depmode=none' Makefile; then
+    skip_ "automatic dependency tracking couldn't be activated"
+  fi
+
+  $MAKE
+  ls -l
+  test -f stdio.h
+
+  # Simulate that we don't need our custom stdio.h anymore.
+
+  $sleep
+  sed -e 's/^\( *override_stdio\)=.*$/\1=false/' $srcdir/macros.m4 > t
+  diff $srcdir/macros.m4 t && fatal_ "failed to edit macros.m4"
+  mv -f t $srcdir/macros.m4
+
+  using_gmake || $MAKE Makefile
+  $MAKE
+  ls -l
+  test ! -f stdio.h
+
+  # And now simulate that we want our custom stdio.h back.
+
+  $sleep
+  sed -e 's/^\( *override_stdio\)=.*$/\1=:/' $srcdir/macros.m4 > t
+  diff $srcdir/macros.m4 t && fatal_ "failed to edit macros.m4"
+  mv -f t $srcdir/macros.m4
+
+  using_gmake || $MAKE Makefile
+  $MAKE
+  ls -l
+  test -f stdio.h
+
+  $MAKE distclean
+  cd $srcdir
+
+done
+
+:
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
new file mode 100755
index 0000000..09a2a4c
--- /dev/null
+++ b/t/remake-m4-pr10111.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that our remake rules doesn't give spurious successes in
+# some corner case situations where they should actually fail.
+# See automake bug#10111.
+# To be clear, we are speaking about *very* corner-case situations here,
+# and the fact that the remake rules might get confused in them is not a
+# big deal in practice (in fact, this test *currently fails*).  Still,
+# keeping the limitation exposed is a good idea anyway.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+m4_include([foobar.m4])
+AC_OUTPUT
+END
+
+: > foobar.m4
+
+cat > Makefile.am <<'END'
+$(srcdir)/foobar.m4:
+       echo ': foobar was here :' > $@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# OK, so the developer wants to interactively try out how the
+# "distributed form" of his package behaves.
+$MAKE distdir
+cd $distdir
+# He's interested in trying out a VPATH build.
+mkdir build
+cd build
+../configure
+# He wants to verify that the rules he's written to rebuild a file
+# included by configure.ac works also in VPATH builds.
+rm -f ../foobar.m4
+$MAKE
+grep ': foobar was here :' ../configure
+$MAKE distcheck
+
+:
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
new file mode 100755
index 0000000..d5a1263
--- /dev/null
+++ b/t/remake-moved-m4-file.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when m4 files get moved among different "include
+# dirs" (i.e. those passed to aclocal with '-I' option).
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+MY_MACRO
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I d1 -I d2 -I d3
+.PHONY: test
+test:
+       test '$(the_answer)' -eq 42
+END
+
+mkdir d1 d2 d3
+
+cat > d1/macros.m4 <<'END'
+AC_DEFUN([MY_MACRO], [FOO])
+END
+
+cat > d1/foo.m4 <<'END'
+AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
+END
+
+$ACLOCAL -I d1
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+# Move one file.
+mv d1/foo.m4 d2/foo.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/d2/foo.m4
+test ! -f $distdir/d1/foo.m4
+test -f $distdir/d1/macros.m4
+test ! -f $distdir/d2/macros.m4
+
+# Move both files at once.
+mv d1/macros.m4 d3/macros.m4
+mv d2/foo.m4 d3/foo.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/d3/foo.m4
+test -f $distdir/d3/macros.m4
+test ! -f $distdir/d1/foo.m4
+test ! -f $distdir/d2/foo.m4
+test ! -f $distdir/d1/macros.m4
+test ! -f $distdir/d2/macros.m4
+
+:
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
new file mode 100755
index 0000000..f1106f4
--- /dev/null
+++ b/t/remake-renamed-am.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that inclusion of '.am' fragments by automake does not suffer
+# of the "deleted header problem".  This test checks that we can rename
+# an included .am file without confusing the remake rules.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+include foo.am
+END
+
+cat > foo.am <<'END'
+all-local:
+       echo ok > has-run-1
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE
+test -f has-run-1
+
+$sleep
+rm -f has-run-1
+mv -f foo.am bar.am
+echo include bar.am > Makefile.am
+$MAKE Makefile
+$FGREP 'foo.am' Makefile Makefile.in && Exit 1
+
+$sleep
+rm -f has-run-1 bar.am
+echo 'all-local:; echo ok > has-run-2' > zardoz.am
+echo 'include $(srcdir)/zardoz.am' > Makefile.am
+using_gmake || $MAKE Makefile
+$MAKE
+test ! -f has-run-1
+test -f has-run-2
+
+:
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
new file mode 100755
index 0000000..87721f5
--- /dev/null
+++ b/t/remake-renamed-m4-file.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when m4 files get renamed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+MY_MACRO
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+.PHONY: test
+test:
+       test '$(the_answer)' -eq 42
+END
+
+mkdir m4
+
+cat > m4/macros.m4 <<'END'
+AC_DEFUN([MY_MACRO], [FOO])
+END
+
+cat > m4/foo.m4 <<'END'
+AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
+END
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+# Rename one file at the time.
+
+mv m4/foo.m4 m4/bar.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/m4/bar.m4
+test ! -f $distdir/m4/foo.m4
+
+mv m4/macros.m4 m4/defs.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/m4/defs.m4
+test ! -f $distdir/m4/macros.m4
+
+# Rename both files at once.
+
+mv m4/bar.m4 m4/quux.m4
+mv m4/defs.m4 acinclude.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/m4/quux.m4
+test -f $distdir/acinclude.m4
+test ! -f $distdir/m4/foo.m4
+test ! -f $distdir/m4/bar.m4
+test ! -f $distdir/m4/macros.m4
+test ! -f $distdir/m4/defs.m4
+
+:
diff --git a/t/remake-renamed-m4-macro-and-file.sh 
b/t/remake-renamed-m4-macro-and-file.sh
new file mode 100755
index 0000000..9f80b31
--- /dev/null
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when an m4 file gets renamed and *simultaneously*
+# an m4 macro in it gets renamed.  Kudos to Bruno Haible for thinking
+# about this situation.  See also related test 'acloca22.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+MY_MACRO
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+.PHONY: test
+test:
+       test '$(the_answer)' -eq 42
+END
+
+mkdir m4
+
+cat > m4/macros.m4 <<'END'
+AC_DEFUN([MY_MACRO], [FOO_MACRO])
+END
+
+cat > m4/foo.m4 <<'END'
+AC_DEFUN([FOO_MACRO], [the_answer=42; AC_SUBST([the_answer])])
+END
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+# Rename only one file and one macro.
+
+$sleep
+sed -e 's/FOO_MACRO/BAR_MACRO/' m4/foo.m4 > m4/bar.m4
+rm -f m4/foo.m4
+sed -e 's/FOO_MACRO/BAR_MACRO/' m4/macros.m4 > t
+mv -f t m4/macros.m4
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/m4/bar.m4
+test -f $distdir/m4/macros.m4
+test ! -f $distdir/m4/foo.m4
+
+# Rename both at once.
+
+$sleep
+sed -e 's/BAR_MACRO/QUUX_MACRO/' \
+  m4/bar.m4 > m4/quux.m4
+sed -e 's/BAR_MACRO/QUUX_MACRO/' -e 's/MY_MACRO/A_MACRO/' \
+  m4/macros.m4 > m4/defs.m4
+rm -f m4/macros.m4 m4/bar.m4
+sed -e 's/BAR_MACRO/QUUX_MACRO/' -e 's/MY_MACRO/A_MACRO/' configure.ac > t
+mv -f t configure.ac
+using_gmake || $MAKE Makefile
+$MAKE test
+$MAKE distdir
+ls -l $distdir $distdir/*
+test -f $distdir/m4/quux.m4
+test -f $distdir/m4/defs.m4
+test ! -f $distdir/m4/bar.m4
+test ! -f $distdir/m4/macros.m4
+
+:
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
new file mode 100755
index 0000000..5ec71d6
--- /dev/null
+++ b/t/remake-renamed-m4-macro.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when the name of an m4 macro change.  Try both with
+# and without indirection.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+MY_MACRO
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+.PHONY: test
+test:
+       test '$(the_answer)' -eq 42
+END
+
+mkdir m4
+
+cat > m4/macros.m4 <<'END'
+AC_DEFUN([MY_MACRO], [FOO_1])
+END
+
+cat > m4/foo.m4 <<'END'
+AC_DEFUN([FOO_1], [the_answer=42
+                   AC_SUBST([the_answer])])
+END
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+$sleep
+
+for x in macros foo; do
+  sed -e 's/FOO_1/FOO_2/' m4/$x.m4 > t
+  mv -f t m4/$x.m4
+done
+
+using_gmake || $MAKE Makefile
+$MAKE test
+
+$sleep
+
+for f in m4/macros.m4 configure.ac; do
+  sed -e 's/MY_MACRO/YOUR_MACRO/' $f > t
+  mv -f t $f
+done
+
+using_gmake || $MAKE Makefile
+$MAKE test
+
+:
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
new file mode 100755
index 0000000..a5053e0
--- /dev/null
+++ b/t/remake-subdir-from-subdir.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that remake rules works for adding a new subdirectory from a
+# pre-existing subdirectory.
+# See also the other similar tests 'remake-subdir*.test', and the
+# related test 'aclocal5.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+m4_include([subdirs.m4])
+AC_SUBST([MAGIC], [magic])
+AC_OUTPUT
+END
+
+echo 'AC_CONFIG_FILES([sub/Makefile])' > subdirs.m4
+echo 'SUBDIRS = sub' > Makefile.am
+
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+
+cd sub
+$sleep
+echo 'AC_CONFIG_FILES([sub/subsub/Makefile])' >> ../subdirs.m4
+echo 'SUBDIRS = subsub' >> Makefile.am
+mkdir subsub
+cat > subsub/Makefile.am <<'END'
+all-local:
+       : > ok-it-works
+END
+using_gmake || $MAKE Makefile
+$MAKE
+test -f subsub/ok-it-works
+
+:
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
new file mode 100755
index 0000000..116790f
--- /dev/null
+++ b/t/remake-subdir-gnu.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that remake rules works from subdirectories, even using
+# 'GNUmakefile' as makefiles name.  This obviously requires GNU
+# make.
+# See also the other similar tests 'remake-subdir*.test', and the
+# related test 'aclocal5.test'
+
+required=GNUmake
+. ./defs || Exit 1
+
+magic1='::MagicString::One::'
+magic2='__MagicString__Two__'
+
+debug_info ()
+{
+  grep -i magic configure GNUmakefile.in GNUmakefile \
+                sub/GNUmakefile.in sub/GNUmakefile
+}
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([GNUmakefile sub/GNUmakefile])
+AC_SUBST([MAGIC], [magic])
+AC_OUTPUT
+END
+
+cat > GNUmakefile.am <<'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+: > sub/GNUmakefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+debug_info
+
+$sleep
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
+cd sub
+$MAKE
+cd ..
+debug_info
+$FGREP $magic1 configure
+$FGREP $magic1 GNUmakefile
+$FGREP $magic1 sub/GNUmakefile
+
+$sleep
+cd sub
+echo MAGIC = $magic2 >> GNUmakefile.am
+$MAKE
+cd ..
+debug_info
+$FGREP $magic2 sub/GNUmakefile
+$FGREP $magic2 sub/GNUmakefile.in
+$FGREP $magic1 sub/GNUmakefile sub/GNUmakefile.in && Exit 1
+$FGREP $magic2 GNUmakefile GNUmakefile.in && Exit 1
+
+:
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
new file mode 100755
index 0000000..8f31740
--- /dev/null
+++ b/t/remake-subdir-long-time.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that remake rules from subdirectories do not hang or cycle
+# endlessly, even with build systems that takes several seconds to
+# rebuild the Makefiles.
+# This test tries to ensure a long-enough rebuild time by introducing
+# an explicit delay in the build process.
+# Suggestion by Ralf Wildenhues.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_SUBST([MAGIC], [magic])
+AC_OUTPUT
+END
+
+echo SUBDIRS = sub > Makefile.am
+mkdir sub
+: > sub/Makefile.am
+
+# Both aclocal and automake are expected to run one and just one time.
+# Create and use wrappers that will verify that.
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+mkdir bin
+
+cat > bin/automake <<END
+#!/bin/sh
+set -e
+PATH='$PATH'; export PATH
+sentinel='$ocwd/automake-has-run'
+if test -f "\$sentinel"; then
+  echo "Automake has been run more than one time" >&2
+  exit 1
+else
+  echo automake has run > "\$sentinel"
+fi
+$sleep; $sleep;
+exec $AUTOMAKE \${1+"\$@"}
+END
+chmod a+x bin/automake
+
+cat > bin/aclocal <<END
+#!/bin/sh
+set -e
+PATH='$PATH'; export PATH
+sentinel='$ocwd/aclocal-has-run'
+if test -f "\$sentinel"; then
+  echo "Aclocal has been run more than one time" >&2
+  exit 1
+else
+  echo aclocal has run > "\$sentinel"
+fi
+$sleep; $sleep;
+exec $ACLOCAL \${1+"\$@"}
+END
+chmod a+x bin/aclocal
+
+# Just to be sure.
+cp bin/automake bin/automake-$APIVERSION
+cp bin/aclocal bin/aclocal-$APIVERSION
+
+PATH=$ocwd/bin$PATH_SEPARATOR$PATH; export PATH
+
+AUTOMAKE=automake ACLOCAL=aclocal; export AUTOMAKE ACLOCAL
+
+$ACLOCAL  # Should use or just-defined wrapper.
+$AUTOMAKE # Likewise.
+$AUTOCONF
+
+# Sanity check: the wrappers have been used.
+test -f automake-has-run
+test -f aclocal-has-run
+rm -f automake-has-run aclocal-has-run
+
+./configure
+# Sanity check: Makefile doesn't get updated uselessly.
+ACLOCAL=false AUTOMAKE=false AUTOCONF=false $MAKE -e
+
+$sleep
+sed "s|magic|magic2|" configure.ac > t
+mv -f t configure.ac
+
+cd sub
+AUTOMAKE="$AUTOMAKE" ACLOCAL="$ACLOCAL" $MAKE -e Makefile
+cd ..
+
+# For debugging.
+ls -l . sub
+grep -i magic configure Makefile.in Makefile sub/Makefile.in sub/Makefile
+# Sanity checks.
+$FGREP magic2 configure
+$FGREP magic2 Makefile
+$FGREP magic2 sub/Makefile
+
+:
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
new file mode 100755
index 0000000..eb21f38
--- /dev/null
+++ b/t/remake-subdir.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that remake rules works from subdirectories, even with non-GNU
+# make implementations.
+# See also the other similar tests 'remake-subdir*.test', and the
+# related test 'aclocal5.test'.
+
+. ./defs || Exit 1
+
+if using_gmake; then
+  remake=$MAKE
+else
+  remake="$MAKE Makefile"
+fi
+
+magic1='::MagicString::One::'
+magic2='__MagicString__Two__'
+
+debug_info ()
+{
+  grep -i magic configure Makefile.in Makefile sub/Makefile.in sub/Makefile
+}
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_SUBST([MAGIC], [magic])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+debug_info
+
+$sleep
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
+cd sub
+$remake
+cd ..
+debug_info
+$FGREP $magic1 configure
+$FGREP $magic1 Makefile
+$FGREP $magic1 sub/Makefile
+
+$sleep
+cd sub
+echo MAGIC = $magic2 >> Makefile.am
+$remake
+cd ..
+debug_info
+$FGREP $magic2 sub/Makefile
+$FGREP $magic2 sub/Makefile.in
+$FGREP $magic1 sub/Makefile sub/Makefile.in && Exit 1
+$FGREP $magic2 Makefile Makefile.in && Exit 1
+
+:
diff --git a/t/remake-subdir2.sh b/t/remake-subdir2.sh
new file mode 100755
index 0000000..0a5665d
--- /dev/null
+++ b/t/remake-subdir2.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that remake rules works from subdirectories, even when makefiles
+# are not named "Makefile".
+# See also the other similar tests 'remake-subdir*.test', and the
+# related test 'aclocal5.test'.
+
+. ./defs || Exit 1
+
+magic1='::MagicString::One::'
+magic2='__MagicString__Two__'
+
+debug_info ()
+{
+  grep -i magic configure build.in build.mk sub/build.in sub/build.mk
+}
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([build.mk:build.in])
+AC_CONFIG_FILES([sub/build.mk:sub/build.in])
+AC_SUBST([MAGIC], [magic])
+AC_OUTPUT
+END
+
+cat > build.am <<'END'
+AM_MAKEFLAGS = -f build.mk
+SUBDIRS = sub
+END
+
+mkdir sub
+cat > sub/build.am <<'END'
+AM_MAKEFLAGS = -f build.mk
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+ls -l # For debugging.
+
+$MAKE -f build.mk
+debug_info
+
+$sleep
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
+cd sub
+$MAKE -f build.mk build.mk
+cd ..
+debug_info
+$FGREP $magic1 configure
+$FGREP $magic1 build.mk
+$FGREP $magic1 sub/build.mk
+
+$sleep
+cd sub
+echo MAGIC = $magic2 >> build.am
+$MAKE -f build.mk build.mk
+cd ..
+debug_info
+$FGREP $magic2 sub/build.mk
+$FGREP $magic2 sub/build.in
+$FGREP $magic1 sub/build.in sub/build.mk && Exit 1
+$FGREP $magic2 build.in build.mk && Exit 1
+
+:
diff --git a/t/remake.sh b/t/remake.sh
new file mode 100755
index 0000000..620d5f8
--- /dev/null
+++ b/t/remake.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Weak "grepping" test trying to ensure that remaking rules in a subdir
+# are correctly generated.
+# See also sister functional test 'remake1a.test'.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^Makefile' sub/Makefile.in
+
+:
diff --git a/t/remake10a.sh b/t/remake10a.sh
new file mode 100755
index 0000000..358554f
--- /dev/null
+++ b/t/remake10a.sh
@@ -0,0 +1,111 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules for m4 files included (also recursively) by
+# configure.ac.
+# Keep in sync with sister tests 'remake10b.test' and 'remake10c.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+if using_gmake; then
+  remake="$MAKE nil"
+else
+  remake="$MAKE Makefile"
+fi
+
+cat >> configure.ac <<END
+m4_include([foo.m4])
+AC_SUBST([FINGERPRINT], [my_fingerprint])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+.PHONY: nil
+nil:
+## Used by "make distcheck" later.
+check-local:
+       test -f $(top_srcdir)/foo.m4
+       test ! -r $(top_srcdir)/bar.m4
+       test x'$(FINGERPRINT)' = x'DummyValue'
+END
+
+echo 'm4_define([my_fingerprint], [BadBadBad])' > foo.m4
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    top_srcdir=..
+  else
+    top_srcdir=.
+  fi
+
+  $top_srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/foo.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "m4_define([my_fingerprint], [$magic2])" > $top_srcdir/foo.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+
+  $sleep
+  echo "m4_include([bar.m4])" > $top_srcdir/foo.m4
+  echo "m4_define([my_fingerprint], [$magic3])" > $top_srcdir/bar.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile
+
+  $sleep
+  echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/bar.m4
+  $remake
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile && Exit 1
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "m4_define([my_fingerprint], [DummyValue])" > $top_srcdir/foo.m4
+  using_gmake || $remake
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+  $FGREP $magic3 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $top_srcdir
+
+done
+
+:
diff --git a/t/remake10b.sh b/t/remake10b.sh
new file mode 100755
index 0000000..9eeeb9d
--- /dev/null
+++ b/t/remake10b.sh
@@ -0,0 +1,110 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules for am files included (also recursively) by
+# Makefile.am.
+# Keep in sync with sister tests 'remake10a.test' and 'remake10c.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+if using_gmake; then
+  remake="$MAKE nil"
+else
+  remake="$MAKE Makefile"
+fi
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+.PHONY: nil
+nil:
+include foo.am
+## Used by "make distcheck" later.
+check-local:
+       test -f $(top_srcdir)/foo.am
+       test ! -r $(top_srcdir)/bar.am
+       test x'$(FINGERPRINT)' = x'DummyValue'
+END
+
+echo 'FINGERPRINT = BadBadBad' > foo.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    top_srcdir=..
+  else
+    top_srcdir=.
+  fi
+
+  $top_srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  echo "FINGERPRINT = $magic1" > $top_srcdir/foo.am
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "FINGERPRINT = $magic2" > $top_srcdir/foo.am
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+
+  $sleep
+  echo 'include $(top_srcdir)/bar.am' > $top_srcdir/foo.am
+  echo "FINGERPRINT = $magic3" > $top_srcdir/bar.am
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile
+
+  $sleep
+  echo "FINGERPRINT = $magic1" > $top_srcdir/bar.am
+  $remake
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile && Exit 1
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "FINGERPRINT = DummyValue" > $top_srcdir/foo.am
+  using_gmake || $remake
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+  $FGREP $magic3 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $top_srcdir
+
+done
+
+:
diff --git a/t/remake10c.sh b/t/remake10c.sh
new file mode 100755
index 0000000..dfb43f4
--- /dev/null
+++ b/t/remake10c.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules for m4 files included (also recursively) by
+# aclocal.m4.
+# Keep in sync with sister tests 'remake10a.test' and 'remake10b.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+if using_gmake; then
+  remake="$MAKE nil"
+else
+  remake="$MAKE Makefile"
+fi
+
+cat >> configure.ac <<END
+FINGERPRINT='my_fingerprint'
+AC_SUBST([FINGERPRINT])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+.PHONY: nil
+nil:
+## Used by "make distcheck" later.
+check-local:
+       test -f $(top_srcdir)/m4/foo.m4
+       test ! -r $(top_srcdir)/m4/bar.m4
+       test x'$(FINGERPRINT)' = x'DummyValue'
+END
+
+mkdir m4
+echo 'AC_DEFUN([my_fingerprint], [BadBadBad])' > m4/foo.m4
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    top_srcdir=..
+  else
+    top_srcdir=.
+  fi
+
+  $top_srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/foo.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [$magic2])" > $top_srcdir/m4/foo.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+
+  $sleep
+  echo "m4_include([m4/bar.m4])" > $top_srcdir/m4/foo.m4
+  echo "AC_DEFUN([my_fingerprint], [$magic3])" > $top_srcdir/m4/bar.m4
+  $remake
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/bar.m4
+  $remake
+  $FGREP $magic2 Makefile && Exit 1
+  $FGREP $magic3 Makefile && Exit 1
+  $FGREP $magic1 Makefile
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $top_srcdir/m4/foo.m4
+  echo "AC_DEFUN([AM_UNUSED], [NoSuchMacro])" > $top_srcdir/m4/bar.m4
+  using_gmake || $remake
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+  $FGREP $magic3 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $top_srcdir
+
+done
+
+:
diff --git a/t/remake11.sh b/t/remake11.sh
new file mode 100755
index 0000000..ec96a08
--- /dev/null
+++ b/t/remake11.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules in deeply nested subdirectories, and with a lot
+# of files.  This is basically a mild stress test, ensuring that rebuild
+# rules don't break in obvious ways in a slightly "heavier than usual"
+# setup.
+
+. ./defs || Exit 1
+
+ocwd=`pwd` || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+
+echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
+
+echo "@FOO@" > bar.in
+echo "AC_CONFIG_FILES([bar])" >> configure.ac
+for i in 0 1 2 3 4 5 6 7 8 9; do
+  d=${d+"$d/"}sub$i
+  echo "SUBDIRS = sub$i" > Makefile.am
+  echo "AC_CONFIG_FILES([$d/Makefile])" >> "$ocwd"/configure.ac
+  echo "AC_CONFIG_FILES([$d/bar])" >> "$ocwd"/configure.ac
+  mkdir sub$i
+  cd sub$i
+  echo "$d: @FOO@" > bar.in
+done
+echo AC_OUTPUT >> "$ocwd"/configure.ac
+: > Makefile.am
+unset d i
+bottom=`pwd`
+
+cd "$ocwd"
+
+makefiles_am_list=`find . -name Makefile.am | LC_ALL=C sort`
+makefiles_list=`echo "$makefiles_am_list" | sed 's/\.am$//'`
+bar_in_list=`find . -name bar.in | LC_ALL=C sort`
+bar_list=`echo "$bar_in_list" | sed 's/\.in$//'`
+
+cat configure.ac # For debugging.
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+
+for f in configure config.status $makefiles_list $bar_list; do
+  $FGREP "$magic1" $f
+done
+
+$sleep
+sed "s/$magic1/$magic2/" configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
+
+cd "$bottom"
+$MAKE
+cd "$ocwd"
+
+for f in configure config.status $makefiles_list $bar_list; do
+  $FGREP "$magic2" $f
+done
+$FGREP "$magic1" configure config.status $makefiles_list $bar_list && Exit 1
+
+$MAKE distcheck
+
+:
diff --git a/t/remake12.sh b/t/remake12.sh
new file mode 100755
index 0000000..73d85d5
--- /dev/null
+++ b/t/remake12.sh
@@ -0,0 +1,146 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test basic remake rules for Makefiles with non-default names
+# and/or with multiple sources.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+# See if the user's make implementation support an include directive.
+# We need it in this test.
+echo 'all:; @echo include is supported' > incl.mk
+echo 'include incl.mk' > gnu-style.mk
+echo '.include "incl.mk"' > bsd-style.mk
+if $MAKE -f gnu-style.mk | grep 'include is supported'; then
+  echo "$me: GNU make include style supported"
+  include_zardoz='include zardoz'
+elif $MAKE -f bsd-style.mk | grep 'include is supported'; then
+  echo "$me: BSD make include style supported"
+  include_zardoz='.include "zardoz"'
+else
+  skip_ "make doesn't support any \"include\" directive"
+fi
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([zardoz])
+AC_CONFIG_LINKS([Makefile:Makefile])
+AC_OUTPUT
+END
+
+cat > zardoz.am <<END
+EXTRA_DIST = Makefile
+#H: $magic1
+END
+
+cat > Makefile <<END
+$include_zardoz
+nil:
+.PHONY: nil
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+if using_gmake; then
+  $MAKE nil
+else
+  $MAKE Makefile
+fi
+grep '^#H:' zardoz.in # For debugging.
+$FGREP $magic1 zardoz
+$FGREP $magic1 zardoz.in
+$MAKE distcheck
+$MAKE distclean # This shouldn't remove Makefile.
+ls -l
+test -f Makefile
+
+./configure
+
+$sleep
+sed "s/%MAGIC3%/$magic3/" >> Makefile <<'END'
+my-check:
+       ls -l . $(srcdir) ;: For debugging.
+       test -f $(srcdir)/quux.am
+       test -f $(srcdir)/quux.in
+       test -f $(srcdir)/bot.in
+       test -f $(srcdir)/top.in
+       test ! -r $(srcdir)/zardoz.am
+       test ! -r $(srcdir)/zardoz.in
+       grep FOO zardoz ;: For debugging.
+       test x'$(FOO)' = x'%MAGIC3%'
+test:
+       ls -l ;: For debugging.
+       test x'$(FOO)' = x'dummy'
+.PHONY: test my-check
+END
+sed "s/^#H:.*/#H: $magic2/" zardoz.am > t
+cat >> t <<'END'
+# Used by "make distcheck" below.
+check-local: my-check
+END
+mv -f t zardoz.am
+cat zardoz.am # For debugging.
+if using_gmake; then
+  $MAKE nil
+else
+  $MAKE zardoz
+fi
+$FGREP my-check zardoz # Sanity check.
+$FGREP $magic1 zardoz zardoz.in && Exit 1
+$FGREP $magic2 zardoz
+$FGREP $magic2 zardoz.in
+
+./configure
+
+$sleep
+sed 's/^\(AC_CONFIG_FILES\)(.*/\1([zardoz:top.in:quux.in:bot.in])/' \
+  <configure.ac >t
+mv -f t configure.ac
+cat configure.ac # For debugging.
+sed '/^#H:/d' zardoz.am > quux.am
+echo 'FOO = dummy' >> quux.am
+echo 'BAR = $(BAZ)' > top.in
+echo "BAZ = $magic3" > bot.in
+is_gmake || $MAKE zardoz
+$MAKE test
+$FGREP my-check zardoz # Sanity check.
+$FGREP $magic3 quux.in && Exit 1
+$FGREP $magic3 zardoz
+$FGREP $magic1 zardoz && Exit 1
+$FGREP $magic2 zardoz && Exit 1
+# After the remake above, the files 'zardoz.am' and 'zardoz.in'
+# should be no more needed.
+echo 'endif' > zardoz.am # Put in a syntax error.
+is_gmake || $MAKE zardoz
+$MAKE test
+rm -f zardoz.in zardoz.am # Get rid of them.
+is_gmake || $MAKE zardoz
+$MAKE test
+
+echo 'FOO = $(BAR)' >> quux.am
+is_gmake || $MAKE zardoz
+$MAKE distcheck
+
+:
diff --git a/t/remake1a.sh b/t/remake1a.sh
new file mode 100755
index 0000000..fede092
--- /dev/null
+++ b/t/remake1a.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure remaking rules in subdir are correctly generated.
+# See also sister "grepping" test 'remake.test'.
+
+. ./defs || Exit 1
+
+fingerprint='=/FiNgErPrInT/='
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# Rebuild rules should work even if there is no top-level
+# makefiles, if we are careful enough to trigger them only
+# in proper subdirs.
+$sleep
+echo "# $fingerprint" > sub/Makefile.am
+cd sub
+$MAKE Makefile
+cd ..
+# Check that no spurious Makefile has been created in the
+# top-level directory.
+test ! -r Makefile
+# Check that the Makefile in the subdirectory has been properly
+# updated.
+$FGREP "$fingerprint" sub/Makefile
+
+:
diff --git a/t/remake2.sh b/t/remake2.sh
new file mode 100755
index 0000000..228b14f
--- /dev/null
+++ b/t/remake2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Weak "grepping" test trying to ensure that remaking rules in subdir
+# are correct even when there is no upper-level Makefile.
+# TODO: we should really add also functional tests for this!
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '\$(AUTOMAKE).*sub/Makefile' sub/Makefile.in
+
+:
diff --git a/t/remake3.sh b/t/remake3.sh
new file mode 100755
index 0000000..96294fb
--- /dev/null
+++ b/t/remake3.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Weak "grepping" test trying to ensure that remake rules work for files
+# in a subdirectory even when there is no Makefile for that subdirectory.
+# See also sister functional test 'remake3a.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/foo])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+mkdir sub
+: > sub/foo.in
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^sub/foo' Makefile.in
+
+:
diff --git a/t/remake3a.sh b/t/remake3a.sh
new file mode 100755
index 0000000..cac2abc
--- /dev/null
+++ b/t/remake3a.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure that remake rules work for files in a subdirectory even when
+# there is no Makefile for that subdirectory.
+# See also sister "grepping" test 'remake3.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/foo])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+all-local: sub/foo
+END
+
+mkdir sub
+: > sub/foo.in
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# First a VPATH build.
+mkdir build
+cd build
+../configure
+$sleep
+test -f sub/foo
+test ! -s sub/foo
+echo '#GrepMe#' > ../sub/foo.in
+$MAKE
+grep '#GrepMe#' sub/foo
+
+cd ..
+
+# Now try an in-tree build.
+: > sub/foo.in # Restore its original (empty) content.
+./configure
+$sleep
+test -f sub/foo
+test ! -s sub/foo
+echo '#GrepMe#' > sub/foo.in
+$MAKE
+grep '#GrepMe#' sub/foo
+
+# Finally try to check the distribution.
+$sleep
+echo '%GrepMe%' > sub/foo.in
+cat >>Makefile.am <<END
+check-local:
+       grep '%GrepMe%' sub/foo
+END
+$MAKE
+grep "grep '%GrepMe%' sub/foo" Makefile.in # Sanity check.
+$MAKE distcheck
+
+:
diff --git a/t/remake4.sh b/t/remake4.sh
new file mode 100755
index 0000000..43f8569
--- /dev/null
+++ b/t/remake4.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Makefile.in are up to date after make dist.
+# This is expected to work even without GNU Make (the GNU Make
+# feature that isn't supported elsewhere is the rebuild of
+# Makefile dependencies during ordinary builds).
+#
+# If this fails, this is likely to be due to a dependency being
+# given two different name.  For instance BSD Make does not know
+# that 'Makefile' is the same as './Makefile'
+#
+# Report from Akim Demaille.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+# Rebuild rule are ok until make dist, but not afterwards.
+if test ! -f rebuild_ok; then
+  ACLOCAL=false
+  AUTOMAKE=false
+  AUTOCONF=false
+fi
+AC_OUTPUT
+EOF
+
+: > rebuild_ok
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE
+$sleep
+touch aclocal.m4
+$MAKE distdir
+cd $me-1.0
+test ! -f rebuild_ok
+./configure
+$MAKE
+
+:
diff --git a/t/remake5.sh b/t/remake5.sh
new file mode 100755
index 0000000..dba802a
--- /dev/null
+++ b/t/remake5.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that AM_MAINTAINER_MODE disable some rebuild rules,
+# but not all.
+# Report from Ralf Corsepius.
+
+. ./defs || Exit 1
+
+if using_gmake; then
+  remake="$MAKE"
+else
+  remake="$MAKE Makefile"
+fi
+
+cat >>configure.ac <<'EOF'
+AM_MAINTAINER_MODE
+m4_include([foo.m4])
+if test ! -f rebuild_ok; then
+  ACLOCAL=false
+  AUTOMAKE=false
+  AUTOCONF=false
+fi
+AC_OUTPUT
+EOF
+
+: > foo.m4
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE
+
+# Make sure the rules to rebuild configure/Makefile.in are not
+# triggered by default.  ($MAKE will fail if they are, because the
+# tools are set to false.)
+$sleep
+touch aclocal.m4 Makefile.am configure.ac foo.m4
+$remake
+
+# Make sure the rebuild rule for Makefile is triggered.
+$sleep
+echo '# GrEpMe' >>Makefile.in
+$remake
+grep GrEpMe Makefile
+
+# Make sure the rebuild rule for config.status is triggered.
+$sleep
+grep 'AUTOCONF.*=.*false' Makefile
+: > rebuild_ok
+./configure --no-create
+$remake
+grep 'AUTOCONF.*=.*false' Makefile && Exit 1
+
+# Make sure rebuild rules do work if --enable-maintainer-mode is given.
+./configure --enable-maintainer-mode
+$sleep
+echo 'AC_SUBST([YIPPY_YIPPY_YEAH])' >foo.m4
+$remake
+grep YIPPY_YIPPY_YEAH Makefile
+
+# Try the distribution, for completeness.
+$MAKE distcheck
+
+:
diff --git a/t/remake6.sh b/t/remake6.sh
new file mode 100755
index 0000000..c48c1b8
--- /dev/null
+++ b/t/remake6.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure remaking rules work when subdir Makefile.in has been removed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+END
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+$MAKE
+
+# Now, we are set up.  Ensure that, for either missing Makefile.in,
+# or updated Makefile.am, rebuild rules are run, and run exactly once
+# only.
+
+rm -f Makefile.in
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test `grep -c " --run " stdout` -eq 1
+
+rm -f sub/Makefile.in
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test `grep -c " --run " stdout` -eq 1
+
+$sleep  # Let touched files appear newer.
+
+touch Makefile.am
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test `grep -c " --run " stdout` -eq 1
+
+touch sub/Makefile.am
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+test `grep -c " --run " stdout` -eq 1
+
+:
diff --git a/t/remake7.sh b/t/remake7.sh
new file mode 100755
index 0000000..fbd15e6
--- /dev/null
+++ b/t/remake7.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure remaking rules fail when they should.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+END
+mkdir sub
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+$MAKE
+
+$sleep
+
+# Fail for broken input files.
+
+echo "if FOO" > sub/Makefile.am
+$MAKE && Exit 1
+
+: >sub/Makefile.am
+$MAKE
+
+mv Makefile.am backup
+echo "if FOO" > Makefile.am
+$MAKE && Exit 1
+
+# Fail for missing input files, with or without missing
+# Makefile.in files.
+
+cp backup Makefile.am
+mv sub/Makefile.am sub/backup
+$MAKE && Exit 1
+
+rm -f sub/Makefile.in
+$MAKE && Exit 1
+
+mv sub/backup sub/Makefile.am
+rm -f Makefile.am
+$MAKE && Exit 1
+
+rm -f Makefile.in
+$MAKE && Exit 1
+
+:
diff --git a/t/remake8a.sh b/t/remake8a.sh
new file mode 100755
index 0000000..1b32a5e
--- /dev/null
+++ b/t/remake8a.sh
@@ -0,0 +1,190 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test basic remake rules for Makefiles, for an *in-tree build*.
+# This testcase checks dependency of generated Makefile from Makefile.am,
+# configure.ac, acinclude.m4, aclocal.m4, and extra m4 files considered
+# by aclocal.
+# Keep this in sync with sister test 'remake8b.test', which performs the
+# same checks for a VPATH build.
+
+. ./defs || Exit 1
+
+mv -f configure.ac configure.stub
+
+cat > Makefile.am <<'END'
+all-local: foo
+foo:
+       echo '!Foo!' >$@
+check-local:
+       cat foo
+       grep '!Foo!' foo
+CLEANFILES = foo
+END
+
+cat configure.stub - > configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+srcdir='.' # To make syncing with remake8b.test easier.
+
+$srcdir/configure
+
+$MAKE
+cat foo
+grep '!Foo!' foo
+$MAKE distcheck
+
+rm -f foo
+
+# Modify just Makefile.am.
+
+$sleep
+
+cat > $srcdir/Makefile.am <<'END'
+all-local: bar
+bar:
+       echo '!Baz!' >$@
+check-local:
+       cat bar
+       grep '!Baz!' bar
+       test ! -r $(srcdir)/foo
+       test ! -r foo
+CLEANFILES = bar
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+cat bar
+grep '!Baz!' bar
+test ! -r foo
+$MAKE distcheck
+
+rm -f bar
+
+# Modify Makefile.am and configure.ac.
+
+$sleep
+
+cat > $srcdir/Makefile.am <<'END'
+check-local:
+       cat quux
+       grep '!Zardoz!' quux
+       test ! -r $(srcdir)/bar
+       test ! -r bar
+END
+
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
+AC_CONFIG_FILES([quux])
+AC_SUBST([QUUX], [Zardoz])
+AC_OUTPUT
+END
+
+cat > $srcdir/quux.in <<'END'
address@hidden@!
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+cat quux
+grep '!Zardoz!' quux
+test ! -r bar
+$MAKE distcheck
+
+rm -f quux
+
+# Modify Makefile.am to add a directory of extra m4 files
+# considered by aclocal.
+
+$sleep
+
+mkdir $srcdir/m4
+
+cat > $srcdir/Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+check-local:
+       cat quux
+       grep '%Foo%' quux
+       test x'$(QUUX)' = x'%Foo%'
+END
+
+$MAKE # This should place aclocal flags in Makefile.
+grep '.*-I m4' Makefile # Sanity check.
+
+# Modify configure.ac and aclocal.m4.
+
+$sleep
+
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
+AC_CONFIG_FILES([quux])
+MY_CUSTOM_MACRO
+AC_OUTPUT
+END
+
+cat >> $srcdir/aclocal.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Foo%])])
+END
+
+$MAKE
+cat quux
+grep '%Foo%' quux
+$MAKE distcheck
+
+# Modify Makefile.am, remove aclocal.m4, and add a new m4 file to
+# the directory of extra m4 files considered by aclocal.  This new
+# file should now provide a macro required by configure.ac and that
+# was previously provided by aclocal.m4.
+
+$sleep
+
+sed 's/%Foo%/%Bar%/g' $srcdir/Makefile.am > t
+mv -f t $srcdir/Makefile.am
+cat $srcdir/Makefile.am
+rm -f $srcdir/aclocal.m4
+cat > $srcdir/m4/blah.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Bar%])])
+END
+
+$MAKE
+cat quux
+grep '%Bar%' quux
+$MAKE distcheck
+
+# Modify Makefile.am, remove all the extra m4 files to considered
+# by aclocal, and add an acinclude.m4 file.  This last file should
+# now provide a macro required by configure.ac, and that was
+# previously provided by the extra m4 files considered by aclocal.
+
+$sleep
+
+rm -f $srcdir/m4/*.m4
+sed 's/%Bar%/%Quux%/g' $srcdir/Makefile.am > t
+mv -f t $srcdir/Makefile.am
+cat $srcdir/Makefile.am
+cat > $srcdir/acinclude.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Quux%])])
+END
+
+$MAKE
+cat quux
+grep '%Quux%' quux
+$MAKE distcheck
+
+:
diff --git a/t/remake8b.sh b/t/remake8b.sh
new file mode 100755
index 0000000..5f687ba
--- /dev/null
+++ b/t/remake8b.sh
@@ -0,0 +1,192 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test basic remake rules for Makefiles, for a *VPATH build*.
+# This testcase checks dependency of generated Makefile from Makefile.am,
+# configure.ac, acinclude.m4, aclocal.m4, and extra m4 files considered
+# by aclocal.
+# Keep this in sync with sister test 'remake8a.test', which performs the
+# same checks for a in-tree build.
+
+. ./defs || Exit 1
+
+mv -f configure.ac configure.stub
+
+cat > Makefile.am <<'END'
+all-local: foo
+foo:
+       echo '!Foo!' >$@
+check-local:
+       cat foo
+       grep '!Foo!' foo
+CLEANFILES = foo
+END
+
+cat configure.stub - > configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+mkdir build
+cd build
+srcdir='..' # To make syncing with remake8a.test easier.
+
+$srcdir/configure
+
+$MAKE
+cat foo
+grep '!Foo!' foo
+$MAKE distcheck
+
+rm -f foo
+
+# Modify just Makefile.am.
+
+$sleep
+
+cat > $srcdir/Makefile.am <<'END'
+all-local: bar
+bar:
+       echo '!Baz!' >$@
+check-local:
+       cat bar
+       grep '!Baz!' bar
+       test ! -r $(srcdir)/foo
+       test ! -r foo
+CLEANFILES = bar
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+cat bar
+grep '!Baz!' bar
+test ! -r foo
+$MAKE distcheck
+
+rm -f bar
+
+# Modify Makefile.am and configure.ac.
+
+$sleep
+
+cat > $srcdir/Makefile.am <<'END'
+check-local:
+       cat quux
+       grep '!Zardoz!' quux
+       test ! -r $(srcdir)/bar
+       test ! -r bar
+END
+
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
+AC_CONFIG_FILES([quux])
+AC_SUBST([QUUX], [Zardoz])
+AC_OUTPUT
+END
+
+cat > $srcdir/quux.in <<'END'
address@hidden@!
+END
+
+using_gmake || $MAKE Makefile
+$MAKE
+cat quux
+grep '!Zardoz!' quux
+test ! -r bar
+$MAKE distcheck
+
+rm -f quux
+
+# Modify Makefile.am to add a directory of extra m4 files
+# considered by aclocal.
+
+$sleep
+
+mkdir $srcdir/m4
+
+cat > $srcdir/Makefile.am <<'END'
+ACLOCAL_AMFLAGS = -I m4
+check-local:
+       cat quux
+       grep '%Foo%' quux
+       test x'$(QUUX)' = x'%Foo%'
+END
+
+$MAKE # This should place aclocal flags in Makefile.
+grep '.*-I m4' Makefile # Sanity check.
+
+# Modify configure.ac and aclocal.m4.
+
+$sleep
+
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
+AC_CONFIG_FILES([quux])
+MY_CUSTOM_MACRO
+AC_OUTPUT
+END
+
+cat >> $srcdir/aclocal.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Foo%])])
+END
+
+$MAKE
+cat quux
+grep '%Foo%' quux
+$MAKE distcheck
+
+# Modify Makefile.am, remove aclocal.m4, and add a new m4 file to
+# the directory of extra m4 files considered by aclocal.  This new
+# file should now provide a macro required by configure.ac and that
+# was previously provided by aclocal.m4.
+
+$sleep
+
+sed 's/%Foo%/%Bar%/g' $srcdir/Makefile.am > t
+mv -f t $srcdir/Makefile.am
+cat $srcdir/Makefile.am
+rm -f $srcdir/aclocal.m4
+cat > $srcdir/m4/blah.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Bar%])])
+END
+
+$MAKE
+cat quux
+grep '%Bar%' quux
+$MAKE distcheck
+
+# Modify Makefile.am, remove all the extra m4 files to considered
+# by aclocal, and add an acinclude.m4 file.  This last file should
+# now provide a macro required by configure.ac, and that was
+# previously provided by the extra m4 files considered by aclocal.
+
+$sleep
+
+rm -f $srcdir/m4/*.m4
+sed 's/%Bar%/%Quux%/g' $srcdir/Makefile.am > t
+mv -f t $srcdir/Makefile.am
+cat $srcdir/Makefile.am
+cat > $srcdir/acinclude.m4 <<'END'
+AC_DEFUN([MY_CUSTOM_MACRO], [AC_SUBST([QUUX], [%Quux%])])
+END
+
+$MAKE
+cat quux
+grep '%Quux%' quux
+$MAKE distcheck
+
+:
diff --git a/t/remake9a.sh b/t/remake9a.sh
new file mode 100755
index 0000000..7ee3075
--- /dev/null
+++ b/t/remake9a.sh
@@ -0,0 +1,109 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when configure.ac or its prerequisites change.
+# Keep in sync with the other sister tests 'remake9*.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+
+if using_gmake; then
+  remake_() { $MAKE nil; }
+else
+  remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
+cat >> configure.ac <<END
+FINGERPRINT=BadBadBad
+AC_SUBST([FINGERPRINT])
+AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+nil:
+.PHONY: nil
+
+$(srcdir)/configure.ac: $(srcdir)/tweak-configure-in
+       $(SHELL) $(srcdir)/tweak-configure-in <$@ >address@hidden
+       mv -f address@hidden $@
+EXTRA_DIST = $(srcdir)/tweak-configure-in
+
+# Used by "make distcheck" later.
+check-local:
+       test x'$(FINGERPRINT)' = x'DummyValue'
+       test x"`./foo.sh`" = x"DummyValue"
+END
+
+cat > foo.in <<END
+#!/bin/sh
+echo '@FINGERPRINT@'
+END
+
+echo cat > tweak-configure-in # It is a no-op by default.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  sed "s/^\\(FINGERPRINT\\)=.*/\\1=$magic1/" $srcdir/configure.ac >t
+  mv -f t $srcdir/configure.ac
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+  test x"`./foo.sh`" = x"$magic1"
+
+  $sleep
+  echo 'sed "s/^\\(FINGERPRINT\\)=.*/\\1='$magic2'/"' \
+    > $srcdir/tweak-configure-in
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+  test x"`./foo.sh`" = x"$magic2"
+
+  $sleep
+  echo cat > $srcdir/tweak-configure-in # Make it a no-op again.
+  sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.ac >t
+  mv -f t $srcdir/configure.ac
+  using_gmake || remake_
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/remake9b.sh b/t/remake9b.sh
new file mode 100755
index 0000000..cab606e
--- /dev/null
+++ b/t/remake9b.sh
@@ -0,0 +1,111 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when Makefile.am or its prerequisites change.
+# Keep in sync with the other sister tests 'remake9*.test'.
+
+. ./defs || Exit 1
+
+if using_gmake; then
+  remake_() { $MAKE nil; }
+else
+  remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+FINGERPRINT = BadBadBad
+
+all-local: nil
+nil: foo.sh
+.PHONY: nil
+
+$(srcdir)/Makefile.am: $(srcdir)/tweak-makefile-am
+       $(SHELL) $(srcdir)/tweak-makefile-am <$@ >address@hidden
+       mv -f address@hidden $@
+EXTRA_DIST = $(srcdir)/tweak-makefile-am
+
+foo.sh: Makefile
+       rm -f $@ address@hidden
+       echo '#!/bin/sh' > address@hidden
+       echo "echo '$(FINGERPRINT)'" >> address@hidden
+       chmod a+x address@hidden && mv -f address@hidden $@
+CLEANFILES = foo.sh
+
+# Used by "make distcheck" later.
+check-local:
+       test x'$(FINGERPRINT)' = x'DummyValue'
+       test x"`./foo.sh`" = x"DummyValue"
+END
+
+echo cat > tweak-makefile-am # It is a no-op by default.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = $magic1/" $srcdir/Makefile.am >t
+  mv -f t $srcdir/Makefile.am
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+  test x"`./foo.sh`" = x"$magic1"
+
+  $sleep
+  echo 'sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = '$magic2'/"' \
+    > $srcdir/tweak-makefile-am
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+  test x"`./foo.sh`" = x"$magic2"
+
+  $sleep
+  echo cat > $srcdir/tweak-makefile-am # Make it a no-op again.
+  sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = DummyValue/" $srcdir/Makefile.am >t
+  mv -f t $srcdir/Makefile.am
+  using_gmake || remake_
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/remake9c.sh b/t/remake9c.sh
new file mode 100755
index 0000000..efbec30
--- /dev/null
+++ b/t/remake9c.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when acinclude.m4 or its prerequisites change.
+# Keep in sync with the other sister tests 'remake9*.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+
+if using_gmake; then
+  remake_() { $MAKE nil; }
+else
+  remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
+cat >> configure.ac <<END
+FINGERPRINT='my_fingerprint'
+AC_SUBST([FINGERPRINT])
+AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+nil:
+.PHONY: nil
+
+# The right way to extend an autogenerated aclocal.m4 is to provide
+# an acinclude.m4 file.
+$(srcdir)/acinclude.m4: $(srcdir)/tweak-acinclude-m4
+       $(SHELL) $(srcdir)/tweak-acinclude-m4 <$@ >address@hidden
+       mv -f address@hidden $@
+       touch $@
+EXTRA_DIST = $(srcdir)/tweak-acinclude-m4
+
+# Used by "make distcheck" later.
+check-local:
+       test x'$(FINGERPRINT)' = x'DummyValue'
+       test x"`./foo.sh`" = x"DummyValue"
+END
+
+cat > foo.in <<END
+#!/bin/sh
+echo '@FINGERPRINT@'
+END
+
+echo "AC_DEFUN([my_fingerprint], [BadBadBad])" > acinclude.m4
+
+echo : > tweak-acinclude-m4 # It is a no-op by default.
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [$magic1])" > $srcdir/acinclude.m4
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+  test x"`./foo.sh`" = x"$magic1"
+
+  $sleep
+  echo "echo 'AC_DEFUN([my_fingerprint], [$magic2])'" \
+    > $srcdir/tweak-acinclude-m4
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+  test x"`./foo.sh`" = x"$magic2"
+
+  $sleep
+  echo : > $srcdir/tweak-acinclude-m4 # Make it a no-op again.
+  echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $srcdir/acinclude.m4
+  using_gmake || remake_
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/remake9d.sh b/t/remake9d.sh
new file mode 100755
index 0000000..dddb083
--- /dev/null
+++ b/t/remake9d.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test remake rules when aclocal.m4 or its prerequisites change.
+# Keep in sync with the other sister tests 'remake9*.test'.
+
+. ./defs || Exit 1
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+
+if using_gmake; then
+  remake_() { $MAKE nil; }
+else
+  remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
+cat >> configure.ac <<END
+FINGERPRINT='my_fingerprint'
+AC_SUBST([FINGERPRINT])
+AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+nil:
+.PHONY: nil
+
+# A non-autogenerated aclocal.m4 can be extended by hand.
+$(srcdir)/aclocal.m4: $(srcdir)/tweak-aclocal-m4
+       $(SHELL) $(srcdir)/tweak-aclocal-m4 <$@ >address@hidden
+       mv -f address@hidden $@
+       touch $@
+EXTRA_DIST = $(srcdir)/tweak-aclocal-m4
+
+# Used by "make distcheck" later.
+check-local:
+       test x'$(FINGERPRINT)' = x'DummyValue'
+       test x"`./foo.sh`" = x"DummyValue"
+END
+
+cat > foo.in <<END
+#!/bin/sh
+echo '@FINGERPRINT@'
+END
+
+echo cat > tweak-aclocal-m4 # It is a no-op by default.
+
+$ACLOCAL
+# Cheatingly mark aclocal.m4 as non auto-generated.
+sed '/^ *#.*generated automatically/d' aclocal.m4 > t
+mv -f t aclocal.m4
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE # Should be a no-op.
+
+  $sleep
+  echo "AC_DEFUN([my_fingerprint], [$magic1])dnl %%%" >> $srcdir/aclocal.m4
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile
+  test x"`./foo.sh`" = x"$magic1"
+
+  $sleep
+  echo "sed 's/.*dnl *%%%.*/AC_DEFUN([my_fingerprint], [$magic2])/'" \
+    > $srcdir/tweak-aclocal-m4
+  remake_
+  $FGREP FINGERPRINT Makefile # For debugging.
+  $FGREP $magic1 Makefile && Exit 1
+  $FGREP $magic2 Makefile
+  test x"`./foo.sh`" = x"$magic2"
+
+  $sleep
+  echo cat > $srcdir/tweak-aclocal-m4 # Make it a no-op again.
+  echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4
+  using_gmake || remake_
+  $MAKE distcheck
+  $FGREP $magic1 Makefile && Exit 1 # Sanity check.
+  $FGREP $magic2 Makefile && Exit 1 # Likewise.
+
+  $MAKE distclean
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
new file mode 100755
index 0000000..8ad5765
--- /dev/null
+++ b/t/repeated-options.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake does not complain on repeated options, nor
+# generate broken or incorrect makefiles.
+
+required='cc bzip2'
+. ./defs || Exit 1
+
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip no-dist-gzip dist-bzip2])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = parallel-tests subdir-objects subdir-objects
+AUTOMAKE_OPTIONS += dist-bzip2 parallel-tests
+TESTS = foo.test
+EXTRA_DIST = $(TESTS)
+TESTS_ENVIRONMENT = EXEEXT='$(EXEEXT)'
+bin_PROGRAMS = sub/foo
+.PHONY: test-build
+test-build:
+       ls -l . sub
+       test -f sub/foo.$(OBJEXT)
+       test -f sub/foo$(EXEEXT)
+END
+
+mkdir sub
+
+cat > foo.test <<'END'
+#!/bin/sh
+test -f sub/foo$EXEEXT && test -x sub/foo$EXEEXT
+END
+chmod a+x foo.test
+
+cat > sub/foo.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cp "$am_scriptdir"/compile "$am_scriptdir"/test-driver .
+
+$ACLOCAL
+$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; Exit 1; }
+test -s stderr && { cat stderr >&2; Exit 1; }
+rm -f stderr
+$AUTOCONF
+
+./configure
+$MAKE
+$MAKE test-build
+$MAKE check
+ls -l
+test -f foo.log
+test -f test-suite.log
+$MAKE clean
+$MAKE distcheck
+ls -l
+test -f $me-1.0.tar.bz2
+test ! -r $me-1.0.tar.gz
+
+:
diff --git a/t/req.sh b/t/req.sh
new file mode 100755
index 0000000..cfc3b43
--- /dev/null
+++ b/t/req.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure macro used in m4 file is included.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+EOF
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+END
+
+$ACLOCAL
+
+grep 'DEFUN.*INIT_AUTOMAKE' aclocal.m4
+
+:
diff --git a/t/reqd.sh b/t/reqd.sh
new file mode 100755
index 0000000..9e0bcc1
--- /dev/null
+++ b/t/reqd.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake will install several copies of required files if needed.
+# Reported by Marius Vollmer.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<EOF
+AC_CONFIG_FILES([one/Makefile two/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir one
+mkdir two
+
+echo 'SUBDIRS = one two' > Makefile.am
+echo 'info_TEXINFOS = mumble.texi' > one/Makefile.am
+cat >one/mumble.texi <<'END'
address@hidden mumble.info
address@hidden version.texi
+END
+
+cp one/Makefile.am one/mumble.texi two
+
+$ACLOCAL
+$AUTOMAKE --add-missing --copy
+
+test -f one/mdate-sh
+test -f one/texinfo.tex
+test -f two/mdate-sh
+test -f two/texinfo.tex
diff --git a/t/reqd2.sh b/t/reqd2.sh
new file mode 100755
index 0000000..a9442a2
--- /dev/null
+++ b/t/reqd2.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for a bug reported by Andrew Suffield.
+# (Automake goes wild and try to rerun itself more than two time
+# to fix the Makefiles.)
+
+required='libtoolize'
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([req2], [1.0])
+AC_CONFIG_AUX_DIR([autoconf])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AM_PROG_LIBTOOL
+AC_CONFIG_FILES([autoconf/Makefile main/Makefile])
+AC_OUTPUT
+END
+
+mkdir autoconf
+mkdir main
+
+: > autoconf/Makefile.am
+echo 'SUBDIRS = autoconf main' >Makefile.am
+
+cat >main/Makefile.am <<'END'
+lib_LTLIBRARIES = lib0.la
+lib0_la_SOURCES = 0.c
+END
+
+: > ar-lib
+libtoolize --force --copy
+$ACLOCAL
+$AUTOCONF
+
+test -f autoconf/ltmain.sh # Sanity check.
+rm -f autoconf/ltmain.sh
+AUTOMAKE_fails --add-missing --copy
+grep '^configure\.ac:7:.* required file.*autoconf/ltmain\.sh' stderr
+
+:
diff --git a/t/rst-formatting.sh b/t/rst-formatting.sh
new file mode 100755
index 0000000..f23c28c
--- /dev/null
+++ b/t/rst-formatting.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Parallel testsuite harness: check APIs for the registering the
+# "global test result" in '*.trs' files, as documented in the automake
+# manual.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+sed -n '/^am__rst_[a-z_][a-z_]* =/p' "$am_amdir"/check.am > Makefile \
+  || framework_failure_ "fetching definitions from check.am"
+
+cat >> Makefile << 'END'
+test:
+       printf '%s\n' "$$in" | $(am__rst_title) > title-got
+       printf '%s\n' "$$in" | $(am__rst_section) > section-got
+       cat title-exp
+       cat title-got
+       diff title-exp title-got
+       cat section-exp
+       cat section-got
+       diff section-exp section-got
+END
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+==============
+   ab cd ef
+==============
+
+END
+
+cat > section-exp <<'END'
+ab cd ef
+========
+
+END
+
+env in='ab cd ef' $MAKE test
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+============================================================================
+   0123456789012345678901234567890123456789012345678901234567890123456789
+============================================================================
+
+END
+
+cat > section-exp <<'END'
+0123456789012345678901234567890123456789012345678901234567890123456789
+======================================================================
+
+END
+
+in=0123456789012345678901234567890123456789012345678901234567890123456789
+env in=$in $MAKE test
+
+# -------------------------------------------------------------------------
+
+cat > title-exp <<'END'
+=======
+   x
+=======
+
+END
+
+cat > section-exp <<'END'
+x
+=
+
+END
+
+env in=x $MAKE test
+
+# -------------------------------------------------------------------------
+
+:
diff --git a/t/rulepat.sh b/t/rulepat.sh
new file mode 100755
index 0000000..5e547a5
--- /dev/null
+++ b/t/rulepat.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure RULE_PATTERN catches strange targets.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+$(srcdir)/Makefile.am:
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^$(srcdir)/Makefile\.am' Makefile.in
+
+:
diff --git a/t/sanity.sh b/t/sanity.sh
new file mode 100755
index 0000000..d4f328c
--- /dev/null
+++ b/t/sanity.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Unsafe absolute directory names should be diagnosed.
+
+. ./defs || Exit 1
+
+mkdir 'unsafe$'
+cd 'unsafe$'
+
+mv ../configure.ac .
+mv ../install-sh ../missing .
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'unsafe absolute working directory' stderr
+
+cd ..
+mkdir build
+cd build
+../unsafe$/configure 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'unsafe srcdir' stderr
+
+:
diff --git a/t/scripts.sh b/t/scripts.sh
new file mode 100755
index 0000000..4808358
--- /dev/null
+++ b/t/scripts.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported by Jim Meyering.
+# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+noinst_SCRIPTS = foo
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/seenc.sh b/t/seenc.sh
new file mode 100755
index 0000000..d1bfa23
--- /dev/null
+++ b/t/seenc.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure C-but-not-CC error works.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+dnl AC_PROG_CC and AC_PROG_CXX missing on purpose
+AC_LIBOBJ([fsusage])
+AC_LIBOBJ([mountlist])
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = x.C
+foo_LDADD = @LIBOBJS@
+END
+
+: > fsusage.c
+: > mountlist.c
+
+$ACLOCAL
+AUTOMAKE_fails
+grep ' C source.*CC.* undefined' stderr
+grep 'define .*CC.* add .*AC_PROG_CC' stderr
+grep ' C++ source.*CXX.* undefined' stderr
+grep 'define .*CXX.* add .*AC_PROG_CXX' stderr
+
+:
diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap
new file mode 100755
index 0000000..a56854b
--- /dev/null
+++ b/t/self-check-cleanup.tap
@@ -0,0 +1,192 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check creation/removal of temporary test working directory by './defs'.
+
+. ./defs || Exit 1
+
+if test x"$sh_errexit_works" != x"yes"; then
+  skip_all_ "$me: no working exit trap with 'set -e'"
+fi
+
+plan_ 43
+
+# We still need a little hack to make ./defs work outside automake's
+# tree 'tests' subdirectory.  Not a big deal.
+sed "s|^am_top_builddir=.*|am_top_builddir='`pwd`'|" \
+  "$am_top_builddir"/defs-static >defs-static
+diff "$am_top_builddir"/defs-static defs-static \
+  && fatal_ "failed to edit defs-static"
+cp "$am_top_builddir"/defs .
+
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+keep_testdirs=; unset keep_testdirs
+
+if ln -s defs foo && test -h foo; then
+  have_symlinks=yes
+else
+  have_symlinks=no
+fi
+export have_symlinks # Is used also by spawned shells.
+
+# Don't let a failure poison all subsequent tests.
+do_clean ()
+{
+  # Don't try to be smart and use find here, that has caused issues
+  # and extra ERROR results in the past.  Be dumb and safe.
+  for d in t t/* t/*/* t/*/*/*; do
+    test ! -d $d || chmod u+rwx $d || :
+  done
+  rm -rf t
+}
+
+# Exporting 'keep_testdirs' to "yes" in the environment should cause
+# the cleanup code not to be run, so that the temporary directories
+# are left on disk.
+command_ok_ '"keep_testdirs=yes" causes testdir to be kept around' eval '
+     keep_testdirs=yes $SHELL -c ". ./defs && echo okok >foo" t/dummy.sh \
+     && test -f t/dummy.dir/foo \
+     && test okok = `cat t/dummy.dir/foo`'
+
+do_clean
+
+# Check that pre-test cleanup works also with directories with
+# "null" permissions, and containing broken symlinks.
+mkdir t t/dummy.dir t/dummy.dir/sub
+(
+  cd t/dummy.dir
+  touch file sub/file
+  if test $have_symlinks = yes; then
+    ln -s file symlink
+    ln -s none brokenlink
+  fi
+)
+chmod 000 t/dummy.dir/sub/* t/dummy.dir/file
+test $have_symlinks = yes && chmod 000 t/dummy.dir/symlink
+chmod 500 t/dummy.dir/sub t/dummy.dir
+command_ok_ "pre-cleanup can deal with low-perms testdir" \
+            $SHELL -c  '. ./defs' t/dummy.sh
+command_ok_ "pre-cleanup removed low-perms testdir" \
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
+
+do_clean
+
+# Check that post-test cleanup works also with directories with
+# "null" permissions, and containing broken symlinks.
+command_ok_ "post-cleanup can deal with low-perms testdir" \
+            $SHELL -c  '
+  stderr_fileno_=2
+  . ./defs || Exit 1
+  set -e
+  mkdir dir dir/sub
+  cd dir
+  touch file sub/file
+  if test $have_symlinks = yes; then
+    ln -s file symlink
+    ln -s none brokenlink
+  fi
+  cd ..
+  chmod 000 dir/sub/* dir/file
+  test $have_symlinks = yes && chmod 000 dir/symlink
+  chmod 500 dir/sub dir
+  :
+' t/dummy.sh
+command_ok_ "post-cleanup removed null-perms testdir" \
+            eval 'test ! -f t/dummy.dir \
+               && test ! -d t/dummy.dir \
+               && test ! -r t/dummy.dir'
+
+do_clean
+
+# Check that pre-test cleanup does not unduly change the permissions of
+# files to which symlinks in the temporary test directory point to.
+if test $have_symlinks = yes; then
+
+  mkdir dir
+  chmod 000 dir
+  : > file
+  chmod 000 file
+
+  mkdir t t/dummy.dir
+  (cd t/dummy.dir && ln -s ../../dir ../../file .)
+
+  command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \
+               $SHELL -c '. ./defs' t/dummy.sh
+  ls -l # For debugging.
+  command_ok_ "pre-cleanup chmod doesn't follow symlinks to files" \
+               eval 'ls -l file | grep "^----------.*file"'
+  command_ok_ "pre-cleanup chmod doesn't follow symlinks to dirs" \
+              eval 'ls -ld dir | grep "^d---------.*dir"'
+
+  command_ok_ "post-cleanup with testdir with zero-perms symlinks" \
+              $SHELL -c '
+    ocwd=`pwd` || exit 1
+    stderr_fileno_=2
+    . ./defs || Exit 1
+    ln -s "$ocwd/dir" "$ocwd/file" .
+  ' t/dummy.sh
+  ls -l # For debugging.
+  command_ok_ "post-cleanup chmod doesn't follow symlinks to files" \
+               eval 'ls -l file | grep "^----------.*file"'
+  command_ok_ "post-cleanup chmod doesn't follow symlinks to dirs" \
+              eval 'ls -ld dir | grep "^d---------.*dir"'
+
+  chmod u+rwx dir file
+  rmdir dir
+  rm -f file
+
+else # $have_symlinks = no
+  skip_row_ 6 "symlinks not supported"
+fi
+
+do_clean
+
+# Check that the cleanup trap does not remove the temporary
+# test directory in case of test failure, skip, hard-error,
+# or when receiving a signal.
+
+for st in 1 2 3 10 77 99 126 127 130 255; do
+  command_ok_ "exit trap doesn't clobber exit status $st" not $SHELL -c "
+    stderr_fileno_=2
+    . ./defs
+    : > foo
+    Exit $st
+  " t/dummy.sh
+  command_ok_ "testdir not removed if exiting with status $st" \
+              test -f t/dummy.dir/foo
+  do_clean
+done
+
+for sig in 1 2 3 9 13 15; do
+  if is_blocked_signal $sig; then
+    skip_row_ 2 -r "signal $sig seems blocked"
+    continue
+  fi
+  command_ok_ "exit trap doesn't clobber signal $sig" not $SHELL -c "
+    stderr_fileno_=2
+    . ./defs
+    : > foo
+    kill -$sig \$\$
+  " t/dummy.sh
+  command_ok_ "testdir not removed if getting signal $sig" \
+              test -f t/dummy.dir/foo
+  do_clean
+done
+
+:
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
new file mode 100755
index 0000000..23b9dc7
--- /dev/null
+++ b/t/self-check-configure-help.sh
@@ -0,0 +1,274 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check on the function used by the automake testsuite to
+# analyze output of "configure --help".
+
+. ./defs || Exit 1
+
+# FIXME: this test is a good candidate for a conversion to TAP.
+
+# Prefer real-world data.  This is from the help screen of the
+# configure script from GNU coreutils, with small adaptations.
+cat > help <<'END'
+'configure' configures GNU coreutils 8.14a to adapt to many kinds of systems.
+
+Usage: ./configure [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print 'checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for '--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or '..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [/usr/local]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, 'make install' will install all the files in
+'/usr/local/bin', '/usr/local/lib' etc.  You can specify
+an installation prefix other than '/usr/local' using '--prefix',
+for instance '--prefix=$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/coreutils]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules          less verbose build output (undo: 'make V=1')
+  --disable-silent-rules         verbose build output (undo: 'make V=0')
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --disable-largefile     omit support for large files
+  --enable-threads={posix|solaris|pth|win32}
+                          specify multithreading API
+  --disable-threads       build without multithread safety
+  --disable-acl           do not support ACLs
+  --disable-assert        turn off assertions
+  --disable-rpath         do not hardcode runtime library paths
+  --disable-xattr         do not support extended attributes
+  --disable-libcap        disable libcap support
+  --enable-gcc-warnings   turn on lots of GCC warnings (for developers)
+  --enable-install-program=PROG_LIST
+                          install the programs in PROG_LIST (comma-separated,
+                          default: none)
+  --enable-no-install-program=PROG_LIST
+                          do NOT install the programs in PROG_LIST
+                          (comma-separated, default: arch,hostname,su)
+  --disable-nls           do not use Native Language Support
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and 
libdir
+  --with-libpth-prefix[=DIR]  search for libpth in DIR/include and DIR/lib
+  --without-libpth-prefix     don't search for libpth in includedir and libdir
+  --without-included-regex
+                          don't compile regex; this is the default on systems
+                          with recent-enough versions of the GNU C Library
+                          (use with caution on other systems).
+  --without-selinux       do not use SELinux, even on systems with SELinux
+  --with-packager         String identifying the packager of this software
+  --with-packager-version Packager-specific version information
+  --with-packager-bug-reports
+                          Packager info for bug reports (URL/e-mail/...)
+  --with-tty-group[=NAME]
+                          group used by system for TTYs, "tty" when not
+                          specified (default: do not rely on any group used
+                          for TTYs)
+  --without-gmp           do not use the GNU MP library for arbitrary
+                          precision calculation (default: use it if available)
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+  --without-libintl-prefix     don't search for libintl in includedir and 
libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  YACC        The "Yet Another C Compiler" implementation to use. Defaults to
+              'bison -y'. Values other than 'bison -y' will most likely break
+              on most systems.
+  YFLAGS      YFLAGS contains the list arguments that will be passed by
+              default to Bison. This script will default YFLAGS to the empty
+              string to avoid a default value of '-d' given by some make
+              applications.
+  DEFAULT_POSIX2_VERSION
+              POSIX version to default to; see 'config.hin'.
+
+Use these variables to override the choices made by 'configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <address@hidden>.
+General help using GNU software: <http://www.gnu.org/gethelp/>.
+END
+
+compare_extracted_help ()
+{
+  cat > exp || Exit 99
+  extract_configure_help "$1" help > got || Exit 1
+  cat exp
+  cat got
+  diff exp got || Exit 1
+}
+
+compare_extracted_help --disable-libcap <<'END'
+  --disable-libcap        disable libcap support
+END
+
+compare_extracted_help --disable-nls <<'END'
+  --disable-nls           do not use Native Language Support
+END
+
+compare_extracted_help --disable-option-checking <<'END'
+  --disable-option-checking  ignore unrecognized --enable/--with options
+END
+
+compare_extracted_help --build= <<'END'
+  --build=BUILD     configure for building on BUILD [guessed]
+END
+
+compare_extracted_help --host= <<'END'
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+END
+
+compare_extracted_help '--with-libintl-prefix[=]' <<'END'
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+END
+
+compare_extracted_help --without-included-regex <<'END'
+  --without-included-regex
+                          don't compile regex; this is the default on systems
+                          with recent-enough versions of the GNU C Library
+                          (use with caution on other systems).
+END
+
+compare_extracted_help --enable-threads= <<'END'
+  --enable-threads={posix|solaris|pth|win32}
+                          specify multithreading API
+END
+
+compare_extracted_help '--with-tty-group[=]' <<'END'
+  --with-tty-group[=NAME]
+                          group used by system for TTYs, "tty" when not
+                          specified (default: do not rely on any group used
+                          for TTYs)
+END
+
+compare_extracted_help '--prefix=' <<'END'
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [/usr/local]
+END
+
+compare_extracted_help '--exec-prefix=' <<'END'
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+END
+
+compare_extracted_help CC <<'END'
+  CC          C compiler command
+END
+
+compare_extracted_help CPP <<'END'
+  CPP         C preprocessor
+END
+
+compare_extracted_help CPPFLAGS <<'END'
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+END
+
+compare_extracted_help YACC <<'END'
+  YACC        The "Yet Another C Compiler" implementation to use. Defaults to
+              'bison -y'. Values other than 'bison -y' will most likely break
+              on most systems.
+END
+
+compare_extracted_help DEFAULT_POSIX2_VERSION <<'END'
+  DEFAULT_POSIX2_VERSION
+              POSIX version to default to; see 'config.hin'.
+END
+
+for o in \
+  '--nonesuch' \
+  '--nonesuch=' \
+  '--nonesuch[=]' \
+  '--disable-nls=' \
+  '--disable-nls[=]' \
+  '--without-included-regex=' \
+  '--without-included-regex[=]' \
+  '--prefix' \
+  '--prefix[=]' \
+  '--build' \
+  '--build[=]' \
+  '--with-tty-group' \
+  '--with-tty-group=' \
+  'NO_SUCH_VAR' \
+  'NOSUCHVAR' \
+; do
+  compare_extracted_help "$o" </dev/null
+done
+
+:
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
new file mode 100755
index 0000000..736238c
--- /dev/null
+++ b/t/self-check-dir.tap
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check that tests using './defs' create a proper temporary directory,
+# and run in it.  Also check that we can prevent the pre-population
+# and the creation of such directory if we want.
+
+am_create_testdir=no
+. ./defs || Exit 99
+
+plan_ 5
+
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+keep_testdirs=; unset keep_testdirs
+
+# This needs to be consistent with what $SHELL deems to be the
+# current working directory.
+cwd=`$SHELL -c 'pwd'` || fatal_ "can't get current working directory"
+echo "$cwd"
+
+do_check ()
+{
+  test ! -d _self.dir || rm -rf _self.dir \
+    || framework_failure_ "cleaning up _self.dir"
+  command_ok_ "$1 [$2]" $SHELL -c "
+    $2
+    . ./defs || Exit 99
+    # Don't fail if 'ls -l' fails; avoids possible racy spurious failures.
+    pwd; ls -l || : # For debugging.
+    $3
+  " t/_self.sh
+}
+
+do_check 'testdir has the expected path' \
+         'unset am_create_testdir' \
+         'case `pwd` in '"$cwd"'/t/_self.dir);; *) Exit 1;; esac'
+
+do_check 'fully pre-populated testdir' \
+         'unset am_create_testdir' \
+         'test -f install-sh || Exit 1
+          test -f configure.ac || Exit 1
+          case `pwd` in '"$cwd"'/t/_self.dir) : ;; *) Exit 1;; esac'
+
+do_check 'testdir has the expected path' \
+         'am_create_testdir=empty' \
+         'case `pwd` in '"$cwd"'/t/_self.dir) : ;; *) Exit 1;; esac'
+
+do_check 'do not pre-populate testdir' \
+         'am_create_testdir=empty' \
+         'ls -a | grep -v "^\\.\\{1,2\\}$" | grep . && Exit 1; :'
+
+do_check 'do not create nor chdir in testdir' \
+         'am_create_testdir=no' \
+         'test ! -d t/_self.dir || Exit 1
+          test ! -f t/_self.dir || Exit 1
+          test ! -r t/_self.dir || Exit 1
+          grep "self-check-dir\.tap" Makefile || Exit 1
+          case `pwd` in '"$cwd"') : ;; *) Exit 1;; esac'
+
+:
diff --git a/t/self-check-env-sanitize.tap b/t/self-check-env-sanitize.tap
new file mode 100755
index 0000000..d4e6cdb
--- /dev/null
+++ b/t/self-check-env-sanitize.tap
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Make sure that the testsuite initialization code complains when
+# some testsuite-influential variables are set in the environment.
+
+am_create_testdir=no
+. ./defs || Exit 1
+
+set -x
+exec 5>&1
+
+plan_ 18 # Two times the number of variable names in $vars.
+
+vars='
+  me
+  required
+  am_parallel_tests
+  am_using_tap
+  am_create_testdir
+  am_tap_implementation
+  am_test_prefer_config_shell
+  am_original_AUTOMAKE
+  am_original_ACLOCAL
+'
+
+do_run ()
+{
+  env "$1=foo" $SHELL -c '. ./defs' foo.test
+}
+
+do_grep ()
+{
+  env "$1=foo" $SHELL -c '. ./defs' foo.test 2>&1 1>&5 \
+    | grep "foo\.test:.* variable '$1'.* in the environment.*unsafe"
+}
+
+for var in $vars; do
+  command_ok_ "$var [err status]" not do_run $var
+  command_ok_ "$var [err message]" do_grep $var
+done
+
+:
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
new file mode 100755
index 0000000..c866dbc
--- /dev/null
+++ b/t/self-check-exit.tap
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check that, in case of failing commands, the correct exit status is
+# passed to the exit trap installed by the './defs' script.
+# Also check that the 'errexit' shell flag is active.
+
+am_create_testdir=no
+. ./defs || Exit 99
+
+plan_ 34
+
+# This test becomes more cumbersome if we keep the 'errexit' shell flag
+# set.  And removing it is no big deal, as this test is a TAP-based one,
+# so that false positives remain very unlikely.
+set +e
+
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+
+# It's especially important that the 'unset' is done before sourcing
+# ./defs, i.e., when 'set -e' is not active yet, for the benefit of shells
+# (like Bash 2.05 and Solaris 10 /bin/ksh) that returns a non-zero status
+# when unsetting an already-unset variable.
+init='stderr_fileno_=2; unset am_explicit_skips; . ./defs'
+
+# Required so that the code in defs doesn't go crazy trying to creating a
+# temporary directory in the absolute dir of $SHELL.
+dummy_test_script=t/$me.sh
+
+for st in 1 2 3 4 5 77 99 126 127 128 129 130 255; do
+  for exit_cmd in "Exit $st" "sh -c 'exit $st'"; do
+    $SHELL -c  "$init; $exit_cmd; :" "$dummy_test_script"
+    command_ok_ "$exit_cmd" test $? -eq $st
+  done
+done
+
+for sig in 1 2 13 15; do
+  if is_blocked_signal $sig; then
+    skip_ -r "signal $sig seems blocked"
+    continue
+  fi
+  if test $sig -eq 2; then
+    # Some Korn shells might otherwise get a spurious SIGINT signal when
+    # one is sent to the child $SHELL.  For more details, see:
+    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    trap : 2
+  fi
+  $SHELL -c  "$init; kill -$sig \$\$; :" "$dummy_test_script"
+  rc=$?
+  if test $sig -eq 2; then
+    # Reset default SIGINT handler as portably as possible.
+    trap 2 || trap - 2
+  fi
+  if test x"$sh_errexit_works" = x"yes"; then
+    # The exit trap should turn into an hard errors any failure
+    # caused by signals.
+    command_ok_ "kill -$sig" test $rc -eq 99
+  else
+    # The exit trap is not installed, so that the shell should exit
+    # with status 128+n when receiving signal number n.  But don't
+    # be too strict in the check, as POSIX only says that "The exit
+    # status of a command that terminated because it received a
+    # signal shall be reported as greater than 128".
+    command_ok_ "kill -$sig" test $rc -gt 128
+  fi
+  unset rc
+done
+
+: Non-existent program.
+# Solaris 10 /bin/sh erroneously exit with success right away when the
+# following three conditions are met at the same time:
+#   1. the 'errexit' flag is active,
+#   2. an exit trap is installed, and
+#   3. a non-existing command is issued.
+# Note that the non-existent command is issued as the last command to
+# the shell in the next line; this is deliberate.
+if $SHELL -c 'set -e; trap "exit \$?" 0; non-existent-program'; then
+  maybe_todo=TODO reason="known Solaris /bin/sh bug"
+else
+  maybe_todo="" reason=""
+fi
+$SHELL -c  "$init; non-existent-program; :" "$dummy_test_script"
+command_ok_ "command not found" -D "$maybe_todo" -r "$reason" \
+            -- test $? -gt 0
+
+: Non-executable command.
+test -f Makefile && test ! -x Makefile || \
+  framowork_failure_ "no proper Makefile in the current directory"
+$SHELL -c  "$init; ./Makefile; :" "$dummy_test_script"
+command_ok_ "permission denied" test $? -gt 0
+
+: Syntax errors in the test code.
+$SHELL -c  "$init; if :; then" "$dummy_test_script"
+command_ok_ "syntax error 1" test $? -gt 0
+$SHELL -c  "$init; fi" "$dummy_test_script"
+command_ok_ "syntax error 2" test $? -gt 0
+
+:
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
new file mode 100755
index 0000000..3e7a77c
--- /dev/null
+++ b/t/self-check-explicit-skips.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check creation/removal of temporary test working directory by './defs'.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+test x"$sh_errexit_works" = x"yes" || skip_ "no working shell exit trap"
+
+# We still need a little hack to make ./defs work outside automake's
+# tree 'tests' subdirectory.  Not a big deal.
+sed "s|^am_top_builddir=.*|am_top_builddir='`pwd`'|" \
+  "$am_top_builddir"/defs-static > defs-static
+diff "$am_top_builddir"/defs-static defs-static \
+  && fatal_ "failed to edit defs-static"
+cp "$am_top_builddir"/defs .
+
+set +e
+
+unset am_explicit_skips stderr_fileno_
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+
+$SHELL -c '. ./defs; (exit 77); exit 77' dummy.test
+test $? -eq 77 || Exit 1
+
+am_explicit_skips=no $SHELL -c '. ./defs; sh -c "exit 77"' dummy.test
+test $? -eq 77 || Exit 1
+
+am_explicit_skips=yes $SHELL -c '. ./defs; (exit 77); exit 77' dummy.test
+test $? -eq 78 || Exit 1
+
+am_explicit_skips=y $SHELL -c '. ./defs; sh -c "exit 77"' dummy.test
+test $? -eq 78 || Exit 1
+
+am_explicit_skips=yes $SHELL -c '. ./defs; Exit 77' dummy.test
+test $? -eq 77 || Exit 1
+
+am_explicit_skips=y $SHELL -c '. ./defs; skip_ "foo"' dummy.test
+test $? -eq 77 || Exit 1
+
+:
diff --git a/t/self-check-is-blocked-signal.tap 
b/t/self-check-is-blocked-signal.tap
new file mode 100755
index 0000000..5c0dded
--- /dev/null
+++ b/t/self-check-is-blocked-signal.tap
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite: the 'signal_is_blocked'
+# shell function.
+
+am_create_testdir=no
+. ./defs || Exit 99
+
+plan_ 2
+
+command_ok_ "unblockable signal 9" not is_blocked_signal 9
+trap "" 13
+command_ok_ "blocked signal 13" is_blocked_signal 13
+
+:
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
new file mode 100755
index 0000000..76b69ac
--- /dev/null
+++ b/t/self-check-is_newest.tap
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite: the 'is_newest' subroutine.
+
+. ./defs || Exit 1
+
+plan_ 21
+
+# I'm a lazy typist.
+Y () { command_ok_ "is_newest $*" is_newest "$@"; }
+N () { command_ok_ "not is_newest $*" not is_newest "$@"; }
+
+: > a
+$sleep
+: > b
+: > c
+
+stat a b c || : # For debugging.
+
+Y c a
+Y b a
+N a b
+Y c b
+Y c c
+Y c a b c
+
+touch -r c d
+
+stat c d || : # For debugging.
+
+Y c d
+
+# Should work on directories too, both empty and not-empty.  An older
+# implementation of 'is_newest' failed if the first argument was a
+# directory containing files newer than itself (see automake bug#9147).
+mkdir u x
+touch x/foo
+$sleep
+touch x/foo
+$sleep
+mkdir v y
+touch y/foo
+$sleep
+touch y/foo
+
+stat u v x y x/foo y/foo || : # For debugging.
+
+for older in u x; do
+  for newer in v y; do
+    Y $newer $older
+    N $older $newer
+  done
+done
+
+Y x/foo x
+N x x/foo
+
+touch -r x u
+Y x u
+Y u x
+
+# A couple of mild "stress" tests.
+Y y x u v
+Y y u x/foo a b c
+
+:
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
new file mode 100755
index 0000000..5c83ee6
--- /dev/null
+++ b/t/self-check-me.tap
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Make sure that $me gets automatically defined by './defs', and that it
+# can be overridden by the test script.
+
+am_create_testdir=no
+. ./defs || Exit 1
+
+plan_ 14
+
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+
+# This test becomes cumbersome if we keep the 'errexit' shell flag set.
+# And removing it is no big deal, as this test is a TAP-based one, so
+# that false positives remain very unlikely.
+set +e
+
+do_check ()
+{
+  $SHELL -c '. ./defs && echo me=$me' "$1" | grep "^me=$2$"
+  command_ok_ "me=$1" test $? -eq 0
+}
+
+for e in sh tap; do
+  do_check foo-bar-.$e 'foo-bar-'
+  do_check _foo__bar.$e '_foo__bar'
+  do_check 012.$e '012'
+  do_check a.b.c.$e 'a\.b\.c'
+done
+
+do_check foo.bar 'foo\.bar'
+do_check abc. 'abc\.'
+
+# If we override $me, ./defs should not modify it.
+
+s=`$SHELL -c 'me=foo.sh && . ./defs && echo me=$me' bad.sh`
+command_ok_ "override of \$me before ./defs causes no error" \
+            test $? -eq 0
+
+r='ok'
+printf '%s\n' "$s" | grep '^me=foo\.sh$' || r='not ok'
+printf '%s\n' "$s" | grep 'me=bad'       && r='not ok'
+result_ "$r" "override of \$me before ./defs is honored"
+unset r
+
+# Overriding $me after sourcing ./defs-static should work.
+s=`$SHELL -c '. ./defs-static && me=zardoz &&
+              . ./defs && echo me=$me' bad.sh`
+command_ok_ "override of \$me after ./defs-static causes no error" \
+            test $? -eq 0
+
+r='ok'
+printf '%s\n' "$s" | grep '^me=zardoz$' || r='not ok'
+printf '%s\n' "$s" | grep 'me=bad'      && r='not ok'
+result_ "$r" "override of \$me after ./defs-static is honored"
+unset r
+
+:
diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap
new file mode 100755
index 0000000..8237c08
--- /dev/null
+++ b/t/self-check-reexec.tap
@@ -0,0 +1,205 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check that automatic re-execution of test script with the
+# configure-time $SHELL.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+plan_ 32
+
+unset AM_TESTS_REEXEC BASH_VERSION || :
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+cp "$am_top_builddir"/defs . || fatal_ "fetching 'defs' from top_builddir"
+
+#
+# Search for required bash and non-bash shells.
+#
+
+for bash_shell in "$SHELL" bash bash3 bash4 :; do
+  test "$bash_shell" = : && break
+  $bash_shell --version || continue
+  $bash_shell -c 'test -n "$BASH_VERSION"' || continue
+  break
+done
+
+# This might not be optimal, but it's much better than writing wrapper
+# scripts acting as "fake" shells.
+for non_bash_shell in /bin/sh /bin/ksh "$SHELL" sh ksh ash dash pdksh :; do
+  test "$non_bash_shell" = : && break
+  $non_bash_shell -c 'exit 0' || continue
+  $non_bash_shell -c 'test -n "$BASH_VERSION"' && continue
+  break
+done
+
+echo "bash_shell='$bash_shell'"
+echo "non_bash_shell='$non_bash_shell'"
+
+# This would denote an internal error.
+if test "$bash_shell" = : && test "$non_bash_shell" = :; then
+  fatal_ "we couldn't find a bash shell nor a non-bash one"
+fi
+
+#
+# Functions used throughout the test.
+#
+
+get_ddata ()
+{
+  case $1 in
+    ""|*/) dsep=;;
+        *) dsep=/;;
+  esac
+  case $1 in
+    "") dname="no dir";;
+    /*) dname="absolute dir";;
+     *) dname="dir '$1'";;
+  esac
+}
+
+get_sh ()
+{
+  case $1 in
+    bash) sh=$bash_shell;;
+    non-bash) sh=$non_bash_shell;;
+    *) fatal_ "get_sh: invalid shell type '$1'";;
+  esac
+}
+
+#
+# Check how to default, force or prevent a re-execution.
+#
+
+cat > need-bash.sh <<'END'
+#!/bin/false
+. ./defs
+# Ensure that the script gets re-executed with bash.  Also ensure that
+# non-standard syntax used after the inclusion of './defs' doesn't cause
+# non-bash shells to fail.
+# Subshell required to prevent some shells (e.g., Solaris 10 /bin/sh)
+# from only complaining on stderr but then exiting with exit status 0.
+(foo=abac && test xbxc = ${foo//a/x} && test -n "$BASH_VERSION")
+END
+
+sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd'|" \
+    -e 's|^SHELL=.*$|SHELL=bash; export SHELL|' \
+    < "$am_top_builddir"/defs-static >defs-static
+
+do_reexec ()
+{
+  command_ok_ "re-exec if AM_TESTS_REEXEC=$1" \
+              env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.sh
+}
+
+dont_reexec ()
+{
+  command_ok_ "don't re-exec if AM_TESTS_REEXEC=$1" \
+              not env AM_TESTS_REEXEC="$1" $non_bash_shell need-bash.sh
+}
+
+if test "$bash_shell" = :; then
+  skip_row_ 10 -r "no bash shell found" AM_TESTS_REEXEC
+elif test "$non_bash_shell" = :; then
+  skip_row_ 10 -r "no non-bash shell found" AM_TESTS_REEXEC
+else
+  command_ok_ "re-exec if AM_TESTS_REEXEC unset" \
+              $non_bash_shell need-bash.sh
+  do_reexec ''
+  do_reexec yes
+  do_reexec y
+  do_reexec true
+  do_reexec 1
+  dont_reexec no
+  dont_reexec n
+  dont_reexec false
+  dont_reexec 0
+fi
+
+#
+# Check message about the re-execution.  Also check that arguments passed
+# to a test script are preserved by a re-exec, even in "corner" cases.
+#
+
+cat > dummy.sh <<'END'
+#!/bin/sh
+. ./defs
+:
+END
+
+cat > checkargs.sh <<'END'
+. ./defs
+test $# -eq 3 && test x"$1" = x'a' && test x"$2" = x && test x"$3" = x"-e"
+END
+
+chmod a+x dummy.sh checkargs.sh
+
+mkdir sub
+cp dummy.sh checkargs.sh defs sub
+sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd'|" \
+    <  "$am_top_builddir"/defs-static > defs-static
+sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd/sub'|" \
+    <  "$am_top_builddir"/defs-static > sub/defs-static
+
+check_preserve_args ()
+{
+  dir=$1; shift
+  get_ddata "$dir"
+  $sh "${dir}${dsep}checkargs.sh" a '' -e && r='ok' || r='not ok'
+  result_ "$r" "$sh re-exec preserving args [$dname]"
+}
+
+check_reexec_message ()
+{
+  dir=$1; shift
+  get_ddata "$dir"
+  $sh "${dir}${dsep}dummy.sh" "$@" \
+    | grep "^dummy: exec $SHELL ${dir}${dsep}dummy\\.sh $*\$" \
+    && r='ok' || r='not ok'
+  result_ "$r" "$sh display re-exec message [$dname] [args: $*]"
+}
+
+./dummy.sh a b | grep "^dummy: exec $SHELL \\./dummy\\.sh a b$" \
+  && r='ok' || r='not ok'
+result_ "$r" "direct run display re-exec message [args: a b]"
+
+./checkargs.sh a '' -e && r='ok' || r='not ok'
+result_ "$r" "direct re-exec preserving args"
+
+for sh_type in non-bash bash; do
+  get_sh $sh_type
+  if test "$sh" = :; then
+    skip_row_ 5 -r "no $sh_type shell available" "re-exec message"
+    skip_row_ 5 -r "no $sh_type shell available" "re-exec preserving args"
+    continue
+  fi
+  check_preserve_args ''
+  check_reexec_message '' a b c
+  check_preserve_args .
+  check_reexec_message .  a b c
+  cd sub
+  check_preserve_args ..
+  check_reexec_message .. a b c
+  cd ..
+  check_preserve_args "$cwd"
+  check_reexec_message "$cwd" a -b c-
+  check_preserve_args sub
+  check_reexec_message sub 1 2 3 4
+done
+
+:
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
new file mode 100755
index 0000000..e5998b5
--- /dev/null
+++ b/t/self-check-report.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Test subroutines to report warnings, and to signal failures, skips
+# and hard errors.
+
+unset stderr_fileno_ || :
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+set +e
+
+exec 5>&1
+
+(warn_ foobar) 2>&1 1>&5 | grep '^foobar$'             || Exit 1
+(fail_ foo); test $? -eq 1                             || Exit 1
+(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
+(skip_ foo); test $? -eq 77                            || Exit 1
+(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
+(fatal_ foo); test $? -eq 99                           || Exit 1
+(fatal_ foo) 2>&1 1>&5 | grep "^$me: hard error: foo"  || Exit 1
+(framework_failure_ foo); test $? -eq 99               || Exit 1
+(framework_failure_ foo) 2>&1 1>&5 \
+  | grep "^$me: set-up failure: foo"                   || Exit 1
+
+stderr_fileno_=6
+
+(warn_ foobar) 6>&1 1>&5 | grep '^foobar$'             || Exit 1
+(fail_ foo); test $? -eq 1                             || Exit 1
+(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
+(skip_ foo); test $? -eq 77                            || Exit 1
+(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
+(fatal_ foo); test $? -eq 99                           || Exit 1
+(fatal_ foo) 6>&1 1>&5 | grep "^$me: hard error: foo"  || Exit 1
+(framework_failure_ foo); test $? -eq 99               || Exit 1
+(framework_failure_ foo) 6>&1 1>&5 \
+  | grep "^$me: set-up failure: foo"                   || Exit 1
+
+:
diff --git a/t/self-check-sanity.sh b/t/self-check-sanity.sh
new file mode 100755
index 0000000..64e489c
--- /dev/null
+++ b/t/self-check-sanity.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Test the sanity checks performed by the 'defs' script.  Also check
+# that we can use 'defs' elsewhere, when we duplicate some of the
+# infrastructure from the automake/tests subdirectory.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+# Avoid to confuse traces from child processed with our own traces.
+show_stderr ()
+{
+  sed 's/^/ | /' stderr >&2
+}
+
+AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
+
+source_defs=". '$am_top_builddir/defs'"
+
+if $SHELL -c "$source_defs" dummy.test 2>stderr; then
+  show_stderr
+  Exit 1
+else
+  show_stderr
+  grep 'defs-static: not found in current directory' stderr
+fi
+
+sed 's|^am_top_srcdir=.*|am_top_srcdir=foo|' \
+  "$am_top_builddir"/defs-static > defs-static
+if $SHELL -c "$source_defs" t/dummy.test 2>stderr; then
+  show_stderr
+  Exit 1
+else
+  show_stderr
+  grep 'foo/defs-static\.in not found.*check \$am_top_srcdir' stderr
+fi
+
+sed 's|^am_top_builddir=.*|am_top_builddir=foo|' \
+  "$am_top_builddir"/defs-static > defs-static
+if $SHELL -c "$source_defs" t/dummy.test 2>stderr; then
+  show_stderr
+  Exit 1
+else
+  show_stderr
+  grep 'foo/defs-static not found.*check \$am_top_builddir' stderr
+fi
+
+# We still need a little hack to make ./defs work outside automake's
+# tree 'tests' subdirectory.  Not a big deal.
+sed "s|^am_top_builddir=.*|am_top_builddir='`pwd`'|" \
+  "$am_top_builddir"/defs-static > defs-static
+# Redefining *srcdir and *builddir variables in the environment shouldn't
+# cause problems
+env \
+  builddir=bad-dir srcdir=bad-dir \
+  top_builddir=bad-dir top_srcdir=bad-dir \
+  abs_builddir=bad-dir abs_srcdir=bad-dir \
+  abs_top_builddir=bad-dir abs_top_srcdir=bad-dir \
+  $SHELL -c "$source_defs && echo '!OK!' > ../foo" t/dummy.test
+$FGREP '!OK!' t/foo
+
+:
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
new file mode 100755
index 0000000..a92230e
--- /dev/null
+++ b/t/self-check-seq.tap
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check the 'seq_' subroutine.
+
+. ./defs || Exit 1
+
+plan_ 14
+
+unset stderr_fileno_ || :
+
+check_work ()
+{
+  desc=$1 args=$2 exp=$3
+  st=0; got=`seq_ $args` || st=$?
+  command_ok_ "$desc [exit status = 0]" test $st -eq 0
+  command_ok_ "$desc [output]" test x"$exp" = x"$got"
+}
+
+check_work 'one-argument form' '5' "\
+1
+2
+3
+4
+5"
+
+check_work 'two-arguments form' '7 11' "\
+7
+8
+9
+10
+11"
+
+check_work 'three-arguments form (1)' '120 5 135' "\
+120
+125
+130
+135"
+
+check_work 'three-arguments form (1)' '13 4 23' "\
+13
+17
+21"
+
+check_err ()
+{
+  desc=$1 args=$2 err=$3
+  (seq_ $args) >output || st=$?
+  # Protect content emitted on stdout/stderr, to avoid sending to the
+  # TAP driver possible "Bail out!" directives generated by 'seq_'.
+  # Use 'grep -c' below for the same reason.
+  sed 's/^/: /' output
+  command_ok_ "$desc [exit status = 99]" test $st -eq 99
+  command_ok_ "$desc [error message]" grep -c "seq_: $err" output
+}
+
+check_err 'no argument is an error' '' 'missing argument'
+check_err 'four arguments is an error' '1 1 2 1' 'too many arguments'
+check_err 'six arguments is an error' '1 1 1 1 1 1' 'too many arguments'
+
+:
diff --git a/t/self-check-tap.sh b/t/self-check-tap.sh
new file mode 100755
index 0000000..6a2d132
--- /dev/null
+++ b/t/self-check-tap.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Make sure that $am_using_tap gets automatically defined by
+# './defs-static', but can be overridden by the individual tests.
+
+. ./defs-static || exit 1
+
+set -ex
+
+$SHELL -c '. ./defs-static && test $am_using_tap = yes' foo.tap
+$SHELL -c '. ./defs-static && test $am_using_tap = no'  foo.test
+$SHELL -c '. ./defs-static && test $am_using_tap = no'  tap
+$SHELL -c '. ./defs-static && test $am_using_tap = no'  tap.test
+$SHELL -c '. ./defs-static && test $am_using_tap = no'  foo-tap
+
+$SHELL -c '
+  am_using_tap=no
+  . ./defs-static
+  test $am_using_tap = no
+' foo.tap
+
+$SHELL -c '
+  am_using_tap=yes
+  . ./defs-static
+  test $am_using_tap = yes
+' foo.test
+
+:
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
new file mode 100755
index 0000000..3591656
--- /dev/null
+++ b/t/self-check-unindent.tap
@@ -0,0 +1,255 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Sanity check for the automake testsuite.
+# Check the 'unindent' subroutine.
+
+. ./defs || Exit 1
+
+plan_ 22
+
+#------------------------------------------------------------------
+
+will_test () { tst=$*; }
+
+do_check ()
+{
+  command_ok_ "$tst [simple, exit status]" \
+              eval 'unindent input > got'
+  command_ok_ "$tst [simple, output]" \
+              diff exp got
+  command_ok_ "$tst [parallel, exit status]" \
+              eval 'unindent input | unindent > got'
+  command_ok_ "$tst [parallel, output]" \
+              diff exp got
+}
+
+#------------------------------------------------------------------
+
+will_test 'leading spaces'
+
+cat > input <<END
+  1
+   2
+3
+ 4
+${tab}5
+${tab}  6
+  6${sp}
+7${sp}
+  8${sp}${sp}
+9${sp}${sp}
+  10${tab}
+11${tab}
+  12${sp}${tab}
+13${sp}${tab}
+  14 this${tab}with${tab}multiple fields${sp}
+15 and   ${tab}${tab}this too${tab}
+ 16 and also this
+${sp}${sp}
+${sp}
+${tab}
+
+last line
+END
+
+cat > exp <<END
+1
+ 2
+3
+ 4
+${tab}5
+${tab}  6
+6${sp}
+7${sp}
+8${sp}${sp}
+9${sp}${sp}
+10${tab}
+11${tab}
+12${sp}${tab}
+13${sp}${tab}
+14 this${tab}with${tab}multiple fields${sp}
+15 and   ${tab}${tab}this too${tab}
+ 16 and also this
+
+${sp}
+${tab}
+
+last line
+END
+
+do_check
+
+#------------------------------------------------------------------
+
+will_test 'leading tab'
+
+cat > input <<END
+${tab}1
+${tab} 2
+3
+ 4
+  5
+    6
+        7
+ ${tab}8
+${tab}${tab}9
+${tab}10${tab}
+${tab}11${sp}
+12${tab}
+13${sp}
+${tab}14 this  with${tab}multiple fields${sp}
+15 and   ${tab}${tab}this too${tab}
+ 16 and also this
+${tab}
+${sp}
+${sp}${tab}
+
+last line
+END
+
+cat > exp <<END
+1
+ 2
+3
+ 4
+  5
+    6
+        7
+ ${tab}8
+${tab}9
+10${tab}
+11${sp}
+12${tab}
+13${sp}
+14 this  with${tab}multiple fields${sp}
+15 and   ${tab}${tab}this too${tab}
+ 16 and also this
+
+${sp}
+${sp}${tab}
+
+last line
+END
+
+do_check "leading tab"
+
+#------------------------------------------------------------------
+
+will_test 'no leading whitespace'
+
+cat > input <<END
+1
+ 2
+  3
+        4
+${tab}5
+${tab} 6
+ ${tab}7
+${tab}${tab}8
+9${sp}
+ 10${tab}
+${tab}10${sp}${sp}
+14 this with${tab}multiple  fields${sp}
+ 15 and this too${tab}
+${tab}16 and also this
+${tab}
+${sp}
+
+last line
+END
+
+cp input exp
+
+do_check
+
+#------------------------------------------------------------------
+
+will_test 'leading empty lines ignored (1)'
+
+cat > input <<END
+
+
+ foo
+ bar
+   quux
+END
+
+cat > exp <<END
+
+
+foo
+bar
+  quux
+END
+
+do_check
+
+#------------------------------------------------------------------
+
+will_test 'leading empty lines ignored (2)'
+
+cat > input <<END
+
+
+foo
+bar
+   quux
+END
+
+cat > exp <<END
+
+
+foo
+bar
+   quux
+END
+
+do_check
+
+#------------------------------------------------------------------
+
+will_test 'more elaborated parallel use'
+
+cat > input <<END
+  x
+  ${tab}y
+  z
+  ${tab}a
+  ${tab} b
+${tab}c
+   ${tab}d
+ ${tab}e
+  ${tab}${tab}f
+END
+
+cat > exp <<END
+y
+z
+a
+ b
+c
+ ${tab}d
+ ${tab}e
+${tab}f
+END
+
+command_ok_ "$tst [exit status]" \
+            eval 'unindent input | sed 1d | unindent > got'
+
+command_ok_ "$tst [output]" diff exp got
+
+:
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
new file mode 100755
index 0000000..680513f
--- /dev/null
+++ b/t/serial-tests.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Option 'serial-tests'.
+
+# To avoid useless generation of a sibling test.
+am_parallel_tests=yes
+am_create_testdir=empty
+. ./defs || Exit 1
+
+hasnt_parallel_tests ()
+{
+  $EGREP 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && Exit 1
+  grep 'recheck.*:' $1 && Exit 1
+  grep '^check-TESTS: \$(TESTS)$' $1
+}
+
+has_parallel_tests ()
+{
+  $EGREP '(^| )check-TESTS.*:' $1
+  $EGREP '(^| )recheck.*:' $1
+  grep '^\$(TEST_SUITE_LOG): \$(TEST_LOGS)$' $1
+  grep '^\.test\.log:$' $1
+}
+
+mkdir one two
+
+cat >> one/configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([serial-tests])
+AC_CONFIG_FILES([Makefile])
+END
+
+echo 'TESTS = foo.test bar.test' > one/Makefile.am
+
+cat >> two/configure.ac <<END
+AC_INIT([$me], [2.0])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([parallel-tests])
+AC_CONFIG_FILES([aMakefile bMakefile])
+END
+
+cp one/Makefile.am two/aMakefile.am
+cat - one/Makefile.am > two/bMakefile.am <<END
+AUTOMAKE_OPTIONS = serial-tests
+END
+
+cd one
+touch missing install-sh
+$ACLOCAL
+$AUTOMAKE
+grep TEST Makefile.in # For debugging.
+hasnt_parallel_tests Makefile.in
+test ! -r test-driver
+cd ..
+
+cd two
+mkdir config
+$ACLOCAL
+$AUTOMAKE --add-missing
+grep TEST [ab]Makefile.in # For debugging.
+has_parallel_tests aMakefile.in
+hasnt_parallel_tests bMakefile.in
+mv aMakefile.in aMakefile.sav
+mv bMakefile.in bMakefile.sav
+test ! -r test-driver
+test -f config/test-driver
+$AUTOMAKE
+diff aMakefile.sav aMakefile.in
+diff bMakefile.sav bMakefile.in
+cd ..
+
+:
diff --git a/t/silent-amopts.sh b/t/silent-amopts.sh
new file mode 100755
index 0000000..f71ad13
--- /dev/null
+++ b/t/silent-amopts.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake complaints if the 'silent-rules' option is
+# used in AUTOMAKE_OPTIONS.
+
+. ./defs || Exit 1
+
+echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep "^Makefile\.am:1:.*'silent-rules'.*AM_INIT_AUTOMAKE" stderr
+
+:
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
new file mode 100755
index 0000000..813753b
--- /dev/null
+++ b/t/silent-configsite.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the user can control default mode of silent-rules
+# from config.site, and that this default can be overridden from
+# either the ./configure or make command line.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+.PHONY: test-silent test-nosilent
+test-silent:
+       test x'$(AM_DEFAULT_VERBOSITY)' = x'0'
+test-nosilent:
+       test x'$(AM_DEFAULT_VERBOSITY)' = x'1'
+EOF
+
+unset enable_silent_rules || :
+
+: 'No explicit default in configure.ac, enable by default in config.site'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+echo "enable_silent_rules=\${enable_silent_rules-yes}" > config.site
+CONFIG_SITE=./config.site ./configure
+$MAKE test-silent
+$MAKE distclean
+# Command line should win over default values in config.site.
+CONFIG_SITE=./config.site ./configure --disable-silent-rules
+$MAKE test-nosilent
+$MAKE distclean
+
+: 'Disable by default in configure.ac, enable by default in config.site'
+
+sed 's/^AM_SILENT_RULES/&([no])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+echo "enable_silent_rules=\${enable_silent_rules-yes}" > config.site
+CONFIG_SITE=./config.site ./configure
+$MAKE test-silent
+# Command line should win over default values in config.site.
+$MAKE distclean
+CONFIG_SITE=./config.site ./configure --disable-silent-rules
+$MAKE test-nosilent
+$MAKE distclean
+
+: 'Enable by default in configure.ac, disable by default in config.site'
+
+sed 's/^AM_SILENT_RULES/&([yes])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+echo "enable_silent_rules=\${enable_silent_rules-no}" > config.site
+CONFIG_SITE=./config.site ./configure
+$MAKE test-nosilent
+$MAKE distclean
+# Command line should win over default values in config.site.
+CONFIG_SITE=./config.site ./configure --enable-silent-rules
+$MAKE test-silent
+$MAKE distclean
+
+:
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
new file mode 100755
index 0000000..2838d6e
--- /dev/null
+++ b/t/silent-lex.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Lex.
+
+required=lex
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_LEX
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.l
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_LFLAGS = -n
+foo2_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+LDADD = $(LEXLIB)
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.l
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_LFLAGS = -n
+bar2_CFLAGS = $(AM_CFLAGS)
+LDADD = $(LEXLIB)
+EOF
+
+cat > foo.l <<'EOF'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+.
+%%
+/* Avoid possible link errors. */
+int yywrap (void) { return 1; }
+int   main (void) { return 0; }
+EOF
+cp foo.l sub/bar.l
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Ensure per-target rules are used, to ensure their coverage below.
+$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'LEX .*foo\.' stdout
+grep 'LEX .*bar\.' stdout
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for LEX, as probably lex hasn't been re-run.
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE clean
+rm -f *foo.c sub/*bar.c
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+
+:
diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh
new file mode 100755
index 0000000..8b457ca
--- /dev/null
+++ b/t/silent-many-gcc.sh
@@ -0,0 +1,241 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, with gcc depmode and many languages at once.
+# This test partly overlaps with other silent*.test, but it serves as
+# a stress test by using many different languages at once -- so don't
+# remove this test script.
+# This test requires the GNU compilers; keep it in sync with sister test
+# 'silent-many-generic.test', which should work with generic compilers.
+
+required='gcc g++ gfortran lex yacc'
+. ./defs || Exit 1
+
+# Avoids too much code duplication.
+do_and_check_silent_build ()
+{
+  case $1 in
+    --rebuild) rebuild=true;;
+            *) rebuild=false;;
+  esac
+
+  $MAKE >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  # Avoid spurious failures with SunStudio Fortran compilers.
+  sed '/^NOTICE:/d' stdout > t
+  mv -f t stdout
+  cat stdout
+
+  $EGREP ' (-c|-o)' stdout && Exit 1
+  $EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+  grep 'CXX .*foo1\.' stdout
+  grep 'CXX .*baz1\.' stdout
+  grep 'FC .*foo2\.'  stdout
+  grep 'FC .*baz2\.'  stdout
+  grep 'F77 .*foo3\.' stdout
+  grep 'F77 .*baz3\.' stdout
+  grep ' CC .*foo5\.' stdout
+  grep ' CC .*baz5\.' stdout
+  grep ' CC .*foo6\.' stdout
+  grep ' CC .*baz6\.' stdout
+
+  grep 'CXXLD .*foo' stdout
+  grep 'CCLD .*bar'  stdout
+  grep 'CXXLD .*baz' stdout
+  grep 'CCLD .*bla'  stdout
+
+  if $rebuild; then :; else
+    grep 'YACC .*foo6\.' stdout
+    grep 'YACC .*baz6\.' stdout
+    grep 'LEX .*foo5\.'  stdout
+    grep 'LEX .*baz5\.'  stdout
+  fi
+
+  unset rebuild
+}
+
+# Avoids too much code duplication.
+do_and_check_verbose_build ()
+{
+  case $1 in
+    --rebuild) rebuild=true;;
+            *) rebuild=false;;
+  esac
+
+  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  grep ' -c ' stdout
+  grep ' -o ' stdout
+
+  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+
+  if $rebuild; then :; else
+    grep 'ylwrap ' stdout
+    $EGREP '(LEX|YACC) ' stdout && Exit 1
+  fi
+
+  unset rebuild
+}
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_PROG_F77
+AC_PROG_FC
+AC_PROG_LEX
+AC_PROG_YACC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo bar fo2
+bar_CFLAGS = $(AM_CFLAGS)
+foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
+fo2_SOURCES = $(foo_SOURCES)
+fo2_CPPFLAGS = $(AM_CPPFLAGS)
+fo2_FFLAGS = $(AM_FFLAGS)
+fo2_FCFLAGS = $(AM_FCFLAGS)
+fo2_YFLAGS = -v
+fo2_LFLAGS = -n
+SUBDIRS = sub
+AM_YFLAGS = -d
+LDADD = $(LEXLIB)
+BUILT_SOURCES = foo6.h
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = baz bla ba2
+bla_CFLAGS = $(AM_CFLAGS)
+baz_SOURCES = baz1.cpp baz2.f90 baz3.f baz5.l baz6.y
+ba2_SOURCES = $(baz_SOURCES)
+ba2_CPPFLAGS = $(AM_CPPFLAGS)
+ba2_FFLAGS = $(AM_FFLAGS)
+ba2_FCFLAGS = $(AM_FCFLAGS)
+ba2_YFLAGS = -v
+ba2_LFLAGS = -n
+AM_YFLAGS = -d
+LDADD = $(LEXLIB)
+BUILT_SOURCES = baz6.h
+EOF
+
+cat > foo1.cpp <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cat > foo2.f90 <<'EOF'
+      subroutine foo2
+      return
+      end
+EOF
+cat > foo3.f <<'EOF'
+      subroutine foo3
+      return
+      end
+EOF
+cat > foo5.l <<'EOF'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+.
+%%
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+EOF
+cat > foo6.y <<'EOF'
+%{
+void yyerror (char *s) {}
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+cp foo1.cpp bar.c
+cp foo1.cpp sub/baz.c
+cp foo1.cpp sub/bla.c
+cp foo1.cpp sub/baz1.cpp
+cp foo2.f90 sub/baz2.f90
+cp foo3.f sub/baz3.f
+cp foo5.l sub/baz5.l
+cp foo6.y sub/baz6.y
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Sanity check: make sure the cache variables we force are really
+# used by configure.
+$FGREP am_cv_CC_dependencies_compiler_type configure
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+# Ensure per-target rules are used, to ensure their coverage below.
+# (We do not do an exhaustive check, that wouldn't be practical).
+$FGREP 'bar-bar.o' Makefile.in
+$FGREP 'fo2-foo5.c' Makefile.in
+$FGREP 'fo2-foo6.c' Makefile.in
+
+# Force gcc ("fast") depmode.
+depmodes="am_cv_CC_dependencies_compiler_type=gcc \
+          am_cv_CXX_dependencies_compiler_type=gcc"
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test 'silent-many-generic.test'.
+for config_args in \
+  "$depmodes"
+do
+
+  ./configure $config_args --enable-silent-rules
+
+  do_and_check_silent_build
+  # Cleaning and then rebuilding with the same V flag (and without
+  # removing the generated sources in between) shouldn't trigger a
+  # different set of rules.
+  $MAKE clean
+  do_and_check_silent_build --rebuild
+
+  # Ensure a clean rebuild.
+  $MAKE clean
+  # This is required, since these files are not removed by 'make clean'
+  # (as dictated by the GNU Coding Standards).
+  rm -f *foo5.c *foo6.[ch] sub/*baz5.c sub/*baz6.[ch]
+
+  do_and_check_verbose_build
+  # Cleaning and then rebuilding with the same V flag (and without
+  # removing the generated sources in between) shouldn't trigger a
+  # different set of rules.
+  $MAKE clean
+  do_and_check_verbose_build --rebuild
+
+  # Ensure a clean reconfiguration/rebuild.
+  $MAKE clean
+  $MAKE maintainer-clean
+
+done
+
+:
diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh
new file mode 100755
index 0000000..3949009
--- /dev/null
+++ b/t/silent-many-generic.sh
@@ -0,0 +1,266 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, with many languages at once.
+# This test partly overlaps with other silent*.test, but it serves as
+# a stress test by using many different languages at once -- so don't
+# remove this test script.
+# This test should work with generic compilers; keep it in sync with
+# sister test 'silent-many-gcc.test', which requires the GNU compilers
+# and forces the use of gcc depmode.
+
+required='cc c++ fortran fortran77 lex yacc'
+. ./defs || Exit 1
+
+# Avoids too much code duplication.
+do_and_check_silent_build ()
+{
+  case $1 in
+    --rebuild) rebuild=true;;
+            *) rebuild=false;;
+  esac
+
+  $MAKE >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  # Avoid spurious failures with SunStudio Fortran compilers.
+  sed '/^NOTICE:/d' stdout > t
+  mv -f t stdout
+  cat stdout
+
+  $EGREP ' (-c|-o)' stdout && Exit 1
+  $EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+  grep 'CXX .*foo1\.' stdout
+  grep 'CXX .*baz1\.' stdout
+  grep 'FC .*foo2\.'  stdout
+  grep 'FC .*baz2\.'  stdout
+  grep 'F77 .*foo3\.' stdout
+  grep 'F77 .*baz3\.' stdout
+  grep ' CC .*foo5\.' stdout
+  grep ' CC .*baz5\.' stdout
+  grep ' CC .*foo6\.' stdout
+  grep ' CC .*baz6\.' stdout
+
+  grep 'CXXLD .*foo' stdout
+  grep 'CCLD .*bar'  stdout
+  grep 'CXXLD .*baz' stdout
+  grep 'CCLD .*bla'  stdout
+
+  if $rebuild; then :; else
+    grep 'YACC .*foo6\.' stdout
+    grep 'YACC .*baz6\.' stdout
+    grep 'LEX .*foo5\.'  stdout
+    grep 'LEX .*baz5\.'  stdout
+  fi
+
+  unset rebuild
+}
+
+# Avoids too much code duplication.
+do_and_check_verbose_build ()
+{
+  case $1 in
+    --rebuild) rebuild=true;;
+            *) rebuild=false;;
+  esac
+
+  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  grep ' -c ' stdout
+  grep ' -o ' stdout
+
+  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+
+  if $rebuild; then :; else
+    grep 'ylwrap ' stdout
+    $EGREP '(LEX|YACC) ' stdout && Exit 1
+  fi
+
+  unset rebuild
+}
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_F77
+AC_PROG_FC
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_CXX
+
+# FIXME: remove this hack once the requirements c++, fortran and fortran77
+# are implemented correctly.
+test -n "`echo $CXX`" || AC_MSG_ERROR([C++ compiler not found], [77])
+test -n "`echo $FC`"  || AC_MSG_ERROR([Fortran compiler not found], [77])
+test -n "`echo $F77`" || AC_MSG_ERROR([Fortran 77 compiler not found], [77])
+
+# The SunStudio C++ compiler is unfortunately named 'sunCC' (or even just
+# 'CC', yuck!); similarly and the Portland group C++ compiler is named
+# 'pgCC'.  This can cause problems with our grepping checks on the output
+# from make.  Avoid these problems by invoking a wrapper script, as
+# filtering the make output proved too fragile.
+case " $CXX " in
+  *'CC '*)
+    AC_MSG_WARN([the C++ compiler '$CXX' name ends with 'CC'])
+    AC_MSG_WARN([it will be wrapped with the custom script 'am--cxx'])
+    echo '#!/bin/sh' > bin/am--cxx
+    echo 'PATH=$saved_PATH; export PATH' >> bin/am--cxx
+    echo "case \$# in" >> bin/am--cxx
+    echo "  0) exec $CXX ;;" >> bin/am--cxx
+    echo "  *) exec $CXX \"address@hidden" ;;" >> bin/am--cxx
+    echo "esac" >> bin/am--cxx
+    chmod a+x bin/am--cxx
+    CXX=am--cxx
+esac
+
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo bar fo2
+bar_CFLAGS = $(AM_CFLAGS)
+foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
+fo2_SOURCES = $(foo_SOURCES)
+fo2_CPPFLAGS = $(AM_CPPFLAGS)
+fo2_FFLAGS = $(AM_FFLAGS)
+fo2_FCFLAGS = $(AM_FCFLAGS)
+fo2_YFLAGS = -v
+fo2_LFLAGS = -n
+SUBDIRS = sub
+AM_YFLAGS = -d
+LDADD = $(LEXLIB)
+BUILT_SOURCES = foo6.h
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = baz bla ba2
+bla_CFLAGS = $(AM_CFLAGS)
+baz_SOURCES = baz1.cpp baz2.f90 baz3.f baz5.l baz6.y
+ba2_SOURCES = $(baz_SOURCES)
+ba2_CPPFLAGS = $(AM_CPPFLAGS)
+ba2_FFLAGS = $(AM_FFLAGS)
+ba2_FCFLAGS = $(AM_FCFLAGS)
+ba2_YFLAGS = -v
+ba2_LFLAGS = -n
+AM_YFLAGS = -d
+LDADD = $(LEXLIB)
+BUILT_SOURCES = baz6.h
+EOF
+
+cat > foo1.cpp <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cat > foo2.f90 <<'EOF'
+      subroutine foo2
+      return
+      end
+EOF
+cat > foo3.f <<'EOF'
+      subroutine foo3
+      return
+      end
+EOF
+cat > foo5.l <<'EOF'
+%{
+#define YY_NO_UNISTD_H 1
+%}
+%%
+"END"   return EOF;
+.
+%%
+/* Avoid possible link errors. */
+int yywrap (void)
+{
+  return 1;
+}
+EOF
+cat > foo6.y <<'EOF'
+%{
+void yyerror (char *s) {}
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+cp foo1.cpp bar.c
+cp foo1.cpp sub/baz.c
+cp foo1.cpp sub/bla.c
+cp foo1.cpp sub/baz1.cpp
+cp foo2.f90 sub/baz2.f90
+cp foo3.f sub/baz3.f
+cp foo5.l sub/baz5.l
+cp foo6.y sub/baz6.y
+
+mkdir bin
+saved_PATH=$PATH; export saved_PATH
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Ensure per-target rules are used, to ensure their coverage below.
+# (We do not do an exhaustive check, that wouldn't be practical).
+$FGREP 'bar-bar.o' Makefile.in
+$FGREP 'fo2-foo5.c' Makefile.in
+$FGREP 'fo2-foo6.c' Makefile.in
+
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected.  Try also with dependency tracking
+# explicitly disabled.
+for config_args in \
+  --enable-dependency-tracking --disable-dependency-tracking
+do
+
+  ./configure $config_args --enable-silent-rules
+
+  do_and_check_silent_build
+  # Cleaning and then rebuilding with the same V flag (and without
+  # removing the generated sources in between) shouldn't trigger a
+  # different set of rules.
+  $MAKE clean
+  do_and_check_silent_build --rebuild
+
+  # Ensure a clean rebuild.
+  $MAKE clean
+  # This is required, since these files are not removed by 'make clean'
+  # (as dictated by the GNU Coding Standards).
+  rm -f *foo5.c *foo6.[ch] sub/*baz5.c sub/*baz6.[ch]
+
+  do_and_check_verbose_build
+  # Cleaning and then rebuilding with the same V flag (and without
+  # removing the generated sources in between) shouldn't trigger a
+  # different set of rules.
+  $MAKE clean
+  do_and_check_verbose_build --rebuild
+
+  # Ensure a clean reconfiguration/rebuild.
+  $MAKE clean
+  $MAKE maintainer-clean
+
+done
+
+:
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
new file mode 100755
index 0000000..c579e2c
--- /dev/null
+++ b/t/silent-nested-vars.sh
@@ -0,0 +1,147 @@
+#!/bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, on 'make' implementations that do not
+# support nested variables (Bug#9928, Bug#10237).
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo bar
+bar_CFLAGS = $(AM_CFLAGS)
+
+# Check that AM_V and AM_DEFAULT_V work as advertised.
+pkg_verbose = $(address@hidden@)
+pkg_verbose_ = $(address@hidden@)
+pkg_verbose_0 = @echo PKG-GEN $@;
+
+bin_SCRIPTS = oop
+oop:
+       $(pkg_verbose)echo $@ >$@
+
+mostlyclean-local:
+       rm -f oop
+EOF
+
+cat > foo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp foo.c bar.c
+
+cat >mymake <<'EOF'
+#! /bin/sh
+makerules=
+
+case $1 in
+  -f)
+    makefile=$2
+    case $2 in
+      -) makerules=`cat` || exit ;;
+    esac ;;
+  *)
+    for makefile in makefile Makefile; do
+      test -f $makefile && break
+    done ;;
+esac
+
+nested_var_pat='^[^#].*\$([^)]*\$'
+if
+  case $makefile in
+    -) printf '%s\n' "$makerules" | grep "$nested_var_pat";;
+    *) grep "$nested_var_pat" $makefile;;
+  esac
+then
+  echo >&2 "mymake: $makefile contains nested variables"
+  exit 1
+fi
+
+case $makefile in
+  -) printf '%s\n' "$makerules" | $mymake_MAKE "$@";;
+  *) exec $mymake_MAKE "$@";;
+esac
+EOF
+chmod a+x mymake
+mymake_MAKE=${MAKE-make}
+MAKE=./mymake
+export MAKE mymake_MAKE
+
+# As a sanity check, verify that 'mymake' rejects Makefiles that
+# use nested variables.
+cat > Makefile <<'END'
+a = $(b$(c))
+all:
+       touch bar
+END
+$MAKE && Exit 99
+mv -f Makefile foo.mk
+$MAKE -f foo.mk && Exit 99
+cat foo.mk | $MAKE -f - && Exit 99
+test -f bar && Exit 99
+sed '/a =/d' foo.mk > Makefile
+$MAKE && test -f bar || Exit 99
+rm -f bar Makefile foo.mk
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
+  stdout
+$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
+grep '^AM_V_CC =  *\$(am__v_CC_0) *$' Makefile
+grep '^AM_V_GEN =  *\$(am__v_GEN_0) *$' Makefile
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep 'echo .*oop' stdout && Exit 1
+grep 'CC .*foo\.' stdout
+grep 'CC .*bar\.' stdout
+grep 'CCLD .*foo' stdout
+grep 'CCLD .*bar' stdout
+grep 'PKG-GEN .*oop' stdout
+$MAKE distclean
+
+./configure --disable-silent-rules > stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
+  stdout
+$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
+grep '^AM_V_CC =  *\$(am__v_CC_1) *$' Makefile
+grep '^AM_V_GEN =  *\$(am__v_GEN_1) *$' Makefile
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o foo' stdout
+grep ' -o bar' stdout
+grep 'echo .*>oop' stdout
+$EGREP '(CC|LD) ' stdout && Exit 1
+
+:
diff --git a/t/silent-nowarn.sh b/t/silent-nowarn.sh
new file mode 100755
index 0000000..5a547bc
--- /dev/null
+++ b/t/silent-nowarn.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the 'silent-rules' mode suppresses the warnings for recursive
+# make variable expansions.  This should happen regardless of whether and
+# where these warnings are requested.
+
+. ./defs || Exit 1
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+# Yes, we repeat the warnings two times, both before and after
+# 'silent-rules'.  This is deliberate.
+AM_INIT_AUTOMAKE([gnu -Wall -Wportability-recursive
+                      silent-rules
+                      -Wall -Wportability-recursive])
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = gnu -Wall -Wportability-recursive
+foo = $($(v)) $(x$(v)) $($(v)x) $(y$(v)z)
+END
+
+# Files required bu gnu strictness.
+touch AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS
+
+$ACLOCAL
+$AUTOMAKE --gnu -Wall -Wportability-recursive
+
+:
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
new file mode 100755
index 0000000..55ba247
--- /dev/null
+++ b/t/silent-yacc-headers.sh
@@ -0,0 +1,173 @@
+#!/bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Yacc, when yacc-generated headers are
+# involved (i.e., the '-d' option is in *YFLAGS).
+
+required=yacc
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_YACC
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+AM_YFLAGS = -d
+bin_PROGRAMS = foo bar
+foo_SOURCES = parse.y
+bar_SOURCES = $(foo_SOURCES)
+bar_YFLAGS = $(AM_YFLAGS)
+EOF
+
+cat > parse.y <<'EOF'
+%{
+void yyerror (char *s) { return; }
+int yylex (void) { return 0; }
+int main (void) { return 0; }
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Check that the expected non-generic rules has been truly generated.
+# Otherwise, the coverage offered by this test will be weaker then
+# expected and planned.
+$FGREP 'bar-parse.c' Makefile.in
+$FGREP '$(bar_YFLAGS)' Makefile.in
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC  *parse\.c' stdout
+grep 'updating  *parse\.h' stdout
+grep 'YACC  *bar-parse\.c' stdout
+grep 'updating  *bar-parse\.h' stdout
+
+grep ' CC  *parse\.' stdout
+grep ' CC  *bar-parse\.' stdout
+grep 'CCLD  *foo' stdout
+grep 'CCLD  *bar' stdout
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC  *parse\.c' stdout
+grep 'updating  *parse\.h' stdout
+grep 'YACC  *bar-parse\.c' stdout
+grep 'updating  *bar-parse\.h' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for "YACC *.c" and "updating *.h", as yacc shouldn't
+# have been re-run.
+grep ' CC  *parse\.' stdout
+grep ' CC  *bar-parse\.' stdout
+grep 'CCLD  *foo' stdout
+grep 'CCLD  *bar' stdout
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-d|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC  *parse\.c' stdout
+grep 'updating  *parse\.h' stdout
+grep 'YACC  *bar-parse\.c' stdout
+grep 'updating  *bar-parse\.h' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE maintainer-clean
+
+./configure --enable-silent-rules
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+grep 'YACC' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Check recovering from header removal.
+rm -f parse.h bar-parse.h
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -d ' stdout
+grep 'ylwrap ' stdout
+
+grep 'YACC' stdout && Exit 1
+
+:
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
new file mode 100755
index 0000000..35415bf
--- /dev/null
+++ b/t/silent-yacc.sh
@@ -0,0 +1,136 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Yacc.
+# Keep this in sync with sister test 'silent-yacc-gcc.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.y
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_YFLAGS = -v
+foo2_CFLAGS = $(AM_CPPFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.y
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_YFLAGS = -v
+bar2_CFLAGS = $(AM_CPPFLAGS)
+EOF
+
+cat > foo.y <<'EOF'
+%{
+void yyerror (char *s) { return; }
+int yylex (void) { return 0; }
+int main (void) { return 0; }
+%}
+%token EOF
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
+EOF
+cp foo.y sub/bar.y
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Ensure per-target rules are used, to ensure their coverage below.
+$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99
+
+./configure --enable-silent-rules
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+grep 'YACC .*foo\.' stdout
+grep 'YACC .*bar\.' stdout
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+$EGREP '(mv|ylwrap) ' stdout && Exit 1
+
+# Don't look for YACC, as probably yacc hasn't been re-run.
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep 'CCLD .*foo1' stdout
+grep 'CCLD .*bar1' stdout
+grep 'CCLD .*foo2' stdout
+grep 'CCLD .*bar2' stdout
+
+# Ensure a truly clean rebuild.
+$MAKE clean
+rm -f *foo.[ch] sub/*bar.[ch]
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+grep 'ylwrap ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+# Cleaning and then rebuilding with the same V flag (and without
+# removing the generated sources in between) shouldn't trigger a
+# different set of rules.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+# Don't look for ylwrap, as probably lex hasn't been re-run.
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+
+:
diff --git a/t/silent.sh b/t/silent.sh
new file mode 100755
index 0000000..f914c44
--- /dev/null
+++ b/t/silent.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, without libtool, standard depmode case.
+
+# Please keep this file in sync with silent2.test.
+
+required=cc
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo bar
+bar_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = baz bla
+bla_CFLAGS = $(AM_CFLAGS)
+EOF
+
+cat > foo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp foo.c bar.c
+cp foo.c sub/baz.c
+cp foo.c sub/bla.c
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep 'CC    .*foo\.' stdout
+grep 'CC .*bar\.' stdout
+grep 'CC .*baz\.' stdout
+grep 'CC .*bla\.' stdout
+grep 'CCLD .*foo' stdout
+grep 'CCLD .*bar' stdout
+grep 'CCLD .*baz' stdout
+grep 'CCLD .*bla' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o foo' stdout
+$EGREP '(CC|LD) ' stdout && Exit 1
+
+:
diff --git a/t/silent2.sh b/t/silent2.sh
new file mode 100755
index 0000000..6565a27
--- /dev/null
+++ b/t/silent2.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, without libtool, non-fastdep case
+# (so that, with GCC, we also cover the other code paths in depend2).
+
+# Please keep this file in sync with silent.test.
+
+required=gcc
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo bar
+bar_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = baz bla
+bla_CFLAGS = $(AM_CFLAGS)
+EOF
+
+cat > foo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp foo.c bar.c
+cp foo.c sub/baz.c
+cp foo.c sub/bla.c
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep 'CC .*foo\.' stdout
+grep 'CC .*bar\.' stdout
+grep 'CC .*baz\.' stdout
+grep 'CC .*bla\.' stdout
+grep 'CCLD .*foo' stdout
+grep 'CCLD .*bar' stdout
+grep 'CCLD .*baz' stdout
+grep 'CCLD .*bla' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o foo' stdout
+$EGREP '(CC|LD) ' stdout && Exit 1
+
+:
diff --git a/t/silent3.sh b/t/silent3.sh
new file mode 100755
index 0000000..564a490
--- /dev/null
+++ b/t/silent3.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, with libtool, standard depmode case.
+
+# Please keep this file in sync with silent4.test and silent9.test.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libfoo.la libbar.la
+libbar_la_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libbaz.la libbla.la
+libbla_la_CFLAGS = $(AM_CFLAGS)
+EOF
+
+cat > libfoo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp libfoo.c libbar.c
+cp libfoo.c sub/libbaz.c
+cp libfoo.c sub/libbla.c
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep ' CC .*baz\.' stdout
+grep ' CC .*bla\.' stdout
+grep ' CCLD .*foo' stdout
+grep ' CCLD .*bar' stdout
+grep ' CCLD .*baz' stdout
+grep ' CCLD .*bla' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o libfoo' stdout
+# The libtool command line can contain e.g. a '--tag=CC' option.
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+
+:
diff --git a/t/silent4.sh b/t/silent4.sh
new file mode 100755
index 0000000..44b7eb3
--- /dev/null
+++ b/t/silent4.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, with libtool, non-fastdep case
+# (so that, with GCC, we also cover the other code paths in depend2).
+
+# Please keep this file in sync with silent3.test and silent9.test.
+
+required="libtoolize gcc"
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libfoo.la libbar.la
+libbar_la_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libbaz.la libbla.la
+libbla_la_CFLAGS = $(AM_CFLAGS)
+EOF
+
+cat > libfoo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp libfoo.c libbar.c
+cp libfoo.c sub/libbaz.c
+cp libfoo.c sub/libbla.c
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep ' CC .*baz\.' stdout
+grep ' CC .*bla\.' stdout
+grep ' CCLD .*foo' stdout
+grep ' CCLD .*bar' stdout
+grep ' CCLD .*baz' stdout
+grep ' CCLD .*bla' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o libfoo' stdout
+# The libtool command line can contain e.g. a '--tag=CC' option.
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+
+:
diff --git a/t/silent6.sh b/t/silent6.sh
new file mode 100755
index 0000000..280d25a
--- /dev/null
+++ b/t/silent6.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check user extensibility of silent-rules mode.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+my_verbose = $(my_verbose_$(V))
+my_verbose_ = $(my_verbose_$(AM_DEFAULT_VERBOSITY))
+my_verbose_0 = @echo GEN $@;
+
+all-local: foo
+
+foo: foo.in
+       $(my_verbose)cp $(srcdir)/foo.in $@
+EXTRA_DIST = foo.in
+CLEANFILES = foo
+EOF
+
+: >foo.in
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^ *GEN foo *$' stdout
+grep 'cp ' stdout && Exit 1
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN ' stdout && Exit 1
+grep 'cp \.*/foo\.in foo' stdout
+
+$MAKE distclean
+
+./configure --disable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN ' stdout && Exit 1
+grep 'cp \.*/foo\.in foo' stdout
+
+$MAKE clean
+$MAKE V=0 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^ *GEN foo *$' stdout
+grep 'cp ' stdout && Exit 1
+
+$MAKE distclean
+
+$sleep
+# Things should also work with -Wall in AM_INIT_AUTOMAKE.
+cat > configure.ac <<'END'
+AC_INIT([silent6], [1.0])
+AM_INIT_AUTOMAKE([-Wall])
+AC_CONFIG_FILES([Makefile])
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+$AUTOMAKE -Wno-error
+
+# AM_SILENT_RULES should turn off the warning.
+$sleep
+echo 'AM_SILENT_RULES' >> configure.ac
+$ACLOCAL
+$AUTOMAKE
+grep 'AM_V_GEN' Makefile.in
+$AUTOMAKE --force -Wno-all -Wportability
+grep 'AM_V_GEN' Makefile.in
+
+# The 'silent-rules' option to AM_INIT_AUTOMAKE should work likewise.
+$sleep
+cat > configure.ac <<'END'
+AC_INIT([silent6], [1.0])
+AM_INIT_AUTOMAKE([silent-rules])
+AC_CONFIG_FILES([Makefile])
+END
+$ACLOCAL
+$AUTOMAKE
+grep 'AM_V_GEN' Makefile.in
+$AUTOMAKE --force -Wno-all -Wportability
+grep 'AM_V_GEN' Makefile.in
+
+:
diff --git a/t/silent7.sh b/t/silent7.sh
new file mode 100755
index 0000000..02ef287
--- /dev/null
+++ b/t/silent7.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check user extensibility of silent-rules mode.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+all-local: foo
+
+## And here's how you should do it in your own code:
+foo: foo.in
+       $(AM_V_GEN)cp $(srcdir)/foo.in $@
+       $(AM_V_at)echo more >> $@
+
+EXTRA_DIST = foo.in
+CLEANFILES = foo
+EOF
+
+: >foo.in
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --disable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN ' stdout && Exit 1
+grep 'cp ' stdout
+grep 'echo ' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN ' stdout && Exit 1
+grep 'cp ' stdout
+grep 'echo ' stdout
+
+$MAKE clean
+$MAKE V=0 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN .*foo' stdout
+grep 'cp ' stdout && Exit 1
+grep 'echo ' stdout && Exit 1
+
+$MAKE distclean
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN .*foo' stdout
+grep 'cp ' stdout && Exit 1
+grep 'echo ' stdout && Exit 1
+
+$MAKE clean
+$MAKE V=0 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN .*foo' stdout
+grep 'cp ' stdout && Exit 1
+grep 'echo ' stdout && Exit 1
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'GEN ' stdout && Exit 1
+grep 'cp ' stdout
+grep 'echo ' stdout
+
+# Ensure that setting 'silent-rules' in a Makefile.am produces an error.
+echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
+AUTOMAKE_fails --force
+
+:
diff --git a/t/silent8.sh b/t/silent8.sh
new file mode 100755
index 0000000..a2fdb44
--- /dev/null
+++ b/t/silent8.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check texinfo rules in silent-rules mode.
+
+required='makeinfo-html tex texi2dvi-o dvips'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+info_TEXINFOS = foo.texi
+EOF
+
+cat > foo.texi <<'EOF'
+\input texinfo
address@hidden %**start of header
address@hidden foo.info
address@hidden foo manual
address@hidden %**end of header
address@hidden
+EOF
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --disable-silent-rules
+
+# Make sure that all labels work in silent-mode.
+$MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'DVIPS    foo.ps' stdout || Exit 1
+grep 'MAKEINFO foo.html' stdout || Exit 1
+# NetBSD make will print './foo.info' instead of 'foo.info'.
+grep 'MAKEINFO.*foo.info' stdout || Exit 1
+grep 'TEXI2DVI foo.dvi' stdout || Exit 1
+grep 'TEXI2PDF foo.pdf' stdout || Exit 1
+
+# Now make sure the labels don't appear in verbose mode.
+$MAKE clean || Exit 1
+$MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep 'DVIPS    foo.ps' stdout && Exit 1
+grep 'MAKEINFO foo.html' stdout && Exit 1
+grep 'MAKEINFO.*foo.info' stdout && Exit 1
+grep 'TEXI2DVI foo.dvi' stdout && Exit 1
+grep 'TEXI2PDF foo.pdf' stdout && Exit 1
+
+:
diff --git a/t/silent9.sh b/t/silent9.sh
new file mode 100755
index 0000000..70195a1
--- /dev/null
+++ b/t/silent9.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode, with libtool, nodep case.
+
+# Please keep this file in sync with silent3.test and silent4.test.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libfoo.la libbar.la
+libbar_la_CFLAGS = $(AM_CFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+lib_LTLIBRARIES = libbaz.la libbla.la
+libbla_la_CFLAGS = $(AM_CFLAGS)
+EOF
+
+cat > libfoo.c <<'EOF'
+int main ()
+{
+  return 0;
+}
+EOF
+cp libfoo.c libbar.c
+cp libfoo.c sub/libbaz.c
+cp libfoo.c sub/libbla.c
+
+libtoolize
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --disable-dependency-tracking --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep ' CC .*baz\.' stdout
+grep ' CC .*bla\.' stdout
+grep ' CCLD .*foo' stdout
+grep ' CCLD .*bar' stdout
+grep ' CCLD .*baz' stdout
+grep ' CCLD .*bla' stdout
+
+$MAKE clean
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep ' -c' stdout
+grep ' -o libfoo' stdout
+# The libtool command line can contain e.g. a '--tag=CC' option.
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+
+:
diff --git a/t/silentcxx-gcc.sh b/t/silentcxx-gcc.sh
new file mode 100755
index 0000000..d99f1e9
--- /dev/null
+++ b/t/silentcxx-gcc.sh
@@ -0,0 +1,109 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for C++.
+# This test requires the GNU C++ compiler; keep it in sync with sister
+# test 'silentcxx.test', which should work with generic compilers.
+
+required=g++
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_CXX
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.cpp baz.cxx quux.cc
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_CXXFLAGS = $(AM_CXXFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.cpp
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_CXXFLAGS = $(AM_CXXFLAGS)
+EOF
+
+cat > foo.cpp <<'EOF'
+using namespace std; /* C compilers fail on this. */
+int main() { return 0; }
+EOF
+
+# Let's try out other extensions too.
+echo 'class Baz  { public: int i;  };' > baz.cxx
+echo 'class Quux { public: bool b; };' > quux.cc
+
+cp foo.cpp sub/bar.cpp
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Sanity check: make sure the cache variable we force is really used
+# by configure.
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+
+# Force gcc ("fast") depmode.
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test 'silentcxx.test'.
+for config_args in \
+  am_cv_CXX_dependencies_compiler_type=gcc
+do
+  ./configure $config_args --enable-silent-rules
+  $MAKE >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  $EGREP ' (-c|-o)' stdout && Exit 1
+  grep 'mv ' stdout && Exit 1
+
+  grep 'CXX .*foo\.'  stdout
+  grep 'CXX .*baz\.'  stdout
+  grep 'CXX .*quux\.' stdout
+  grep 'CXX .*bar\.'  stdout
+  grep 'CXXLD .*foo1' stdout
+  grep 'CXXLD .*bar1' stdout
+  grep 'CXXLD .*foo2' stdout
+  grep 'CXXLD .*bar2' stdout
+
+  # Ensure a clean rebuild.
+  $MAKE clean
+
+  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  grep ' -c ' stdout
+  grep ' -o ' stdout
+
+  $EGREP '(CC|CXX|LD) ' stdout && Exit 1
+
+  # Ensure a clean reconfiguration/rebuild.
+  $MAKE clean
+  $MAKE maintainer-clean
+
+done
+
+:
diff --git a/t/silentcxx.sh b/t/silentcxx.sh
new file mode 100755
index 0000000..a41cc2d
--- /dev/null
+++ b/t/silentcxx.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for C++.
+# This test should work with generic C++ compilers; keep it in sync with
+# sister test 'silentcxx-gcc.test', which requires the GNU C++ compiler
+# and forces the use of gcc depmode.
+
+required=c++
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_CXX
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.cpp baz.cxx quux.cc
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_CXXFLAGS = $(AM_CXXFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.cpp
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_CXXFLAGS = $(AM_CXXFLAGS)
+EOF
+
+cat > foo.cpp <<'EOF'
+using namespace std; /* C compilers fail on this. */
+int main (void) { return 0; }
+EOF
+
+# Let's try out other extensions too.
+echo 'class Baz  { public: int i;  };' > baz.cxx
+echo 'class Quux { public: bool b; };' > quux.cc
+
+cp foo.cpp sub/bar.cpp
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# Sanity check: make sure the cache variable we force is really used
+# by configure.
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected.  Try also with dependency tracking
+# explicitly disabled.
+for config_args in \
+  --enable-dependency-tracking --disable-dependency-tracking
+do
+  ./configure $config_args --enable-silent-rules
+  $MAKE >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  $EGREP ' (-c|-o)' stdout && Exit 1
+  grep 'mv ' stdout && Exit 1
+
+  grep 'CXX .*foo\.'  stdout
+  grep 'CXX .*baz\.'  stdout
+  grep 'CXX .*quux\.' stdout
+  grep 'CXX .*bar\.'  stdout
+  grep 'CXXLD .*foo1' stdout
+  grep 'CXXLD .*bar1' stdout
+  grep 'CXXLD .*foo2' stdout
+  grep 'CXXLD .*bar2' stdout
+
+  # Ensure a clean rebuild.
+  $MAKE clean
+
+  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+  cat stdout
+
+  grep ' -c ' stdout
+  grep ' -o ' stdout
+
+  $EGREP '(CXX|LD) ' stdout && Exit 1
+
+  # Ensure a clean reconfiguration/rebuild.
+  $MAKE clean
+  $MAKE maintainer-clean
+
+done
+
+:
diff --git a/t/silentf77.sh b/t/silentf77.sh
new file mode 100755
index 0000000..ce6f6a0
--- /dev/null
+++ b/t/silentf77.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Fortran 77.
+# Keep this ins sync with the sister test silentf90.test.
+
+required=fortran77
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_F77
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.f
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_FFLAGS = $(AM_FFLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.f
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_FFLAGS = $(AM_FFLAGS)
+EOF
+
+cat > foo.f <<'EOF'
+      program foo
+      stop
+      end
+EOF
+cp foo.f sub/bar.f
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+
+grep 'F77 .*foo\.'  stdout
+grep 'F77 .*bar\.'  stdout
+grep 'F77LD .*foo1' stdout
+grep 'F77LD .*bar1' stdout
+grep 'F77LD .*foo2' stdout
+grep 'F77LD .*bar2' stdout
+
+$EGREP '(FC|FCLD) ' stdout && Exit 1
+
+# Ensure a clean rebuild.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(F77|FC|LD) ' stdout && Exit 1
+
+:
diff --git a/t/silentf90.sh b/t/silentf90.sh
new file mode 100755
index 0000000..8bb06b2
--- /dev/null
+++ b/t/silentf90.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check silent-rules mode for Fortran 90.
+# Keep this ins sync with the sister test silentf77.test.
+
+required=fortran
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >>configure.ac <<'EOF'
+AM_SILENT_RULES
+AC_PROG_FC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
+# Need generic and non-generic rules.
+bin_PROGRAMS = foo1 foo2
+foo1_SOURCES = foo.f90
+foo2_SOURCES = $(foo1_SOURCES)
+foo2_FCFLAGS = $(AM_FCLAGS)
+SUBDIRS = sub
+EOF
+
+cat > sub/Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+# Need generic and non-generic rules.
+bin_PROGRAMS = bar1 bar2
+bar1_SOURCES = bar.f90
+bar2_SOURCES = $(bar1_SOURCES)
+bar2_FCFLAGS = $(AM_FCLAGS)
+EOF
+
+cat > foo.f90 <<'EOF'
+      program foo
+      stop
+      end
+EOF
+cp foo.f90 sub/bar.f90
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure --enable-silent-rules
+$MAKE >stdout || { cat stdout; Exit 1; }
+cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
+
+$EGREP ' (-c|-o)' stdout && Exit 1
+grep 'mv ' stdout && Exit 1
+
+grep 'FC .*foo\.'  stdout
+grep 'FC .*bar\.'  stdout
+grep 'FCLD .*foo1' stdout
+grep 'FCLD .*bar1' stdout
+grep 'FCLD .*foo2' stdout
+grep 'FCLD .*bar2' stdout
+
+$EGREP '(F77|F77LD) ' stdout && Exit 1
+
+# Ensure a clean rebuild.
+$MAKE clean
+
+$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep ' -c ' stdout
+grep ' -o ' stdout
+
+$EGREP '(F77|FC|LD) ' stdout && Exit 1
+
+:
diff --git a/t/space.sh b/t/space.sh
new file mode 100755
index 0000000..c46ade1
--- /dev/null
+++ b/t/space.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test leading space on macro assignment.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+    bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
new file mode 100755
index 0000000..1486f4c
--- /dev/null
+++ b/t/specflg-dummy.sh
@@ -0,0 +1,247 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that even "dummy" per-target flags triggers the use of renamed
+# objects.  I.e., a definition like 'foo_CFLAGS = $(AM_CFLAGS)' should
+# always cause Automake to trigger the semantics for per-target CFLAGS,
+# even if AM_CFLAGS is undefined. Similarly for other *FLAGS variables
+# (CXXFLAGS, YFLAGS, LDFLAGS, ...)
+
+. ./defs || Exit 1
+
+# Disable shell globbing if possible.
+(set +f) >/dev/null 2>&1 && set +f
+
+oIFS=$IFS
+nl='
+'
+
+matches=
+add_match ()
+{
+  matches="$matches$nl$1"
+}
+
+do_check ()
+{
+  IFS=$nl
+  for string in $matches; do
+    IFS=$oIFS
+    $FGREP "$string" Makefile.in
+  done
+  IFS=$oIFS
+}
+
+# Fake libtool presence, so that we won't have to require it.
+cat > acinclude.m4 <<END
+AC_DEFUN([AC_PROG_LIBTOOL], [AC_SUBST([LIBTOOL], [dummy])])
+END
+: > ltmain.sh
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_YACC
+AC_PROG_LEX
+AC_PROG_F77
+AC_PROG_FC
+AM_PROG_GCJ
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AM_PROG_UPC
+AC_PROG_OBJC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS =
+lib_LIBRARIES =
+lib_LTLIBRARIES =
+END
+
+$ACLOCAL
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog1
+prog1_SOURCES = source1.c
+prog1_CFLAGS = $(AM_CFLAGS)
+END
+
+add_match 'prog1-source1.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog2
+prog2_SOURCES = source2.c
+prog2_CPPFLAGS = $(AM_CPPFLAGS)
+END
+
+add_match 'prog2-source2.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog3
+prog3_SOURCES = source3.cxx
+prog3_CXXFLAGS = $(AM_CXXFLAGS)
+END
+
+add_match 'prog3-source3.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog4
+prog4_SOURCES = source4.c++
+prog4_CPPFLAGS = $(AM_CPPFLAGS)
+END
+
+add_match 'prog4-source4.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog5
+prog5_SOURCES = source5.f
+prog5_FFLAGS = $(AM_FFLAGS)
+END
+
+add_match 'prog5-source5.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog6
+prog6_SOURCES = source6.f90
+prog6_FCFLAGS = $(AM_FCFLAGS)
+END
+
+add_match 'prog6-source6.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog7
+prog7_SOURCES = source7.r
+prog7_RFLAGS = $(AM_RFLAGS)
+END
+
+add_match 'prog7-source7.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog8
+prog8_SOURCES = source8.java
+prog8_GCJFLAGS = $(AM_GCJFLAGS)
+END
+
+add_match 'prog8-source8.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog9
+prog9_SOURCES = source9.upc
+prog9_UPCFLAGS = $(AM_UPCFLAGS)
+END
+
+add_match 'prog9-source9.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += prog10
+prog10_SOURCES = source10.m
+prog10_OBJCFLAGS = $(AM_OBJCFLAGS)
+END
+
+add_match 'prog10-source10.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += linkprog
+linkprog_SOURCES = linkprog.c
+linkprog_LDFLAGS = $(AM_LDFLAGS)
+END
+
+add_match 'linkprog_LINK ='
+
+cat >> Makefile.am <<'END'
+lib_LIBRARIES += libstatic.a
+libstatic_a_SOURCES = static123.c
+libstatic_a_CFLAGS = $(AM_CFLAGS)
+END
+
+add_match 'libstatic_a-static123.$(OBJEXT)'
+
+cat >> Makefile.am <<'END'
+lib_LTLIBRARIES += libshared1.la
+libshared1_la_SOURCES = shared1.c
+libshared1_la_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS)
+END
+
+add_match 'libshared1_la-shared1.lo'
+
+cat >> Makefile.am <<'END'
+lib_LTLIBRARIES += libshared2.la
+libshared2_la_SOURCES = shared2.cc
+libshared2_la_CXXFLAGS = $(AM_CXXFLAGS)
+END
+
+add_match 'libshared2_la-shared2.lo'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += parse1
+parse1_SOURCES = parse.y
+parse1_YFLAGS = $(AM_YFLAGS)
+END
+
+add_match 'parse1-parse.c'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += parse2
+parse2_SOURCES = parse.ypp
+parse2_YFLAGS = $(AM_YFLAGS)
+END
+
+add_match 'parse2-parse.cpp'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += lexer1
+lexer1_SOURCES = lex.l
+lexer1_LFLAGS = $(AM_YFLAGS)
+END
+
+add_match 'lexer1-lex.c'
+
+cat >> Makefile.am <<'END'
+bin_PROGRAMS += lexer2
+lexer2_SOURCES = lexer.ll
+lexer2_LFLAGS = $(AM_YFLAGS)
+END
+
+add_match 'lexer2-lexer.cc'
+
+# For debugging.
+cat Makefile.am
+
+$AUTOMAKE -a
+do_check
+
+sed '
+  s|^\(.*\)_SOURCES *= *|sub_\1_SOURCES = srcsub/|
+  s|^\(.*\)PROGRAMS *+= *|\1PROGRAMS += sub/|
+  s|^\(.*\)LIBRARIES *+= *|\1LIBRARIES += sub/|
+  s|^\(.*\)FLAGS *=|sub_\1FLAGS =|
+' Makefile.am > t
+
+cat - t > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+END
+
+rm -f t
+
+# For debugging.
+cat Makefile.am
+
+$AUTOMAKE
+do_check
+
+:
diff --git a/t/specflg.sh b/t/specflg.sh
new file mode 100755
index 0000000..9d5c73c
--- /dev/null
+++ b/t/specflg.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of flags specific to executable.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+foo_CFLAGS = -DBAR
+END
+
+# Make sure 'compile' is required.
+$ACLOCAL
+AUTOMAKE_fails
+grep 'required.*compile' stderr
+
+: > compile
+
+$AUTOMAKE
+
+# Look for $(COMPILE) -c in .c.o rule.
+grep 'COMPILE. [^-]' Makefile.in && Exit 1
+
+# Look for foo-foo.o.
+grep '[^-]foo\.o' Makefile.in && Exit 1
+
+# Regression test for missing space.
+$FGREP ')-c' Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/specflg10.sh b/t/specflg10.sh
new file mode 100755
index 0000000..3b8fc5b
--- /dev/null
+++ b/t/specflg10.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# AM_DEFAULT_SOURCE_EXT
+
+required='cc c++'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
+AM_CONDITIONAL([COND], [:])
+AC_OUTPUT
+END
+
+mkdir sub sub2
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub sub2
+bin_PROGRAMS = foo
+END
+
+cat > sub/Makefile.am << 'END'
+bin_PROGRAMS = bar baz
+AM_DEFAULT_SOURCE_EXT = .cpp
+END
+
+cat > sub2/Makefile.am << 'END'
+bin_PROGRAMS = bla
+if COND
+AM_DEFAULT_SOURCE_EXT = .foo .quux
+endif
+SUFFIXES = .foo .c
+.foo.c:
+       cat $< >$@
+BUILT_SOURCES = bla.c
+CLEANFILES = bla.c
+END
+
+cat > foo.c << 'END'
+int main () { return 0; }
+END
+
+cp foo.c sub/bar.cpp
+cp foo.c sub/baz.cpp
+cp foo.c sub2/bla.foo
+
+$ACLOCAL
+$AUTOCONF
+
+# Conditional AM_DEFAULT_SOURCE_EXT does not work yet  :-(
+# (this limitation could be lifted).
+AUTOMAKE_fails --add-missing
+grep 'defined conditionally' stderr
+
+sed '/^if/d; /^endif/d' sub2/Makefile.am > t
+mv -f t sub2/Makefile.am
+
+# AM_DEFAULT_SOURCE_EXT can only assume one value
+# (lifting this limitation is not such a good idea).
+AUTOMAKE_fails --add-missing
+grep 'at most one value' stderr
+
+sed 's/ \.quux//' sub2/Makefile.am > t
+mv -f t sub2/Makefile.am
+
+$AUTOMAKE --add-missing
+
+./configure
+$MAKE
+$MAKE distcheck
+
+:
diff --git a/t/specflg2.sh b/t/specflg2.sh
new file mode 100755
index 0000000..9f9569c
--- /dev/null
+++ b/t/specflg2.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test library-specific flags.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AM_PROG_AR
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c bar.cc
+libfoo_a_CFLAGS = -DBAR
+libfoo_a_CXXFLAGS = -DZOT
+END
+
+: > ar-lib
+
+# Make sure 'compile' is required.
+$ACLOCAL
+AUTOMAKE_fails
+grep 'required.*compile' stderr
+
+: > compile
+
+$AUTOMAKE
+
+# Look for $(COMPILE) -c in .c.o rule.
+grep 'COMPILE. [^-]' Makefile.in && Exit 1
+
+# Look for libfoo_a-foo.o.
+grep foo Makefile.in
+grep '[^-]foo\.o' Makefile.in && Exit 1
+
+# Look for libfoo_a-bar.o.
+grep bar Makefile.in
+grep '[^-]bar\.o' Makefile.in && Exit 1
+
+Exit 0
diff --git a/t/specflg3.sh b/t/specflg3.sh
new file mode 100755
index 0000000..9e78872
--- /dev/null
+++ b/t/specflg3.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test exe-specific flags with dependency tracking.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+foo_CFLAGS = -DFOO
+END
+
+: > compile
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP ' -o foo-foo' Makefile.in
+$FGREP 'foo.o.o' Makefile.in && Exit 1
+$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && Exit 1
+$FGREP '$(foo_CFLAGS)' Makefile.in
+
+:
diff --git a/t/specflg6.sh b/t/specflg6.sh
new file mode 100755
index 0000000..f420cdf
--- /dev/null
+++ b/t/specflg6.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Regression test for multiple rules being generated for each target when
+# conditionals are present.
+# From Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_CONDITIONAL([BAR], [true])
+END
+
+cat > Makefile.am << 'END'
+if BAR
+BAR_SRCS = bar.c
+endif
+
+bin_PROGRAMS = foo
+foo_CFLAGS = -DFOO
+foo_SOURCES = foo.c
+END
+
+: > compile
+
+$ACLOCAL
+$AUTOMAKE
+
+uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
+
+cat >> Makefile.am << 'END'
+foo_SOURCES += $(BAR_SRCS)
+END
+
+$AUTOMAKE
+
+condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
+
+test "x$uncondval" = "x$condval"
+
+:
diff --git a/t/specflg7.sh b/t/specflg7.sh
new file mode 100755
index 0000000..26ad75c
--- /dev/null
+++ b/t/specflg7.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The true/false example from the manual, plus a check for _SHORTNAME.
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = false true
+true_SOURCES = false.c
+true_CFLAGS = -DAM_TRUE
+true_SHORTNAME = t
+# No false_SOURCES definition.  Use the default source.
+false_CFLAGS = -DAM_FALSE
+false_SHORTNAME = f
+END
+
+cat > false.c << 'END'
+#include <stdio.h>
+int
+main (int argc, char *argv[])
+{
+#ifdef AM_TRUE
+   puts ("true");
+#else
+   puts ("false");
+#endif
+   return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+./true | grep true
+./false | grep false
+
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./t-false.$objext
+test -f ./f-false.$objext
+
+:
diff --git a/t/specflg8.sh b/t/specflg8.sh
new file mode 100755
index 0000000..435ce16
--- /dev/null
+++ b/t/specflg8.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Like the true/false example from the manual,
+# with one extra indirection in the sources (PR/315), and
+# use of _CPPFLAGS (PR/337).
+
+required='cc native'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+# Using a separate variable to hold all the sources for a program is
+# common when building many flavors of this program, each with
+# different flags.
+
+cat > Makefile.am << 'END'
+TRUESOURCE = true.c
+bin_PROGRAMS = false true
+true_SOURCES = $(TRUESOURCE)
+true_CPPFLAGS = -DEXIT_CODE=0
+false_SOURCES = $(TRUESOURCE)
+false_CPPFLAGS = -DEXIT_CODE=1
+END
+
+cat > true.c << 'END'
+int main (void)
+{
+   return EXIT_CODE;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+
+./true
+./false && Exit 1
+
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./true-true.$objext
+test -f ./false-true.$objext
+
+:
diff --git a/t/specflg9.sh b/t/specflg9.sh
new file mode 100755
index 0000000..96e7a2e
--- /dev/null
+++ b/t/specflg9.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Another check for per-target flag substitutions.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zzfoo zzbar
+zzfoo_SOURCES = sub/foo.c
+zzbar_SOURCES = bar.c
+zzbar_CPPFLAGS = -Dfoo
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+$FGREP '$(AM_CFLAGS)' Makefile.in
+
+$FGREP '$(zzfoo_CFLAGS)' Makefile.in && Exit 1
+$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && Exit 1
+
+$FGREP '$(zzbar_CFLAGS)' Makefile.in && Exit 1
+$FGREP '$(zzbar_CPPFLAGS)' Makefile.in
+
+:
diff --git a/t/spell.sh b/t/spell.sh
new file mode 100755
index 0000000..a2b4752
--- /dev/null
+++ b/t/spell.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure misspellings in _SOURCES variables cause failure.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz foo
+zardoz_SOURCES = x.c
+boo_SOURCES = y.c
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:3:.*boo' stderr
diff --git a/t/spell2.sh b/t/spell2.sh
new file mode 100755
index 0000000..a4b0a46
--- /dev/null
+++ b/t/spell2.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure misspellings in _SOURCES variables cause failure.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = x.c
+qardoz_LDADD = -ljoe
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:3:.*qardoz' stderr
diff --git a/t/spell3.sh b/t/spell3.sh
new file mode 100755
index 0000000..a96fa03
--- /dev/null
+++ b/t/spell3.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure some internal _DEPENDENCIES variables don't cause
+# errors.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TAGS_DEPENDENCIES = joe
+## Required to avoid error.
+ETAGS_ARGS = joe
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/spelling.sh b/t/spelling.sh
new file mode 100755
index 0000000..fb68f31
--- /dev/null
+++ b/t/spelling.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that misspelled prefixes actually cause error.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'EOF'
+bni_PROGRAMS = zot
+EOF
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'bni_PROGRAMS' stderr
+grep 'bnidir.*undefined' stderr
+
+:
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
new file mode 100755
index 0000000..af7ba2a
--- /dev/null
+++ b/t/spy-rm.tap
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check whether "rm -f" do not complain if called without file
+# operands.  We'd like to depend on this behaviour (which seems
+# to hold on all non-museum systems, and will soon be mandated
+# by POSIX as well) in future version of automake, to simplify
+# automake-provided cleanup rules.
+# References:
+#  <http://lists.gnu.org/archive/html/bug-autoconf/2012-02/msg00002.html>
+#  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10819>
+#  <http://austingroupbugs.net/view.php?id=542>
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+plan_ 10
+
+chk ()
+{
+  if test -f /bin/rm; then
+    command_ok_ "/bin/rm $*" /bin/rm "$@"
+  else
+    skip_ -r "/bin/rm not found"
+  fi
+  command_ok_ "rm $*" rm "$@"
+}
+
+chk -f
+chk -rf
+chk -fr
+chk -f -r
+chk -r -f
+
+:
diff --git a/t/spy.sh b/t/spy.sh
new file mode 100755
index 0000000..0d087a4
--- /dev/null
+++ b/t/spy.sh
@@ -0,0 +1,106 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check whether double colon rules work.  The Unix V7 make manual
+# mentions double-colon rules, but POSIX does not.  They seem to be
+# supported by all Make implementation as far as we can tell. This test
+# case is a spy: we want to detect if there exist implementations where
+# these do not work.  We might use these rules to simplify the rebuild
+# rules (instead of the $? hack).
+
+# Tom Tromey write:
+# | In the distant past we used :: rules extensively.
+# | Fran?ois convinced me to get rid of them:
+# |
+# | Thu Nov 23 18:02:38 1995  Tom Tromey  <address@hidden>
+# | [ ... ]
+# |         * subdirs.am: Removed "::" rules
+# |         * header.am, libraries.am, mans.am, texinfos.am, footer.am:
+# |         Removed "::" rules
+# |         * scripts.am, programs.am, libprograms.am: Removed "::" rules
+# |
+# |
+# | I no longer remember the rationale for this.  It may have only been a
+# | belief that they were unportable.
+
+# On a related topic, the Autoconf manual has the following text:
+# |     'VPATH' and double-colon rules
+# |           Any assignment to 'VPATH' causes Sun 'make' to only execute
+# |           the first set of double-colon rules.  (This comment has been
+# |           here since 1994 and the context has been lost.  It's probably
+# |           about SunOS 4.  If you can reproduce this, please send us a
+# |           test case for illustration.)
+
+# We already know that overlapping ::-rule like
+#
+#   a :: b
+#      echo rule1 >> $@
+#   a :: c
+#      echo rule2 >> $@
+#   a :: b c
+#      echo rule3 >> $@
+#
+# do not work equally on all platforms.  It seems that in all cases
+# Make attempts to run all matching rules.  However at least GNU Make,
+# NetBSD Make, and FreeBSD Make will detect that $@ was updated by the
+# first matching rule and skip remaining matches (with the above
+# example that means that unless 'a' was declared PHONY, only "rule1"
+# will be appended to 'a' if both b and c have changed).  Other
+# implementations like OSF1 Make and HP-UX Make do not perform such a
+# check and execute all matching rules whatever they do ("rule1",
+# "rule2", abd "rule3" will all be appended to 'a' if b and c have
+# changed).
+
+# So it seems only non-overlapping ::-rule may be portable.  This is
+# what we check now.
+
+. ./defs || Exit 1
+
+cat >Makefile <<\EOF
+a :: b
+       echo rule1 >> $@
+a :: c
+       echo rule2 >> $@
+EOF
+
+touch b c
+$sleep
+: > a
+$MAKE
+test "`cat a`" = ''
+$sleep
+touch b
+$MAKE
+test "`cat a`" = rule1
+# Ensure a is strictly newer than b, so HP-UX make does not execute rule2.
+$sleep
+: > a
+$sleep
+touch c
+$MAKE
+test "`cat a`" = rule2
+
+# Unfortunately, the following is not portable to FreeBSD/NetBSD/OpenBSD
+# make, see explanation above.
+
+#: > a
+#$sleep
+#touch b c
+#$MAKE
+#grep rule1 a
+#grep rule2 a
+
+:
diff --git a/t/srcsub.sh b/t/srcsub.sh
new file mode 100755
index 0000000..978a105
--- /dev/null
+++ b/t/srcsub.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config sub in _SOURCES fails.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = x
+x_SOURCES = x.c @FOO@
+EXTRA_x_SOURCES = y.c
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:2:.*x_SOURCES.*substitution' stderr
diff --git a/t/srcsub2.sh b/t/srcsub2.sh
new file mode 100755
index 0000000..2d6da97
--- /dev/null
+++ b/t/srcsub2.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config sub in _SOURCES fails.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = x
+bar = @FOO@
+foo = $(bar)
+x_SOURCES = x.c $(foo)
+EXTRA_x_SOURCES = y.c
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:2:.*bar.*substitution' stderr
+grep 'Makefile.am:2:.*x_SOURCES' stderr
diff --git a/t/stamph2.sh b/t/stamph2.sh
new file mode 100755
index 0000000..59a373a
--- /dev/null
+++ b/t/stamph2.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure stamp-h* files are created where we expect
+. ./defs || Exit 1
+
+cat >> configure.ac << END
+AM_CONFIG_HEADER([1.h
+                  2.h:config.hin
+                  3.h:sdir1/config1.hin])
+# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms.
+AC_CONFIG_HEADERS([sdir1/4.h
+                   sdir1/5.h:config.hin
+                   sdir1/6.h:sdir1/config1.hin
+                   sdir1/7.h:sdir2/config2.hin])
+AC_OUTPUT
+END
+
+: > Makefile.am
+mkdir sdir1
+mkdir sdir2
+: > config.hin
+: > 1.h.in
+: > sdir1/4.h.in
+: > sdir1/config1.hin
+: > sdir2/config2.hin
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+test -f stamp-h1
+test -f stamp-h2
+test -f stamp-h3
+test -f sdir1/stamp-h4
+test -f sdir1/stamp-h5
+test -f sdir1/stamp-h6
+test -f sdir1/stamp-h7
+
+# Make sure './config.status foo' creates the right stamp file.
+# Report from Sander Niemeijer.
+
+rm -f stamp-h*
+rm -f sdir1/stamp-h*
+
+./config.status sdir1/7.h 2.h sdir1/4.h
+test ! -f stamp-h1
+test -f stamp-h2
+test ! -f stamp-h3
+test -f sdir1/stamp-h4
+test ! -f sdir1/stamp-h5
+test ! -f sdir1/stamp-h6
+test -f sdir1/stamp-h7
+
+:
diff --git a/t/stdinc.sh b/t/stdinc.sh
new file mode 100755
index 0000000..ec99483
--- /dev/null
+++ b/t/stdinc.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure the standard include order is stable.
+# Report by Kent Boortz.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_CONFIG_HEADERS([sub/config.h])
+AC_CONFIG_FILES([sub/bar.h])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c
+BUILT_SOURCES = bar.h
+END
+
+mkdir sub
+
+cat >foo.c <<'END'
+#include <config.h>
+#include <bar.h>
+int main() { return bar (); }
+END
+cat >bar.h <<'END'
+int bar () { return 0; }
+END
+cat >sub/bar.h.in <<'END'
+choke me
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+mkdir build
+cd build
+../configure -C
+$MAKE
+
+cd ..
+./configure -C
+$MAKE
diff --git a/t/stdlib.sh b/t/stdlib.sh
new file mode 100755
index 0000000..1594707
--- /dev/null
+++ b/t/stdlib.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test "not a standard library" error.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = sub/foo
+include $(srcdir)/foo.mk
+END
+
+cat > foo.mk << 'END'
+## A dummy automake comment.
+a = x \
+    y
+# A dummy make comment.
+lib_LIBRARIES = zardoz.a
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+q="[\`'\"]"
+badname='not a standard library name'
+# We're specifically testing for line-number information.
+grep "^Makefile\\.am:1:.*${q}sub/foo${q}.*$badname" stderr
+grep "^Makefile\\.am:1:.*sub/libfoo\\.a" stderr
+grep "^foo\\.mk:5:.*${q}zardoz\\.a${q}.*$badname" stderr
+grep "^foo\\.mk:5:.*libzardoz\\.a" stderr
+
+:
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
new file mode 100755
index 0000000..ce5158f
--- /dev/null
+++ b/t/stdlib2.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for AM_LDFLAGS = -module
+# Report from Kevin P. Fleming.
+required=libtool
+. ./defs || Exit 1
+
+: > README
+: > NEWS
+: > AUTHORS
+: > ChangeLog
+: > ltconfig
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+: > Makefile.inc
+
+cat > Makefile.am << 'END'
+include Makefile.inc
+lib_LTLIBRARIES = nonstandard.la
+nonstandard_la_SOURCES = foo.c
+FOO = -module
+END
+
+$ACLOCAL
+AUTOMAKE_fails --add-missing --gnu
+grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
+grep 'Makefile.am:2:.*libnonstandard.la' stderr
+
+# We will use -Wno-gnu to disable the warning about setting LDFLAGS (below)
+# Make sure nonstandard names are diagnosed anyway.
+AUTOMAKE_fails --add-missing --gnu -Wno-gnu
+grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
+grep 'Makefile.am:2:.*libnonstandard.la' stderr
+
+# Make sure nonstandard_la_LDFLAGS is read even if LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+LDFLAGS = -lfoo
+nonstandard_la_LDFLAGS = $(FOO)
+EOF
+$AUTOMAKE -Wno-gnu
+
+# Make sure LDFLAGS is read even if nonstandard_la_LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+LDFLAGS = $(FOO)
+nonstandard_la_LDFLAGS = -lfoo
+EOF
+$AUTOMAKE -Wno-gnu
+
+# Make sure AM_LDFLAGS is not read if foo_LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+nonstandard_la_LDFLAGS = -lfoo
+AM_LDFLAGS = -module
+EOF
+AUTOMAKE_fails
+grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
+grep 'Makefile.am:2:.*libnonstandard.la' stderr
+
+echo 'AM_LDFLAGS = -module' > Makefile.inc
+$AUTOMAKE
+
+# For module, Automake should not suggest the lib prefix.
+cat > Makefile.am << 'END'
+include Makefile.inc
+lib_LTLIBRARIES = nonstandard
+nonstandard_SOURCES = foo.c
+FOO = -module
+END
+
+AUTOMAKE_fails
+grep "Makefile.am:2:.*'nonstandard'.*standard libtool module name" stderr
+grep 'Makefile.am:2:.*nonstandard.la' stderr
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
new file mode 100755
index 0000000..8c365f0
--- /dev/null
+++ b/t/strictness-override.sh
@@ -0,0 +1,123 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The strictness specified in Makefile.am:AUTOMAKE_OPTIONS should
+# override that specified in configure.ac:AM_INIT_AUTOMAKE, and both
+# should override the strictness specified on the command line.
+# NOTE: the current semantics might not be the best one (even if it has
+# been in place for quite a long time); see also Automake bug #7673.
+# Update this test if the semantics are changed.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS =
+END
+
+set_strictness ()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+ok ()
+{
+  $AUTOMAKE -Werror $*
+}
+
+ko ()
+{
+  AUTOMAKE_fails $*
+  grep 'required file.*README' stderr
+}
+
+$ACLOCAL
+
+# Leave out only one of the required files, to avoid too much
+# repetition in the error messages.
+touch INSTALL NEWS AUTHORS ChangeLog COPYING
+
+rm -rf autom4te*.cache
+set_strictness '' Makefile.am
+set_strictness '' configure.ac
+ko --gnu
+ko
+ok --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'gnu' Makefile.am
+set_strictness '' configure.ac
+ko --gnu
+ko
+ko --foreign
+
+rm -rf autom4te*.cache
+set_strictness '' Makefile.am
+set_strictness 'gnu' configure.ac
+ko --gnu
+ko
+ko --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'foreign' Makefile.am
+set_strictness '' configure.ac
+ok --gnu
+ok
+ok --foreign
+
+rm -rf autom4te*.cache
+set_strictness '' Makefile.am
+set_strictness 'foreign' configure.ac
+ok --gnu
+ok
+ok --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'gnu' Makefile.am
+set_strictness 'gnu' configure.ac
+ko --gnu
+ko
+ko --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'foreign' Makefile.am
+set_strictness 'foreign' configure.ac
+ok --gnu
+ok
+ok --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'foreign' Makefile.am
+set_strictness 'gnu' configure.ac
+ok --gnu
+ok
+ok --foreign
+
+rm -rf autom4te*.cache
+set_strictness 'gnu' Makefile.am
+set_strictness 'foreign' configure.ac
+ko --gnu
+ko
+ko --foreign
+
+:
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
new file mode 100755
index 0000000..6f5a143
--- /dev/null
+++ b/t/strictness-precedence.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# On the command line, in AM_INIT_AUTOMAKE, and in AUTOMAKE_OPTIONS,
+# strictness specified later should take precedence over strictness
+# specified earlier.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS =
+END
+
+set_strictness ()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+ok ()
+{
+  $AUTOMAKE -Werror $*
+}
+
+ko ()
+{
+  AUTOMAKE_fails $*
+  grep 'required file.*README' stderr
+}
+
+# Leave out only one of the required files, to avoid too much
+# repetition in the error messages.
+touch INSTALL NEWS AUTHORS ChangeLog COPYING
+
+$ACLOCAL
+ko --foreign --gnu
+ok --gnu --foreign
+
+set_strictness '' Makefile.am
+set_strictness 'gnu foreign' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+ok
+set_strictness 'foreign gnu' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+ko
+
+set_strictness '' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+set_strictness 'gnu foreign' Makefile.am
+ok
+set_strictness 'foreign gnu' Makefile.am
+ko
+
+:
diff --git a/t/strip.sh b/t/strip.sh
new file mode 100755
index 0000000..dfefcd9
--- /dev/null
+++ b/t/strip.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for install-strip.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_SCRIPTS = foo
+END
+
+cat > foo << 'END'
+#! /bin/sh
+echo Maude
+END
+
+chmod +x foo
+
+mkdir install
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+prefix=`cd install && pwd` || Exit 1
+./configure --prefix="$prefix"
+$MAKE
+$MAKE install-strip
+diff foo "$prefix"/bin/foo
+
+:
diff --git a/t/strip2.sh b/t/strip2.sh
new file mode 100755
index 0000000..49a5c06
--- /dev/null
+++ b/t/strip2.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure install-strip works when STRIP consists of more than one word.
+# This test needs GNU binutils strip.  See sister test strip3.
+
+required='cc strip'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+lib_LIBRARIES = libfoo.a
+END
+
+cat > foo.c << 'END'
+int main () { return 0; }
+END
+
+cat > libfoo.c << 'END'
+int foo () { return 0; }
+END
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+prefix=`pwd`/inst
+./configure --prefix="$prefix" STRIP='strip --verbose'
+$MAKE
+$MAKE install-strip
+
+:
diff --git a/t/strip3.sh b/t/strip3.sh
new file mode 100755
index 0000000..187e8a5
--- /dev/null
+++ b/t/strip3.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Ensure install-strip works when STRIP consists of more than one word.
+# This test needs GNU binutils strip.  Libtool variant.
+
+required='cc libtoolize strip'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+lib_LTLIBRARIES = libfoo.la
+END
+
+cat > foo.c << 'END'
+int main () { return 0; }
+END
+
+cat > libfoo.c << 'END'
+int foo () { return 0; }
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+prefix=`pwd`/inst
+./configure --prefix="$prefix" STRIP='strip --verbose'
+$MAKE
+$MAKE install-strip
+
+:
diff --git a/t/subcond.sh b/t/subcond.sh
new file mode 100755
index 0000000..c09e5ad
--- /dev/null
+++ b/t/subcond.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# It is ok to have a conditional SUBDIRS when using gettext.
+
+required=gettext
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_GNU_GETTEXT
+AM_CONDITIONAL(MAUDE, true)
+ALL_LINGUAS=
+AC_SUBST(ALL_LINGUAS)
+END
+
+mkdir po intl
+: >config.rpath
+
+cat > Makefile.am << 'END'
+if MAUDE
+SUBDIRS = po intl
+else
+SUBDIRS =
+endif
+END
+
+$ACLOCAL
+# Gettext wants config.guess etc.
+$AUTOMAKE --add-missing
diff --git a/t/subcond2.sh b/t/subcond2.sh
new file mode 100755
index 0000000..0e9f451
--- /dev/null
+++ b/t/subcond2.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The for conditional SUBDIRS.
+# SUBDIRS + AM_CONDITIONAL setup from the manual.
+# Lots of lines here are duplicated in subcond3.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_CONDITIONAL([COND_OPT], [test "$want_opt" = yes])
+AC_CONFIG_FILES([src/Makefile opt/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am << 'END'
+if COND_OPT
+  MAYBE_OPT = opt
+endif
+SUBDIRS = src $(MAYBE_OPT)
+
+# Testing targets.
+#
+# We want to ensure that
+#      - src/source and opt/source are always distributed.
+#      - src/result is always built
+#      - opt/result is built conditionally
+#
+# We rely on 'distcheck' to run 'check-local' and use
+# 'sanity1' and 'sanity2' as evidences that test-build was run.
+
+if COND_OPT
+test-build: all
+       test -f src/result
+       test -f opt/result
+       : > $(top_builddir)/../../sanity2
+else
+test-build: all
+       test -f src/result
+       test ! -f opt/result
+       : > $(top_builddir)/../../sanity1
+endif
+
+test-dist: distdir
+       test -f $(distdir)/src/source
+       test -f $(distdir)/opt/source
+
+check-local: test-build test-dist
+END
+
+mkdir src opt
+: > src/source
+: > opt/source
+
+cat >src/Makefile.am << 'END'
+EXTRA_DIST = source
+all-local: result
+CLEANFILES = result
+
+result: source
+       cp $(srcdir)/source result
+END
+
+# We want in opt/ the same Makefile as in src/.  Let's exercise 'include'.
+cat >opt/Makefile.am << 'END'
+include ../src/Makefile.am
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE distcheck
+test -f sanity1
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
+test -f sanity2
diff --git a/t/subcond3.sh b/t/subcond3.sh
new file mode 100755
index 0000000..e84aa41
--- /dev/null
+++ b/t/subcond3.sh
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The for conditional SUBDIRS.
+# SUBDIRS + AC_SUBST setup from the manual.
+# Lots of lines here are duplicated in subcond2.test.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+if test "$want_opt" = yes; then
+  MAYBE_OPT=opt
+else
+  MAYBE_OPT=
+fi
+AC_SUBST([MAYBE_OPT])
+AC_CONFIG_FILES([src/Makefile opt/Makefile])
+AC_OUTPUT
+END
+
+cat >Makefile.am << 'END'
+SUBDIRS = src $(MAYBE_OPT)
+DIST_SUBDIRS = src opt
+
+# Testing targets.
+#
+# We want to ensure that
+#      - src/source and opt/source are always distributed.
+#      - src/result is always built
+#      - opt/result is built conditionally
+#
+# We rely on 'distcheck' to run 'check-local' and use
+# 'sanity1' and 'sanity2' as evidences that test-build was run.
+
+test-build: all
+       test -f src/result
+       if test -n "$(MAYBE_OPT)"; then \
+          test -f opt/result || exit 1; \
+          : > $(top_builddir)/../../sanity2 || exit 1; \
+       else \
+          test ! -f opt/result || exit 1; \
+          : > $(top_builddir)/../../sanity1 || exit 1; \
+       fi
+
+test-dist: distdir
+       test -f $(distdir)/src/source
+       test -f $(distdir)/opt/source
+
+check-local: test-build test-dist
+END
+
+mkdir src opt
+: > src/source
+: > opt/source
+
+cat >src/Makefile.am << 'END'
+EXTRA_DIST = source
+all-local: result
+CLEANFILES = result
+
+result: source
+       cp $(srcdir)/source result
+END
+
+# We want in opt/ the same Makefile as in src/.  Let's exercise 'include'.
+cat >opt/Makefile.am << 'END'
+include ../src/Makefile.am
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure
+$MAKE distcheck
+test -f sanity1
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
+test -f sanity2
diff --git a/t/subdir.sh b/t/subdir.sh
new file mode 100755
index 0000000..34b6ece
--- /dev/null
+++ b/t/subdir.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure install-sh and mkinstalldirs correctly found in
+# subdirs.
+
+. ./defs || Exit 1
+
+mkdir zot
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([zot/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = zot
+END
+
+cat > zot/Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/subdir10.sh b/t/subdir10.sh
new file mode 100755
index 0000000..4ba791a
--- /dev/null
+++ b/t/subdir10.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# SUDBIRS with $fail set in the environment.
+
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+echo SUBDIRS = sub >Makefile.am
+: > sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+env fail=1 $MAKE all clean
+
+:
diff --git a/t/subdir2.sh b/t/subdir2.sh
new file mode 100755
index 0000000..31e3c61
--- /dev/null
+++ b/t/subdir2.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure sub-sub-dirs work correctly.
+
+. ./defs || Exit 1
+
+mkdir one
+mkdir one/two
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([one/Makefile one/two/Makefile])
+AC_OUTPUT
+END
+
+# Files required because we are using '--gnu'.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+
+cat > Makefile.am << 'END'
+SUBDIRS = one
+END
+
+cat > one/Makefile.am << 'END'
+SUBDIRS = two
+END
+
+cat > one/two/Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+$ACLOCAL
+$AUTOMAKE --gnu
+
+:
diff --git a/t/subdir3.sh b/t/subdir3.sh
new file mode 100755
index 0000000..d9b160f
--- /dev/null
+++ b/t/subdir3.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure subdir source file generates explicit dependency.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz widdershins
+zardoz_SOURCES = y.c x/z.c
+widdershins_SOURCES = x/z.c
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^z\.o: x/z\.c$' Makefile.in
+
+:
diff --git a/t/subdir4.sh b/t/subdir4.sh
new file mode 100755
index 0000000..81528b2
--- /dev/null
+++ b/t/subdir4.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure a top-level depcomp file is found when
+# AC_CONFIG_AUX_DIR is not specified.
+
+. ./defs || Exit 1
+
+mkdir lib src
+
+cat >> configure.ac << 'END'
+AC_PROG_RANLIB
+AC_PROG_CC
+AM_PROG_AR
+AC_CONFIG_FILES([lib/Makefile src/Makefile])
+AC_OUTPUT
+END
+
+# Files required because we are using '--gnu'.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+
+cat > Makefile.am << 'END'
+SUBDIRS = lib src
+END
+
+cat > lib/Makefile.am << 'END'
+pkgdata_DATA =
+noinst_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+cat > lib/foo.c << 'END'
+int foo () {}
+END
+
+cat > src/Makefile.am << 'END'
+pkgdata_DATA =
+END
+
+: > ar-lib
+
+$ACLOCAL
+$AUTOMAKE --gnu
+
+# Make sure that depcomp is *not* included in the definition
+# of DIST_COMMON in lib/Makefile.in.  If you change this test
+# so that more files are included in lib's DIST_COMMON definition,
+# then you must handle the case in which depcomp is listed on a
+# continued line.
+grep '^DIST_COMMON.*depcomp' lib/Makefile.in && Exit 1
+
+:
diff --git a/t/subdir5.sh b/t/subdir5.sh
new file mode 100755
index 0000000..a74c746
--- /dev/null
+++ b/t/subdir5.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that adding a new directory works.
+# This test runs 'make' from the top-level directory, the sister test
+# 'subdir8.test' do it from a subdirectory.
+# PR automake/46
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+# Now add new directories.
+
+# First we add a new directory by modifying configure.ac directly.
+# We update configure.ac *before* updating sub/Makefile.am; subdir8.test
+# does it in the other way: it updates confiles.m4 (which is m4_included
+# by configure.ac there) after Makefile.am.
+
+# Modified configure dependencies must be newer than config.status.
+$sleep
+sed <configure.ac >configure.tmp -e '/^AC_OUTPUT$/i\
+AC_CONFIG_FILES([maude/Makefile])\
+m4_include([confile.m4])\
+' # Last newline required by older OpenBSD sed.
+mv -f configure.tmp configure.ac
+
+cat configure.ac # For debugging.
+
+: > confile.m4
+
+mkdir maude
+
+cat > maude/Makefile.am << 'END'
+include_HEADERS = foo.h
+END
+
+: > maude/foo.h
+
+echo 'SUBDIRS = maude' >> Makefile.am
+
+# We want a simple rebuild to create maude/Makefile automatically.
+$MAKE
+grep '^SUBDIRS = *maude *$' Makefile.in
+grep '^SUBDIRS = *maude *$' Makefile
+test -f maude/Makefile
+
+# Then we add a new directory by modifying a file included (through
+# 'm4_include') by configure.ac.
+mkdir maude2
+# Modified configure dependencies must be newer than config.status.
+$sleep
+cat >> confile.m4 << 'END'
+AC_CONFIG_FILES([maude2/Makefile])
+AC_SUBST([GREPME])
+END
+: > maude2/Makefile.am
+echo 'SUBDIRS += maude2' >> Makefile.am
+
+# We want a simple rebuild to create maude2/Makefile and update
+# all other Makefiles automatically.
+$MAKE
+grep '^SUBDIRS =.* maude2' Makefile.in
+grep '^SUBDIRS =.* maude2' Makefile
+
+for ext in '.in' ''; do
+  for d in . maude maude2; do
+    grep '^GREPME =' $d/Makefile$ext
+  done
+done
+
+:
diff --git a/t/subdir6.sh b/t/subdir6.sh
new file mode 100755
index 0000000..5c17b65
--- /dev/null
+++ b/t/subdir6.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure config headers in subdirectories are cleaned.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
+AC_OUTPUT
+END
+
+touch Makefile.am
+mkdir sub
+
+$ACLOCAL
+$AUTOCONF
+touch sub/config.hin
+$AUTOMAKE
+./configure
+test -f sub/stamp-h1
+$MAKE clean
+test -f sub/stamp-h1
+$MAKE distclean
+test -f sub/stamp-h1 && Exit 1
+
+:
diff --git a/t/subdir7.sh b/t/subdir7.sh
new file mode 100755
index 0000000..a2c47a1
--- /dev/null
+++ b/t/subdir7.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Naming a subdirectory 'obj/' is a bad idea.  Automake should say so.
+
+. ./defs || Exit 1
+
+mkdir obj
+
+cat >>configure.ac << 'END'
+AC_CONFIG_FILES([obj/Makefile])
+AC_OUTPUT
+END
+
+: > obj/Makefile.am
+echo 'SUBDIRS = obj' >Makefile.am
+
+$ACLOCAL
+
+AUTOMAKE_fails
+grep 'Makefile.am:1:.*obj.*BSD' stderr
+
+cat >Makefile.am <<'END'
+SUBDIRS = @STH@
+FOO = obj
+DIST_SUBDIRS = $(FOO)
+END
+
+AUTOMAKE_fails
+grep 'Makefile.am:2:.*obj.*BSD' stderr
+
+:
diff --git a/t/subdir8.sh b/t/subdir8.sh
new file mode 100755
index 0000000..ee9e0b0
--- /dev/null
+++ b/t/subdir8.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that adding a new directory works, even from
+# subdirectories.  The sister test 'subdir5.test' makes sure it works
+# when make is run from the top-level directory.
+# PR automake/46
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+m4_include([confiles.m4])
+MORE_DEFS
+AC_OUTPUT
+END
+
+echo 'AC_CONFIG_FILES([sub/Makefile])' > confiles.m4
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+ACLOCAL_AMFLAGS = -I m4
+END
+
+mkdir sub
+
+: > sub/Makefile.am
+
+mkdir m4
+echo 'AC_DEFUN([MORE_DEFS], [])' > m4/moredefs.m4
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+# Now add new directories.
+
+# The first step users typically do when adding a new subdir is
+# editing configure.ac.  That is already tested by subdir5.test,
+# though, so here we try to just edit a file that is included by
+# configure.ac, without touching configure.ac itself.
+
+mkdir sub/maude
+cat > sub/maude/Makefile.am << 'END'
+include_HEADERS = foo.h
+END
+
+: > sub/maude/foo.h
+
+echo 'SUBDIRS = maude' >> sub/Makefile.am
+
+mkdir maude
+: > maude/Makefile.am
+
+# Update confiles.m4 *after* updating sub/Makefile.am; subdir5.test do
+# it in the other way: it updates configure.ac before Makefile.am.
+# We sleep here because modified configure dependencies must be newer
+# than config.status.
+$sleep
+echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4
+
+# We want a simple rebuild from sub/ to create sub/maude/Makefile
+# and maude/Makefile automatically.
+cd sub
+$MAKE
+cd ..
+grep '^SUBDIRS = *maude *$' sub/Makefile.in
+grep '^SUBDIRS = *maude *$' sub/Makefile
+test -f maude/Makefile
+test -f sub/maude/Makefile
+
+# Make sure the dependencies of aclocal.m4 or honored at least from
+# the top-level directory.
+echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
+$MAKE
+
+for ext in '.in' ''; do
+  for d in . maude sub sub/maude; do
+    grep '^GREPME =' $d/Makefile$ext
+  done
+done
+
+:
diff --git a/t/subdir9.sh b/t/subdir9.sh
new file mode 100755
index 0000000..116e1c3
--- /dev/null
+++ b/t/subdir9.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test SUDBIRS with /.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([src/subdir/Makefile src/subdir2/Makefile])
+AC_OUTPUT
+END
+
+echo SUBDIRS = src/subdir >Makefile.am
+
+mkdir src
+mkdir src/subdir
+mkdir src/subdir2
+
+: >src/subdir/foo
+: >src/subdir2/foo
+
+cat >src/subdir/Makefile.am <<'EOF'
+EXTRA_DIST = foo
+SUBDIRS = ../subdir2
+EOF
+
+cat >src/subdir2/Makefile.am <<'EOF'
+EXTRA_DIST = foo
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --copy --add-missing
+./configure
+$MAKE distdir
+test -f $distdir/src/subdir/foo
+test -f $distdir/src/subdir2/foo
+$MAKE clean
+$MAKE distclean
+test ! -f src/subdir2/Makefile
+
+:
diff --git a/t/subdirbuiltsources.sh b/t/subdirbuiltsources.sh
new file mode 100755
index 0000000..2f50708
--- /dev/null
+++ b/t/subdirbuiltsources.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure when using SUBDIR that all BUILT_SOURCES are built.
+# A bug occurred where subdirs do not have all-recursive or
+# all-recursive-am which depended on BUILT_SOURCES.
+
+required=cc
+. ./defs || Exit 1
+
+mkdir lib
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([lib/Makefile])
+AC_PROG_RANLIB
+AC_PROG_CC
+AM_PROG_AR
+AC_OUTPUT
+END
+
+# Files required because we are using '--gnu'.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+
+cat > Makefile.am << 'END'
+SUBDIRS = lib
+END
+
+cat > lib/Makefile.am << 'END'
+pkgdata_DATA =
+noinst_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+BUILT_SOURCES=foo.h
+foo.h:
+       echo \#define FOO_DEFINE 1 >$@
+END
+
+cat > lib/foo.c << 'END'
+#include <foo.h>
+int foo () { return !FOO_DEFINE;}
+END
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --force-missing --add-missing --gnu
+
+./configure
+
+# Remove the comment to get a successful test.
+# $MAKE -C lib foo.h
+$MAKE
+
+:
diff --git a/t/subobj.sh b/t/subobj.sh
new file mode 100755
index 0000000..b7f6597
--- /dev/null
+++ b/t/subobj.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of subdir objects with C.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.c generic/b.c
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+# Make sure compile is installed, and that Automake says so.
+grep 'install.*compile' stderr
+test -f compile
+
+grep '^generic/a\.\$(OBJEXT):' Makefile.in
+grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
+
+# Opportunistically test for a different bug.
+grep '^generic/b\.\$(OBJEXT):.*dirstamp' Makefile.in
+
+:
diff --git a/t/subobj10.sh b/t/subobj10.sh
new file mode 100755
index 0000000..db6bf72
--- /dev/null
+++ b/t/subobj10.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# PR 492: Test asm subdir-objects.
+
+required=gcc
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([subdir-objects])
+
+AM_PROG_AS
+AM_PROG_AR
+AC_PROG_RANLIB
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a libbar.a
+libfoo_a_SOURCES = src/a.s b.s
+libbar_a_SOURCES = src/c.s d.s
+libbar_a_CCASFLAGS =
+END
+
+mkdir src
+: >src/a.s
+: >b.s
+: >src/c.s
+: >d.s
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+$MAKE distcheck
+
+:
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
new file mode 100755
index 0000000..461325a
--- /dev/null
+++ b/t/subobj11a.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake works around a bug of Solaris Make. The bug is the
+# following.  If we have a Makefile containg a file inclusion like this:
+#   include .//foo.mk
+# Solaris make fails with a message like:
+#   make: ... can't find '/foo.mk': No such file or directory
+#   make: fatal error ... read of include file '/foo.mk' failed
+# (even if the file 'foo.mk' exists). The error disappear by collapsing
+# the repeated slash '/' characters into a single one.
+#
+# See also sister "grepping" test 'subobj11b.test', and related test
+# 'subobj11c.test'.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+## The './/' below is meant.
+foo_SOURCES = .//src/foo.c
+END
+
+mkdir src
+
+cat > src/foo.c << 'END'
+int main(void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure --enable-dependency-tracking
+
+depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
+if test x"$depdir" != x; then
+  depdir=src/$depdir
+else
+  echo "$me: cannot extract value of DEPDIR from Makefile" >&2
+  Exit 1
+fi
+
+ls -l "$depdir"
+test -f "$depdir"/foo.Po
+
+echo 'quux:; echo "address@hidden@z" >$@' >> "$depdir"/foo.Po
+
+$MAKE quux
+$FGREP "address@hidden@z" quux
+
+$MAKE
+
+DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
+DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking' $MAKE distcheck
+
+:
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
new file mode 100755
index 0000000..129b6ea
--- /dev/null
+++ b/t/subobj11b.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake works around a bug of Solaris Make. The bug is the
+# following.  If we have a Makefile containg a file inclusion like this:
+#   include .//foo.mk
+# Solaris make fails with a message like:
+#   make: ... can't find '/foo.mk': No such file or directory
+#   make: fatal error ... read of include file '/foo.mk' failed
+# (even if the file 'foo.mk' exists). The error disappear by collapsing
+# the repeated slash '/' characters into a single one.
+#
+# See also "semantic" sister test 'subobj11a.test', and related test
+# 'subobj11c.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+## The 'zardoz' sources should activate a code paths in Automake that
+## cannot be sensibly tested by sister test 'subobj11a.test'.  The other
+## sources provide some sort of stress testing.
+foo_SOURCES = \
+  //server/zardoz0.c \
+  //server//zardoz1.c \
+  //server/path/to/zardoz2.c \
+  //server/another//path///to////zardoz3.c \
+  /foobar0.c \
+  ///foobar1.c \
+  ////foobar2.c \
+  /sub///foobar3.c \
+  ///sub/foobar4.c \
+  .//foobar5.c \
+  .//sub/foobar6.c \
+  ./sub//foobar7.c \
+  .//sub//foobar8.c \
+  sub/sub//sub///sub////foobar9.c
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# Be lax in the regexp, to account for automake conditionals, the
+# use of @am__include@, and similar stuff.
+grep 'include.*//.*foobar' Makefile.in && Exit 1
+
+# These checks depend on automake internals, but presently this is
+# the only way to test the code path we are interested in.
+# Please update these checks when (and if) the relevant automake
+# internals are changed.
+for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do
+  case $x in
+   */*) d=`echo $x | sed 's,[^/]*$,,'`; b=`echo $x | sed 's,^.*/,,'`;;
+     *) d=''; b=$x;;
+  esac
+  # Be a little lax in the regexp, to account for automake conditionals,
+  # quoting, and similar stuff.
+  grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in
+done
+
+# Sanity checks.
+for i in 0 1 2 3 4 5 6 7 8 9; do
+  grep "am__include.*/foobar$i\\." Makefile.in
+done
+
+:
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
new file mode 100755
index 0000000..9f59c5f
--- /dev/null
+++ b/t/subobj11c.sh
@@ -0,0 +1,51 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Automatic dependency tracking with subdir-objects option active:
+# check for a pathological case of slash-collapsing in the name of
+# included makefile fragments (containing dependency info).
+# See also related tests 'subobj11a.test' and 'subobj11b.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+foo_SOURCES = //zardoz.c
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+#
+# This check depends on automake internals, but presently this is
+# the only way to test the code path we are interested in.
+# Please update these checks when (and if) the relevant automake
+# internals are changed.
+#
+# Be a little lax in the regexp, to account for automake conditionals,
+# quoting, and similar stuff.
+#
+# FIXME: Are we sure this is the most sensible output in our situation?
+#
+grep '^[^/]*am__include[^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
+
+:
diff --git a/t/subobj2.sh b/t/subobj2.sh
new file mode 100755
index 0000000..3a3f861
--- /dev/null
+++ b/t/subobj2.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of subdir objects with C++.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.cc generic/b.cxx
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in
+grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
+grep '.*-c -o' Makefile.in
+
+:
diff --git a/t/subobj4.sh b/t/subobj4.sh
new file mode 100755
index 0000000..975f8fb
--- /dev/null
+++ b/t/subobj4.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure '../foo/foo.cpp' generates a rule.
+# Report from Dave Brolley.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_CONFIG_FILES([d1/Makefile d2/Makefile])
+AC_OUTPUT
+END
+
+mkdir d1 d2
+
+cat > Makefile.am << 'END'
+SUBDIRS = d1 d2
+END
+
+cat > d1/Makefile.am << 'END'
+bin_PROGRAMS = z
+z_SOURCES = ../d2/z.c
+END
+
+cat > d2/Makefile.am << 'END'
+END
+
+: > compile
+: > d2/z.c
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '\$(CC) .*\.\./d2/z\.c' d1/Makefile.in
+
+:
diff --git a/t/subobj5.sh b/t/subobj5.sh
new file mode 100755
index 0000000..3b05b6a
--- /dev/null
+++ b/t/subobj5.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of subdir make dist rules.
+# From Robert Collins.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([generic/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.c
+
+.PHONY: test-distdir test-build
+test-distdir: distdir
+       ls -l $(distdir) $(distdir)/* ;: For debugging.
+       test ! -r $(distdir)/a.c
+       test -f $(distdir)/generic/a.c
+test-build: all
+       ls -l . generic ;: For debugging.
+       test -f generic/a.$(OBJEXT)
+       test -f wish$(EXEEXT)
+       test ! -r a.$(OBJEXT)
+       test ! -r a$(EXEEXT)
+       test ! -r generic/wish$(EXEEXT)
+       test ! -r generic/a$(EXEEXT)
+END
+
+mkdir generic
+: > generic/Makefile.am
+
+cat > generic/a.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --add-missing
+
+./configure
+
+$MAKE test-distdir
+$MAKE dist
+$MAKE test-build
+
+:
diff --git a/t/subobj6.sh b/t/subobj6.sh
new file mode 100755
index 0000000..2f902f2
--- /dev/null
+++ b/t/subobj6.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of subdir make distclean rules.
+# From Robert Collins.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.c
+
+test-all: all
+       test -f generic/$(am__dirstamp)
+test-mostlyclean: mostlyclean
+       test ! -f generic/a.o
+test-distclean: distclean
+       test ! -f generic/$(am__dirstamp)
+END
+
+mkdir generic
+cat > generic/a.c << 'END'
+#include <stdio.h>
+int main ()
+{
+   printf ("maude!\n");
+   return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --add-missing
+
+mkdir build
+cd build
+
+../configure
+$MAKE test-all
+$MAKE test-mostlyclean
+$MAKE test-distclean
+
+cd ..
+
+# Now test without the subdir.
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+END
+
+mv generic/a.c a.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --include-deps --copy --add-missing
+
+mkdir build2
+cd build2
+
+../configure
+$MAKE
+$MAKE mostlyclean
+
+:
diff --git a/t/subobj7.sh b/t/subobj7.sh
new file mode 100755
index 0000000..863cae0
--- /dev/null
+++ b/t/subobj7.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure AM_CFLAGS appears in subdir compilation rule.
+# Report from Steve M. Robbins.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = wish
+wish_SOURCES = foo.c generic/a.c
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+grep wish_CFLAGS Makefile.in && Exit 1
+
+:
diff --git a/t/subobj8.sh b/t/subobj8.sh
new file mode 100755
index 0000000..35b566f
--- /dev/null
+++ b/t/subobj8.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' is included when subdir-objects is used in a subdir.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([tools])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_CONFIG_FILES([Makefile foo/Makefile])
+AC_OUTPUT
+END
+
+mkdir tools foo foo/bar
+
+cat > Makefile.am << 'END'
+SUBDIRS = foo
+END
+
+cat > foo/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = mumble
+mumble_SOURCES = bar/a.c
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+test -f tools/compile
+
+:
diff --git a/t/subobj9.sh b/t/subobj9.sh
new file mode 100755
index 0000000..f706edf
--- /dev/null
+++ b/t/subobj9.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for PR 312.
+#
+# == Report ==
+# When using non-recursive make to build a libtoolize-library from
+# sources in a subdirectory, 'make distcheck' fails because of incomplete
+# cleanup. "make clean" tries to remove '*.o' and '.../<file>.lo' but
+# forgets '.../<file>.o'.
+
+required='c++ libtoolize'
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_PROG_CXX
+AM_PROG_AR
+AM_PROG_LIBTOOL
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = src/foo.cc .//src/bar.cc  # The `.//' is meant.
+.PHONY: print
+print:
+       @echo BEG1: "$(LTCXXCOMPILE)" :1END
+       @echo BEG2: "$(CXXLINK)" :2END
+END
+
+mkdir src
+cat > src/foo.cc << 'END'
+int doit2 (void);
+int doit (void)
+{
+   return doit2();
+}
+END
+
+cat > src/bar.cc << 'END'
+int doit2 (void)
+{
+   return 23;
+}
+END
+
+
+libtoolize --force
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+# Ensure './libtool --help' will use the right tool versions.
+export AUTOCONF AUTOMAKE
+
+# Opportunistically check that --tag=CXX is used when supported.
+if ./libtool --help | grep tag=TAG; then
+  $MAKE print >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
+  grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout
+fi
+
+$MAKE
+$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
+cat output
+# GNU Make used to complain that the Makefile contained two rules
+# for 'src/.dirstamp' and './/src/.dirstamp'.
+grep 'overriding commands' output && Exit 1
+
+:
diff --git a/t/subobjname.sh b/t/subobjname.sh
new file mode 100755
index 0000000..bef3bf0
--- /dev/null
+++ b/t/subobjname.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we reuse variables whenever possible, to limit
+# combinational explosion.  (This test is named after the &subobjname
+# sub in Automake).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_CONDITIONAL([FOO1], [some test])
+AM_CONDITIONAL([FOO2], [some test])
+AM_CONDITIONAL([FOO3], [some test])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = c d
+
+if FOO1
+A1=a1.c
+endif
+
+if FOO2
+A2=a2.c
+endif
+
+if FOO3
+A3=a3.c
+endif
+
+B=$(A1) $(A2) $(A3)
+
+c_SOURCES=$(B)
+d_SOURCES=$(B)
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# Sanity check: make sure am_c_OBJECTS and am_d_OBJECTS are used
+# in the Makefile.  (This is an internal detail, so better make
+# sure we update this test if the naming changes in the future.)
+grep '^am_c_OBJECTS = ' Makefile.in
+grep '^am_d_OBJECTS = ' Makefile.in
+
+# Now the actual test.  Are both values equal?
+cobj=`sed -n '/^am_c_OBJECTS = / {
+                s/.* = \(.*\)$/\1/
+                p
+              }' Makefile.in`
+dobj=`sed -n '/^am_d_OBJECTS = / {
+                s/^.* = \(.*\)$/\1/
+                p
+              }' Makefile.in`
+test "$cobj" = "$dobj"
+
+:
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
new file mode 100755
index 0000000..f1b2ac3
--- /dev/null
+++ b/t/subpkg-yacc.sh
@@ -0,0 +1,129 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that ylwrap is installed properly, and $(YLWRAP) us defined
+# properly, when a subpackage is involved.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AC_CONFIG_SUBDIRS([lib])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib
+bin_PROGRAMS = MU
+MU_LDADD = lib/liblib.a
+# It's ok to override distdir.
+distdir = subpack-1
+# Remove a file created by rules in subdir lib.
+CLEANFILES = lib-dist-hook-has-run
+EOF
+
+cat >MU.c <<'EOF'
+int lib (void);
+int main (void)
+{
+  return lib ();
+}
+EOF
+
+mkdir lib
+mkdir lib/src
+
+cat >lib/configure.ac <<'EOF'
+AC_INIT([lib], [2.3])
+AM_INIT_AUTOMAKE
+AC_PROG_RANLIB
+AC_PROG_YACC
+dnl This comes after YACC and RANLIB checks, deliberately.
+AC_PROG_CC
+AM_PROG_AR
+AC_CONFIG_HEADERS([config.h:config.hin])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = liblib.a
+liblib_a_SOURCES = src/x.c foo.y
+EXTRA_liblib_a_SOURCES = bar.y
+
+dist-hook:
+       test -d $(top_distdir)
+       test -d $(distdir)
+       find $(top_distdir) $(distdir) ;: For debugging.
+       test -f $(top_distdir)/MU.c
+       test ! -f $(distdir)/MU.c
+       for suf in y c; do \
+         for name in foo bar; do \
+           test -f $(distdir)/$$name.$$suf || exit 1; \
+           test ! -f $(top_distdir)/$$name.$$suf || exit 1; \
+         done; \
+       done
+       test -f $(distdir)/foo.y
+       test ! -f $(top_distdir)/foo.y
+       test -f $(distdir)/src/x.c
+       test ! -f $(top_distdir)/src/x.c
+       test -f $(YLWRAP)
+       : > $(top_builddir)/../lib-dist-hook-has-run
+EOF
+
+cat > lib/foo.y << 'END'
+%{
+int yylex (void) { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cp lib/foo.y lib/bar.y
+
+cat >lib/src/x.c <<'EOF'
+#include <config.h>
+int lib (void)
+{
+  return 0;
+}
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -Wno-override
+
+cd lib
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE -Wno-override --add-missing
+cd ..
+
+./configure
+
+$MAKE dist
+test -f lib-dist-hook-has-run
+test -f subpack-1.tar.gz
+test ! -d subpack-1 # Make sure "dist" cleans up after itself.
+
+rm -f lib-dist-hook-has-run subpack-1.tar.gz
+
+yl_distcheck
+
+:
diff --git a/t/subpkg.sh b/t/subpkg.sh
new file mode 100755
index 0000000..82bf338
--- /dev/null
+++ b/t/subpkg.sh
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check subpackage handling.
+
+required=cc
+. ./defs || Exit 1
+
+mkdir m4
+
+cat >m4/foo.m4 <<'EOF'
+AC_DEFUN([FOO],[
+  AC_PROG_CC
+  AC_OUTPUT
+])
+EOF
+
+cat >>configure.ac <<'END'
+AC_CONFIG_SUBDIRS([lib])
+FOO
+END
+
+cat >Makefile.am <<'EOF'
+SUBDIRS = lib
+# Yes, This program is named LDADD.  So what?
+bin_PROGRAMS = LDADD
+LDADD_LDADD = lib/liblib.a
+
+# It's ok to override distdir.
+distdir = subpack-1
+
+# Make sure $(distdir) and $(top_distdir) work as expected.
+dist-hook:
+       test -f $(distdir)/LDADD.c
+       test -f $(top_distdir)/LDADD.c
+
+ACLOCAL_AMFLAGS = -I m4
+EOF
+
+cat >LDADD.c <<'EOF'
+int lib (void);
+int main (void)
+{
+  return lib ();
+}
+EOF
+
+mkdir lib
+mkdir lib/src
+
+cat >lib/configure.ac <<'EOF'
+AC_INIT([lib], [2.3])
+AM_INIT_AUTOMAKE
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_CONFIG_HEADERS([config.h:config.hin])
+AC_CONFIG_FILES([Makefile])
+FOO
+EOF
+
+cat >lib/Makefile.am <<'EOF'
+noinst_LIBRARIES = liblib.a
+liblib_a_SOURCES = src/x.c
+
+dist-hook:
+       test ! -f $(distdir)/LDADD.c
+       test -f $(top_distdir)/LDADD.c
+       test -f $(distdir)/src/x.c
+       test ! -f $(top_distdir)/src/x.c
+
+ACLOCAL_AMFLAGS = -I ../m4
+EOF
+
+cat >lib/src/x.c <<'EOF'
+#include <config.h>
+int lib (void)
+{
+  return 0;
+}
+EOF
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE -Wno-override
+
+cd lib
+$ACLOCAL -I ../m4
+$FGREP 'm4_include([../m4/foo.m4])' aclocal.m4
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE -Wno-override --add-missing
+cd ..
+
+./configure
+$MAKE
+$MAKE distcheck
+test ! -d subpack-1 # Make sure distcheck cleans up after itself.
+test -f subpack-1.tar.gz
+
+:
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
new file mode 100755
index 0000000..af89fc1
--- /dev/null
+++ b/t/subpkg2.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Try a DIST_SUBDIRS subpackage with no SUBDIRS.
+# Report from Gary V. Vaughan.
+
+. ./defs || Exit 1
+
+mkdir m4
+
+cat >m4/foo.m4 <<'EOF'
+AC_DEFUN([FOO],[
+  AC_OUTPUT
+])
+EOF
+
+cat >>configure.ac <<'END'
+AC_CONFIG_SUBDIRS([sub])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'EOF'
+DIST_SUBDIRS = sub
+dist-hook:
+       test -f $(distdir)/sub/script.in
+EOF
+
+mkdir sub
+
+cat >sub/configure.ac <<'EOF'
+AC_INIT([sub], [2.3])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([script])
+FOO
+EOF
+
+: >sub/script.in
+echo ACLOCAL_AMFLAGS = -I ../m4 > sub/Makefile.am
+
+$ACLOCAL -I m4
+$AUTOCONF
+$AUTOMAKE
+
+cd sub
+$ACLOCAL -I ../m4
+$FGREP 'm4_include([../m4/foo.m4])' aclocal.m4
+$AUTOCONF
+$AUTOMAKE -Wno-override
+cd ..
+
+./configure
+$MAKE distcheck
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
new file mode 100755
index 0000000..38dc455
--- /dev/null
+++ b/t/subpkg3.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure different subpackages may share files and directories.
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<'END'
+SUBDIRS = subpkg
+EXTRA_DIST = subpkg/foobar
+END
+
+cat >>configure.ac <<'END'
+AC_CONFIG_SUBDIRS([subpkg])
+AC_OUTPUT
+END
+
+mkdir subpkg
+
+echo foobar >subpkg/foobar
+
+echo SUBDIRS = >subpkg/Makefile.am
+
+cat >subpkg/configure.ac <<'END'
+AC_INIT([subpkg], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+cd subpkg
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+cd ..
+
+./configure
+$MAKE distcheck
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
new file mode 100755
index 0000000..f8e9a2c
--- /dev/null
+++ b/t/subpkg4.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to ensure 'distdir' fixes the mode of files and directories
+# copied into '$(distdir)', even with sub-packages.
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<'END'
+SUBDIRS = subpkg
+test-distdir-is-readable:
+       bad_dirs=`find $(distdir) -type d ! -perm -755 -print`; \
+       if test -n "$$bad_dirs"; then \
+         echo "directories not permissive: $$bad_dirs" >&2; \
+         exit 1; \
+       fi
+       bad_files=`find $(distdir) ! -type d ! -perm -444 -print`; \
+       if test -n "$$bad_files"; then \
+         echo "file not permissive: $$bad_files" >&2; \
+         exit 1; \
+       fi
+END
+
+cat >>configure.ac <<'END'
+AC_CONFIG_SUBDIRS([subpkg])
+AC_OUTPUT
+END
+
+mkdir subpkg subpkg/dir
+echo foobar >subpkg/foobar
+echo baz > subpkg/dir/baz
+
+chmod go-rwx subpkg/foobar subpkg/dir/baz subpkg/dir
+
+cat >subpkg/Makefile.am <<'END'
+EXTRA_DIST = foobar dir
+END
+
+cat >subpkg/configure.ac <<'END'
+AC_INIT([subpkg], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+cd subpkg
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+cd ..
+
+./configure
+$MAKE distdir
+$MAKE test-distdir-is-readable
diff --git a/t/subst-no-trailing-empty-line.sh 
b/t/subst-no-trailing-empty-line.sh
new file mode 100755
index 0000000..2069e3a
--- /dev/null
+++ b/t/subst-no-trailing-empty-line.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# If the last line of a automake-rewritten definition is made only of
+# @substitutions@, automake should take care of appending an empty
+# variable to make sure that line cannot end up substituted as a blank
+# line (that would confuse HP-UX Make).
+# These checks have been introduced in commit 'Release-1-9-254-g9d0eaef'
+# into the former test 'subst2.test'.
+
+. ./defs || Exit 1
+
+# These are deliberately quite long, so that the xxx_PROGRAMS definition
+# in Makefile.am below will be split on multiple lines, with the last
+# line containing only @substituted@ stuff that expands to empty (this is
+# required to expose the bug we are testing).
+v1=ABCDEFGHIJKLMNOPQRSTUVWX
+v2=ABCDEFGHIJKLMNOPQRSTUVWXY
+v3=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+# Literal backslash for use by grep.
+bs='\\'
+
+cat >> configure.ac <<END
+AC_SUBST([A], [''])
+AC_SUBST([$v1], [''])
+AC_SUBST([$v2], [''])
+AC_SUBST([$v3], [''])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<END
+AUTOMAKE_OPTIONS = no-dependencies
+CC = false
+EXEEXT =
+
+## The "x" and "zardoz" strings and the use of '+=' are there to ensure
+## that these variables get rewritten by Automake.
+noinst_PROGRAMS = x @$v1@ @$v2@ @$v3@
+bin_PROGRAMS = @A@
+bin_PROGRAMS += @$v1@ @$v2@ @$v3@
+check_PROGRAMS = zardoz \$(noinst_PROGRAMS)
+
+## Required whenever there are @substituted@ values in the
+## PROGRAMS primary, otherwise automake will complain.
+EXTRA_PROGRAMS =
+
+print-programs:
+       @echo BEG1: \$(noinst_PROGRAMS) :END1
+       @echo BEG2: \$(bin_PROGRAMS) :END2
+       @echo BEG3: \$(check_PROGRAMS) :END3
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+# For debugging.
+$EGREP -n 'ABCD|am__empty' Makefile.in
+# Sanity check.
+test `$EGREP -c "^[ address@hidden@ @address@hidden $tab]*$bs?$" Makefile.in` 
-eq 3
+
+./configure
+{
+  sed -n '/^noinst_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^bin_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^check_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^am__EXEEXT.*=/,/[^\\]$/p' Makefile
+} >t-programs
+cat t-programs
+grep '^ *$' t-programs && Exit 1
+
+$MAKE print-programs >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^BEG1: x :END1$' stdout
+grep '^BEG2: :END2$' stdout
+grep '^BEG3: zardoz x :END3$' stdout
+
+am__empty=X $MAKE -e print-programs >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^BEG1: x X :END1$' stdout
+grep '^BEG2: X :END2$' stdout
+grep '^BEG3: zardoz x X :END3$' stdout
+
+:
diff --git a/t/subst.sh b/t/subst.sh
new file mode 100755
index 0000000..f46f2ed
--- /dev/null
+++ b/t/subst.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that AC_SUBST($1) does something sensible.  From Ulrich
+# Drepper.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+dnl This test used to have the following lines, which cannot have
+dnl worked sensibly with Autoconf for years, however:
+dnl AC_SUBST($1)
+dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
+dnl
+AC_DEFUN([FOO],
+[AC_SUBST([$1])])
+FOO([BAR])
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+grep '^\$1' Makefile.in && Exit 1
+
+:
diff --git a/t/subst3.sh b/t/subst3.sh
new file mode 100755
index 0000000..cc81063
--- /dev/null
+++ b/t/subst3.sh
@@ -0,0 +1,177 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test installation with substitutions.  This test is based on nobase.test.
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+if test -n "$doit"; then
+  AC_SUBST([basehdr], [sub/base.h])
+  AC_SUBST([nobasehdr], [sub/nobase.h])
+  AC_SUBST([basedata], [sub/base.dat])
+  AC_SUBST([nobasedata], [sub/nobase.dat])
+  AC_SUBST([basescript], [sub/base.sh])
+  AC_SUBST([nobasescript], [sub/nobase.sh])
+  AC_SUBST([baseprog], ['sub/base$(EXEEXT)'])
+  AC_SUBST([nobaseprog], ['sub/nobase$(EXEEXT)'])
+  AC_SUBST([baselib], [sub/libbase.a])
+  AC_SUBST([nobaselib], [sub/libnobase.a])
+fi
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+foodir = $(prefix)/foo
+fooexecdir = $(prefix)/foo
+
+foo_HEADERS = @basehdr@
+nobase_foo_HEADERS = @nobasehdr@
+EXTRA_HEADERS = sub/base.h sub/nobase.h
+
+dist_foo_DATA = @basedata@
+nobase_dist_foo_DATA = @nobasedata@
+
+dist_fooexec_SCRIPTS = @basescript@
+nobase_dist_fooexec_SCRIPTS = @nobasescript@
+EXTRA_SCRIPTS = sub/base.sh sub/nobase.sh
+
+fooexec_PROGRAMS = @baseprog@
+nobase_fooexec_PROGRAMS = @nobaseprog@
+EXTRA_PROGRAMS = sub/base sub/nobase
+sub_base_SOURCES = source.c
+sub_nobase_SOURCES = source.c
+
+fooexec_LIBRARIES = @baselib@
+nobase_fooexec_LIBRARIES = @nobaselib@
+EXTRA_LIBRARIES = sub/libbase.a sub/libnobase.a
+sub_libbase_a_SOURCES = source.c
+sub_libnobase_a_SOURCES = source.c
+
+test-install-data: install-data
+       test   -f inst/foo/sub/nobase.h
+       test ! -f inst/foo/nobase.h
+       test   -f inst/foo/base.h
+       test   -f inst/foo/sub/nobase.dat
+       test ! -f inst/foo/nobase.dat
+       test   -f inst/foo/base.dat
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libbase.a
+
+test-install-exec: install-exec
+       test   -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pnobase.sh
+       test   -f inst/foo/pbase.sh
+       test   -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pnobase$(EXEEXT)
+       test   -f inst/foo/pbase$(EXEEXT)
+       test   -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libnobase.a
+       test   -f inst/foo/libbase.a
+
+test-install-nothing-data: install-data
+       test ! -f inst/foo/sub/nobase.h
+       test ! -f inst/foo/nobase.h
+       test ! -f inst/foo/base.h
+       test ! -f inst/foo/sub/nobase.dat
+       test ! -f inst/foo/nobase.dat
+       test ! -f inst/foo/base.dat
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libbase.a
+
+test-install-nothing-exec: install-exec
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pnobase.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libnobase.a
+       test ! -f inst/foo/libbase.a
+EOF
+
+mkdir sub
+
+: > sub/base.h
+: > sub/nobase.h
+: > sub/base.dat
+: > sub/nobase.dat
+: > sub/base.sh
+: > sub/nobase.sh
+
+cat >source.c <<'EOF'
+int
+main (int argc, char *argv[])
+{
+  return 0;
+}
+EOF
+cp source.c source2.c
+
+rm -f install-sh
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a --copy
+./configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
+
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+$MAKE clean
+
+test `find inst/foo -type f -print | wc -l` = 0
+
+./configure --prefix "`pwd`/inst" --program-prefix=p doit=
+
+$MAKE
+$MAKE test-install-nothing-data
+$MAKE test-install-nothing-exec
+$MAKE uninstall
+
+
+# Likewise, in a VPATH build.
+
+$MAKE distclean
+mkdir build
+cd build
+../configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
+$MAKE
+$MAKE test-install-data
+$MAKE test-install-exec
+$MAKE uninstall
+test `find inst/foo -type f -print | wc -l` = 0
+
+../configure --prefix "`pwd`/inst" --program-prefix=p doit=
+$MAKE
+$MAKE test-install-nothing-data
+$MAKE test-install-nothing-exec
+
+:
diff --git a/t/subst4.sh b/t/subst4.sh
new file mode 100755
index 0000000..ab3631e
--- /dev/null
+++ b/t/subst4.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_SUBST_NOTMAKE.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+myrule="\
+foo: bar
+       echo making \$@ from bar
+       echo \$@ > \$@
+"
+AC_SUBST([myrule])
+AM_SUBST_NOTMAKE([myrule])
+AC_OUTPUT
+EOF
+
+cat > Makefile.am <<'EOF'
address@hidden@
+EOF
+: > bar
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE foo
+test -f foo
+
+:
diff --git a/t/subst5.sh b/t/subst5.sh
new file mode 100755
index 0000000..2fef1b9
--- /dev/null
+++ b/t/subst5.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Complain about configure substitutions in EXTRA_PRIMARY variables.
+# Rationale: we need to know the literal values of, say, PROGRAMS.
+# Thus, we allow substitutions in bin_PROGRAMS, but then EXTRA_PROGRAMS
+# needs to list possible values of that substitution, literally.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AC_SUBST([substed1])
+AC_SUBST([substed2])
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = @substed1@
+EXTRA_PROGRAMS = @substed2@
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'bin_PROGRAMS.*contains configure substitution' stderr && Exit 1
+grep 'EXTRA_PROGRAMS.*contains configure substitution' stderr
+
+Exit 0
diff --git a/t/substre2.sh b/t/substre2.sh
new file mode 100755
index 0000000..a205c08
--- /dev/null
+++ b/t/substre2.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in variable substitution references, where
+# undefined variables break later substitutions.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([CC], [whocares])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+
+foo = foo.a foo.b $(doesnt_exist)
+bar = bar.a bar.b
+var1 = $(foo:.a=1.c) $(doesnt_exist:.b=2.c) $(bar:.a=3.c)
+var2 = $(var1:.b=4.c)
+
+bin_PROGRAMS = foo
+foo_SOURCES = $(var2)
+
+OBJEXT = obj
+.PHONY: test
+test:
+       is $(foo_OBJECTS) == foo1.obj foo4.obj bar3.obj bar4.obj
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE test
+
+:
diff --git a/t/substref.sh b/t/substref.sh
new file mode 100755
index 0000000..7183a91
--- /dev/null
+++ b/t/substref.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug in variable substitution references when left hand
+# pattern is null.
+# Report from Richard Boulton.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([CC], [whocares])
+AC_OUTPUT
+END
+
+: > hello.c
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+var1 = dlmain
+var2 = $(var1:=.)
+helldl_SOURCES = $(var2:=c)
+bin_PROGRAMS = helldl
+.PHONY: test
+test:
+       is $(helldl_SOURCES) $(helldl_OBJECTS) == dlmain.c dlmain.$(OBJEXT)
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE test
+
+# This is unrelated to the rest of this test.  But while we are
+# at it, make sure we don't use am__helldl_SOURCES_DIST here, since
+# it's not needed.  DIST_SOURCES should contain $(helldl_SOURCES).
+grep am__helldl_SOURCES_DIST Makefile && Exit 1
+grep 'DIST_SOURCES.*\$(helldl_SOURCES)' Makefile
+
+:
diff --git a/t/substtarg.sh b/t/substtarg.sh
new file mode 100755
index 0000000..2e695f8
--- /dev/null
+++ b/t/substtarg.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that substitutions in variables work.
+# From Lars J. Aas.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SOURCE([fakelib.c])
+AC_PROG_CC
+AM_PROG_AR
+RANLIB=:
+AC_SUBST([RANLIB])
+SUBST=hei
+AC_SUBST([SUBST])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = address@hidden@.a
+
address@hidden@_a_SOURCES = abra.c kadabra.c
+
+# Then we override the target rule:
address@hidden@.a: Makefile $(address@hidden@_a_OBJECTS) 
$(address@hidden@_a_DEPENDENCIES)
+       @echo here we do some custom stuff, instead of invoking the linker
+END
+
+: > ar-lib
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'address@hidden@.a' stderr
+$AUTOMAKE -Wno-override
+num=`grep 'address@hidden@.a:' Makefile.in | wc -l`
+test $num -eq 1
diff --git a/t/suffix-chain.tap b/t/suffix-chain.tap
new file mode 100755
index 0000000..604e8a9
--- /dev/null
+++ b/t/suffix-chain.tap
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that Automake can emit code that work round the inability of
+# some make implementations to automatically chain suffix rules.
+# See automake bug#7824 and bug#7670.
+
+required=cc
+. ./defs || Exit 1
+
+plan_ 8
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c1
+.c1.c0:
+       (echo 'int main (void)' && echo '{' && cat $<) > $@
+.c0.c:
+       (cat $< && echo '}') > $@
+CLEANFILES = foo.c0 foo.c
+END
+
+echo 'return 0;' > foo.c1
+
+command_ok_ "aclocal"   $ACLOCAL
+command_ok_ "automake"  $AUTOMAKE
+command_ok_ "autoconf"  $AUTOCONF
+command_ok_ "configure" ./configure
+
+directive=''; make_can_chain_suffix_rules || directive=TODO
+
+for target in all distcheck; do
+  command_ok_ "make $target" \
+              -D "$directive" -r "suffix rules not chained" \
+              $MAKE $target
+done
+
+command_ok_ "clean" $MAKE clean
+# Sanity check.
+cat >> Makefile <<'END'
+foo.c: foo.c0
+foo.c0: foo.c1
+END
+command_ok_ "make with explicit dependencies" $MAKE
+
+:
diff --git a/t/suffix.sh b/t/suffix.sh
new file mode 100755
index 0000000..f9944cb
--- /dev/null
+++ b/t/suffix.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure proper suffix rules for C compilation are produced, and
+# only once.
+# See also related test 'suffix2.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = foo
+noinst_LIBRARIES = libbar.a
+END
+
+for use_arlib in false :; do
+
+  if $use_arlib; then
+    am_warns=
+    echo AM_PROG_AR >> configure.ac
+    : > ar-lib
+  else
+    am_warns=-Wno-extra-portability
+  fi
+
+  $ACLOCAL --force
+
+  $AUTOMAKE $am_warns -i
+  grep '^ *\.c' Makefile.in # For debugging.
+  test `grep -c '^\.c\.o:' Makefile.in` -eq 1
+  test `grep -c '^\.c\.obj:' Makefile.in` -eq 1
+
+  $AUTOMAKE $am_warns
+  grep '^ *\.c' Makefile.in # For debugging.
+  test `grep -c '^\.c\.o:' Makefile.in` -eq 1
+  test `grep -c '^\.c\.obj:' Makefile.in` -eq 1
+
+done
+
+:
diff --git a/t/suffix10.tap b/t/suffix10.tap
new file mode 100755
index 0000000..72d0acc
--- /dev/null
+++ b/t/suffix10.tap
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that derivations work with .lo too.
+# (related to PR/37)
+
+required='cc libtoolize yacc'
+. ./defs || Exit 1
+
+plan_ 7
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AC_PROG_YACC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+EOF
+
+cat >Makefile.am << 'END'
+lib_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = foo.x_
+.x_.y:
+       rm -f $@ address@hidden
+## The leading ':;' works around a bug in bash <= 3.2.
+       :; { echo '/* autogenerated */' \
+         && echo '%{' \
+         && echo 'int yylex () {return 0;}' \
+         && echo 'void yyerror (char *s) {}' \
+         && echo '%}' \
+         && echo '%%' \
+         && echo "foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};" \
+         && echo '%%' \
+## Account for VPATH issues on weaker make implementations.
+         && cat `test -f '$<' || echo $(srcdir)/`$<; \
+       } > address@hidden
+       mv -f address@hidden $@
+.PHONY: test
+test:
+       echo $(libfoo_la_OBJECTS) | grep '^foo\.lo$$'
+END
+
+cat > foo.x_ << 'END'
+int foo (void) { return yyparse(); }
+END
+
+command_ok_ "libtoolize" libtoolize --force
+command_ok_ "aclocal"    $ACLOCAL
+command_ok_ "autoconf"   $AUTOCONF
+command_ok_ "automake"   $AUTOMAKE --add-missing
+command_ok_ "configure"  ./configure
+command_ok_ "make test"  $MAKE test
+
+directive=''; make_can_chain_suffix_rules || directive=TODO
+command_ok_ "make all" -D "$directive" -r "suffix rules not chained" \
+            $MAKE all
+
+:
diff --git a/t/suffix11.tap b/t/suffix11.tap
new file mode 100755
index 0000000..d365fbc
--- /dev/null
+++ b/t/suffix11.tap
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests that Automake understands multiple suffix rules on the same line.
+# PR/371 and PR/372: Reported by Duncan Gibson.
+# We also check for suffixes containing '-'.
+
+required=cc
+. ./defs || Exit 1
+
+plan_ 10
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat >Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz
+foo_SOURCES = foo.x_
+bar_SOURCES = bar.y-z
+baz_SOURCES = baz1.x_ baz2.y-z
+
+.y-z.c .x_.c:
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5).
+       sed 's/INTEGER/int/g' `test -f '$<' || echo $(srcdir)/`$< >$@
+
+CLEANFILES = foo.c bar.c baz1.c baz2.c
+
+.PHONY: test-real test-fake
+test-fake:
+       echo $(foo_OBJECTS) | grep '^foo\.foo$$'
+       echo $(bar_OBJECTS) | grep '^bar\.foo$$'
+       echo $(baz_OBJECTS) | grep '^baz1\.foo baz2\.foo$$'
+test-real:
+       echo $(foo_OBJECTS) | grep '^foo\.$(OBJEXT)$$'
+       echo $(bar_OBJECTS) | grep '^bar\.$(OBJEXT)$$'
+       echo $(baz_OBJECTS) | grep '^baz1\.$(OBJEXT) baz2\.$(OBJEXT)$$'
+check-local: test-real
+END
+
+echo 'INTEGER main(void) { return 0; }' > foo.x_
+echo 'INTEGER main(void) { return 0; }' > bar.y-z
+echo 'INTEGER main(void) { INTEGER baz(void); return baz(); }' > baz1.x_
+echo 'INTEGER baz(void) { return 0; }' > baz2.y-z
+
+command_ok_ "aclocal" $ACLOCAL
+command_ok_ "autoconf" $AUTOCONF
+
+# What we do is not portable.  Automake should warn.
+AUTOMAKE_fails -a
+command_ok_ "warn about unportable make usage" \
+  grep '[iI]nference rules can have only one target before the colon' stderr
+# But this should work anyway.
+command_ok_ "automake" $AUTOMAKE -a -Wno-portability
+
+command_ok_ "configure"  ./configure
+command_ok_ "make test-fake" env OBJEXT=foo $MAKE -e test-fake
+command_ok_ "make test-real" $MAKE test-real
+
+directive=''; make_can_chain_suffix_rules || directive=TODO
+
+for target in '' distcheck; do
+  command_ok_ "make $target" \
+              -D "$directive" -r "suffix rules not chained" \
+              $MAKE $target
+done
+
+:
diff --git a/t/suffix12.sh b/t/suffix12.sh
new file mode 100755
index 0000000..5882df7
--- /dev/null
+++ b/t/suffix12.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests that Automake understands suffix rules with subdir objects.
+# Reported by John Ratliff.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat >Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+SUFFIXES = .baz .o
+# We fake here:
+.baz.o:
+## Account for VPATH issues on weaker make implementations.
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c sub/bar.baz
+
+.PHONY: test-fake test-real
+test-fake:
+       echo $(foo_OBJECTS) | grep '^foo\.quux sub/bar\.quux$$'
+test-real:
+       echo $(foo_OBJECTS) | grep '^foo\.$(OBJEXT) sub/bar\.$(OBJEXT)$$'
+END
+
+mkdir sub
+: > sub/bar.baz
+: > foo.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+OBJEXT=quux $MAKE -e test-fake
+$MAKE test-real
+
+:
diff --git a/t/suffix13.sh b/t/suffix13.sh
new file mode 100755
index 0000000..6022205
--- /dev/null
+++ b/t/suffix13.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests that Automake understands suffix rules with renamed objects
+# and subdir objects.
+# Reported by Florian Briegel.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<EOF
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+EOF
+
+cat >Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+SUFFIXES = .baz .c
+.baz.c:
+       case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac
+## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5).
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+
+DISTCLEANFILES = sub/bar.c
+
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c sub/bar.baz
+foo_CFLAGS =
+END
+
+mkdir sub
+cat > sub/bar.baz <<'END'
+extern int foo ();
+int main () { return foo (); }
+END
+cat > foo.c <<'END'
+int foo () { return 0; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE
+
+$MAKE distcheck
+$MAKE distclean
+
+# Should also work without subdir-objects.
+
+sed '/subdir-objects/d' < Makefile.am > t
+mv -f t Makefile.am
+$AUTOMAKE
+./configure
+$MAKE
+$MAKE distcheck
+
+:
diff --git a/t/suffix2.sh b/t/suffix2.sh
new file mode 100755
index 0000000..6dd2616
--- /dev/null
+++ b/t/suffix2.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure proper suffix rules for C compilation are produced,
+# and only once, even for libtool libraries.
+# See also related test 'suffix.test'.
+required=libtoolize
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_LIBTOOL
+END
+
+cat > Makefile.am << 'END'
+lib_LTLIBRARIES = libltdl.la
+libltdl_la_SOURCES = ltdl.c ltdl.h
+END
+
+# Create all the files created libtoolize so we don't run libtoolize.
+# We don't want the user to need libtool to run this test.
+: > ltconfig
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
+$ACLOCAL
+
+$AUTOMAKE -a
+grep '^ *\.c' Makefile.in # For debugging.
+test `grep -c '^\.c\.o:' Makefile.in` -eq 1
+test `grep -c '^\.c\.obj:' Makefile.in` -eq 1
+
+$AUTOMAKE -i
+grep '^ *\.c' Makefile.in # For debugging.
+test `grep -c '^\.c\.o:' Makefile.in` -eq 1
+test `grep -c '^\.c\.obj:' Makefile.in` -eq 1
+
+:
diff --git a/t/suffix3.tap b/t/suffix3.tap
new file mode 100755
index 0000000..168c842
--- /dev/null
+++ b/t/suffix3.tap
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that suffix rules chain.
+
+required=c++
+. ./defs || Exit 1
+
+plan_ 10
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUFFIXES = .zoo
+.zoo.cc:
+       sed 's/INTEGER/int/g' `test -f '$<' || echo $(srcdir)/`$< >$@
+bin_PROGRAMS = foo
+foo_SOURCES = foo.zoo
+# This is required by "make distcheck".  The useless indirection is
+# reequired to avoid false positives by the grepping checks below.
+FOO = foo
+CLEANFILES = $(FOO).cc
+END
+
+command_ok_ "aclocal" $ACLOCAL
+command_ok_ "automake" $AUTOMAKE
+
+# The foo.cc intermediate step is implicit, it's a mistake if
+# Automake requires this file somewhere.  Also, Automake should
+# not require the file 'foo.c' anywhere.
+command_ok_ "intermediate files not mentioned" \
+  not $FGREP foo.c Makefile.in
+# However Automake must figure that foo.zoo is eventually
+# transformed into foo.o, and use this latter file (to link foo).
+command_ok_ "final object file figured out" \
+  $FGREP 'foo.$(OBJEXT)' Makefile.in
+
+command_ok_ "autoconf" $AUTOCONF
+command_ok_ "configure" ./configure
+
+# This is deliberately valid C++, but invalid C.
+cat > foo.zoo <<'END'
+using namespace std;
+INTEGER main (void)
+{
+  return 0;
+}
+END
+
+directive=''; make_can_chain_suffix_rules || directive=TODO
+
+for target in all distcheck; do
+  command_ok_ "make $target"  \
+              -D "$directive" -r "suffix rules not chained" \
+              $MAKE $target
+done
+
+# FIXME: should we check that intermediate file 'foo.cc' has
+# been removed?  Or is this requiring too much from the make
+# implementation?
+
+# Intermediate files should not be distributed.
+command_ok_ "make distdir" $MAKE distdir
+command_ok_ "intermediate file not distributed" test ! -r $me-1.0/foo.cc
+
+:
diff --git a/t/suffix4.sh b/t/suffix4.sh
new file mode 100755
index 0000000..4523096
--- /dev/null
+++ b/t/suffix4.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake doesn't abort on user-defined extensions.
+# Based on a report from Dmitry Mikhin <address@hidden>.
+
+# Also make sure that .SUFFIXES is automatically adjusted with
+# extensions from implicit rules.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+.k.o:
+       echo $< > $@
+
+bin_PROGRAMS = foo
+foo_SOURCES = foo.k
+END
+
+$ACLOCAL
+$AUTOMAKE
+grep '^\.SUFFIXES:' Makefile.in | sed -e 's/$/ /' > suffixes
+cat suffixes
+$FGREP ' .k ' suffixes
+
+:
diff --git a/t/suffix5.sh b/t/suffix5.sh
new file mode 100755
index 0000000..8608a86
--- /dev/null
+++ b/t/suffix5.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake include libtool objects resulting
+# from user-defined implicit rules.
+# Based on a report from Arkadiusz Miskiewicz <address@hidden>.
+
+required='cc libtool'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_SUBST([LINK], [:])
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+.k.lo:
+## Account for VPATH issues on weaker make implementations.
+       (echo $< && cat `test -f '$<' || echo $(srcdir)/`$<) > $@
+
+noinst_LTLIBRARIES = libfoo.la
+libfoo_la_SOURCES = foo.k
+
+.PHONY: test
+test: all
+       grep '^=GREP=ME=$$' foo.lo
+## Weaker regex to account for VPATH issues.
+       grep 'foo\.k$$' foo.lo
+check-local: test
+END
+
+: > ltmain.sh
+
+for auxscript in ar-lib config.guess config.sub; do
+  cp "$am_scriptdir/$auxscript" . \
+    || fatal_ "fetching auxiliary script '$auxscript'"
+done
+
+$ACLOCAL
+$AUTOMAKE
+grep '_OBJECTS.*foo\.lo' Makefile.in
+
+$AUTOCONF
+./configure
+
+echo '=GREP=ME=' > foo.k
+
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/suffix6.sh b/t/suffix6.sh
new file mode 100755
index 0000000..29ffc4d
--- /dev/null
+++ b/t/suffix6.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake supports implicit rules with dot-less
+# extensions.  Also make sure that '.o' and '.obj' are handled like
+# '.$(OBJEXT)'.  See also related "semantic" tests suffix6b.test
+# and suffix6c.test.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUFFIXES = a b .$(OBJEXT) c .o .obj
+bin_PROGRAMS = foo
+foo_SOURCES = fooa barc bazc
+ab:
+       dummy action 1
+b.$(OBJEXT):
+       dummy action 2
+c.o:
+       dummy action C
+c.obj:
+       dummy action C
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+sed -n -e '/foo_OBJECTS *=.*\\$/ {
+  :loop
+  p
+  n
+  t clear
+  :clear
+  s/\\$/\\/
+  t loop
+  p
+  n
+}' -e 's/$/ /' -e 's/^.*foo_OBJECTS *= */ /p' Makefile.in > foo-objects
+cat foo-objects
+
+# Automake must figure that fooa translates to foo.$(OBJEXT) and
+# foo.$(OBJEXT) using the following rules:
+#  fooa --[ab]--> foob --[b.$(OBJEXT)]--> foo.$(OBJEXT)
+$FGREP ' foo.$(OBJEXT) ' foo-objects
+#  barc --[c.o]--> bar.$(OBJEXT)    ## This is really meant!
+$FGREP ' bar.$(OBJEXT) ' foo-objects
+#  bazc --[c.obj]--> baz.$(OBJEXT)  ## This is really meant!
+$FGREP ' baz.$(OBJEXT) ' foo-objects
+
+:
diff --git a/t/suffix6b.sh b/t/suffix6b.sh
new file mode 100755
index 0000000..319e021
--- /dev/null
+++ b/t/suffix6b.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake supports implicit rules with dot-less
+# extensions.  Se also related "grepping" test suffix6.test.
+
+required=GNUmake # Other makes might not grok dot-less suffix rules.
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+# $(LINK) is not defined automatically by Automake, since the *_SOURCES
+# variables don't contain any known extension (.c, .cc, .f, ...).
+# So we need this hack -- but since such an hack can also serve as a
+# mild stress test, that's ok.
+AC_SUBST([LINK], ['cat >$@'])
+AC_SUBST([OBJEXT], [oOo])
+AC_SUBST([EXEEXT], [.XxX])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUFFIXES = a b c .$(OBJEXT)
+bin_PROGRAMS = foo
+foo_SOURCES = fooa
+ab:
+       { echo '=ab=' && cat $<; } >$@
+bc:
+       { echo '=bc=' && cat $<; } >$@
+c.$(OBJEXT):
+       { echo '=b.obj=' && cat $<; } >$@
+test:
+       : For debugging.
+       ls -l
+       : Implicit intermediate files should be removed by GNU make ...
+       test ! -r foob
+       test ! -r fooc
+       : ... but object files should not.
+       cat foo.$(OBJEXT)
+       : For debugging.
+       cat foo.XxX
+       : Now check that the chain of implicit rules has been executed
+       : completely and in the correct order.
+       (echo =b.obj= && echo =bc= && echo =ab= && echo =src=) > exp
+       diff exp foo.XxX
+       rm -f exp
+.PHONY: test
+check-local: test
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+echo =src= > fooa
+
+$MAKE
+$MAKE test
+$MAKE distcheck
+
+:
diff --git a/t/suffix6c.sh b/t/suffix6c.sh
new file mode 100755
index 0000000..80f3bf0
--- /dev/null
+++ b/t/suffix6c.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that '.o' and '.obj' are handled like '.$(OBJEXT)'.
+# See also related "grepping" test suffix6.test.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+# $(LINK) is not defined automatically by Automake, since the *_SOURCES
+# variables don't contain any known extension (.c, .cc, .f ...),
+# So we need this hack -- but since such an hack can also serve as a
+# mild stress test, that's ok.
+OBJEXT=${OBJEXT-oOo}
+AC_SUBST([LINK], ['cat >$@'])
+AC_SUBST([EXEEXT], [.XxX])
+AC_SUBST([OBJEXT])
+AC_OUTPUT
+END
+
+unset OBJEXT || :
+
+cat > Makefile.am << 'END'
+SUFFIXES = .zoo .o .obj address@hidden@
+
+bin_PROGRAMS = foo
+foo_SOURCES = foo.zoo
+
+.zoo.o:
+       { echo '=.zoo.o=' && cat $<; } >$@
+.zoo.obj:
+       { echo '=.zoo.obj=' && cat $<; } >$@
address@hidden@:
+       { echo 'address@hidden@=' && cat $<; } >$@
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+cat > foo.exp <<'END'
+=.zoo.oOo=
+%ONE%
+END
+echo %ONE% > foo.zoo
+$MAKE
+cat foo.oOo
+cat foo.XxX
+diff foo.XxX foo.exp
+
+rm -f foo.* exp
+
+cat > foo.exp <<'END'
+=.zoo.o=
+%TWO%
+END
+echo %TWO% > foo.zoo
+OBJEXT=o $MAKE -e
+cat foo.o
+cat foo.XxX
+diff foo.XxX foo.exp
+
+rm -f foo.* exp
+
+cat > foo.exp <<'END'
+=.zoo.obj=
+%THREE%
+END
+echo %THREE% > foo.zoo
+OBJEXT=obj $MAKE -e
+cat foo.obj
+cat foo.XxX
+diff foo.XxX foo.exp
+
+rm -f foo.* exp
+
+:
diff --git a/t/suffix7.sh b/t/suffix7.sh
new file mode 100755
index 0000000..bef1031
--- /dev/null
+++ b/t/suffix7.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake supports implicit rules "confusing"
+# extensions.  Inspired by a mail from Alex Hornby.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUFFIXES = .idl S.cpp C.h
+SUFFIXES += C.cpp S.h
+.idlC.cpp:
+       cp $< $@
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+# Make sure Automake has NOT recognized .cpp and .idlC as two new
+# extensions.
+grep 'SUFFIXES.* \.cpp' Makefile.in && Exit 1
+grep 'SUFFIXES.* \.idlC' Makefile.in && Exit 1
+
+:
diff --git a/t/suffix8.tap b/t/suffix8.tap
new file mode 100755
index 0000000..288dd99
--- /dev/null
+++ b/t/suffix8.tap
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Automake supports multiple derivations for the
+# same suffix.
+# From PR/37.
+
+required='cc libtoolize'
+. ./defs || Exit 1
+
+plan_ 10
+
+cat >>configure.ac <<'END'
+AM_PROG_AR
+AM_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am << 'END'
+# $(LINK) is not defined automatically by Automake, since the *_SOURCES
+# variables don't contain any known extension (.c, .cc, .f ...),
+# So we need this hack.
+LINK = :
+
+bin_PROGRAMS = foo
+lib_LTLIBRARIES = libfoo.la
+
+foo_SOURCES = foo.x_
+libfoo_la_SOURCES = bar.x_
+
+# The elaborate cp commands below account for VPATH issues on
+# weaker make implementations (e.g. IRIX 6.5).
+.x_.y_:
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+.y_.o:
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+.y_.obj:
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+.y_.z_:
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+.z_.lo:
+       cp `test -f '$<' || echo $(srcdir)/`$< $@
+
+# Some make implementations don't remove intermediate files
+# automatically, thus causing "make distcheck" to fail if
+# this is not added.
+MOSTLYCLEANFILES = *.y_ *.z_
+
+.PHONY: test0 test1 test2
+test0:
+       echo $(foo_OBJECTS) | grep '^foo\.foo$$'
+       echo $(libfoo_la_OBJECTS) | grep '^bar\.lo$$'
+test1:
+       echo $(foo_OBJECTS) | grep '^foo\.$(OBJEXT)$$'
+       echo $(libfoo_la_OBJECTS) | grep '^bar\.lo$$'
+test2: $(foo_OBJECTS) $(libfoo_la_OBJECTS)
+       test -f foo.$(OBJEXT)
+       test -f bar.lo
+check-local: test1 test2
+END
+
+echo 'int main (void) { return 0; }' > foo.x_
+echo 'int bar (void) { return 0; }' > bar.x_
+
+command_ok_ "libtoolize" libtoolize
+command_ok_ "aclocal"    $ACLOCAL
+command_ok_ "autoconf"   $AUTOCONF
+command_ok_ "automake"   $AUTOMAKE -a
+command_ok_ "configure"  ./configure
+command_ok_ "make test0" env OBJEXT=foo $MAKE -e test0
+command_ok_ "make test1" $MAKE test1
+
+directive=''; make_can_chain_suffix_rules || directive=TODO
+
+for target in test2 all distcheck; do
+  command_ok_ "make $target"  \
+              -D "$directive" -r "suffix rules not chained" \
+              $MAKE $target
+done
+
+:
diff --git a/t/suffix9.sh b/t/suffix9.sh
new file mode 100755
index 0000000..2c1d73d
--- /dev/null
+++ b/t/suffix9.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Automake choose the shorter route between suffixes
+# (related to PR/37)
+
+. ./defs || Exit 1
+
+cat >>configure.ac << 'END'
+AC_PROG_CC
+END
+
+$ACLOCAL
+
+#  x_ -> y -> c -> o
+#   \________/
+#
+# Automake should follow the bottom route: x_ -> c -> o because
+# it is shorter.
+#
+# It should not take the "-> y ->" route.  We use 'y' here so that
+# then Automake will complains that YACC is not defined and the test will
+# fail when this happens.
+
+cat >Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.x_
+
+.x_.y:
+       cp $< $@
+.x_.c:
+       cp $< $@
+END
+
+$AUTOMAKE -a
+
+# Idem with the rules the another order.
+
+cat >Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.x_
+
+.x_.c:
+       cp $< $@
+.x_.y:
+       cp $< $@
+END
+
+$AUTOMAKE -a
+
+:
diff --git a/t/symlink.sh b/t/symlink.sh
new file mode 100755
index 0000000..f4b4338
--- /dev/null
+++ b/t/symlink.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we get an error if symlink creation fails.
+# Reported by Joerg-Martin Schwarz.
+
+am_create_testdir=empty
+. ./defs || Exit 1
+
+: > Makefile.am
+
+cat > configure.ac << 'END'
+AC_INIT([symlink], [1.0])
+AC_CONFIG_AUX_DIR([subdir])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+$ACLOCAL
+AUTOMAKE_fails --add-missing
+
+grep '^configure\.ac:3: .*missing.*error while making link' stderr
+grep '^configure\.ac:3: .*install-sh.*error while making link' stderr
+
+test `$FGREP -c 'error while making link' stderr` -eq 2
+
+:
diff --git a/t/symlink2.sh b/t/symlink2.sh
new file mode 100755
index 0000000..46e26db
--- /dev/null
+++ b/t/symlink2.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that 'automake -a' redirects dangling symlinks.
+
+. ./defs || Exit 1
+
+rm -f install-sh
+ln -s Zardoz install-sh || skip_ "cannot create broken symlinks"
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+test -f install-sh
+test ! -r Zardoz
+
+:
diff --git a/t/syntax.sh b/t/syntax.sh
new file mode 100755
index 0000000..5b51a7a
--- /dev/null
+++ b/t/syntax.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for error for bad syntax.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+foo = q \
+
+bin_SCRIPTS = foo.sh
+END
+
+$ACLOCAL
+AUTOMAKE_fails -Wnone
+grep '^Makefile\.am:2:.*blank line following trailing backslash' stderr
+
+:
diff --git a/t/tags.sh b/t/tags.sh
new file mode 100755
index 0000000..b1b95a2
--- /dev/null
+++ b/t/tags.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported by Harlan Stenn: the tags target doesn't work
+# when there are only headers in a directory.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+noinst_HEADERS = iguana.h
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^ID:' Makefile.in
diff --git a/t/tags2.sh b/t/tags2.sh
new file mode 100755
index 0000000..7d4ee64
--- /dev/null
+++ b/t/tags2.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAGS_DEPENDENCIES only make sense if other tag-worthy things (such as
+# sources) exist.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat >Makefile.am << 'END'
+TAGS_DEPENDENCIES = foo
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'define.*TAGS_DEPENDENCIES.*without' stderr
+
+cat >>Makefile.am << 'END'
+bin_PROGRAMS = bar
+END
+
+AUTOMAKE_run
+grep 'define.*TAGS_DEPENDENCIES.*without' stderr && Exit 1
+
+:
diff --git a/t/tagsub.sh b/t/tagsub.sh
new file mode 100755
index 0000000..5915d46
--- /dev/null
+++ b/t/tagsub.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure tags and subdirs work correctly.  Bug report by
+# François Pinard, and later by Akim Demaille.
+
+required=etags
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+echo 'SUBDIRS = sub' > Makefile.am
+mkdir sub
+echo 'noinst_HEADERS = iguana.h' > sub/Makefile.am
+: > sub/iguana.h
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE tags
+test -f sub/TAGS
+test -f TAGS
+$FGREP sub/TAGS TAGS
+$FGREP iguana.h sub/TAGS
+
+$MAKE distclean
+test ! -f sub/TAGS
+test ! -f TAGS
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
new file mode 100755
index 0000000..32b1b80
--- /dev/null
+++ b/t/tap-ambiguous-directive.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - handling of "ambiguous" TODO and SKIP directives
+# See also related test 'tap-todo-skip-together.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..6
+ok 1 # foo SKIP
+not ok 2 # bar TODO
+ok 3 # :SKIP
+not ok 4 # :TODO
+ok 5 # SKIP SKIP
+not ok 6 # TODO TODO
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=6 pass=2 fail=2 xpass=0 xfail=1 skip=1 error=0
+
+cat > exp << 'END'
+PASS: all.test 1 # foo SKIP
+FAIL: all.test 2 # bar TODO
+PASS: all.test 3 # :SKIP
+FAIL: all.test 4 # :TODO
+SKIP: all.test 5 # SKIP SKIP
+XFAIL: all.test 6 # TODO TODO
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
new file mode 100755
index 0000000..4e88f3d
--- /dev/null
+++ b/t/tap-autonumber.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - unnumbered tests are OK, as long as their final total number
+#    agrees with the plan
+#  - test results without number get automatically numbered in the
+#    console progress output
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..14
+ok
+ok foo
+ok - foo2
+not ok
+not ok bar
+not ok - bar2
+; See that we can intermingle different kind of results without
+; messing up the autonumbering
+ok
+ok # TODO
+not ok # TODO who cares?
+ok
+not ok
+ok muuu # SKIP
+not ok
+ok
+END
+
+TESTS=all.test $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=14 pass=6 fail=5 xpass=1 xfail=1 skip=1 error=0
+
+cat > exp <<'END'
+PASS: all.test 1
+PASS: all.test 2 foo
+PASS: all.test 3 - foo2
+FAIL: all.test 4
+FAIL: all.test 5 bar
+FAIL: all.test 6 - bar2
+PASS: all.test 7
+XPASS: all.test 8 # TODO
+XFAIL: all.test 9 # TODO who cares?
+PASS: all.test 10
+FAIL: all.test 11
+SKIP: all.test 12 muuu # SKIP
+FAIL: all.test 13
+PASS: all.test 14
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
new file mode 100755
index 0000000..580e7d3
--- /dev/null
+++ b/t/tap-bad-prog.tap
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - missing, unreadable, or not-executable test scripts cause proper
+#    error reports
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+plan_ 6
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+TESTS = none.test noread.test noexec.test
+none.test:
+END
+
+cat > noexec.test <<'END'
+#!/bin/sh
+echo 1..1
+echo ok 1
+END
+
+cp noexec.test noread.test
+chmod a-r noread.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+if $MAKE check >stdout; then
+  r='not ok'
+else
+  r='ok'
+fi
+cat stdout
+result_ "$r" '"make check" returns non-zero exit status'
+
+# FIXME: maybe grep for stricter error messages in the next checks?
+
+command_ok_ "non-existent test is reported" \
+            grep '^ERROR: none\.test' stdout
+
+desc="non-executable test is reported"
+# Redirect output to avoid confusing automake's testsuite own TAP driver.
+if ./noexec.test >/dev/null; then
+  skip_ -r "any file is executable" "$desc"
+else
+  command_ok_ "$desc" -- grep '^ERROR: noexec\.test' stdout
+fi
+
+desc="non-readable test is reported"
+if test -r noread.test; then
+  skip_ -r "any file is readable" "$desc"
+else
+  command_ok_ "$desc" -- grep '^ERROR: noread\.test' stdout
+fi
+
+# Check that no spurious test result is reported.  This is lower-priority
+# (and in fact the check currently fails for our awk-based driver).
+directive=
+if test $am_tap_implementation = shell; then
+  directive=TODO
+else
+  # Older versions of IPC::Open3 (e.g., version 1.05 on perl 5.12.4 or
+  # version 1.0103 on perl 5.6.2) fail to properly trap errors in exec(2)
+  # calls in the child process; hence, the TAP driver cannot be properly
+  # informed of such error.
+  if $PERL -w -e '
+    use IPC::Open3 qw/open3/;
+    $@ = "";
+    eval { open3(*STDIN, *STDOUT, *STDERR, "am--no-such-command") };
+    $@ =~ m/\bopen3:.*am--no-such-command/
+      or die "Bad \$@ value: \"address@hidden"\n";
+  '; then
+    : # OK. IPC::Open3 should be good enough.
+  else
+    for s in '"missing plan" message' 'results'; do
+      skip_ -r "IPC::Open3 not good enough" "no spurious $s"
+    done
+    Exit 0
+  fi
+fi
+
+command_ok_ 'no spurious "missing plan" message' \
+    -D "$directive" -- not grep 'missing.* plan' stdout
+command_ok_ 'no spurious results' \
+  -D "$directive" -r 'still get "missing plan"' \
+  count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3
+
+:
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
new file mode 100755
index 0000000..cc95d98
--- /dev/null
+++ b/t/tap-bailout-and-logging.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - even after a "Bail out!" directive, all input is still copied in
+#    the log file
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+First line
+Bail out!
+non-TAP line after bailout
+# TAP diagnostic after bailout
+1..0 # SKIP TAP plan after bailout
+ok 1 - TAP result after bailout
+END
+
+$MAKE check && { cat all.log; Exit 1; }
+cat all.log
+
+for rx in \
+  'First line' \
+  'Bail out!' \
+  'non-TAP line after bailout' \
+  '# TAP diagnostic after bailout' \
+  '1\.\.0 # SKIP TAP plan after bailout' \
+  'ok 1 - TAP result after bailout' \
+; do
+  grep "^$rx$" all.log
+done
+
+:
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
new file mode 100755
index 0000000..94084d4
--- /dev/null
+++ b/t/tap-bailout-leading-space.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Older versions of prove and TAP::Harness (e.g., 3.17) didn't recognize
+# a "Bail out!" directive that was preceded by whitespace, but more modern
+# versions (e.g., 3.23) do.  So we leave this behaviour undefined for the
+# perl implementation of the Automake TAP driver, but expect the latter,
+# "more modern" behaviour in our awk TAP driver.
+
+am_parallel_tests=yes
+am_tap_implementation=shell
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..1
+ok 1
+ Bail out!
+END
+
+cat > b.test <<END
+1..1
+ok 1 # SKIP
+${tab}Bail out!
+END
+
+cat > c.test <<END
+1..1
+  ${tab}  ${tab}${tab}Bail out!   FUBAR! $tab
+END
+
+cat >> exp <<END
+PASS: a.test 1
+ERROR: a.test - Bail out!
+SKIP: b.test 1
+ERROR: b.test - Bail out!
+ERROR: c.test - Bail out! FUBAR!
+END
+
+TESTS='a.test b.test c.test' $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=3
+
+LC_ALL=C sort exp > t
+mv -f t exp
+
+# We need the sort below to account for parallel make usage.
+grep ': [abcde]\.test' stdout \
+  | sed "s/[ $tab]*#[ $tab]*SKIP.*//" \
+  | LC_ALL=C sort > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-bailout-suppress-badexit.sh 
b/t/tap-bailout-suppress-badexit.sh
new file mode 100755
index 0000000..1962639
--- /dev/null
+++ b/t/tap-bailout-suppress-badexit.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic TAP test protocol support:
+#  - A "Bail out!" directive causes the driver to ignore the exit
+#    status of the test script.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+tests='exit.test exit127.test sighup.test sigterm.test'
+
+cat > Makefile.am <<END
+TESTS = $tests
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > exit.test << 'END'
+#!/bin/sh
+echo 'Bail out!'
+exit 1
+END
+
+cat > exit127.test << 'END'
+#!/bin/sh
+echo 'Bail out!'
+exit 127
+END
+
+cat > sighup.test << 'END'
+#!/bin/sh
+echo 'Bail out!'
+kill -1 $$
+END
+
+cat > sigterm.test << 'END'
+#!/bin/sh
+echo 'Bail out!'
+kill -15 $$
+END
+
+chmod a+x $tests
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=4 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=4
+for tst in $tests; do grep "^ERROR: $tst - Bail out!" stdout; done
+$EGREP "ERROR: .*(exit.*status|terminat.*signal)" stdout && Exit 1
+
+:
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh 
b/t/tap-bailout-suppress-later-diagnostic.sh
new file mode 100755
index 0000000..9bc29de
--- /dev/null
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - A "Bail out!" directive causes the driver to ignore any TAP
+#    diagnostic message in the rest of the following TAP stream.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
+
+cat > all.test <<END
+1..1
+# sanity check
+ok 1
+Bail out!
+# not seen
+END
+
+# Doing the sums above, we have:
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
+grep '# all.test: sanity check' stdout
+grep 'not seen' stdout && Exit 1
+
+:
diff --git a/t/tap-bailout-suppress-later-errors.sh 
b/t/tap-bailout-suppress-later-errors.sh
new file mode 100755
index 0000000..e6cc6c2
--- /dev/null
+++ b/t/tap-bailout-suppress-later-errors.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - A "Bail out!" directive causes the driver to ignore any TAP
+#    result or error in the rest of the following TAP stream.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# Various errors that can all be squashed into a single test script.
+cat > foo.test << 'END'
+1..5
+Bail out!
+# All possible test results.
+# Test out-of-order.
+ok 4
+# Extra TAP plan.
+1..2
+# Another bailout directive.
+Bail out! Not seen.
+# Stop now, with too few tests run.
+END
+
+# Tests run after a "SKIP" plan.
+cat > bar.test << 'END'
+1..0 # SKIP
+Bail out!
+ok 1
+END
+
+# Too many tests run.
+cat > baz.test << 'END'
+1..1
+ok 1
+Bail out!
+ok 2
+ok 3
+END
+
+TESTS='foo.test bar.test baz.test' $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=3
+
+grep '^ERROR: foo\.test - Bail out!$' stdout
+grep '^ERROR: bar\.test - Bail out!$' stdout
+grep '^SKIP: bar\.test'               stdout
+grep '^ERROR: baz\.test - Bail out!$' stdout
+grep '^PASS: baz\.test 1$'            stdout
+
+$FGREP 'Not seen' stdout && Exit 1
+
+test `$FGREP -c ': foo.test' stdout` -eq 1
+test `$FGREP -c ': bar.test' stdout` -eq 2
+test `$FGREP -c ': baz.test' stdout` -eq 2
+
+:
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
new file mode 100755
index 0000000..0def87e
--- /dev/null
+++ b/t/tap-bailout.sh
@@ -0,0 +1,138 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic TAP test protocol support:
+#  - "Bail out!" magic
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+: > exp
+
+#------------------------------------------------------------------
+
+# Bailout without explanation.
+
+cat > a.test <<END
+1..4
+ok 1
+not ok 2
+Bail out!
+not ok 3
+ok 4 # SKIP
+END
+
+cat >> exp <<END
+PASS: a.test 1
+FAIL: a.test 2
+ERROR: a.test - Bail out!
+END
+
+# pass += 1, fail +=1, error += 1
+
+#------------------------------------------------------------------
+
+# Bailout with explanation.
+
+cat > b.test <<END
+1..7
+ok 1 # SKIP
+ok 2 # TODO
+not ok 3 # TODO
+Bail out! We're out of disk space.
+ok 4
+not ok 5
+not ok 6 # TODO
+ok 7 # TODO
+END
+
+cat >> exp <<END
+SKIP: b.test 1 # SKIP
+XPASS: b.test 2 # TODO
+XFAIL: b.test 3 # TODO
+ERROR: b.test - Bail out! We're out of disk space.
+END
+
+# skip += 1, xpass += 1, xfail += 1, error += 1
+
+#------------------------------------------------------------------
+
+# Bail out before the test plan.
+
+cat > c.test <<END
+ok 1
+ok 2
+Bail out! BOOOH!
+1..2
+END
+
+cat >> exp <<END
+PASS: c.test 1
+PASS: c.test 2
+ERROR: c.test - Bail out! BOOOH!
+END
+
+# pass += 2, error += 1
+
+#------------------------------------------------------------------
+
+# Bailout on the first line.
+
+cat > d.test <<END
+Bail out! mktemp -d: Permission denied
+ok 1
+END
+
+echo 'ERROR: d.test - Bail out! mktemp -d: Permission denied' >> exp
+
+# error += 1
+
+#------------------------------------------------------------------
+
+# TAP input comprised only of a bailout directive.
+
+cat > e.test <<END
+Bail out!
+END
+
+echo "ERROR: e.test - Bail out!" >> exp
+
+# error += 1
+
+#------------------------------------------------------------------
+
+# Doing the sums above, we have:
+test_counts='total=12 pass=3 fail=1 xpass=1 xfail=1 skip=1 error=5'
+
+TESTS='a.test b.test c.test d.test e.test' $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results $test_counts
+
+LC_ALL=C sort exp > t
+mv -f t exp
+
+# We need the sort below to account for parallel make usage.
+grep ': [abcde]\.test' stdout | LC_ALL=C sort > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
new file mode 100755
index 0000000..3d6d8fe
--- /dev/null
+++ b/t/tap-basic.sh
@@ -0,0 +1,175 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic TAP support:
+#  - LOG_COMPILER support;
+#  - basic support for TODO and SKIP directives, and "Bail out!" magic;
+#  - testsuite progress output on console;
+#  - runtime overriding of TESTS and TEST_LOGS;
+#  - correct counts of test results (both in summary and in progress
+#    output on console).
+# Note that some of the features checked here are checked in other
+# test cases too, usually in a more thorough and detailed way.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+## Defining LOG_COMPILER should work and not intefere with the
+## tap-driver script.
+TEST_LOG_COMPILER = cat
+TESTS = success.test
+
+ok.test:
+       echo '1..3' > address@hidden
+       echo 'ok 1' >> address@hidden
+       echo 'not ok 2 # TODO' >>address@hidden
+       echo 'ok 3 # SKIP' >>address@hidden
+       cat address@hidden ;: For debugging.
+       mv -f address@hidden $@
+END
+
+cat > success.test << 'END'
+1..20
+ok 1
+ok 2 two
+ok 3 - three
+ok 4 four four
+not ok 5
+not ok 6 six
+not ok 7 - seven
+not ok 8 eight eight
+ok 9 # TODO
+ok 10 ten # TODO
+ok 11 - eleven # TODO
+ok 12 twelve twelve # TODO
+not ok 13 # TODO
+not ok 14 fourteen # TODO
+not ok 15 - fifteen # TODO
+not ok 16 sixteen sixteen # TODO
+ok 17 # SKIP
+ok 18 eighteen # SKIP
+ok 19 - nineteen # SKIP
+ok 20 twenty twenty # SKIP
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# Basilar usage and testsuite progress output.
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=20 pass=4 fail=4 xpass=4 xfail=4 skip=4 error=0
+
+test -f success.log
+test -f test-suite.log
+
+cat > exp << 'END'
+PASS: success.test 1
+PASS: success.test 2 two
+PASS: success.test 3 - three
+PASS: success.test 4 four four
+FAIL: success.test 5
+FAIL: success.test 6 six
+FAIL: success.test 7 - seven
+FAIL: success.test 8 eight eight
+XPASS: success.test 9 # TODO
+XPASS: success.test 10 ten # TODO
+XPASS: success.test 11 - eleven # TODO
+XPASS: success.test 12 twelve twelve # TODO
+XFAIL: success.test 13 # TODO
+XFAIL: success.test 14 fourteen # TODO
+XFAIL: success.test 15 - fifteen # TODO
+XFAIL: success.test 16 sixteen sixteen # TODO
+SKIP: success.test 17 # SKIP
+SKIP: success.test 18 eighteen # SKIP
+SKIP: success.test 19 - nineteen # SKIP
+SKIP: success.test 20 twenty twenty # SKIP
+END
+
+$FGREP ': success.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# Override TESTS from the command line.
+
+rm -f *.log *.test
+
+cat > bail.test <<'END'
+1..1
+Bail out!
+ok 1
+END
+
+TESTS=bail.test $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
+
+test ! -f success.log
+test -f bail.log
+test -f test-suite.log
+
+grep '^ERROR: bail\.test - Bail out!' stdout
+grep '^PASS:' stdout && Exit 1
+test `$FGREP -c ': bail.test' stdout` -eq 1
+$FGREP 'success.test' stdout && Exit 1
+
+# Override TEST_LOGS from the command line, making it point to a test
+# (ok.test) that has to be generated at make time.
+
+rm -f *.log *.test
+
+TEST_LOGS=ok.log $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+test -f ok.test
+test -f ok.log
+test ! -f success.log
+test ! -f bail.log
+test -f test-suite.log
+
+$EGREP '(bail|success)\.test' stdout && Exit 1
+
+cat > exp << 'END'
+PASS: ok.test 1
+XFAIL: ok.test 2 # TODO
+SKIP: ok.test 3 # SKIP
+END
+
+$FGREP ': ok.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-color.sh b/t/tap-color.sh
new file mode 100755
index 0000000..b8c4004
--- /dev/null
+++ b/t/tap-color.sh
@@ -0,0 +1,173 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - colorization of TAP results and diagnostic messages
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+TERM=ansi; export TERM
+
+esc=''
+# Escape '[' for grep, below.
+red="$esc\[0;31m"
+grn="$esc\[0;32m"
+lgn="$esc\[1;32m"
+blu="$esc\[1;34m"
+mgn="$esc\[0;35m"
+std="$esc\[m"
+
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$std" | grep .` in
+  "$std") ;;
+  *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
+esac
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = color-tests
+AM_TEST_LOG_DRIVER_FLAGS = --comments
+TEST_LOG_COMPILER = cat
+TESTS = all.test skip.test bail.test badplan.test noplan.test \
+        few.test many.test order.test afterlate.test
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test << 'END'
+1..5
+ok 1 - foo
+# Hi! I shouldn't be colorized!
+not ok 2 - bar # TODO td
+ok 3 - baz # SKIP sk
+not ok 4 - quux
+ok 5 - zardoz # TODO
+END
+
+cat > skip.test << 'END'
+1..0 # SKIP whole script
+END
+
+cat > bail.test << 'END'
+1..1
+ok 1
+Bail out!
+END
+
+cat > badplan.test << 'END'
+1..2
+ok 1
+1..2
+ok 2
+END
+
+cat > noplan.test << 'END'
+ok 1
+END
+
+cat > few.test << 'END'
+1..2
+ok 1
+END
+
+cat > many.test << 'END'
+1..1
+ok 1
+ok 2
+END
+
+cat > order.test << 'END'
+1..1
+ok 5
+END
+
+cat > afterlate.test << 'END'
+ok 1
+1..2
+ok 2
+END
+
+AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+test_color ()
+{
+  # Not a useless use of cat; see above comments about grep.
+  cat stdout | grep "^${grn}PASS${std}: all\.test 1 - foo$"
+  cat stdout | grep "^${lgn}XFAIL${std}: all\.test 2 - bar # TODO td$"
+  cat stdout | grep "^${blu}SKIP${std}: all\.test 3 - baz # SKIP sk$"
+  cat stdout | grep "^${red}FAIL${std}: all\.test 4 - quux$"
+  cat stdout | grep "^${red}XPASS${std}: all\.test 5 - zardoz # TODO$"
+  cat stdout | grep "^${blu}SKIP${std}: skip\.test - whole script$"
+  cat stdout | grep "^${grn}PASS${std}: bail\.test 1$"
+  cat stdout | grep "^${mgn}ERROR${std}: bail\.test - Bail out!$"
+  cat stdout | grep "^${mgn}ERROR${std}: badplan\.test - multiple test plans$"
+  cat stdout | grep "^${mgn}ERROR${std}: noplan\.test - missing test plan$"
+  cat stdout | grep "^${mgn}ERROR${std}: few.test - too few tests run 
(expected 2, got 1)$"
+  cat stdout | grep "^${mgn}ERROR${std}: many.test - too many tests run 
(expected 1, got 2)$"
+  cat stdout | grep "^${mgn}ERROR${std}: many.test 2 # UNPLANNED$"
+  cat stdout | grep "^${mgn}ERROR${std}: order.test 5 # OUT-OF-ORDER 
(expecting 1)$"
+  cat stdout | grep "^${mgn}ERROR${std}: afterlate\.test 2 # AFTER LATE PLAN$"
+  # Diagnostic messages shouldn't be colorized.
+  cat stdout | grep "^# all\.test: Hi! I shouldn't be colorized!$"
+  :
+}
+
+test_no_color ()
+{
+  # With make implementations that, like Solaris make, in case of errors
+  # print the whole failing recipe on standard output, we should content
+  # ourselves with a laxer check, to avoid false positives.
+  # Keep this in sync with lib/am/check.am:$(am__color_tests).
+  if $FGREP '= Xalways || test -t 1 ' stdout; then
+    # Extra verbose make, resort to laxer checks.
+    # But we also want to check that the testsuite summary is not unduly
+    # colorized.
+    (
+      set +e # In case some grepped regex below isn't matched.
+      # Not a useless use of cat; see above comments about grep.
+      cat stdout | grep "TOTAL.*:"
+      cat stdout | grep "PASS.*:"
+      cat stdout | grep "FAIL.*:"
+      cat stdout | grep "SKIP.*:"
+      cat stdout | grep "XFAIL.*:"
+      cat stdout | grep "XPASS.*:"
+      cat stdout | grep "ERROR.*:"
+      cat stdout | grep "^#"
+      cat stdout | grep 'test.*expected'
+      cat stdout | grep 'test.*not run'
+      cat stdout | grep '===='
+      cat stdout | grep '[Ss]ee .*test-suite\.log'
+      cat stdout | grep '[Tt]estsuite summary'
+    ) | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  else
+    cat stdout | grep "$esc" && Exit 1
+    : For shells with broken 'set -e'
+  fi
+}
+
+AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+test_color
+
+$MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+test_no_color
+
+:
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
new file mode 100755
index 0000000..b14099a
--- /dev/null
+++ b/t/tap-common-setup.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Auxiliary test to set up common data used by many tests on TAP support.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+TEST_LOG_COMPILER = cat
+TESTS = all.test
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+rm -rf autom4te*.cache
+
+# So that the data files we've created won't be removed at exit.
+keep_testdirs=yes
+
+:
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
new file mode 100755
index 0000000..5049171
--- /dev/null
+++ b/t/tap-deps.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic TAP test protocol support:
+#  - dependencies between test scripts
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+# The tests are *deliberately* listed in inversed order here.
+TESTS = c.test b.test a.test
+b.log: a.log
+c.log: b.log
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test << 'END'
+#!/bin/sh
+echo 1..2
+echo ok 1
+# Creative quoting below to please maintainer-check.
+sleep '3'
+echo ok 2
+: > a.run
+END
+
+cat > b.test << 'END'
+#!/bin/sh
+echo 1..2
+if test -f a.run; then
+  echo ok 1
+else
+  echo not ok 1
+fi
+# Creative quoting below to please maintainer-check.
+sleep '3'
+echo ok 2
+: > b.run
+END
+
+cat > c.test << 'END'
+#!/bin/sh
+echo 1..1
+test -f b.run || { echo 'Bail out!'; exit 1; }
+echo ok 1
+rm -f a.run b.run
+END
+
+chmod a+x *.test
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+cat > exp << 'END'
+PASS: a.test 1
+PASS: a.test 2
+PASS: b.test 1
+PASS: b.test 2
+PASS: c.test 1
+END
+
+grep ': [abc]\.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# TODO: it would be nice to also redo the checks forcing parallel make...
+
+:
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
new file mode 100755
index 0000000..d3f28a5
--- /dev/null
+++ b/t/tap-diagnostic-custom.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - option '--diagnostic-string' to customize the string introducing
+#    TAP diagnostics
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+my_log_driver = $(srcdir)/tap-driver
+my_log_compiler = cat
+TEST_EXTENSIONS =
+TESTS =
+END
+
+: > later.mk
+
+# Quoting our comments below is an hack required to keep
+# comments near the things they refer to.
+i=0
+for string in \
+'## A letter' \
+    a \
+'## A number' \
+    1023 \
+'## A non-alphabetic character' \
+    @ \
+'## Some metacharacters (we need to repeat the "$" for make)' \
+    '^>;&*"|$$' \
+'## A whitespace character' \
+    " " \
+'## A tab character' \
+    "$tab" \
+'## A string with more whitespace' \
+    "  ${tab}a b${tab} c" \
+'## Note the we do not have the empty string here.  We prefer to' \
+'## leave its behaviour in this context undefined for the moment.'
+do
+  case $string in '##'*) continue;; esac
+  i=`expr $i + 1`
+  unindent >> Makefile.am << END
+    TEST_EXTENSIONS += .t$i
+    TESTS += foo$i.t$i
+    T${i}_LOG_COMPILER = \$(my_log_compiler)
+    T${i}_LOG_DRIVER = \$(my_log_driver)
+    AM_T${i}_LOG_DRIVER_FLAGS = \
+      --comments \
+      --diagnostic-string '$string'
+END
+  unindent > foo$i.t$i <<END
+    1..1
+    ok 1
+    $string blah blah $i
+END
+    echo "AM_T${i}_LOG_DRIVER_FLAGS = --no-comments" >> later.mk
+done
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=$i pass=$i fail=0 xpass=0 xfail=0 skip=0 error=0
+
+cat later.mk >> Makefile
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP 'blah blah' stdout && Exit 1
+
+:
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
new file mode 100755
index 0000000..31f5df6
--- /dev/null
+++ b/t/tap-diagnostic.sh
@@ -0,0 +1,124 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - diagnostic messages (TAP lines with leading "#")
+#  - flags '--comments' and '--no-comments' of the TAP test driver
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+metacharacters=\''"\$!&()[]<>#;^?*'
+
+cat > all.test <<END
+1..4
+# Hi! I'm a comment.
+# Tests begin.
+ok 1
+not ok 2 - foo # TODO
+ok 3 - bar # SKIP
+# Tests end.
+ok - zardoz
+# Shell metacharacters here: $metacharacters
+.# Leading characters before "#", not a TAP diagnostic line.
+x # Leading characters before "#", not a TAP diagnostic line.
+ # Leading whitespace before "#", not a TAP diagnostic line.
+${tab}# Leading whitespace before "#", not a TAP diagnostic line.
+ ${tab}  # Leading whitespace before "#", not a TAP diagnostic line.
+END
+
+cat > exp <<END
+# all.test: Hi! I'm a comment.
+# all.test: Tests begin.
+PASS: all.test 1
+XFAIL: all.test 2 - foo # TODO
+SKIP: all.test 3 - bar # SKIP
+# all.test: Tests end.
+PASS: all.test 4 - zardoz
+# all.test: Shell metacharacters here: $metacharacters
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+$EGREP -i "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1
+count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+echo 'AM_TEST_LOG_DRIVER_FLAGS = --comments' >> Makefile
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+$FGREP ' all.test' stdout > got
+cat exp
+cat got
+diff exp got
+count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+TEST_LOG_DRIVER_FLAGS="--no-comments" $MAKE -e check >stdout \
+  || { cat stdout; Exit 1; }
+cat stdout
+$EGREP -i "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1
+count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+# The "#"-prepended lines here shouldn't be parsed as test results.
+cat > all.test <<END
+1..1
+ok
+# ok
+#ok
+# not ok
+#not ok
+# Bail out!
+#Bail out!
+# SKIP
+#SKIP
+# TODO
+#TODO
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+# Diagnostic without leading whitespace, or with extra leading whitespace,
+# is ok.  Be laxer in the grepping checks, to allow for whitespace
+# normalization by the TAP driver.
+
+ws="[ $tab]"
+ws0p="${ws}*"
+ws1p="${ws}${ws0p}"
+
+cat > all.test <<END
+1..1
+ok 1
+#foo
+#bar${tab}
+#   zardoz  ${tab}
+#  ${tab} ${tab}${tab}foo  bar${tab}baz  ${tab}
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+grep "^# all.test:${ws0p}foo$" stdout
+grep "^# all.test:${ws0p}bar${ws0p}$" stdout
+grep "^# all.test:${ws1p}zardoz${ws0p}$" stdout
+grep "^# all.test:${ws1p}foo  bar${tab}baz${ws0p}$" stdout
+
+test `grep -c '^# all\.test:' stdout` -eq 4
+
+:
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
new file mode 100755
index 0000000..46b3b51
--- /dev/null
+++ b/t/tap-doc.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that an example given in the documentation really works.
+# See section "Simple Tests" subsection "Script-based Testsuites".
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.sh zardoz.tap bar.sh mu.tap
+TEST_EXTENSIONS = .sh .tap
+TAP_LOG_DRIVER = $(srcdir)/tap-driver
+## Ensure the test scripts are run in the correct order.
+mu.log: bar.log
+bar.log: zardoz.log
+zardoz.log: foo.log
+END
+
+cat > foo.sh <<'END'
+#!/bin/sh
+exit 0
+END
+
+cat > bar.sh <<'END'
+#!/bin/sh
+exit 77
+END
+
+cat > zardoz.tap << 'END'
+#!/bin/sh
+echo 1..4
+echo 'ok 1 - Daemon started'
+echo 'ok 2 - Daemon responding'
+echo 'ok 3 - Daemon uses /proc # SKIP /proc is not mounted'
+echo 'ok 4 - Daemon stopped'
+END
+
+cat > mu.tap << 'END'
+#!/bin/sh
+echo 1..2
+echo 'ok'
+echo 'not ok # TODO frobnication not yet implemented'
+END
+
+chmod a+x *.sh *.tap
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+cat > exp <<'END'
+PASS: foo.sh
+PASS: zardoz.tap 1 - Daemon started
+PASS: zardoz.tap 2 - Daemon responding
+SKIP: zardoz.tap 3 - Daemon uses /proc # SKIP /proc is not mounted
+PASS: zardoz.tap 4 - Daemon stopped
+SKIP: bar.sh
+PASS: mu.tap 1
+XFAIL: mu.tap 2 # TODO frobnication not yet implemented
+END
+
+sed -n '/^PASS: foo\.sh/,/^XFAIL: mu\.tap/p' stdout > t
+cat t
+# Strip extra "informative" lines that could be printed by Solaris
+# Distributed Make.
+LC_ALL=C $EGREP -v ' --> ([0-9][0-9]* job|[Jj]ob output)' t > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
new file mode 100755
index 0000000..2232712
--- /dev/null
+++ b/t/tap-doc2.sh
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that an example given in the documentation really works.
+# See section "Using the TAP test protocol", subsection "Use TAP
+# with the Automake test harness".
+
+am_create_testdir=empty
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am <<'END'
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/build-aux/tap-driver.sh
+TESTS = foo.test bar.test baz.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > configure.ac <<'END'
+AC_INIT([GNU Try Tap], [1.0], address@hidden)
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([foreign parallel-tests -Wall -Werror])
+AC_CONFIG_FILES([Makefile])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
+AC_OUTPUT
+END
+
+cat > foo.test <<'END'
+#!/bin/sh
+echo 1..4 # Number of tests to be executed.
+echo 'ok 1 - Swallows fly'
+echo 'not ok 2 - Caterpillars fly # TODO metamorphosis in progress'
+echo 'ok 3 - Pigs fly # SKIP not enough acid'
+echo '# I just love word plays...'
+echo 'ok 4 - Flies fly too :-)'
+END
+
+cat > bar.test <<'END'
+#!/bin/sh
+echo 1..3
+echo 'not ok 1 - Bummer, this test has failed.'
+echo 'ok 2 - This passed though.'
+echo 'Bail out! Ennui kicking in, sorry...'
+echo 'ok 3 - This will not be seen.'
+END
+
+cat > baz.test <<'END'
+#!/bin/sh
+echo 1..1
+echo ok 1
+# Exit with error, even if all the tests have been successful.
+exit 7
+END
+
+chmod a+x *.test
+
+# Strip extra "informative" lines that could be printed by Solaris
+# Distributed Make.
+mkdir build-aux
+cp "$am_scriptdir"/tap-driver.sh build-aux \
+  || framework_failure_ "fetching the perl TAP driver"
+
+(export AUTOMAKE ACLOCAL AUTOCONF && $AUTORECONF -vi) || Exit 1
+
+./configure --help # Sanity check.
+./configure || skip_ "configure failed"
+
+case $MAKE in *\ -j*) skip_ "can't work easily with concurrent make";; esac
+
+# Prevent Sun Distributed Make from trying to run in parallel.
+DMAKE_MODE=serial; export DMAKE_MODE
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+cat > exp <<'END'
+PASS: foo.test 1 - Swallows fly
+XFAIL: foo.test 2 - Caterpillars fly # TODO metamorphosis in progress
+SKIP: foo.test 3 - Pigs fly # SKIP not enough acid
+PASS: foo.test 4 - Flies fly too :-)
+FAIL: bar.test 1 - Bummer, this test has failed.
+PASS: bar.test 2 - This passed though.
+ERROR: bar.test - Bail out! Ennui kicking in, sorry...
+PASS: baz.test 1
+ERROR: baz.test - exited with status 7
+END
+
+sed -n '/^PASS: foo\.test/,/^ERROR: baz\.test/p' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+grep '^Please report to address@hidden' stdout
+
+env \
+  TESTS='foo.test baz.test' \
+  TEST_LOG_DRIVER_FLAGS='--comments --ignore-exit' \
+  $MAKE -e check >stdout || { cat stdout; Exit 1; }
+
+cat > exp <<'END'
+PASS: foo.test 1 - Swallows fly
+XFAIL: foo.test 2 - Caterpillars fly # TODO metamorphosis in progress
+SKIP: foo.test 3 - Pigs fly # SKIP not enough acid
+# foo.test: I just love word plays...
+PASS: foo.test 4 - Flies fly too :-)
+PASS: baz.test 1
+END
+
+sed -n '/^PASS: foo\.test/,/^PASS: baz\.test/p' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# Sanity check the distribution.
+cat > bar.test <<'END'
+#!/bin/sh
+echo 1..1
+echo ok 1
+END
+echo AM_TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile.in
+./config.status Makefile
+$MAKE distcheck
+
+rm -f Makefile.in # To avoid a maintainer-check failure.
+
+:
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
new file mode 100755
index 0000000..879d051
--- /dev/null
+++ b/t/tap-driver-stderr.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Unit test on TAP driver:
+#  - error messages from awk/shell/perl goes to the console
+
+required=non-root
+am_parallel_tests=yes
+am_create_testdir=empty
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+tst=zardoz
+
+for suf in trs log; do
+
+  rm -f $tst.log $tst.trs
+  touch $tst.$suf
+  chmod a-w $tst.$suf
+
+  st=0
+  ./tap-driver --test-name $tst --log-file $tst.log --trs-file $tst.trs \
+    -- sh -c 'echo 1..1; echo ok 1; echo "Hello, World!"' \
+    >stdout 2>stderr && st=1
+  cat stdout
+  cat stderr >&2
+  cat $tst.log || :
+  cat $tst.trs || :
+  test $st -eq 0
+
+  $FGREP 'Hello, World!' stderr stdout && Exit 1
+  $FGREP $tst.$suf stderr
+
+done
+
+:
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
new file mode 100755
index 0000000..1a8a99b
--- /dev/null
+++ b/t/tap-empty-diagnostic.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - empty diagnostic messages are discarder
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+sed 's/\$$//' > all.test <<END
+1..1$
+ok 1$
+#$
+# $
+#${tab}$
+#   ${tab} $tab${tab}$
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep '^PASS:.*all\.test' stdout # Sanity check.
+grep '#.*all\.test' stdout && Exit 1
+grep "all\.test[ $tab]*:[ $tab]*$" stdout && Exit 1
+
+:
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
new file mode 100755
index 0000000..4d3bfda
--- /dev/null
+++ b/t/tap-empty.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: the following situations should be flagged as errors:
+#  - empty TAP input
+#  - blank TAP input
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# Empty TAP input.
+: > empty.test
+
+# Blank TAP input (one empty line).
+echo > blank.test
+
+# Blank TAP input (one whitespace-only line).
+cat > white.test  <<END
+  ${tab}
+END
+
+# Blank TAP input (few blank and whitespace-only lines).
+cat > white2.test  <<END
+
+
+ ${tab}  ${tab}${tab}
+
+${tab}
+
+END
+
+for input in empty blank white white2; do
+  cp $input.test all.test
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
+  grep '^ERROR: all\.test - missing test plan$' stdout
+done
+
+:
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
new file mode 100755
index 0000000..595c384
--- /dev/null
+++ b/t/tap-escape-directive-2.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - "escape" TODO and SKIP directives (by escaping the "#" character)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..8
+
+not ok \ # TODO
+ok \ # SKIP
+
+not ok \\# TODO
+ok \\# SKIP
+
+ok \\\# TODO
+ok \\\# SKIP
+
+not ok \\\\\\\\\\# TODO
+ok     \\\\\\\\\\# SKIP
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=8 pass=2 fail=0 xpass=0 xfail=3 skip=3 error=0
+
+grep '^XFAIL: all\.test 1 .*# TODO' stdout
+grep '^SKIP: all\.test 2 .*# SKIP' stdout
+grep '^XFAIL: all\.test 3 .*# TODO' stdout
+grep '^SKIP: all\.test 4 .*# SKIP' stdout
+grep '^PASS: all\.test 5 .*# TODO' stdout
+grep '^PASS: all\.test 6 .*# SKIP' stdout
+grep '^XFAIL: all\.test 7 .*# TODO' stdout
+grep '^SKIP: all\.test 8 .*# SKIP' stdout
+
+:
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
new file mode 100755
index 0000000..8b24251
--- /dev/null
+++ b/t/tap-escape-directive.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - "escape" TODO and SKIP directives (by escaping the "#" character)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..2
+ok \# TODO
+ok \# SKIP
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+grep '^PASS: all\.test 1 .*# TODO' stdout
+grep '^PASS: all\.test 2 .*# SKIP' stdout
+
+:
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
new file mode 100755
index 0000000..abc1ace
--- /dev/null
+++ b/t/tap-exit.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - an exit status != 0 of a test script causes an hard error
+#  - the '--ignore-exit' option causes the TAP test driver to ignore
+#    exit statuses of the test scripts.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+echo TESTS = > Makefile.am
+for st in 1 2 77 99; do
+  unindent > exit${st}.test <<END
+    #!/bin/sh
+    echo 1..1
+    echo ok 1
+    exit $st
+END
+  echo TESTS += exit${st}.test >> Makefile.am
+done
+
+chmod a+x *.test
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=8 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=4
+
+grep '^ERROR: exit1\.test - exited with status 1$' stdout
+grep '^ERROR: exit2\.test - exited with status 2$' stdout
+grep '^ERROR: exit77\.test - exited with status 77$' stdout
+grep '^ERROR: exit99\.test - exited with status 99$' stdout
+
+echo TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=4 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+:
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
new file mode 100755
index 0000000..6815ac5
--- /dev/null
+++ b/t/tap-fancy.sh
@@ -0,0 +1,133 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: some unusual forms for valid TAP input.
+# See also related test 'tap-fancy2.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+#
+# From manpage Test::Harness::TAP(3):
+#
+# ``Lines written to standard output matching /^(not )?ok\b/ must be
+#   interpreted as test lines. All other lines must not be considered
+#   test output.''
+#
+# Unfortunately, the exact format of TODO and SKIP directives is not as
+# clearly described in that manpage; but a simple reverse-engineering of
+# the prove(1) utility shows that it is probably given by the perl regex
+# /#\s*(TODO|SKIP)\b/.
+#
+
+cat > all.test <<END
+1..21
+
+ok? a question
+not ok? a question
+
+ok+plus
+not ok+plus
+
+ok-minus
+not ok-minus
+
+ok#55
+not ok#55
+
+ok${tab}  ${tab}9
+ok ${tab}${tab}          10
+
+not ok${tab}  ${tab}11
+not ok ${tab}${tab}          12
+
+ok# SKIP
+ok${tab}#SKIP--who cares?
+ok?#SKIP!
+ok!#SKIP?
+
+not ok# TODO
+not ok${tab}#TODO--who cares?
+not ok?#TODO!
+not ok!#TODO?
+
+ok~#TODO
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=21 pass=6 fail=6 xfail=4 xpass=1 skip=4 error=0
+
+#
+# "Weird" characters support.
+#
+
+# The "#" character might cause confusion w.r.t. TAP directives (TODO,
+# SKIP), so we don't attempt to use it.
+weirdchars=\''"$!&()[]<>;^?*/@%=,.:'
+
+cat > all.test <<END
+1..6
+ok $weirdchars
+not ok $weirdchars
+ok $weirdchars # TODO
+not ok $weirdchars # TODO
+ok $weirdchars # SKIP
+Bail out! $weirdchars
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=6 pass=1 fail=1 xfail=1 xpass=1 skip=1 error=1
+$FGREP "PASS: all.test 1 $weirdchars" stdout
+$FGREP "FAIL: all.test 2 $weirdchars" stdout
+$FGREP "XPASS: all.test 3 $weirdchars" stdout
+$FGREP "XFAIL: all.test 4 $weirdchars" stdout
+$FGREP "SKIP: all.test 5 $weirdchars" stdout
+$FGREP "ERROR: all.test - Bail out! $weirdchars" stdout
+
+#
+# Trailing backslashes does not confuse the parser.
+#
+
+bs='\'
+
+cat > all.test <<END
+1..6
+ok $bs
+not ok $bs
+ok # TODO $bs
+not ok # TODO $bs
+ok # SKIP $bs
+Bail out! $bs
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=6 pass=1 fail=1 xfail=1 xpass=1 skip=1 error=1
+grep '^PASS: all\.test 1 \\$' stdout
+grep '^FAIL: all\.test 2 \\$' stdout
+grep '^XPASS: all\.test 3 # TODO \\$' stdout
+grep '^XFAIL: all\.test 4 # TODO \\$' stdout
+grep '^SKIP: all\.test 5 # SKIP \\$' stdout
+grep '^ERROR: all\.test - Bail out! \\$' stdout
+
+:
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
new file mode 100755
index 0000000..bb51d54
--- /dev/null
+++ b/t/tap-fancy2.sh
@@ -0,0 +1,138 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: more unusual forms for valid TAP input.
+# See also related test 'tap-fancy.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+#
+# From manpage Test::Harness::TAP(3):
+#
+# ``Lines written to standard output matching /^(not )?ok\b/ must be
+#   interpreted as test lines. All other lines must not be considered
+#   test output.''
+#
+# Unfortunately, the exact format of TODO and SKIP directives is not as
+# clearly described in that manpage; but a simple reverse-engineering of
+# the prove(1) utility shows that it is probably given by the perl regex
+# /#\s*(TODO|SKIP)\b/.
+#
+
+# To avoid problems with backslashes in echo arguments.
+xecho () { printf '%s\n' "$*"; }
+
+# There are 34 values for $str ...
+for str in \
+  \'  \
+  '"' \
+  '`' \
+  '#' \
+  '$' \
+  '!' \
+  '\' \
+  '/' \
+  '&' \
+  '%' \
+  '(' \
+  ')' \
+  '|' \
+  '^' \
+  '~' \
+  '?' \
+  '*' \
+  '+' \
+  '-' \
+  ',' \
+  ':' \
+  ';' \
+  '=' \
+  '<' \
+  '>' \
+  '@' \
+  '[' \
+  ']' \
+  '{' \
+  '}' \
+  '\\' \
+  '...' \
+  '?[a-zA-Z0-9]*' \
+  '*.*' \
+; do
+  # ... each of them add 1 pass, 1 fail, ...
+  xecho "ok${str}"
+  xecho "not ok${str}"
+  # ... and (generally) 4 skips, 4 xfails, and 4 xpasses ...
+  for settings in \
+    'result="ok" directive=SKIP' \
+    'result="not ok" directive=TODO' \
+    'result="ok" directive=TODO' \
+  ; do
+    eval "$settings"
+    xecho "${result}# ${directive}${str}"
+    # ... but 6 skips, 6 xpasses and 6 xfails are to be removed, since
+    # they might not work with $str = '#' or $str = '\' ...
+    if test x"$str" != x'#' && test x"$str" != x'\'; then
+      xecho "${result}${str}#${directive}"
+      xecho "${result}${str}#   ${tab}${tab} ${directive}"
+      xecho "${result}${str}#${directive}${str}"
+    fi
+  done
+done > all.test
+
+# Sanity check against a previous use of unportable usages of backslashes
+# with the "echo" builtin.
+if grep '[^\\]\\#' all.test; then
+  framework_failure_ "writing backslashes in all.test"
+fi
+
+# ... so that we finally have:
+pass=34
+fail=34
+xfail=130 # = 4 * 34 - 6
+xpass=130 # = 4 * 34 - 6
+skip=130  # = 4 * 34 - 6
+error=0
+total=`expr $pass + $fail + $xfail + $xpass + $skip`
+
+# Even nastier!  But accordingly to the specifics, it should still work.
+for result in 'ok' 'not ok'; do
+  echo "${result}{[(<#${tab}TODO>)]}" >> all.test
+done
+echo "ok{[(<#${tab}SKIP>)]}" >> all.test
+
+# We have to update some test counts.
+xfail=`expr $xfail + 1`
+xpass=`expr $xpass + 1`
+skip=`expr $skip + 1`
+total=`expr $total + 3`
+
+# And add the test plan!
+echo 1..$total >> all.test
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+$EGREP '^(PASS|FAIL|SKIP).*#.*TODO' stdout && Exit 1
+$EGREP '^X?(PASS|FAIL).*#.*SKIP' stdout && Exit 1
+
+count_test_results total=$total pass=$pass fail=$fail skip=$skip \
+                   xpass=$xpass xfail=$xfail error=$error
+
+:
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
new file mode 100755
index 0000000..69dc5b0
--- /dev/null
+++ b/t/tap-global-log.sh
@@ -0,0 +1,122 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - which log files get copied in the global log?
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > ok.test << 'END'
+1..5
+ok 1
+ok 2
+ok 3
+not seen in global log
+ok 4
+ok 5
+END
+
+cat > top << 'END'
+1..6
+ok 1
+ok 2
+ok 3
+END
+
+cat > bot << 'END'
+ok 5
+ok 6
+END
+
+cat top - bot > skip.test << 'END'
+ok # SKIP
+::skip::
+END
+
+cat top - bot > todo.test << 'END'
+not ok # TODO
+::todo::
+END
+
+cat top - bot > fail.test << 'END'
+not ok
+::fail::
+END
+
+cat top - bot > xpass.test << 'END'
+ok # TODO
+::xpass::
+END
+
+cat top - bot > bail.test << 'END'
+::bail::
+Bail out!
+END
+
+cat top - bot > error.test << 'END'
+::error::
+1..7
+END
+
+# Created with "dd if=/dev/urandom count=1 | base64-encode"
+cat > hodgepodge <<'END'
+1+0 records in
+1+0 records out
+512 bytes (512 B) copied, 0.000241092 s, 2.1 MB/s
+gdivnV4VhL4DOzhE3zULJuun3PwqqQqMdATVcZbIQkNgyRvNBoqqHMBQEs7QsjDbp2nK+Szz
+EcelGyvXmHrW7yImaom6Yrg95k31VCmp/pGDRnTDwDrcOPJiv9jDReEmTAQkPuqLO+mFNly+
+DDHM9fNbzGumstsQ3wq3DOXz1pCV3JXwhjeaHSboeEbmr55bX0XHLSKaecctA0rXDXEyZWZ/
+ODlawSrAXzw0H7a+xBwjnNXZ3zYiwk3x+WQrPqNjb+qXiLLTxAKzx2/KnaFhxkPlte5jPRNB
+FciDolL+H/10LsCdSzLOrGnY2zH6vL2JMZfxjnb73zWFcdWWE01LTD7wpN5O1MP3+N47lcVe
+lWbkD04cJvhwxLElYSO24B743GG5EyGYt9SeZRE6xbgwq3fVOS8KqjwGxwi4adSBTtw0CV8W
+S/6n8dck1vBvjA+qpk0zMSYSqc3+jzW9UiGTmTEIwfw80p/lGNsfjcNBJ86nFkWUnHmrsi8k
+Dv57sK70mTg239g08f5Uvdga/5UreMBSgB0hUj5sbq57r7B1fsVr0Kag468la8zKy3ZEZ0gX
+++sbaJ9WGHhnKvjooeH+4Y6HwAFsdINde++FlCmp4EuNKKEEuXbSKLaOTy3+6pJ2DYdvRCL+
+frZwxH4hcrw8qh+8IakB02viewZS/qT57v4=
+END
+
+exec 5>misc.test
+echo 'ok # SKIP' >&5
+cat hodgepodge >&5
+echo 'not ok # TODO' >&5
+echo 'ok' >&5
+exec 5>&-
+
+cat > skipall.test << 'END'
+1..0 # SKIP all
+END
+
+# We don't care about the exit status of "make check" here.
+TESTS="`echo *.test`" $MAKE -e check || :
+cat test-suite.log
+
+grep ':.*ok|not seen' test-suite.log && Exit 1
+
+for s in skip todo fail xpass bail error; do
+  $FGREP "::$s::" test-suite.log
+done
+
+grep '^1\.\.0 # SKIP all$' test-suite.log
+
+case `cat test-suite.log` in
+  *"`cat hodgepodge`"*) ;;
+  *) Exit 1;;
+esac
+
+:
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
new file mode 100755
index 0000000..78d5c9f
--- /dev/null
+++ b/t/tap-global-result.sh
@@ -0,0 +1,187 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - which global test result derives from different test results
+#    mixed in a single script?
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > ok.test <<END
+1..3
+ok 1
+not ok 2 # TODO
+ok 3 # SKIP
+END
+
+cat > skip.test <<'END'
+1..3
+ok 1 # SKIP
+ok 2 # SKIP
+ok 3 # SKIP
+END
+
+cat > skipall.test <<'END'
+1..0 # SKIP
+foo
+# bar
+END
+
+cat > fail.test <<'END'
+1..1
+not ok 1
+END
+
+(sed '1s/.*/1..4/' ok.test && echo 'not ok 4') > fail2.test
+
+cat > xpass.test <<'END'
+1..1
+ok 1 # TODO
+END
+
+(sed '1s/.*/1..4/' ok.test && echo 'ok 4 # TODO') > xpass2.test
+
+echo 'Bail out!' > bail.test
+
+(cat ok.test && echo 'Bail out!') > bail2.test
+
+cat > bail3.test <<'END'
+1..0 # SKIP
+Bail out!
+END
+
+# Too many tests.
+cat > error.test <<'END'
+1..2
+ok 1
+ok 2 # SKIP
+not ok 3
+not ok 4 # TODO
+END
+
+# Too few tests.
+cat > error2.test <<'END'
+1..4
+ok 1
+not ok 2 # TODO
+ok 3 # SKIP
+END
+
+# Repeated plan.
+cat > error3.test <<'END'
+1..2
+1..2
+ok 1
+ok 2
+END
+
+# Too many tests, after a "SKIP" plan.
+cat > error4.test <<'END'
+1..0 # SKIP
+ok 1
+ok 2
+END
+
+# Tests out of order.
+cat > error5.test <<'END'
+1..4
+not ok 1 # TODO
+ok 3
+ok 2
+ok 4
+END
+
+# Wrong test number.
+cat > error6.test <<'END'
+1..2
+ok 1 # SKIP
+ok 7
+END
+
+# No plan.
+cat > error7.test <<'END'
+ok 1 # SKIP
+ok 2 # TODO
+not ok 3 # TODO
+ok 4
+END
+
+cat > hodgepodge.test <<'END'
+1..2
+not ok 1
+ok 2 # TODO
+Bail out!
+END
+
+cat > hodgepodge-all.test <<'END'
+1..4
+ok 1
+ok 2 # SKIP
+not ok 2 # TODO
+not ok 3
+ok 4 # TODO
+Bail out!
+END
+
+tests=`echo *.test` # Also required later.
+
+TESTS="$tests" $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+# Dirty trick required here.
+for tst in `echo " $tests " | sed 's/.test / /'`; do
+  echo :copy-in-global-log: yes >> $tst.trs
+done
+
+rm -f test-suite.log
+TESTS="$tests" $MAKE -e test-suite.log && Exit 1
+cat test-suite.log
+
+have_rst_section ()
+{
+  eqeq=`echo "$1" | sed 's/./=/g'`
+  # Assume $1 contains no RE metacharacters.
+  sed -n "/^$1$/,/^$eqeq$/p" test-suite.log > got
+  (echo "$1" && echo "$eqeq") > exp
+  cat exp
+  cat got
+  diff exp got
+}
+
+have_rst_section 'PASS: ok'
+have_rst_section 'SKIP: skip'
+have_rst_section 'SKIP: skipall'
+have_rst_section 'FAIL: fail'
+have_rst_section 'FAIL: fail2'
+have_rst_section 'FAIL: xpass'
+have_rst_section 'FAIL: xpass2'
+have_rst_section 'ERROR: bail'
+have_rst_section 'ERROR: bail2'
+have_rst_section 'ERROR: bail3'
+have_rst_section 'ERROR: error'
+have_rst_section 'ERROR: error2'
+have_rst_section 'ERROR: error3'
+have_rst_section 'ERROR: error4'
+have_rst_section 'ERROR: error5'
+have_rst_section 'ERROR: error6'
+have_rst_section 'ERROR: error7'
+have_rst_section 'ERROR: hodgepodge'
+have_rst_section 'ERROR: hodgepodge-all'
+
+:
diff --git a/t/tap-log.sh b/t/tap-log.sh
new file mode 100755
index 0000000..ca564e1
--- /dev/null
+++ b/t/tap-log.sh
@@ -0,0 +1,164 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - log file creation
+#  - log file removal
+#  - stdout and stderr of a script go in its log file
+#  - TEST_SUITE_LOG redefinition, at either automake or make time
+#  - VERBOSE environment variable support
+# Keep in sync with 'test-log.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TESTS = pass.test skip.test xfail.test fail.test xpass.test error.test
+TEST_SUITE_LOG = global.log
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# Custom markers, for use in grepping checks.
+cmarker=::: # comment marker
+pmarker=%%% # plain maker
+
+cat > pass.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker pass $pmarker" >&2
+echo "# $cmarker pass $cmarker" >&2
+echo "ok 1"
+END
+
+cat > skip.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker skip $pmarker"
+echo "# $cmarker skip $cmarker"
+echo "ok 1 # SKIP"
+END
+
+cat > xfail.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker xfail $pmarker" >&2
+echo "# $cmarker xfail $cmarker" >&2
+echo "not ok 1 # TODO"
+END
+
+cat > fail.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker fail $pmarker"
+echo "# $cmarker fail $cmarker"
+echo "not ok 1"
+END
+
+cat > xpass.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker xpass $pmarker" >&2
+echo "# $cmarker xpass $cmarker" >&2
+echo "ok 1 # TODO"
+END
+
+cat > error.test <<END
+#! /bin/sh -e
+echo 1..1
+echo   "$pmarker error $pmarker"
+echo "# $cmarker error $cmarker"
+echo 'Bail out!'
+END
+
+chmod a+x *.test
+
+TEST_SUITE_LOG=my.log $MAKE -e check && Exit 1
+ls -l # For debugging.
+test ! -f test-suite.log
+test ! -f global.log
+test -f my.log
+st=0
+for result in pass fail xfail xpass skip error; do
+  cat $result.log # For debugging.
+  $FGREP "$pmarker $result $pmarker" $result.log || st=1
+  $FGREP "$cmarker $result $cmarker" $result.log || st=1
+done
+test $st -eq 0 || Exit 1
+cat my.log # For debugging.
+for result in xfail fail xpass skip error; do
+  cat $result.log # For debugging.
+  $FGREP "$pmarker $result $pmarker" my.log || st=1
+  $FGREP "$cmarker $result $cmarker" my.log || st=1
+done
+test `$FGREP -c "$pmarker" my.log` -eq 5
+test `$FGREP -c "$cmarker" my.log` -eq 5
+
+# Passed test scripts shouldn't be mentioned in the global log.
+$EGREP '(^pass|[^x]pass)\.test' my.log && Exit 1
+# But failing (expectedly or not) and skipped ones should.
+$FGREP 'xfail.test' my.log
+$FGREP 'skip.test' my.log
+$FGREP 'fail.test' my.log
+$FGREP 'xpass.test' my.log
+$FGREP 'error.test' my.log
+
+touch error2.log test-suite.log global.log
+TEST_SUITE_LOG=my.log $MAKE -e mostlyclean
+ls -l # For debugging.
+test ! -f my.log
+test ! -f pass.log
+test ! -f fail.log
+test ! -f xfail.log
+test ! -f xpass.log
+test ! -f skip.log
+test ! -f error.log
+# "make mostlyclean" shouldn't remove unrelated log files.
+test -f error2.log
+test -f test-suite.log
+test -f global.log
+
+rm -f *.log
+
+VERBOSE=yes $MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+cat global.log
+test ! -f my.log
+test ! -f test-suite.log
+# Check that VERBOSE causes the global testsuite log to be
+# emitted on stdout.
+out=`cat stdout`
+log=`cat global.log`
+case $out in *"$log"*) ;; *) Exit 1;; esac
+
+touch error2.log test-suite.log my.log
+$MAKE clean
+ls -l # For debugging.
+test ! -f global.log
+test ! -f pass.log
+test ! -f fail.log
+test ! -f xfail.log
+test ! -f xpass.log
+test ! -f skip.log
+test ! -f error.log
+# "make clean" shouldn't remove unrelated log files.
+test -f error2.log
+test -f test-suite.log
+test -f my.log
+
+rm -f *.log
+
+:
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
new file mode 100755
index 0000000..351b10d
--- /dev/null
+++ b/t/tap-merge-stdout-stderr.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - The Automake TAP driver has an option that instruct it to read TAP
+#    input also from the stderr of the test command, not only its stdout.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat > Makefile.am << 'END'
+AM_TEST_LOG_DRIVER_FLAGS = --comments --merge
+TESTS = all.test
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+#!/bin/sh
+echo 1..4
+echo ok 1 >&2
+echo ok 2
+echo "not ok 3 # TODO" >&2
+echo "ok 4 # SKIP"
+echo "# foo foo foo" >&2
+END
+chmod a+x all.test
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
+grep '^# all\.test: foo foo foo' stdout
+
+cat > all.test <<END
+#!/bin/sh
+echo 1..1
+echo ok 1
+echo 'Bail out!' >&2
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
+
+# See that the option '--no-merge' can override the effect of '--merge'.
+
+TEST_LOG_DRIVER_FLAGS=--no-merge $MAKE -e check >stdout \
+  || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+
+
+:
diff --git a/t/tap-missing-plan-and-bad-exit.sh 
b/t/tap-missing-plan-and-bad-exit.sh
new file mode 100755
index 0000000..e1ea4fd
--- /dev/null
+++ b/t/tap-missing-plan-and-bad-exit.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - if a test script exits with non-zero status before printing the TAP
+#    plan, then the driver reports both "missing plan" and "exited with
+#    non-zero status" errors.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > foo.test <<END
+#!/bin/sh
+exit 123
+END
+
+echo TESTS = foo.test > Makefile.am
+
+chmod a+x foo.test
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=2
+
+grep '^ERROR: foo\.test - exited with status 123$' stdout
+grep '^ERROR: foo\.test - missing test plan$' stdout
+
+:
diff --git a/t/tap-more.sh b/t/tap-more.sh
new file mode 100755
index 0000000..6f5d5fe
--- /dev/null
+++ b/t/tap-more.sh
@@ -0,0 +1,162 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# More on TAP support:
+#  - more than one TAP-generating test script in $(TESTS)
+#  - VPATH builds
+#  - use with parallel make (if supported)
+#  - basic use of diagnostic messages (lines beginning with "#")
+#  - flags for TAP driver defined through AC_SUBST in configure.ac
+#  - messages generated by the testsuite harness reference the
+#    correct test script(s)
+#  - "make distcheck" works
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_SUBST([AM_TEST_LOG_DRIVER_FLAGS], ['--comments'])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+TESTS = 1.test 2.test 3.test
+EXTRA_DIST = $(TESTS) tap-driver
+END
+
+cat > 1.test <<'END'
+#! /bin/sh
+echo 1..2
+echo ok 1 - mu
+if test -f not-skip; then
+  echo "not ok 2 zardoz"
+else
+  echo "ok 2 zardoz # SKIP"
+fi
+END
+
+cat > 2.test <<'END'
+#! /bin/sh
+echo 1..3
+echo "ok"
+echo "not ok # TODO not implemented"
+echo "ok 3"
+END
+
+cat > 3.test <<END
+#! /bin/sh
+echo 1..1
+echo ok - blah blah blah
+echo '# Some diagnostic'
+if test -f bail-out; then
+  echo 'Bail out! Kernel Panic'
+else
+  :
+fi
+END
+
+chmod a+x [123].test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+# Try a VPATH and by default serial build first, and then an in-tree
+# and by default parallel build.
+for try in 0 1; do
+
+  if test $try -eq 0; then
+    # VPATH serial build.
+    mkdir build
+    cd build
+    srcdir=..
+    run_make=$MAKE
+  elif test $try -eq 1; then
+    # In-tree parallel build.
+    srcdir=.
+    case $MAKE in
+      *\ -j*)
+        # Degree of parallelism already specified by the user: do
+        # not override it.
+        run_make=$MAKE
+        ;;
+      *)
+        # Some make implementations (e.g., HP-UX) don't grok '-j',
+        # some require no space between '-j' and the number of jobs
+        # (e.g., older GNU make versions), and some *do* require a
+        # space between '-j' and the number of jobs (e.g., Solaris
+        # dmake).  We need a runtime test to see what works.
+        echo 'all:' > Makefile
+        for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do
+          $run_make && break
+        done
+        rm -f Makefile
+        ;;
+    esac
+  else
+    fatal_ "internal error, invalid value of '$try' for \$try"
+  fi
+
+  $srcdir/configure
+  ls -l # For debugging.
+
+  # Success.
+
+  $run_make check >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=6 pass=4 fail=0 xpass=0 xfail=1 skip=1 error=0
+  grep '^PASS: 1\.test 1 - mu$' stdout
+  grep '^SKIP: 1\.test 2 zardoz # SKIP$' stdout
+  test `$FGREP -c '1.test' stdout` -eq 2
+  grep '^PASS: 2\.test 1$' stdout
+  grep '^XFAIL: 2\.test 2 # TODO not implemented$' stdout
+  grep '^PASS: 2\.test 3$' stdout
+  test `$FGREP -c '2.test' stdout` -eq 3
+  grep '^PASS: 3\.test 1 - blah blah blah$' stdout
+  grep '^# 3\.test: Some diagnostic$' stdout
+  test `$FGREP -c '3.test' stdout` -eq 2
+
+  # Failure.
+
+  # Use 'echo' here, since Solaris 10 /bin/sh would try to optimize
+  # a ':' away after the first iteration, even if it is redirected.
+  echo dummy > not-skip
+  echo dummy > bail-out
+  $run_make check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=7 pass=4 fail=1 xpass=0 xfail=1 skip=0 error=1
+  grep '^PASS: 1\.test 1 - mu$' stdout
+  grep '^FAIL: 1\.test 2 zardoz$' stdout
+  test `$FGREP -c '1.test' stdout` -eq 2
+  grep '^PASS: 2\.test 1$' stdout
+  grep '^XFAIL: 2\.test 2 # TODO not implemented$' stdout
+  grep '^PASS: 2\.test 3$' stdout
+  test `$FGREP -c '2.test' stdout` -eq 3
+  grep '^PASS: 3\.test 1 - blah blah blah$' stdout
+  grep '^# 3\.test: Some diagnostic$' stdout
+  grep '^ERROR: 3\.test - Bail out! Kernel Panic$' stdout
+  test `$FGREP -c '3.test' stdout` -eq 3
+
+  cd $srcdir
+
+done
+
+$MAKE distcheck
+
+:
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
new file mode 100755
index 0000000..3cefd58
--- /dev/null
+++ b/t/tap-more2.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# More on TAP support:
+#  - more LOG_COMPILER at once for TAP tests
+#  - binary programs in $(TESTS)
+#  - interactions with 'check_*' variables
+
+required='cc native'
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .sh .tap
+
+tap_driver = $(srcdir)/tap-driver
+
+LOG_DRIVER = $(tap_driver)
+SH_LOG_DRIVER = $(tap_driver)
+TAP_LOG_DRIVER = $(tap_driver)
+
+TAP_LOG_COMPILER = cat
+SH_LOG_COMPILER = $(SHELL)
+LOG_COMPILER =
+
+EXTRA_DIST = baz.tap
+
+check_SCRIPTS = bar.sh
+bar.sh: Makefile
+       echo '#!/bin/sh' > address@hidden
+       echo 'echo 1..1' >> address@hidden
+       echo 'echo "not ok 1 # TODO"' >> address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+CLEANFILES = bar.sh
+
+check_PROGRAMS = foo-test
+foo_test_SOURCES = foo.c
+
+TESTS = foo-test $(check_SCRIPTS) baz.tap
+
+EXTRA_DIST += tap-driver
+END
+
+cat > foo.c <<'END'
+#include <stdio.h>
+int main (void)
+{
+  printf ("1..1\n");
+  printf ("ok 1\n");
+  return 0;
+}
+END
+
+cat > baz.tap << 'END'
+1..1
+ok 1 # SKIP
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+for target in check distcheck; do
+  $MAKE $target >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=3 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=0
+done
+
+:
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
new file mode 100755
index 0000000..115ffcd
--- /dev/null
+++ b/t/tap-msg0-bailout.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - literal strings "0" and "0.0" as a test description in the message
+#    of a "plan with skip" TAP plan
+# generally true!
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo 'Bail out! 0' > a.test
+echo 'Bail out! 0.0' > b.test
+
+TESTS='a.test b.test' $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=2
+
+grep '^ERROR: a.test - Bail out! 0$' stdout
+grep '^ERROR: b.test - Bail out! 0\.0$' stdout
+
+:
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
new file mode 100755
index 0000000..04d3790
--- /dev/null
+++ b/t/tap-msg0-directive.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - literal string "0" as a TODO or SKIP message
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test << 'END'
+1..3
+ok 1 # TODO 0
+not ok 2 # TODO 0
+ok 3 # SKIP 0
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 xpass=1 xfail=1 skip=1 error=0
+
+grep '^XPASS: all\.test 1 # TODO 0$' stdout
+grep '^XFAIL: all\.test 2 # TODO 0$' stdout
+grep '^SKIP: all\.test 3 # SKIP 0$' stdout
+
+:
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
new file mode 100755
index 0000000..6a515a8
--- /dev/null
+++ b/t/tap-msg0-misc.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - literal "0" and "0.0" in a test description and a TODO/SKIP message
+#    at the same time
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test << 'END'
+1..14
+
+ok 1 0
+ok 2 0.0
+
+ok 3 0   # TODO 0
+ok 4 0.0 # TODO 0
+ok 5 0   # TODO 0.0
+ok 6 0.0 # TODO 0.0
+
+not ok 7 0   # TODO 0
+not ok 8 0.0 # TODO 0
+not ok 9 0   # TODO 0.0
+not ok 10 0.0 # TODO 0.0
+
+ok 11 0   # SKIP 0
+ok 12 0.0 # SKIP 0
+ok 13 0   # SKIP 0.0
+ok 14 0.0 # SKIP 0.0
+
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=14 pass=2 fail=0 xpass=4 xfail=4 skip=4 error=0
+
+sed '/^ *$/d' > exp << 'END'
+
+PASS: all.test 1 0
+PASS: all.test 2 0.0
+
+XPASS: all.test 3 0 # TODO 0
+XPASS: all.test 4 0.0 # TODO 0
+XPASS: all.test 5 0 # TODO 0.0
+XPASS: all.test 6 0.0 # TODO 0.0
+
+XFAIL: all.test 7 0 # TODO 0
+XFAIL: all.test 8 0.0 # TODO 0
+XFAIL: all.test 9 0 # TODO 0.0
+XFAIL: all.test 10 0.0 # TODO 0.0
+
+SKIP: all.test 11 0 # SKIP 0
+SKIP: all.test 12 0.0 # SKIP 0
+SKIP: all.test 13 0 # SKIP 0.0
+SKIP: all.test 14 0.0 # SKIP 0.0
+
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
new file mode 100755
index 0000000..60aa5fe
--- /dev/null
+++ b/t/tap-msg0-planskip.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - literal strings "0" and "0.0" as the reason of the skip in a "TAP
+#    plan with skip" (i.e., "1..0 # SKIP ...").
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo '1..0 # SKIP 0' > a.test
+echo '1..0 # SKIP 0.0' > b.test
+
+TESTS='a.test b.test' $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=0
+
+grep '^SKIP: a.test - 0$' stdout
+grep '^SKIP: b.test - 0\.0$' stdout
+
+:
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
new file mode 100755
index 0000000..8c464c4
--- /dev/null
+++ b/t/tap-msg0-result.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - the string "0" as a test description
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test << 'END'
+1..10
+ok 1 0
+ok - 0
+not ok 3 0
+not ok - 0
+ok 5 0 # TODO
+ok - 0 # TODO
+not ok 7 0 # TODO
+not ok - 0 # TODO
+ok 9 0 # SKIP
+ok - 0 # SKIP
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=10 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=0
+
+cat > exp << 'END'
+PASS: all.test 1 0
+PASS: all.test 2 - 0
+FAIL: all.test 3 0
+FAIL: all.test 4 - 0
+XPASS: all.test 5 0 # TODO
+XPASS: all.test 6 - 0 # TODO
+XFAIL: all.test 7 0 # TODO
+XFAIL: all.test 8 - 0 # TODO
+SKIP: all.test 9 0 # SKIP
+SKIP: all.test 10 - 0 # SKIP
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
new file mode 100755
index 0000000..67ecb1e
--- /dev/null
+++ b/t/tap-negative-numbers.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - don't spuriously recognize negative TAP result numbers, but correctly
+#    interpret them as test descriptions instead
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..7
+ok -1
+not ok -3
+ok -2 # SKIP
+not ok -5 # TODO
+ok -04 # TODO
+ok -121
+not ok -50000
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0
+
+cat > exp <<'END'
+PASS: all.test 1 -1
+FAIL: all.test 2 -3
+SKIP: all.test 3 -2 # SKIP
+XFAIL: all.test 4 -5 # TODO
+XPASS: all.test 5 -04 # TODO
+PASS: all.test 6 -121
+FAIL: all.test 7 -50000
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
new file mode 100755
index 0000000..c95e20e
--- /dev/null
+++ b/t/tap-no-disable-hard-error.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - "Bail out!" magic and TAP parse errors are not disabled nor turned
+#    into simple failures by the definition DISABLE_HARD_ERRORS.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+DISABLE_HARD_ERRORS = yes
+TEST_LOG_COMPILER = cat
+TESTS = bail.test few.test noplan.test
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > bail.test <<END
+1..1
+Bail out!
+END
+
+cat > few.test <<END
+1..1
+END
+
+cat > noplan.test <<END
+# nothing here
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3
+
+:
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
new file mode 100755
index 0000000..0236ef8
--- /dev/null
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - By default, TAP input is only from the stdout (and not the stderr)
+#    of the test command.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER_FLAGS = --comments
+TESTS = all.test
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+#!/bin/sh
+echo 1..2
+echo 'not ok' >&2
+echo 'not ok 1 # TODO' >&2
+echo 'ok 1'
+echo '# foo foo foo'
+echo '# bar bar bar' >&2
+echo 'ok 44 # TODO' >&2
+echo 'Bail out!' >&2
+echo 'ok 2 # SKIP'
+END
+
+chmod a+x all.test
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=0
+$FGREP 'foo foo foo' stdout
+$FGREP 'bar bar bar' stdout && Exit 1
+
+:
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
new file mode 100755
index 0000000..2fc993e
--- /dev/null
+++ b/t/tap-no-spurious-numbers.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - we shouldn't spuriously recognize as TAP result numbers what it
+#    not, even if it seems pretty close
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > prefixes <<'END'
+A
+a
+_
++
+-
+=
+/
+*
+.
+:
+,
+;
+$
+@
+%
+&
+#
+?
+!
+|
+\
+"
+`
+'
+(
+)
+[
+]
+{
+}
+<
+>
+END
+
+n=`wc -l <prefixes`
+
+# See the loop below to understand this initialization.
+pass=`expr $n '*' 3`
+fail=$pass
+skip=`expr $pass - 3`
+xfail=$skip
+xpass=$xfail
+error=0
+total=`expr $pass + $fail + $skip + $xfail + $xpass`
+
+echo 1..$total > all.test
+
+highno=1000
+
+for result in 'ok' 'not ok'; do
+  for spacing in "" " " "$tab"; do
+    subst="$result &$spacing$higno"
+    sed -e "s|.*|$subst|" prefixes
+    for directive in TODO SKIP; do
+      test "$result $directive" != "not ok SKIP" || continue
+      sed -e '/^#$/d' -e "s|.*|$subst # $directive|" prefixes
+    done
+  done
+done >> all.test
+
+cat all.test # For debugging.
+
+# Sanity checks.
+grep '#.*#' all.test && framework_failure_ "creating all.test"
+test `wc -l <all.test` -lt $highno || framework_failure_ "creating all.test"
+
+$MAKE check >stdout || :
+cat stdout
+
+count_test_results total=$total pass=$pass fail=$fail skip=$skip \
+                   xpass=$xpass xfail=$xfail error=$error
+
+:
diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
new file mode 100755
index 0000000..8da15e8
--- /dev/null
+++ b/t/tap-no-spurious-summary.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - ':test-results:' directives in test scripts' output doesn't
+#    originate spurious results in the testsuite summary
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..1
+:test-result: PASS
+:test-result: FAIL
+:test-result: XPASS
+:test-result: XFAIL
+:test-result: SKIP
+:test-result: ERROR
+:test-result: UNKNOWN
+ok 1
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+for result in PASS FAIL XPASS XFAIL SKIP ERROR UNKNOWN; do
+  grep "^ *:test-result: $result$" all.log
+done
+
+:
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
new file mode 100755
index 0000000..ac6e668
--- /dev/null
+++ b/t/tap-no-spurious.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - don't spuriously recognize lines that are "almost" TAP lines as
+#    real TAP lines
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo 1..5 > all.test
+
+# The only recognized directives are "TODO" and "SKIP".
+# So the following should count as passed tests.
+cat >> all.test <<END
+ok 1 # XFAIL
+ok 2 # SKIPPED
+ok 3 # TO DO
+ok 4 # TODOALL
+ok 5 # FIXME
+END
+
+# According to documentation of Test::Harness::TAP(3):
+#
+#  ``Lines written to standard output matching /^(not )?ok\b/
+#    must be interpreted as test lines. All other lines must
+#    not be considered test output.''
+
+cat >> all.test <<END
+ ok
+ ok 1
+${tab}ok
+${tab}ok 1
+ not ok
+ not ok 1
+${tab}not ok
+${tab}not ok 1
+notok
+notok 1
+not${tab}ok
+not${tab}ok 1
+not  ok
+not  ok 1
+no ok
+no ok 1
+# ok
+# not ok
+# ok 1
+# not ok 1
+#ok
+#not ok
+#ok 1
+#not ok 1
+END
+
+set +x # Don't pollute logs too much.
+for r in 'ok' 'not ok'; do
+  for s1 in \
+    a b c d e f g h i j k l m n o p q r s t u v w x y z \
+    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
+    0 1 2 3 4 5 6 7 8 9 _ ab 0a 23 a1B2c _o _x_y_
+  do
+    for s2 in '' @ % + - = / . : \; \* \? \& \! \# \$ \< \> \\; do
+      printf '%s\n' "$r$s1$s2"
+    done
+  done
+done >> all.test
+set -x # Reset shell xtraces.
+
+# The prove(1) utility doesn't bail out on these, so our driver
+# shouldn't either.
+# See comments in 'tap-bailout-leading-space.test' for an explanation
+# of why we don't have a whitespace-prepended "Bail out!" line here.
+cat >> all.test <<'END'
+bailout
+bailout!
+bail out
+bail out!
+Bailout
+Bailout!
+Bail out
+ Bail out
+#Bail out!
+# Bail out!
+END
+
+cat all.test # For debugging.
+
+# Minor sanity check.
+test `grep -c '^ok1$' all.test` -eq 1 \
+  && test `grep -c '^not ok1$' all.test` -eq 1 \
+  || framework_failure_ "creating all.test"
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+:
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
new file mode 100755
index 0000000..8cfffe2
--- /dev/null
+++ b/t/tap-not-ok-skip.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - a "not ok # SKIP" line should count as a failure, for consistency
+#    with the prove(1) utility.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..4
+not ok # SKIP
+not ok 2 # SKIP
+not ok - foo # SKIP
+not ok 4 - bar # SKIP
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=4 pass=0 fail=4 skip=0 xpass=0 xfail=0 error=0
+
+:
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
new file mode 100755
index 0000000..7aa2c7f
--- /dev/null
+++ b/t/tap-number-wordboundary.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - TAP result numbers terminated by a non-whitespace "word boundary"
+#    character are recognized
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..5
+ok 1: foo1
+not ok 2- foo2
+ok 3@ foo3 # SKIP
+not ok 4?&%$ foo4 # TODO
+ok 5"`!! foo5 # TODO
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=1 fail=1 skip=1 xpass=1 xfail=1 error=0
+
+$EGREP '^PASS: all\.test 1 ?: foo1$' stdout
+$EGREP '^FAIL: all\.test 2 ?- foo2$' stdout
+$EGREP '^SKIP: all\.test 3 ?@ foo3 # SKIP$' stdout
+$EGREP '^XFAIL: all\.test 4 ?\?&%\$ foo4 # TODO$' stdout
+$EGREP '^XPASS: all\.test 5 ?"`!! foo5 # TODO$' stdout
+
+cat > all.test <<'END'
+1..3
+ok 2: quux
+not ok 1!
+ok 476$ # SKIP
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 skip=0 xpass=0 xfail=0 error=3
+
+$EGREP '^ERROR: all\.test 2 ?: quux # OUT-OF-ORDER \(expecting 1\)$' stdout
+$EGREP '^ERROR: all\.test 1 ?! # OUT-OF-ORDER \(expecting 2\)$' stdout
+$EGREP '^ERROR: all\.test 476 ?\$ # OUT-OF-ORDER \(expecting 3\)$' stdout
+
+cat > punctuation <<'END'
+'
+"
+`
+#
+$
+!
+\
+/
+&
+%
+(
+)
+|
+^
+~
+?
+*
++
+-
+,
+:
+;
+=
+<
+>
+@
+[
+]
+{
+}
+\
+END
+
+# Strip any extra whitespace, for Solaris' wc.
+planned=`wc -l <punctuation | tr -d " $tab"`
+
+echo 1..$planned > all.test
+awk '{print "ok " NR $0 }' punctuation >> all.test
+# For debugging.
+cat all.test
+# Sanity check.
+grep "^ok 1'$" all.test || framework_failure_ "creating all.test"
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=$planned pass=$planned \
+                   fail=0 skip=0 xpass=0 xfail=0 error=0
+
+:
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
new file mode 100755
index 0000000..345b31f
--- /dev/null
+++ b/t/tap-numbers-leading-zero.sh
@@ -0,0 +1,109 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - how does TAP result numbers with leading zero fares?
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+do_checks ()
+{
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results "$@"
+  # Allow some normalization of leading zeros, without forcing it.
+  LC_ALL=C sed -n 's/: all\.test 0*\([0-9]\)/: all.test \1/p' stdout > got
+  cat exp
+  cat got
+  diff exp got
+}
+
+cat > all.test <<END
+1..15
+
+ok 01
+ok 0002
+
+not ok 03
+not ok 0004
+
+ok 05 # SKIP
+ok 0006 # SKIP
+
+not ok 07 # TODO
+not ok 0008 # TODO
+
+ok 009
+ok 010
+
+ok 00000011
+not ok 0012
+ok 00000013 # SKIP
+not ok 0014 # TODO
+ok 00000015 # TODO
+END
+
+cat > exp <<END
+PASS: all.test 1
+PASS: all.test 2
+FAIL: all.test 3
+FAIL: all.test 4
+SKIP: all.test 5 # SKIP
+SKIP: all.test 6 # SKIP
+XFAIL: all.test 7 # TODO
+XFAIL: all.test 8 # TODO
+PASS: all.test 9
+PASS: all.test 10
+PASS: all.test 11
+FAIL: all.test 12
+SKIP: all.test 13 # SKIP
+XFAIL: all.test 14 # TODO
+XPASS: all.test 15 # TODO
+END
+
+do_checks total=15 pass=5 fail=3 xpass=1 xfail=3 skip=3 error=0
+
+cat > all.test <<END
+1..8
+
+ok 010
+not ok 003
+ok 0001 # SKIP
+not ok 010 # TODO
+ok 00100 # TODO
+
+ok 06
+ok 00007
+ok 8
+END
+
+cat > exp <<END
+ERROR: all.test 10 # OUT-OF-ORDER (expecting 1)
+ERROR: all.test 3 # OUT-OF-ORDER (expecting 2)
+ERROR: all.test 1 # OUT-OF-ORDER (expecting 3)
+ERROR: all.test 10 # OUT-OF-ORDER (expecting 4)
+ERROR: all.test 100 # OUT-OF-ORDER (expecting 5)
+PASS: all.test 6
+PASS: all.test 7
+PASS: all.test 8
+END
+
+do_checks total=8 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=5
+
+:
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
new file mode 100755
index 0000000..b2f54f3
--- /dev/null
+++ b/t/tap-numeric-description.sh
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP result lines whose description is a number.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# Some random numbers to be used as test names.  The definitions below are
+# selected so that $x<n> != <n> for every n >= 1.  We can't use positional
+# parameters for this unfortunately, since Solaris 10 /bin/sh doesn't allow
+# the dereferencing of parameters from ${10} onwards.
+x1=5 x2=7 x3=45 x4=11 x5=7 x6=3 x7=6 x8=9 x9=1000 x10=1
+
+cat > all.test <<END
+1..10
+ok 1 ${x1}
+ok - ${x2}
+not ok 3 ${x3}
+not ok - ${x4}
+ok 5 ${x5} # SKIP
+ok - ${x6} # SKIP
+not ok 7 ${x7} # TODO
+not ok - ${x8} # TODO
+ok 9 ${x9} # TODO
+ok - ${x10} # TODO
+END
+
+cat > exp <<END
+PASS: all.test 1 ${x1}
+PASS: all.test 2 - ${x2}
+FAIL: all.test 3 ${x3}
+FAIL: all.test 4 - ${x4}
+SKIP: all.test 5 ${x5} # SKIP
+SKIP: all.test 6 - ${x6} # SKIP
+XFAIL: all.test 7 ${x7} # TODO
+XFAIL: all.test 8 - ${x8} # TODO
+XPASS: all.test 9 ${x9} # TODO
+XPASS: all.test 10 - ${x10} # TODO
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=10 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=0
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+
+:
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
new file mode 100755
index 0000000..d9f36a2
--- /dev/null
+++ b/t/tap-out-of-order.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - out-of-order test results
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..3
+ok
+not ok 2 # TODO
+ok 71
+END
+
+cat > b.test <<END
+1..5
+ok 1
+ok 2
+ok 4 foo # SKIP mu
+not ok 2 bar # TODO um
+ok 5
+END
+
+cat > c.test <<END
+1..4
+ok 1
+ok foo
+ok 4 - zardoz
+not ok 3
+END
+
+# This is documented as an "test out of sequence" error in the
+# TAP::Parser documentation.  Keep it in sync with the example
+# there.
+cat > d.test <<'END'
+1..5
+ok 1
+ok 2
+ok 15
+ok 16
+ok 17
+END
+
+TESTS='a.test b.test c.test d.test' $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=17 pass=8 fail=0 xpass=0 xfail=1 skip=0 error=8
+
+test `$FGREP -c ': a.test' stdout` -eq 3
+test `$FGREP -c ': b.test' stdout` -eq 5
+test `$FGREP -c ': c.test' stdout` -eq 4
+test `$FGREP -c ': d.test' stdout` -eq 5
+
+grep '^ERROR: a\.test 71 # OUT-OF-ORDER (expecting 3)$' stdout
+grep '^ERROR: b\.test 4 foo # OUT-OF-ORDER (expecting 3)$' stdout
+grep '^ERROR: b\.test 2 bar # OUT-OF-ORDER (expecting 4)$' stdout
+grep '^ERROR: c\.test 4 - zardoz # OUT-OF-ORDER (expecting 3)$' stdout
+grep '^ERROR: c\.test 3 # OUT-OF-ORDER (expecting 4)$' stdout
+grep '^ERROR: d\.test 15 # OUT-OF-ORDER (expecting 3)$' stdout
+grep '^ERROR: d\.test 16 # OUT-OF-ORDER (expecting 4)$' stdout
+grep '^ERROR: d\.test 17 # OUT-OF-ORDER (expecting 5)$' stdout
+
+:
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
new file mode 100755
index 0000000..75ce5f1
--- /dev/null
+++ b/t/tap-passthrough-exit.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - non-success exit status of a test script is reported in the
+#    log file
+# See also related test 'tap-passthrough.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TEST_LOG_COMPILER = $(SHELL)
+TESTS =
+END
+
+exit_statuses='1 2 77 99'
+
+for e in $exit_statuses; do
+  unindent > exit-$e.test <<END
+    #!/bin/sh
+    echo 1..1
+    echo ok 1
+    exit $e
+END
+  echo TESTS += exit-$e.test >> Makefile.am
+done
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+st=0
+$MAKE check || st=$?
+for e in $exit_statuses; do cat exit-$e.log; done
+cat test-suite.log
+test $st -gt 0 || Exit 1
+
+for e in $exit_statuses; do
+  for log in exit-$e.log test-suite.log; do
+    grep "^ERROR: exit-$e\\.test - exited with status $e$" $log
+  done
+done
+
+env TEST_LOG_DRIVER_FLAGS='--ignore-exit' $MAKE -e check
+$FGREP ".test - exited with status" *.log && Exit 1
+
+:
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
new file mode 100755
index 0000000..da05b1b
--- /dev/null
+++ b/t/tap-passthrough.sh
@@ -0,0 +1,166 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - all input (valid TAP lines, invalid TAP lines, non-TAP lines)
+#    are passed through in the log file
+#  - TAP errors are reported in the log file too
+# See also related test 'tap-passthrough-exit.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+weirdchars=\''"address@hidden&()[]<>#;,:.^?*/'
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+#
+# Only successful tests.
+#
+
+# The whitespace in this test might be normalized in the testsuite
+# progress output, but should be copied verbatim in the log files.
+cat > ok.test <<END
+1..6
+TAP plan in the previous line.
+ok${tab}
+ok     2
+ok - foo
+ok 4 - x
+  This is not a TAP line, but should still be copied in the log file!
+# some diagnostic${tab}
+not ok # TODO low priority
+ok # SKIP who cares?
+$weirdchars
+END
+
+TESTS=ok.test $MAKE -e check || { cat ok.log; Exit 1; }
+cat ok.log
+
+for rx in \
+  '1\.\.6' \
+  'TAP plan in the previous line\.' \
+  "ok${tab}" \
+  'ok     2' \
+  'ok - foo' \
+  'ok 4 - x' \
+  '  This is not a TAP line, but should still be copied in the log file!' \
+  "# some diagnostic${tab}" \
+  'not ok # TODO low priority' \
+  'ok # SKIP who cares?' \
+; do
+  grep "^$rx$" ok.log
+done
+$FGREP "$weirdchars" ok.log
+
+#
+# Mixed failing/successful tests.
+#
+
+cat > tiny.test <<END
+1..1
+ok
+END
+
+cat > ok.test <<END
+1..1
+ok
+only one success here
+END
+
+cat > ko.test <<END
+1..5
+foo foo foo
+ok${tab}
+ok     2
+not ok - foo
+not ok 4 - x
+# diagnostic ko
+  bar${tab}bar${tab}bar
+ok # TODO dunno
+$weirdchars
+END
+
+cat > bail.test <<END
+Bail out! Test is taking too long!
+END
+
+cat > skip.test <<END
+1..0 # Skipped: WWW::Mechanize not installed
+END
+
+cat > err.test <<END
+1..3
+ok 1
+Invalid test count
+ok 23
+Misplaced plan
+1..13
+ok
+Extra test
+ok
+Last line
+END
+
+st=0
+env TESTS='tiny.test ok.test ko.test bail.test skip.test err.test' \
+  $MAKE -e check || st=$?
+cat tiny.log
+cat ok.log
+cat ko.log
+cat bail.log
+cat skip.log
+cat err.log
+test $st -gt 0 || Exit 1
+
+grep '^1\.\.1$' tiny.log
+grep '^ok$' tiny.log
+grep '^only one success here$' ok.log
+
+for rx in \
+  '1\.\.5' \
+  'foo foo foo' \
+  "ok${tab}" \
+  'ok     2' \
+  'not ok - foo' \
+  'not ok 4 - x' \
+  '# diagnostic ko' \
+  "  bar${tab}bar${tab}bar" \
+  'ok # TODO dunno' \
+; do
+  grep "^$rx$" ko.log
+done
+$FGREP "$weirdchars" ko.log
+
+grep '^Bail out! Test is taking too long!$' bail.log
+grep '^1\.\.0 # Skipped: WWW::Mechanize not installed$' skip.log
+
+for rx in \
+  '^1\.\.3$' \
+  '^Invalid test count$' \
+  '^ok 23$' \
+  '^Misplaced plan$' \
+  '^1\.\.13$' \
+  '^ERROR:.* multiple test plans' \
+   '^Extra test$' \
+  '^Last line$' \
+  '^ERROR:.* [tT]oo many tests run.*expected 3, got 4' \
+  '^ERROR:.* err\.test 23 .*OUT[ -]OF[ -]ORDER.*expecting 2' \
+; do
+  grep "$rx" err.log
+done
+
+:
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
new file mode 100755
index 0000000..3b9cd1f
--- /dev/null
+++ b/t/tap-plan-corner.sh
@@ -0,0 +1,198 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - some corner cases for TAP plan
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# -------------------------------------------------------------------------
+
+cat > leading-repeated.test <<END
+1..1
+1..1
+ok 1
+END
+
+cat > trailing-repeated.test <<END
+ok 1
+1..1
+1..1
+END
+
+for pos in leading trailing; do
+  TESTS="$pos-repeated.test" $MAKE -e check >stdout \
+    && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
+  grep "^ERROR: $pos-repeated\\.test - multiple test plans$" stdout
+done
+
+# -------------------------------------------------------------------------
+
+cat > leading-repeated.test <<END
+1..2
+ok 1
+1..2
+ok 2
+END
+
+cat > trailing-repeated.test <<END
+ok 1
+1..2
+ok 2
+1..2
+END
+
+env TESTS="leading-repeated.test trailing-repeated.test" \
+  $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=6 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=3
+grep "^ERROR: leading-repeated\\.test - multiple test plans$" stdout
+grep "^ERROR: trailing-repeated\\.test - multiple test plans$" stdout
+grep "^ERROR: trailing-repeated\\.test 2 # AFTER LATE PLAN$" stdout
+grep "leading .*AFTER LATE PLAN" stdout && Exit 1
+
+# -------------------------------------------------------------------------
+
+cat > 1.test <<END
+1..0
+1..0
+END
+
+cat > 2.test <<END
+1..0 # SKIP
+1..0
+END
+
+cat > 3.test <<END
+1..0
+1..0 # SKIP
+END
+
+cat > 4.test <<END
+1..0 # SKIP
+1..0 # SKIP
+END
+
+env TESTS="1.test 2.test 3.test 4.test" \
+  $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=8 pass=0 fail=0 xpass=0 xfail=0 skip=4 error=4
+for i in 1 2 3 4; do
+  grep "^ERROR: $i\\.test - multiple test plans$" stdout
+done
+
+# -------------------------------------------------------------------------
+
+cat > all.test <<END
+1..5
+ok 1
+ok 2
+1..5
+ok 3
+1..5
+ok 4
+1..5
+ok 5
+END
+
+$MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=8 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=3
+
+cat > exp <<'END'
+PASS: all.test 1
+PASS: all.test 2
+ERROR: all.test - multiple test plans
+PASS: all.test 3
+ERROR: all.test - multiple test plans
+PASS: all.test 4
+ERROR: all.test - multiple test plans
+PASS: all.test 5
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# -------------------------------------------------------------------------
+
+cat > all.test <<END
+1..2
+ok 1
+ok 2
+1..3
+ok 3
+END
+
+$MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=5 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=3
+
+cat > exp <<'END'
+PASS: all.test 1
+PASS: all.test 2
+ERROR: all.test - multiple test plans
+ERROR: all.test 3 # UNPLANNED
+ERROR: all.test - too many tests run (expected 2, got 3)
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# -------------------------------------------------------------------------
+
+cat > all.test <<END
+ok 1
+ok 2
+ok 3
+1..5
+1..5
+ok 4
+1..5
+ok 5
+END
+
+$MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=7 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=4
+
+cat > exp <<'END'
+PASS: all.test 1
+PASS: all.test 2
+PASS: all.test 3
+ERROR: all.test - multiple test plans
+ERROR: all.test 4 # AFTER LATE PLAN
+ERROR: all.test - multiple test plans
+ERROR: all.test 5 # AFTER LATE PLAN
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
new file mode 100755
index 0000000..1b74059
--- /dev/null
+++ b/t/tap-plan-errors.sh
@@ -0,0 +1,114 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: the following situations should be flagged as errors:
+#  - unmatched test plan (too few tests run)
+#  - multiple test plans
+#  - missing test plan
+#  - misplaced test plan (tests run after a late plan)
+# Checks about unplanned tests are performed in 'tap-unplanned.test'
+# and 'tap-skip-whole-badcount.test'.  More checks about corner-cases
+# in TAP plans are performed in 'tap-plan-corner.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+my_check ()
+{
+  cat > all.test
+  test -n "$err" || fatal_ "\$err not set before calling my_check"
+  cat all.test # For debugging.
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results "$@"
+  grep "^ERROR: all\\.test $err$" stdout
+  unset err
+}
+
+err='- too few tests run (expected 2, got 1)'
+my_check total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+1..2
+ok 1
+END
+
+err='- too few tests run (expected 12, got 3)'
+my_check total=4 pass=2 fail=0 xpass=0 xfail=1 skip=0 error=1 <<END
+ok 1
+ok 2
+not ok 3 # TODO
+1..12
+END
+
+err='- too few tests run (expected 1, got 0)'
+my_check total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+1..1
+END
+
+err='2 # AFTER LATE PLAN'
+my_check total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+ok 1
+1..2
+ok 2
+END
+
+err='5 # AFTER LATE PLAN'
+my_check total=5 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+ok 1
+ok 2
+ok 3
+ok 4
+1..5
+ok 5
+END
+
+err='- missing test plan'
+my_check total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+ok 1
+END
+
+
+# The two test plans here are deliberately equal.
+err='- multiple test plans'
+my_check total=3 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+1..2
+ok 1
+ok 2
+1..2
+END
+
+# The second plan is diagnosed as extra, and only the first one is
+# relevant w.r.t. the number of the expected test.
+err='- multiple test plans'
+my_check total=4 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+1..3
+ok 1
+ok 2
+1..2
+ok 3
+END
+
+# As above, in a slightly different situation.
+err='- multiple test plans'
+my_check total=3 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=1 <<END
+1..2
+ok 1
+ok 2
+1..4
+END
+
+:
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
new file mode 100755
index 0000000..bb45f31
--- /dev/null
+++ b/t/tap-plan-leading-zero.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - TAP plans with numbers having leading zeroes, as in "1..01"
+#  - TAP "SKIP" plans with multiple zeroes, as in "1..00 # SKIP"
+# This is consistent with the behaviour of the 'prove' utility.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..01
+ok 1
+END
+
+cat > b.test <<END
+1..0002
+ok 1
+ok 2
+END
+
+echo 1..010 > c.test
+for i in 1 2 3 4 5 6 7 8 9 10; do echo ok $i; done >> c.test
+
+echo 1..00100 > d.test
+for i in 1 2 3 4 5 6 7 8 9 10; do
+  for j in 1 2 3 4 5 6 7 8 9 10; do
+    echo ok
+  done
+done >> d.test
+
+echo 1..00 > e.test
+echo '1..000 # SKIP' > f.test
+
+env TESTS='a.test b.test c.test d.test e.test f.test' \
+  $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=115 pass=113 xfail=0 skip=2 fail=0 xpass=0 error=0
+
+:
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
new file mode 100755
index 0000000..c8d2cdc
--- /dev/null
+++ b/t/tap-plan-malformed.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: a malformed TAP plan is not recognized.  The checks in
+# here should be consistent with the behaviour of the 'prove' utility.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..1 foo
+END
+
+cat > b.test <<END
+ 1..2
+ok 1
+ok 2
+END
+
+cat > c.test <<END
+1..1 # SKIP
+END
+
+cat > d.test <<END
+1..2 # foo bar
+not ok 1 # TODO
+not ok 2 # TODO
+END
+
+cat > e.test <<END
+0..0
+END
+
+tests_list=`echo *.test`
+
+TESTS="$tests_list" $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=9 pass=2 fail=0 xpass=0 xfail=2 skip=0 error=5
+
+for tst in $tests_list; do
+  grep "^ERROR: $tst - missing test plan$" stdout
+done
+
+:
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
new file mode 100755
index 0000000..0775f10
--- /dev/null
+++ b/t/tap-plan-middle.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - test plan preceding and/or following non-result TAP lines
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > top1.test <<END
+non-TAP line, ignored
+1..1
+ok 1
+END
+
+cat > top2.test <<END
+some
+non-TAP
+lines
+are
+ignored
+# and a TAP comment won't cause problems either
+1..2
+ok 1
+ok 2
+END
+
+# Try with a blank line too, just to be sure.
+cat > top3.test <<END
+
+1..1
+ok 1
+END
+
+cat > bot1.test <<END
+ok 1 # SKIP
+1..1
+bla blah blah ...
+END
+
+cat > bot2.test <<END
+ok 1
+ok 2
+not ok 3 # TODO
+1..3
address@hidden (a cursing comment :-)
+END
+
+# Try with a blank line too, just to be sure.
+cat > bot3.test <<END
+ok 1
+not ok 2 # TODO
+ok 3 # SKIP
+ok 4 # SKIP
+1..4
+
+END
+
+tests=`echo *.test`
+
+for tap_flags in "" "--comments"; do
+  env TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS="$tests" \
+    $MAKE -e check >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=12 pass=7 xfail=2 skip=3 fail=0 xpass=0 error=0
+done
+
+:
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
new file mode 100755
index 0000000..7bdb4dc
--- /dev/null
+++ b/t/tap-plan-whitespace.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - plan line with trailing whitespace is recognized and handled correctly
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+sed 's/\$$//' > foo.test <<END
+1..2 $
+ok 1$
+ok 2$
+END
+
+cat > bar.test <<END
+1..1$tab   $tab$tab
+ok 1
+END
+
+TESTS='foo.test bar.test' $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=3 fail=0 error=0 xpass=0 xfail=0 skip=0
+
+:
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
new file mode 100755
index 0000000..d85a3a2
--- /dev/null
+++ b/t/tap-plan.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - test scripts with the test plan at the beginning
+#  - test scripts with the test plan at the end
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > top.test <<END
+1..3
+ok 1
+ok 2 # SKIP
+ok 3
+# a trailing comment
+END
+
+cat > bot.test <<END
+ok 1
+# a comment
+ok 2
+not ok 3 # TODO
+# another comment
+ok
+1..4
+END
+
+for tap_flags in "" "--comments"; do
+  env TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS='top.test bot.test' \
+    $MAKE -e check >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=7 pass=5 xfail=1 skip=1 fail=0 xpass=0 error=0
+done
+
+
+:
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
new file mode 100755
index 0000000..48b3e12
--- /dev/null
+++ b/t/tap-planskip-and-logging.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - interactions between "TAP plan with SKIP" and logging of earlier or
+#    later TAP or non-TAP text
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
+
+cat > foo.test <<END
+1..0
+a non-TAP line
+# a comment
+END
+
+cat > foo2.test <<END
+a non-TAP line 2
+# a comment 2
+1..0
+END
+
+cat > bar.test <<END
+# an early comment
+an early non-TAP line
+ $tab
+1..0 # SKIP
+# a later comment
+a later non-TAP line
+END
+
+TESTS='foo.test foo2.test bar.test' $MAKE -e check >stdout \
+  || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=3 error=0
+
+grep '^# foo\.test: a comment$' stdout
+grep '^# foo2\.test: a comment 2$' stdout
+grep '^# bar\.test: an early comment$' stdout
+grep '^# bar\.test: a later comment$' stdout
+
+cat foo.log
+cat foo2.log
+cat bar.log
+
+grep '^a non-TAP line$' foo.log
+grep '^# a comment$' foo.log
+grep '^a non-TAP line 2$' foo2.log
+grep '^# a comment 2$' foo2.log
+grep '^# an early comment' bar.log
+grep '^an early non-TAP line$' bar.log
+grep '^# a later comment' bar.log
+grep '^a later non-TAP line$' bar.log
+grep "^ $tab$" bar.log
+
+:
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
new file mode 100755
index 0000000..fbb3b56
--- /dev/null
+++ b/t/tap-planskip-badexit.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - an exit status != 0 of a test script causes an hard error, even if
+#    the last line of output is a "SKIP plan" (e.g., "1..0 # SKIP").
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+echo TESTS = one.test two.test > Makefile.am
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > one.test <<'END'
+#!/bin/sh
+echo '1..0 # SKIP'
+exit 1
+END
+
+cat > two.test <<'END'
+#!/bin/sh
+echo '1..0'
+exit 22
+END
+
+chmod a+x one.test two.test
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+# The 'prove' utility reports both the skip and the non-zero exit status,
+# so we do the same.
+count_test_results total=4 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=2
+
+grep '^ERROR: one\.test - exited with status 1$' stdout
+grep '^ERROR: two\.test - exited with status 22$' stdout
+
+:
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
new file mode 100755
index 0000000..7fb72e9
--- /dev/null
+++ b/t/tap-planskip-bailout.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - a "Bail out!" directive causes an hard error, even if coming after
+#    a "SKIP plan" (e.g., "1..0 # SKIP").
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..0 # SKIP
+Bail out!
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=1
+grep '^ERROR: all\.test - Bail out!' stdout
+
+:
diff --git a/t/tap-planskip-case-insensitive.sh 
b/t/tap-planskip-case-insensitive.sh
new file mode 100755
index 0000000..b26701c
--- /dev/null
+++ b/t/tap-planskip-case-insensitive.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - "SKIP" keyword in a TAP plan is case-insensitive
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# These nested loops are clearer without indentation.
+
+i=0
+for c1 in s S; do
+for c2 in k K; do
+for c3 in i I; do
+for c4 in p P; do
+  i=`expr $i + 1`
+  case $i in ?) i=0$i; esac
+  echo "1..0 # $c1$c2$c3$c4 foobar" > $i.test
+done; done; done; done
+
+TESTS="`echo *.test`" $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=16 pass=0 fail=0 xpass=0 xfail=0 skip=16 error=0
+
+for tst in *.test; do
+  grep "^SKIP: $tst .* foobar$" stdout
+done
+
+:
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
new file mode 100755
index 0000000..f89a55d
--- /dev/null
+++ b/t/tap-planskip-late.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - the special "plan with SKIP" can also be used "late" in the TAP
+#    stream, i.e., preceded by non-TAP output or TAP diagnostic.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > foo.test <<END
+some non-TAP text, will be copied in the global log
+1..0 # SKIP from the last line
+END
+
+cat > bar.test <<END
+# some TAP diagnostic, will go to console
+1..0
+END
+
+TESTS='foo.test bar.test' $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+grep '^SKIP: foo\.test .* from the last line$' stdout
+grep '^SKIP: bar\.test$' stdout
+test `grep -c ': .*\.test' stdout` -eq 2
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=0
+
+:
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
new file mode 100755
index 0000000..a73dbce
--- /dev/null
+++ b/t/tap-planskip-later-errors.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - TAP errors following a "TAP plan with SKIP" are still diagnosed.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..0
+a non-TAP line
+1..3
+1..5
+# a comment
+1..1
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=4 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=3
+test `grep -c '^ERROR: all\.test - multiple test plans' stdout` -eq 3
+
+:
diff --git a/t/tap-planskip-unplanned-corner.sh 
b/t/tap-planskip-unplanned-corner.sh
new file mode 100755
index 0000000..6dff7ac
--- /dev/null
+++ b/t/tap-planskip-unplanned-corner.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - test results seen in a TAP stream that has a "plan with SKIP" are
+#    flagged as errors, even if all of them are "SKIP" results.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > foo.test <<END
+1..0 # SKIP
+ok 1 # SKIP
+END
+
+cat > bar.test <<END
+ok 1 # SKIP
+1..0 # SKIP
+END
+
+TESTS='foo.test bar.test' $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=3
+
+# Don't be too strict w.r.t. the format of the "skip whole test" message.
+grep '^SKIP: foo\.test$' stdout || grep '^SKIP: foo\.test [^0-9]' stdout
+grep '^ERROR: foo\.test 1 # UNPLANNED$' stdout
+grep '^ERROR: foo\.test - too many tests run (expected 0, got 1)$' stdout
+grep '^SKIP: bar\.test 1 # SKIP$' stdout
+grep '^ERROR: bar\.test - too many tests run (expected 0, got 1)$' stdout
+
+:
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
new file mode 100755
index 0000000..4aeb4de
--- /dev/null
+++ b/t/tap-planskip-unplanned.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - a "plan with skip" given after one or more test result have already
+#    been seen is an error
+#  - any test result following a "plan with skip" is an error.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+ok 1
+1..0 # SKIP too late
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
+grep '^ERROR: all\.test - too many tests run (expected 0, got 1)$' stdout
+
+cat > all.test <<END
+ok 1
+ok 2 # SKIP
+not ok 3 # TODO
+1..0 # SKIP too late
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=4 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=1
+grep '^ERROR: all\.test - too many tests run (expected 0, got 3)$' stdout
+
+cat > all.test <<END
+1..0 # SKIP falsified later
+ok 1
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=2
+grep '^ERROR: all\.test 1 # UNPLANNED$' stdout
+grep '^ERROR: all\.test - too many tests run (expected 0, got 1)$' stdout
+
+cat > all.test <<END
+1..0 # SKIP falsified later
+ok 1
+ok 2 # SKIP
+not ok 3
+not ok 4 # TODO
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=6 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=5
+grep '^ERROR: all\.test 1 # UNPLANNED$' stdout
+grep '^ERROR: all\.test 2 # UNPLANNED$' stdout
+grep '^ERROR: all\.test 3 # UNPLANNED$' stdout
+grep '^ERROR: all\.test 4 # UNPLANNED$' stdout
+grep '^ERROR: all\.test - too many tests run (expected 0, got 4)$' stdout
+
+:
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
new file mode 100755
index 0000000..a4dae99
--- /dev/null
+++ b/t/tap-planskip-whitespace.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - normalization of whitespace in console testsuite progress associated
+#    with a SKIP directive in the TAP plan
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > foo.test <<END
+1..0${tab}${tab}   #${tab}SKIP  ${tab}Strip leading & trailing ${tab}${tab}
+END
+
+cat > bar.test <<END
+1..0 #SKIP Preserve ${tab}  middle${tab}${tab}space
+END
+
+cat > baz.test <<END
+1..0 #  SKIP${tab}  Strip${tab}external  preserve ${tab}middle  ${tab}${sp}
+END
+
+TESTS='foo.test bar.test baz.test' $MAKE -e check > stdout \
+  || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 error=0 xpass=0 xfail=0 skip=3
+
+grep "SKIP: foo\\.test - Strip leading & trailing$" stdout
+grep "SKIP: bar\\.test - Preserve ${tab}  middle${tab}${tab}space" stdout
+grep "SKIP: baz\\.test - Strip${tab}external  preserve ${tab}middle" stdout
+
+:
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
new file mode 100755
index 0000000..97ebd0c
--- /dev/null
+++ b/t/tap-planskip.sh
@@ -0,0 +1,78 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic TAP test protocol support:
+#  - special plan format to skip all the tests in a script
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+weirdchars=\''"$!&()[]<>#;^?*/@%=,.:'
+
+cat > foo.test <<END
+1..0
+END
+
+cat > bar.test <<END
+blah
+# blah
+1..0$tab $tab
+END
+
+# It is undefined whether the comment after the plan below should
+# count as an explanation; still, the test should be skipped.
+cat > baz.test <<END
+1..0 # WWW::Mechanize not installed
+other
+    junk
+       lines
+END
+
+cat > wget.test <<END
+1..0 # SKIP wget(1) not installed
+# See also curl.test
+END
+
+cat > curl.test <<END
+1..0 # SKIP: Can't connect to gnu.org!
+# See also wget.test
+END
+
+cat > mu.test <<END
+1..0 # SKIP $weirdchars
+END
+
+env TESTS='foo.test bar.test baz.test wget.test curl.test mu.test' \
+  $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=6 pass=0 fail=0 xpass=0 xfail=0 skip=6 error=0
+
+# Look for a regression where the "1..0" wasn't being stripped from the
+# SKIP message.
+$FGREP '1..0' stdout && Exit 1
+
+grep '^SKIP: foo\.test$' stdout
+grep '^SKIP: bar\.test$' stdout
+grep '^SKIP: baz\.test' stdout # Deliberately laxer, see above for why.
+grep '^SKIP: wget\.test .* wget(1) not installed$' stdout
+grep '^SKIP: curl\.test .* Can'\''t connect to gnu\.org!$' stdout
+grep '^SKIP: mu\.test' stdout | $FGREP "$weirdchars" stdout
+test `grep -c ': .*\.test' stdout` -eq 6
+
+:
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
new file mode 100755
index 0000000..51f7bba
--- /dev/null
+++ b/t/tap-realtime.sh
@@ -0,0 +1,126 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - testsuite progress on console should happen mostly "in real time";
+#    i.e., it's not acceptable for the driver to wait the end of the
+#    script to start displaying results from it.
+# FIXME: this test uses expect(1) to ensure line buffering from make and
+# children, and is pretty hacky and complex; is there a better way to
+# accomplish the checks done here?
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >expect-check <<'END'
+eval spawn $env(SHELL) -c ":"
+expect eof
+END
+expect -f expect-check || {
+    echo "$me: failed to find a working expect program" >&2
+    Exit 77
+}
+rm -f expect-check
+
+# Unfortunately, some make implementations (among them, FreeBSD make,
+# NetBSD make, and Solaris Distributed make), when run in parallel mode,
+# serialize the output from their targets' recipes unconditionally.  In
+# such a situation, there's no way the partial results of a TAP test can
+# be displayed until the test has terminated.  And this is not something
+# our TAP driver script can work around; in fact, the driver *is* sending
+# out its output progressively and "in sync" with test execution -- it is
+# make that is stowing such output away instead of presenting it to the
+# user as soon as it gets it.
+if using_gmake; then :; else
+  case $MAKE in
+    *\ -j*) skip_ "doesn't with non-GNU concurrent make";;
+  esac
+  # Prevent Sun Distributed Make from trying to run in parallel.
+  DMAKE_MODE=serial; export DMAKE_MODE
+fi
+
+cat > Makefile.am << 'END'
+TESTS = all.test
+END
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+#! /bin/sh
+echo 1..3
+
+# Creative quoting to placate maintainer-check.
+sleep="sleep "3
+
+# The awk+shell implementation of the TAP driver must "read ahead" of one
+# line in order to catch the exit status of the test script it runs.  So
+# be sure to echo one "dummy" line after each result line in order not to
+# cause false positives.
+
+echo ok 1 - foo
+echo DUMMY
+$sleep
+test -f ok-1 || { echo 'Bail out!'; exit 1; }
+
+echo ok 2 - bar
+echo DUMMY
+$sleep
+test -f ok-2 || { echo 'Bail out!'; exit 1; }
+
+echo ok 3 - baz
+echo DUMMY
+$sleep
+test -f ok-3 || { echo 'Bail out!'; exit 1; }
+
+: > all-is-well
+END
+
+chmod a+x all.test
+
+cat > expect-make <<'END'
+eval spawn $env(MAKE) check
+expect {
+  "PASS: all.test 1 - foo" {
+    open "ok-1" "w"
+    exp_continue
+  }
+  "PASS: all.test 2 - bar" {
+    open "ok-2" "w"
+    exp_continue
+  }
+  "PASS: all.test 3 - baz" {
+    open "ok-3" "w"
+    exp_continue
+  }
+  "Testsuite summary" {
+    exit 0
+  }
+  timeout {
+    puts "expect timed out"
+    exit 1
+  }
+  default {
+    puts "expect error"
+    exit 1
+  }
+}
+END
+
+# Expect should simulate a tty as stdout, which should ensure a
+# line-buffered output.
+MAKE=$MAKE expect -f expect-make
+test -f all-is-well
+
+:
diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh
new file mode 100755
index 0000000..53b2370
--- /dev/null
+++ b/t/tap-recheck-logs.sh
@@ -0,0 +1,119 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+# - RECHECK_LOGS
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TEST_LOG_COMPILER = cat
+TESTS = foo.test bar.test baz.test
+baz.log: zardoz
+END
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+: > zardoz
+
+cat > foo.test <<'END'
+1..2
+ok 1
+ok 2
+END
+
+cat > bar.test <<'END'
+1..1
+not ok 1
+END
+
+cat > baz.test <<'END'
+1..1
+Bail out!
+END
+
+# Even the tests that are not re-run should contribute to the testsuite
+# summary when obtained by "make check RECHECK_LOGS=".
+grep_summary ()
+{
+  grep '^# TOTAL: *4$' stdout
+  grep '^# PASS: *2$' stdout
+  grep '^# XPASS: *0$' stdout
+  grep '^# FAIL: *1$' stdout
+  grep '^# XFAIL: *0$' stdout
+  grep '^# SKIP: *0$' stdout
+  grep '^# ERROR: *1$' stdout
+}
+
+$MAKE -e check && Exit 1
+test -f foo.log
+test -f bar.log
+test -f baz.log
+
+rm -f foo.log bar.log
+
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+test -f foo.log
+test -f bar.log
+grep '^PASS: foo\.test 1$' stdout
+grep '^PASS: foo\.test 2$' stdout
+grep '^FAIL: bar\.test 1$' stdout
+grep 'baz\.test' stdout && Exit 1
+grep_summary
+
+$sleep
+touch foo.test
+# We re-run only a successful test, but the tests that failed in the
+# previous run should still be taken into account, and cause an overall
+# failure.
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^PASS: foo\.test 1$' stdout
+grep '^PASS: foo\.test 2$' stdout
+grep 'ba[rz]\.test' stdout && Exit 1
+is_newest foo.log foo.test
+grep_summary
+
+$sleep
+touch zardoz
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^ERROR: baz\.test' stdout
+$EGREP '(foo|bar)\.test' stdout && Exit 1
+is_newest baz.log zardoz
+grep_summary
+
+# Now, explicitly retry with all test logs already updated, and ensure
+# that the summary is still displayed.
+env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+$EGREP '(foo|bar|baz)\.test' stdout && Exit 1
+grep_summary
+
+# The following should re-run foo.test (and only foo.test), even if its
+# log file is up-to-date.
+: > older
+env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^PASS: foo\.test 1$' stdout
+grep '^PASS: foo\.test 2$' stdout
+grep 'ba[rz]\.test' stdout && Exit 1
+is_newest foo.log older
+grep_summary
+
+:
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
new file mode 100755
index 0000000..4b120a5
--- /dev/null
+++ b/t/tap-recheck.sh
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the 'recheck' target for TAP test protocol.
+# Keep in sync with 'test-driver-custom-multitest-recheck.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(srcdir)/tap-driver
+TESTS = a.test b.test c.test d.test
+END
+
+cat > a.test << 'END'
+#! /bin/sh
+echo 1..2
+echo ok 1
+echo ok 2
+: > a.run
+END
+
+cat > b.test << 'END'
+#! /bin/sh
+: > b.run
+echo 1..2
+echo ok 1
+if test -f b.ok; then
+  echo ok 2
+else
+  echo 'Bail out!'
+fi
+END
+
+cat > c.test << 'END'
+#! /bin/sh
+echo 1..3
+if test -f c.pass; then
+  echo 'ok - c is ok :-)'
+else
+  echo 'not ok - c is ko :-('
+fi
+if test -f c.xfail; then
+  echo 'not ok 2 # TODO'
+else
+  echo 'ok 2 # TODO'
+fi
+echo 'not ok 3 - blah blah # TODO need better diagnostic'
+: > c.run
+END
+
+cat > d.test << 'END'
+#! /bin/sh
+test -f ./d.count && . ./d.count
+echo 1..${test_count-2}
+echo ok 1 '# SKIP: who cares ...'
+(. ./d.extra) || echo 'not ok 2 - d.extra failed'
+: > d.run
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+do_recheck ()
+{
+  case $* in
+    --fail) on_bad_rc='&&';;
+    --pass) on_bad_rc='||';;
+         *) fatal_ "invalid usage of function 'do_recheck'";;
+  esac
+  rm -f *.run
+  eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; Exit 1; }; :"
+  cat stdout; ls -l
+}
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  : A "make recheck" in a clean tree should run no tests.
+  do_recheck --pass
+  cat test-suite.log
+  test ! -r a.run
+  test ! -r a.log
+  test ! -r b.run
+  test ! -r b.log
+  test ! -r c.run
+  test ! -r c.log
+  test ! -r d.run
+  test ! -r d.log
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+  : Run the tests for the first time.
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  ls -l
+  # All the test scripts should have run.
+  test -f a.run
+  test -f b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=9 pass=3 fail=2 xpass=1 xfail=1 skip=1 error=1
+
+  : Let us make b.test pass.
+  echo OK > b.ok
+  do_recheck --fail
+  # a.test has been successful the first time, so no need to re-run it.
+  # Similar considerations apply to similar checks, below.
+  test ! -r a.run
+  test -f b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0
+
+  : Let us make the first part of c.test pass.
+  echo OK > c.pass
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0
+
+  : Let us make also the second part of c.test pass.
+  echo KO > c.xfail
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=5 pass=1 fail=1 xpass=0 xfail=2 skip=1 error=0
+
+  : Nothing changed, so only d.test should be run.
+  for i in 1 2; do
+    do_recheck --fail
+    test ! -r a.run
+    test ! -r b.run
+    test ! -r c.run
+    test -f d.run
+    count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
+  done
+
+  : Let us make d.test run more testcases, and experience _more_ failures.
+  echo 'test_count=9' > d.count
+  unindent > d.extra <<'END'
+    echo 'ok # SKIP s'
+    echo 'not ok - f 1'
+    echo 'ok - p 1'
+    echo 'not ok - f 2'
+    echo 'ok # TODO xp'
+    echo 'not ok - f 3'
+    echo 'not ok - f 4'
+    echo 'ok - p 2'
+    echo 'ok' # Extra test.
+    echo 'Bail out!'
+END
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test -f d.run
+  count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2
+
+  : Let us finally make d.test pass.
+  echo 'test_count=1' > d.count
+  echo : > d.extra
+  do_recheck --pass
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test -f d.run
+  count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0
+
+  : All tests have been successful or skipped, nothing should be re-run.
+  do_recheck --pass
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test ! -r d.run
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
new file mode 100755
index 0000000..7162df0
--- /dev/null
+++ b/t/tap-result-comment.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - non-directive comments in TAP results are kept verbatim
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..5
+ok 1 # TDO
+not ok 2 # SKP
+ok #SIKP${tab}${sp}
+not ok #    TOD${tab}
+ok 5 # ${tab}${tab}TOOD${tab}${sp}${sp}
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=3 fail=2 xpass=0 xfail=0 skip=0 error=0
+
+# Don't be too strict about trailing white space.
+$FGREP ': all.test' stdout | sed "s/[$sp$tab]*$//" > got
+
+cat > exp <<END
+PASS: all.test 1 # TDO
+FAIL: all.test 2 # SKP
+PASS: all.test 3 #SIKP
+FAIL: all.test 4 #    TOD
+PASS: all.test 5 # ${tab}${tab}TOOD
+END
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
new file mode 100755
index 0000000..ab1cd40
--- /dev/null
+++ b/t/tap-signal.tap
@@ -0,0 +1,140 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - a test script terminated by a signal causes an hard error
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+fetch_tap_driver
+
+plan_ 10
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << END
+TEST_LOG_DRIVER = \$(srcdir)/tap-driver
+TEST_LOG_COMPILER = $PERL -w
+## Will be updated later.
+TESTS =
+END
+
+all_signals='1 2 3 9 13 15'
+blocked_signals=''
+for sig in $all_signals; do
+  # Ignore blocked signals
+  if is_blocked_signal $sig; then
+    blocked_signals="$blocked_signals $sig"
+    continue
+  fi
+  # Write the dummy test scripts in perl, not as shell scripts, to work
+  # around unportabilities in the handling of signals (in fact, even
+  # with bash, the older script were unable to properly deliver a SIGQUIT
+  # to themselves consistently).  The shebang is dummy here, as we prefer
+  # to rely on the definition of TEST_LOG_COMPILER instead.
+  unindent > signal-$sig.test <<END
+    #! perl
+    # We need autoflush to avoid losing output, which could cause spurious
+    # "no test plan seen" in the TAP driver.
+    BEGIN { $| = 1 }
+    use warnings FATAL => "all";
+    print "1..1\\n";
+    print "ok 1\\n";
+    kill $sig, \$\$;
+    print "Bail out! \$0 not killed?\\n";
+END
+  echo TESTS += signal-$sig.test >> Makefile.am
+done
+results_count=`ls *.test | wc -l | tr -d "$tab$sp"`
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+system=`uname -s -r || echo unknown` # Needed later.
+
+signal_caught ()
+{
+  numeric=$1
+  case $numeric in
+     1) symbolic=HUP;;
+     2) symbolic=INT;;
+     3) symbolic=QUIT;;
+     9) symbolic=KILL;;
+    13) symbolic=PIPE;;
+    15) symbolic=TERM;;
+     *) fatal_ "unexpected signal number '$numeric'"
+  esac
+  # Sending a SIGQUIT on Cygwin 1.5 can cause a segmentation fault
+  # instead (sometimes).  Don't let this older bug pollute the results
+  # of our testsuite.
+  case $numeric,$system in
+    3,CYGWIN*\ 1.5.*) sig_re="((SIG)?($symbolic|SEGV)|$numeric|11)";;
+    *) sig_re="((SIG)?$symbolic|$numeric)";;
+  esac
+  wbound_re="($|[^a-zA-Z0-9_-])"
+  pfx_re="^ERROR: signal-$numeric\\.test"
+  case $am_tap_implementation in
+    perl) rx="$pfx_re - terminated by signal $sig_re$";;
+    shell) rx="$pfx_re .*terminated by signal $sig_re$wbound_re";;
+    *) fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'";;
+  esac
+  desc="TAP driver catch test termination by signal SIG$symbolic"
+  case " $blocked_signals " in
+    *" $numeric "*) skip_ -r "SIG$symbolic is blocked" "$desc" ;;
+    *) command_ok_ "$desc" env LC_ALL=C $EGREP "$rx" stdout ;;
+  esac
+}
+
+command_ok_ '"make check" fails' eval '
+  (
+    st=0; $MAKE check >stdout || st=$?
+    cat stdout
+    # Extra "echo" and silencing of xtraces required to avoid possible
+    # garbled output with NetBSD make, which would miss some final
+    # newlines in the expected places and thus mess up our TAP output.
+    set +x; echo
+    test $st -gt 0
+  )
+'
+cat stdout # For debugging.
+
+command_ok_ "count of test results" count_test_results \
+  total=`expr $results_count '*' 2` \
+  pass=$results_count error=$results_count \
+  fail=0 xpass=0 xfail=0 skip=0
+
+for sig in $all_signals; do
+  signal_caught $sig
+done
+
+echo 'TEST_LOG_DRIVER_FLAGS = --ignore-exit' >> Makefile
+
+command_ok_ '"make check" passes [--ignore-exit]' eval '$MAKE check >stdout'
+cat stdout # For debugging.
+
+command_ok_ "count of test results [--ignore-exit]" count_test_results \
+  total=$results_count pass=$results_count \
+  fail=0 xpass=0 xfail=0 skip=0 error=0
+
+:
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
new file mode 100755
index 0000000..a28512b
--- /dev/null
+++ b/t/tap-summary-color.sh
@@ -0,0 +1,23 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - colorized testsuite summary
+
+. ./defs-static
+
+use_colors=yes
+. "$am_testauxdir"/tap-summary-aux.sh
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
new file mode 100755
index 0000000..deee099
--- /dev/null
+++ b/t/tap-summary.sh
@@ -0,0 +1,23 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - colorized testsuite summary
+
+. ./defs-static
+
+use_colors=no
+. "$am_testauxdir"/tap-summary-aux.sh
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
new file mode 100755
index 0000000..cf75cef
--- /dev/null
+++ b/t/tap-test-number-0.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - a test result numbered as 0 is to be considered out-of-order
+# This is consistent with the behaviour of the 'prove' utility.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+if test $am_tap_implementation = perl; then
+  $PERL -MTAP::Parser -e 1 \
+    || skip_ "cannot import TAP::Parser perl module"
+  if $PERL -w -e '
+    use warnings FATAL => "all"; use strict;
+    use TAP::Parser;
+    my $parser = TAP::Parser->new({tap => "1..1\n" . "ok 0\n"});
+    my $result = $parser->next;
+    $result->is_plan or die "first line is not TAP plan";
+    $result = $parser->next;
+    $result->is_test or die "second line is not TAP test result";
+    my $testno = $result->number;
+    $parser->next and die "unexpected further TAP stream";
+    exit ($testno == 0 ? 0 : 77);
+  '; then
+    : # Nothing to do.
+  elif test $? -eq 77; then
+    skip_ 'TAP::Parser bug: test number 0 gets relabelled as 1'
+  else
+    fatal_ "error analyzing TAP::Parser module for bugs"
+  fi
+fi
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..1
+ok 0
+END
+
+cat > b.test <<END
+1..1
+not ok 0
+END
+
+cat > c.test <<END
+1..1
+ok 0 foo # SKIP
+END
+
+cat > d.test <<END
+1..1
+not ok 0 bar # TODO
+END
+
+cat > e.test <<END
+1..1
+ok 0 # TODO
+END
+
+TESTS='a.test b.test c.test d.test e.test' $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=5
+
+grep '^ERROR: a\.test 0 # OUT-OF-ORDER (expecting 1)$' stdout
+grep '^ERROR: b\.test 0 # OUT-OF-ORDER (expecting 1)$' stdout
+grep '^ERROR: c\.test 0 foo # OUT-OF-ORDER (expecting 1)$' stdout
+grep '^ERROR: d\.test 0 bar # OUT-OF-ORDER (expecting 1)$' stdout
+grep '^ERROR: e\.test 0 # OUT-OF-ORDER (expecting 1)$' stdout
+
+:
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
new file mode 100755
index 0000000..e911532
--- /dev/null
+++ b/t/tap-todo-skip-together.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - TODO and SKIP directives on the same line: the first one wins
+# See also related test 'tap-ambiguous-directive.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..2
+ok 1 # SKIP TODO
+not ok 2 # TODO SKIP
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=2 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+grep '^SKIP: all\.test 1 ' stdout
+grep '^XFAIL: all\.test 2 ' stdout
+
+:
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
new file mode 100755
index 0000000..9d7afb9
--- /dev/null
+++ b/t/tap-todo-skip-whitespace.sh
@@ -0,0 +1,100 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - normalization of whitespace in console testsuite progress associated
+#    with TODO and SKIP directives
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > stub.tap <<END
+1 # TODO
+2 # TODO foo?
+3 # TODO: bar!
+4 aa # TODO
+5 bb # TODO       fnord 5
+6 cc # TODO:${tab}fnord 6
+7 - x # TODO
+8 - y # TODO fnord $tab  8
+9 - z # TODO: fnord 9  $tab
+10# TODO x0
+11$tab# TODO x1
+12 $tab$tab   # TODO x2
+13 asd# TODO x3
+14 sad$tab# TODO x4
+15 das$tab$tab   # TODO x5
+END
+
+cat > stub.exp <<END
+1 # TODO
+2 # TODO foo?
+3 # TODO: bar!
+4 aa # TODO
+5 bb # TODO fnord 5
+6 cc # TODO:${tab}fnord 6
+7 - x # TODO
+8 - y # TODO fnord $tab  8
+9 - z # TODO: fnord 9
+10 # TODO x0
+11 # TODO x1
+12 # TODO x2
+13 asd # TODO x3
+14 sad # TODO x4
+15 das # TODO x5
+END
+
+plan=1..15
+
+my_make_check ()
+{
+  xpass=0 xfail=0 skip=0
+  case $1 in
+    xpass|xfail|skip) eval $1=15;;
+    *) fatal_ "bad argument '$1' for my_make_check";;
+  esac
+  cat all.test
+  $MAKE check >stdout || : # Don't care about the exit status in this test.
+  cat stdout
+  count_test_results total=15 pass=0 fail=0 error=0 \
+                     xpass=$xpass xfail=$xfail skip=$skip
+  # Don't be too strict w.r.t. possible normalization of "TODO: foo" into
+  # "TODO : foo" (as is done by, e.g., the 'TAP::Parser' perl module).
+  LC_ALL=C grep '^[A-Z][A-Z]*:' stdout \
+    | sed -e 's/# TODO *:/# TODO:/' -e 's/# SKIP *:/# SKIP:/' > got
+  cat exp
+  cat got
+  diff exp got
+}
+
+# For "TODO" directives leading to XPASS results.
+(echo $plan && sed -e 's/^/ok /' stub.tap) > all.test
+sed -e 's/^/XPASS: all.test /' stub.exp > exp
+my_make_check xpass
+
+# For "TODO" directives leading to XFAIL results.
+(echo $plan && sed -e 's/^/not ok /' stub.tap) > all.test
+sed -e 's/^/XFAIL: all.test /' stub.exp > exp
+my_make_check xfail
+
+# For "SKIP" directives.
+(echo $plan && sed -e 's/^/ok /' -e 's/TODO/SKIP/' stub.tap) > all.test
+sed -e 's/TODO/SKIP/' -e 's/^/SKIP: all.test /' stub.exp > exp
+my_make_check skip
+
+:
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
new file mode 100755
index 0000000..e261d57
--- /dev/null
+++ b/t/tap-todo-skip.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - TODO and SKIP directives are case-insensitive
+#  - TODO and SKIP directives can be followed optionally by a colon ":"
+#    and by an optional explanation.
+#  - our driver isn't fooled into recognizing TODO and SKIP directives
+#    spuriously
+#  - the reasons for TODO and SKIP, if present, are nicely printed in
+#    the testsuite progress output
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# ----------------------------------------------------- #
+#  Check all possible combinations of:                  #
+#    - uppercase/lowercase                              #
+#    - with/without colon character ":"                 #
+#    - with/without explanatory message                 #
+#  in TODO and SKIP directives.                         #
+# ----------------------------------------------------- #
+
+# There are 2 * 2^6 + 2 * 2^6 = 256 tests.
+echo 1..256 > all.test
+
+# These nested loops are clearer without indentation.
+
+for c1 in t T; do
+for c2 in o O; do
+for c3 in d D; do
+for c4 in o O; do
+for ex in '' ':' ' foo' ': foo'; do
+  echo "not ok # $c1$c2$c3$c4$ex"
+  echo "not ok# $c1$c2$c3$c4$ex"
+done; done; done; done; done >> all.test
+
+for c1 in s S; do
+for c2 in k K; do
+for c3 in i I; do
+for c4 in p P; do
+for ex in '' ':' ' foo' ': foo'; do
+  echo "ok # $c1$c2$c3$c4$ex"
+  echo "ok# $c1$c2$c3$c4$ex"
+done; done; done; done; done >> all.test
+
+cat all.test # For debugging.
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=256 pass=0 fail=0 xpass=0 xfail=128 skip=128 error=0
+
+# -------------------------------------------------------- #
+#  TODO ans SKIP directives aren't recognized spuriously.  #
+# -------------------------------------------------------- #
+
+cat > all.test <<'END'
+1..9
+ok TODO
+ok - TODO
+ok 3 TODO
+ok 4 - TODO
+ok SKIP
+ok - SKIP
+ok 7 SKIP
+ok 8 - SKIP
+ok 9
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=9 pass=9 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+:
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
new file mode 100755
index 0000000..252e946
--- /dev/null
+++ b/t/tap-unplanned.sh
@@ -0,0 +1,159 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - unplanned tests are properly reported as errors
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..1
+ok 1
+ok 2
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=3 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=2
+grep '^ERROR: all\.test - too many tests run (expected 1, got 2)$' stdout
+grep '^ERROR: all\.test 2 # UNPLANNED$' stdout
+
+cat > all.test <<END
+1..2
+ok 1
+ok 2
+ok 3
+END
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=4 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=2
+grep '^ERROR: all\.test - too many tests run (expected 2, got 3)$' stdout
+grep '^ERROR: all\.test 3 # UNPLANNED$' stdout
+
+# Interaction with XFAIL_TESTS.
+cat > all.test <<END
+1..2
+not ok 1
+ok 2 # SKIP
+ok 3
+not ok 4
+ok 5 # SKIP
+END
+XFAIL_TESTS=all.test $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=6 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=4
+grep '^ERROR: all\.test - too many tests run (expected 2, got 5)$' stdout
+grep '^ERROR: all\.test 3 # UNPLANNED$' stdout
+grep '^ERROR: all\.test 4 # UNPLANNED$' stdout
+grep '^ERROR: all\.test 5 # UNPLANNED$' stdout
+
+cat > all.test <<END
+1..1
+ok 1
+
+ok
+ok 3
+ok foo
+ok 5 - bar bar
+
+not ok
+not ok 7
+not ok foo
+not ok 9 - bar bar
+
+ok # TODO
+ok 11 # TODO
+ok foo # TODO
+ok 13 - bar bar # TODO
+
+not ok # TODO
+not ok 15 # TODO
+not ok foo # TODO
+not ok 17 - bar bar # TODO
+
+ok # SKIP
+ok 19 # SKIP
+ok foo # SKIP
+ok 21 - bar bar # SKIP
+END
+
+cat > t <<END
+
+2
+3
+4 foo
+5 - bar bar
+
+6
+7
+8 foo
+9 - bar bar
+
+10
+11
+12 foo
+13 - bar bar
+
+14
+15
+16 foo
+17 - bar bar
+
+18
+19
+20 foo
+21 - bar bar
+
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=22 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=21
+
+echo 'PASS: all.test 1' > exp
+sed -e '/^$/d' -e 's/.*/ERROR: all.test & # UNPLANNED/' t >> exp
+echo 'ERROR: all.test - too many tests run (expected 1, got 21)' >> exp
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+# Note that, if the TAP input has a trailing plan, it is not possible
+# to flag unplanned tests as such, since we do not know they're unplanned
+# until the plan is reached; still, we should give at least an error
+# message about the unmatched number of tests once we've got the plan.
+
+for x in 'ok' 'ok 3' 'not ok' 'not ok # TODO' 'ok # TODO' 'ok # SKIP'; do
+  unindent > all.test <<END
+    ok 1
+    ok 2 # SKIP
+    $x
+    1..2
+END
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  test `$FGREP -c ': all.test' stdout` -eq 4
+  $EGREP '^PASS: all\.test 1($| )' stdout
+  $EGREP '^SKIP: all\.test 2($| )' stdout
+  $EGREP ': all\.test 3($| )' stdout
+  grep '^ERROR: all\.test - too many tests run (expected 2, got 3)$' stdout
+done
+
+:
diff --git a/t/tap-whitespace-normalization.sh 
b/t/tap-whitespace-normalization.sh
new file mode 100755
index 0000000..2274674
--- /dev/null
+++ b/t/tap-whitespace-normalization.sh
@@ -0,0 +1,165 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support: whitespace normalization (or lack thereof) in the testsuite
+# progress output on console.  We keep all these checks here in a single
+# script so that a potential cosmetic change in the output format won't
+# force us to tweak dozens of other tests (hopefully).
+# See also related test 'tap-todo-skip-whitespace.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+TEST_LOG_COMPILER = cat
+TESTS =
+END
+
+: > exp
+
+spaces_a=${sp}${tab}${tab}${sp}${sp}${tab}
+spaces_b=${tab}${tab}${sp}${tab}${sp}${sp}${sp}
+
+#-----------------------------------------------------------------------
+
+echo TESTS += numbers.test >> Makefile.am
+
+cat > numbers.test <<END
+1..6
+ok${spaces_a}1
+ok 2${spaces_b}
+ok${spaces_a}3${spaces_b}
+not ok${spaces_b}4
+not ok 5${spaces_a}
+not ok${spaces_b}6${spaces_a}
+END
+
+cat >> exp <<END
+PASS: numbers.test 1
+PASS: numbers.test 2
+PASS: numbers.test 3
+FAIL: numbers.test 4
+FAIL: numbers.test 5
+FAIL: numbers.test 6
+END
+
+#-----------------------------------------------------------------------
+
+echo TESTS += description.test >> Makefile.am
+
+cat > description.test <<END
+1..8
+ok${spaces_a}+foo
+ok +bar${spaces_b}
+ok${spaces_a}+baz${spaces_b}
+not ok${spaces_b}-foo
+not ok -bar${spaces_a}
+not ok${spaces_b}-baz${spaces_a}
+ok  u${spaces_b}v${spaces_a}w${sp}
+not ok${spaces_a}x${spaces_a}y${tab}z${tab}
+END
+
+cat >> exp <<END
+PASS: description.test 1 +foo
+PASS: description.test 2 +bar
+PASS: description.test 3 +baz
+FAIL: description.test 4 -foo
+FAIL: description.test 5 -bar
+FAIL: description.test 6 -baz
+PASS: description.test 7 u${spaces_b}v${spaces_a}w
+FAIL: description.test 8 x${spaces_a}y${tab}z
+END
+
+#-----------------------------------------------------------------------
+
+# "Bail out!" magic.
+
+echo TESTS += bailout.test >> Makefile.am
+
+cat > bailout.test <<END
+1..1
+Bail out!${tab}${sp}${sp}${tab}We're out of disk space.
+ok 1
+END
+
+cat >> exp <<END
+ERROR: bailout.test - Bail out! We're out of disk space.
+END
+
+echo TESTS += bailout2.test >> Makefile.am
+
+cat > bailout2.test <<END
+1..1
+Bail out!foo${tab}${sp}
+ok 1
+END
+
+cat >> exp <<END
+ERROR: bailout2.test - Bail out! foo
+END
+
+#-----------------------------------------------------------------------
+
+# Diagnostic lines.
+
+echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile.am
+echo TESTS += cmnt.test >> Makefile.am
+
+cat > cmnt.test <<END
+1..1
+ok 1
+#Leading whitespace gets added
+#   ${tab}${tab} ${tab}Extra leading whitespace is stripped
+# Trailing whitespace is stripped ${tab}   ${tab}${tab}
+# Middle${tab}whitespace  is${tab}  ${tab}${tab}    kept
+# ${tab} And  only${tab}middle ${tab}whitespace  ${tab}${tab} ${tab}
+END
+
+cat >> exp <<END
+PASS: cmnt.test 1
+# cmnt.test: Leading whitespace gets added
+# cmnt.test: Extra leading whitespace is stripped
+# cmnt.test: Trailing whitespace is stripped
+# cmnt.test: Middle${tab}whitespace  is${tab}  ${tab}${tab}    kept
+# cmnt.test: And  only${tab}middle ${tab}whitespace
+END
+
+#-----------------------------------------------------------------------
+
+# TODO: we should have more checks here ... (but let's not over-do FTM).
+
+#-----------------------------------------------------------------------
+
+chmod a+x *.test
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# Don't care about exit status or number of test results, they should be
+# checked for in many other tests.
+$MAKE check >stdout || :
+cat stdout
+
+LC_ALL=C sort exp > t
+mv -f t exp
+
+# We need the sort below to account for parallel make usage.
+LC_ALL=C grep '[a-z0-9][a-z0-9]*\.test' stdout | LC_ALL=C sort > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
new file mode 100755
index 0000000..fc795f6
--- /dev/null
+++ b/t/tap-with-and-without-number.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - numbered and unnumbered test results can coexist
+#  - tests without explicit number get automatically numbered in the
+#    testsuite progress output on console
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<'END'
+1..7
+ok 1 foo
+ok 2 - foo2
+ok - bar
+not ok baz # TODO
+not ok 5 - asd # TODO
+ok 6 # SKIP
+ok zardoz
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+count_test_results total=7 pass=4 fail=0 xpass=0 xfail=2 skip=1 error=0
+
+grep '^PASS: all\.test 1 foo$' stdout
+grep '^PASS: all\.test 2 - foo2$' stdout
+grep '^PASS: all\.test 3 - bar$' stdout
+grep '^XFAIL: all\.test 4 baz # TODO$' stdout
+grep '^XFAIL: all\.test 5 - asd # TODO$' stdout
+grep '^SKIP: all\.test 6 # SKIP$' stdout
+grep '^PASS: all\.test 7 zardoz$' stdout
+
+:
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
new file mode 100755
index 0000000..6107792
--- /dev/null
+++ b/t/tap-xfail-tests.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP and $(XFAIL_TESTS): test results without directives are turned from
+# PASS to XPASS and from FAIL to XFAIL; other results are unchanged.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+echo 'XFAIL_TESTS = $(TESTS)' >> Makefile
+
+cat > all.test <<END
+1..6
+ok 1
+not ok 2
+ok 3 # TODO
+not ok 4 # TODO
+ok 5 # SKIP
+# The next should count as a failure (and thus will be
+# rendered into an expected failure by XFAIL_TESTS).
+not ok 6 # SKIP
+Bail out!
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=7 pass=0 fail=0 xpass=2 xfail=3 skip=1 error=1
+
+grep '^XPASS: all\.test 1$' stdout
+grep '^XFAIL: all\.test 2$' stdout
+grep '^XPASS: all\.test 3 # TODO' stdout
+grep '^XFAIL: all\.test 4 # TODO' stdout
+grep '^SKIP: all\.test 5 # SKIP' stdout
+grep '^XFAIL: all\.test 6 # SKIP' stdout
+grep '^ERROR: all\.test - Bail out!' stdout
+
+# Check that the exit status of the testsuite is indeed 0 when we
+# would expect success.
+
+cat > all.test <<END
+1..3
+not ok 1
+ok 2 # SKIP
+not ok 3 # TODO
+END
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=3 pass=0 fail=0 xpass=0 xfail=2 skip=1 error=0
+
+:
diff --git a/t/tar-override.sh b/t/tar-override.sh
new file mode 100755
index 0000000..641ce86
--- /dev/null
+++ b/t/tar-override.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the user can override the tar program used by "make dist"
+# at runtime, by redefining the 'TAR' environment variable.
+# FIXME: currently this works only when the tar format used is 'v7'
+# FIXME: (which is the default one).
+
+. ./defs || Exit 1
+
+cwd=`pwd` || fatal_ "couldn't get current working directory"
+
+echo AC_OUTPUT >> configure.ac
+
+cat > am--tar <<'END'
+#!/bin/sh
+echo $1 > am--tar-has-run
+shift
+exec tar "$@"
+END
+chmod a+x am--tar
+
+cat > Makefile.am <<'END'
+check-local: dist
+       test -f am--tar-has-run
+CLEANFILES = am--tar-has-run
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+$MAKE dist
+test -f $me-1.0.tar.gz
+ls | grep has-run && Exit 1
+
+rm -f *.tar.* *has-run*
+
+TAR="$cwd/am--tar foo" $MAKE distcheck
+test -f $me-1.0.tar.gz
+test "`cat am--tar-has-run`" = foo
+
+rm -f *.tar.* *has-run*
+
+TAR=; unset TAR
+# Creative use of eval to pacify maintainer checks.
+eval \$'MAKE dist "TAR=./am--tar mu"'
+test -f $me-1.0.tar.gz
+test "`cat am--tar-has-run`" = mu
+
+:
diff --git a/t/tar.sh b/t/tar.sh
new file mode 100755
index 0000000..263049a
--- /dev/null
+++ b/t/tar.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the tar-ustar option.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([tar], [1.0])
+AM_INIT_AUTOMAKE([tar-ustar])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+if grep 'am__tar.*false' Makefile; then
+  skip_ "cannot find proper archiver program"
+fi
+
+$MAKE distcheck
+test -f tar-1.0.tar.gz
diff --git a/t/tar2.sh b/t/tar2.sh
new file mode 100755
index 0000000..f9cc000
--- /dev/null
+++ b/t/tar2.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the tar-pax option.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([tar2], [1.0])
+AM_INIT_AUTOMAKE([tar-pax])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+if grep 'am__tar.*false' Makefile; then
+  skip_ "cannot find proper archiver program"
+fi
+
+$MAKE distcheck
+test -f tar2-1.0.tar.gz
diff --git a/t/tar3.sh b/t/tar3.sh
new file mode 100755
index 0000000..403ce99
--- /dev/null
+++ b/t/tar3.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check the tar options diagnostics.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT([tar2], [1.0])
+AM_INIT_AUTOMAKE([tar-pax tar-v7])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep "^configure\.ac:2:.*mutually exclusive" stderr > tar-err
+cat tar-err
+test 1 = `wc -l < tar-err`
+grep "'tar-pax'" tar-err
+grep "'tar-v7'"  tar-err
+
+rm -rf autom4te.cache
+
+cat > configure.ac << 'END'
+AC_INIT([tar2], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+echo 'AUTOMAKE_OPTIONS = tar-pax' > Makefile.am
+
+AUTOMAKE_fails
+grep '^Makefile\.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
+
+:
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
new file mode 100755
index 0000000..ad0e94d
--- /dev/null
+++ b/t/target-cflags.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure target specific CFLAGS work
+# Assar Westerlund <address@hidden>
+
+required=cc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = no-dependencies
+
+bin_PROGRAMS = foo bar
+foo_CFLAGS   = -DFOO
+END
+
+cat > foo.c << 'END'
+#include <stdio.h>
+#ifdef FOO
+int main(void)
+{
+  return 0;
+}
+#endif
+END
+
+cat > bar.c << 'END'
+#ifndef FOO
+int main(void)
+{
+  return 0;
+}
+#endif
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+mkdir build
+
+cd build
+../configure
+$MAKE
+if cross_compiling; then :; else
+  ./foo
+  ./bar
+fi
+cd ..
+
+./configure
+$MAKE
+if cross_compiling; then :; else
+  ./foo
+  ./bar
+fi
+
+:
diff --git a/t/targetclash.sh b/t/targetclash.sh
new file mode 100755
index 0000000..43e227d
--- /dev/null
+++ b/t/targetclash.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that target clashes are diagnosed.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = ctags
+END
+
+$ACLOCAL
+AUTOMAKE_fails -a
+grep 'redefinition.*ctags' stderr
+
+:
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
new file mode 100755
index 0000000..7df66ae
--- /dev/null
+++ b/t/test-driver-acsubst.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests:
+#  - LOG_DRIVER variables can be AC_SUBST'd
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+mkdir test-drivers
+
+cp "$am_testauxdir"/trivial-test-driver test-drivers/triv \
+  || fatal_ "failed to fetch auxiliary script trivial-test-driver"
+cp "$am_scriptdir"/test-driver test-drivers/dflt \
+  || fatal_ "failed to fetch auxiliary script test-driver"
+
+cat >> configure.ac <<'END'
+AC_SUBST([LOG_DRIVER],      ['${SHELL} test-drivers/triv'])
+AC_SUBST([TEST_LOG_DRIVER], ['${SHELL} test-drivers/dflt'])
+AC_SUBST([SH_LOG_DRIVER],   ['${my_drv}'])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TEST_EXTENSIONS = .test .sh
+my_drv = $(SHELL) test-drivers/dflt
+TESTS = foo bar.test baz.sh
+XFAIL_TESTS = baz.sh
+.PHONY: check-autodefs
+check-autodefs:
+### For debugging.
+       @echo      LOG_DRIVER = $(LOG_DRIVER)
+       @echo TEST_LOG_DRIVER = $(TEST_LOG_DRIVER)
+       @echo   SH_LOG_DRIVER = $(SH_LOG_DRIVER)
+### Checks here.
+       @echo ' ' $(LOG_DRIVER)      ' ' | grep ' test-drivers/triv '
+       @echo ' ' $(TEST_LOG_DRIVER) ' ' | grep ' test-drivers/dflt '
+       @echo ' ' $(SH_LOG_DRIVER)   ' ' | grep ' test-drivers/dflt '
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+
+cat > foo <<'END'
+#!/bin/sh
+echo "PASS: from $0"
+exit 1 # Exit status should be ignored by the trivial-test-driver.
+END
+
+cat > bar.test <<'END'
+#!/bin/sh
+exit 77
+END
+
+cat > baz.sh <<'END'
+#!/bin/sh
+exit 1
+END
+
+chmod a+x foo bar.test baz.sh
+
+$MAKE check-autodefs
+st=0; $MAKE check >stdout || st=$?
+cat stdout
+cat test-suite.log
+cat foo.log
+cat bar.log
+cat baz.log
+test $st -eq 0 || Exit 1
+count_test_results total=3 pass=1 fail=0 skip=1 xfail=1 xpass=0 error=0
+
+:
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
new file mode 100755
index 0000000..ac0b3f1
--- /dev/null
+++ b/t/test-driver-cond.sh
@@ -0,0 +1,119 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests:
+#   - Automake can correctly handle conditionals contents for the
+#     LOG_DRIVER variables.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cp "$am_testauxdir"/trivial-test-driver . \
+  || fatal_ "failed to fetch auxiliary script trivial-test-driver"
+cp "$am_scriptdir"/tap-driver.pl . \
+  || fatal_ "failed to fetch auxiliary script tap-driver.pl"
+
+cat >> configure.ac << END
+AM_CONDITIONAL([COND1], [:])
+AM_CONDITIONAL([COND2], [false])
+AM_CONDITIONAL([COND3], [false])
+AC_SUBST([PERL], ['$PERL'])
+AC_SUBST([my_LOG_DRIVER], ['\${SHELL} \${top_srcdir}/trivial-test-driver'])
+AM_SUBST_NOTMAKE([my_LOG_DRIVER])
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+cat > Makefile.am << 'END'
+TESTS = foo bar.test baz.sh
+EXTRA_DIST = $(TESTS) tap-driver.pl trivial-test-driver
+TEST_EXTENSIONS = .test .sh
+LOG_DRIVER =
+SH_LOG_DRIVER = $(tap_rulez)
+if COND1
+LOG_DRIVER += @my_LOG_DRIVER@
+if COND2
+tap_rulez = false
+else !COND2
+tap_rulez = $(PERL) $(srcdir)/tap-driver.pl
+endif !COND2
+endif COND1
+END
+
+cat > foo <<'END'
+#!/bin/sh
+echo "PASS: from $0"
+echo "SKIP: from $0"
+exit 1 # Exit status should be ignored by the trivial-test-driver.
+END
+
+cat > bar.test <<'END'
+#!/bin/sh
+exit 0
+END
+
+cat > baz.sh <<'END'
+#!/bin/sh
+echo 1..3
+echo 'ok 1'
+echo 'not ok 2 # TODO'
+echo 'not ok 3 # TODO'
+END
+
+chmod a+x foo bar.test baz.sh
+
+$AUTOMAKE -a
+test -f test-driver
+
+grep DRIVER Makefile.in || Exit 99 # For debugging.
+
+grep '^my_LOG_DRIVER *=' Makefile.in \
+  && fatal_ 'unexpected $(my_LOG_DRIVER) in Makefile.in'
+
+grep '^TEST_LOG_DRIVER =.*\$(SHELL).*/test-driver' Makefile.in
+
+$PERL -MTAP::Parser -e 1 \
+  || skip_ "cannot import TAP::Parser perl module"
+
+./configure
+
+do_count ()
+{
+  count_test_results total=6 pass=3 fail=0 skip=1 xfail=2 xpass=0 error=0
+  grep '^PASS: foo, testcase 1 *$' stdout
+  grep '^SKIP: foo, testcase 2 *$' stdout
+  grep '^PASS: bar\.test *$' stdout
+  $EGREP 'PASS: baz\.sh 1( |$)' stdout
+  $EGREP 'XFAIL: baz\.sh 2( |$)' stdout
+  $EGREP 'XFAIL: baz\.sh 3( |$)' stdout
+}
+
+st=0; $MAKE check >stdout || st=$?
+cat stdout
+cat test-suite.log
+cat foo.log
+cat bar.log
+cat baz.log
+test $st -eq 0 || Exit 1
+do_count
+
+$MAKE distcheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+do_count
+
+:
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
new file mode 100755
index 0000000..bfca0b9
--- /dev/null
+++ b/t/test-driver-create-log-dir.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: if a log file has a directory component (as in
+# e.g., 'sub/foo.log'), the Automake test harness must ensure that
+# directory exists before calling any custom test driver.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# The extra '.' components below are meant.
+TESTS = sub/foo sub/subsub/bar.test ././sub1/./baz
+$(TESTS):
+LOG_DRIVER = $(srcdir)/checkdir-driver
+TEST_LOG_DRIVER = $(LOG_DRIVER)
+EXTRA_DIST = checkdir-driver
+
+check-local: $(TEST_SUITE_LOG)
+       test -d sub
+       test -d sub1
+       test -d sub/subsub
+       test -f sub/foo.log
+       test -f sub/subsub/bar.log
+       test -f sub1/baz.log
+       test -f sub/foo.trs
+       test -f sub/subsub/bar.trs
+       test -f sub1/baz.trs
+END
+
+cat > checkdir-driver <<'END'
+#! /bin/sh
+set -e; set -u
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name|--expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+echo "log: $log_file" # For debugging.
+echo "trs: $trs_file" # Ditto.
+case $log_file in */*);; *) exit 1;; esac
+dir_log=`expr "$log_file" : '\(.*\)/[^/]*'`
+dir_trs=`expr "$trs_file" : '\(.*\)/[^/]*'`
+echo "dir_log: $dir_log" # For debugging.
+echo "dir_trs: $dir_trs" # Likewise.
+test x"$dir_trs" = x"$dir_log" || exit 1
+test -d "$dir_log" || exit 1
+echo dummy1 > "$log_file"
+echo dummy2 > "$trs_file"
+END
+chmod a+x checkdir-driver
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/test-driver-custom-multitest-recheck.sh 
b/t/test-driver-custom-multitest-recheck.sh
new file mode 100755
index 0000000..9b4f5df
--- /dev/null
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -0,0 +1,214 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: try the "recheck" functionality with test protocols
+# that allow multiple testcases in a single test script.  This test not
+# only checks implementation details in Automake's custom test drivers
+# support, but also serves as a "usability test" for our APIs.
+# See also related tests 'test-driver-custom-multitest-recheck2.test'
+# and 'parallel-tests-recheck-override.test'.
+# Keep in sync with 'tap-recheck.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cp "$am_testauxdir"/trivial-test-driver . \
+  || fatal_ "failed to fetch auxiliary script trivial-test-driver"
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(SHELL) $(srcdir)/trivial-test-driver
+TESTS = a.test b.test c.test d.test
+END
+
+cat > a.test << 'END'
+#! /bin/sh
+echo PASS: aa
+echo PASS: AA
+: > a.run
+END
+
+cat > b.test << 'END'
+#! /bin/sh
+echo PASS:
+if test -f b.ok; then
+  echo PASS:
+else
+  echo ERROR:
+fi
+: > b.run
+END
+
+cat > c.test << 'END'
+#! /bin/sh
+if test -f c.pass; then
+  echo PASS: c0
+else
+  echo FAIL: c0
+fi
+if test -f c.xfail; then
+  echo XFAIL: c1
+else
+  echo XPASS: c1
+fi
+echo XFAIL: c2
+: > c.run
+END
+
+cat > d.test << 'END'
+#! /bin/sh
+echo SKIP: who cares ...
+(. ./d.extra) || echo FAIL: d.extra failed
+: > d.run
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+do_recheck ()
+{
+  case $* in
+    --fail) on_bad_rc='&&';;
+    --pass) on_bad_rc='||';;
+         *) fatal_ "invalid usage of function 'do_recheck'";;
+  esac
+  rm -f *.run
+  eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; Exit 1; }; :"
+  cat stdout; ls -l
+}
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  : A "make recheck" in a clean tree should run no tests.
+  do_recheck --pass
+  cat test-suite.log
+  test ! -r a.run
+  test ! -r a.log
+  test ! -r b.run
+  test ! -r b.log
+  test ! -r c.run
+  test ! -r c.log
+  test ! -r d.run
+  test ! -r d.log
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+  : Run the tests for the first time.
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  ls -l
+  # All the test scripts should have run.
+  test -f a.run
+  test -f b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=9 pass=3 fail=2 xpass=1 xfail=1 skip=1 error=1
+
+  : Let us make b.test pass.
+  echo OK > b.ok
+  do_recheck --fail
+  # a.test has been successful the first time, so no need to re-run it.
+  # Similar considerations apply to similar checks, below.
+  test ! -r a.run
+  test -f b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0
+
+  : Let us make the first part of c.test pass.
+  echo OK > c.pass
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0
+
+  : Let us make also the second part of c.test pass.
+  echo KO > c.xfail
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+  test -f d.run
+  count_test_results total=5 pass=1 fail=1 xpass=0 xfail=2 skip=1 error=0
+
+  : Nothing changed, so only d.test should be run.
+  for i in 1 2; do
+    do_recheck --fail
+    test ! -r a.run
+    test ! -r b.run
+    test ! -r c.run
+    test -f d.run
+    count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
+  done
+
+  : Let us make d.test run more testcases, and experience _more_ failures.
+  unindent > d.extra <<'END'
+    echo SKIP: s
+    echo FAIL: f 1
+    echo PASS: p 1
+    echo FAIL: f 2
+    echo XPASS: xp
+    echo FAIL: f 3
+    echo FAIL: f 4
+    echo ERROR: e 1
+    echo PASS: p 2
+    echo ERROR: e 2
+END
+  do_recheck --fail
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test -f d.run
+  count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2
+
+  : Let us finally make d.test pass.
+  echo : > d.extra
+  do_recheck --pass
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test -f d.run
+  count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0
+
+  : All tests have been successful or skipped, nothing should be re-run.
+  do_recheck --pass
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  test ! -r d.run
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/test-driver-custom-multitest-recheck2.sh 
b/t/test-driver-custom-multitest-recheck2.sh
new file mode 100755
index 0000000..3e7add6
--- /dev/null
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -0,0 +1,188 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: try the "recheck" functionality with test protocols
+# that allow multiple testcases in a single test script.  In particular,
+# check that this still works when we override $(TESTS) and $(TEST_LOGS)
+# at make runtime.
+# See also related tests 'test-driver-custom-multitest-recheck.test' and
+# 'parallel-tests-recheck-override.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cp "$am_testauxdir"/trivial-test-driver . \
+  || fatal_ "failed to fetch auxiliary script trivial-test-driver"
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(SHELL) $(srcdir)/trivial-test-driver
+TESTS = a.test b.test c.test
+END
+
+cat > a.test << 'END'
+#! /bin/sh
+echo PASS: 1
+echo PASS: 2
+: > a.run
+END
+
+cat > b.test << 'END'
+#! /bin/sh
+echo SKIP: b0
+if test -f b.ok; then
+  echo XFAIL: b1
+else
+  echo FAIL: b2
+fi
+: > b.run
+END
+
+cat > c.test << 'END'
+#! /bin/sh
+if test -f c.err; then
+  echo ERROR: xxx
+elif test -f c.ok; then
+  echo PASS: ok
+else
+  echo XPASS: xp
+fi
+: > c.run
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  : Run the tests for the first time.
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  # All the test scripts should have run.
+  test -f a.run
+  test -f b.run
+  test -f c.run
+  count_test_results total=5 pass=2 fail=1 xpass=1 xfail=0 skip=1 error=0
+
+  rm -f *.run
+
+  : An empty '$(TESTS)' or '$(TEST_LOGS)' means that no test should be run.
+  for var in TESTS TEST_LOGS; do
+    env "$var=" $MAKE -e recheck >stdout || { cat stdout; Exit 1; }
+    cat stdout
+    count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+    test ! -r a.run
+    test ! -r b.run
+    test ! -r c.run
+  done
+  unset var
+
+  : a.test was successful the first time, no need to re-run it.
+  env TESTS=a.test $MAKE -e recheck >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+
+  : b.test failed, it should be re-run.  And make it pass this time.
+  echo OK > b.ok
+  TEST_LOGS=b.log $MAKE -e recheck >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  test ! -r a.run
+  test -f b.run
+  test ! -r c.run
+  count_test_results total=2 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=0
+
+  rm -f *.run
+
+  : No need to re-run a.test or b.test anymore.
+  TEST_LOGS=b.log $MAKE -e recheck >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+  TESTS='a.test b.test' $MAKE -e recheck >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+
+  : No need to re-run a.test anymore, but c.test should be rerun,
+  : as it contained an XPASS.  And this time, make it fail with
+  : an hard error.
+  # Use 'echo' here, since Solaris 10 /bin/sh would try to optimize
+  # a ':' away after the first iteration, even if it is redirected.
+  echo dummy > c.err
+  env TEST_LOGS='a.log c.log' $MAKE -e recheck >stdout \
+    && { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+
+  rm -f *.run *.err
+
+  : c.test contained and hard error the last time, so it should be re-run.
+  : This time, make it pass
+  # Use 'echo', not ':'; see comments above for why.
+  echo dummy > c.ok
+  env TESTS='c.test a.test' $MAKE -e recheck >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+  test ! -r a.run
+  test ! -r b.run
+  test -f c.run
+
+  rm -f *.run *.err *.ok
+
+  : Nothing should be rerun anymore, as all tests have been eventually
+  : successful.
+  $MAKE recheck >stdout || { cat stdout; Exit 1; }
+  cat stdout
+  count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+  test ! -r a.run
+  test ! -r b.run
+  test ! -r c.run
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/test-driver-custom-multitest.sh 
b/t/test-driver-custom-multitest.sh
new file mode 100755
index 0000000..c7959cd
--- /dev/null
+++ b/t/test-driver-custom-multitest.sh
@@ -0,0 +1,172 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: check that we can easily support test protocols
+# that allow multiple testcases in a single test script.  This test not
+# only checks implementation details in Automake's custom test drivers
+# support, but also serves as a "usability test" for our APIs.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cp "$am_testauxdir"/trivial-test-driver . \
+  || fatal_ "failed to fetch auxiliary script trivial-test-driver"
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .t
+T_LOG_DRIVER = $(SHELL) $(srcdir)/trivial-test-driver
+
+TESTS = \
+  pass.t \
+  fail.t \
+  fail2.t \
+  pass-fail.t \
+  pass4-skip.t \
+  pass3-skip2-xfail.t \
+  pass-xpass-fail-xfail-skip-error.t
+END
+
+cat > pass.t << 'END'
+echo %% pass %%
+echo PASS: pass
+END
+
+cat > fail.t << 'END'
+echo %% fail %%
+echo FAIL: fail
+END
+
+cat > fail2.t << 'END'
+echo %% fail2 %%
+echo FAIL: stdout >&1
+echo FAIL: stderr >&2
+echo :PASS: this should be ignored
+END
+
+cat > pass-fail.t << 'END'
+echo %% pass-fail %%
+echo 'FAIL: this fails :-('
+echo 'some randome message'
+echo 'some randome warning' >&2
+echo 'PASS: this passes :-)'
+echo 'INFO: blah'
+echo 'WARNING: blah blah' >&2
+END
+
+cat > pass4-skip.t << 'END'
+echo %% pass4-skip %%
+echo PASS: on stdout >&1
+echo PASS: on stderr >&2
+echo PASS: 3
+echo PASS: 4
+echo SKIP: 1
+echo this FAIL: should be ignored
+echo FAIL as should this
+exit 99
+END
+
+cat > pass3-skip2-xfail.t << 'END'
+echo %% pass4-skip2-xfail %%
+echo 'PASS: -v'
+echo 'PASS: --verbose'
+echo 'SKIP: Oops, unsupported system.'
+echo 'PASS: -#-#-#-'
+cp || echo "SKIP: cp cannot read users' mind" >&2
+mv || echo "XFAIL: mv cannot read users' mind yet"
+exit 127
+END
+
+cat > pass-xpass-fail-xfail-skip-error.t << 'END'
+echo PASS:
+echo FAIL:
+echo XFAIL:
+echo XPASS:
+echo SKIP:
+echo ERROR:
+echo %% pass-xpass-fail-xfail-skip-error %%
+END
+
+chmod a+x *.t
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+for vpath in : false; do
+  if $vpath; then
+    mkdir build
+    cd build
+    srcdir=..
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  $MAKE check >stdout && { cat stdout; cat test-suite.log; Exit 1; }
+  cat stdout
+  cat test-suite.log
+  # Couple of sanity checks.  These might need to be updated if the
+  # 'trivial-test-driver' script is changed.
+  $FGREP INVALID.NAME stdout test-suite.log && Exit 1
+  test -f BAD.LOG && Exit 1
+  test -f BAD.TRS && Exit 1
+  # These log files must all have been created by the testsuite.
+  cat pass.log
+  cat fail.log
+  cat fail2.log
+  cat pass-fail.log
+  cat pass4-skip.log
+  cat pass3-skip2-xfail.log
+  cat pass-xpass-fail-xfail-skip-error.log
+
+  count_test_results total=23 pass=10 fail=5 skip=4 xfail=2 xpass=1 error=1
+
+  tst=pass-xpass-fail-xfail-skip-error
+  grep  "^PASS: $tst\.t, testcase 1" stdout
+  grep  "^FAIL: $tst\.t, testcase 2" stdout
+  grep "^XFAIL: $tst\.t, testcase 3" stdout
+  grep "^XPASS: $tst\.t, testcase 4" stdout
+  grep  "^SKIP: $tst\.t, testcase 5" stdout
+  grep "^ERROR: $tst\.t, testcase 6" stdout
+
+  # Check that the content of, and only of, the test logs with at least
+  # one failing test case has been copied into 'test-suite.log'.  Note
+  # that test logs containing skipped or xfailed test cases are *not*
+  # copied into 'test-suite.log' -- a behaviour that deliberately differs
+  # from the one of the built-in Automake test drivers.
+  grep '%%' test-suite.log # For debugging.
+  grep '%% fail %%' test-suite.log
+  grep '%% fail2 %%' test-suite.log
+  grep '%% pass-fail %%' test-suite.log
+  grep '%% pass-xpass-fail-xfail-skip-error %%' test-suite.log
+  test `grep -c '%% ' test-suite.log` -eq 4
+
+  TESTS='pass.t pass3-skip2-xfail.t' $MAKE -e check >stdout \
+    || { cat stdout; cat test-suite.log; Exit 1; }
+  cat test-suite.log
+  cat stdout
+  count_test_results total=7 pass=4 fail=0 skip=2 xfail=1 xpass=0 error=0
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/test-driver-custom-no-extra-driver.sh 
b/t/test-driver-custom-no-extra-driver.sh
new file mode 100755
index 0000000..31000af
--- /dev/null
+++ b/t/test-driver-custom-no-extra-driver.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that auxiliary script 'test-driver' doesn't get needlessly
+# installed or referenced if it's not used, i.e., if the user has
+# defined his own '*LOG_DRIVER' variables.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_SUBST([X_LOG_DRIVER], [none])
+AC_OUTPUT
+END
+
+mkdir sub1 sub2
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub1 sub2
+LOG_DRIVER =
+TEST_LOG_DRIVER = :
+TESTS = foo bar.test
+END
+
+cat > sub1/Makefile.am <<'END'
+TEST_EXTENSIONS = .x .sh .pl
+SH_LOG_DRIVER = dummy1
+PL_LOG_DRIVER = dummy2
+TESTS = a.pl b.sh c.x
+END
+
+cat > sub2/Makefile.am <<'END'
+TEST_EXTENSIONS = .bar
+LOG_DRIVER = x
+BAR_LOG_DRIVER = y
+TESTS = 1 2.bar 3.test 4.t 5.tt $(check_PROGRAMS)
+check_PROGRAMS = p1 p2$(EXEEXT) p3.bar p4.suf
+END
+
+$ACLOCAL
+
+for opts in '' '--add-missing' '-a -c'; do
+  $AUTOMAKE $opts
+  $FGREP test-driver Makefile.in sub[12]/Makefile.in && Exit 1
+  find . | $FGREP test-driver && Exit 1
+  : For shells with busted 'set -e'.
+done
+
+:
diff --git a/t/test-driver-custom-xfail-tests.sh 
b/t/test-driver-custom-xfail-tests.sh
new file mode 100755
index 0000000..9a4e3fe
--- /dev/null
+++ b/t/test-driver-custom-xfail-tests.sh
@@ -0,0 +1,166 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: "abstract" XFAIL_TESTS support.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_SUBST([nihil], [])
+AC_SUBST([ac_xfail_tests], ['x5.test x6$(test_suffix)'])
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = . sub1 sub2
+TEST_LOG_DRIVER = $(srcdir)/td
+TESTS = pass.test xfail.test
+XFAIL_TESTS = xfail.test
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am <<END
+empty =
+
+TEST_LOG_DRIVER = \$(top_srcdir)/td
+
+# XFAIL_TESTS should gracefully handle TAB characters, and multiple
+# whitespaces.
+XFAIL_TESTS =\$(empty)${tab}x1.test x2.test${tab}x3.test${tab}\
+x4.test ${tab} x5.test              x6.test${tab}\$(empty)
+
+TESTS = pass.test x1.test x2.test x3.test x4.test x5.test x6.test
+END
+
+cat > sub2/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = -Wno-portability-recursive
+
+TEST_LOG_DRIVER = $(srcdir)/../td
+
+# XFAIL_TESTS should gracefully AC_SUBST @substitution@ and
+# make variables indirections.
+an_xfail_test = x1.test
+test_suffix = .test
+v0 = x3.test
+v1 = v
+v2 = 0
+XFAIL_TESTS = $(an_xfail_test) x2.test @nihil@ x3${test_suffix}
+XFAIL_TESTS += $($(v1)$(v2)) x4.test @ac_xfail_tests@
+
+TESTS = pass.test x1.test x2.test x3.test x4.test x5.test x6.test
+END
+
+cat > pass.test <<'END'
+#!/bin/sh
+exit 0
+END
+
+cat > xfail.test <<'END'
+#!/bin/sh
+exit 1
+END
+
+chmod a+x pass.test xfail.test
+
+cp pass.test sub1/pass.test
+cp pass.test sub2/pass.test
+
+for i in 1 2 3 4 5 6; do
+  cp xfail.test sub1/x$i.test
+  cp xfail.test sub2/x$i.test
+done
+
+cat > td <<'END'
+#! /bin/sh
+set -e; set -u
+test_name=INVALID
+log_file=/dev/null
+trs_file=/dev/null
+expect_failure=no
+while test $# -gt 0; do
+  case $1 in
+    --test-name) test_name=$2; shift;;
+    --expect-failure) expect_failure=$2; shift;;
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    # Ignored.
+    --color-tests) shift;;
+    --enable-hard-errors) shift;;
+    # Explicitly terminate option list.
+    --) shift; break;;
+    # Shouldn't happen
+    *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+st=0
+"$@" || st=$?
+case $st,$expect_failure in
+  0,no)
+    echo "PASS: $test_name" | tee "$log_file"
+    echo ":test-result: PASS" > "$trs_file"
+    ;;
+  1,no)
+    echo "FAIL: $test_name" | tee "$log_file"
+    echo ":test-result: FAIL" > "$trs_file"
+    ;;
+  0,yes)
+    echo "XPASS: $test_name" | tee "$log_file"
+    echo ":test-result: XPASS" > "$trs_file"
+    ;;
+  1,yes)
+    echo "XFAIL: $test_name" | tee "$log_file"
+    echo ":test-result: XFAIL" > "$trs_file"
+    ;;
+  *)
+    echo "INTERNAL ERROR" >&2
+    exit 99
+    ;;
+esac
+END
+chmod a+x td
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+$MAKE check >stdout || { cat stdout; Exit 1; }
+cat stdout
+test `grep -c '^PASS:'  stdout` -eq 3
+test `grep -c '^XFAIL:' stdout` -eq 13
+
+for dir in sub1 sub2; do
+  cd $dir
+  cp pass.test x1.test
+  cp x2.test pass.test
+  $MAKE check >stdout && { cat stdout; Exit 1; }
+  cat stdout
+  test "`cat pass.trs`" = ":test-result: FAIL"
+  test "`cat x1.trs`"   = ":test-result: XPASS"
+  test "`cat x2.trs`"   = ":test-result: XFAIL"
+  grep '^FAIL: pass\.test$' stdout
+  grep '^XPASS: x1\.test$'  stdout
+  grep '^XFAIL: x2\.test$'  stdout
+  count_test_results total=7 pass=0 xpass=1 fail=1 xfail=5 skip=0 error=0
+  cd ..
+done
+
+:
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
new file mode 100755
index 0000000..60ce074
--- /dev/null
+++ b/t/test-driver-custom.sh
@@ -0,0 +1,144 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: per-extension test drivers.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# Automake shouldn't match the '/test' in 'sub/test' as '.test' suffix.
+TESTS = 1.chk 2.test 3 4.c.chk 5.suf sub/test
+
+TEST_EXTENSIONS = .chk .test
+
+CHK_LOG_DRIVER = ./chk-wrapper
+TEST_LOG_DRIVER = $(SHELL) $(srcdir)/test-wrapper
+LOG_DRIVER = noext-wrapper
+
+AM_CHK_LOG_DRIVER_FLAGS = --am-chk
+CHK_LOG_DRIVER_FLAGS = --chk
+AM_TEST_LOG_DRIVER_FLAGS = -am-test
+TEST_LOG_DRIVER_FLAGS = -test
+AM_LOG_DRIVER_FLAGS = am
+LOG_DRIVER_FLAGS = _
+END
+
+mkdir sub bin
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+
+cat > wrapper.skel <<'END'
+#! /bin/sh
+set -e
+
+me=`echo "$0" | sed 's,^.*/,,'`
+if test -z "$me"; then
+  echo "$0: cannot determine program name" >&2
+  exit 99
+fi
+
+am_log_wflags='@am_log_wflags@'
+log_wflags='@log_wflags@'
+
+test_name=INVALID
+log_file=BAD.log
+trs_file=BAD.trs
+extra_opts=
+while test $# -gt 0; do
+  case $1 in
+    --test-name) test_name=$2; shift;;
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    # Ignored.
+    --expect-failure) shift;;
+    --color-tests) shift;;
+    --enable-hard-errors) shift;;
+    # Remembered in the same order they're passed in.
+    $am_log_wflags|$log_wflags) extra_opts="$extra_opts $1";;
+    # Explicitly terminate option list.
+    --) shift; break;;
+    # Shouldn't happen
+    *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+
+echo "$me" "$test_name" $extra_opts > "$log_file"
+: > "$trs_file"
+
+exec "$@"
+exit 127
+END
+
+sed -e 's|@am_log_wflags@|--am-chk|' \
+    -e 's|@log_wflags@|--chk|' \
+    < wrapper.skel > chk-wrapper
+
+sed -e 's|@am_log_wflags@|-am-test|' \
+    -e 's|@log_wflags@|-test|' \
+    < wrapper.skel > test-wrapper
+
+sed -e 's|@am_log_wflags@|am|' \
+    -e 's|@log_wflags@|_|' \
+    < wrapper.skel > bin/noext-wrapper
+
+# 'test-wrapper' is deliberately not made executable.
+chmod a+x chk-wrapper bin/noext-wrapper
+
+# Not needed anymore.
+rm -f wrapper.skel
+
+cat > 1.chk << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x 1.chk
+cp 1.chk 2.test
+cp 1.chk 3
+cp 1.chk 4.c.chk
+cp 1.chk 5.suf
+cp 1.chk sub/test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE
+VERBOSE=yes $MAKE check
+ls -l . sub
+
+test ! -r BAD.log
+test ! -r BAD.trs
+
+echo 'chk-wrapper 1.chk --am-chk --chk' > 1.exp
+echo 'test-wrapper 2.test -am-test -test' > 2.exp
+echo 'noext-wrapper 3 am _' > 3.exp
+echo 'chk-wrapper 4.c.chk --am-chk --chk' > 4.c.exp
+echo 'noext-wrapper 5.suf am _' > 5.suf.exp
+echo 'noext-wrapper sub/test am _' > sub/test.exp
+
+st=0
+for x in 1 2 3 4.c 5.suf sub/test; do
+  cat $x.log
+  diff $x.exp $x.log || st=1
+done
+
+Exit $st
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
new file mode 100755
index 0000000..0eb2268
--- /dev/null
+++ b/t/test-driver-fail.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: what happens when a test driver fails?  Well,
+# "make check" should at least fail too, and the test-suite.log
+# shouldn't be created.  Unfortunately, we cannot truly control also
+# the (non-)creation of individual test logs, since those are expected
+# to be created by the drivers themselves, and an ill-behaved driver
+# (like our dummy one in this test) might leave around a test log even
+# in case of internal failures.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+TEST_LOG_DRIVER = ./oops
+TESTS = foo.test
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+exit 0
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# The testsuite driver does not exist.
+$MAKE check && Exit 1
+test ! -f test-suite.log
+
+# The testsuite driver exists and create the test log files, but fails.
+
+cat > oops <<'END'
+#!/bin/sh
+: > foo.log
+echo 'Oops, I fail!' >&2
+exit 1
+END
+chmod a+x oops
+
+$MAKE check && Exit 1
+test ! -f test-suite.log
+
+:
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
new file mode 100755
index 0000000..fb4e540
--- /dev/null
+++ b/t/test-driver-is-distributed.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check regression of parallel-tests:
+#  - 'test-driver' script not correctly distributed when TESTS is
+#    defined in a subdir Makefile
+
+am_create_testdir=empty
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+ocwd=`pwd` || fatal_ "getting current working directory"
+
+do_check ()
+{
+  whereopts=$1 auxdir=$2
+  case $#,$whereopts in
+    2,ac) ac_opts=parallel-tests am_code= ;;
+    2,am) am_opts=parallel-tests ac_code= ;;
+       *) fatal_ "do_check: bad usage";;
+  esac
+  mkdir $whereopts
+  cd $whereopts
+  mkdir tests
+  unindent > configure.ac << END
+    AC_INIT([$me], [1.0])
+    AC_CONFIG_AUX_DIR([$auxdir])
+    AM_INIT_AUTOMAKE([$ac_opts])
+    AC_CONFIG_FILES([Makefile tests/Makefile])
+    AC_OUTPUT
+END
+  if test $auxdir = .; then
+    test_driver=test-driver
+  else
+    mkdir $auxdir
+    test_driver=$auxdir/test-driver
+  fi
+  # No 'AUTOMAKE_OPTIONS' in here -- purposely.
+  unindent > Makefile.am << END
+    SUBDIRS = tests
+    check-local: test-top
+    test-top: distdir
+       ls -l \$(distdir) \$(distdir)/* ;: For debugging.
+       test -f \$(distdir)/$test_driver
+    .PHONY: test-top
+END
+  unindent > tests/Makefile.am << END
+    AUTOMAKE_OPTIONS = $am_opts
+    check-local: test-sub
+    test-sub:
+       echo ' ' \$(DIST_COMMON) ' ' | grep '[ /]$test_driver '
+    TESTS = foo.test
+    EXTRA_DIST = \$(TESTS)
+END
+  unindent > tests/foo.test << 'END'
+    #!/bin/sh
+    exit 0
+END
+  chmod a+x tests/foo.test
+  $ACLOCAL
+  $AUTOCONF
+  $AUTOMAKE -a
+  ./configure
+  $MAKE test-top
+  cd tests
+  $MAKE test-sub
+  cd ..
+  $MAKE distcheck
+  # Try code path without automatic installation of required files.
+  mv -f Makefile.in Makefile.sav
+  mv -f tests/Makefile.in tests/Makefile.sav
+  $AUTOMAKE
+  diff Makefile.in Makefile.sav
+  diff tests/Makefile.in tests/Makefile.sav
+  :
+}
+
+do_check ac .
+do_check am build-aux
+
+:
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
new file mode 100755
index 0000000..9670188
--- /dev/null
+++ b/t/test-driver-strip-vpath.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers: check that the test name passed to the test
+# driver has any VPATH prefix stripped.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
+mkdir src build
+mv install-sh missing configure.ac src
+rm -f depcomp
+
+cd src
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# The directories of the 'bar.test' and 'baz.test' tests are deliberately
+# called as the source directory, to verify that the VPATH-stripping code
+# doesn't get too easily confused.
+# The $(empty) are for eliciting VPATH rewrites on make implementations
+# that support it (e.g., Solaris make), to improve coverage.
+empty =
+TESTS = $(empty) foo.test src/bar.test ./src/baz.test $(empty)
+$(TESTS):
+TEST_LOG_DRIVER = $(srcdir)/checkstrip-driver
+EXTRA_DIST = checkstrip-driver
+END
+
+cat > checkstrip-driver <<'END'
+#! /bin/sh
+set -e
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name) test_name=$2; shift;;
+    --expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+echo "test name: $test_name" # For debugging.
+case $test_name in
+  foo.test|./foo.test|src/ba[rz].test|./src/ba[rz].test);;
+  *) exit 1;;
+esac
+echo dummy > "$log_file"
+echo dummy > "$trs_file"
+END
+chmod a+x checkstrip-driver
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cd ..
+
+mkdir build1
+cd build1
+../src/configure
+# "$MAKE -n" is for debugging, should highlight any VPATH rewrite.
+$MAKE -n check || :
+$MAKE check
+cd ..
+
+mkdir build2
+cd build2
+"$ocwd"/src/configure
+# "$MAKE -n" is for debugging, should highlight any VPATH rewrite.
+$MAKE -n check || :
+$MAKE check
+cd ..
+
+cd src
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/test-driver-trs-suffix-registered.sh 
b/t/test-driver-trs-suffix-registered.sh
new file mode 100755
index 0000000..0c3734f
--- /dev/null
+++ b/t/test-driver-trs-suffix-registered.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests support: the following are registered with '.SUFFIXES':
+#  - .log
+#  - .trs (used by files that store test results and metadata)
+#  - .test if $(TEST_EXTENSIONS) is not defined
+#  - stuff in $(TEST_EXTENSIONS) otherwise
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+: > Makefile.am
+
+cat > 1.am << 'END'
+TESTS =
+END
+
+cat > 2.am << 'END'
+TEST_EXTENSIONS = .SH .abcdef
+TESTS =
+END
+
+: > test-driver
+
+$ACLOCAL
+
+$AUTOMAKE 1
+$AUTOMAKE 2
+
+sed -e 's/$/ /' 1.in > mk.1
+sed -e 's/$/ /' 2.in > mk.2
+
+grep '^\.SUFFIXES:' mk.1
+grep '^\.SUFFIXES:' mk.2
+
+for suf in test log trs; do
+  grep "^\\.SUFFIXES:.* \\.$suf " mk.1
+done
+
+for suf in SH abcdef log trs; do
+  grep "^\\.SUFFIXES:.* \\.$suf " mk.2
+done
+
+:
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
new file mode 100755
index 0000000..8180803
--- /dev/null
+++ b/t/test-extensions-cond.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Expose bug in conditional definition of TEST_EXTENSIONS.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_CONDITIONAL([COND], [:])
+AM_CONDITIONAL([COND2], [:])
+END
+
+$ACLOCAL
+
+cat > 1.am << 'END'
+TESTS =
+if COND
+## lineno 4
+TEST_EXTENSIONS = .foo
+endif
+END
+
+cat > 2.am << 'END'
+TESTS =
+## lineno 3
+TEST_EXTENSIONS = .foo
+if COND
+# Do nothing.
+else
+TEST_EXTENSIONS += .bar
+endif
+END
+
+cat > 3.am << 'END'
+TESTS =
+if COND
+if !COND2
+TESTS = x
+else
+## lineno 7
+TEST_EXTENSIONS = .foo
+endif
+endif
+END
+
+: > test-driver
+
+for i in 1 2 3; do
+  AUTOMAKE_fails $i
+  lineno=`sed -n 's/^## lineno //p' $i.am` \
+    && test 0 -lt "$lineno" \
+    || Exit 99
+  grep "^$i\\.am:$lineno:.*TEST_EXTENSIONS.*conditional content" stderr
+done
+
+:
diff --git a/t/test-extensions.sh b/t/test-extensions.sh
new file mode 100755
index 0000000..d2fc2dd
--- /dev/null
+++ b/t/test-extensions.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Automake diagnose invalid entries in TEST_EXTENSIONS,
+# and do not diagnose valid (albeit more unusual) ones.
+# See automake bug#9400.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+
+valid_extensions='sh T t1 _foo BAR x_Y_z _'
+
+echo TESTS = > Makefile.am
+echo " $valid_extensions" \
+  | sed -e 's/ / ./g' -e 's/^/TEST_EXTENSIONS =/' >> Makefile.am
+cat Makefile.am # For debugging.
+
+$AUTOMAKE -a
+
+grep -i 'log' Makefile.in # For debugging.
+
+for lc in $valid_extensions; do
+  uc=`echo $lc | tr '[a-z]' '[A-Z]'`
+  $FGREP "\$(${uc}_LOG_COMPILER)" Makefile.in
+  grep "^${uc}_LOG_COMPILE =" Makefile.in
+  grep "^\.${lc}\.log:" Makefile.in
+done
+
+# The produced Makefile is not broken.
+./configure
+$MAKE all check
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.sh
+TEST_EXTENSIONS  = .test mu .x-y a-b .t.1 .sh .6c .0 .11 .= @suf@ 
address@hidden@
+TEST_EXTENSIONS += .= .t33 address@hidden _&_
+END
+
+AUTOMAKE_fails
+for suf in mu .x-y a-b .t.1 .6c .0 .11  @suf@ address@hidden@ '.=' '_&_'; do
+  suf2=`printf '%s\n' "$suf" | sed -e 's/\./\\./'`
+  $EGREP "^Makefile\.am:2:.*invalid test extension.* $suf2( |$)" stderr
+done
+
+# Verify that we accept valid suffixes, even if intermixed with
+# invalid ones.
+$EGREP '\.(sh|test|t33)' stderr && Exit 1
+
+# Verify that we don't try to handle invalid suffixes.
+$EGREP '(LOG_COMPILER|non-POSIX var|bad character)' stderr && Exit 1
+
+:
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
new file mode 100755
index 0000000..f0f71c6
--- /dev/null
+++ b/t/test-harness-vpath-rewrite.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that our concurrent test harness is not subject to spurious VPATH
+# rewrites.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+LOG_COMPILER = true
+TESTS = x0 foo bar baz x1
+EXTRA_DIST = $(TESTS)
+END
+
+: > x0
+: > foo
+: > bar
+: > baz
+: > x1
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+../configure
+$MAKE check
+test -f test-suite.log
+test -f foo.log
+test -f foo.trs
+test -f bar.log
+test -f bar.trs
+test -f baz.log
+test -f baz.trs
+# We don't want VPATH rewrites, really.
+$MAKE check -n | $EGREP '\.\./(foo|bar|baz)( |$)' && Exit 1
+$MAKE distcheck
+
+:
diff --git a/t/test-log.sh b/t/test-log.sh
new file mode 100755
index 0000000..d400b52
--- /dev/null
+++ b/t/test-log.sh
@@ -0,0 +1,178 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+#  - log file creation
+#  - log file removal
+#  - stdout and stderr of a test script go in its log file
+#  - TEST_SUITE_LOG redefinition, at either automake or make time
+#  - VERBOSE environment variable support
+# Keep in sync with 'tap-log.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = pass.test skip.test xfail.test fail.test xpass.test error.test
+XFAIL_TESTS = xpass.test xfail.test
+TEST_SUITE_LOG = global.log
+END
+
+# Custom markers, for use in grepping checks.
+cmarker=::: # comment marker
+pmarker=%%% # plain maker
+
+cat > pass.test <<END
+#! /bin/sh
+echo   "$pmarker pass $pmarker" >&2
+echo "# $cmarker pass $cmarker" >&2
+exit 0
+END
+
+cat > skip.test <<END
+#! /bin/sh
+echo   "$pmarker skip $pmarker"
+echo "# $cmarker skip $cmarker"
+exit 77
+END
+
+cat > xfail.test <<END
+#! /bin/sh
+echo   "$pmarker xfail $pmarker" >&2
+echo "# $cmarker xfail $cmarker" >&2
+exit 1
+END
+
+cat > fail.test <<END
+#! /bin/sh
+echo   "$pmarker fail $pmarker"
+echo "# $cmarker fail $cmarker"
+exit 1
+END
+
+cat > xpass.test <<END
+#! /bin/sh
+echo   "$pmarker xpass $pmarker" >&2
+echo "# $cmarker xpass $cmarker" >&2
+exit 0
+END
+
+cat > error.test <<END
+#! /bin/sh
+echo   "$pmarker error $pmarker"
+echo "# $cmarker error $cmarker"
+exit 99
+END
+
+chmod a+x *.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+TEST_SUITE_LOG=my.log $MAKE -e check && Exit 1
+ls -l # For debugging.
+test ! -f test-suite.log
+test ! -f global.log
+test -f my.log
+st=0
+for result in pass fail xfail xpass skip error; do
+  cat $result.log # For debugging.
+  $FGREP "$pmarker $result $pmarker" $result.log || st=1
+  $FGREP "$cmarker $result $cmarker" $result.log || st=1
+done
+test $st -eq 0 || Exit 1
+cat my.log # For debugging.
+for result in xfail fail xpass skip error; do
+  cat $result.log # For debugging.
+  $FGREP "$pmarker $result $pmarker" my.log || st=1
+  $FGREP "$cmarker $result $cmarker" my.log || st=1
+done
+test `$FGREP -c "$pmarker" my.log` -eq 5
+test `$FGREP -c "$cmarker" my.log` -eq 5
+
+have_rst_section ()
+{
+  eqeq=`echo "$1" | sed 's/./=/g'`
+  # Assume $1 contains no RE metacharacters.
+  sed -n "/^$1$/,/^$eqeq$/p" $2 > got
+  (echo "$1" && echo "$eqeq") > exp
+  cat exp
+  cat got
+  diff exp got
+}
+
+# Passed test scripts shouldn't be mentioned in the global log.
+$EGREP ':.*[^x]pass' my.log && Exit 1
+# But failing (expectedly or not) and skipped ones should.
+have_rst_section 'SKIP: skip'   my.log
+have_rst_section 'FAIL: fail'   my.log
+have_rst_section 'XFAIL: xfail' my.log
+have_rst_section 'XPASS: xpass' my.log
+have_rst_section 'ERROR: error' my.log
+
+touch error2.log test-suite.log global.log
+TEST_SUITE_LOG=my.log $MAKE -e mostlyclean
+ls -l # For debugging.
+test ! -f my.log
+test ! -f pass.log
+test ! -f fail.log
+test ! -f xfail.log
+test ! -f xpass.log
+test ! -f skip.log
+test ! -f error.log
+# "make mostlyclean" shouldn't remove unrelated log files.
+test -f error2.log
+test -f test-suite.log
+test -f global.log
+
+rm -f *.log
+
+VERBOSE=yes $MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+cat global.log
+test ! -f my.log
+test ! -f test-suite.log
+# Check that VERBOSE causes the global testsuite log to be
+# emitted on stdout.
+out=`cat stdout`
+log=`cat global.log`
+case $out in *"$log"*) ;; *) Exit 1;; esac
+
+touch error2.log test-suite.log my.log
+$MAKE clean
+ls -l # For debugging.
+test ! -f global.log
+test ! -f pass.log
+test ! -f fail.log
+test ! -f xfail.log
+test ! -f xpass.log
+test ! -f skip.log
+test ! -f error.log
+# "make clean" shouldn't remove unrelated log files.
+test -f error2.log
+test -f test-suite.log
+test -f my.log
+
+rm -f *.log
+
+:
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
new file mode 100755
index 0000000..d75bbcb
--- /dev/null
+++ b/t/test-logs-repeated.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel-tests features:
+#  - $(TESTS_LOGS) can end up holding duplicated entries
+# Such behaviour can be useful for projects that want to verify that
+# different test scripts don't end up sharing the same log file.
+# (Automake itself is such a project, BTW ;-)
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .sh .test .bar
+TESTS = foo.sh mu.test foo.test foo.bar
+.PHONY: verify
+verify:
+       is $(TEST_LOGS) == foo.log mu.log foo.log foo.log
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE verify
+
+:
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
new file mode 100755
index 0000000..b10f481
--- /dev/null
+++ b/t/test-metadata-global-log.sh
@@ -0,0 +1,147 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Custom test drivers and parallel-tests harness: check the documented
+# semantics for deciding when the content of a test log file should be
+# copied in the global test-suite.log file.  Currently, this is done
+# with the use of the reStructuredText field ':copy-in-global-log:' in
+# the associated '.trs' files.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = ./passthrough-driver
+TEST_LOG_COMPILER = $(SHELL) -e
+END
+
+cat > passthrough-driver <<'END'
+#!/bin/sh
+set -e; set -u;
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name) test_name=$2; shift;;
+    --expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+echo "$test_name: RUN"
+"$@" >$log_file 2>&1 5>$trs_file
+END
+chmod a+x passthrough-driver
+
+# The ':test-result:' and ':recheck:' fields and the first line of the
+# log file should be be irrelevant for the decision of whether a test
+# output is to be copied in the 'test-suite.log'.
+
+cat > no-1.test <<END
+echo :test-result: SKIP >&5
+echo :copy-in-global-log: no >&5
+echo :test-result: FAIL >&5
+echo :test-result: XPASS >&5
+echo not seen 1
+END
+
+# In the last line, with leading and trailing whitespace in the value.
+cat > no-2.test <<END
+echo ":test-result: FAIL" >&5
+echo "not seen 2"
+echo ":recheck: yes" >&5
+echo ":copy-in-global-log:$tab $tab no   $tab" >&5
+END
+
+for RES in XPASS FAIL XFAIL SKIP ERROR UNKNOWN; do
+  unindent > $RES.test <<END
+    echo :test-result: $RES >&5
+    echo :copy-in-global-log: no >&5
+    echo not seen $RES
+END
+done
+
+# In the first line, with no whitespace.
+cat > no-3.test <<END
+echo :copy-in-global-log:no >&5
+echo ":test-result: FAIL" >&5
+echo "not seen 3"
+END
+
+# Leading whitespace before the field.
+cat > no-4.test <<END
+echo ":test-result: FAIL" >&5
+echo "  $tab $tab$tab   :copy-in-global-log: no" >&5
+echo "not seen 4"
+END
+
+cat > yes-1.test <<END
+echo :test-result: PASS >&5
+echo :copy-in-global-log: yes >&5
+echo seen yes 1
+END
+
+# A lacking ':copy-in-global-log:' implies that the content of
+# the log file should be copied.
+cat > yes-2.test <<END
+echo :test-result: PASS >&5
+echo seen yes 2
+END
+
+# Three corner cases.
+
+cat > corn-1.test <<END
+echo seen corn 1
+echo ':copy-in-global-log:' >&5
+END
+
+cat > corn-2.test <<END
+echo seen corn 2
+echo '$tab $tab$tab' >&5
+END
+
+cat > corn-3.test <<'END'
+echo seen corn 31
+echo ':copy-in-global-log:address@hidden' >&5
+echo seen corn 32
+END
+
+echo TESTS = *.test >> Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# We don't care about the exit status of "make check" here, that
+# should be checked in other tests.
+$MAKE check || :
+cat test-suite.log
+grep '^seen yes 1$' test-suite.log
+grep '^seen yes 2$' test-suite.log
+grep '^seen corn 1$' test-suite.log
+grep '^seen corn 2$' test-suite.log
+grep '^seen corn 31$' test-suite.log
+grep '^seen corn 32$' test-suite.log
+$FGREP 'not seen' test-suite.log && Exit 1
+
+:
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
new file mode 100755
index 0000000..b247444
--- /dev/null
+++ b/t/test-metadata-global-result.sh
@@ -0,0 +1,196 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Parallel testsuite harness: check APIs for the registering the
+# "global test result" in '*.trs' files, as documented in the automake
+# manual.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .test .x
+TEST_LOG_DRIVER = ./dummy-driver
+X_LOG_DRIVER = ./dummy-driver
+TESTS = foo.test zar-doz.test
+END
+
+cat > dummy-driver <<'END'
+#! /bin/sh
+set -e; set -u
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name) test_name=$2; shift;;
+    --expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+echo logloglog > $log_file
+cp $1 $trs_file
+END
+chmod a+x dummy-driver
+
+# Do this in a subroutine to avoid quoting problem in the backticked
+# command substitution below.
+get_escaped_line()
+{
+   sed -e 's,[$^/\\\.],\\&,g' -e 1q "$@"
+}
+
+have_result ()
+{
+   cat > exp; echo >> exp; echo logloglog >> exp
+   eline=`get_escaped_line exp`
+   sed -n -e "/^$eline$/,/^logloglog$/p" test-suite.log > got
+   cat exp; cat got
+   diff exp got
+}
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+: Basic checks.
+
+echo :global-test-result: PASS > foo.test
+echo :global-test-result: ERROR > zar-doz.x
+
+$MAKE check
+cat test-suite.log
+
+have_result <<END
+PASS: foo
+=========
+END
+
+have_result <<END
+ERROR: zar-doz
+==============
+END
+
+: Try usage documented in the manual.
+
+echo :global-test-result: PASS/SKIP > foo.test
+echo :global-test-result: ALMOST PASSED > zar-doz.x
+
+$MAKE check
+cat test-suite.log
+
+have_result <<END
+PASS/SKIP: foo
+==============
+END
+
+have_result <<END
+ALMOST PASSED: zar-doz
+======================
+END
+
+: Fields ':test-result:' does not interfere with the global test result.
+
+cat > foo.test << 'END'
+:test-result: FAIL
+:global-test-result: PASS
+:test-result: ERROR
+END
+
+cat > zar-doz.x << 'END'
+:global-test-result: FAIL
+:test-result: SKIP
+:test-result: XFAIL
+END
+
+$MAKE check && Exit 1
+cat test-suite.log
+
+have_result <<END
+PASS: foo
+=========
+END
+
+have_result <<END
+FAIL: zar-doz
+=============
+END
+
+: What happens when ':global-test-result:' is absent.
+
+cat > foo.test << 'END'
+:test-result: PASS
+:test-result: ERROR
+END
+: > zar-doz.x
+
+$MAKE check && Exit 1
+cat test-suite.log
+
+have_result <<END
+RUN: foo
+========
+END
+
+have_result <<END
+RUN: zar-doz
+============
+END
+
+# Leading and trailing whitespace gets eaten/normalized.
+
+echo ":global-test-result:SKIP${tab}   ${tab}${tab}" > foo.test
+echo ":global-test-result:${tab}   ${tab}XFAIL  ${tab}   " > zar-doz.x
+
+$MAKE check
+cat test-suite.log
+
+have_result <<END
+SKIP: foo
+=========
+END
+
+have_result <<END
+XFAIL: zar-doz
+==============
+END
+
+# Whitespaces before and after ':global-test-result:' are handled OK.
+
+echo "   $tab:global-test-result:PASS" > foo.test
+echo "${tab}${tab}:global-test-result:${tab}   ${tab}SKIP" > zar-doz.x
+
+$MAKE check
+cat test-suite.log
+
+have_result <<END
+PASS: foo
+=========
+END
+
+have_result <<END
+SKIP: zar-doz
+=============
+END
+
+:
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
new file mode 100755
index 0000000..0a7a7cc
--- /dev/null
+++ b/t/test-metadata-recheck.sh
@@ -0,0 +1,164 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the "make recheck" semantics for custom test drivers, as documented
+# in the Automake manual.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+LOG_DRIVER = ./dummy-driver
+TEST_EXTENSIONS =
+TESTS =
+END
+
+#
+# Tests to be re-run by "make recheck"
+#
+
+: > y-1
+echo "foo bar" > y-2
+echo ":recheck:" > y-3
+echo ":recheck:yes" > y-4
+echo ":recheck: who cares" > y-5
+echo ":recheck: $tab   y" > y-6
+echo ":recheck: yeah!$tab$tab " > y-7
+cat > y-10 <<END
+:foo:
+:recheck: ???
+END
+cat > y-11 <<END
+:recheck: YES
+:foo:
+END
+cat > y-12 <<END
+foo
+:recheck:yes
+
+bar
+zardoz
+END
+
+echo "  $tab $tab$tab    :recheck: yes" > y-8
+
+# The :test-result: fields and the fist line of the log should be
+# irrelevant for the decision of whether "make recheck" should or
+# should not re-run a test.
+
+echo ":test-result: PASS" > y-100
+
+echo "PASS: y-101"
+
+cat > y-102 <<END
+PASS: y-102
+===========
+
+:test-result: PASS
+END
+
+#
+# Tests *not* to be re-run by "make recheck"
+#
+
+echo ":recheck:no" > n-1
+echo ":recheck: no " > n-2
+echo ":recheck: $tab   no" > n-3
+echo ":recheck: no $tab$tab " > n-4
+cat > n-5 <<END
+:foo:
+:recheck:no
+END
+cat > n-6 <<END
+:recheck: no
+:foo:
+END
+cat > n-7 <<END
+foo
+:recheck: no$tab$tab
+
+bar
+zardoz
+END
+
+echo "  $tab $tab$tab    :recheck: no" > n-8
+
+# The :test-result: fields should be irrelevant for the decision of
+# whether "make recheck" should or should not re-run a test.
+cat > n-100 <<END
+:test-result: FAIL
+:test-result: XPASS
+:test-result: ERROR
+:test-result: UNKNOWN
+:recheck: no
+END
+
+rechecked=`echo y-[0-9]*`
+
+for t in [yn]-[0-9]*; do echo $t; done \
+  | sed 's/.*/TESTS += &/' >> Makefile.am
+
+cat Makefile.am # For debugging.
+
+cat > dummy-driver <<'END'
+#!/bin/sh
+set -e; set -u
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name) test_name=$2; shift;;
+    --expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+: > $test_name.run
+: > $log_file
+cp $1 $trs_file
+END
+chmod a+x dummy-driver
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# The ':test-result:' fields should be ignored by "make recheck",
+# but should cause the testsuite report to detect errors.
+$MAKE check && Exit 1
+ls -l
+for t in $tests; do test -f $t.run; done
+rm -f *.run
+
+# But now the tests that actually get re-run have only ':test-result:'
+# fields indicating success, so "make recheck" must pass.  Still, the
+# next "make recheck" call should still re-run the same set of tests.
+for iteration in 1 2; do
+  $MAKE recheck
+  ls -l
+  for t in $rechecked; do test -f $t.run; done
+  find . -name 'n-*.run' | grep . && Exit 1
+  : For shells with busted 'set -e'.
+done
+
+:
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
new file mode 100755
index 0000000..5978f7f
--- /dev/null
+++ b/t/test-metadata-results.sh
@@ -0,0 +1,176 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Parallel testsuite harness: check APIs for the registering of test
+# results in '*.trs' files, as documented in the automake manual.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = ./dummy-driver
+TESTS = foo.test bar.test
+END
+
+cat > dummy-driver <<'END'
+#! /bin/sh
+set -e; set -u
+while test $# -gt 0; do
+  case $1 in
+    --log-file) log_file=$2; shift;;
+    --trs-file) trs_file=$2; shift;;
+    --test-name) test_name=$2; shift;;
+    --expect-failure|--color-tests|--enable-hard-errors) shift;;
+    --) shift; break;;
+     *) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
+  esac
+  shift
+done
+: > $log_file
+cp $1 $trs_file
+END
+chmod a+x dummy-driver
+
+mk_check ()
+{
+  st=0
+  $MAKE check >stdout || st=$?
+  cat stdout
+  # Our dummy driver make no testsuite progress report.
+  grep ': .*\.test' stdout && Exit 1
+  # Nor it writes to the log files.
+  test -s foo.log && Exit 1
+  test -s bar.log && Exit 1
+  return $st
+}
+
+# This must be different from the one defined in 'test/defs', as that
+# assumes that the driver does proper testsuite progress reporting.
+count_test_results ()
+{
+  total=ERR pass=ERR fail=ERR xpass=ERR xfail=ERR skip=ERR error=ERR
+  eval "$@"
+  st=0
+  grep "^# TOTAL:  *$total$" stdout || rc=1
+  grep "^# PASS:  *$pass$"   stdout || rc=1
+  grep "^# XFAIL:  *$xfail$" stdout || rc=1
+  grep "^# SKIP:  *$skip$"   stdout || rc=1
+  grep "^# FAIL:  *$fail$"   stdout || rc=1
+  grep "^# XPASS:  *$xpass$" stdout || rc=1
+  grep "^# ERROR:  *$error$" stdout || rc=1
+  test $st -eq 0 || Exit 1
+}
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+
+# Basic checks.  Also that that ':global-test-result:' fields and
+# "old-style" directives with format "RESULT: test-name" are now ignored.
+
+: > foo.test
+echo blah blah blah > bar.test
+mk_check
+count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+cat > foo.test <<END
+:test-global-result: PASS
+:test-result: FAIL
+END
+cat > bar.test <<END
+:test-result: SKIP
+:test-global-result: ERROR
+END
+mk_check && Exit 1
+count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
+
+cat > foo.test <<END
+FAIL: foo.test
+:test-result: PASS
+:test-global-result: XPASS
+END
+echo ERROR: bar.test > bar.test
+mk_check
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+cat > foo.test <<END
+:test-global-result: SKIP
+:test-result: FAIL
+END
+cat > bar.test <<END
+:test-global-result: PASS
+END
+mk_check && Exit 1
+count_test_results total=1 pass=0 fail=1 xpass=0 xfail=0 skip=0 error=0
+
+cat > foo.test <<END
+:test-result: XFAIL
+:test-result: PASS
+:test-result: SKIP
+END
+cat > bar.test <<END
+:test-result: SKIP
+:test-result: PASS
+:test-result: SKIP
+:test-result: PASS
+:test-result: PASS
+END
+mk_check
+count_test_results total=8 pass=4 fail=0 xpass=0 xfail=1 skip=3 error=0
+
+# Check that all results expected to be supported are *really* supported.
+
+cat > foo.test <<END
+:test-result: PASS
+:test-result: SKIP
+:test-result: XFAIL
+:test-result: FAIL
+:test-result: XPASS
+:test-result: ERROR
+END
+: > bar.test
+mk_check && Exit 1
+count_test_results total=6 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=1
+
+cp foo.test bar.test
+mk_check && Exit 1
+count_test_results total=12 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=2
+
+# Check that we are liberal w.r.t. whitespace use.
+
+: > foo.test
+: > bar.test
+for RESULT in PASS FAIL XPASS XFAIL SKIP ERROR; do
+  sed -e 's/^ *//' -e 's/|//g' >> foo.test <<END
+    |:test-result:$RESULT|
+    |:test-result: $tab  $RESULT|
+    |:test-result:$RESULT  $tab|
+    |:test-result:$tab$tab  $RESULT$tab  $tab |
+END
+  echo "  $tab $tab$tab   :test-result: $RESULT" >> bar.test
+done
+cat foo.test # For debugging.
+cat bar.test # Likewise.
+mk_check && Exit 1
+count_test_results total=30 pass=5 fail=5 xpass=5 xfail=5 skip=5 error=5
+
+:
diff --git a/t/test-missing.sh b/t/test-missing.sh
new file mode 100755
index 0000000..586190f
--- /dev/null
+++ b/t/test-missing.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests:
+#  - non-existent scripts listed in TESTS get diagnosed
+# See also related test 'test-missing2.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = ok.test zardoz.test
+TEST_LOG_COMPILER = true
+END
+
+: > ok.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check >output 2>&1 && { cat output; Exit 1; }
+cat output
+test -f ok.log
+grep '^PASS: ok\.test' output
+$FGREP 'zardoz.log' output
+test ! -f test-suite.log
+
+TESTS='zardoz2.test' $MAKE -e check >output 2>&1 \
+  && { cat output; Exit 1; }
+cat output
+$FGREP 'zardoz2.log' output
+test ! -f test-suite.log
+
+TEST_LOGS='zardoz3.log' $MAKE -e check >output 2>&1 \
+  && { cat output; Exit 1; }
+cat output
+$FGREP 'zardoz3.log' output
+test ! -f test-suite.log
+
+# The errors should persist even after 'test-suite.log'
+# has been created.
+
+: > zardoz.test
+$MAKE check
+rm -f zardoz.test
+
+$MAKE check >output 2>&1 && { cat output; Exit 1; }
+cat output
+$FGREP 'zardoz.log' output
+test ! -f test-suite.log
+
+:
diff --git a/t/test-missing2.sh b/t/test-missing2.sh
new file mode 100755
index 0000000..e511a8b
--- /dev/null
+++ b/t/test-missing2.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests:
+#  - non-existent scripts listed in TESTS get diagnosed, even when
+#    all the $(TEST_LOGS) have a dummy dependency.
+# See also related test 'test-missing.test'.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foobar1.test foobar2.test
+$(TEST_LOGS):
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE foobar1.log foobar2.log || Exit 99
+test ! -f foobar1.log || Exit 99
+test ! -f foobar1.trs || Exit 99
+test ! -f foobar2.log || Exit 99
+test ! -f foobar2.trs || Exit 99
+
+$MAKE check >output 2>&1 && { cat output; Exit 1; }
+cat output
+grep 'test-suite\.log.*foobar1\.log' output
+grep 'test-suite\.log.*foobar1\.trs' output
+grep 'test-suite\.log.*foobar2\.log' output
+grep 'test-suite\.log.*foobar2\.trs' output
+test ! -f test-suite.log
+
+:
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
new file mode 100755
index 0000000..a82d260
--- /dev/null
+++ b/t/test-trs-basic.sh
@@ -0,0 +1,158 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel harness features:
+#  - creation and removal of '.trs' auxiliary files
+#  - check some internals regarding the use of '.trs' files.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .sh .test
+TESTS = foo.test bar.sh sub/zardoz.test
+TEST_LOG_COMPILER = $(SHELL)
+SH_LOG_COMPILER = $(SHELL)
+
+## Used to check some internal details.  And yes, the quotes around
+## '$bases' are deliberate: they check for whitespace normalization.
+tb:
+       $(am__set_TESTS_bases); echo "$$bases" > $@
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+exit $FOO_STATUS
+END
+: > bar.sh
+mkdir sub
+: > sub/zardoz.test
+
+FOO_STATUS=0; export FOO_STATUS
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+
+#
+# Check some internal details first.
+#
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+
+  $MAKE tb
+  test x"`cat tb`" = x"foo bar sub/zardoz"
+  rm -f tb
+  # Please don't change the order of the stuff in TESTS, below.
+  TESTS='foo.test foo2.sh foo-log foolog.test a.log.b.sh 0.exe' $MAKE -e tb
+  test x"`cat tb`" = x"foo foo2 foo-log foolog a.log.b 0.exe"
+  rm -f tb
+
+  cd $srcdir
+
+done
+
+#
+# The 'test-suite.stamp' file and the '.trs' files get created by
+# "make check" and removed by "make clean" and "make mostlyclean".
+#
+
+: > unrelated.trs
+: > sub/foo.trs
+
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+test -f sub/zardoz.trs
+$MAKE clean
+test ! -f foo.trs
+test ! -f bar.trs
+test ! -f sub/zardoz.trs
+# Unrelated '.trs' files shouldn't be removed.
+test -f unrelated.trs
+test -f sub/foo.trs
+
+# The files should be properly created in case of testsuite failure too.
+FOO_STATUS=1 $MAKE check && Exit 1
+test -f foo.trs
+test -f bar.trs
+test -f sub/zardoz.trs
+$MAKE mostlyclean
+test ! -f foo.trs
+test ! -f bar.trs
+test ! -f sub/zardoz.trs
+# Unrelated '.trs' files shouldn't be removed.
+test -f unrelated.trs
+test -f sub/foo.trs
+
+#
+# Try with a subset of TESTS.
+#
+
+TESTS=foo.test $MAKE -e check
+test -f foo.trs
+test ! -f bar.trs
+test ! -f sub/zardoz.trs
+$MAKE clean
+test ! -f foo.trs
+TESTS='foo.test bar.sh' $MAKE -e check
+test -f foo.trs
+test -f bar.trs
+test ! -f sub/zardoz.trs
+# "make clean" shouldn't remove '.trs' files for tests not in $(TESTS).
+TESTS=bar.sh $MAKE -e clean
+test -f foo.trs
+test ! -f bar.trs
+
+$MAKE clean
+
+#
+# Try with a subset of TEST_LOGS.
+#
+
+TEST_LOGS=sub/zardoz.log $MAKE -e check
+test ! -f foo.trs
+test ! -f bar.trs
+test -f sub/zardoz.trs
+$MAKE clean
+test ! -f sub/zardoz.trs
+TEST_LOGS='foo.log bar.log' $MAKE -e check
+test -f foo.trs
+test -f bar.trs
+test ! -f sub/zardoz.trs
+# "make clean" shouldn't remove '.trs' files for tests whose log
+# is not in $(TEST_LOGS).
+TEST_LOGS=foo.log $MAKE -e clean
+test ! -f foo.trs
+test -f bar.trs
+test ! -f sub/zardoz.trs
+
+:
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
new file mode 100755
index 0000000..3632f61
--- /dev/null
+++ b/t/test-trs-recover.sh
@@ -0,0 +1,167 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel harness features:
+#  - recovery from deleted '.trs' files, in various scenarios
+# This test is complex and tricky, but that's acceptable since we are
+# testing semantics that are potentially complex and tricky.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test baz.test
+TEST_LOG_COMPILER = $(SHELL)
+END
+
+# Creative quoting below to please maintainer-check.
+echo exit '$TEST_STATUS' > foo.test
+echo exit '$TEST_STATUS' > bar.test
+: > baz.test
+
+TEST_STATUS=0; export TEST_STATUS
+
+# Slower and possible overkill in some situations, but also clearer
+# and safer.
+update_stamp () { $sleep && touch stamp && $sleep; }
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+: Create the required log files.
+$MAKE check
+
+: Recreate by hand.
+rm -f foo.trs bar.trs baz.trs
+$MAKE foo.trs
+test -f foo.trs
+test ! -f bar.trs
+test ! -f baz.trs
+
+: Recreate by hand, several at the same time.
+rm -f foo.trs bar.trs baz.trs
+$MAKE foo.trs bar.trs
+test -f foo.trs
+test -f bar.trs
+test ! -f baz.trs
+
+: Recreate by hand, with a failing test.
+rm -f foo.trs bar.trs
+TEST_STATUS=1 $MAKE bar.trs baz.trs >stdout || { cat stdout; Exit 1; }
+cat stdout
+test ! -f foo.trs
+test -f bar.trs
+test -f baz.trs
+grep '^FAIL: bar\.test' stdout
+$EGREP '^(baz|foo)\.test' stdout && Exit 1
+
+: Recreate with a sweeping "make check", and ensure that also up-to-date
+: '.trs' files are remade.
+update_stamp
+rm -f foo.trs bar.trs
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+is_newest baz.trs stamp
+
+: Recreate with a sweeping "make check" with failing tests.  Again,
+: ensure that also up-to-date '.trs' files are remade -- this time we
+: grep the "make check" output verify that.
+rm -f foo.trs bar.trs
+TEST_STATUS=1 $MAKE check >stdout && { cat stdout; Exit 1; }
+test -f foo.trs
+test -f bar.trs
+grep '^FAIL: foo\.test' stdout
+grep '^FAIL: bar\.test' stdout
+grep '^PASS: baz\.test' stdout
+
+: Recreate with a "make check" with redefined TESTS.
+rm -f foo.trs bar.trs baz.trs
+TESTS=foo.test $MAKE -e check
+test -f foo.trs
+test ! -f bar.trs
+test ! -f baz.trs
+
+: Recreate with a "make check" with redefined TEST_LOGS.
+rm -f foo.trs bar.trs baz.trs
+TEST_LOGS=bar.log $MAKE -e check
+test ! -f foo.trs
+test -f bar.trs
+test ! -f baz.trs
+
+: Interactions with "make recheck" are OK.
+rm -f foo.trs bar.trs baz.log baz.trs
+$MAKE recheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f foo.trs
+test -f bar.trs
+test ! -f baz.trs
+test ! -f baz.log
+grep '^PASS: foo\.test' stdout
+grep '^PASS: bar\.test' stdout
+grep 'baz\.test' stdout && Exit 1
+count_test_results total=2 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+: Setup for the next check.
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+test -f baz.trs
+
+: Recreate by remaking the global test log, and ensure that up-to-date
+: '.trs' files are *not* remade.
+update_stamp
+rm -f foo.trs bar.trs test-suite.log
+$MAKE test-suite.log >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^PASS: foo\.test' stdout
+grep '^PASS: bar\.test' stdout
+grep 'baz\.test' stdout && Exit 1
+stat *.trs *.log stamp || : # For debugging.
+# Check that make has updated what it needed to, but no more.
+test -f foo.trs
+test -f bar.trs
+is_newest stamp baz.trs
+is_newest test-suite.log foo.trs bar.trs
+
+: Setup for the next check.
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+test -f baz.trs
+
+: Interactions with lazy test reruns are OK.
+rm -f foo.trs
+update_stamp
+touch bar.test
+RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+# Check that make has updated what it needed to, but no more.
+test -f foo.trs
+is_newest bar.trs bar.test
+is_newest stamp baz.trs
+grep '^PASS: foo\.test' stdout
+grep '^PASS: bar\.test' stdout
+grep 'baz\.test' stdout && Exit 1
+
+:
diff --git a/t/test-trs-recover2.sh b/t/test-trs-recover2.sh
new file mode 100755
index 0000000..9726870
--- /dev/null
+++ b/t/test-trs-recover2.sh
@@ -0,0 +1,133 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check parallel harness features:
+#  - recovery from unreadable '.trs' files, in various scenarios
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+TEST_LOG_COMPILER = true
+END
+
+: > foo.test
+: > bar.test
+
+TEST_STATUS=0; export TEST_STATUS
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+: > t
+chmod a-r t
+test ! -r t || Exit 77
+rm -f t
+
+: Create the required log files.
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+
+: Recreate with a sweeping "make check".
+chmod a-r bar.trs
+$MAKE check
+test -f foo.trs
+test -r foo.trs
+test -f bar.trs
+test -r bar.trs
+
+: Again, this time with one .trs file missing and the other
+: one unreadable.
+rm -f foo.trs
+chmod a-r bar.trs
+$MAKE check
+test -f foo.trs
+test -r foo.trs
+test -f bar.trs
+test -r bar.trs
+
+: Again, but using "make recheck" this time.
+rm -f foo.trs
+chmod a-r bar.trs
+$MAKE recheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f foo.trs
+test -r foo.trs
+test -f bar.trs
+test -r bar.trs
+grep '^PASS: foo\.test' stdout
+grep '^PASS: bar\.test' stdout
+
+: More complex interactions with "make recheck" are OK.
+chmod a-r bar.log bar.trs
+$MAKE recheck >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f bar.trs
+test -r bar.trs
+grep '^PASS: bar\.test' stdout
+grep 'foo\.test' stdout && Exit 1
+count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
+
+: Recreate by remaking the global test log.
+chmod a-r foo.trs
+rm -f test-suite.log
+$MAKE test-suite.log >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f foo.trs
+test -r foo.trs
+grep '^PASS: foo\.test' stdout
+grep 'bar\.test' stdout && Exit 1
+# Also test that have only run before should be counted in the final
+# testsuite summary.
+grep '^# TOTAL:  *2$' stdout
+
+: Setup for the next check.
+: > baz.test
+sed 's/^TESTS =.*/& baz.test/' Makefile > t
+diff t Makefile && Exit 99
+mv -f t Makefile
+$MAKE check
+test -f foo.trs
+test -f bar.trs
+test -f baz.trs
+
+: Interactions with lazy test reruns are OK.
+chmod a-r foo.trs
+$sleep
+touch stamp
+$sleep
+touch bar.test
+RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -r foo.trs
+is_newest bar.trs bar.test
+grep '^PASS: foo\.test' stdout
+grep '^PASS: bar\.test' stdout
+grep 'baz\.test' stdout && Exit 1
+# Also test that have only run before should be counted in the final
+# testsuite summary.
+grep '^# TOTAL:  *3$' stdout
+
+:
diff --git a/t/tests-environment-and-log-compiler.sh 
b/t/tests-environment-and-log-compiler.sh
new file mode 100755
index 0000000..0e9d6e7
--- /dev/null
+++ b/t/tests-environment-and-log-compiler.sh
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# parallel-tests: check that we can use variables and functions set
+# by TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER and
+# LOG_FLAGS (for tests both with and without registered extensions).
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+unset v0 v1 v2 v3 v4 || :
+
+cat > Makefile.am << 'END'
+TESTS_ENVIRONMENT = am__f3 () { echo 3; }; v0='$(srcdir)' v1=1; :;
+AM_TESTS_ENVIRONMENT = v2=2; v4=4 && am__f5 () { echo 5; }; :;
+
+LOG_COMPILER = $$v0/log-compiler $$v1
+AM_LOG_FLAGS = $$v2 `am__f3`
+LOG_FLAGS = $$v4 `am__f5`
+
+TEST_LOG_COMPILER = $$v0/test-log-compiler $$v2
+AM_TEST_LOG_FLAGS = `am__f5` $$v1
+TEST_LOG_FLAGS = $$v4 `am__f3`
+
+EXTRA_DIST = log-compiler test-log-compiler
+
+TESTS = a b.test
+$(TESTS):
+END
+
+cat > log-compiler << 'END'
+#! /bin/sh
+echo "$0: $*"
+test x"$1$2$3$4$5" = x"12345"
+END
+
+cat > test-log-compiler << 'END'
+#! /bin/sh
+echo "$0: $*"
+test x"$1$2$3$4$5" = x"25143"
+END
+
+chmod a+x test-log-compiler log-compiler
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE -n check || : # For debugging.
+VERBOSE=yes $MAKE check
+cat a.log
+cat b.log
+
+VERBOSE=yes $MAKE distcheck
+
+:
diff --git a/t/tests-environment-backcompat.sh 
b/t/tests-environment-backcompat.sh
new file mode 100755
index 0000000..61b2728
--- /dev/null
+++ b/t/tests-environment-backcompat.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# With old serial testsuite driver, TESTS_ENVIRONMENT can be used to
+# define the "test runner", i.e. the program that the test scripts must
+# be run by (with the parallel-tests driver one should use LOG_COMPILER
+# for this).  The behaviour tested here is also documented in the manual.
+
+am_parallel_tests=no
+. ./defs || Exit 1
+
+cat >> configure.ac <<END
+AC_SUBST([PERL], ['$PERL'])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS_ENVIRONMENT = $(PERL) -Mstrict -w
+TESTS = foo.pl bar.pl baz.pl
+XFAIL_TESTS = baz.pl
+EXTRA_DIST = $(TESTS)
+END
+
+echo 'exit (0);' > foo.pl
+echo 'exit (0);' > bar.pl
+
+cat > baz.pl << 'END'
+# With "use strict" enacted, this will cause an error, since the
+# variable '$x' is not declared with 'my' nor specified with an
+# explicit package name.
+$x = 0;
+exit ($x);
+END
+
+chmod a+x *.pl
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE check
+$MAKE distcheck
+
+:
diff --git a/t/tests-environment-fd-redirect.sh 
b/t/tests-environment-fd-redirect.sh
new file mode 100755
index 0000000..d62e537
--- /dev/null
+++ b/t/tests-environment-fd-redirect.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for a behaviour of 'TESTS_ENVIRONMENT' and 'AM_TESTS_ENVIRONMENT'
+# w.r.t. file descriptor redirections which, although undocumented,
+# is nonetheless required by Gnulib's 'tests/init.sh' and by coreutils'
+# testsuite.
+# The checked behaviour is that we can portably do file descriptor
+# redirections by placing them at the end of a {AM_,}TESTS_ENVIRONMENT
+# definition without a following semicolon.  The need to support this
+# is detailedly motivated by coreutils bug#8846:
+#   <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
+# and the following CC:ed thread on bug-autoconf list:
+#   <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+# Use both a shell script and a perl script as tests,
+# for better coverage.
+
+cat >foo.test <<'END'
+#! /bin/sh
+set -e
+echo " " $0: foofoofoo >&8
+echo " " $0: barbarbar >&9
+END
+
+echo "#! $PERL -w" > bar.test
+cat >>bar.test <<'END'
+use warnings FATAL => 'all';
+use strict;
+open(FD8, ">&=8") or die "$!";
+open(FD9, ">&=9") or die "$!";
+print FD8 "  $0: 8888\n";
+print FD9 "  $0: 9999\n";
+END
+
+chmod a+x foo.test bar.test
+
+$ACLOCAL
+$AUTOCONF
+
+# Korn Shells seem more vulnerable to the issue highlighted in coreutils
+# bug#8846 than other shells are.  In particular, the default Korn Shell
+# on Debian GNU/Linux is affected by the issue.  So let's try to run our
+# test with a system Korn Shell too, if that's available.
+bin_ksh=:
+case $SHELL in
+  ksh|*/ksh) ;;
+  *) for d in /bin /usr/bin; do
+       test -f $d/ksh && { bin_ksh=$d/ksh; break; }
+     done;;
+esac
+
+for sh in "$SHELL" "$bin_ksh"; do
+  test "$sh" = : && continue
+  for pfx in AM_ ''; do
+    unindent > Makefile.am <<END
+      TESTS = foo.test bar.test
+      ## No trailing semicolon here, *deliberately*.
+      ${pfx}TESTS_ENVIRONMENT = 8>&1 9>&8
+END
+    $AUTOMAKE -a
+    CONFIG_SHELL="$sh" $sh ./configure CONFIG_SHELL="$sh"
+    VERBOSE=y $MAKE check >stdout || { cat stdout; Exit 1; }
+    cat stdout
+    grep '[ /]foo\.test: foofoofoo$' stdout
+    grep '[ /]foo\.test: barbarbar$' stdout
+    grep '[ /]bar\.test: 8888$' stdout
+    grep '[ /]bar\.test: 9999$' stdout
+    $EGREP '(foofoofoo|barbarbar|8888|9999)' foo.log && Exit 1
+    : # For shells with buggy 'set -e'.
+  done
+done
+
+:
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
new file mode 100755
index 0000000..27cd458
--- /dev/null
+++ b/t/tests-environment.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+test x"$FOO" = x"ok"
+END
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+FOO=bad TESTS_ENVIRONMENT='FOO=ok'  $MAKE check
+FOO=ok  TESTS_ENVIRONMENT='FOO=bad' $MAKE check && Exit 1
+
+:
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
new file mode 100755
index 0000000..0f00708
--- /dev/null
+++ b/t/testsuite-summary-color.sh
@@ -0,0 +1,199 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check coloring of the testsuite summary.
+
+. ./defs-static || Exit 1
+
+use_colors=yes
+use_vpath=no
+
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
+
+./configure
+
+# ANSI colors.
+red=''
+grn=''
+lgn=''
+blu=''
+mgn=''
+brg='';
+std='';
+
+success_header="\
+${grn}${br}${std}
+${grn}Testsuite summary for GNU AutoFoo 7.1${std}
+${grn}${br}${std}"
+
+success_footer=${grn}${br}${std}
+
+failure_header="\
+${red}${br}${std}
+${red}Testsuite summary for GNU AutoFoo 7.1${std}
+${red}${br}${std}"
+
+failure_footer="\
+${red}${br}${std}
+${red}See ./test-suite.log${std}
+${red}Please report to address@hidden
+${red}${br}${std}"
+
+do_check '' <<END
+$success_header
+# TOTAL: 0
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check pass.t <<END
+$success_header
+${brg}# TOTAL: 1${std}
+${grn}# PASS:  1${std}
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check skip.t <<END
+$success_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+${blu}# SKIP:  1${std}
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check xfail.t <<END
+$success_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check fail.t <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+${red}# FAIL:  1${std}
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+do_check xpass.t <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+${red}# XPASS: 1${std}
+# ERROR: 0
+$failure_footer
+END
+
+do_check error.t <<END
+$failure_header
+${brg}# TOTAL: 1${std}
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+do_check pass.t xfail.t skip.t <<END
+$success_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check pass.t fail.t skip.t <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+# XFAIL: 0
+${red}# FAIL:  1${std}
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+do_check pass.t xfail.t xpass.t <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+${grn}# PASS:  1${std}
+# SKIP:  0
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+${red}# XPASS: 1${std}
+# ERROR: 0
+$failure_footer
+END
+
+do_check skip.t xfail.t error.t <<END
+$failure_header
+${brg}# TOTAL: 3${std}
+# PASS:  0
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+# FAIL:  0
+# XPASS: 0
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+do_check pass.t skip.t xfail.t fail.t xpass.t error.t <<END
+$failure_header
+${brg}# TOTAL: 6${std}
+${grn}# PASS:  1${std}
+${blu}# SKIP:  1${std}
+${lgn}# XFAIL: 1${std}
+${red}# FAIL:  1${std}
+${red}# XPASS: 1${std}
+${mgn}# ERROR: 1${std}
+$failure_footer
+END
+
+:
diff --git a/t/testsuite-summary-count-many.sh 
b/t/testsuite-summary-count-many.sh
new file mode 100755
index 0000000..58157ad
--- /dev/null
+++ b/t/testsuite-summary-count-many.sh
@@ -0,0 +1,105 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check test counts in the testsuite summary, with test drivers allowing
+# multiple test results per test script, and for a huge number of tests.
+# Incidentally, this test also checks that the testsuite summary doesn't
+# give any bug-report address if it's not defined.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+for s in trivial-test-driver extract-testsuite-summary.pl; do
+  cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
+done
+
+br='============================================================================'
+
+header="\
+${br}
+Testsuite summary for $me 1.0
+${br}"
+
+footer="\
+${br}
+See ./test-suite.log
+${br}"
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+TEST_LOG_DRIVER = $(SHELL) $(srcdir)/trivial-test-driver
+TESTS = all.test
+# Without this, the test driver will be horrendously slow.
+END
+
+cat > all.test <<'END'
+#!/bin/sh
+cat results.txt || { echo ERROR: weird; exit 99; }
+END
+chmod a+x all.test
+
+$PERL -w -e '
+  use warnings FATAL => "all";
+  use strict;
+
+  # FIXME: we would like this to be 1000 or even 10000, but the current
+  # implementation is too slow to handle that :-(
+  my $base = 5;
+  my %count = (
+    TOTAL => $base * 1000,
+    PASS  => $base * 700,
+    SKIP  => $base * 200,
+    XFAIL => $base * 80,
+    FAIL  => $base * 10,
+    XPASS => $base * 7,
+    ERROR => $base * 3,
+  );
+  my @results = qw/PASS SKIP XFAIL FAIL XPASS ERROR/;
+
+  open (RES, ">results.txt") or die "opening results.txt: $!\n";
+  open (CNT, ">count.txt") or die "opening count.txt: $!\n";
+
+  printf CNT "# %-6s %d\n", "TOTAL:", $count{TOTAL};
+  for my $res (@results)
+    {
+      my $uc_res = uc $res;
+      print STDERR "Generating list of $res ...\n";
+      for (1..$count{$res})
+        {
+          print RES "$uc_res: $_\n";
+        }
+      printf CNT "# %-6s %d\n", $res . ":", $count{$res};
+    }
+'
+
+(echo "$header" && cat count.txt && echo "$footer") > summary.exp
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure
+
+($MAKE check || : > make.fail) | tee stdout
+test -f make.fail
+
+$PERL extract-testsuite-summary.pl stdout > summary.got
+cat summary.exp
+cat summary.got
+diff summary.exp summary.got || Exit 1
+
+:
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
new file mode 100755
index 0000000..1d13e7e
--- /dev/null
+++ b/t/testsuite-summary-count.sh
@@ -0,0 +1,161 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check test counts in the testsuite summary.
+
+. ./defs-static || Exit 1
+
+use_colors=no
+use_vpath=no
+
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
+
+./configure
+
+header="\
+${br}
+Testsuite summary for GNU AutoFoo 7.1
+${br}"
+
+success_footer=${br}
+
+failure_footer="\
+${br}
+See ./test-suite.log
+Please report to address@hidden
+${br}"
+
+# Corner cases.
+
+do_check '' <<END
+$header
+# TOTAL: 0
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check pass.t <<END
+$header
+# TOTAL: 1
+# PASS:  1
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check fail.t <<END
+$header
+# TOTAL: 1
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  1
+# XPASS: 0
+# ERROR: 0
+$failure_footer
+END
+
+# Some simpler checks, with low or moderate number of tests.
+
+do_check skip.t skip2.t skip3.t xfail.t xfail2.t <<END
+$header
+# TOTAL: 5
+# PASS:  0
+# SKIP:  3
+# XFAIL: 2
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+$success_footer
+END
+
+do_check pass.t pass2.t xfail.t xpass.t error.t error2.t <<END
+$header
+# TOTAL: 6
+# PASS:  2
+# SKIP:  0
+# XFAIL: 1
+# FAIL:  0
+# XPASS: 1
+# ERROR: 2
+$failure_footer
+END
+
+pass_count=22
+skip_count=19
+xfail_count=21
+fail_count=18
+xpass_count=23
+error_count=17
+tests_count=120
+
+pass=` seq_ 1 $pass_count  | sed 's/.*/pass-&.t/'`
+skip=` seq_ 1 $skip_count  | sed 's/.*/skip-&.t/'`
+xfail=`seq_ 1 $xfail_count | sed 's/.*/xfail-&.t/'`
+fail=` seq_ 1 $fail_count  | sed 's/.*/fail-&.t/'`
+xpass=`seq_ 1 $xpass_count | sed 's/.*/xpass-&.t/'`
+error=`seq_ 1 $error_count | sed 's/.*/error-&.t/'`
+
+do_check $pass $skip $xfail $fail $xpass $error <<END
+$header
+# TOTAL: $tests_count
+# PASS:  $pass_count
+# SKIP:  $skip_count
+# XFAIL: $xfail_count
+# FAIL:  $fail_count
+# XPASS: $xpass_count
+# ERROR: $error_count
+$failure_footer
+END
+
+# Mild stress test with a lot of test scripts.
+
+tests_count=1888
+pass_count=1403
+skip_count=292
+xfail_count=41
+fail_count=126
+xpass_count=17
+error_count=9
+
+pass=` seq_ 1 $pass_count  | sed 's/.*/pass-&.t/'`
+skip=` seq_ 1 $skip_count  | sed 's/.*/skip-&.t/'`
+xfail=`seq_ 1 $xfail_count | sed 's/.*/xfail-&.t/'`
+fail=` seq_ 1 $fail_count  | sed 's/.*/fail-&.t/'`
+xpass=`seq_ 1 $xpass_count | sed 's/.*/xpass-&.t/'`
+error=`seq_ 1 $error_count | sed 's/.*/error-&.t/'`
+
+do_check $pass $skip $xfail $fail $xpass $error <<END
+$header
+# TOTAL: $tests_count
+# PASS:  $pass_count
+# SKIP:  $skip_count
+# XFAIL: $xfail_count
+# FAIL:  $fail_count
+# XPASS: $xpass_count
+# ERROR: $error_count
+$failure_footer
+END
+
+:
diff --git a/t/testsuite-summary-reference-log.sh 
b/t/testsuite-summary-reference-log.sh
new file mode 100755
index 0000000..480ec12
--- /dev/null
+++ b/t/testsuite-summary-reference-log.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the global testsuite log file referenced in the testsuite
+# summary and in the global testsuite log itself is correct.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+mv configure.ac configure.stub
+
+cat > fail << 'END'
+#!/bin/sh
+exit 1
+END
+chmod a+x fail
+
+cat configure.stub - > configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_SUITE_LOG = my_test_suite.log
+TESTS = fail
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+
+../configure
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^See \./my_test_suite\.log$' stdout
+
+mkdir bar
+TEST_SUITE_LOG=bar/bar.log $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^See \./bar/bar\.log$' stdout
+
+cd ..
+
+echo SUBDIRS = sub > Makefile.am
+mkdir sub
+echo TESTS = fail > sub/Makefile.am
+mv fail sub
+
+cat configure.stub - > configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+$ACLOCAL --force
+$AUTOCONF --force
+$AUTOMAKE
+
+./configure
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^See sub/test-suite\.log$' stdout
+cd sub
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^See sub/test-suite\.log$' stdout
+cd ..
+
+TEST_SUITE_LOG=foo.log $MAKE -e check >stdout && { cat stdout; Exit 1; }
+cat stdout
+grep '^See sub/foo\.log$' stdout
+
+:
diff --git a/t/transform.sh b/t/transform.sh
new file mode 100755
index 0000000..7aa958e
--- /dev/null
+++ b/t/transform.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that --program-transform works.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'EOF'
+bin_PROGRAMS = h
+bin_SCRIPTS = h.sh
+man_MANS = h.1
+
+.PHONY: test-install
+test-install: install
+       test -f inst/bin/gnu-h$(EXEEXT)
+       test -f inst/bin/gnu-h.sh
+       test -f inst/man/man1/gnu-h.1
+EOF
+
+cat >h.c <<'EOF'
+int main (void)
+{
+  return 0;
+}
+EOF
+
+: > h.sh
+: > h.1
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --program-prefix=gnu- --prefix "`pwd`/inst" --mandir 
"`pwd`/inst/man"
+$MAKE
+$MAKE test-install
+$MAKE uninstall
+test `find inst -type f -print | wc -l` = 0
+
+# Opportunistically test for installdirs.
+rm -rf inst
+$MAKE installdirs
+test -d inst/bin
+test -d inst/man/man1
+
+:
diff --git a/t/transform2.sh b/t/transform2.sh
new file mode 100755
index 0000000..a4a94f7
--- /dev/null
+++ b/t/transform2.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that --program-transform works even when multiple files are
+# collapsed.
+
+required=cc
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_CC
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'EOF'
+bin_PROGRAMS = p1 p2
+bin_SCRIPTS = s1.sh s2.sh
+man_MANS = m1.1 m2.1
+
+test-install: install
+       test -f inst/bin/p$(EXEEXT)
+       test -f inst/bin/s.sh
+       test -f inst/man/man1/m.1
+
+test-install-foo: install
+       test -f inst/bin/foo$(EXEEXT)
+       test -f inst/bin/foo
+       test -f inst/man/man1/foo.1
+       test ! -f inst/bin/p1$(EXEEXT)
+       test ! -f inst/bin/p2$(EXEEXT)
+       test ! -f inst/bin/s1.sh
+       test ! -f inst/bin/s2.sh
+       test ! -f inst/man/man/m1.1
+       test ! -f inst/man/man/m2.1
+EOF
+
+cat >p1.c <<'EOF'
+int
+main ()
+{
+  return 0;
+}
+EOF
+
+cp p1.c p2.c
+
+: > s1.sh
+: > s2.sh
+: > m1.1
+: > m2.1
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure --program-transform-name='s/[12]//' --prefix "`pwd`/inst" --mandir 
"`pwd`/inst/man"
+$MAKE
+$MAKE test-install
+$MAKE uninstall
+test `find inst -type f -print | wc -l` = 0
+
+# Also squash all file types in question.
+
+# On newer Cygwin versions, that won't work, likely due to overly
+# aggressive appending of '.exe' suffix when copying/renaming Windows
+# executables).  So let's skip this part of the test if we detect the
+# faulty heuristic is present.  See also:
+# <http://lists.gnu.org/archive/html/automake-patches/2010-08/msg00153.html>
+# <http://thread.gmane.org/gmane.os.cygwin/119380>
+echo Foo > foo
+echo Bar > bar.exe
+chmod a+x foo bar.exe
+cp foo bar && cmp foo bar \
+  || skip_ "your Cygwin is too aggressive in tweaking '.exe' suffixes"
+
+./configure --program-transform-name='s/.*/foo/' --prefix "`pwd`/inst" 
--mandir "`pwd`/inst/man"
+$MAKE
+$MAKE test-install-foo
+$MAKE uninstall
+test `find inst -type f -print | wc -l` = 0
+
+:
diff --git a/t/transform3.sh b/t/transform3.sh
new file mode 100755
index 0000000..6f1b811
--- /dev/null
+++ b/t/transform3.sh
@@ -0,0 +1,92 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that --program-transform does not transform too much
+# stuff (in particular, pgklibdir, pkgdatadir and pkglibexecdir).
+
+required=cc
+. ./defs || Exit 1
+
+cat > configure.ac <<'END'
+AC_INIT([foo], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_SCRIPTS = foo
+pkgdata_DATA = bar.txt
+pkglib_LIBRARIES = libzap.a
+pkglibexec_SCRIPTS = mu
+
+test-install: install
+       find $(prefix) ;: For debugging.
+       test   -f $(bindir)/gnu-foo
+       test   -x $(bindir)/gnu-foo
+       test   -f $(datadir)/foo/bar.txt
+       test ! -d $(datadir)/gnu-foo
+       test   -f $(libdir)/foo/libzap.a
+       test ! -d $(libdir)/gnu-foo
+       test   -f $(libexecdir)/foo/gnu-mu
+       test   -x $(libexecdir)/foo/gnu-mu
+       test ! -d $(libexecdir)/gnu-foo
+
+test-installdirs: installdirs
+       find $(prefix) ;: For debugging.
+       test   -d $(datadir)/foo
+       test ! -d $(datadir)/gnu-foo
+       test   -d $(libdir)/foo
+       test ! -d $(libdir)/gnu-foo
+       test   -d $(libexecdir)/foo
+       test ! -d $(libexecdir)/gnu-foo
+END
+
+cat > libzap.c <<'END'
+int zap (void)
+{
+  return 0;
+}
+END
+
+echo 'To be or not to be ...' > bar.txt
+
+cat > foo <<'END'
+#!/bin/sh
+exit 0
+END
+cp foo mu
+chmod a+x foo mu
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure --program-prefix=gnu- --prefix "`pwd`/inst"
+
+$MAKE test-install
+
+$MAKE uninstall
+test `find inst -type f -print | wc -l` = 0
+
+# Opportunistically test for installdirs.
+rm -rf inst
+$MAKE test-installdirs
+
+:
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
new file mode 100755
index 0000000..ae5e9f2
--- /dev/null
+++ b/t/txinfo-no-clutter.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The pdf, ps and dvi targets shouldn't let clutter in the build directory.
+# Related to automake bug#11146.
+
+required='makeinfo tex texi2dvi-o dvips'
+. ./defs || Exit 1
+
+mkdir sub
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+all-local: ps pdf dvi html
+info_TEXINFOS = foo.texi sub/bar.texi
+END
+
+cat > foo.texi << 'END'
+\input texinfo
address@hidden foo.info
address@hidden foo
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+cat > sub/bar.texi << 'END'
+\input texinfo
address@hidden bar.info
address@hidden bar
address@hidden Top
+Hello walls.
address@hidden version2.texi
address@hidden
+END
+
+cat > baz.texi << 'END'
+\input texinfo
address@hidden baz.info
address@hidden baz
address@hidden Top
+Hello walls.
address@hidden
+END
+
+cat > baz.texi << 'END'
+\input texinfo
address@hidden baz.info
address@hidden baz
address@hidden au
address@hidden sa
address@hidden sb
address@hidden sa sb
address@hidden Top
+Hello walls.
address@hidden foo
+foo
address@hidden bar
+bar
address@hidden baz
+baz
address@hidden sa
+sa
address@hidden sb
+sb
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+
+# Try one by one, to ensure later targets don't involuntarily
+# clean up potential cruft left by earlier ones.
+for fmt in info pdf ps dvi html all; do
+  $MAKE $fmt
+  ls -l . sub # For debugging.
+  ls -d foo* baz* sub/bar* > lst
+  $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && Exit 1
+  $MAKE clean
+done
+
+$MAKE distcheck
+
+:
diff --git a/t/txinfo-unrecognized-extension.sh 
b/t/txinfo-unrecognized-extension.sh
new file mode 100755
index 0000000..2516580
--- /dev/null
+++ b/t/txinfo-unrecognized-extension.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that automake complains properly when the files with unrecognized
+# extensions are passed to the TEXINFOS primary.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foobar.foo bazquux.tex zardoz.c
+END
+
+echo '@setfilename foobar.info'  > foobar.foo
+echo '@setfilename bazquux.info' > bazquux.tex
+echo '@setfilename zardoz.info'  > zardoz.c
+: > texinfo.tex
+
+$ACLOCAL
+AUTOMAKE_fails
+
+for x in 'foobar\.foo' 'bazquux\.tex' 'zardoz\.c'; do
+  grep "^Makefile\\.am:.* texinfo file .*$x.* unrecognized extension" stderr
+done
+
+:
diff --git a/t/txinfo.sh b/t/txinfo.sh
new file mode 100755
index 0000000..e6667cb
--- /dev/null
+++ b/t/txinfo.sh
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to ensure texinfo.tex is included in distribution.  Bug report by
+# Jim Meyering.
+
+required=makeinfo
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+.PHONY: test1 test2
+test1:
+       @echo DISTFILES = $(DISTFILES)
+       echo ' ' $(DISTFILES) ' ' | grep '[ /]texinfo\.tex '
+test2: distdir
+       ls -l $(distdir)
+       test -f $(distdir)/texinfo.tex
+END
+
+echo '@setfilename textutils.info' > textutils.texi
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE test1 test2
+
+:
diff --git a/t/txinfo10.sh b/t/txinfo10.sh
new file mode 100755
index 0000000..6908ab8
--- /dev/null
+++ b/t/txinfo10.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure dvi target recurses into subdir.
+# Reported by Pavel Roskin.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+info_TEXINFOS = maude.texi
+END
+
+echo '@setfilename maude.info' > sub/maude.texi
+: > sub/texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+grep dvi-recursive Makefile.in
+grep '[^-]info-recursive' Makefile.in
+grep '[^n]install-info-recursive' Makefile.in
diff --git a/t/txinfo13.sh b/t/txinfo13.sh
new file mode 100755
index 0000000..77f9af7
--- /dev/null
+++ b/t/txinfo13.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for subdir Texinfo (PR/343).
+# Also make sure we do not distribute too much foo.info* files (Report
+# from Vincent Lefevre).
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = subdir/main.texi
+subdir_main_TEXINFOS = subdir/inc.texi
+
+installcheck-local:
+       test -f "$(infodir)/main.info"
+check-local:
+       test ! -f $(srcdir)/subdir/main.info.bak
+END
+
+mkdir subdir
+
+cat > subdir/main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden inc.texi
address@hidden
+END
+
+cat > subdir/inc.texi << 'END'
+I'm included.
+END
+
+touch subdir/main.info.bak
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE distcheck
+test -f ../subdir/main.info
+test ! -f subdir/main.info
+test -f ../subdir/main.info.bak
diff --git a/t/txinfo16.sh b/t/txinfo16.sh
new file mode 100755
index 0000000..173a87a
--- /dev/null
+++ b/t/txinfo16.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that info files are normally built in $(srcdir),
+# not in $(builddir).
+
+required='makeinfo tex texi2dvi'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE
+test -f ../main.info
+test ! -f main.info
+test -f ../stamp-vti
+test ! -f stamp-vti
+test -f ../version.texi
+test ! -f version.texi
+
+cd ..
+rm -rf build make.info* stamp-vti version.texi
+./configure
+$MAKE
+test -f main.info
+
+# Make sure stamp-vti is older that version.texi.
+# (A common situation in a real tree.)
+# This is needed to test the "subtle" issue described below.
+test -f stamp-vti
+test -f version.texi
+$sleep
+touch stamp-vti
+
+$MAKE distclean
+test -f stamp-vti
+test -f version.texi
+
+mkdir build
+cd build
+../configure
+$MAKE
+# main.info should not be rebuilt in the current directory, since
+# it's up-to-date in $(srcdir).
+# This can be caused by a subtle issue related to VPATH handling
+# of version.texi (see also the comment in texi-vers.am): because
+# stamp-vti is newer than version.texi, the 'version.texi: stamp-vti'
+# rule is always triggered.  Still that's not a reason for 'make'
+# to think 'version.texi' has been created...
+test ! -f main.info
+$MAKE dvi
+test -f main.dvi
+
+$MAKE distcheck
+
+:
diff --git a/t/txinfo17.sh b/t/txinfo17.sh
new file mode 100755
index 0000000..1de7e9a
--- /dev/null
+++ b/t/txinfo17.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Automake uses the _first_ @setfilname it sees.
+# Report from Karl Berry.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = texinfo.texi
+END
+
+cat > texinfo.texi << 'END'
address@hidden texinfo
+...
address@hidden
address@hidden example.info
address@hidden verbatim
+...
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+grep 'example' Makefile.in && Exit 1
+grep 'texinfo:' Makefile.in
diff --git a/t/txinfo19.sh b/t/txinfo19.sh
new file mode 100755
index 0000000..63417f8
--- /dev/null
+++ b/t/txinfo19.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test support for DJGPP's .iNN info files.
+
+required=makeinfo
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure "--infodir=`pwd`/_inst"
+$MAKE
+
+# Make sure .iNN files are installed.
+: > main.i1
+: > main.i21
+$MAKE install
+test -f _inst/main.i1
+test -f _inst/main.i21
+
+# They should be uninstalled too.
+$MAKE uninstall
+test ! -f _inst/main.i1
+test ! -f _inst/main.i21
+
+# Make sure rebuild rules erase old .iNN files when they run makeinfo.
+$sleep
+touch main.texi
+test -f main.i1
+test -f main.i21
+$MAKE
+test ! -f main.i1
+test ! -f main.i21
+
+# Finally, we also want them erased by maintainer-clean.
+: > main.i7
+: > main.i39
+$MAKE maintainer-clean
+test ! -f main.i7
+test ! -f main.i39
+
+:
diff --git a/t/txinfo2.sh b/t/txinfo2.sh
new file mode 100755
index 0000000..0daebd9
--- /dev/null
+++ b/t/txinfo2.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to ensure that a ".info~" file doesn't end up in the
+# distribution.  Bug report from Greg McGary.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+.PHONY: test
+test:
+       @echo DISTFILES = $(DISTFILES)
+       case '$(DISTFILES)' in *'~'*) exit 1;; *) exit 0;; esac
+END
+
+: > texinfo.tex
+echo '@setfilename textutils.info' > textutils.texi
+: > textutils.info~
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE test
+
+:
diff --git a/t/txinfo20.sh b/t/txinfo20.sh
new file mode 100755
index 0000000..5c07880
--- /dev/null
+++ b/t/txinfo20.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure info files survive makeinfo errors.
+
+required=makeinfo
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi sub/main.texi
+END
+
+mkdir sub
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+
+cp main.texi sub/main.texi
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+$MAKE
+
+# Feign more info files.
+: > main-1
+: > sub/main-1
+
+# Break main.texi.
+$sleep
+cp main.texi main.old
+cat > main.texi << 'END'
+\input texinfo
address@hidden main
address@hidden main
address@hidden Top
address@hidden walls.}
address@hidden
+END
+
+# makeinfo will bail out, but we should conserve the old info files.
+$MAKE && Exit 1
+test -f main
+test -f main-1
+
+# Restore main.texi, and break sub/main.texi.
+cp main.texi sub/main.texi
+mv main.old main.texi
+$MAKE && Exit 1
+test -f main
+test ! -f main-1
+test -f sub/main
+test -f sub/main-1
diff --git a/t/txinfo21.sh b/t/txinfo21.sh
new file mode 100755
index 0000000..93543a7
--- /dev/null
+++ b/t/txinfo21.sh
@@ -0,0 +1,176 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test support for building HTML documentation, and the many
+# install-DOC flavors.
+
+required='makeinfo-html tex texi2dvi'
+. ./defs || Exit 1
+
+cat >>configure.ac <<\EOF
+AC_CONFIG_FILES([rec/Makefile])
+
+# At the time of writing, Autoconf does not supplies any of these
+# definitions (and those below are purposely not those of the standard).
+AC_SUBST([dvidir],  ['${datadir}/${PACKAGE}/dvi'])
+AC_SUBST([htmldir], ['${datadir}/${PACKAGE}/html'])
+AC_SUBST([pdfdir],  ['${datadir}/${PACKAGE}/pdf'])
+AC_SUBST([psdir],   ['${datadir}/${PACKAGE}/ps'])
+
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'END'
+SUBDIRS = rec
+info_TEXINFOS = main.texi sub/main2.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+
+mkdir sub
+cat > sub/main2.texi << 'END'
+\input texinfo
address@hidden main2.info
address@hidden main2
address@hidden Top
+Hello walls.
address@hidden
+END
+
+mkdir rec
+cat > rec/main3.texi << 'END'
+\input texinfo
address@hidden main3.info
address@hidden main3
address@hidden Top
+Hello walls.
address@hidden
+END
+
+cat > rec/Makefile.am << 'END'
+info_TEXINFOS = main3.texi
+
+install-pdf-local:
+       @$(MKDIR_P) "$(pdfdir)"
+       :> "$(pdfdir)/hello"
+uninstall-local:
+       rm -f "$(pdfdir)/hello"
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+
+$MAKE
+
+$sleep
+# Test production of split-per-node HTML.
+$MAKE html
+test -d main.html
+test -d sub/main2.html
+test -d rec/main3.html
+
+# Rebuilding main.html should cause its timestamp to be updated.
+is_newest main.html main.texi
+$sleep
+touch main.texi
+$MAKE html
+is_newest main.html main.texi
+
+$MAKE clean
+test ! -d main.html
+test ! -d sub/main2.html
+test ! -d rec/main3.html
+
+# Test production of a single HTML file.
+MAKEINFOFLAGS=--no-split $MAKE -e html
+test -f main.html
+test -f sub/main2.html
+test -f rec/main3.html
+$MAKE clean
+test ! -f main.html
+test ! -f sub/main2.html
+test ! -f rec/main3.html
+
+# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
+cat >>Makefile.am <<\EOF
+AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
+AM_MAKEINFOFLAGS = --unsupported-option
+EOF
+$AUTOMAKE
+./configure --prefix "`pwd`"
+$MAKE html
+test -f main.html
+test -f sub/main2.html
+test -d rec/main3.html
+$MAKE clean
+test ! -f main.html
+test ! -f sub/main2.html
+test ! -d rec/main3.html
+
+$MAKE install-html
+test -f share/$me/html/main.html
+test -f share/$me/html/main2.html
+test -d share/$me/html/main3.html
+$MAKE uninstall
+test ! -f share/$me/html/main.html
+test ! -f share/$me/html/main2.html
+test ! -d share/$me/html/main3.html
+
+$MAKE install-dvi
+test -f share/$me/dvi/main.dvi
+test -f share/$me/dvi/main2.dvi
+test -f share/$me/dvi/main3.dvi
+$MAKE uninstall
+test ! -f share/$me/dvi/main.dvi
+test ! -f share/$me/dvi/main2.dvi
+test ! -f share/$me/dvi/main3.dvi
+
+dvips --help || skip_ "dvips is missing"
+
+$MAKE install-ps
+test -f share/$me/ps/main.ps
+test -f share/$me/ps/main2.ps
+test -f share/$me/ps/main3.ps
+$MAKE uninstall
+test ! -f share/$me/ps/main.ps
+test ! -f share/$me/ps/main2.ps
+test ! -f share/$me/ps/main3.ps
+
+pdfetex --help || pdftex --help \
+  || skip_ "pdftex and pdfetex are both missing"
+
+$MAKE install-pdf
+test -f share/$me/pdf/main.pdf
+test -f share/$me/pdf/main2.pdf
+test -f share/$me/pdf/main3.pdf
+test -f share/$me/pdf/hello
+$MAKE uninstall
+test ! -f share/$me/pdf/main.pdf
+test ! -f share/$me/pdf/main2.pdf
+test ! -f share/$me/pdf/main3.pdf
+test ! -f share/$me/pdf/hello
+
+:
diff --git a/t/txinfo22.sh b/t/txinfo22.sh
new file mode 100755
index 0000000..c33898b
--- /dev/null
+++ b/t/txinfo22.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the user can override TEXINFO_TEX.
+# Also make sure TEXINFO_TEX is not distributed.
+# Report from Tom Tromey.
+
+required='makeinfo tex texi2dvi'
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([aux1])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEXINFO_TEX = $(srcdir)/tex/texinfo.tex
+info_TEXINFOS = main.texi
+sure_it_exists:
+       test -f $(TEXINFO_TEX)
+sure_it_is_not_distributed: distdir
+       test ! -f $(distdir)/tex/texinfo.tex
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+END
+
+mkdir aux1
+mkdir tex
+cp "$am_pkgvdatadir/texinfo.tex" tex
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+test ! -f texinfo.tex
+test ! -f aux1/texinfo.tex
+test -f tex/texinfo.tex
+
+./configure
+
+$MAKE sure_it_exists
+$MAKE distcheck
+$MAKE sure_it_is_not_distributed
+
+:
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
new file mode 100755
index 0000000..e5c1761
--- /dev/null
+++ b/t/txinfo23.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that info files are built in builddir when needed.
+# Test with subdir Texinfo.
+# (Similar to txinfo13.test, plus DISTCLEANFILES).
+# (See also txinfo24.test and txinfo25.test).
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+DISTCLEANFILES = subdir/*.info*
+info_TEXINFOS = subdir/main.texi
+subdir_main_TEXINFOS = subdir/inc.texi
+
+installcheck-local:
+       test -f "$(infodir)/main.info"
+END
+
+mkdir subdir
+
+cat > subdir/main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden inc.texi
address@hidden
+END
+
+cat > subdir/inc.texi << 'END'
+I'm included.
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE distcheck
+test -f subdir/main.info
+test ! -f ../subdir/main.info
+
+:
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
new file mode 100755
index 0000000..709cee7
--- /dev/null
+++ b/t/txinfo24.sh
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that info files are built in builddir when needed.
+# (Similar to txinfo16.test, plus CLEANFILES).
+# (See also txinfo23.test and txinfo25.test).
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+CLEANFILES = main.info
+info_TEXINFOS = main.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE
+test ! -f ../main.info
+test -f main.info
+
+cd ..
+rm -rf build
+./configure
+$MAKE
+test -f main.info
+
+# Make sure stamp-vti is older that version.texi.
+# (A common situation in a real tree).
+test -f stamp-vti
+test -f version.texi
+$sleep
+touch stamp-vti
+
+$MAKE distclean
+test -f stamp-vti
+test -f version.texi
+
+mkdir build
+cd build
+../configure
+$MAKE
+# main.info should be rebuilt in the current directory.
+test -f main.info
+test ! -f ../main.info
+$MAKE dvi
+test -f main.dvi
+
+$MAKE distcheck
+
+:
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
new file mode 100755
index 0000000..7aa66ae
--- /dev/null
+++ b/t/txinfo25.sh
@@ -0,0 +1,111 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that info files are built in builddir and in srcdir can safely
+# co-exist.  This setup is obtained by having two info files, only one
+# of which being cleaned.
+# (Similar to txinfo16.test, plus CLEANFILES).
+# (See also txinfo23.test and txinfo24.test).
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+CLEANFILES = [a-m]*.info
+info_TEXINFOS = main.texi other.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+cat > other.texi << 'END'
+\input texinfo
address@hidden other.info
address@hidden other
address@hidden Top
+Hello walls.
address@hidden version2.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE
+test -f main.info
+test ! -f ../main.info
+test ! -f other.info
+test -f ../other.info
+
+cd ..
+rm -rf build
+./configure
+$MAKE
+test -f main.info
+test -f other.info
+
+# Make sure stamp-vti is older that version.texi.
+# (A common situation in a real tree).
+# This is needed to test the "subtle" issue described below.
+test -f stamp-vti
+test -f version.texi
+test -f stamp-1
+test -f version2.texi
+$sleep
+touch stamp-vti
+touch stamp-1
+
+$MAKE distclean
+test -f stamp-vti
+test -f stamp-1
+test -f version.texi
+test -f version2.texi
+
+mkdir build
+cd build
+../configure
+$MAKE
+# other.info should not be rebuilt in the current directory, since
+# it's up-to-date in $(srcdir).
+# This can be caused by a subtle issue related to VPATH handling
+# of version.texi (see also the comment in texi-vers.am): because
+# stamp-vti is newer than version.texi, the 'version.texi: stamp-vti'
+# rule is always triggered.  Still that's not a reason for 'make'
+# to think 'version.texi' has been created...
+test -f main.info
+test ! -f other.info
+$MAKE dvi
+test -f main.dvi
+test -f other.dvi
+
+$MAKE distcheck
+
+:
diff --git a/t/txinfo26.sh b/t/txinfo26.sh
new file mode 100755
index 0000000..e336bba
--- /dev/null
+++ b/t/txinfo26.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure Texinfo installation works when absolute --srcdir is used.
+# PR/408
+
+required='makeinfo'
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi
+END
+
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+$MAKE
+$MAKE distclean
+
+case `pwd` in
+  *\ * | *\    *)
+    skip_ "this test might fail in a directory containing white spaces";;
+esac
+
+mkdir build
+cd build
+../configure "--srcdir=`pwd`/.." "--prefix=`pwd`/_inst" 
"--infodir=`pwd`/_inst/info"
+$MAKE install
+test -f ../main.info
+test ! -f ./main.info
+test -f _inst/info/main.info
+
+$MAKE uninstall
+test ! -f _inst/info/main.info
+test -f ../main.info
+
+# Multiple uninstall should not fail.
+$MAKE uninstall
diff --git a/t/txinfo27.sh b/t/txinfo27.sh
new file mode 100755
index 0000000..131300a
--- /dev/null
+++ b/t/txinfo27.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure install-info works even if no-installinfo is given.
+
+required='makeinfo'
+. ./defs || Exit 1
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi
+AUTOMAKE_OPTIONS = no-installinfo
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure "--prefix=`pwd`/inst" "--infodir=`pwd`/inst/info"
+$MAKE install-info
+test -f inst/info/main.info
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
new file mode 100755
index 0000000..97b36d5
--- /dev/null
+++ b/t/txinfo28.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that info files are built in builddir when needed.
+# Similar to txinfo24.test, but obfuscating filenames with variable
+# references.
+# Report from Ralf Corsepius.
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+# This setting, when honored by GNU ls, used to cause an infinite loop
+# in mdate-sh.
+TIME_STYLE="+%Y-%m-%d %H:%M:%S"
+export TIME_STYLE
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+MA = ma
+IN = in
+PROJ = $(MA)$(IN)
+include fragment.mk
+info_TEXINFOS = ma$(IN).texi
+END
+
+echo 'CLEANFILES = $(PROJ).info' > fragment.mk
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+mkdir build
+cd build
+../configure
+$MAKE
+test -f main.info
+
+cd ..
+rm -rf build
+./configure
+$MAKE
+test -f main.info
+
+# Make sure stamp-vti is older that version.texi.
+# (A common situation in a real tree).
+test -f stamp-vti
+test -f version.texi
+$sleep
+touch stamp-vti
+
+$MAKE distclean
+test -f stamp-vti
+test -f version.texi
+
+mkdir build
+cd build
+../configure
+$MAKE
+# main.info should be rebuilt in the current directory.
+test -f main.info
+test ! -f ../main.info
+$MAKE dvi
+test -f main.dvi
+
+$MAKE distcheck
diff --git a/t/txinfo29.sh b/t/txinfo29.sh
new file mode 100755
index 0000000..a0013d2
--- /dev/null
+++ b/t/txinfo29.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that INFO_DEPS can be overridden.
+# Report from Bruce Korb.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+INFO_DEPS = foo.info
+info_TEXINFOS = bar.texi
+END
+
+echo '@setfilename baz.info' > bar.texi
+
+$ACLOCAL
+AUTOMAKE_fails --add-missing
+grep '^Makefile\.am:1:.*user variable.*INFO_DEPS' stderr
+grep 'overrides Automake variable.*INFO_DEPS' stderr
+
+$AUTOMAKE -Wno-override
+
+# There is only one definition of INFO_DEPS ...
+test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l`
+# ... and it is the right one.
+grep '^INFO_DEPS *= *foo.info *$' Makefile.in
+
+# Likewise with AC_SUBST.
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = bar.texi
+END
+cat >> configure.ac << 'END'
+AC_SUBST([INFO_DEPS])
+END
+rm -rf autom4te.cache # Make sure autoconf sees the configure.ac update.
+AUTOMAKE_fails
+
+grep '^configure\.ac:4:.*user variable.*INFO_DEPS' stderr
+grep 'overrides Automake variable.*INFO_DEPS' stderr
+
+$AUTOMAKE -Wno-override
+
+# There is only one definition of INFO_DEPS ...
+test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l`
+# ... and it is the right one.
+grep '^INFO_DEPS *= address@hidden@ *$' Makefile.in
+
+:
diff --git a/t/txinfo3.sh b/t/txinfo3.sh
new file mode 100755
index 0000000..88e1bac
--- /dev/null
+++ b/t/txinfo3.sh
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure .info-less @setfilename works.
+
+required='makeinfo tex texi2dvi'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > textutils.texi <<EOF
+\input texinfo
address@hidden textutils
address@hidden main
address@hidden Top
+Hello walls.
address@hidden
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+grep '^INFO_DEPS.*textutils$' Makefile.in
+
+# We should not use single suffix inference rules (with separate
+# dependencies), this confuses Solaris make.
+grep '^\.texi:$' Makefile.in && Exit 1
+grep 'textutils: *textutils\.texi' Makefile.in
+
+./configure
+$MAKE distcheck
+
+:
diff --git a/t/txinfo30.sh b/t/txinfo30.sh
new file mode 100755
index 0000000..09ebd5e
--- /dev/null
+++ b/t/txinfo30.sh
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'missing texinfo' does not create empty files.
+# Report from Bob Proulx.
+
+. ./defs || Exit 1
+
+echo info_TEXINFOS = bar.texi >Makefile.am
+echo grepme >bar.info
+$sleep
+cat >bar.texi <<EOF
address@hidden bar.info
+EOF
+
+echo AC_OUTPUT >>configure.ac
+
+cat >makeinfo <<\EOF
+#!/bin/sh
+# This script
+# 1. fails so 'missing' can take over
+# 2. does not understand '--version' so 'missing' thinks 'makeinfo' isn't
+#    installed
+exec false
+EOF
+
+chmod +x makeinfo
+
+PATH=`pwd`$PATH_SEPARATOR$PATH
+export PATH
+
+# Otherwise configure might pick up a working makeinfo from the
+# environment.  Seen in automake bug#10866.
+unset MAKEINFO || :
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+$MAKE
+grep grepme bar.info
+test -f bar.info
+
+# We should not create a missing bar.info.
+rm -f bar.info
+$MAKE && Exit 1
+test ! -f bar.info
+
+:
diff --git a/t/txinfo31.sh b/t/txinfo31.sh
new file mode 100755
index 0000000..191bca4
--- /dev/null
+++ b/t/txinfo31.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure file extensions are matched correctly.
+# Report from Eric Dorland.
+
+. ./defs || Exit 1
+
+echo info_TEXINFOS = bar.texi >Makefile.am
+cat >bar.texi <<EOF
address@hidden bar-1.9.info
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
diff --git a/t/txinfo32.sh b/t/txinfo32.sh
new file mode 100755
index 0000000..7fa7938
--- /dev/null
+++ b/t/txinfo32.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the documentation targets work as required with BSD make,
+# even in the presence of subdirs (requires presence of default *-am rules).
+
+. ./defs || Exit 1
+
+mkdir sub
+cat >>configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+cat >Makefile.am <<'END'
+SUBDIRS = sub
+END
+: >sub/Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure "--prefix=`pwd`/inst"
+$MAKE html dvi ps pdf info \
+      install-html install-dvi install-ps install-pdf install-info \
+      install-man install-data install-exec install uninstall
+
+Exit 0
diff --git a/t/txinfo33.sh b/t/txinfo33.sh
new file mode 100755
index 0000000..4bdd767
--- /dev/null
+++ b/t/txinfo33.sh
@@ -0,0 +1,126 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'.
+# Similar to txinfo25.test.
+
+required='makeinfo tex texi2dvi-o dvips'
+. ./defs || Exit 1
+
+mkdir sub
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = main.texi other.texi sub/another.texi
+END
+
+cat > main.texi << 'END'
+\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+cat > other.texi << 'END'
+\input texinfo
address@hidden other.info
address@hidden other
address@hidden Top
+Hello walls.
address@hidden version2.texi
address@hidden
+END
+
+cat > sub/another.texi << 'END'
+\input texinfo
address@hidden another.info
address@hidden another
address@hidden Top
+Hello walls.
address@hidden version3.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+# In-tree build.
+./configure
+$MAKE dvi ps pdf html
+
+test -f main.dvi
+test -f main.ps
+test -f main.html || test -d main.html
+test -f main.pdf
+test -f other.pdf
+test -f sub/another.pdf
+
+test -f other.dvi
+test -f other.html || test -d other.html
+test -f other.ps
+test -f sub/another.dvi
+test -f sub/another.html || test -d sub/another.html
+test -f sub/another.ps
+
+$MAKE mostlyclean
+
+ls *.aux && Exit 1
+ls sub/*.aux && Exit 1
+
+test -f main.dvi
+test -f main.ps
+test -f main.html || test -d main.html
+test -f main.pdf
+test -f other.pdf
+test -f sub/another.pdf
+
+test -f other.dvi
+test -f other.html || test -d other.html
+test -f other.ps
+test -f sub/another.dvi
+test -f sub/another.html || test -d sub/another.html
+test -f sub/another.ps
+
+$MAKE clean
+
+test ! -f main.dvi
+test ! -f main.ps
+test ! -f main.html && test ! -d main.html
+test ! -f main.pdf
+test ! -f other.pdf
+test ! -f sub/another.pdf
+test ! -f sub/yetanother.pdf
+
+test ! -f other.dvi
+test ! -f other.html && test ! -d other.html
+test ! -f other.ps
+test ! -f sub/another.dvi
+test ! -f sub/another.html && test ! -d sub/another.html
+test ! -f sub/another.ps
+
+./configure
+$MAKE
+
+$MAKE distcheck
+
+:
diff --git a/t/txinfo4.sh b/t/txinfo4.sh
new file mode 100755
index 0000000..f92f9c1
--- /dev/null
+++ b/t/txinfo4.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure non-empty, non-info suffixes are diagnosed.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+echo '@setfilename textutils.frob' > textutils.texi
+: > texinfo.tex
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'textutils\.texi:1:.*textutils\.frob.*extension' stderr
+
+:
diff --git a/t/txinfo5.sh b/t/txinfo5.sh
new file mode 100755
index 0000000..9e42823
--- /dev/null
+++ b/t/txinfo5.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that texinfo.tex is not required by --cygnus.
+# Also check that TEXINFOS + cygnus work without requiring the
+# '-Wno-override' option.
+# See also sister test txinfo5b.test.
+# Report from Ian Taylor.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = ian.texi
+END
+
+echo '@setfilename ian.info' > ian.texi
+
+$ACLOCAL
+$AUTOMAKE --cygnus
+
+:
diff --git a/t/txinfo5b.sh b/t/txinfo5b.sh
new file mode 100755
index 0000000..c4eac53
--- /dev/null
+++ b/t/txinfo5b.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that texinfo.tex is not required by --cygnus.
+# See also sister test txinfo5.test.
+# Report from Ian Taylor.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_MAINTAINER_MODE
+END
+
+cat > Makefile.am << 'END'
+# Disable 'override' warning to work around an unrelated
+# texi+cygnus bug.
+AUTOMAKE_OPTIONS = -Wno-override
+info_TEXINFOS = ian.texi
+END
+
+echo '@setfilename ian.info' > ian.texi
+
+$ACLOCAL
+$AUTOMAKE --cygnus
+$AUTOMAKE -a --cygnus
+test ! -f texinfo.tex
+
+:
diff --git a/t/txinfo6.sh b/t/txinfo6.sh
new file mode 100755
index 0000000..b289efe
--- /dev/null
+++ b/t/txinfo6.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure '.txi' extension works.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foo.txi
+END
+
+echo '@setfilename foo.info' > foo.txi
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^\.txi\.info: *$' Makefile.in
+
+:
diff --git a/t/txinfo7.sh b/t/txinfo7.sh
new file mode 100755
index 0000000..2a5dc9d
--- /dev/null
+++ b/t/txinfo7.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure texinfo.tex correctly installed by -a.  Bug report
+# by Per Cederqvist.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+echo '@setfilename textutils.info' > textutils.texi
+
+$ACLOCAL
+$AUTOMAKE -a
+
+test -f texinfo.tex
+
+:
diff --git a/t/txinfo8.sh b/t/txinfo8.sh
new file mode 100755
index 0000000..4b186bc
--- /dev/null
+++ b/t/txinfo8.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure texinfo.tex is correctly installed and disted by
+# -a when we're using AC_CONFIG_AUX_DIR.  Bug report by by Per
+# Cederqvist.
+
+. ./defs || Exit 1
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+AC_CONFIG_AUX_DIR([auxdir])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+.PHONY: test1 test2
+test1:
+       @echo DISTFILES = $(DISTFILES)
+       echo ' ' $(DISTFILES) ' ' | grep '[ /]auxdir/texinfo\.tex '
+test2: distdir
+       ls -l $(distdir)/*
+       test -f $(distdir)/auxdir/texinfo.tex
+END
+
+echo '@setfilename textutils.info' > textutils.texi
+
+mkdir auxdir
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+test -f auxdir/texinfo.tex
+
+./configure
+
+# Create textutils.info by hand, so that we don't have to require
+# makeinfo.  Also ensure it's really newer than textutils.texi, so
+# that make won't try to re-create it.
+$sleep
+: > textutils.info
+
+$MAKE test1 test2
+
+:
diff --git a/t/txinfo9.sh b/t/txinfo9.sh
new file mode 100755
index 0000000..eb2cbdc
--- /dev/null
+++ b/t/txinfo9.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we only create texinfo-related targets once.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = maude.texi liver.txi heart.texinfo
+END
+
+echo '@setfilename maude.info' > maude.texi
+echo '@setfilename liver.info' > liver.txi
+echo '@setfilename heart.info' > heart.texinfo
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+# These are just examples -- basically for many targets in texinfos.am
+# we only want them to appear once.  But grepping them all would be
+# overkill.
+for t in info dist-info dvi-am install-html uninstall-pdf-am; do
+  $EGREP "(^| )$t*.:" Makefile.in # For debugging.
+  test `$EGREP -c "(^| )$t(:| *.:)" Makefile.in` -eq 1
+done
+
+:
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
new file mode 100755
index 0000000..aee1fb5
--- /dev/null
+++ b/t/uninstall-fail.sh
@@ -0,0 +1,96 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# "make uninstall" complains and errors out on failures.
+
+# FIXME: this test only deal with DATA primary; maybe we need sister
+# tests for other primaries too?  E.g., SCRIPTS, PROGRAMS, LISP, PYTHON,
+# etc...
+
+. ./defs || Exit 1
+
+mkdir d
+: > d/f
+chmod a-w d || skip "cannot make directories unwritable"
+
+# On Solaris 10, if '/bin/rm' is run with the '-f' option, it doesn't
+# print any error message when failing to remove a file (due to e.g.,
+# "Permission denied").  Yikes.  We'll cater to this incompatibility
+# by relaxing a test below if a faulty 'rm' is detected.
+st=0; rm -f d/f 2>stderr || st=$?
+cat stderr >&2
+test $st -gt 0 || skip_ "can delete files from unwritable directories"
+if grep 'rm:' stderr; then
+  rm_f_is_silent_on_error=no
+else
+  rm_f_is_silent_on_error=yes
+fi
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+data_DATA = foobar.txt
+END
+
+: > foobar.txt
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+inst=__inst-dir__
+
+./configure --prefix="`pwd`/$inst"
+
+mkdir $inst $inst/share
+: > $inst/share/foobar.txt
+
+chmod a-w $inst/share
+$MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
+cat output
+if test $rm_f_is_silent_on_error = yes; then
+  : "rm -f" is silent on errors, skip the grepping of make output
+else
+  grep "rm: .*foobar\.txt" output
+fi
+
+chmod a-rwx $inst/share
+(cd $inst/share) && skip_ "cannot make directories fully unreadable"
+
+$MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
+cat output
+#
+# Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report
+# the name of the 'cd' builtin upon a chdir error:
+#
+#   $ /bin/sh -c 'cd /none'
+#   /bin/sh: /none: does not exist
+#
+# In addition, some shells, like Solaris 10 /usr/xpg4/bin/sh, also print
+# a line number in the error message *if the command contains newlines*:
+#
+#   $ /usr/xpg4/bin/sh -c 'cd unreadable'
+#   /usr/xpg4/bin/sh: unreadable: permission denied
+#   $ /usr/xpg4/bin/sh -c '\
+#   > \
+#   > cd unreadable'
+#   /usr/xpg4/bin/sh[3]: unreadable: permission denied
+#
+$EGREP "(cd|sh)(\[[0-9]*[0-9]\])?: .*$inst/share" output
+
+:
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
new file mode 100755
index 0000000..1ba6ac7
--- /dev/null
+++ b/t/uninstall-pr9578.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check against automake bug#9578: "make uninstall" issued before
+# "make install" or after a mere "make install-data" or a mere
+# "make install-exec" failed spuriously.
+#
+# FIXME: this test only deal with DATA and script primaries; maybe we
+# need sister tests for other primaries too?  E.g., PROGRAMS, LISP,
+# PYTHON, etc...
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+: > foo
+: > bar
+
+cat > Makefile.am << 'END'
+bin_SCRIPTS = foo
+data_DATA = bar
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure --prefix="`pwd`/inst"
+
+$MAKE uninstall
+test ! -d inst
+
+rm -rf inst
+
+$MAKE install-exec
+test -f inst/bin/foo || Exit 99 # Sanity check.
+$MAKE uninstall
+test ! -f inst/bin/foo
+
+$MAKE install-data
+test -f inst/share/bar || Exit 99 # Sanity check.
+$MAKE uninstall
+test ! -f inst/share/bar
+
+rm -rf inst
+
+$MAKE install-exec
+test -f inst/bin/foo || Exit 99 # Sanity check.
+$MAKE uninstall
+test ! -f inst/bin/foo
+
+:
diff --git a/t/unused.sh b/t/unused.sh
new file mode 100755
index 0000000..271273f
--- /dev/null
+++ b/t/unused.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for failing check for unused macros.  From Johan Danielsson.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+MACRO_1
+MACRO_1_2
+MACRO_1_2_3
+END
+
+cat > acinclude.m4 << 'END'
+AC_DEFUN([MACRO_1], echo 1)
+AC_DEFUN([MACRO_1_2], echo 12)
+AC_DEFUN([MACRO_1_2_3], echo 123)
+END
+
+$ACLOCAL 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+test ! -s stderr
diff --git a/t/upc.sh b/t/upc.sh
new file mode 100755
index 0000000..320e02f
--- /dev/null
+++ b/t/upc.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# A simple Hello World for UPC.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AM_PROG_UPC
+AC_OUTPUT
+END
+
+cat > hello.upc << 'END'
+#include <stdio.h>
+#include <upc.h>
+int
+main (void)
+{
+  printf ("Thread %d says, 'Hello.'\n", MYTHREAD);
+  return 0;
+}
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.upc
+hello_LDADD = -lm
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure || Exit $?
+$MAKE distcheck
+
+:
diff --git a/t/upc2.sh b/t/upc2.sh
new file mode 100755
index 0000000..43575d8
--- /dev/null
+++ b/t/upc2.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that Automake suggests using AM_PROG_UPC if Unified Parallel C
+# sources are used.
+
+. ./defs || Exit 1
+
+echo AC_PROG_CC >>configure.ac
+
+cat >Makefile.am <<'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.upc
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AM_PROG_UPC stderr
diff --git a/t/upc3.sh b/t/upc3.sh
new file mode 100755
index 0000000..eb02679
--- /dev/null
+++ b/t/upc3.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test that C and Unified Parallel C link safely.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_UPC
+AC_OUTPUT
+END
+
+cat > hello.upc << 'END'
+#include <stdio.h>
+#include <upc.h>
+#include "message.h"
+int
+main (void)
+{
+  printf ("Thread %d says, '%s'\n", MYTHREAD, message());
+  return 0;
+}
+END
+
+cat > message.h << 'END'
+const char *message (void);
+END
+
+cat > mix.c << 'END'
+#include "message.h"
+const char *
+message (void)
+{
+  return "Hello.";
+}
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = hello
+hello_SOURCES = hello.upc mix.c message.h
+hello_LDADD = -lm
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure || Exit $?
+$MAKE distcheck
+
+:
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
new file mode 100755
index 0000000..a091c4c
--- /dev/null
+++ b/t/vala-headers.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure compiling Vala code really works with recursive make.
+
+required="pkg-config valac gcc GNUmake"
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_VALAC([0.7.0])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz quux
+
+zardoz_SOURCES = zardoz.vala
+quux_SOURCES = quux.vala
+quux.vala: zardoz.vala
+       sed 's/Zardoz/Quux/' <zardoz.vala >quux.vala
+
+quux_VALAFLAGS = \
+  --header HDR.h \
+  --vapi hello.vapi
+
+zardoz_VALAFLAGS = \
+  -H foo.h \
+  --internal-header foo2.h \
+  --internal-vapi foo3.vapi
+
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+LDADD = $(GOBJECT_LIBS)
+END
+
+headers='HDR.h hello.vapi foo.h foo2.h foo3.vapi'
+
+cat > zardoz.vala << 'END'
+using GLib;
+public class Zardoz {
+  public static void main () {
+    stdout.printf ("Zardoz!\n");
+  }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
+
+./configure
+$MAKE
+
+# Test rebuild rules.
+
+for h in $headers; do
+  rm -f $h
+  $MAKE $h
+  test -f $h
+done
+
+rm -f $headers
+$MAKE $headers
+for h in $headers; do test -f $h; done
+
+$MAKE distcheck
+
+$MAKE maintainer-clean
+for h in $headers; do test ! -f $h; done
+
+:
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
new file mode 100755
index 0000000..00befdd
--- /dev/null
+++ b/t/vala-libs.sh
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Building libraries (libtool and static) from Vala sources.
+# And use of vapi files to call C code from Vala.
+
+required="valac cc pkg-config libtoolize GNUmake"
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AM_PROG_VALAC([0.7.3])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libmu.a
+lib_LTLIBRARIES = src/libzardoz.la
+libmu_a_SOURCES = mu.vala mu2.c mu.vapi mu2.h
+libmu_a_CPPFLAGS = -DOKOKIMDEFINED=1
+libmu_a_VALAFLAGS = --profile=posix --vapidir=$(srcdir)
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+src_libzardoz_la_LIBADD = $(GOBJECT_LIBS)
+src_libzardoz_la_SOURCES = src/zardoz-foo.vala src/zardoz-bar.vala
+src/zardoz-bar.vala: src/zardoz-foo.vala
+       sed 's/Foo/Bar/g' $< >$@
+END
+
+libtoolize
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
+
+./configure
+
+cat > mu2.c << 'END'
+#include "mu2.h"
+int mu2 (void)
+{
+  return OKOKIMDEFINED;
+}
+END
+
+cat > mu2.h << 'END'
+int mu2 (void);
+END
+
+cat > mu.vapi <<'END'
+[CCode (cheader_filename = "mu2.h", cname = "mu2")]
+public int c_mu2 ();
+END
+
+cat > mu.vala << 'END'
+int main ()
+{
+  stdout.printf ("mumumu\n");
+  return c_mu2 ();
+}
+END
+
+mkdir src
+cat > src/zardoz-foo.vala << 'END'
+using GLib;
+public class Foo {
+  public static void zap () {
+    stdout.printf ("FooFooFoo!\n");
+  }
+}
+END
+
+$MAKE
+test -f libmu.a
+test -f src/libzardoz.la
+$FGREP "mumumu" mu.c
+$FGREP "FooFooFoo" src/zardoz-foo.c
+$FGREP "BarBarBar" src/zardoz-bar.c
+test -f libmu_a_vala.stamp
+test -f src_libzardoz_la_vala.stamp
+
+$MAKE distcheck
+
+:
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
new file mode 100755
index 0000000..7e04b60
--- /dev/null
+++ b/t/vala-mix.sh
@@ -0,0 +1,124 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Vala sources and C sources in the same program.  Functional test.
+
+required='valac cc GNUmake'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz mu baz
+AM_VALAFLAGS = --profile=posix
+zardoz_SOURCES = foo.vala bar.c
+mu_SOURCES = 1.vala 2.c
+mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
+mu_CFLAGS = -DHAVE_MU
+baz_SOURCES = baz.c
+END
+
+if cross_compiling; then :; else
+  unindent >> Makefile.am <<'END'
+    check-local:
+       ./zardoz
+       ./mu
+       ./zardoz | grep "foo is alive"
+       ./mu | grep "Howdy, World!"
+END
+fi
+
+cat > foo.vala <<'END'
+int main ()
+{
+  stdout.printf ("foo is alive\n");
+  return 0;
+}
+END
+
+echo 'extern int i = 0;' > bar.c
+
+cat > 1.vala <<'END'
+int run ()
+{
+  stdout.printf ("Howdy, World!\n");
+  return 0;
+}
+END
+
+cat > 2.c <<'END'
+#ifdef HAVE_MU
+int all_is_ok = 1;
+#else
+#error "HAVE_MU no defined"
+chocke me
+#endif
+END
+
+# For automake bug#11229.
+cat > baz.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure
+
+$MAKE all
+ls -l # For debugging.
+$MAKE check
+
+have_generated_files ()
+{
+  test -f mu_vala.stamp
+  test -f zardoz_vala.stamp
+  test -f foo.c
+  test -f 1.c
+}
+
+# Our vala-related rules must create stamp files and intermediate
+# C files.
+have_generated_files
+
+# Remake rules are not uselessly triggered.
+$MAKE -q
+$MAKE -n | $FGREP vala.stamp && Exit 1
+
+# Check the distribution.
+$MAKE distcheck
+
+# Stamp files and intermediate C files should *not* be removed
+# by "make clean".
+$MAKE clean
+have_generated_files
+
+# But stamp files should be removed by "maintainer-clean" (the
+# behaviour w.r.t. intermediate C files is still unclear, and
+# better left undefined for the moment).
+$MAKE maintainer-clean
+ls *vala*.stamp | grep . && Exit 1
+
+:
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
new file mode 100755
index 0000000..992c41f
--- /dev/null
+++ b/t/vala-mix2.sh
@@ -0,0 +1,120 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Vala sources, C and C++ sources and C and C++ headers in the same
+# program.  Functional test.  See automake bug#10894.
+
+required='valac cc c++ GNUmake'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+AM_VALAFLAGS = --profile=posix
+zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
+END
+
+cat > zardoz.vala <<'END'
+int main ()
+{
+  stdout.printf ("foo is alive\n");
+  return 0;
+}
+END
+
+cat > foo.h <<'END'
+int foo;
+int bar (void);
+int baz (void);
+END
+
+cat > bar.c <<'END'
+#include "foo.h"
+int bar (void) { return foo + baz (); }
+END
+
+cat > baz.c <<'END'
+#include "foo.h"
+extern int foo = 0;
+int baz (void) { return 0; }
+END
+
+cat > zen.hh <<'END'
+#include <iostream>
+END
+
+cat > master.cxx <<'END'
+#include "zen.hh"
+void chatty (void) { std::cout << "Hello, stranger!\n"; }
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+# Do not reject slower dependency extractors.
+./configure --enable-dependency-tracking
+
+$MAKE all
+ls -l # For debugging.
+
+have_generated_files ()
+{
+  test -f zardoz_vala.stamp
+  test -f zardoz.c
+}
+
+# Our vala-related rules must create stamp files and intermediate
+# C files.
+have_generated_files
+
+# Remake rules are not uselessly triggered.
+$MAKE -q
+$MAKE -n | $FGREP vala.stamp && Exit 1
+
+# But are triggered when they should.
+for file in zardoz.vala foo.h bar.c baz.c zen.hh master.cxx; do
+  $sleep
+  echo '& choke me !' >> $file
+  $MAKE && Exit 1
+  $sleep
+  sed '$d' $file > t
+  mv -f t $file
+  $MAKE
+done
+
+# Check the distribution.
+$MAKE distcheck
+
+# Stamp files and intermediate C files should *not* be removed
+# by "make clean".
+$MAKE clean
+ls -l # For debugging.
+have_generated_files
+
+# But stamp files should be removed by "maintainer-clean" (the
+# behaviour w.r.t. intermediate C files is still unclear, and
+# better left undefined for the moment).
+$MAKE maintainer-clean
+ls *vala*.stamp | grep . && Exit 1
+
+:
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
new file mode 100755
index 0000000..8b6aff5
--- /dev/null
+++ b/t/vala-parallel.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Vala support with parallel make.
+
+required='valac cc GNUmake'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+AM_VALAFLAGS = --profile=posix
+zardoz_SOURCES = main.vala 1.vala 2.vala 3.vala 4.vala 5.vala 6.vala
+END
+
+echo 'int main () {' > main.vala
+for i in 1 2 3 4 5 6; do
+  echo "void foo$i () { stdout.printf (\"ok $i\\n\"); }" > $i.vala
+  echo "foo$i ();" >> main.vala
+done
+echo 'return 0; }' >> main.vala
+
+cat main.vala # For debugging.
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure
+
+$MAKE -j3
+ls -l # For debugging.
+for x in main 1 2 3 4 5 6; do test -f $x.c; done
+test -f  zardoz_vala.stamp
+
+$MAKE maintainer-clean -j4
+ls -l # For debugging.
+for x in main 1 2 3 4 5 6; do test ! -f $x.c; done
+test ! -f zardoz_vala.stamp
+
+mkdir build
+cd build
+../configure
+$MAKE -j6
+ls -l . .. # For debugging.
+for x in main 1 2 3 4 5 6; do test -f ../$x.c; done
+test -f ../zardoz_vala.stamp
+
+$MAKE distcheck -j4
+
+$MAKE maintainer-clean -j2
+for x in main 1 2 3 4 5 6; do test ! -f ../$x.c; done
+test ! -f ../zardoz_vala.stamp
+
+:
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
new file mode 100755
index 0000000..3a92716
--- /dev/null
+++ b/t/vala-vapi.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test and that vapi files are correctly handled by Vala support.
+
+required='valac cc GNUmake'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+AM_VALAFLAGS = --profile=posix
+zardoz_SOURCES = zardoz.vala foo.vapi foo.h
+END
+
+cat > zardoz.vala <<'END'
+int main ()
+{
+    stdout.printf (BARBAR);
+    return 0;
+}
+END
+
+echo '#define BARBAR "Zardoz!\n"' > foo.h
+
+cat > foo.vapi <<'END'
+[CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
+public const string BARBAR;
+END
+
+if cross_compiling; then :; else
+  unindent >> Makefile.am <<'END'
+    check-local: test2
+    .PHONY: test1 test2
+    test1:
+       ./zardoz
+       ./zardoz | grep 'Zardoz!'
+    test2:
+       ./zardoz
+       ./zardoz | grep 'Quux!'
+END
+fi
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure --enable-dependency-tracking
+
+$MAKE
+ls -l        # For debugging.
+cat zardoz.c # Likewise.
+grep 'BARBAR' zardoz.c
+cross_compiling || $MAKE test1 || Exit 1
+
+# Simple check on remake rules.
+$sleep
+echo '#define BAZBAZ "Quux!\n"' > foo.h
+sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
+$MAKE && Exit 1
+sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
+$MAKE
+cat zardoz.c # For debugging.
+grep 'BAZBAZ' zardoz.c
+cross_compiling || $MAKE test2 || Exit 1
+
+# Check the distribution.
+$MAKE distcheck
+
+:
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
new file mode 100755
index 0000000..f2da4af
--- /dev/null
+++ b/t/vala-vpath.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure vala support handles from-scratch VPATH builds.
+# See automake bug#8753.
+
+required="cc valac GNUmake"
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_SRCDIR([hello.vala])
+AC_PROG_CC
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+AM_VALAFLAGS = --profile=posix
+foo_SOURCES = hello.vala
+bar_VALAFLAGS = $(AM_VALAFLAGS) -H zardoz.h
+bar_SOURCES = goodbye.vala
+END
+
+cat > hello.vala <<'END'
+void main ()
+{
+  stdout.printf ("foofoofoo\n");
+}
+END
+cp hello.vala goodbye.vala
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+mkdir build
+cd build
+../configure
+$MAKE
+test -f ../foo_vala.stamp
+test -f ../bar_vala.stamp
+grep foofoofoo ../hello.c
+test -f ../zardoz.h
+$MAKE distcheck
+
+# Rebuild rules work also in VPATH builds.
+
+cat > ../hello.vala <<'END'
+int main ()
+{
+  stdout.printf ("barbarbar\n");
+  return 0;
+}
+END
+
+$MAKE
+test -f ../foo_vala.stamp
+test -f ../bar_vala.stamp
+grep barbarbar ../hello.c
+
+# Rebuild rules are not uselessly triggered.
+$MAKE -q
+$MAKE -n | grep '\.stamp' && Exit 1
+
+# Cleanup rules work also in VPATH builds.
+$MAKE clean
+test -f ../foo_vala.stamp
+test -f ../bar_vala.stamp
+test -f ../zardoz.h
+test -f ../hello.c
+$MAKE maintainer-clean
+test ! -f ../zardoz.h
+test ! -f ../hello.c
+test ! -f ../foo_vala.stamp
+test ! -f ../bar_vala.stamp
+
+:
diff --git a/t/vala.sh b/t/vala.sh
new file mode 100755
index 0000000..71c2ee6
--- /dev/null
+++ b/t/vala.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic "grepping" test on vala support.
+
+. ./defs || Exit 1
+
+# So that we won't require libtool macros.
+cat > acinclude.m4 <<'END'
+AC_DEFUN([AC_PROG_LIBTOOL],
+         [AC_SUBST([LIBTOOL], [:])])
+END
+
+cat >> 'configure.ac' << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AM_PROG_VALAC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = sub
+
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.vala
+zardoz_VALAFLAGS = --debug
+
+lib_LTLIBRARIES = libzardoz.la
+libzardoz_la_SOURCES = zardoz-foo.vala zardoz-bar.vala
+END
+
+mkdir sub
+
+cat > sub/Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = bar.vala baz.vala mu.c zap.cxx
+END
+
+: > ltmain.sh
+: > config.sub
+: > config.guess
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(VALAC).* \$(AM_VALAFLAGS) \$(VALAFLAGS) ' Makefile.in
+grep '\$(VALAC).* \$(zardoz_VALAFLAGS) \$(VALAFLAGS) ' Makefile.in
+$FGREP 'am_zardoz_OBJECTS' Makefile.in
+$FGREP 'am_libzardoz_la_OBJECTS' Makefile.in
+$FGREP 'zardoz_vala.stamp:' Makefile.in
+$FGREP 'libzardoz_la_vala.stamp:' Makefile.in
+test `$FGREP -c '.stamp:' Makefile.in` -eq 2
+$FGREP 'zardoz.c' Makefile.in
+$FGREP 'zardoz-foo.c' Makefile.in
+$FGREP 'zardoz-bar.c' Makefile.in
+
+grep '\$(VALAC).* \$(AM_VALAFLAGS) \$(VALAFLAGS) ' sub/Makefile.in
+$FGREP 'foo_VALAFLAGS' sub/Makefile.in && Exit 1
+$FGREP 'am_foo_OBJECTS' sub/Makefile.in
+$FGREP 'bar.c' sub/Makefile.in
+$FGREP 'baz.c' sub/Makefile.in
+$FGREP 'foo_vala.stamp:' sub/Makefile.in
+test `$FGREP -c '.stamp:' sub/Makefile.in` -eq 1
+
+# Check against regression for weird bug due to unescaped '@'
+# characters used in a "..." perl string when writing the vala
+# rules from automake.in.
+grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
+
+:
diff --git a/t/vala2.sh b/t/vala2.sh
new file mode 100755
index 0000000..cf52c50
--- /dev/null
+++ b/t/vala2.sh
@@ -0,0 +1,110 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure compiling Vala code really works with recursive make.
+
+required="pkg-config valac gcc GNUmake"
+. ./defs || Exit 1
+
+mkdir src
+
+cat >> 'configure.ac' << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.0])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+AC_CONFIG_FILES([src/Makefile])
+AC_OUTPUT
+END
+
+cat > 'Makefile.am' <<'END'
+SUBDIRS = src
+END
+
+cat > 'src/Makefile.am' <<'END'
+bin_PROGRAMS = zardoz
+zardoz_VALAFLAGS = -H zardoz.h
+zardoz_CFLAGS = $(GOBJECT_CFLAGS)
+zardoz_LDADD = $(GOBJECT_LIBS)
+zardoz_SOURCES = zardoz.vala
+END
+
+cat > 'src/zardoz.vala' <<'END'
+using GLib;
+
+public class Zardoz {
+  public static void main () {
+    stdout.printf ("Zardoz!\n");
+  }
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
+
+./configure
+$MAKE
+
+# Test rebuild rules.
+
+rm -f src/zardoz.h
+$MAKE -C src zardoz.h
+test -f src/zardoz.h
+rm -f src/zardoz.c
+$MAKE -C src
+test -f src/zardoz.c
+
+echo am--error > src/zardoz.h
+echo am--error > src/zardoz.c
+$sleep
+touch src/zardoz.vala
+$MAKE
+grep 'am--error' src/zardoz.[ch] && Exit 1
+
+# Check the distribution.
+
+$MAKE distcheck
+$MAKE distclean
+
+# Tru a VPATH setup.
+
+mkdir build
+cd build
+../configure
+$MAKE
+$MAKE distcheck
+
+# Test rebuild rules from builddir.
+
+rm -f ../src/zardoz.h
+$MAKE -C src ../../src/zardoz.h
+test -f ../src/zardoz.h
+
+rm -f ../src/zardoz.c
+$MAKE
+grep 'Zardoz!' ../src/zardoz.c
+
+$sleep
+sed 's/Zardoz!/FooBar!/' ../src/zardoz.vala > t
+mv -f t ../src/zardoz.vala
+$MAKE
+grep 'FooBar!' ../src/zardoz.c
+grep 'Zardoz!' ../src/zardoz.c && Exit 1
+
+:
diff --git a/t/vala3.sh b/t/vala3.sh
new file mode 100755
index 0000000..220c76b
--- /dev/null
+++ b/t/vala3.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure compiling Vala code really works with non-recursive make.
+
+required="pkg-config valac gcc GNUmake"
+. ./defs || Exit 1
+
+mkdir src
+
+cat >> 'configure.ac' << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.0])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+AC_OUTPUT
+END
+
+cat > 'src/zardoz.vala' <<'END'
+using GLib;
+
+public class Zardoz {
+  public static void main () {
+    stdout.printf ("Zardoz!\n");
+  }
+}
+END
+
+cat > 'Makefile.am' <<'END'
+bin_PROGRAMS = src/zardoz
+src_zardoz_CFLAGS = $(GOBJECT_CFLAGS)
+src_zardoz_LDADD = $(GOBJECT_LIBS)
+src_zardoz_SOURCES = src/zardoz.vala
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
+
+./configure
+$MAKE
+test -f src/zardoz.c
+test -f src_zardoz_vala.stamp
+$MAKE distcheck
+$MAKE maintainer-clean
+test ! -f src/zardoz.c
+test ! -f src_zardoz_vala.stamp
+
+mkdir build
+cd build
+../configure
+$MAKE
+$MAKE distcheck
+
+cd ..
+rm -rf build
+
+# Try again with subdir-objects.
+
+cat > 'Makefile.am' <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+
+bin_PROGRAMS = src/zardoz
+src_zardoz_CFLAGS = $(GOBJECT_CFLAGS)
+src_zardoz_LDADD = $(GOBJECT_LIBS)
+src_zardoz_SOURCES = src/zardoz.vala
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure || skip_ "configure failure"
+$MAKE
+$MAKE distcheck
+$MAKE distclean
+mkdir build
+cd build
+../configure
+$MAKE
+$MAKE distcheck
+
+
diff --git a/t/vala4.sh b/t/vala4.sh
new file mode 100755
index 0000000..879803f
--- /dev/null
+++ b/t/vala4.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_PROG_VALAC.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_VALAC([0.0.1])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+cat > valac << 'END'
+#! /bin/sh
+if test "x$1" = x--version; then
+  echo 1.2.3
+fi
+exit 0
+END
+chmod +x valac
+
+cwd=`pwd`
+
+# Use $cwd instead of `pwd` in the && list below to avoid a bug in
+# the way Solaris/Heirloom Sh handles 'set -e'.
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+# The "|| Exit 1" is required here even if 'set -e' is active,
+# because ./configure migt exit with status 77, and in that case
+# we want to FAIL, not to SKIP.
+./configure "VALAC=$cwd/valac" || Exit 1
+
+sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.ac >t
+mv -f t configure.ac
+$AUTOCONF --force
+st=0; ./configure "VALAC=$cwd/valac" || st=$?
+test $st -eq 77 || Exit 1
+
+sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.ac >t
+mv -f t configure.ac
+$AUTOCONF --force
+# See comments above for why "|| Exit 1" is needed.
+./configure "VALAC=$cwd/valac" || Exit 1
+
+:
diff --git a/t/vala5.sh b/t/vala5.sh
new file mode 100755
index 0000000..6ea2738
--- /dev/null
+++ b/t/vala5.sh
@@ -0,0 +1,103 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test per-target flags.
+
+required="pkg-config valac gcc GNUmake"
+. ./defs || Exit 1
+
+mkdir src
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.0])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+AC_CONFIG_FILES([src/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = src
+END
+
+cat > src/Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_CFLAGS = $(GOBJECT_CFLAGS)
+foo_LDADD = $(GOBJECT_LIBS)
+foo_SOURCES = xfoo.vala
+bar_SOURCES = xbar.vala
+bar_VALAFLAGS = -D BAR
+bar_CFLAGS = $(GOBJECT_CFLAGS)
+bar_LDADD = $(GOBJECT_LIBS)
+END
+
+cat > src/xfoo.vala <<'END'
+int main ()
+{
+  stdout.printf ("foo\n");
+  return 0;
+}
+END
+
+cat > src/xbar.vala <<'END'
+void main ()
+{
+#if BAR
+  stdout.printf ("bar\n");
+#else
+  stdout.oops_an_invalid_method ();
+#endif
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
+
+./configure
+$MAKE
+
+if cross_compiling; then :; else
+  ./src/foo
+  ./src/bar
+  test `./src/foo` = foo
+  test `./src/bar` = bar
+fi
+
+# Test clean rules.
+
+cp config.status config.sav
+
+$MAKE clean
+test -f src/xfoo.c
+test -f src/xbar.c
+
+$MAKE distclean
+test -f src/xfoo.c
+test -f src/xbar.c
+
+# Re-create Makefile.
+mv config.sav config.status
+./config.status
+
+$MAKE maintainer-clean
+test ! -f src/xfoo.c
+test ! -f src/xbar.c
+
+:
diff --git a/t/vars.sh b/t/vars.sh
new file mode 100755
index 0000000..1e3e91e
--- /dev/null
+++ b/t/vars.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test various variable definitions that include an '=' sign.
+# From Raja R Harinath.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+MY_FLAGS_1=-DABC=345
+MY_FLAGS_2= -DABC=345
+MY_FLAGS_3 =-DABC=345
+MY_FLAGS_4 = -DABC=345
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+for i in 1 2 3 4; do
+  grep "^MY_FLAGS_$i *= *-DABC=345 *$" Makefile.in
+done
+
+:
diff --git a/t/vars3.sh b/t/vars3.sh
new file mode 100755
index 0000000..246ea70
--- /dev/null
+++ b/t/vars3.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that Automake warns about variables containing spaces
+# and other non-POSIX characters.
+
+. ./defs || Exit 1
+
+cat >Makefile.am <<'EOF'
+L01 = $(shell echo *)
+L02 = $$(not an error)
+L03 = $$(this is)$${ok too}
+L04 = $(nextvariableisbad)$(addsuffix .a, $(A))
+L05 = "$(bad boy)"
+L06 = $(this:is= ok)
+L07 = ${three errors}${on this} $(long line)
+L08$(o u c h): $(wildcard *.c)
+       ${another Error}
+       echo $${ok-this is}
+L11: $(thisis) $(ok)
+       ${here}
+EOF
+
+$ACLOCAL
+# Make sure this warning is print in the 'portability' category.
+$AUTOMAKE --warnings=no-error,none,portability 2>stderr \
+  || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+
+# Lines number are printed in error message.
+# Use them to make sure errors are diagnosed against the right lines.
+
+# No error expected apart from those on these lines.
+grep -v '^Makefile\.am:[145789]:' stderr | grep . && Exit 1
+
+# Now check some individual values.
+grep ':1:.*shell echo' stderr
+grep 'nextvariableisbad' stderr && Exit 1
+grep ':4:.*addsuffix' stderr
+grep ':5:.*bad boy' stderr
+grep ':7:.*three errors' stderr
+grep ':7:.*on this' stderr
+grep ':7:.*long line' stderr
+grep ':8:.*o u c h' stderr
+grep ':8:.*wildcard' stderr
+grep ':9:.*another Error' stderr
+
+$EGREP 'ok|thisis|here' stderr && Exit 1
+
+# None of these errors be diagnosed with '-Wno-portability'.
+$AUTOMAKE -Wno-portability
+
+# Likewise if we add this in the Makefile.am
+# (although this makes some difference internally: AUTOMAKE_OPTIONS is
+# processed far later).
+echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
+$AUTOMAKE
+
+:
diff --git a/t/vartar.sh b/t/vartar.sh
new file mode 100755
index 0000000..ebac14b
--- /dev/null
+++ b/t/vartar.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Targets and macros are two different name spaces.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+install = install
+install:
+       $(install) install
+END
+
+$ACLOCAL
+$AUTOMAKE -Wno-override
+
+grep '^install = install$' Makefile.in
+
+cat > target.expected <<'EOF'
+install:
+       $(install) install
+EOF
+sed -n '/^install:/,/^ /p' Makefile.in > target.value
+diff target.expected target.value
+
+:
diff --git a/t/vartypo2.sh b/t/vartypo2.sh
new file mode 100755
index 0000000..9b52df6
--- /dev/null
+++ b/t/vartypo2.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we warn about possible variable typos when we should,
+# Libtool variant.
+
+required=libtoolize
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AM_PROG_AR
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+libfoo_la_SOURCES = unused
+nodist_libfoo_la_SOURCES = unused
+EXTRA_libfoo_la_SOURCES = unused
+libfoo_la_LIBADD = unused
+libfoo_la_DEPENDENCIES = unused
+EXTRA_libfoo_la_DEPENDENCIES = unused
+END
+
+libtoolize
+$ACLOCAL
+AUTOMAKE_fails --add-missing
+# The expected diagnostic is:
+# automake: warnings are treated as errors
+# Makefile.am:3: warning: variable `EXTRA_libfoo_la_SOURCES' is defined but no 
program or
+# Makefile.am:3: library has `libfoo_la' as canonical name (possible typo)
+# Makefile.am:1: warning: variable `libfoo_la_SOURCES' is defined but no 
program or
+# Makefile.am:1: library has `libfoo_la' as canonical name (possible typo)
+# Makefile.am:2: warning: variable `nodist_libfoo_la_SOURCES' is defined but 
no program or
+# Makefile.am:2: library has `libfoo_la' as canonical name (possible typo)
+# Makefile.am:4: warning: variable `libfoo_la_LIBADD' is defined but no 
program or
+# Makefile.am:4: library has `libfoo_la' as canonical name (possible typo)
+# Makefile.am:6: warning: variable `EXTRA_libfoo_la_DEPENDENCIES' is defined 
but no program or
+# Makefile.am:6: library has `libfoo_la' as canonical name (possible typo)
+# Makefile.am:5: warning: variable `libfoo_la_DEPENDENCIES' is defined but no 
program or
+# Makefile.am:5: library has `libfoo_la' as canonical name (possible typo)
+
+
+grep 'as canonical' stderr | grep -v ' .libfoo_la. ' && Exit 1
+test `grep 'variable.*is defined but' stderr | wc -l` = 6
+
+# If we add a global -Wnone, all warnings should disappear.
+$AUTOMAKE -Wnone
+
+# Likewise, if matching programs or libraries are defined.
+cat >>Makefile.am <<'END'
+lib_LTLIBRARIES = libfoo.la
+END
+
+$AUTOMAKE
+
+:
diff --git a/t/vartypos.sh b/t/vartypos.sh
new file mode 100755
index 0000000..eb924cc
--- /dev/null
+++ b/t/vartypos.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we warn about possible variable typos when we should.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<'END'
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+foo_SOURCES = unused
+nodist_foo_SOURCES = unused
+EXTRA_foo_SOURCES = unused
+foo_LDADD = unused
+foo_LDFLAGS = unused
+foo_DEPENDENCIES = unused
+EXTRA_foo_DEPENDENCIES = unused
+
+libfoo_a_SOURCES = unused
+nodist_libfoo_a_SOURCES = unused
+EXTRA_libfoo_a_SOURCES = unused
+libfoo_a_LIBADD = unused
+libfoo_a_DEPENDENCIES = unused
+EXTRA_libfoo_a_DEPENDENCIES = unused
+END
+
+$ACLOCAL
+AUTOMAKE_fails -Wno-extra-portability
+# The expected diagnostic is:
+# automake: warnings are treated as errors
+# Makefile.am:2: warning: variable 'nodist_foo_SOURCES' is defined but no 
program or
+# Makefile.am:2: library has 'foo' as canonical name (possible typo)
+# Makefile.am:1: warning: variable 'foo_SOURCES' is defined but no program or
+# Makefile.am:1: library has 'foo' as canonical name (possible typo)
+# Makefile.am:9: warning: variable 'libfoo_a_SOURCES' is defined but no 
program or
+# Makefile.am:9: library has 'libfoo_a' as canonical name (possible typo)
+# Makefile.am:10: warning: variable 'nodist_libfoo_a_SOURCES' is defined but 
no program or
+# Makefile.am:10: library has 'libfoo_a' as canonical name (possible typo)
+# Makefile.am:11: warning: variable 'EXTRA_libfoo_a_SOURCES' is defined but no 
program or
+# Makefile.am:11: library has 'libfoo_a' as canonical name (possible typo)
+# Makefile.am:3: warning: variable 'EXTRA_foo_SOURCES' is defined but no 
program or
+# Makefile.am:3: library has 'foo' as canonical name (possible typo)
+# Makefile.am:12: warning: variable 'libfoo_a_LIBADD' is defined but no 
program or
+# Makefile.am:12: library has 'libfoo_a' as canonical name (possible typo)
+# Makefile.am:4: warning: variable 'foo_LDADD' is defined but no program or
+# Makefile.am:4: library has 'foo' as canonical name (possible typo)
+# Makefile.am:5: warning: variable 'foo_LDFLAGS' is defined but no program or
+# Makefile.am:5: library has 'foo' as canonical name (possible typo)
+# Makefile.am:14: warning: variable 'EXTRA_libfoo_a_DEPENDENCIES' is defined 
but no program or
+# Makefile.am:14: library has 'libfoo_a' as canonical name (possible typo)
+# Makefile.am:7: warning: variable 'EXTRA_foo_DEPENDENCIES' is defined but no 
program or
+# Makefile.am:7: library has 'foo' as canonical name (possible typo)
+# Makefile.am:6: warning: variable 'foo_DEPENDENCIES' is defined but no 
program or
+# Makefile.am:6: library has 'foo' as canonical name (possible typo)
+# Makefile.am:13: warning: variable 'libfoo_a_DEPENDENCIES' is defined but no 
program or
+# Makefile.am:13: library has 'libfoo_a' as canonical name (possible typo)
+
+grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \
+  && Exit 1
+test `grep 'variable.*is defined but' stderr | wc -l` = 13
+
+# If we add a global -Wnone, all warnings should disappear.
+$AUTOMAKE -Wnone
+
+# Likewise, if matching programs or libraries are defined.
+cat >>Makefile.am <<'END'
+bin_PROGRAMS = foo
+lib_LIBRARIES = libfoo.a
+END
+
+$AUTOMAKE -Wno-extra-portability
+
+:
diff --git a/t/version.sh b/t/version.sh
new file mode 100755
index 0000000..98664e2
--- /dev/null
+++ b/t/version.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure [...] is ok in version number.  Report from Jim
+# Meyering.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE([sh-utils], [1.12o])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOMAKE --gnits
diff --git a/t/version2.sh b/t/version2.sh
new file mode 100755
index 0000000..71749f6
--- /dev/null
+++ b/t/version2.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in
+# version.  From Joel Weber.
+
+. ./defs || Exit 1
+
+cat > configure.ac << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE([sh-utils], [1.12o], [no])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+: > Makefile.am
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$ACLOCAL
+$AUTOMAKE --gnits
diff --git a/t/version3.sh b/t/version3.sh
new file mode 100755
index 0000000..2839467
--- /dev/null
+++ b/t/version3.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure version in AUTOMAKE_OPTIONS works.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = 9.9x
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'Makefile.am:1:.*Automake 9.9x' stderr
diff --git a/t/version4.sh b/t/version4.sh
new file mode 100755
index 0000000..7fa429e
--- /dev/null
+++ b/t/version4.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure we are compatible with the 1.4-p1 series.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = 1.4-p3
+END
+
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/version6.sh b/t/version6.sh
new file mode 100755
index 0000000..1c04ab4
--- /dev/null
+++ b/t/version6.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure the current version can be required.
+
+. ./defs || Exit 1
+
+amver=`$AUTOMAKE --version | sed -e 's/.* //;1q'`
+
+# Does the extracted version number seems legit?
+case $amver in
+  *[0-9].[0-9]*) ;;
+  *) fatal_ "couldn't extract version number from automake" ;;
+esac
+
+cat > Makefile.am << END
+AUTOMAKE_OPTIONS = $amver
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/version7.sh b/t/version7.sh
new file mode 100755
index 0000000..2892920
--- /dev/null
+++ b/t/version7.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for a special setup where the package's version isn't defined
+# in configure.ac.  We want GNU Make for this test (part of the test
+# is to make sure Makefile.ins get rebuilt when a m4_included file
+# changes -- we don't support this feature on non-GNU Makes).
+
+required='makeinfo tex texi2dvi'
+. ./defs || Exit 1
+
+cat >configure.ac <<END
+m4_include([version.m4])
+AC_INIT([$me], [THE_VERSION])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+echo 'm4_define([THE_VERSION], [2.718])' > version.m4
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = zardoz.texi
+
+check:
+       test -f $(srcdir)/version.m4
+END
+
+cat > zardoz.texi << 'END'
+\input texinfo
address@hidden zardoz.info
address@hidden Zardoz
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure --version | grep '2\.718'
+./configure
+$MAKE
+grep '2\.718' version.texi
+
+$sleep
+echo 'm4_define([THE_VERSION], [3.141])' > version.m4
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+./configure --version | grep '3\.141'
+grep '3\.141' version.texi
+
+:
diff --git a/t/version8.sh b/t/version8.sh
new file mode 100755
index 0000000..1e66280
--- /dev/null
+++ b/t/version8.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Calling AM_AUTOMAKE_VERSION by hand is a bug.
+
+. ./defs || Exit 1
+
+echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.ac
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 0; }
+cat stderr >&2
+$FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr
diff --git a/t/vpath.sh b/t/vpath.sh
new file mode 100755
index 0000000..4bfc9be
--- /dev/null
+++ b/t/vpath.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure VPATH can be overridden.
+# Report from Anthony Green.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+VPATH = zardoz
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+grep VPATH Makefile.in # For debugging.
+grep '^VPATH = zardoz$' Makefile.in
+grep 'address@hidden@' Makefile.in && Exit 1
+
+:
diff --git a/t/vtexi.sh b/t/vtexi.sh
new file mode 100755
index 0000000..9d1bc24
--- /dev/null
+++ b/t/vtexi.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic checks and some regressions testing on 'version.texi'
+# support for texinfo files.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = textutils.texi
+END
+
+cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
+END
+
+# Required when using Texinfo.
+: > mdate-sh
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+# Test for bug reported by Jim Meyering:
+# When I ran automake-0.29 on textutils,
+# I noticed that doc/Makefile.in had
+#   textutils.info: textutils.texi
+# instead of
+#   textutils.info: textutils.texi version.texi
+# Today this should be:
+#   $(srcdir)/textutils.info: $(srcdir)/version.texi
+# or:
+#   $(srcdir)/textutils.info: version.texi
+grep '^\$(srcdir)/textutils\.info:.*[ /]version\.texi *$' Makefile.in
+
+# Test for bug reported by Lars Hecking:
+# When running the first version of configure.ac aware automake,
+# @CONFIGURE_AC@ was not properly substituted.
+$EGREP 'stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
+$EGREP 'stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in
+
+# Check that the path to mdate-sh is correct.  Over escaping of '$'
+# etc. once led to '\$\(srcdir\)/mdate-sh'.
+# Filter out '$(srcdir)/mdate-sh'; there should be no occurrences
+# of '.../mdate-sh' left then.
+sed 's,\$(srcdir)/mdate-sh,,g' Makefile.in | grep '/mdate-sh' && Exit 1
+
+:
diff --git a/t/vtexi2.sh b/t/vtexi2.sh
new file mode 100755
index 0000000..18f1e9e
--- /dev/null
+++ b/t/vtexi2.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for bug reported by Glenn Amerine:
+#   When automake sees version.texi is being included by a texi file,
+#   version.texi gets listed as a dependency for the .info file but
+#   not the .dvi file.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = zardoz.texi
+END
+
+cat > zardoz.texi << 'END'
address@hidden zardoz
address@hidden version.texi
+END
+
+# Required when using Texinfo.
+: > mdate-sh
+: > texinfo.tex
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^zardoz\.dvi:.*[ /]version.texi' Makefile.in
+
+:
diff --git a/t/vtexi3.sh b/t/vtexi3.sh
new file mode 100755
index 0000000..9dd3e67
--- /dev/null
+++ b/t/vtexi3.sh
@@ -0,0 +1,124 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that vers*.texi files are automatically created and distributed
+# if @included into a texi source.  Also check that they correctly contain
+# the @values definitions they are advertised to.
+# See also the related test 'vtexi4.test', which does similar checks, but
+# for version.texi only, and requires makeinfo, tex and texi2dvi.
+
+. ./defs || Exit 1
+
+# We are going to override package version in AC_INIT, so we need
+# to redefine the name of the distdir as well.
+distdir=$me-7.45.3a
+
+# This should work without tex, texinfo or makeinfo.
+TEX=false TEXI2DVI=false MAKEINFO=false
+export TEX TEXI2DVI MAKEINFO
+
+cat > configure.ac << END
+AC_INIT([$me], [7.45.3a])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = foobar.texi quux.texi zardoz.texi
+.PHONY: echo-distfiles
+echo-distfiles:
+       @echo ' ' $(DISTFILES) ' '
+END
+
+cat > foobar.texi << 'END'
address@hidden foobar.info
+random text
address@hidden version.texi
+END
+
+cat > quux.texi << 'END'
address@hidden quux.info
address@hidden version-quux.texi
+random text
+END
+
+cat > zardoz.texi << 'END'
address@hidden zardoz.info
+some randome text
address@hidden vers1a_2b.texi
+more random text
+END
+
+# Required when using Texinfo.
+: > texinfo.tex
+cp "$am_scriptdir"/mdate-sh .
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+day='([1-9]|1[0-9]|2[0-9]|3[01])'
+month='(January|February|March|April|May|June|July|August|September|October|November|December)'
+year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
+date="$day $month $year"
+
+do_check ()
+{
+  # Basename of the vers*.texi file.
+  vfile=$1
+  # The $(srcdir) of the current build.
+  srcdir=$2
+  # The vers*.texi file must be created in $(srcdir).
+  $MAKE $srcdir/$vfile.texi
+  cat $srcdir/$vfile.texi
+  # EDITION and VERSION are synonyms, as per documentation.
+  grep "address@hidden EDITION 7\\.45\\.3a$" $srcdir/$vfile.texi
+  grep "address@hidden VERSION 7\\.45\\.3a$" $srcdir/$vfile.texi
+  # Check that UPDATED seems right, and that UPDATED and UPDATED-MONTH
+  # are consistent.
+  $EGREP "address@hidden UPDATED $date$" $srcdir/$vfile.texi
+  vmonth=`grep 'address@hidden UPDATED ' $srcdir/$vfile.texi | awk '{print $4, 
$5}'`
+  grep "address@hidden UPDATED-MONTH $vmonth$" $srcdir/$vfile.texi
+  # Check that the vers*.texi file is distributed according
+  # to $(DISTFILES).
+  $MAKE echo-distfiles # For debugging.
+  $MAKE -s echo-distfiles | grep "[ /]$vfile\\.texi"
+}
+
+mkdir build
+cd build
+../configure
+
+do_check version ..
+do_check version-quux ..
+do_check vers1a_2b ..
+
+# The various $(srcdir)/*.info are required for the distribution
+# and they must be newer than version.texi, so that make won't try
+# to rebuild them.
+$sleep
+touch ../foobar.info
+touch ../quux.info
+touch ../zardoz.info
+# Check that the vers*.texi files are really distributed.
+$MAKE distdir
+ls -l $distdir
+diff ../version.texi $distdir/version.texi
+diff ../version-quux.texi $distdir/version-quux.texi
+diff ../version.texi $distdir/vers1a_2b.texi
+
+:
diff --git a/t/vtexi4.sh b/t/vtexi4.sh
new file mode 100755
index 0000000..6038444
--- /dev/null
+++ b/t/vtexi4.sh
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the version.texi file is automatically created and distributed
+# if @included into a texi source.  Also check that is correctly defined
+# @values definitions it is advertised to.
+# See also the related test 'vtexi3.test', which does similar checks, but
+# for more vers*.texi files, and does not require makeinfo, tex and
+# texi2dvi.
+
+required='makeinfo tex texi2dvi-o'
+. ./defs || Exit 1
+
+case `LC_ALL=C date '+%u'` in
+  [1-7]) date_is_posix=:;;
+      *) date_is_posx=false;;
+esac
+$date_is_posix \
+  && day=`LC_ALL=C date '+%d'` && test -n "$day" \
+  && month=`LC_ALL=C date '+%B'` && test -n "$month" \
+  && year=`LC_ALL=C date '+%Y'`&& test -n "$year" \
+  || skip_ "'date' is not POSIX-compliant enough"
+day=`echo "$day" | sed 's/^0//'`
+
+(echo 'x' | grep x) \
+  || skip_ "grep doesn't work on input that is not pure text"
+
+cat > configure.ac << END
+AC_INIT([$me], [123.456])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > defs.am <<END
+my_date_rx = $day $month $year
+my_month_rx = $month $year
+my_version_rx = 123\.456
+END
+
+cat > Makefile.am << 'END'
+include defs.am
+info_TEXINFOS = foo.texi
+test-grepinfo:
+## Not useless uses of cat: we only tested that grep worked on
+## non-text input when that's given from a pipe.
+       cat $(srcdir)/foo.info | grep 'GREPVERSION=$(my_version_rx)='
+       cat $(srcdir)/foo.info | grep 'GREPEDITION=$(my_version_rx)='
+       cat $(srcdir)/foo.info | grep 'GREPDATE=$(my_date_rx)='
+       cat $(srcdir)/foo.info | grep 'GREPMONTH=$(my_month_rx)='
+test-distfiles:
+       @echo DISTFILES = $(DISTFILES)
+       echo ' ' $(DISTFILES) ' ' | grep '[ /]version.texi '
+test-distdir: distdir
+       ls -l $(distdir)
+       diff $(srcdir)/version.texi $(distdir)/version.texi
+.PHONY: test-grepinfo test-distfiles test-distdir
+check-local: test-grepinfo test-distfiles test-distdir
+END
+
+cat > foo.texi << 'END'
+\input texinfo
address@hidden %**start of header
address@hidden foo.info
address@hidden Zardoz
address@hidden %**end of header
+
address@hidden Top
address@hidden version.texi
+
address@hidden
+
address@hidden
+
address@hidden
+
address@hidden
+
address@hidden
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE all dvi
+
+# Debugging & sanity checks.
+ls -l
+cat version.texi
+cat foo.info
+test -f foo.dvi
+
+$MAKE test-grepinfo
+$MAKE test-distfiles
+$MAKE test-distdir
+$MAKE distcheck
+
+:
diff --git a/t/warning-groups-win-over-strictness.sh 
b/t/warning-groups-win-over-strictness.sh
new file mode 100755
index 0000000..3d3885d
--- /dev/null
+++ b/t/warning-groups-win-over-strictness.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that explicitly-defined warning levels take precedence over
+# implicit strictness-implied warnings, even when these explicit warning
+# levels are "catch-all warnings" (such as '-Wall' and '-Wnone').
+# Since we are at it, also throw in *.am and *.m4 file inclusions.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+# Files required in gnu and/or gnits strictness.
+touch README INSTALL NEWS AUTHORS ChangeLog COPYING THANKS
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+m4_include([am-init-automake.m4])
+AC_PROG_CC
+AC_CONFIG_FILES([Makefile])
+# Other similar tests do not use AC_OUTPUT, so we use it here,
+# for completeness and for better coverage.
+AC_OUTPUT
+END
+
+cat > Makefile.am <<END
+include automake-options.am
+FOO := bar
+END
+
+rm -rf autom4te*.cache
+: > automake-options.am
+echo 'AM_INIT_AUTOMAKE' > am-init-automake.m4
+$ACLOCAL
+AUTOMAKE_fails -Werror -Wall --foreign
+grep '^Makefile\.am:.*:=.*not portable' stderr
+
+rm -rf autom4te*.cache
+: > automake-options.am
+echo 'AM_INIT_AUTOMAKE([-Werror -Wnone gnu])' > am-init-automake.m4
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+echo 'AUTOMAKE_OPTIONS = -Werror -Wnone gnits' > automake-options.am
+echo 'AM_INIT_AUTOMAKE' > am-init-automake.m4
+$ACLOCAL
+$AUTOMAKE
+
+:
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
new file mode 100755
index 0000000..9f973c6
--- /dev/null
+++ b/t/warnings-override.sh
@@ -0,0 +1,111 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The warnings specified in Makefile.am:AUTOMAKE_OPTIONS should override
+# those specified in configure.ac:AM_INIT_AUTOMAKE, and both should
+# override the warnings specified on the command line.
+# NOTE: the current semantics might not be the best one (even if it has
+# been in place for quite a long time); see also Automake bug #7673.
+# Update this test if the semantics are changed.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
+
+cat > Makefile.am <<'END'
+FOO := bar
+AUTOMAKE_OPTIONS =
+END
+
+set_warnings ()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+ok ()
+{
+  $AUTOMAKE $*
+}
+
+ko ()
+{
+  AUTOMAKE_fails $*
+  grep '^Makefile\.am:1:.*:=.*not portable' stderr
+}
+
+$ACLOCAL
+
+# Files required in gnu strictness.
+touch README INSTALL NEWS AUTHORS ChangeLog COPYING
+
+rm -rf autom4te*.cache
+set_warnings '-Wno-portability' Makefile.am
+set_warnings '' configure.ac
+
+ok -Wportability
+ok
+
+rm -rf autom4te*.cache
+set_warnings '' Makefile.am
+set_warnings '-Wno-portability' configure.ac
+
+ok -Wportability
+ok
+
+rm -rf autom4te*.cache
+set_warnings '-Wno-portability' Makefile.am
+set_warnings '-Wno-portability' configure.ac
+
+ok -Wportability
+
+rm -rf autom4te*.cache
+set_warnings '-Wportability' Makefile.am
+set_warnings '' configure.ac
+
+ko
+ko -Wno-portability
+
+rm -rf autom4te*.cache
+set_warnings '' Makefile.am
+set_warnings '-Wportability' configure.ac
+
+ko
+ko -Wno-portability
+
+rm -rf autom4te*.cache
+set_warnings '-Wportability' Makefile.am
+set_warnings '-Wportability' configure.ac
+ko -Wno-portability
+
+rm -rf autom4te*.cache
+set_warnings '-Wno-portability' Makefile.am
+set_warnings '-Wportability' configure.ac
+ok
+ok -Wportability
+
+rm -rf autom4te*.cache
+set_warnings '-Wportability' Makefile.am
+set_warnings '-Wno-portability' configure.ac
+ko
+ko -Wno-portability
+
+:
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
new file mode 100755
index 0000000..a588670
--- /dev/null
+++ b/t/warnings-precedence.sh
@@ -0,0 +1,77 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# On the command line, in AM_INIT_AUTOMAKE, and in AUTOMAKE_OPTIONS,
+# warnings specified later should take precedence over those specified
+# earlier.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
+
+cat > Makefile.am <<'END'
+FOO := bar
+AUTOMAKE_OPTIONS =
+END
+
+set_warnings ()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+ok ()
+{
+  $AUTOMAKE $*
+}
+
+ko ()
+{
+  AUTOMAKE_fails $*
+  grep '^Makefile\.am:1:.*:=.*not portable' stderr
+}
+
+# Files required in gnu strictness.
+touch README INSTALL NEWS AUTHORS ChangeLog COPYING
+
+$ACLOCAL
+ok -Wportability -Wno-portability
+ko -Wno-portability -Wportability
+
+set_warnings '' Makefile.am
+set_warnings '-Wportability -Wno-portability' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+ok
+set_warnings '-Wno-portability -Wportability' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+ko
+
+set_warnings '' configure.ac
+rm -rf autom4te*.cache
+$ACLOCAL
+set_warnings '-Wportability -Wno-portability' Makefile.am
+ok
+set_warnings '-Wno-portability -Wportability' Makefile.am
+ko
+
+:
diff --git a/t/warnings-strictness-interactions.sh 
b/t/warnings-strictness-interactions.sh
new file mode 100755
index 0000000..774fd3a
--- /dev/null
+++ b/t/warnings-strictness-interactions.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the default warnings triggered by a strictness specified
+# in AUTOMAKE_OPTIONS take precedence over explicit warnings given in
+# AM_INIT_AUTOMAKE.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE -Werror"
+
+cat > Makefile.am <<END
+AUTOMAKE_OPTIONS =
+FOO := bar
+END
+
+set_am_opts ()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+set_am_opts '-Wportability' configure.ac
+set_am_opts 'foreign' Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+rm -rf autom4te*.cache
+
+# Files required in gnu strictness.
+touch README INSTALL NEWS AUTHORS ChangeLog COPYING
+
+set_am_opts '-Wno-portability' configure.ac
+set_am_opts 'gnu' Makefile.am
+
+AUTOMAKE_fails
+$ACLOCAL
+grep '^Makefile\.am:2:.*:=.*not portable' stderr
+
+:
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
new file mode 100755
index 0000000..4d64059
--- /dev/null
+++ b/t/warnings-unknown.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake complains about unknown warnings.
+
+. ./defs || Exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+cat > configure.ac <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([-Wno-zardoz])
+AC_CONFIG_FILES([Makefile])
+END
+
+cat > Makefile.am <<END
+AUTOMAKE_OPTIONS = -Wfoobar
+END
+
+$ACLOCAL
+
+AUTOMAKE_fails -Wbazquux
+# FIXME: we could get rid of this once we improve our wrapper scripts.
+sed "s/^automake:/automake-$APIVERSION:/" stderr > t
+mv -f t stderr
+cat stderr >&2
+grep '^configure\.ac:2:.* unknown warning category.*zardoz' stderr
+grep '^Makefile\.am:1:.* unknown warning category.*foobar' stderr
+grep "^automake-$APIVERSION:.* unknown warning category.*bazquux" stderr
+
+# Check that we can override warnings about unknown warning categories.
+$AUTOMAKE -Wno-unsupported -Wbazquux
+
+:
diff --git a/t/warnings-win-over-strictness.sh 
b/t/warnings-win-over-strictness.sh
new file mode 100755
index 0000000..5d47f50
--- /dev/null
+++ b/t/warnings-win-over-strictness.sh
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that, on the command line, explicitly-defined warnings take
+# precedence over implicit strictness-implied warnings.
+
+. ./defs || Exit 1
+
+# We want complete control over automake options.
+AUTOMAKE=$am_original_AUTOMAKE
+
+ok ()
+{
+  AUTOMAKE_run $*
+  test ! -s stderr
+}
+
+ko ()
+{
+  AUTOMAKE_run $*
+  grep '^Makefile\.am:.*:=.*not portable' stderr
+  test `wc -l <stderr` -eq 1
+}
+
+set_am_opts()
+{
+  set +x
+  sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
+                -e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
+  mv -f $2-t $2
+  set -x
+  cat $2
+}
+
+# Files required in gnu strictness.
+touch README INSTALL NEWS AUTHORS ChangeLog COPYING
+
+cat > Makefile.am <<END
+AUTOMAKE_OPTIONS =
+FOO := bar
+END
+
+$ACLOCAL
+
+ko --foreign -Wportability
+ko -Wportability --foreign
+ok --gnu -Wno-portability
+ok -Wno-portability --gnu
+
+set_am_opts '' Makefile.am
+
+rm -rf autom4te*.cache
+set_am_opts 'foreign -Wportability' configure.ac
+ko
+rm -rf autom4te*.cache
+set_am_opts '-Wportability foreign' configure.ac
+ko
+rm -rf autom4te*.cache
+set_am_opts 'gnu -Wno-portability' configure.ac
+ok
+rm -rf autom4te*.cache
+set_am_opts '-Wno-portability gnu' configure.ac
+ok
+
+rm -rf autom4te*.cache
+set_am_opts '' configure.ac
+
+set_am_opts 'foreign -Wportability' Makefile.am
+ko
+set_am_opts '-Wportability foreign' Makefile.am
+ko
+set_am_opts 'gnu -Wno-portability' Makefile.am
+ok
+set_am_opts '-Wno-portability gnu' Makefile.am
+ok
+
+:
diff --git a/t/warnopts.sh b/t/warnopts.sh
new file mode 100755
index 0000000..1662d91
--- /dev/null
+++ b/t/warnopts.sh
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that we can enable or disable warnings on a per-file basis.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+
+# These two Makefile contain the same errors, but have different
+# warnings disabled.
+
+cat >Makefile.am <<END
+AUTOMAKE_OPTIONS = -Wno-obsolete
+INCLUDES = -Ifoo
+foo_SOURCES = unused
+SUBDIRS = sub
+END
+
+cat >sub/Makefile.am <<END
+AUTOMAKE_OPTIONS = -Wno-syntax
+INCLUDES = -Ifoo
+foo_SOURCES = unused
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+# The expected diagnostic is
+#   Makefile.am:3: warning: variable 'foo_SOURCES' is defined but no program or
+#                           library has 'foo' as canonical name (possible typo)
+#   sub/Makefile.am:2: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS'
+grep '^Makefile.am:.*foo_SOURCES' stderr
+grep '^sub/Makefile.am:.*INCLUDES' stderr
+grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1
+grep '^Makefile.am:.*INCLUDES' stderr && Exit 1
+# Only three lines of warnings.
+test `grep -v 'warnings are treated as errors' stderr | wc -l` = 3
+
+# On fast machines the autom4te.cache created during the above run of
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
+# used.  We could do '$sleep', but it's faster to erase the
+# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
+# bogus installations of Autoconf use a versioned cache).
+rm -rf autom4te*.cache
+
+# If we add a global -Wnone, all warnings should disappear.
+cat >configure.ac <<END
+AC_INIT([warnopts], [1.0])
+AM_INIT_AUTOMAKE([-Wnone])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+$ACLOCAL
+$AUTOMAKE
diff --git a/t/werror.sh b/t/werror.sh
new file mode 100755
index 0000000..606fed6
--- /dev/null
+++ b/t/werror.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure -Werror and --add-missing work together.
+
+. ./defs || Exit 1
+
+: > Makefile.am
+
+rm -f install-sh depcomp missing mkinstalldirs
+
+$ACLOCAL
+$AUTOMAKE -Werror --add-missing
diff --git a/t/werror2.sh b/t/werror2.sh
new file mode 100755
index 0000000..67e0e01
--- /dev/null
+++ b/t/werror2.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure that Makefile.in is not overwritten on error.  Otherwise
+# although the rebuilding rules would fail on error, they would
+# succeed if make is run a second time immediately afterwards.
+# Report from Harlan Stenn.
+
+. ./defs || Exit 1
+
+echo AC_OUTPUT>>configure.ac
+
+: > Makefile.am
+
+$ACLOCAL
+# Create Makefile.in before configure.  configure ensures files
+# generated by it or later are newer than configure, so this allows
+# us to avoid a $sleep before updating Makefile.am below.
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE
+
+cat >Makefile.am <<END
+AUTOMAKE_OPTIONS = -Werror
+INCLUDES = -Ifoo
+foo_SOURCES = unused
+END
+
+# This repetition is deliberate; see heading comments.
+$MAKE && Exit 1
+$MAKE && Exit 1
+
+:
diff --git a/t/werror3.sh b/t/werror3.sh
new file mode 100755
index 0000000..b5e35e3
--- /dev/null
+++ b/t/werror3.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure a per-Makefile.am -Werror setting is not carried over
+# to another Makefile.am.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<\END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+cat >sub/Makefile.am <<\END
+AUTOMAKE_OPTIONS = -Werror
+END
+cat >Makefile.am <<\END
+VAR = foo
+VAR = bar
+END
+
+$ACLOCAL
+
+# The issue would not manifest with threaded execution.
+unset AUTOMAKE_JOBS || :
+AUTOMAKE_run -Wno-error
+grep 'VAR multiply defined' stderr
+
+AUTOMAKE_JOBS=2
+export AUTOMAKE_JOBS
+AUTOMAKE_run -Wno-error
+grep 'VAR multiply defined' stderr
+
+:
diff --git a/t/werror4.sh b/t/werror4.sh
new file mode 100755
index 0000000..b2f3f6a
--- /dev/null
+++ b/t/werror4.sh
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# -Werror and local -Werror settings should be flagged for the user.
+
+. ./defs || Exit 1
+
+cat >>configure.ac <<\END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+cat >sub/Makefile.am <<\END
+AUTOMAKE_OPTIONS = -Werror
+SUB = foo
+SUB = bar
+END
+cat >Makefile.am <<\END
+AUTOMAKE_OPTIONS = -Werror
+VAR = foo
+VAR = bar
+END
+
+$ACLOCAL
+
+AUTOMAKE_fails -Wno-error
+grep 'VAR multiply defined' stderr
+grep 'SUB multiply defined' stderr
+test `grep -c 'warnings are treated as errors' stderr` -eq 1
+
+sed '/AUTOMAKE_OPTIONS/d' sub/Makefile.am > t
+mv -f t sub/Makefile.am
+
+AUTOMAKE_fails -Wno-error
+grep 'VAR multiply defined' stderr
+grep 'SUB multiply defined' stderr
+test `grep -c 'warnings are treated as errors' stderr` -eq 1
+
+sed '/AUTOMAKE_OPTIONS/d' Makefile.am > t
+mv -f t Makefile.am
+
+AUTOMAKE_fails -Werror
+grep 'VAR multiply defined' stderr
+grep 'SUB multiply defined' stderr
+test `grep -c 'warnings are treated as errors' stderr` -eq 1
+
+AUTOMAKE_run -Wno-error
+grep 'VAR multiply defined' stderr
+grep 'SUB multiply defined' stderr
+grep 'warnings are treated as errors' stderr && Exit 1
+
+:
diff --git a/t/whoami.sh b/t/whoami.sh
new file mode 100755
index 0000000..72153ca
--- /dev/null
+++ b/t/whoami.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure aclocal doesn't barf on "WHO_AM_I=...".  Report
+# from Johan Danielsson (and a very nice bug report, too, I might
+# add).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+WHO_AM_I=17
+END
+
+$ACLOCAL
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
new file mode 100644
index 0000000..18ee13a
--- /dev/null
+++ b/t/wrap/aclocal.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+# @configure_input@
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+fi
+
+perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
+export perllibdir
+
+exec "@abs_top_builddir@/aclocal" "address@hidden@/m4" \
+     "address@hidden@/m4/acdir" ${1+"$@"}
diff --git a/t/wrap/automake.in b/t/wrap/automake.in
new file mode 100644
index 0000000..14f437f
--- /dev/null
+++ b/t/wrap/automake.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+# @configure_input@
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+fi
+
+perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
+export perllibdir
+exec "@abs_top_builddir@/automake" "address@hidden@/lib" ${1+"$@"}
diff --git a/t/xsource.sh b/t/xsource.sh
new file mode 100755
index 0000000..5f89dc9
--- /dev/null
+++ b/t/xsource.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure multiple source files with the same object
+# file causes error.
+
+. ./defs || Exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = z.c x/z.c
+END
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+END
+
+mkdir x
+
+: > z.c
+: > x/z.c
+
+$ACLOCAL
+AUTOMAKE_fails
+$FGREP 'z.$(OBJEXT)' stderr
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
new file mode 100755
index 0000000..1b494e8
--- /dev/null
+++ b/t/yacc-auxdir.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure ylwrap is put in right location.
+# Report from Tim Van Holder.
+
+. ./defs || Exit 1
+
+mkdir aux1 sub
+
+cat > configure.ac << END
+AC_INIT([$me], [1.0])
+# 'aux' is not an acceptable file/directory name on Windows systems
+AC_CONFIG_AUX_DIR([aux1])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_PROG_CC
+AC_PROG_YACC
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y
+END
+
+cat > sub/Makefile.am << 'END'
+bin_PROGRAMS = bar
+AM_YFLAGS = -d
+bar_SOURCES = bar.y main.c
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+test -f aux1/ylwrap
+test ! -f ylwrap
+test ! -f sub/ylwrap
+grep -i 'ylwrap' Makefile.in sub/Makefile.in # For debugging.
+$FGREP '$(top_srcdir)/aux1/ylwrap' Makefile.in
+$FGREP '$(top_srcdir)/aux1/ylwrap' sub/Makefile.in
+
+:
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
new file mode 100755
index 0000000..d2fd490
--- /dev/null
+++ b/t/yacc-basic.sh
@@ -0,0 +1,108 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic semantic checks on Yacc support (without yacc-generated headers).
+# Keep in sync with sister test 'yacc-cxx.test'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = parse.y foo.c
+bar_SOURCES = $(foo_SOURCES)
+bar_YFLAGS = -v
+
+.PHONY: echo-distcom
+echo-distcom:
+       @echo ' ' $(DIST_COMMON) ' '
+END
+
+cat > parse.y << 'END'
+%{
+#include <stdio.h>
+#include <stdlib.h>
+int yylex () { return getchar (); }
+void yyerror (char *s) {}
+%}
+%%
+a : 'a' { exit(0); };
+END
+
+cat > foo.c << 'END'
+int main () { yyparse (); return 1; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+ls -l
+# The Yacc-derived C sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
+test -f parse.c
+test -f bar-parse.c
+# Check that per-object flags are honored.
+test -f bar-parse.output
+
+if cross_compiling; then :; else
+  echo a | ./foo
+  echo b | ./foo && Exit 1
+  echo a | ./bar
+  echo b | ./bar && Exit 1
+  : For shells with busted 'set -e'.
+fi
+
+# The Yacc-derived C sources must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse\.c '
+$MAKE -s echo-distcom | grep '[ /]bar-parse\.c '
+$MAKE distdir
+ls -l $distdir
+test -f $distdir/parse.c
+test -f $distdir/bar-parse.c
+
+# Sanity check on distribution.
+# Note that, for this to succeed, bar-parse.output must either not
+# be distributed, or properly cleaned by automake-generated rules.
+# We don't want to set the exact semantics yet, but want to ensure
+# they are are consistent.
+yl_distcheck
+
+# Make sure that the Yacc-derived C sources are erased by
+# maintainer-clean, and not by distclean.
+test -f parse.c
+test -f bar-parse.c
+$MAKE distclean
+ls -l
+test -f parse.c
+test -f bar-parse.c
+./configure # We must re-create 'Makefile'.
+$MAKE maintainer-clean
+ls -l
+test ! -f parse.c
+test ! -f bar-parse.c
+
+:
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
new file mode 100755
index 0000000..30f2543
--- /dev/null
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure bison + bison's C++ skeleton + C++ works.
+# For Automake bug#7648 and PR automake/491.
+
+required=bison
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.yy foo.cc
+
+# This is required even with %defines in zardoz.yy.
+AM_YFLAGS = -d
+
+BUILT_SOURCES = zardoz.hh
+EXTRA_DIST = stack.hh location.hh position.hh
+END
+
+cat > zardoz.yy << 'END'
+%skeleton "lalr1.cc"
+%defines
+
+%{
+#define YYSTYPE int
+int yylex(YYSTYPE* yylval_param);
+%}
+
+%%
+start :        /* empty */
+%%
+
+int
+yylex(YYSTYPE*)
+{
+    return 0;
+}
+
+void
+yy::parser::error(const yy::parser::location_type&, const std::string& m)
+{
+    return;
+}
+END
+
+cat > foo.cc << 'END'
+#include "zardoz.hh"
+
+using namespace std;
+
+int
+main(int argc, char** argv)
+{
+  yy::parser my_parser;
+  return my_parser.parse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try a VPATH build first.
+mkdir build
+cd build
+../configure YACC='bison -y'
+$MAKE
+cd ..
+
+# Now try an in-tree build.
+./configure YACC='bison -y'
+$MAKE
+
+# Check that distribution is self-contained, and do not require
+# bison to be built.
+env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+
+:
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
new file mode 100755
index 0000000..b341401
--- /dev/null
+++ b/t/yacc-bison-skeleton.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure bison + bison's skeleton works.
+# For Automake bug#7648 and PR automake/491.
+
+required=bison
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.y foo.c
+AM_YFLAGS = -d --skeleton glr.c
+END
+
+# Parser.
+cat > zardoz.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (const char *s) { return; }
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cat > foo.c << 'END'
+#include "zardoz.h"
+int main (void)
+{
+  return yyparse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try a VPATH build first.
+mkdir build
+cd build
+../configure YACC='bison -y'
+$MAKE
+cd ..
+
+# Now try an in-tree build.
+./configure YACC='bison -y'
+$MAKE
+
+# Check that distribution is self-contained, and do not require
+# bison to be built.
+env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+
+:
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
new file mode 100755
index 0000000..ea21bff
--- /dev/null
+++ b/t/yacc-clean-cxx.sh
@@ -0,0 +1,163 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that C++ source and header files derived from non-distributed
+# Yacc sources are cleaned by "make clean", while C++ source and
+# header files derived from distributed Yacc sources are cleaned by
+# "make maintainer-clean".
+# See also sister test 'yacc-clean.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# Use two subdirectories, one to test with '-d' in YFLAGS, the
+# other one to test with empty YFLAGS.
+SUBDIRS = sub1 sub2
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = mainfoo.cc parsefoo.yxx
+
+bar_SOURCES = mainbar.cpp parsebar.yy
+bar_YFLAGS = $(AM_YFLAGS)
+
+baz_SOURCES = mainbaz.c++
+nodist_baz_SOURCES = parsebaz.y++
+
+qux_SOURCES = mainqux.cxx
+nodist_qux_SOURCES = parsequx.ypp
+qux_YFLAGS = $(AM_YFLAGS)
+
+parsebaz.y++ parsequx.ypp:
+       cp $(srcdir)/parsefoo.yxx $@
+
+CLEANFILES = parsebaz.y++ parsequx.ypp
+END
+
+cat > sub2/Makefile.am << 'END'
+include $(top_srcdir)/sub1/Makefile.am
+AM_YFLAGS = -d
+END
+
+cat > sub1/parsefoo.yxx << 'END'
+%{
+// This file should contain valid C++ but invalid C.
+#include <cstdio>
+int yylex (void) { return (getchar ()); }
+void yyerror (const char *s) { return; }
+%}
+%%
+x : 'x' { };
+END
+cp sub1/parsefoo.yxx sub1/parsebar.yy
+cp sub1/parsefoo.yxx sub2/parsefoo.yxx
+cp sub1/parsefoo.yxx sub2/parsebar.yy
+
+cat > sub1/mainfoo.cc << 'END'
+// This file should contain valid C++ but invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+  extern int yyparse (void);
+  return yyparse ();
+}
+END
+cp sub1/mainfoo.cc sub1/mainbar.cpp
+cp sub1/mainfoo.cc sub1/mainbaz.c++
+cp sub1/mainfoo.cc sub1/mainqux.cxx
+cp sub1/main???.c* sub2
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l . sub1 sub2
+# Sanity checks.
+test -f sub1/parsefoo.cxx
+test -f sub1/bar-parsebar.cc
+test -f sub1/parsebaz.y++
+test -f sub1/parsebaz.c++
+test -f sub1/parsequx.ypp
+test -f sub1/qux-parsequx.cpp
+test -f sub2/parsefoo.cxx
+test -f sub2/parsefoo.hxx
+test -f sub2/bar-parsebar.cc
+test -f sub2/bar-parsebar.hh
+test -f sub2/parsebaz.y++
+test -f sub2/parsebaz.c++
+test -f sub2/parsebaz.h++
+test -f sub2/parsequx.ypp
+test -f sub2/qux-parsequx.cpp
+test -f sub2/qux-parsequx.hpp
+
+for target in clean distclean; do
+  $MAKE $target
+  ls -l . sub1 sub2
+  test -f sub1/parsefoo.cxx
+  test -f sub1/bar-parsebar.cc
+  test ! -r sub1/parsebaz.y++
+  test ! -r sub1/parsebaz.c++
+  test ! -r sub1/parsequx.ypp
+  test ! -r sub1/qux-parsequx.cpp
+  test -f sub2/parsefoo.cxx
+  test -f sub2/parsefoo.hxx
+  test -f sub2/bar-parsebar.cc
+  test -f sub2/bar-parsebar.hh
+  test ! -r sub2/parsebaz.y++
+  test ! -r sub2/parsebaz.c++
+  test ! -r sub2/parsebaz.h++
+  test ! -r sub2/parsequx.ypp
+  test ! -r sub2/qux-parsequx.cpp
+  test ! -r sub2/qux-parsequx.hpp
+done
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+$MAKE maintainer-clean
+ls -l . sub1 sub2
+test -f sub1/parsefoo.yxx
+test -f sub1/parsebar.yy
+test ! -r sub1/parsefoo.cxx
+test ! -r sub1/bar-parsebar.cc
+test -f sub2/parsefoo.yxx
+test -f sub2/parsebar.yy
+test ! -r sub2/parsefoo.cxx
+test ! -r sub2/parsefoo.hxx
+test ! -r sub2/bar-parsebar.cc
+test ! -r sub2/bar-parsebar.hh
+
+cp config.sav config.status
+./config.status # re-create Makefile
+
+:
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
new file mode 100755
index 0000000..530f87f
--- /dev/null
+++ b/t/yacc-clean.sh
@@ -0,0 +1,147 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that .c and .h files derived from non-distributed .y sources
+# are cleaned by "make clean", while .c and .h files derived from
+# distributed .y sources are cleaned by "make maintainer-clean".
+# See also sister test 'yacc-cxx-clean.test'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+# Use two subdirectories, one to test with '-d' in YFLAGS, the
+# other one to test with empty YFLAGS.
+SUBDIRS = sub1 sub2
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+
+foo_SOURCES = main.c parse.y
+
+bar_SOURCES = main.c parse.y
+bar_YFLAGS = $(AM_YFLAGS)
+
+baz_SOURCES = main.c
+nodist_baz_SOURCES = baz.y
+
+qux_SOURCES = main.c
+nodist_qux_SOURCES = baz.y
+qux_YFLAGS = $(AM_YFLAGS)
+
+baz.y:
+       cp $(srcdir)/parse.y $@
+
+CLEANFILES = baz.y
+END
+
+cat > sub2/Makefile.am << 'END'
+include $(top_srcdir)/sub1/Makefile.am
+AM_YFLAGS = -d
+END
+
+cat > sub1/parse.y << 'END'
+%{
+int yylex () { return (getchar ()); }
+void yyerror (char *s) {}
+%}
+%%
+x : 'x' { };
+END
+cp sub1/parse.y sub2/parse.y
+
+cat > sub1/main.c << 'END'
+int main ()
+{
+  return yyparse ();
+}
+END
+cp sub1/main.c sub2/main.c
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+cp config.status config.sav
+
+$MAKE
+ls -l . sub1 sub2
+# Sanity checks.
+test -f sub1/parse.y
+test -f sub1/parse.c
+test -f sub1/bar-parse.c
+test -f sub1/baz.y
+test -f sub1/baz.c
+test -f sub1/qux-baz.c
+test -f sub2/parse.y
+test -f sub2/parse.c
+test -f sub2/parse.h
+test -f sub2/bar-parse.c
+test -f sub2/bar-parse.h
+test -f sub2/baz.y
+test -f sub2/baz.c
+test -f sub2/baz.h
+test -f sub2/qux-baz.c
+test -f sub2/qux-baz.h
+
+for target in clean distclean; do
+  $MAKE $target
+  ls -l . sub1 sub2
+  test -f sub1/parse.y
+  test -f sub1/parse.c
+  test -f sub1/bar-parse.c
+  test ! -r sub1/baz.y
+  test ! -r sub1/baz.c
+  test ! -r sub1/qux-baz.c
+  test -f sub2/parse.y
+  test -f sub2/parse.c
+  test -f sub2/parse.h
+  test -f sub2/bar-parse.c
+  test -f sub2/bar-parse.h
+  test ! -r sub2/baz.y
+  test ! -r sub2/baz.c
+  test ! -r sub2/baz.h
+  test ! -r sub2/qux-baz.c
+  test ! -r sub2/qux-baz.h
+done
+
+cp config.sav config.status
+./config.status # Re-create 'Makefile'.
+
+$MAKE maintainer-clean
+ls -l . sub1 sub2
+test -f sub1/parse.y
+test ! -r sub1/parse.c
+test ! -r sub1/bar-parse.c
+test -f sub2/parse.y
+test ! -r sub2/parse.c
+test ! -r sub2/parse.h
+test ! -r sub2/bar-parse.c
+test ! -r sub2/bar-parse.h
+
+:
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
new file mode 100755
index 0000000..2af22ee
--- /dev/null
+++ b/t/yacc-cxx.sh
@@ -0,0 +1,139 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Basic semantic checks on Yacc + C++ support (when yacc-generated
+# headers are not involved).
+# Keep in sync with sister test 'yacc-basic.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo1 foo2 foo3 foo4
+foo1_SOURCES = parse1.yy  foo.cc
+foo2_SOURCES = parse2.y++ bar.c++
+foo3_SOURCES = parse3.yxx foo.cc
+foo4_SOURCES = parse4.ypp bar2.cxx
+foo3_YFLAGS = -v
+foo4_YFLAGS = $(foo3_YFLAGS)
+
+.PHONY: echo-distcom
+echo-distcom:
+       @echo ' ' $(DIST_COMMON) ' '
+END
+
+cat > parse1.yy << 'END'
+%{
+// Valid C++, but deliberately invalid C.
+#include <cstdio>
+#include <cstdlib>
+int yylex (void) { return getchar (); }
+void yyerror (const char *s) { return; }
+%}
+%%
+a : 'a' { exit(0); };
+END
+cp parse1.yy parse2.y++
+cp parse1.yy parse3.yxx
+cp parse1.yy parse4.ypp
+
+cat > foo.cc << 'END'
+// Valid C++, but deliberately invalid C.
+using namespace std;
+int main (int argc, char **argv)
+{
+  int yyparse (void);
+  yyparse ();
+  return 1;
+}
+END
+cp foo.cc bar.c++
+cp foo.cc bar2.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE
+
+# The Yacc-derived C++ sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+# Check that per-object flags are honored.
+test -f foo3-parse3.output
+test -f foo4-parse4.output
+
+if cross_compiling; then :; else
+  for i in 1 2 3 4; do
+    echo a | ./foo$i
+    echo b | ./foo$i && Exit 1
+    : For shells with busted 'set -e'.
+  done
+fi
+
+# The Yacc-derived C++ sources must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse1\.cc '
+$MAKE -s echo-distcom | grep '[ /]parse2\.c++ '
+$MAKE -s echo-distcom | grep '[ /]foo3-parse3\.cxx '
+$MAKE -s echo-distcom | grep '[ /]foo4-parse4\.cpp '
+$MAKE distdir
+ls -l $distdir
+test -f $distdir/parse1.cc
+test -f $distdir/parse2.c++
+test -f $distdir/foo3-parse3.cxx
+test -f $distdir/foo4-parse4.cpp
+
+# Sanity check on distribution.
+# Note that, for this to succeed, foo3-parse3.output and foo4-parse4.output
+# must either not be distributed, or properly cleaned by automake-generated
+# rules.  We don't want to set the exact semantics yet, but want to ensure
+# they are are consistent.
+yl_distcheck
+
+# Make sure that the Yacc-derived C++ sources are erased by
+# maintainer-clean, and not by distclean.
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+$MAKE distclean
+ls -l
+test -f parse1.cc
+test -f parse2.c++
+test -f foo3-parse3.cxx
+test -f foo4-parse4.cpp
+./configure # Re-create 'Makefile'.
+$MAKE maintainer-clean
+ls -l
+test ! -f parse1.cc
+test ! -f parse2.c++
+test ! -f foo3-parse3.cxx
+test ! -f foo4-parse4.cpp
+
+:
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
new file mode 100755
index 0000000..a633f41
--- /dev/null
+++ b/t/yacc-d-basic.sh
@@ -0,0 +1,154 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests Yacc support with yacc-generated headers
+# (i.e., '-d' in *YFLAGS).
+# Keep in sync with sister test 'yacc-d-cxx.test'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+SUBDIRS = foo bar baz
+END
+
+mkdir foo bar baz
+
+cat > foo/Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parse.y main.c
+.PHONY: echo-distcom
+echo-distcom:
+       @echo ' ' $(DIST_COMMON) ' '
+END
+cp foo/Makefile.am bar/Makefile.am
+cp foo/Makefile.am baz/Makefile.am
+
+cat > foo/parse.y << 'END'
+%{
+#include "parse.h"
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+x : 'x' {};
+%%
+END
+cp foo/parse.y bar/parse.y
+
+cat > foo/main.c << 'END'
+#include "parse.h"
+int main ()
+{
+  return yyparse ();
+}
+END
+cp foo/main.c bar/main.c
+
+# Even the generated header file is renamed when target-specific YFLAGS
+# are used.  This might not be the best behavior, but it has been in
+# place for quite a long time, so just go along with it for now.
+sed 's/"parse\.h"/"zardoz-parse.h"/' foo/parse.y > baz/parse.y
+sed 's/"parse\.h"/"zardoz-parse.h"/' foo/main.c > baz/main.c
+
+$ACLOCAL
+$AUTOCONF
+
+$AUTOMAKE -a
+$FGREP parse.h foo/Makefile.in bar/Makefile.in baz/Makefile.in && Exit 1
+
+cat >> foo/Makefile.am <<END
+BUILT_SOURCES = parse.h
+YFLAGS=\
+-d
+END
+$AUTOMAKE -Wno-gnu foo/Makefile
+
+sed 's/EOL$//' >> bar/Makefile.am <<END
+AM_YFLAGS${tab}=  -d EOL
+BUILT_SOURCES = parse.h
+END
+$AUTOMAKE bar/Makefile
+
+cat >> baz/Makefile.am <<END
+BUILT_SOURCES = zardoz-parse.h
+zardoz_YFLAGS =-d${tab}
+END
+$AUTOMAKE baz/Makefile
+
+./configure
+
+$MAKE
+
+test -f foo/parse.c
+test -f foo/parse.h
+test -f bar/parse.c
+test -f bar/parse.h
+test -f baz/zardoz-parse.c
+test -f baz/zardoz-parse.h
+
+# The generated C source and header files must be shipped.
+for dir in foo bar; do
+  cd $dir
+  $MAKE echo-distcom
+  $MAKE -s echo-distcom | grep '[ /]parse.c '
+  $MAKE -s echo-distcom | grep '[ /]parse.h '
+  cd ..
+done
+cd baz
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]zardoz-parse.c '
+$MAKE -s echo-distcom | grep '[ /]zardoz-parse.h '
+cd ..
+
+$MAKE distdir
+ls -l $distdir
+test -f $distdir/foo/parse.c
+test -f $distdir/foo/parse.h
+test -f $distdir/bar/parse.c
+test -f $distdir/bar/parse.h
+test -f $distdir/baz/zardoz-parse.c
+test -f $distdir/baz/zardoz-parse.h
+
+# Sanity check the distribution.
+yl_distcheck
+
+# While we are at it, make sure that 'parse.c' and 'parse.h' are erased
+# by maintainer-clean, and not by distclean.
+$MAKE distclean
+test -f foo/parse.c
+test -f foo/parse.h
+test -f bar/parse.c
+test -f bar/parse.h
+test -f baz/zardoz-parse.c
+test -f baz/zardoz-parse.h
+./configure # Re-create 'Makefile'.
+$MAKE maintainer-clean
+test ! -f foo/parse.c
+test ! -f foo/parse.h
+test ! -f bar/parse.c
+test ! -f bar/parse.h
+test ! -f baz/zardoz-parse.c
+test ! -f baz/zardoz-parse.h
+
+:
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
new file mode 100755
index 0000000..09d7a79
--- /dev/null
+++ b/t/yacc-d-cxx.sh
@@ -0,0 +1,232 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Various tests on Yacc/C++ support with yacc-generated headers
+# (i.e., '-d' in *YFLAGS).
+# Keep in sync with sister test 'yacc-d-basic.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+write_parse ()
+{
+  header=$1
+  unindent <<END
+    %{
+    // Valid C++, but deliberately invalid C.
+    #include <cstdlib>
+    #include "$header"
+    int yylex (void) { return 0; }
+    void yyerror (const char *s) {}
+    %}
+    %%
+    x : 'x' {};
+    %%
+END
+}
+
+write_main ()
+{
+  header=$1
+  unindent <<END
+    // Valid C++, but deliberately invalid C.
+    #include <cstdio>
+    #include "$header"
+    int main (int argc, char **argv)
+    {
+      int yyparse (void);
+      return yyparse ();
+    }
+END
+}
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile qux/Makefile])
+AC_OUTPUT
+END
+
+mkdir foo bar baz qux baz/sub
+
+# These makefiles will be extended later.
+cat > Makefile.am <<'END'
+.PHONY: echo-distcom
+echo-distcom:
+       @echo ' ' $(DIST_COMMON) ' '
+END
+cp Makefile.am foo/Makefile.am
+cp Makefile.am bar/Makefile.am
+cp Makefile.am baz/Makefile.am
+cp Makefile.am qux/Makefile.am
+
+cat >> Makefile.am <<'END'
+SUBDIRS = foo bar baz qux
+END
+
+$ACLOCAL
+$AUTOCONF
+
+cp "$am_scriptdir/ylwrap" . \
+  || fatal_ "cannot fetch auxiliary script 'ylwrap'"
+
+$AUTOMAKE Makefile
+
+# Try with -d in $(YFLAGS) (don't do this in real life!).
+cat >> foo/Makefile.am <<END
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parse.yy main.cc
+BUILT_SOURCES = parse.hh
+YFLAGS=\
+-d
+END
+
+$AUTOMAKE -Wno-gnu foo/Makefile
+
+write_parse parse.hh > foo/parse.yy
+write_main parse.hh > foo/main.cc
+
+# Try with -d in $(AM_YFLAGS).
+cat >> bar/Makefile.am <<END
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parse.ypp main.cpp
+BUILT_SOURCES = parse.hpp
+AM_YFLAGS${tab}=  -d ${tab}
+END
+
+$AUTOMAKE bar/Makefile
+
+write_parse parse.hpp > bar/parse.ypp
+write_main parse.hpp > bar/main.cpp
+
+# Try with -d in $(AM_YFLAGS), and a subdir parser.
+cat >> baz/Makefile.am <<END
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = joe
+joe_SOURCES = sub/parse.y++ sub/main.c++
+BUILT_SOURCES = sub/parse.h++
+AM_YFLAGS = \
+${tab}-d
+END
+
+$AUTOMAKE baz/Makefile
+
+write_parse sub/parse.h++ > baz/sub/parse.y++
+write_main sub/parse.h++ > baz/sub/main.c++
+
+# Try with -d in $(xxx_YFLAGS) (per-object flag).
+cat >> qux/Makefile.am <<END
+bin_PROGRAMS = maude
+maude_SOURCES = parse.yxx main.cxx
+maude_YFLAGS=${tab}  -d${tab}
+BUILT_SOURCES = maude-parse.hxx
+END
+
+$AUTOMAKE qux/Makefile
+
+write_parse maude-parse.hxx > qux/parse.yxx
+write_main maude-parse.hxx > qux/main.cxx
+
+./configure
+
+$MAKE
+ls -l . foo bar baz baz/sub qux # For debugging.
+
+test -f foo/parse.cc
+test -f foo/parse.hh
+test -f bar/parse.cpp
+test -f bar/parse.hpp
+test -f baz/sub/parse.c++
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.cxx
+test -f qux/maude-parse.hxx
+
+# The ylwrap script must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]ylwrap '
+
+# The generated C++ source and header files must be shipped.
+cd foo
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse\.cc '
+$MAKE -s echo-distcom | grep '[ /]parse\.hh '
+cd ..
+cd bar
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]parse\.cpp '
+$MAKE -s echo-distcom | grep '[ /]parse\.hpp '
+cd ..
+cd baz
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]sub/parse\.c++ '
+$MAKE -s echo-distcom | grep '[ /]sub/parse\.h++ '
+cd ..
+cd qux
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]maude-parse\.cxx '
+$MAKE -s echo-distcom | grep '[ /]maude-parse\.hxx '
+cd ..
+
+$MAKE distdir
+find $distdir # For debugging.
+
+test -f $distdir/ylwrap
+test -f $distdir/foo/parse.cc
+test -f $distdir/foo/parse.hh
+test -f $distdir/bar/parse.cpp
+test -f $distdir/bar/parse.hpp
+test -f $distdir/baz/sub/parse.c++
+test -f $distdir/baz/sub/parse.h++
+test -f $distdir/qux/maude-parse.cxx
+test -f $distdir/qux/maude-parse.hxx
+
+# The Yacc-derived C++ sources must be created, and not removed once
+# compiled (i.e., not treated like "intermediate files" in the GNU
+# make sense).
+yl_distcheck
+
+# Check that we can recover from deleted headers.
+$MAKE clean
+rm -f foo/parse.hh bar/parse.hpp baz/sub/parse.h++ qux/maude-parse.hxx
+$MAKE
+test -f foo/parse.hh
+test -f bar/parse.hpp
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.hxx
+
+# Make sure that the Yacc-derived C++ sources are erased by
+# maintainer-clean, and not by distclean.
+$MAKE distclean
+test -f foo/parse.cc
+test -f foo/parse.hh
+test -f bar/parse.cpp
+test -f bar/parse.hpp
+test -f baz/sub/parse.c++
+test -f baz/sub/parse.h++
+test -f qux/maude-parse.cxx
+test -f qux/maude-parse.hxx
+./configure # Re-create 'Makefile'.
+$MAKE maintainer-clean
+test ! -f foo/parse.cc
+test ! -f foo/parse.hh
+test ! -f bar/parse.cpp
+test ! -f bar/parse.hpp
+test ! -f baz/sub/parse.c++
+test ! -f baz/sub/parse.h++
+test ! -f qux/maude-parse.cxx
+test ! -f qux/maude-parse.hxx
+
+:
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
new file mode 100755
index 0000000..78a486a
--- /dev/null
+++ b/t/yacc-d-vpath.sh
@@ -0,0 +1,108 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This test checks that dependent files are updated before including
+# in the distribution. 'parse.c' depends on 'parse.y'.  The latter is
+# updated so that 'parse.c' should be rebuilt.  Then we are running
+# 'make' and 'make distdir' and check whether the version of 'parse.c'
+# to be distributed is up to date.
+
+# Please keep this in sync with sister test 'yaccvpath.test'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = parse.y foo.c
+AM_YFLAGS = -d
+END
+
+# Original parser, with 'foobar'.
+cat > parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%token FOOBAR
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cat > foo.c << 'END'
+#include "parse.h"
+int main () { return 0; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+$YACC -d parse.y
+mv y.tab.c parse.c
+mv y.tab.h parse.h
+# Sanity checks.
+grep foobar parse.c
+grep FOOBAR parse.h
+
+mkdir sub
+cd sub
+../configure
+
+$sleep
+
+# New parser, with 'fubar'.
+cat > ../parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%token FUBAR
+%%
+fubar : 'f' 'u' 'b' 'a' 'r' {};
+END
+
+$MAKE
+$MAKE distdir
+$FGREP fubar $distdir/parse.c
+$FGREP FUBAR $distdir/parse.h
+
+# Now check to make sure that 'make dist' will rebuild the parser.
+
+$sleep
+
+# New parser, with 'maude'.
+cat > ../parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%token MAUDE
+%%
+maude : 'm' 'a' 'u' 'd' 'e' {};
+END
+
+$MAKE distdir
+$FGREP maude $distdir/parse.c
+$FGREP MAUDE $distdir/parse.h
+
+:
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
new file mode 100755
index 0000000..5ab8d87
--- /dev/null
+++ b/t/yacc-deleted-headers.sh
@@ -0,0 +1,163 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Tests that we can recover from deleted headers generated by 'yacc -d'.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = p1 p2 p3 p4
+# The order in which files are listed in the p*_SOURCES variables
+# below is significant, since it causes make failures whenever
+# the proper definition of BUILT_SOURCES or the declaration of
+# extra dependencies for 'main3.o' are removed.
+p1_SOURCES = main1.c parse1.y
+p2_SOURCES = main2.c parse2.y
+p3_SOURCES = main3.c parse3.y parse3.h
+p4_SOURCES = parse4.y
+AM_YFLAGS = -d
+p2_YFLAGS = -d
+
+BUILT_SOURCES = parse1.h p2-parse2.h
+
+# When we know which files include a yacc-generated header, we
+# should be able to just declare dependencies directly instead
+# of relying on the BUILT_SOURCES hack, and things should still
+# work correctly.
address@hidden@: parse3.h
+
+.PHONY: clean-p3 build-p3
+build-p3: p3$(EXEEXT)
+clean-p3:
+       rm -f p3$(EXEEXT)
+END
+
+cat > parse1.y << 'END'
+%{
+#include "parse1.h"
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%token ZARDOZ
+%%
+x : 'x' {};
+%%
+END
+
+cat > main1.c << 'END'
+#include "parse1.h"
+int main (void)
+{
+  return ZARDOZ + yyparse ();
+}
+END
+
+sed 's/"parse1\.h"/"p2-parse2.h"/' parse1.y > parse2.y
+sed 's/"parse1\.h"/"p2-parse2.h"/' main1.c > main2.c
+
+sed 's/"parse1\.h"/"parse3.h"/' parse1.y > parse3.y
+sed 's/"parse1\.h"/"parse3.h"/' main1.c > main3.c
+
+cat > parse4.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+
+headers='parse1.h p2-parse2.h parse3.h parse4.h'
+
+# Check that we remake only the necessary headers.
+
+rm -f $headers
+$MAKE parse1.h
+test -f parse1.h
+test ! -r p2-parse2.h
+test ! -r parse3.h
+test ! -r parse4.h
+
+rm -f $headers
+$MAKE p2-parse2.h
+test ! -r parse1.h
+test -f p2-parse2.h
+test ! -r parse3.h
+test ! -r parse4.h
+
+rm -f $headers
+$MAKE parse3.h
+test ! -r parse1.h
+test ! -r p2-parse2.h
+test -f parse3.h
+test ! -r parse4.h
+# Since we declared parse3.h into $(p3_SOURCES), make should be
+# able to rebuild it automatically before remaking 'p3'.
+rm -f $headers
+$MAKE clean-p3
+test ! -f parse3.h # Sanity check.
+$MAKE build-p3
+test -f parse3.h
+
+$MAKE
+
+rm -f $headers
+$MAKE parse4.h
+test ! -r parse1.h
+test ! -r p2-parse2.h
+test ! -r parse3.h
+test -f parse4.h
+
+# Now remake all the headers together.
+
+rm -f $headers
+$MAKE $headers
+test -f parse1.h
+test -f p2-parse2.h
+test -f parse3.h
+test -f parse4.h
+
+# Most headers should be remade by "make all".
+
+rm -f $headers
+$MAKE all
+test -f parse1.h
+test -f p2-parse2.h
+test -f parse3.h
+# parse4.h is not declared in any *_SOURCES variable, nor #included
+# by any C source file, so it shouldn't be rebuilt by "make all".
+test ! -r parse4.h
+
+:
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
new file mode 100755
index 0000000..73d64ad
--- /dev/null
+++ b/t/yacc-depend.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure depcomp does not needlessly update headers for yacc rules.
+# Report from Paolo Bonzini.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y main.c
+BUILT_SOURCES = foo.h
+END
+
+cat > foo.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%token TOKEN
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+
+cat > main.c << 'END'
+#include "foo.h"
+int main(void)
+{
+  return yyparse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+$MAKE
+ls -l # For debugging.
+
+# Make sure foo.h is not updated if not really needed.
+$sleep
+: > my-timestamp
+$sleep
+touch foo.y
+$MAKE
+stat my-timestamp foo.* || : # For debugging.
+is_newest my-timestamp foo.h
+
+# Make sure foo.h is updated if needed.
+$sleep
+sed 's/TOKEN/TEKON/g' foo.y > t
+mv -f t foo.y
+$MAKE
+stat my-timestamp foo.* || : # For debugging.
+is_newest foo.h my-timestamp
+
+:
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
new file mode 100755
index 0000000..879cc59
--- /dev/null
+++ b/t/yacc-depend2.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure depcomp does not needlessly update headers and objects
+# for yacc rules.  This test still fails with FreeBSD make (but passes
+# with NetBSD make).
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+AM_YFLAGS = -d
+foo_SOURCES = foo.y main.c
+BUILT_SOURCES = foo.h
+.PHONY: debug-info test-time-unchanged test-time-changed
+debug-info:
+       ls -l
+       stat *.[ch] *.$(OBJEXT) my-timestamp || :
+test-time-unchanged: debug-info
+       test `ls -1t main.$(OBJEXT) my-timestamp | sed 1q` = my-timestamp
+test-time-changed: debug-info
+       test `ls -1t main.$(OBJEXT) my-timestamp | sed 1q` = main.$(OBJEXT)
+END
+
+cat > foo.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%token TOKEN
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+
+cat > main.c << 'END'
+#include "foo.h"
+int main(void)
+{
+  return yyparse ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try to enable dependency tracking if possible, even if that means
+# using slow dependency extractors.
+./configure --enable-dependency-tracking
+$MAKE
+ls -l # For debugging.
+
+$sleep
+: > my-timestamp
+$sleep
+touch foo.y
+$MAKE
+$MAKE test-time-unchanged
+$sleep
+sed 's/TOKEN/TEKON/g' foo.y > t
+mv -f t foo.y
+$MAKE
+$MAKE test-time-changed
+
+:
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
new file mode 100755
index 0000000..3fdae8d
--- /dev/null
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -0,0 +1,93 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that VPATH builds and "make distcheck" works with packages
+# using yacc and the automake 'subdir-objects' option.
+# Exposes automake bug#8485.
+
+required=yacc
+. ./defs || Exit 1
+
+# This test is bounded to fail for any implementation that
+# triggers automake bug#7884.
+useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat > sub/parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main (void)
+{
+  return yyparse ();
+}
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+foo_SOURCES = sub/parse.y
+bar_SOURCES = $(foo_SOURCES)
+AM_YFLAGS = -d
+bar_YFLAGS =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE distdir
+
+# Yacc-derived C source and header files must be built and distributed.
+
+test   -f sub/parse.c
+test   -f sub/parse.h
+test   -f sub/bar-parse.c
+test ! -r sub/bar-parse.h
+
+test   -f $distdir/sub/parse.c
+test   -f $distdir/sub/parse.h
+test   -f $distdir/sub/bar-parse.c
+test ! -r $distdir/sub/bar-parse.h
+
+# But they shouldn't be rebuilt in VPATH builds.
+
+mkdir $distdir/build
+chmod -R a-w $distdir
+cd $distdir/build
+chmod u+w .
+# Try to enable dependency tracking even with slow dependency
+# extractors, to improve coverage.
+../configure --enable-dependency-tracking YACC=false
+$MAKE
+ls -l sub/*.[ch] && Exit 1
+
+env DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE distcheck
+
+:
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
new file mode 100755
index 0000000..6f02f11
--- /dev/null
+++ b/t/yacc-dist-nobuild.sh
@@ -0,0 +1,90 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that distributed Yacc-generated parsers are not uselessly
+# remade from an unpacked distributed tarball.
+# See automake bug#7884.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foobar zardoz
+foobar_SOURCES = parse.y main.c
+zardoz_SOURCES = $(foobar_SOURCES)
+zardoz_YFLAGS = -d
+END
+
+cat > parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cat > main.c << 'END'
+int main () { return 0; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+
+$MAKE distdir
+chmod -R a-w $distdir
+
+mkdir bin
+cat > bin/yacc <<'END'
+#!/bin/sh
+echo "$0 invoked, shouldn't happen!" >&2
+exit 1
+END
+cp bin/yacc bin/bison
+chmod a+x bin/yacc bin/bison
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH
+
+YACC=yacc BISON=bison
+export YACC BISON
+
+mkdir build
+cd build
+../$distdir/configure
+$MAKE
+
+# Sanity check.
+cd ..
+chmod u+w $distdir
+rm -f $distdir/parse.c
+chmod a-w $distdir
+mkdir build2
+cd build2
+../$distdir/configure
+$MAKE >out 2>&1 && { cat out; Exit 1; }
+cat out
+$FGREP parse.c out
+
+:
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
new file mode 100755
index 0000000..ac6a0aa
--- /dev/null
+++ b/t/yacc-line.sh
@@ -0,0 +1,113 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake yacc support ensures that yacc-generated C
+# files use correct "#line" directives.  Try also with the
+# 'subdir-object' option enabled.
+# See also sister test 'lex-line.test'.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+mkdir dir sub sub/dir
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+bin_PROGRAMS = foo bar
+AM_YFLAGS = -d
+bar_YFLAGS =
+foo_SOURCES = zardoz.y
+bar_SOURCES = dir/quux.y
+## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
+END
+
+cat > sub/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+noinst_PROGRAMS = foo bar
+foo_YFLAGS = -d
+foo_SOURCES = zardoz.y
+bar_SOURCES = dir/quux.y
+## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
+dir/address@hidden@: dir/quux.c
+END
+
+cat > zardoz.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+int main(void)
+{
+  return yyparse ();
+}
+END
+
+cp zardoz.y dir/quux.y
+cp zardoz.y sub/zardoz.y
+cp zardoz.y sub/dir/quux.y
+
+c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+for vpath in : false; do
+
+  if $vpath; then
+    srcdir=..
+    mkdir build
+    cd build
+  else
+    srcdir=.
+  fi
+
+  $srcdir/configure
+  $MAKE
+
+  # For debugging,
+  ls -l . sub sub/dir
+  $FGREP '.y' $c_outputs
+
+  # Adjusted "#line" should not contain reference to the builddir.
+  $EGREP '#.*line.*(build|\.\.).*\.y' $c_outputs && Exit 1
+  # Adjusted "#line" should not contain reference to the default
+  # output file names, e.g., 'y.tab.c' and 'y.tab.h'.
+  $EGREP '#.*line.*y\.tab\.' $c_outputs && Exit 1
+  # Don't be excessively strict in grepping, to avoid spurious failures.
+  grep '#.*line.*zardoz\.y' zardoz.c
+  grep '#.*line.*quux\.y' bar-quux.c
+  grep '#.*line.*zardoz\.y' sub/foo-zardoz.c
+  grep '#.*line.*quux\.y' sub/dir/quux.c
+  cd $srcdir
+
+done
+
+:
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
new file mode 100755
index 0000000..8f72b35
--- /dev/null
+++ b/t/yacc-mix-c-cxx.sh
@@ -0,0 +1,206 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that many different Yacc parsers (both C and C++) can co-exists
+# in the same directory.
+
+required=yacc
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = c1 c2 cxx1 cxx2 cxx3
+AM_YFLAGS = -d
+
+c1_SOURCES = p.y p.h 1.c
+c2_SOURCES = p.y 2.c
+c2_YFLAGS =
+
+cxx1_SOURCES = parse.yy main1.cc parse.hh
+
+cxx2_SOURCES = parse2.y++ main2.c++
+cxx2_YFLAGS =
+
+cxx3_SOURCES = parse3.yxx main3.cxx
+
+BUILT_SOURCES = p.h parse.hh parse3.hxx
+END
+
+# The content of all the .c and .y files created below is valid C but
+# deliberately invalid C++.
+# Vice versa, the content of all the .c++, .cxx, .cc, .y++, .yxx and
+# .yy files created below is valid C++ but deliberately invalid C.
+
+cat > p.y <<'END'
+%{
+int yylex (void) { int new = 0; return new; }
+void yyerror (char *s) { return; }
+%}
+%token ZARDOZ
+%%
+x : 'x' {};
+%%
+END
+
+cat > 1.c <<'END'
+#include "p.h"
+int main ()
+{
+    int new = ZARDOZ;
+    return yyparse () + new;
+}
+
+END
+
+cat > 2.c <<'END'
+int main ()
+{
+    int yyparse ();
+    int new = 0;
+    return yyparse () + new;
+}
+END
+
+cat > parse.yy <<'END'
+%{
+#include <cstdlib>
+#include "parse.hh"
+int yylex (void) { return 0; }
+void yyerror (const char *s) { return; }
+%}
+%token FOOBAR
+%%
+x : 'x' {};
+%%
+END
+
+cat > parse2.y++ <<'END'
+%{
+#include <cstdlib>
+int yylex (void) { return 0; }
+void yyerror (const char *s) { return; }
+%}
+%%
+x : 'x' {};
+%%
+END
+
+cat > main1.cc <<'END'
+using namespace std;
+#include "parse.hh"
+int main (int argc, char **argv)
+{
+    int yyparse (void);
+    return yyparse () + FOOBAR;
+}
+END
+
+cat > main2.c++ <<'END'
+using namespace std;
+int main (int argc, char **argv)
+{
+    int yyparse (void);
+    return yyparse ();
+}
+END
+
+edit () { sed -e 's/FOOBAR/BAZQUUX/' -e 's/"parse\.hh"/"parse3.hxx"/'; }
+edit <parse.yy >parse3.yxx
+edit <main1.cc >main3.cxx
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+# Try a VPATH and by default serial build first, and then an in-tree
+# and by default parallel build.
+
+for try in 0 1; do
+
+  if test $try -eq 0; then
+    # VPATH serial build.
+    mkdir build
+    cd build
+    srcdir=..
+    debug_info="ls -l . $srcdir"
+    run_make=$MAKE
+  elif test $try -eq 1; then
+    # In-tree parallel build.
+    srcdir=.
+    debug_info="ls -l"
+    case $MAKE in
+      *\ -j*)
+        # Degree of parallelism already specified by the user: do
+        # not override it.
+        run_make=$MAKE;;
+      *)
+        # Some make implementations (e.g., HP-UX) don't grok '-j',
+        # some require no space between '-j' and the number of jobs
+        # (e.g., older GNU make versions), and some *do* require a
+        # space between '-j' and the number of jobs (e.g., Solaris
+        # dmake).  We need a runtime test to see what works.
+        echo 'all:' > Makefile
+        for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do
+          $run_make && break
+        done
+        rm -f Makefile
+    esac
+  else
+    echo "$me: invalid value of \$try '$try'" >&2
+    Exit 99
+  fi
+
+  $srcdir/configure
+
+  $run_make
+  $debug_info
+
+  test -f p.c
+  test -f p.h
+  test -f c2-p.c
+  test ! -r c2-p.h
+
+  test -f parse.cc
+  test -f parse.hh
+  test -f parse3.cxx
+  test -f parse3.hxx
+
+  test -f cxx2-parse2.c++
+  test ! -r parse2.h++
+  test ! -r cxx2-parse2.h++
+
+  # Minimal checks about recovering from header removal.
+  rm -f p.h parse.hh parse3.hxx
+  $run_make p.h parse.hh
+  $debug_info
+  test -f p.h
+  test -f parse.hh
+  test ! -r parse3.hxx
+  $run_make
+  $debug_info
+  test -f parse3.hxx
+
+  cd $srcdir
+
+done
+
+:
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
new file mode 100755
index 0000000..2124357
--- /dev/null
+++ b/t/yacc-nodist.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Checks for .c and .h files derived from non-distributed yacc sources.
+# The test 'yacc-pr204.test' does similar check with AM_MAINTAINER_MODE
+# enabled.
+# The tests 'lex-nodist.test' and 'lex-pr204.test' does similar checks
+# for lex-generated .c files.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub1 sub2
+.PHONY: test-build test-dist
+test-build: all
+       ls -l . sub1 sub2
+       test -f sub1/parse.y
+       test -f sub1/parse.c
+       test -f sub2/parse.y
+       test -f sub2/parse.c
+       test -f sub2/parse.h
+test-dist: distdir
+       ls -l $(distdir) $(distdir)/sub1 $(distdir)/sub2
+       test ! -r $(distdir)/sub1/parse.y
+       test ! -r $(distdir)/sub1/parse.c
+       test ! -r $(distdir)/sub1/parse.h
+       test ! -r $(distdir)/sub2/parse.y
+       test ! -r $(distdir)/sub2/parse.c
+       test ! -r $(distdir)/sub2/parse.h
+check-local: test-build test-dist
+END
+
+mkdir sub1 sub2
+
+cat > sub1/Makefile.am << 'END'
+parse.y:
+       rm -f $@ address@hidden
+       :; { : \
+         && echo "%{" \
+         && echo "int yylex () { return 0; }" \
+         && echo "void yyerror (char *s) {}" \
+         && echo "%}" \
+         && echo "%%" \
+         && echo "maude : 'm' 'a' 'u' 'd' 'e' {}"; \
+       } > address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+
+bin_PROGRAMS = prog
+prog_SOURCES = main.c
+nodist_prog_SOURCES = parse.y
+CLEANFILES = $(nodist_prog_SOURCES)
+END
+
+cat sub1/Makefile.am - > sub2/Makefile.am << 'END'
+AM_YFLAGS = -d
+BUILT_SOURCES = parse.h
+END
+
+cat > sub1/main.c << 'END'
+int main ()
+{
+  return yyparse ();
+}
+END
+cat - sub1/main.c > sub2/main.c << 'END'
+#include "parse.h"
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE
+$MAKE test-build
+$MAKE test-dist
+
+# But the distribution must work correctly, assuming the user has
+# the proper tools to process yacc files.  Do this check only with
+# GNU make, to avoid tripping on automake bug#7884.
+if using_gmake; then $MAKE distcheck; fi
+
+:
diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh
new file mode 100755
index 0000000..6507b51
--- /dev/null
+++ b/t/yacc-pr204.sh
@@ -0,0 +1,84 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# For PR 204.
+# C sources derived from nodist_ yacc sources should not be distributed.
+# See also related test 'yacc-nodist.test'.
+# The tests 'lex-nodist.test' and 'lex-pr204.test' does similar checks
+# for lex-generated C files.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'EOF'
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+EOF
+
+# The PARSE2 intermediate variable is there to make
+# sure Automake match 'nodist_' against the right
+# variable name...
+cat > Makefile.am << 'EOF'
+AM_YFLAGS = -d
+EXTRA_PROGRAMS = foo
+PARSE2 = parse2.y
+nodist_foo_SOURCES = parse.y $(PARSE2)
+
+distdirtest: distdir
+       test ! -f $(distdir)/parse.c
+       test ! -f $(distdir)/parse.y
+       test ! -f $(distdir)/parse.h
+       test ! -f $(distdir)/parse2.c
+       test ! -f $(distdir)/parse2.y
+       test ! -f $(distdir)/parse2.h
+EOF
+
+cat > parse.y << 'END'
+%{
+int yylex () {return 0;}
+void yyerror (char *s) {}
+%}
+%%
+maude : 'm' 'a' 'u' 'd' 'e' {};
+END
+
+cp parse.y parse2.y
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+$MAKE distdirtest
+
+# Make sure parse.c and parse2.c are still targets.
+$MAKE parse.c parse2.c
+test -f parse.c
+test -f parse2.c
+
+# Ensure the rebuild rule works despite AM_MAINTAINER_MODE, because
+# it's a nodist_ parser.
+$sleep
+touch parse.y parse2.y
+$sleep
+$MAKE parse.c parse2.c
+stat parse.c parse.y parse2.c parse2.y || : # For debugging.
+test `ls -t parse.c parse.y | sed 1q` = parse.c
+test `ls -t parse2.c parse2.y | sed 1q` = parse2.c
+
+:
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
new file mode 100755
index 0000000..82270fe
--- /dev/null
+++ b/t/yacc-weirdnames.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that yacc sources with many dots in their name are handled
+# correctly.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar foo2 bar2
+
+foo_SOURCES = parse.y.y
+bar_SOURCES = parse.s.f..y
+bar_YFLAGS = -d
+
+foo2_SOURCES = parse..5.y++
+bar2_SOURCES = parse.yxx.yy
+bar2_YFLAGS = -d
+END
+
+outputs=' parse.y.c      bar-parse.s.f..c   bar-parse.s.f..h
+          parse..5.c++   bar2-parse.yxx.cc  bar2-parse.yxx.hh '
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$EGREP '(\.[ch]|parse)' Makefile.in # For debugging.
+
+# All expected files should be mentioned in the generated Makefile.in.
+for s in $outputs; do
+  $FGREP $s Makefile.in
+done
+
+:
diff --git a/t/yacc.sh b/t/yacc.sh
new file mode 100755
index 0000000..60b5a4f
--- /dev/null
+++ b/t/yacc.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure intermediate .c file is built from yacc source.
+# Bug from Thomas Morgan.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.y
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$FGREP 'zardoz.c' Makefile.in
+
+:
diff --git a/t/yacc2.sh b/t/yacc2.sh
new file mode 100755
index 0000000..bfab752
--- /dev/null
+++ b/t/yacc2.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure intermediate .h file is not generated nor removed
+# if (AM_)?YFLAGS do not contain -d.  Requested by Jim Meyering.
+# See also the related semantic test 'yacc-d-basic.test'.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+END
+
+# Run it here once and for all, since we are not going to modify
+# configure.ac anymore.
+$ACLOCAL
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = zardoz.y
+END
+
+# Don't redefine several times the same variable.
+cp Makefile.am Makefile.src
+
+$AUTOMAKE -a
+# If zardoz.h IS mentioned, fail.
+$FGREP 'zardoz.h' Makefile.in && Exit 1
+
+cp Makefile.src Makefile.am
+echo 'AM_YFLAGS = -d' >> Makefile.am
+$AUTOMAKE
+# If zardoz.h is NOT mentioned, fail.
+$FGREP 'zardoz.h' Makefile.in
+
+cp Makefile.src Makefile.am
+echo 'AM_YFLAGS = ' >> Makefile.am
+$AUTOMAKE
+# If zardoz.h IS mentioned, fail.
+$FGREP 'zardoz.h' Makefile.in && Exit 1
+
+cp Makefile.src Makefile.am
+echo 'YFLAGS = -d' >> Makefile.am
+# YFLAGS is a user variable.
+AUTOMAKE_fails
+grep 'YFLAGS.* user variable' stderr
+grep 'AM_YFLAGS.* instead' stderr
+$AUTOMAKE -Wno-gnu
+# If zardoz.h is NOT mentioned, fail.
+$FGREP 'zardoz.h' Makefile.in
+
+cp Makefile.src Makefile.am
+echo 'YFLAGS = ' >> Makefile.am
+$AUTOMAKE -Wno-gnu
+# If zardoz.h IS mentioned, fail.
+$FGREP 'zardoz.h' Makefile.in && Exit 1
+
+:
diff --git a/t/yacc4.sh b/t/yacc4.sh
new file mode 100755
index 0000000..3f9a204
--- /dev/null
+++ b/t/yacc4.sh
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Some simple tests of ylwrap functionality.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = parse.y foo.c
+bar_SOURCES = bar.y foo.c
+END
+
+# First parser.
+cat > parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+# Second parser.
+cat > bar.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cat > foo.c << 'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+test -f ylwrap
+
+mkdir sub
+cd sub
+
+../configure
+$MAKE
+
+grep '^#.*/sub/\.\./' bar.c && Exit 1
+grep '^#.*/sub/\.\./' parse.c && Exit 1
+
+# Make distclean must not erase bar.c nor parse.c (by GNU standards) ...
+$MAKE distclean
+test -f bar.c
+test -f parse.c
+# ... but maintainer-clean should.
+../configure
+$MAKE maintainer-clean
+test ! -f bar.c
+test ! -f parse.c
+
+:
diff --git a/t/yacc5.sh b/t/yacc5.sh
new file mode 100755
index 0000000..ab24b56
--- /dev/null
+++ b/t/yacc5.sh
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of yacc functionality, derived from GNU binutils
+# by Tim Van Holder.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = maude
+maude_SOURCES = sub/maude.y
+END
+
+mkdir sub
+
+: > sub/maude.y
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '^maude\.c:.*maude\.y' Makefile.in
+
+
+## Try again with subdir-objects.
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = maude
+maude_SOURCES = sub/maude.y
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# No rule needed, the default .y.c: inference rule is enough
+# (but there may be an additional dependency on a dirstamp file).
+grep '^sub/maude\.c:.*maude\.y' Makefile.in && Exit 1
+
+
+## Try again with per-exe flags.
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = maude
+maude_SOURCES = sub/maude.y
+## A particularly trickey case.
+maude_YFLAGS = -d
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+# Rule should use maude_YFLAGS.
+grep 'AM_YFLAGS.*maude' Makefile.in && Exit 1
+
+# Silly regression.
+grep 'maudec' Makefile.in && Exit 1
+
+# Make sure the .o file is required.
+grep '^am_maude_OBJECTS.*maude' Makefile.in
+
+:
diff --git a/t/yacc7.sh b/t/yacc7.sh
new file mode 100755
index 0000000..a3602e9
--- /dev/null
+++ b/t/yacc7.sh
@@ -0,0 +1,89 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure dependencies are generated correctly for .h files.
+# Report from Richard Boulton.
+#
+# Also check that the sources of the generated parser are distributed.
+# PR/47.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+AM_YFLAGS = -d
+
+check-dist: distdir
+       test -f $(distdir)/foo.y
+       test -f $(distdir)/foo.c
+       test -f $(distdir)/foo.h
+END
+
+# The %union will cause Bison to output '#line's in y.tab.h too.
+cat > foo.y << 'END'
+%union
+{
+  int i;
+  char c;
+}
+%%
+WORD: "up";
+%%
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+./configure
+
+$MAKE foo.h
+
+test -f foo.h
+
+rm -f foo.h foo.c
+$MAKE check-dist
+
+# We should be able to recover if foo.h is deleted.
+
+rm -f foo.h
+$MAKE foo.h
+test -f foo.h
+
+# Make sure '#line ... y.tab.h' gets replaced.
+$FGREP 'y.tab.h' foo.h && Exit 1
+
+# Make distclean must not erase foo.c nor foo.h (by GNU standards) ...
+$MAKE foo.c
+test -f foo.h
+test -f foo.c
+$MAKE distclean
+test -f foo.h
+test -f foo.c
+# ... but maintainer-clean should.
+./configure # Re-create 'Makefile'.
+$MAKE maintainer-clean
+test ! -f foo.h
+test ! -f foo.c
+
+:
diff --git a/t/yacc8.sh b/t/yacc8.sh
new file mode 100755
index 0000000..bab627d
--- /dev/null
+++ b/t/yacc8.sh
@@ -0,0 +1,109 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test for subdir parsers.
+
+required='cc yacc'
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo/foo
+foo_foo_SOURCES = foo/parse.y
+AM_YFLAGS = -d
+
+.PHONY: obj
+obj: foo/parse.$(OBJEXT)
+
+.PHONY: test1 test2
+test1: foo/parse.$(OBJEXT)
+       test -f foo/parse.c
+       test -f foo/parse.$(OBJEXT)
+test2: foo/parse2.$(OBJEXT)
+       test -f foo/parse2.c
+       test -f foo/parse2.$(OBJEXT)
+END
+
+mkdir foo
+
+cat > foo/parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir sub
+cd sub
+
+../configure
+$MAKE test1
+
+# Aside of the rest of this test, let's see if we can recover from
+# parse.h removal.
+test -f foo/parse.h
+rm -f foo/parse.h
+$MAKE foo/parse.h
+test -f foo/parse.h
+
+# Make sure foo/parse.h is not updated, unless when needed.
+$sleep
+: > z
+$sleep
+touch ../foo/parse.y
+$MAKE obj
+test `ls -1t foo/parse.h z | sed 1q` = z
+$sleep
+sed 's/%%/%token TOKEN\n%%/g' ../foo/parse.y >../foo/parse.yt
+mv -f ../foo/parse.yt ../foo/parse.y
+$MAKE obj
+test `ls -1t foo/parse.h z | sed 1q` = foo/parse.h
+
+# Now, adds another parser to test ylwrap.
+
+cd ..
+
+# Sleep some to make sure timestamp of Makefile.am will change.
+$sleep
+
+cp foo/parse.y foo/parse2.y
+cat >> Makefile.am << 'END'
+EXTRA_foo_foo_SOURCES = foo/parse2.y
+END
+
+$AUTOMAKE -a
+test -f ./ylwrap
+
+cd sub
+# Regenerate Makefile (automatic in GNU Make, but not in other Makes).
+./config.status
+$MAKE test2
+
+:
diff --git a/t/yaccdry.sh b/t/yaccdry.sh
new file mode 100755
index 0000000..3100ce3
--- /dev/null
+++ b/t/yaccdry.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Removal recovery rules for headers should not remove files with 'make -n'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AM_YFLAGS = -d
+bin_PROGRAMS = foo
+foo_SOURCES = foo.c parse.y
+END
+
+cat > foo.c << 'END'
+int main () { return 0; }
+END
+
+cat > parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+./configure
+$MAKE
+
+rm -f parse.h
+$MAKE -n parse.h
+test -f parse.c
+test ! -f parse.h
+
+:
diff --git a/t/yaccpp.sh b/t/yaccpp.sh
new file mode 100755
index 0000000..c065a50
--- /dev/null
+++ b/t/yaccpp.sh
@@ -0,0 +1,81 @@
+#! /bin/sh
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure Yacc + C++ is not obviously broken.
+# See also related tests 'yacc-cxx.test' and 'yacc-d-cxx.test',
+# which does much more in-depth checks (but requires an actual
+# Yacc program and a working C++ compiler).
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CXX
+AC_PROG_YACC
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo bar baz qux
+foo_SOURCES = foo.y++
+bar_SOURCES = bar.ypp
+baz_SOURCES = baz.yy
+qux_SOURCES = qux.yxx
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+$EGREP '(\.[ch]|foo|bar|baz|qux)' Makefile.in # For debugging.
+
+$EGREP '(foo|bar|baz|qux)\.h' Makefile.in && Exit 1
+
+sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
+
+$FGREP ' foo.c++ ' mk
+$FGREP ' bar.cpp ' mk
+$FGREP ' baz.cc '  mk
+$FGREP ' qux.cxx ' mk
+
+cat >> Makefile.am <<END
+AM_YFLAGS = -d
+qux_YFLAGS = foo
+END
+
+$AUTOMAKE
+
+$EGREP '(\.[ch]|foo|bar|baz|qux)' Makefile.in # For debugging.
+
+sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
+
+$FGREP ' foo.c++ ' mk
+$FGREP ' foo.h++ ' mk
+$FGREP ' bar.cpp ' mk
+$FGREP ' bar.hpp ' mk
+$FGREP ' baz.cc '  mk
+$FGREP ' baz.hh '  mk
+
+$EGREP '(^| )foo\.h\+\+(:| .*:)' Makefile.in
+$EGREP '(^| )bar\.hpp(:| .*:)'   Makefile.in
+$EGREP '(^| )baz\.hh(:| .*:)'    Makefile.in
+
+grep ' foo\.h[ :]' mk && Exit 1
+grep ' bar\.h[ :]' mk && Exit 1
+grep ' baz\.h[ :]' mk && Exit 1
+
+$FGREP ' qux-qux.cxx ' mk
+$EGREP '(^| )qux-qux\.cxx(:| .*:)' Makefile.in
+grep 'qux\.h.*:' Makefile.in && Exit 1
+
+:
diff --git a/t/yaccvpath.sh b/t/yaccvpath.sh
new file mode 100755
index 0000000..65ab53b
--- /dev/null
+++ b/t/yaccvpath.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This test checks that dependent files are updated before including
+# in the distribution. 'parse.c' depends on 'parse.y'. The later is
+# updated so that 'parse.c' should be rebuild. Then we are running
+# 'make' and 'make distdir' and check whether the version of 'parse.c'
+# to be distributed is up to date.
+
+# Please keep this in sync with sister test 'yacc-d-vpath.test'.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+foo_SOURCES = parse.y foo.c
+END
+
+# Original parser, with 'foobar'.
+cat > parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cat > foo.c << 'END'
+int main () { return 0; }
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+$YACC parse.y
+mv y.tab.c parse.c
+
+mkdir sub
+cd sub
+../configure
+
+$sleep
+
+# New parser, with 'fubar'.
+cat > ../parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+fubar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+$MAKE
+$MAKE distdir
+$FGREP fubar $distdir/parse.c
+
+# Now check to make sure that 'make dist' will rebuild the parser.
+
+$sleep
+
+# New parser, with 'maude'.
+cat > ../parse.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) {}
+%}
+%%
+maude : 'm' 'a' 'u' 'd' 'e' {};
+END
+
+$MAKE distdir
+$FGREP maude $distdir/parse.c
+
+:
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
new file mode 100755
index 0000000..fb27c0b
--- /dev/null
+++ b/t/yflags-cmdline-override.sh
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake can cope with user-redefinition of $(YFLAGS)
+# at configure time and/or at make time.
+
+required='cc yacc'
+. ./defs || Exit 1
+
+unset YFLAGS || :
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+# A minor automake wart: automake doesn't generate code to clean
+# '*.output' files generated by yacc (it's not even clear if that
+# would be useful in general, so it's probably better to be
+# conservative).
+CLEANFILES = foo.output
+# Another automake wart: '-d' flag won't be given at automake time,
+# so automake won't be able to generate code to clean 'foo.h' :-(
+MAINTAINERCLEANFILES = foo.h
+END
+
+cat > foo.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+int main () { return 0; }
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure YFLAGS='-d -v'
+$MAKE
+ls -l
+test -f foo.c
+test -f foo.h
+test -f foo.output
+
+$MAKE maintainer-clean
+ls -l
+
+./configure YFLAGS='-v'
+$MAKE
+ls -l
+test -f foo.c
+test ! -r foo.h
+test -f foo.output
+
+$MAKE maintainer-clean
+ls -l
+
+./configure YFLAGS='-v'
+YFLAGS=-d $MAKE -e
+ls -l
+test -f foo.c
+test -f foo.h
+test ! -r foo.output
+
+$MAKE maintainer-clean
+ls -l
+
+:
diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh
new file mode 100755
index 0000000..0cd09d2
--- /dev/null
+++ b/t/yflags-conditional.sh
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake complains about *_YFLAGS variables which have
+# conditional content.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+
+# 'YFLAGS' is AC_SUBST'd by AC_PROG_YACC by default, but we
+# don't want this, since it might confuse our error messages.
+# Also, AM_SUBST_NOTMAKE seems not to help about this.
+# So we simply define $(YACC) by hand.
+AC_SUBST([YACC], [yacc])
+
+AM_CONDITIONAL([COND], [:])
+END
+
+$ACLOCAL
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo zardoz
+foo_SOURCES = foo.y
+zardoz_SOURCES = zardoz.y
+if COND
+AM_YFLAGS = -v
+zardoz_YFLAGS = -v
+endif COND
+END
+
+cat > Makefile1.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+## This is a dummy comment to keep line count right.
+if COND
+YFLAGS = foo
+endif COND
+END
+
+cat > Makefile2.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+AM_YFLAGS = am_yflags
+if COND
+YFLAGS = yflags
+endif COND
+END
+
+cat > Makefile3.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+foo_YFLAGS = foo_yflags
+if COND
+YFLAGS = yflags
+endif COND
+END
+
+cat > Makefile4.am <<'END'
+bin_PROGRAMS = foo zardoz
+
+foo_SOURCES = foo.y
+zardoz_SOURCES = $(foo_SOURCES)
+
+YFLAGS =
+AM_YFLAGS = $(COND_VAR1)
+zardoz_YFLAGS = $(COND_VAR2:z=r)
+
+COND_VAR2 = foo
+if COND
+YFLAGS += -v
+COND_VAR2 += bar
+else !COND
+COND_VAR1 = -d
+endif !COND
+END
+
+cat > Makefile5.am <<'END'
+bin_PROGRAMS = foo zardoz
+foo_SOURCES = foo.y
+zardoz_SOURCES = zardoz.y
+YFLAGS = -v
+AM_YFLAGS = -v
+if COND
+zardoz_YFLAGS = -v
+endif
+END
+
+cat > Makefile6.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+foo_YFLAGS = -v
+if COND
+quux_YFLAGS = -v
+AM_YFLAGS = -v
+endif
+END
+
+: > ylwrap
+
+LC_ALL=C; export LC_ALL; # For grep regexes below.
+
+AUTOMAKE_fails -Wnone -Wunsupported Makefile
+grep '^Makefile\.am:5:.*AM_YFLAGS.* conditional contents' stderr
+grep '^Makefile\.am:6:.*zardoz_YFLAGS.* conditional contents' stderr
+
+for i in 1 2 3; do
+  AUTOMAKE_fails -Wnone -Wunsupported Makefile$i
+  grep "^Makefile$i\\.am:5:.*[^a-zA-Z0-9_]YFLAGS.* conditional contents" \
+       stderr
+done
+
+AUTOMAKE_fails -Wnone -Wunsupported Makefile4
+grep '^Makefile4\.am:6:.*[^a-zA-Z0-9_]YFLAGS.* conditional contents' stderr
+grep '^Makefile4\.am:7:.*AM_YFLAGS.* conditional contents' stderr
+grep '^Makefile4\.am:8:.*zardoz_YFLAGS.* conditional contents' stderr
+
+# Now let's check we avoid false positives.
+
+# Disable 'gnu' warnings because we override the user variable 'YFLAGS'.
+AUTOMAKE_fails -Wno-gnu Makefile5
+grep -v '^Makefile5\.am:.*zardoz_YFLAGS' stderr \
+ | grep -v ': warnings are treated as errors' \
+ | grep . && Exit 1
+
+# Disable 'gnu' warnings because we override the user variable 'YFLAGS'.
+$AUTOMAKE -Wno-gnu Makefile6
+
+:
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
new file mode 100755
index 0000000..78820ca
--- /dev/null
+++ b/t/yflags-d-false-positives.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for false positives in automake recognition of '-d' in YFLAGS.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_YACC
+END
+
+$ACLOCAL
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz foobar
+zardoz_SOURCES = zardoz.y
+foobar_SOURCES = foobar.y
+# All the "almost -d" substrings ("- d", "-dd", etc.) are meant.
+AM_YFLAGS = -xd --d - d --output=d
+foobar_YFLAGS = - d $(foovar)-d -dd
+END
+
+$AUTOMAKE -a
+$EGREP '(foobar|zardoz)\.h.*:' Makefile.in && Exit 1
+$EGREP '(foobar|zardoz)\.h' Makefile.in | $FGREP -v '$(YLWRAP) ' && Exit 1
+
+:
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
new file mode 100755
index 0000000..53038a8
--- /dev/null
+++ b/t/yflags-force-conditional.sh
@@ -0,0 +1,85 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the user can force automake to use *_YFLAGS variables
+# which have conditional content.
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_SUBST([CC], [false])
+AC_PROG_YACC
+AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
+AC_OUTPUT
+END
+
+mkdir bin
+cat > bin/fake-yacc <<'END'
+#!/bin/sh
+echo "/* $* */" > y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x bin/fake-yacc
+PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
+YACC=fake-yacc; export YACC
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = foo.y main.c
+bar_SOURCES = $(foo_SOURCES)
+bar_YFLAGS = $(bar_yflags2)
+if COND
+AM_YFLAGS = __am_cond_yes__
+bar_YFLAGS += __bar_cond_yes__
+else !COND
+AM_YFLAGS = __am_cond_no__
+bar_yflags2 = __bar_cond_no__
+endif !COND
+END
+
+: > foo.y
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a -Wno-unsupported
+
+$EGREP '(YFLAGS|yflags|am__append)' Makefile.in # For debugging.
+
+./configure cond=yes
+$MAKE foo.c bar-foo.c
+
+cat foo.c
+cat bar-foo.c
+
+$FGREP ' __am_cond_yes__ ' foo.c
+$FGREP ' __bar_cond_yes__ ' bar-foo.c
+$FGREP 'cond_no' foo.c bar-foo.c && Exit 1
+
+$MAKE maintainer-clean
+ls -l
+
+./configure cond=no
+$MAKE foo.c bar-foo.c
+
+cat foo.c
+cat bar-foo.c
+
+$FGREP ' __am_cond_no__ ' foo.c
+$FGREP ' __bar_cond_no__ ' bar-foo.c
+$FGREP 'cond_yes' foo.c bar-foo.c && Exit 1
+
+:
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
new file mode 100755
index 0000000..3f4755e
--- /dev/null
+++ b/t/yflags-force-override.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake can cope with a definition of the $(YFLAGS) variable
+# in Makefile.am (even if that is extremely bad practice, because that
+# variable is user-reserved).
+
+required='cc yacc'
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_YACC
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo
+foo_SOURCES = foo.y
+# Don't do this in a real-life Makefile.am!
+YFLAGS = -d -v
+END
+
+cat > foo.y << 'END'
+%{
+int yylex () { return 0; }
+void yyerror (char *s) { return; }
+int main () { return 0; }
+%}
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+$ACLOCAL
+$AUTOMAKE -a -Wno-gnu
+
+$EGREP '(foo|YFLAGS)' Makefile.in # For debugging.
+grep '^foo.h *:' Makefile.in
+
+$AUTOCONF
+./configure
+
+$MAKE
+
+test -f foo.c
+test -f foo.h
+test -f foo.output
+
+:
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
new file mode 100755
index 0000000..d3bd0d4
--- /dev/null
+++ b/t/yflags-var-expand.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that automake expand variables when looking for '-d' in YFLAGS;
+# for example, the following is supposed to work:
+#  foo_flags = -d
+#  AM_YFLAGS = $(foo_flags)
+
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_YACC
+END
+
+$ACLOCAL
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = foo.y
+bar_SOURCES = bar.y
+my_YFLAGS = -x
+AM_YFLAGS = $(my_YFLAGS:x=d)
+bar_YFLAGS = $(AM_YFLAGS)
+END
+
+$AUTOMAKE -a
+
+$EGREP '(foo|bar|YFLAGS)' Makefile.in # For debugging.
+grep '^foo.h *:' Makefile.in
+grep '^bar-bar.h *:' Makefile.in
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = -Wno-gnu
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = parser.y
+my_YFLAGS = $(my_YFLAGS_1)
+my_YFLAGS += $(my_YFLAGS_2)
+my_YFLAGS_2 = -d
+YFLAGS = $(my_YFLAGS)
+END
+
+$AUTOMAKE
+
+$EGREP 'parser|YFLAGS' Makefile.in # For debugging.
+grep '^parser.h *:' Makefile.in
+
+:
diff --git a/t/yflags.sh b/t/yflags.sh
new file mode 100755
index 0000000..fbc39f5
--- /dev/null
+++ b/t/yflags.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
+# $(foo_YFLAGS).
+# Please keep this in sync with the sister tests yflags2.test, lflags.test
+# and lflags2.test.
+
+. ./defs || Exit 1
+
+cat >fake-yacc <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x fake-yacc
+
+# Remove Yacc from the environment, so that it won't interfere
+# with 'make -e' below.
+unset YACC || :
+
+cat >> configure.ac <<'END'
+AC_SUBST([CC], [false])
+# Simulate presence of Yacc using our fake-yacc script.
+AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.c foo.y
+bar_SOURCES = main.c bar.y
+AM_YFLAGS = __am_flags__
+bar_YFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+
+: > foo.y
+: > bar.y
+
+$AUTOCONF
+./configure
+env YFLAGS=__user_flags__ $MAKE -e foo.c bar-bar.c
+
+cat foo.c
+cat bar-bar.c
+
+grep '__am_flags__.*__user_flags__' foo.c
+grep '__bar_flags__.*__user_flags__' bar-bar.c
+
+:
diff --git a/t/yflags2.sh b/t/yflags2.sh
new file mode 100755
index 0000000..a933447
--- /dev/null
+++ b/t/yflags2.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
+# $(foo_YFLAGS).
+# Please keep this in sync with the sister tests yflags.test, lflags.test
+# and lflags2.test.
+
+. ./defs || Exit 1
+
+cat >fake-yacc <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x fake-yacc
+
+# Remove Yacc from the environment, so that it won't interfere
+# with 'make -e' below.
+unset YACC || :
+
+cat >> configure.ac <<'END'
+AC_SUBST([CXX], [false])
+# Simulate presence of Yacc using our fake-yacc script.
+AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.cc foo.yy
+bar_SOURCES = main.cc bar.y++
+AM_YFLAGS = __am_flags__
+bar_YFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+
+: > foo.yy
+: > bar.y++
+
+$AUTOCONF
+./configure
+env YFLAGS=__user_flags__ $MAKE -e foo.cc bar-bar.c++
+
+cat foo.cc
+cat bar-bar.c++
+
+grep '__am_flags__.*__user_flags__' foo.cc
+grep '__bar_flags__.*__user_flags__' bar-bar.c++
+
+:
diff --git a/tests/ChangeLog-old b/tests/ChangeLog-old
deleted file mode 100644
index d76ca2b..0000000
--- a/tests/ChangeLog-old
+++ /dev/null
@@ -1,1441 +0,0 @@
-2001-02-07  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Removed remake3.test,
-       distcommon.test.
-
-       * Makefile.am (XFAIL_TESTS): Added new files.
-
-       * remake3.test: New file.
-       * Makefile.am (TESTS): Added new file.
-
-       * distcommon.test: New file.
-       * Makefile.am (TESTS): Added new file.
-
-2001-02-04  Tom Tromey  <address@hidden>
-
-       * exsource.test: Updated for new include code.
-
-2001-02-03  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Removed colon7.test.
-
-2001-01-29  Akim Demaille  <address@hidden>
-
-       * check.test: New.
-
-2001-01-28  Tom Tromey  <address@hidden>
-
-       * listval.test: New file.
-       * Makefile.am (TESTS): Added listval.test.
-
-2001-01-26  Tom Tromey  <address@hidden>
-
-       * makevars.test: Fail if automake fails.
-
-2001-01-26  Pavel Roskin  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Added colon7.test.
-
-2001-01-26  Akim Demaille  <address@hidden>
-
-       * vtexi.test (info_TEXINFOS): Check that the path to mdate-sh is
-       already correct.
-
-       * defs (AUTOCONF, has_autoconf, needs_autoconf): New.
-       * ansi3.test, cond9.test, depacl2.test, install2.test, pr19.test,
-       * pr87.test, pr9.test, subobj3.test, target-cflags.test: Use them.
-
-2001-01-25  Pavel Roskin  <address@hidden>
-
-       * makevars.test: Disable shell tracing.
-
-2001-01-25  Akim Demaille  <address@hidden>
-
-       * makevars.test: New.
-
-2001-01-24  Akim Demaille  <address@hidden>
-
-       * vtexi.test (info_TEXINFOS): Escape a $ in egrep pattern.
-
-2001-01-23  Akim Demaille  <address@hidden>
-
-       * vtexi.test: Also check that stamp-vti properly depends upon
-       configure.in and the Texinfo source file.
-
-2001-01-21  Kevin Ryde <address@hidden>
-
-       * colon7.test: Grep for a couple of AC_OUTPUT problems.
-
-2001-01-15  Tom Tromey  <address@hidden>
-
-       * subdir3.test: Allow any number of dependencies.
-
-       * subobj4.test: Fixed test case.
-
-       * amassign.test: New file.
-       * Makefile.am (TESTS): Added new file.
-
-2001-01-12  Tom Tromey  <address@hidden>
-
-       * subobj4.test: New file.
-       * Makefile.am (TESTS): Added subobj4.test.
-
-       * cxxansi.test: New file.
-       * Makefile.am (TESTS): Added cxxansi.test.
-
-2000-12-21  Tom Tromey  <address@hidden>
-
-       * vtexi.test: Fixed to reflect new rules.
-
-2000-12-17  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Don't mention ldflags.test.
-
-2000-11-25  Tom Tromey  <address@hidden>
-
-       * space.test: New file.
-       * Makefile.am (TESTS): Added space.test.
-
-2000-11-23  Pavel Roskin  <address@hidden>
-
-       * pr87.test: Prevent automake from looking into .. and ../..
-       by using AC_CONFIG_AUX_DIR(.) in configure.in.
-
-2000-11-23  Tom Tromey  <address@hidden>
-
-       * pr87.test: New file.  From PR automake/87.
-       * Makefile.am (TESTS): Added pr87.test.
-
-2000-10-17  Pavel Roskin  <address@hidden>
-
-       * Makefile.am (TESTS): Added aclocali1.test.
-       * aclocali1.test: New file.
-
-2000-08-30  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Removed pr72.test.
-
-       For PR automake/72:
-       * Makefile.am (TESTS): Added pr72.test.
-       (XFAIL_TESTS): Likewise.
-       * pr72.test: New file.
-
-2000-08-28  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Added ldflags.test.
-
-2000-08-27  Tom Tromey  <address@hidden>
-
-       For PR automake/75:
-       * Makefile.am (TESTS): Added fortdep.test.
-       * fortdep.test: New file.
-
-       For PR automake/68:
-       * Makefile.am (TESTS): Added header.test.
-       * header.test: New file.
-
-2000-08-26  Tom Tromey  <address@hidden>
-
-       For PR automake/73:
-       * Makefile.am (TESTS): Added instman2.test.
-       * instman2.test: New file.
-
-       For PR automake/77:
-       * Makefile.am (TESTS): Added ldflags.test.
-       * ldflags.test: New file.
-
-2000-08-06  Jim Meyering  <address@hidden>
-
-       * Makefile.am (TESTS): Add subdir4.test.
-       * subdir4.test: New test for the just-fixed depcomp failure.
-
-2000-08-02  Akim Demaille  <address@hidden>
-
-       * depacl.test: Weaken the regexp looking for AM_PROG_CC_C_STDC in
-       aclocal.m4.
-
-2000-05-01  Pavel Roskin  <address@hidden>
-
-       * install2.test: Prevent automake from looking into .. and ../..
-       by using AC_CONFIG_AUX_DIR(.) in configure.in
-       * pr19.test: Likewise
-       * subobj3.test: Likewise
-
-2000-03-19  Tom Tromey  <address@hidden>
-
-       * libobj2.test: Put depcomp into subdir.
-       * confsub.test: Put depcomp into subdir.
-       * defs: Always copy `depcomp'.
-
-       * defs: Correctly create `depcomp'.
-       * nodepcomp.test: Remove depcomp.
-
-       More for PR automake/38:
-       * symlink3.test: New file.
-       * Makefile.am (TESTS): Added symlink3.test.
-
-       For PR automake/38:
-       * symlink2.test: New file.
-       * Makefile.am (TESTS): Added symlink2.test.
-
-       For PR automake/45:
-       * defs, acoutnoq.test, texinfo8.test, tagsub.test, subdir2.test,
-       subdir.test, scripts.test, remake2.test, remake.test, pr2.test,
-       parse.test, output4.test, output3.test, output2.test, output.test,
-       libobj10.test, libobj9.test, libobj8.test, libobj7.test,
-       libobj6.test, libobj2.test, libobj.test, fpinstall.test,
-       fpinst2.test, depend3.test, confsub.test, config.test,
-       confh4.test, confh3.test, confh2.test, confh.test, conf2.test,
-       colon7.test, colon6.test, colon5.test, colon4.test, colon3.test,
-       colon2.test, colon.test, acouttbs.test, acoutqnl.test,
-       acoutput.test: Put AM_INIT_AUTOMAKE into configure.in.
-
-       * install2.test: Expect a `dist' failure.
-
-2000-03-19  Tom Tromey  <address@hidden>
-
-       * nodepcomp.test: New file.
-       * Makefile.am (TESTS): Added nodepcomp.test.
-
-2000-02-02  Assar Westerlund  <address@hidden>
-
-       * target-cflags.test: new test case to target-specific CFLAGS
-
-2000-01-08  Tom Tromey  <address@hidden>
-
-       * ansi.test, texinfo.test, empty.test, insh2.test, texinfo8.test:
-       Remove @SET_MAKE@ before using Makefile.
-       * backsl2.test: Don't add AC_PROG_MAKE_SET in configure.in;
-       already done.
-       * defs: Put AC_PROG_MAKE_SET in configure.in.
-       * acoutnoq.test, acoutput.test, acoutqnl.test, acouttbs.test,
-       acouttbs2.test, colon.test, colon2.test, colon3.test, colon4.test,
-       colon5.test, colon6.test, colon7.test, conf2.test, confh.test,
-       confh2.test, confh3.test, confh4.test, config.test, depend3.test,
-       discover.test, fpinst2.test, gnits.test, ldadd.test, libobj.test,
-       libobj10.test, libobj2.test, libobj6.test, libobj7.test,
-       libobj8.test, libobj9.test, output.test, output2.test,
-       output3.test, output4.test, output5.test, package.test,
-       parse.test, pr2.test, remake.test, remake2.test, scripts.test,
-       stamph.test, texinfo8.test: Likewise.
-
-1999-12-26  Tom Tromey  <address@hidden>
-
-       * subobj3.test: Remove depcomp.
-       * pr9.test: Remove depcomp.
-       Remove opportunistic check.
-       * pr19.test: Remove depcomp.
-
-1999-12-25  Tom Tromey  <address@hidden>
-
-       * suffix2.test: Create config.guess and config.sub so user doesn't
-       need libtoolize.  From Klaus Reichl.
-
-1999-12-19  Tom Tromey  <address@hidden>
-
-       Test for PR automake/9:
-       * pr9.test: New file.
-       * Makefile.am (TESTS): Added pr9.test.
-
-       * pr19.test: Fail gracefully if gzip missing.
-       * install2.test: Fail gracefully if gzip missing.
-
-1999-12-19  Pavel Roskin  <address@hidden>
-
-       * tests/defs: add all permissions to testSubDir before
-       removing it.
-
-1999-12-19  Tom Tromey  <address@hidden>
-
-       * pr2.test: Use egrep, not grep.
-
-       Test for PR automake/2:
-       * pr2.test: New file.
-       * Makefile.am (TESTS): Added pr2.test.
-
-1999-12-15  Tom Tromey  <address@hidden>
-
-       * dup3.test: New file.
-       * Makefile.am (TESTS): Added dup3.test.
-
-1999-12-13  Tom Tromey  <address@hidden>
-
-       * pr19.test: New file.  For PR automake/19.
-       * Makefile.am (TESTS): Added pr19.test.
-
-       * lex4.test: New file.  For PR automake/6.
-       * Makefile.am (TESTS): Added lex4.test.
-
-       * suffix3.test: New file.
-       * Makefile.am (TESTS): Added suffix3.test.
-
-       * suffix2.test: Added `no-dependencies' to options in
-       Makefile.am.  Removed trailing `exit 1'.
-
-       * nostdinc.test: New file.
-       * Makefile.am (TESTS): Added nostdinc.test.
-
-       * condincl2.test: New file.
-       * condincl.test: New file.
-       * Makefile.am (TESTS): Added condincl.test, condincl2.test.
-
-       * suffix2.test: New file.
-       * Makefile.am (TESTS): Added suffix2.test.
-
-       * subobj.test: Remove final test.
-
-1999-12-12  Tom Tromey  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): Removed subobj3.test.
-
-1999-12-10  Tom Tromey  <address@hidden>
-
-       * install2.test: New file.
-       * Makefile.am (TESTS): Added install2.test.
-
-       * specflags5.test: New file.
-       * Makefile.am (TESTS): Added specflags5.test.
-
-1999-12-06  Tom Tromey  <address@hidden>
-
-       * confh4.test: Corrected final test.
-
-       * confh4.test: New file.  PR automake/34.
-       * Makefile.am (TESTS): Mention confh4.test.
-
-1999-11-22  Tom Tromey  <address@hidden>
-
-       * defs: Never hard link `depcomp'.  From Pavel Roskin
-
-       * exsource.test: Don't use configure substitution in _SOURCES.
-       * depend.test: Don't use configure substitution in _SOURCES.
-       * cygwin32.test: Don't use configure substitution in _SOURCES.
-
-       * subobj.test: Check for another bug.
-
-       * Makefile.am (XFAIL_TESTS): Removed sourcesub.test,
-       ltlibobjs.test.
-
-1999-11-21  Tom Tromey  <address@hidden>
-
-       * specflags3.test: Updated test for new dependency
-       implementation.
-
-1999-10-02  Alexandre Oliva  <address@hidden>
-
-       * defs: Set CDPATH to avoid verbose cd.
-
-1999-09-14  Alexandre Oliva  <address@hidden>
-
-       * defs: Avoid printing the full pathname of testSubDir.
-
-       * exsource.test: Update.
-
-1999-06-01  Alexandre Oliva  <address@hidden>
-
-       * exsource.test: sed @AMDEP@ away from `include' line.
-
-       * compile_f_c_cxx.test: depcomp is no longer in the same line.
-
-1999-04-25  Alexandre Oliva  <address@hidden>
-
-       * compile_f_c_cxx.test: Look for $(depcomp) for C and C++.
-       * suffix.test: We no longer emit % rules.
-
-1999-04-10  Alexandre Oliva  <address@hidden>
-
-       * defs: Create link or copy of depcomp.
-       * depend2.test: Removed, no more disted dependencies.
-       * Makefile.am (TESTS): Likewise.
-       * exsource.test: Adjust dependency filenames.
-       * mdate3.test: Adjust for depcomp.
-
-1999-11-07  Tom Tromey  <address@hidden>
-
-       * dash.test: New file.
-       * Makefile.am (TESTS): Added dash.test.
-
-1999-08-26  Tom Tromey  <address@hidden>
-
-       * texinfo8.test: Use directory named `sub'.
-
-       * symlink.test: Use directory named `sub' (just in case; for
-       Windows).
-
-1999-08-15  Tom Tromey  <address@hidden>
-
-       * ansi4.test: New file.
-       * Makefile.am (TESTS): Added ansi4.test.
-
-1999-07-30  Tom Tromey  <address@hidden>
-
-       * double.test (bin_PROGRAMS): New file.
-       * Makefile.am (TESTS): Added double.test.
-
-1999-07-27  Tom Tromey  <address@hidden>
-
-       * empty4.test: New file.
-       * Makefile.am (TESTS): Added empty4.test.
-
-1999-07-13  Tom Tromey  <address@hidden>
-
-       * empty3.test: New file.
-       * Makefile.am (TESTS): Added empty3.test.
-
-       * empty2.test: Also look for `pavel.o'.
-
-       * empty2.test: New file.
-       * Makefile.am (TESTS): Added empty2.test.
-
-1999-05-27  Tom Tromey  <address@hidden>
-
-       * subobj3.test: New file.
-       * Makefile.am (TESTS): Added subobj3.test.
-       (XFAIL_TESTS): Likewise.
-
-       * ltlibobjs.test: New file.
-       * Makefile.am (TESTS): Added ltlibobjs.test.
-       (XFAIL_TESTS): Added ltlibobjs.test.
-
-       * Makefile.am (XFAIL_TESTS): Added sourcesub.test.
-
-1999-05-19  Tom Tromey  <address@hidden>
-
-       * specflags4.test: Typo fix.
-
-       * specflags4.test: New file.  From Pavel Roskin.
-       * Makefile.am (TESTS): Added specflags4.test.
-
-       * specflags.test: Added regression test for missing space.
-
-1999-05-13  Tom Tromey  <address@hidden>
-
-       * sourcesub.test: New file.
-       * Makefile.am (TESTS): Added sourcesub.test.
-
-1999-05-01  Tom Tromey  <address@hidden>
-
-       * libobj2.test: Reverted previous change; it is incorrect.
-
-       * libobj2.test: Error if libtu.a.P is mentioned.
-
-1999-04-27  Tom Tromey  <address@hidden>
-
-       * cond9.test: New file.  From Raja R Harinath.
-       * Makefile.am (TESTS): Added cond9.test.
-
-       * pluseq8.test: New file.
-       * Makefile.am (TESTS): Added pluseq8.test.
-
-       * canon5.test: Updated to reflect change to MACRO_PATTERN.
-
-       * specflags3.test: New file.
-       * Makefile.am (TESTS): Added specflags3.test.
-       (TESTS): Now lists one file per line, for simpler maintenance.
-
-       * specflags2.test: New file.
-       * specflags.test: New file.
-       * Makefile.am (TESTS): Added specflags.test, specflags2.test.
-
-1999-04-27  Alexandre Oliva  <address@hidden>
-
-       * canon5.test (bin_PROGRAMS): New file.
-       * Makefile.am (TESTS): Added canon5.test.
-
-1999-04-20  Alexandre Oliva  <address@hidden>
-
-       * libobj10.test: New file.
-       * Makefile.am (TESTS): Added libobj10.test.
-
-1999-04-11  Tom Tromey  <address@hidden>
-
-       * subobj2.test: New file.
-       * Makefile.am (TESTS): Added subobj2.test.
-
-       * subobj.test: New file.
-       * Makefile.am (TESTS): Added subobj.test.
-
-       * confh.test: Use `sed' to extract full definition of
-       DIST_COMMON.  Look for stamp-h.in rule in include/Makefile.in.
-       * Makefile.am (XFAIL_TESTS): Removed confh.test.
-
-1999-04-10  Tom Tromey  <address@hidden>
-
-       * defs: Ensure srcdir is always absolute.
-
-       * Makefile.am (XFAIL_TESTS): Removed cond8.test.
-
-       * gcj2.test: New file.
-       * Makefile.am (TESTS): Added gcj2.test.
-
-1999-04-10  Alexandre Oliva  <address@hidden>
-
-       * suffix.test: New file.
-       * Makefile.am: Added suffix.test.
-
-       * Makefile.am (XFAIL_TESTS): Added cond8.test.
-
-       * cond3.test: Refer to am_targ_OBJECTS.
-
-       * yacc2.test, yacc3.test: New files.
-       * Makefile.am (TESTS): Added yacc2.test and yacc3.test.
-
-1999-04-09  Tom Tromey  <address@hidden>
-
-       * nodist.test: New file.
-       * Makefile.am (TESTS): Added nodist.test.
-
-       * gcj.test: New file.
-       * Makefile.am (TESTS): Added gcj.test.
-
-1999-04-08  Tom Tromey  <address@hidden>
-
-       * cond8.test: New file.
-       * Makefile.am (TESTS): Added cond8.test.
-
-1999-04-07  Alexandre Oliva  <address@hidden>
-
-       * backsl2.test: New file.
-       * Makefile.am (TESTS): Added backsl2.test.
-
-       * texinfo8.test: texinfo.tex is only disted by aux/Makefile.
-
-       * texinfo8.test: New file.
-       * Makefile.am (TESTS): Added texinfo8.test.
-
-1999-03-31  Tom Tromey  <address@hidden>
-
-       * pluseq2.test, pluseq3.test: Updated for recent \-preservation
-       change.
-
-1999-03-31  Alexandre Oliva  <address@hidden>
-
-       * Makefile.am (XFAIL_TESTS): add confh.test
-
-1999-03-30  Tom Tromey  <address@hidden>
-
-       * mclean.test: Fixed typo.
-
-       * mclean.test: New file.
-       * Makefile.am (TESTS): Added mclean.test.
-
-1999-03-30  Alexandre Oliva  <address@hidden>
-
-       * confh.test: if include/Makefile.am is created, the test fails
-
-1999-03-27  Tom Tromey  <address@hidden>
-
-       * extra4.test: Allow EXTRA_DATA to be specified.
-
-1999-03-22  Tom Tromey  <address@hidden>
-
-       * ldadd.test: Use AC_PROG_LIBTOOL, not AM_PROG_LIBTOOL.
-
-       * pluseq7.test: New file.
-       * Makefile.am (TESTS): Added pluseq7.test.
-       * pluseq6.test: New file.
-       * Makefile.am (TESTS): Added pluseq6.test.
-
-1999-03-21  Tom Tromey  <address@hidden>
-
-       * nodep.test: New file.
-       * Makefile.am (TESTS): Added nodep.test.
-
-       * subdir3.test: Correctly mention _SOURCES in Makefile.am.
-
-       * subdir3.test: New file.
-       * Makefile.am (TESTS): Added subdir3.test.
-       * xsource.test: Changed to check whether multiple source files
-       with same object name cause failure.
-
-1999-03-11  Tom Tromey  <address@hidden>
-
-       * libobj9.test: New file.
-       * Makefile.am (TESTS): Added libobj9.test.
-
-       * insthook.test: Don't require GNU grep.  From John Pierce.
-
-       * lex3.test: New file.
-       * Makefile.am (TESTS): Added lex3.test.
-
-1999-03-01  Tom Tromey  <address@hidden>
-
-       * ansi3.test: Use no-dependencies option to avoid GNU make
-       requirement.  From Jerome Lovy.
-
-1999-02-27  Tom Tromey  <address@hidden>
-
-       * ext.test (foo_SOURCES): New file.
-       * Makefile.am (TESTS): Added ext.test.
-
-1999-02-11  Tom Tromey  <address@hidden>
-
-       * cygwin32.test: Use AC_EXEEXT, not AM_EXEEXT.
-
-       * obsolete2.test: New file.
-       * Makefile.am (TESTS): Added obsolete2.test.
-
-1999-02-01  Tom Tromey  <address@hidden>
-
-       * installsh.test (AUTOMAKE): Use $PERL.  From Pavel Roskin.
-
-       * cond5.test: Sleep 15 seconds, not 5.  Some people still run the
-       test on slow machines.
-
-1999-01-22  Tom Tromey  <address@hidden>
-
-       * copy.test: New file.
-       * Makefile.am (TESTS): Added copy.test.
-
-       * ppf77.test: New file.
-       * Makefile.am (TESTS): Added ppf77.test.
-
-1999-01-14  Tom Tromey  <address@hidden>
-
-       * confh3.test: New file.
-       * Makefile.am (TESTS): Added confh3.test.
-
-       * confh2.test: New file.
-       * Makefile.am (TESTS): Added confh2.test.
-
-       * confh.test: Run automake differently the second time.
-
-       * mdate3.test: New file.
-       * Makefile.am (TESTS): Added mdate3.test.
-
-1999-01-11  Tom Tromey  <address@hidden>
-
-       * confh.test: New file.
-       * Makefile.am (TESTS): Added confh.test.
-
-1999-01-10  Tom Tromey  <address@hidden>
-
-       * objc.test: Updated to account for new ObjC support.
-
-       * pluseq5.test: New file.
-       * Makefile.am (TESTS): Added pluseq5.test.
-
-       * all.test: Test all *-local targets, not just all-local.
-
-       * all.test: New file.
-       * Makefile.am (TESTS): Added all.test.
-
-1999-01-07  Tom Tromey  <address@hidden>
-
-       * include.test: New file.
-       * Makefile.am (TESTS): Added include.test.
-
-1998-12-21  Tom Tromey  <address@hidden>
-
-       * insthook.test: Updated to fail when it should.
-
-1998-12-11  Tom Tromey  <address@hidden>
-
-       * insthook.test: New file.
-       * Makefile.am (TESTS): Added insthook.test.
-
-1998-11-27  Tom Tromey  <address@hidden>
-
-       * cond7.test: New file.  From Pavel Roskin.
-       * Makefile.am (TESTS): New file.
-
-1998-11-10  Tom Tromey  <address@hidden>
-
-       * pluseq4.test: New file.
-       * Makefile.am (TESTS): Added pluseq4.test.
-
-1998-11-09  Tom Tromey  <address@hidden>
-
-       * pluseq3.test: New file.
-       * Makefile.am (TESTS): Added pluseq3.test.
-
-       * pluseq2.test: New file.
-       * Makefile.am (TESTS): Added pluseq2.test.
-
-1998-10-30  Tom Tromey  <address@hidden>
-
-       * pluseq.test: New file.
-       * Makefile.am (TESTS): Added pluseq.test.
-
-1998-10-28  Tom Tromey  <address@hidden>
-
-       * Makefile.am (distclean-local): Typo fix.
-
-1998-10-20  Tom Tromey  <address@hidden>
-
-       * Makefile.am (TESTS): Sorted tests.  From Jeff Garzik.
-
-1998-10-13  Tom Tromey  <address@hidden>
-
-       * libobj7.test: Updated to reflect minor change in automake (test
-       wasn't resilient enough).
-       * instman.test: Updated to reflect fact that mkinstalldirs will be
-       in distribution.
-
-       * cxxonly.test: Removed.
-
-Mon Aug 31 09:46:59 1998  Matthew D. Langston  <address@hidden>
-
-       * Makefile.am (TESTS): Added compile_f_c_cxx.test.
-       * compile_f_c_cxx.test: New file.
-
-Sat Aug 29 18:17:58 1998  Matthew D. Langston  <address@hidden>
-
-       * Makefile.am (TESTS): Added flink.test link_c_cxx.test
-       link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test.
-       Removed flink.test.
-       * flibs.test: New File.
-       * link_c_cxx.test: New file.
-       * link_f_c.test: New file.
-       * link_f_c_cxx.test: New file.
-       * link_f_cxx.test: New file.
-       * link_f_only.test: New file.
-
-Tue Aug 11 10:46:36 1998  Matthew D. Langston  <address@hidden>
-
-       * Makefile.am (TESTS): Add cxxonly.test, fonly.test, flink.test,
-       fnoc.test and fo.test.
-       * cxxonly.test: New file.
-       * fonly.test: New file.
-       * flink.test: New file.
-       * fnoc.test: New file.
-       * fo.test: New file.
-
-1998-10-08  Tom Tromey  <address@hidden>
-
-       * confdist.test: New file.
-       * Makefile.am (TESTS): Added confdist.test.
-
-1998-10-07  Tom Tromey  <address@hidden>
-
-       * extra4.test: New file.
-       * extra3.test: New file.
-       * Makefile.am (TESTS): Added extra3.test, extra4.test.
-
-Mon Oct  5 12:47:32 1998  Tom Tromey  <address@hidden>
-
-       * badline.test: New file.
-       * Makefile.am (TESTS): Added badline.test.
-
-Thu Oct  1 00:03:39 1998  Tom Tromey  <address@hidden>
-
-       * seenc.test: Updated test to account for removed line numbers.
-
-       * xsource.test: Correctly fail if source in subdir.
-
-Wed Sep 30 12:17:34 1998  Tom Tromey  <address@hidden>
-
-       * colon7.test: New file.
-       * Makefile.am (TESTS): Added colon7.test.
-
-Tue Sep 29 02:09:11 1998  Tom Tromey  <address@hidden>
-
-       * config.test: New file.
-       * Makefile.am (TESTS): Added config.test.
-
-       * Makefile.am (TESTS): Reference clean.test, not clean.am.
-
-Mon Sep 28 01:46:34 1998  Tom Tromey  <address@hidden>
-
-       * recurs2.test: New file, from Jim Meyering.
-       * Makefile.am (TESTS): Added recurs2.test.
-
-       * Makefile.am (TESTS): Added clean.am.
-       * clean.test: New file.
-       * ansi2.test: Updated test for new SUBDIRS change.
-       * noinst.test: Updated test for new SUBDIRS change.
-       * checkall.test: Added check to make sure check-local is handled.
-       Updated test for new SUBDIRS change.
-       * java.test: Updated test for new SUBDIRS change.
-
-Sun Sep 27 20:01:20 1998  Tom Tromey  <address@hidden>
-
-       * Makefile.am (TESTS): Added else.test.
-       * else.test: New file.
-
-       * Makefile.am (TESTS): Added parse.test.
-       * parse.test: New file.
-
-Sat Sep 26 19:17:43 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.test: Put AM_INIT_AUTOMAKE into configure.in.
-       * library.test: Use AC_EXEEXT.
-       * texinfo5.test: Use AC_EXEEXT.
-       * Many files: use AC_PROG_INSTALL, not AM_PROG_INSTALL.
-
-       Test suite updates for the @SHELL@ change:
-       * exsource.test: Set SHELL on `make' command line.
-       * ansi.test: Set SHELL on `make' command line.
-       * texinfo.test: Set SHELL on `make' command line.
-       * insh2.test: Set SHELL on `make' command line.
-       * empty.test: Rewrite @SHELL@ to /bin/sh.
-
-Tue Sep 22 01:20:00 1998  Tom Tromey  <address@hidden>
-
-       * ansi3.test: Use gcc and not gcc -traditional.
-
-Tue Sep 15 22:19:48 1998  Tom Tromey  <address@hidden>
-
-       * texinfo7.test: New file.
-
-Sun Aug 16 23:17:38 1998  Tom Tromey  <address@hidden>
-
-       * colon6.test: New file.
-
-Fri Aug 14 11:09:03 1998  Tom Tromey  <address@hidden>
-
-       * cond6.test: New file.
-
-Mon Aug 10 21:05:15 1998  Tom Tromey  <address@hidden>
-
-       * ansi3.test: New file.
-
-Sat Jul 18 00:27:26 1998  Tom Tromey  <address@hidden>
-
-       * recurs.test: New file.
-
-       * cond3.test: Changed to match recent fixes.
-
-Fri Jul 17 23:44:49 1998  Tom Tromey  <address@hidden>
-
-       * cond4.test, cond5.test: New files.
-
-Tue May 26 01:44:37 1998  Tom Tromey  <address@hidden>
-
-       * syntax.test: New file.
-
-Sun Apr  5 15:26:42 1998  Tom Tromey  <address@hidden>
-
-       * version3.test: Increased version number to ensure failure for a
-       long time to come.
-
-       * library.test: New file.
-
-       * lex2.test: Updated since lex error changed to warning.
-
-Fri Apr  3 13:04:50 1998  Tom Tromey  <address@hidden>
-
-       * colon5.test: New file.
-
-       * exdir2.test: New file.
-       * instdata.test: New file.
-
-Wed Mar 25 15:30:39 1998  Tom Tromey  <address@hidden>
-
-       * badopt.test: new file.
-       * version3.test: New file.
-
-Mon Mar 23 10:52:36 1998  Tom Tromey  <address@hidden>
-
-       * libobj8.test: New file.
-
-Fri Mar 20 00:32:16 1998  Tom Tromey  <address@hidden>
-
-       * lex2.test: New file.
-
-       * aclocalii.test: New file.
-
-       * javasubst.test: New file.
-
-Thu Mar 19 14:11:45 1998  Tom Tromey  <address@hidden>
-
-       * javaprim.test: New file.
-
-       * sinclude.test: New file.
-
-Wed Mar 18 17:15:22 1998  Tom Tromey  <address@hidden>
-
-       * java.test: New file.
-
-Sun Mar  8 15:35:14 1998  Tom Tromey  <address@hidden>
-
-       * colon4.test: New file.
-
-Fri Mar  6 21:17:10 1998  Tom Tromey  <address@hidden>
-
-       * colon3.test: Refined tests.
-
-Tue Feb 24 12:29:05 1998  Tom Tromey  <address@hidden>
-
-       * man.test: Removed.
-
-       * condman2.test: New file.
-
-Mon Feb 23 16:20:49 1998  Tom Tromey  <address@hidden>
-
-       * texinfo6.test: New file.
-
-Mon Feb 16 00:08:58 1998  Tom Tromey  <address@hidden>
-
-       * aclocali.test: New file.
-
-Fri Feb 13 00:36:38 1998  Tom Tromey  <address@hidden>
-
-       * texinfo5.test (info_TEXINFOS): New file.
-
-       * condman.test: New file.
-
-       * Makefile.am (distclean-local): Ignore rm return value.
-
-Thu Feb 12 21:00:34 1998  Tom Tromey  <address@hidden>
-
-       * unused.test: New file.
-
-       * whoami.test: New file.
-
-       * alpha.test: New file.
-
-Wed Feb 11 17:28:30 1998  Tom Tromey  <address@hidden>
-
-       * aclocal.test: New file.
-
-Thu Feb  5 13:22:17 1998  Tom Tromey  <address@hidden>
-
-       * cxxcpp.test: New file.
-
-Mon Dec  1 15:48:16 1997  Tom Tromey  <address@hidden>
-
-       * cond3.test: New file.
-
-Sat Nov 29 22:09:27 1997  Tom Tromey  <address@hidden>
-
-       * objc.test: New file.
-
-Sat Oct 25 00:04:04 1997  Tom Tromey  <address@hidden>
-
-       * libobj7.test: New file.
-
-Tue Oct 21 00:46:24 1997  Tom Tromey  <address@hidden>
-
-       * lex2.test: Removed; @LEXLIB@ no longer required.
-
-       * depacl2.test: Use -I, not --acdir.
-
-       * install.test: New file.
-       * ammissing.test: New file.
-
-Sun Sep 28 17:19:52 1997  Tom Tromey  <address@hidden>
-
-       * cxxnoc.test: Changed to reflect MKDEP change.
-
-Wed Sep 24 16:01:59 1997  Tom Tromey  <address@hidden>
-
-       * output5.test: New file.
-
-       * depend3.test: New file.
-
-Mon Aug 25 17:24:42 1997  Tom Tromey  <address@hidden>
-
-       * cygwin32.test: Use AM_EXEEXT, not AM_CYGWIN32.
-
-Tue Aug  5 20:33:33 1997  Tom Tromey  <address@hidden>
-
-       * libobj6.test: New file.
-
-Mon May 26 22:47:36 1997  Tom Tromey  <address@hidden>
-
-       * depend.test: Fixed test.
-
-Sat May 10 18:28:14 1997  Tom Tromey  <address@hidden>
-
-       * depend2.test: Fixed test; added another check.
-
-Sun May  4 15:47:24 1997  Tom Tromey  <address@hidden>
-
-       * xsource.test: New file.
-
-Tue Apr 29 19:08:47 1997  Tom Tromey  <address@hidden>
-
-       * cond.test, cond2.test: New files from Ian Taylor.
-
-Sun Apr 27 21:07:49 1997  Tom Tromey  <address@hidden>
-
-       * confsub.test: Fixed bug.
-
-Fri Apr 25 12:30:22 1997  Tom Tromey  <address@hidden>
-
-       * conf2.test: New file.
-
-Tue Apr  8 19:26:07 1997  Tom Tromey  <address@hidden>
-
-       * ansi.test, empty.test, exsource.test, insh2.test, man.test,
-       mkinst2.test, texinfo.test, texinfo2.test: Use $MAKE.
-
-       * defs (MAKE): Define.
-
-Mon Apr  7 17:35:49 1997  Tom Tromey  <address@hidden>
-
-       * version2.test: New file.
-
-Wed Apr  2 00:12:26 1997  Tom Tromey  <address@hidden>
-
-       * ldadd.test: New file.
-
-Fri Mar 28 23:36:04 1997  Tom Tromey  <address@hidden>
-
-       * stamph.test: New file.
-
-Thu Mar 27 18:10:47 1997  Tom Tromey  <address@hidden>
-
-       * lisp.test: New file.
-
-Sat Mar 22 01:14:03 1997  Tom Tromey  <address@hidden>
-
-       * cygwin32.test: New file.
-
-Thu Mar 20 00:34:33 1997  Tom Tromey  <address@hidden>
-
-       * exsource.test: Exit if not using GNU make.
-
-Tue Mar 18 22:36:34 1997  Tom Tromey  <address@hidden>
-
-       * remake2.test: Changed for `missing' support.
-
-Sun Mar 16 14:29:45 1997  Tom Tromey  <address@hidden>
-
-       * seenc.test: New file.
-
-       * checkall.test, noinst.test: Don't use bogus construct when
-       checking.
-
-       * libobj3.test, canon.test, target.test, spell2.test,
-       primary2.test, discover.test, lex2.test: Fixed to test what it
-       claims to test.
-
-Mon Mar 10 23:21:03 1997  Tom Tromey  <address@hidden>
-
-       * libobj.test, libobj2.test: Use AC_PROG_CC.
-
-       * confsub.test: Modified for definition of CONFIG_HEADER_FULL.
-
-       * cxxlibobj.test: New file.
-
-Wed Feb 26 13:05:42 1997  Tom Tromey  <address@hidden>
-
-       * tagsub.test: New file.
-
-Sun Feb 23 11:58:00 1997  Tom Tromey  <address@hidden>
-
-       * texinfo.test, texinfo2.test, texinfo3.test, info.test,
-       mdate.test, vtexi.test, canon2.test, mdate2.test, vtexi2.test:
-       Updated for new texinfo handling.
-
-       * texinfo4.test: New file.
-       * texinfo3.test: New file.
-
-Sat Feb 22 09:48:44 1997  Tom Tromey  <address@hidden>
-
-       * yaccpp.test: New file.
-
-Tue Feb 11 09:51:47 1997  Tom Tromey  <address@hidden>
-
-       * texinfo2.test: Fixed quoting bug.  From Michael Brantley.
-
-Tue Feb  4 18:41:32 1997  Tom Tromey  <address@hidden>
-
-       * confsub.test: Check subdir/Makefile.in to make sure dependency
-       is correct.
-
-       * ansi2.test: ANSI2KNR dependency of all.
-
-Tue Dec 10 00:43:14 1996  Tom Tromey  <address@hidden>
-
-       * defun2.test: New file.
-       * subst.test: New file.
-
-Sun Dec  8 12:25:22 1996  Tom Tromey  <address@hidden>
-
-       * colneq2.test: New file.
-
-Sat Dec  7 12:52:45 1996  Tom Tromey  <address@hidden>
-
-       * output4.test: New file.
-       * output3.test: New file.
-       * remake2.test: New file.
-       * output2.test: New file.
-
-Fri Dec  6 19:00:31 1996  Tom Tromey  <address@hidden>
-
-       * output.test: New file.
-
-Thu Dec  5 18:23:17 1996  Tom Tromey  <address@hidden>
-
-       * remake.test: New file.
-       * colon3.test: New file.
-       * colon2.test: New file.
-       * cxxo.test: New file.
-
-Wed Dec  4 00:41:44 1996  Tom Tromey  <address@hidden>
-
-       * defs: Allow user to set interpreter via PERL environment
-       variable.
-
-       * Makefile.am (distclean-local): New target.
-
-Tue Dec  3 11:55:18 1996  Gordon Matzigkeit  <address@hidden>
-
-       * dup.test, dup2.test: Modified, now that aclocal allows
-       acinclude.m4 to override any installed macro file.
-
-Mon Dec  2 22:44:16 1996  Gordon Matzigkeit  <address@hidden>
-
-       * alllib.test: Removed from distribution, since LIBFILES are no
-       longer computed.
-
-Sun Nov 24 14:36:00 1996  Tom Tromey  <address@hidden>
-
-       * extra2.test: New file.
-
-Fri Nov 22 00:10:04 1996  Tom Tromey  <address@hidden>
-
-       * stdlib.test: New file.
-
-Thu Nov 21 22:51:35 1996  Tom Tromey  <address@hidden>
-
-       * confsub.test: Use AM_CONFIG_HEADER.
-
-Tue Nov 19 23:37:32 1996  Tom Tromey  <address@hidden>
-
-       * confvar2.test: New file.
-
-Fri Nov 15 00:09:18 1996  Tom Tromey  <address@hidden>
-
-       * ansi2.test: New file.
-
-       * libfiles.test: Removed (obsolete).
-
-       * libobj.test, canon4.test, libobj2.test, alllib.test,
-       ranlib.test: Fixed for Gord's changes to library handling.
-
-       * Many files: Use AC_PROG_CC to avoid error.
-
-Thu Oct 24 15:22:53 1996  Tom Tromey  <address@hidden>
-
-       * confvar.test: New file.
-       * ranlib.test: New file.
-
-Mon Oct 21 22:57:51 1996  Tom Tromey  <address@hidden>
-
-       * version.test: New file.
-
-Fri Oct 11 00:51:04 1996  Tom Tromey  <address@hidden>
-
-       * libobj5.test: New file.
-       * libobj4.test: New file.
-       * distdir.test: New file.
-       * lex2.test: New file.
-
-Sun Oct  6 11:00:44 1996  Tom Tromey  <address@hidden>
-
-       * acsilent.test: New file.
-       * req.test: New file.
-       * acinclude.test: New file.
-
-Sat Oct  5 11:31:38 1996  Tom Tromey  <address@hidden>
-
-       * discover.test: New file.
-
-       * mkinst2.test: Renamed from mkinstall2.test.
-
-       * symlink.test: New file.
-
-Thu Oct  3 19:55:23 1996  Tom Tromey  <address@hidden>
-
-       * vpath.test: New file.
-
-Mon Sep 30 08:34:07 1996  Tom Tromey  <address@hidden>
-
-       * comment2.test: New file.
-
-Mon Sep 23 00:23:34 1996  Tom Tromey  <address@hidden>
-
-       * spell3.test: New file.
-
-Sun Sep 22 14:42:09 1996  Tom Tromey  <address@hidden>
-
-       * depend2.test: New file.
-
-Sat Sep 21 14:01:10 1996  Tom Tromey  <address@hidden>
-
-       * primary2.test: New file.
-       * primary.test: New file.
-
-Fri Sep 20 09:39:27 1996  Tom Tromey  <address@hidden>
-
-       * confsub.test: New file.
-
-Mon Sep 16 00:05:52 1996  Tom Tromey  <address@hidden>
-
-       * spell2.test: New file.
-
-       * spell.test: New file.
-
-Thu Sep 12 14:57:49 1996  Tom Tromey  <address@hidden>
-
-       * implicit.test: New file.
-
-Wed Sep 11 13:57:10 1996  Tom Tromey  <address@hidden>
-
-       * colneq.test: New file.
-
-       * interp2.test: New file.
-
-Sun Sep  8 10:47:07 1996  Tom Tromey  <address@hidden>
-
-       * gnits.test: New file.
-
-Thu Sep  5 22:54:26 1996  Tom Tromey  <address@hidden>
-
-       * libobj3.test: New file.
-
-Tue Sep  3 20:57:38 1996  Tom Tromey  <address@hidden>
-
-       * block.test: New file.
-
-Mon Aug 26 23:04:01 1996  Tom Tromey  <address@hidden>
-
-       * alllib.test: New file.
-
-       * interp.test: New file.
-
-Mon Aug 12 13:58:55 1996  Tom Tromey  <address@hidden>
-
-       * libobj2.test: New file.
-
-       * order.test: New file.
-
-Sun Aug 11 00:10:42 1996  Tom Tromey  <address@hidden>
-
-       * cxxnoc.test: New file.
-
-       * cxxlink.test: Use AC_PROG_CXX.
-
-       * lex.test: Use AC_PROG_LEX, AC_DECL_YYTEXT.
-
-       * yacc.test: Use AC_PROG_YACC in configure.in.
-
-       * cxxlink.test: New file.
-
-       * yacc.test: Fixed test for new yacc code.
-
-Sat Aug 10 10:09:45 1996  Tom Tromey  <address@hidden>
-
-       * defun.test: New file.
-
-       * dup.test: New file.
-
-Fri Aug  9 09:18:07 1996  Tom Tromey  <address@hidden>
-
-       * canon4.test: New file.
-
-Thu Aug  8 10:47:45 1996  Tom Tromey  <address@hidden>
-
-       * exsource.test: New file.
-
-       * subdir2.test: New file.
-
-       * scripts.test: New file.
-
-Tue Aug  6 12:30:41 1996  Tom Tromey  <address@hidden>
-
-       * lex.test: New file.
-
-Mon Aug  5 01:03:03 1996  Tom Tromey  <address@hidden>
-
-       * obsolete.test: New file.
-
-       * Many files: Use AM_ macros, not fp_ macros.
-
-       * info.test: New file.
-
-Sun Aug  4 12:47:34 1996  Tom Tromey  <address@hidden>
-
-       * man.test: New file.
-
-       * acouttbs2.test: New file.
-
-       * libfiles.test: New file.
-
-       * comment.test: New file.
-
-       * tags.test: New file.
-
-       * vtexi2.test: New file.
-
-       * colon.test: New file.
-
-Sun Jul 28 11:43:00 1996  Tom Tromey  <address@hidden>
-
-       * defs (ACLOCAL): Added definition.
-
-       * depacl.test, depacl2.test, error.test: New tests for aclocal.
-
-Fri Jul 19 10:09:56 1996  Tom Tromey  <address@hidden>
-
-       * ansi.test: New file.
-
-Sun Jun  9 23:20:03 1996  Tom Tromey  <address@hidden>
-
-       * texinfo2.test: New file.
-
-Sat Jun  8 10:00:42 1996  Tom Tromey  <address@hidden>
-
-       * mkinstall2.test: New file.
-
-Fri Jun  7 18:17:11 1996  Tom Tromey  <address@hidden>
-
-       * yacc.test: New file.
-
-Sun Jun  2 09:04:52 1996  Tom Tromey  <address@hidden>
-
-       * dejagnu.test: New file.
-
-       * texinfo.test: New file.
-
-Thu May 23 09:58:48 1996  Tom Tromey  <address@hidden>
-
-       * fpinst2.test: New file.
-
-       * fpinstall.test: New file.
-
-Wed May 22 09:45:52 1996  Tom Tromey  <address@hidden>
-
-       * outdir.test: New file.
-
-Sat May 18 10:51:37 1996  Tom Tromey  <address@hidden>
-
-       * insh2.test: New file.
-
-Fri May 17 17:32:35 1996  Tom Tromey  <address@hidden>
-
-       * number.test: New file.
-
-       * defs, many .test files: Define PACKAGE and VERSION in
-       configure.in.
-
-       * package.test: New file.
-
-       * backsl.test: New file.
-
-Thu May 16 09:15:57 1996  Tom Tromey  <address@hidden>
-
-       * subdir.test: New file.
-
-Tue May 14 10:17:17 1996  Tom Tromey  <address@hidden>
-
-       * mdate2.test: New file, from report by Jim Meyering.
-
-       * canon3.test: New file.
-
-       * auxdir.test: New file.
-
-       * mkinstall.test: New file.
-
-       * extra.test: Reversed sense of test.
-
-Fri Apr 26 15:15:01 1996  Tom Tromey  <address@hidden>
-
-       * instman.test: New file.
-
-Thu Apr 25 17:12:30 1996  Tom Tromey  <address@hidden>
-
-       * noinst.test: New file
-
-       * exdir.test: Quoting change from Gord Matzigkeit.
-
-       * extra.test (EXTRA_PROGRAMS): New file.
-
-Tue Apr  9 22:55:07 1996  Tom Tromey  <address@hidden>
-
-       * target.test: New file.
-
-Wed Apr  3 15:10:54 1996  Tom Tromey  <address@hidden>
-
-       * canon2.test: New file
-
-       * insh.test: New file.
-
-Wed Mar 27 23:31:51 1996  Tom Tromey  <address@hidden>
-
-       * rulepat.test: New file.
-
-Sat Mar 16 08:37:36 1996  Tom Tromey  <address@hidden>
-
-       * empty.test: New file.
-
-Fri Mar 15 17:55:13 1996  Tom Tromey  <address@hidden>
-
-       * installsh.test: New file.
-
-Tue Mar  5 16:22:46 1996  Tom Tromey  <address@hidden>
-
-       * badprog.test: Rewrote.
-
-       * canon.test: New file.
-
-Mon Mar  4 21:08:37 1996  Tom Tromey  <address@hidden>
-
-       * exdir.test: New file.
-
-Fri Mar  1 17:23:53 1996  Tom Tromey  <address@hidden>
-
-       * depend.test: New file.
-
-       * badprog.test: New file.
-
-       * defs (AUTOMAKE): Pass --foreign.
-
-Thu Feb 29 20:23:42 1996  Tom Tromey  <address@hidden>
-
-       More tests:
-       * prefix.test: New file.
-       * spelling.test: New file
-       * confincl.test: New file.
-       * Makefile.am (TESTS): Updated.
-
-Wed Feb 28 11:57:02 1996  Tom Tromey  <address@hidden>
-
-       * acoutqnl.test: New file.
-       * Makefile.am (TESTS): Include it.
-
-Tue Feb 27 10:52:58 1996  Tom Tromey  <address@hidden>
-
-       * Makefile.am (DIST_OTHER): Include "defs".
-
-       * defs (AUTOMAKE): Never relative to $srcdir.
-
-Mon Feb 26 23:14:08 1996  Tom Tromey  <address@hidden>
-
-       * libobj.test: Put AC_PROG_RANLIB in configure.in
-
-Mon Feb 19 08:22:22 1996  Tom Tromey  <address@hidden>
-
-       * proginst.test: New file.
-
-Tue Feb 13 18:54:39 1996  Tom Tromey  <address@hidden>
-
-       * libobj.test: New file.
-
-Mon Feb 12 17:05:48 1996  Tom Tromey  <address@hidden>
-
-       * acouttbs.test: New file.
-
-       * Makefile.am (DIST_OTHER): New variable.
-
-       * acoutnoq.test: New file.
-
-Sun Feb 11 16:39:14 1996  Tom Tromey  <address@hidden>
-
-       * checkall.test: Delay a little.
-
-       * Makefile.am (check-local): Print name of failing test.
-
-Sat Feb 10 17:08:39 1996  Tom Tromey  <address@hidden>
-
-       * checkall.test: New file.
-
-       * instexec.test: New file.
-
-       * mdate.test, vtexi.test, acoutput.test: New files.
-
-       * Started.
diff --git a/tests/CheckListOfTests.am b/tests/CheckListOfTests.am
deleted file mode 100644
index c71c7fc..0000000
--- a/tests/CheckListOfTests.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## -*- Automake -*-
-##
-## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-## Temporary files used in the `check-list-of-tests' target.
-am__tmk = tests-in-makefile-list.tmp
-am__tfs = tests-on-filesystem-list.tmp
-am__tdf = diff-in-tests-lists.tmp
-
-## Check that the list of tests given in the Makefile is equal to the
-## list of all test scripts in the Automake testsuite.
-.PHONY: maintainer-check-list-of-tests
-maintainer-check-list-of-tests:
-## Prefer unified diffs over plain diffs, for readability.
-        @if diff -u /dev/null /dev/null >/dev/null 2>&1; then \
-          diff='diff -u'; \
-        else \
-          diff='diff'; \
-        fi; \
-## List of tests in Makefile.
-        lst='$(expected_list_of_tests)'; \
-        test -n "$$lst" || lst='$(TESTS)'; \
-        for t in $$lst; do \
-          echo "$$t"; \
-        done | sort >$(am__tmk); \
-## List of subdirs where to look for tests.
-        dirs='$(test_subdirs)'; \
-        test -n "$$dirs" || dirs=.; \
-## List of tests on filesystem.  Be careful to cater for VPATH builds too.
-        for ext in $(TEST_EXTENSIONS); do \
-          for dir in $$dirs; do \
-            ls $$dir/*$$ext 2>/dev/null; \
-            if test $(srcdir) != $(builddir); then \
-              (cd $(srcdir) && ls $$dir/*$$ext 2>/dev/null); \
-            fi; \
-          done; \
-        done | sed 's,^\./,,' | sort | uniq >$(am__tfs); \
-## Compare the two lists, complain if they differ.
-        if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
-           result=0; \
-        else \
-           echo '$@: list of tests in Makefile an on filesystem differ' >&2; \
-           echo "+ $$diff in-makefile on-filesystem" >&2; \
-           cat $(am__tdf) >&2; \
-           result=1; \
-        fi; \
-        rm -f $(am__tmk) $(am__tfs) $(am__tdf); \
-        exit $$result;
-
-.PHONY: clean-maintcheck-testslist-tmp
-clean-local: clean-maintcheck-testslist-tmp
-clean-maintcheck-testslist-tmp:
-       rm -f $(am__tmk) $(am__tfs) $(am__tdf)
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index e8feaa3..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,137 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-include $(srcdir)/parallel-tests.am
-
-$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
-       $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
-
-$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
-       $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'` \
-         && sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
-              < $(srcdir)/$$input >$@ \
-         && chmod a+rx $@
-
-MAINTAINERCLEANFILES = $(parallel_tests)
-
-# Some testsuite-influential variables should be overridable from the
-# test scripts, but not from the environment.
-TESTS_ENVIRONMENT = \
-  test x"$$me" = x || unset me; \
-  test x"$$required" = x || unset required; \
-  test x"$$parallel_tests" = x || unset parallel_tests;
-
-TEST_EXTENSIONS = .pl .test
-
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
-
-include $(srcdir)/list-of-tests.mk
-
-TESTS = $(handwritten_TESTS) $(parallel_tests)
-
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-ar-lib4.log: libtool-macros.log
-ar-lib6a.log: libtool-macros.log
-ar-lib6b.log: libtool-macros.log
-depcomp4.log: libtool-macros.log
-depcomp7.log: libtool-macros.log
-depcomp8b.log: libtool-macros.log
-extradep2.log: libtool-macros.log
-fort5.log: libtool-macros.log
-instdir-ltlib.log: libtool-macros.log
-instfail-libtool.log: libtool-macros.log
-ldadd.log: libtool-macros.log
-ldflags.log: libtool-macros.log
-libobj13.log: libtool-macros.log
-libtoo10.log: libtool-macros.log
-libtoo11.log: libtool-macros.log
-libtool.log: libtool-macros.log
-libtool2.log: libtool-macros.log
-libtool3.log: libtool-macros.log
-libtool5.log: libtool-macros.log
-libtool6.log: libtool-macros.log
-libtool7.log: libtool-macros.log
-libtool8.log: libtool-macros.log
-libtool9.log: libtool-macros.log
-listval.log: libtool-macros.log
-ltcond.log: libtool-macros.log
-ltcond2.log: libtool-macros.log
-ltconv.log: libtool-macros.log
-ltdeps.log: libtool-macros.log
-ltinit.log: libtool-macros.log
-ltinstloc.log: libtool-macros.log
-ltlibobjs.log: libtool-macros.log
-ltlibsrc.log: libtool-macros.log
-ltorder.log: libtool-macros.log
-nobase-libtool.log: libtool-macros.log
-pr211.log: libtool-macros.log
-pr300-ltlib.log: libtool-macros.log
-pr307.log: libtool-macros.log
-pr401b.log: libtool-macros.log
-pr72.log: libtool-macros.log
-reqd2.log: libtool-macros.log
-silent3.log: libtool-macros.log
-silent4.log: libtool-macros.log
-silent9.log: libtool-macros.log
-stdlib2.log: libtool-macros.log
-strip3.log: libtool-macros.log
-subobj9.log: libtool-macros.log
-suffix10.log: libtool-macros.log
-suffix2.log: libtool-macros.log
-suffix5.log: libtool-macros.log
-suffix8.log: libtool-macros.log
-vala.log: libtool-macros.log
-vala1.log: libtool-macros.log
-vala2.log: libtool-macros.log
-vala3.log: libtool-macros.log
-vala4.log: libtool-macros.log
-vala5.log: libtool-macros.log
-
-# FIXME: make these automatically computed once we are merged into
-# FIXME: the `testsuite-work' branch.
-gettext.log: gettext-macros.log
-gettext2.log: gettext-macros.log
-gettext3.log: gettext-macros.log
-subcond.log: gettext-macros.log
-
-EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
-
-distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am
-EXTRA_DIST += distcheck-hook-m4.am
-
-# Each test case depends on defs, aclocal, and automake.
-check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
-
-## Checking the list of tests.
-test_subdirs = . pm
-include $(srcdir)/CheckListOfTests.am
-maintainer-check-list-of-tests: $(parallel_tests)
-
-clean-local: clean-local-check
-.PHONY: clean-local-check
-clean-local-check:
-       -set x *.dir; shift; \
-        if test "$$#,$$1" = "1,*.dir"; then \
-          : there is no test directory to clean; \
-        else \
-          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
-          rm -rf "$$@"; \
-        fi;
diff --git a/tests/README b/tests/README
deleted file mode 100644
index 561f426..0000000
--- a/tests/README
+++ /dev/null
@@ -1,197 +0,0 @@
-                           The Automake test suite
-
-
-User interface
-==============
-
-
-Running all tests
------------------
-
-  make check
-
-  You can use `-jN' for faster completion (it even helps on a
-  uniprocessor system, due to unavoidable sleep delays, as
-  noted below).
-
-
-Interpretation
---------------
-
-  Successes:
-    PASS  - success
-    XFAIL - expected failure
-
-  Failures:
-    FAIL  - failure
-    XPASS - unexpected success
-
-  Other:
-    SKIP  - skipped tests (third party tools not available)
-
-
-Getting details from failures
------------------------------
-
-  Each test is a shell script, and by default is run by /bin/sh.
-  In a non-VPATH build you can run them directly, they will be verbose.
-  By default, verbose output of a test foo.test is retained in the log
-  file foo.log.  A summary log is created in the file test-suite.log.
-
-  You can limit the set of files using the TESTS variable, and enable
-  detailed test output at the end of the test run with the VERBOSE
-  variable:
-
-    env VERBOSE=x TESTS='first.test second.test ...' make -e check
-
-
-Supported shells
-----------------
-
-  The test scripts are written with portability in mind, so that they
-  should run with any decent Bourne-compatible shell.
-
-  However, some care must be used with Zsh, since, when not directly
-  starting in Bourne-compatibility mode, it has some incompatibilities
-  in the handling of `$0' which conflict with our usage, and which have
-  no easy workaround.  Thus, if you want to run a test script, say
-  foo.test, with Zsh, you *can't* simply do `zsh foo.test', but you
-  *must* resort to:
-    zsh -o no_function_argzero foo.test
-
-  Note that this problem does not occur if zsh is executed through a
-  symlink with a basename of `sh', since in that case it starts
-  in Bourne compatibility mode.  So you should be perfectly safe when
-  /bin/sh is zsh.
-
-
-Reporting failures
-------------------
-
-  Send verbose output, i.e., the contents of test-suite.log, of failing
-  tests to <address@hidden>, along with the usual version numbers
-  (which Automake, which Autoconf, which operating system, which make
-  version, which shell, etc.)
-
-
-
-Writing test cases
-==================
-
-
-Do
---
-
-  If you plan to fix a bug, write the test case first.  This way you'll
-  make sure the test catches the bug, and that it succeeds once you have
-  fixed the bug.
-
-  Add a copyright/license paragraph.
-
-  Explain what the test does.
-
-  Cite the PR number (if any), and the original reporter (if any), so
-  we can find or ask for information if needed.
-
-  If a test checks examples or idioms given in the documentation, make
-  sure the documentation reference them appropriately in comments, as in:
-    @c Keep in sync with autodist-config-headers.test.
-    @example
-    ...
-    @end example
-
-  Use `required=...' for required tools.  Do not explicitly require
-  tools which can be taken for granted because they're listed in the
-  GNU Coding Standards (for example, `gzip').
-
-  Include ./defs in every test script (see existing tests for examples
-  of how to do this).
-
-  Use the `skip_' function to skip tests, with a meaningful message if
-  possible.  Where convenient, use the `warn_' function to print generic
-  warnings, the `fail_' function for test failures, and the `fatal_'
-  function for hard errors.  In case a hard error is due to a failed
-  set-up of a test scenario, you can use the `framework_fail_' function
-  instead.
-
-  For tests that use the `parallel-tests' Automake option, set the shell
-  variable `parallel_tests' to "yes" before including ./defs.  Also,
-  do not use for them a name that ends in `-p.test', since that would
-  risk to clash with automatically-generated tests.  For tests that are
-  *not* meant to work with the `parallel-tests' Automake option (these
-  should be very very few), set the shell variable `parallel_tests' to
-  "no" before including ./defs.
-
-  ./defs sets a skeleton configure.in.  If possible, append to this
-  file.  In some cases you'll have to overwrite it, but this should
-  be the exception.  Note that configure.in registers Makefile.in
-  but do not output anything by default.  If you need ./configure
-  to create Makefile, append AC_OUTPUT to configure.in.
-
-  Use `set -e' to catch failures you might not have thought of.
-
-  End the test script with a `:' or `Exit 0'.  Otherwise, when somebody
-  changes the test by adding a failing command after the last command,
-  the test will spuriously fail because $? is nonzero at the end.
-  Note that this is relevant also for tests using `set -e', if they
-  contain commands like "grep ... Makefile.in && Exit 1" (and there
-  are indeed a lot of such tests).
-
-  Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
-  $PERL, $MAKE, $EGREP, and $FGREP, instead of the corresponding
-  commands.
-
-  Use $sleep when you have to make sure that some file is newer
-  than another.
-
-  Use `cat' or `grep' to display (part of) files that may be
-  interesting for debugging, so that when a user send a verbose
-  output we don't have to ask him for more details.  Display stderr
-  output on the stderr file descriptor.  If some redirected command
-  is likely to fail, and `set -e' is in effect, display its output
-  even in the failure case, before exiting.
-
-  Use `Exit' rather than `exit' to abort a test.
-
-  Use `$PATH_SEPARATOR', not hard-coded `:', as the separator of
-  PATH's entries.
-
-  It's more important to make sure that a feature works, than
-  make sure that Automake's output looks correct.  It might look
-  correct and still fail to work.  In other words, prefer
-  running `make' over grepping `Makefile.in' (or do both).
-
-  If you run $AUTOMAKE or $AUTOCONF several times in the same test
-  and change `configure.in' by the meantime, do
-    rm -rf autom4te.cache
-  before the following runs.  On fast machines the new `configure.in'
-  could otherwise have the same timestamp as the old `autom4te.cache'.
-  Alternatively, use `--force' for subsequent runs of the tools.
-
-  Use filenames with two consecutive spaces when testing that some
-  code preserves filenames with spaces.  This will catch errors like
-  `echo $filename | ...`.
-
-  Before commit: make sure the test is executable, add the tests to
-  TESTS in Makefile.am, add it to XFAIL_TESTS in addition if needed,
-  write a ChangeLog entry, send the diff to <address@hidden>.
-
-
-Do not
-------
-
-  Do not test an Automake error with `$AUTOMAKE && Exit 1', or in three
-  years we'll discover that this test failed for some other bogus reason.
-  This happened many times.  Better use something like
-     AUTOMAKE_fails
-     grep 'expected diagnostic' stderr
-  (Note this doesn't prevent the test from failing for another
-  reason, but at least it makes sure the original error is still
-  here.)
-
-  Do not override Makefile variables using make arguments, as in e.g.:
-    $MAKE prefix=/opt install
-  This is not portable for recursive targets (targets that call a
-  sub-make may not pass `prefix=/opt' along).  Use the following
-  instead:
-    prefix=/opt $MAKE -e install
diff --git a/tests/aclibobj.test b/tests/aclibobj.test
deleted file mode 100755
index a40baa4..0000000
--- a/tests/aclibobj.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure AC_LIBOBJ and friends work.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > maude.c
-: > liver.c
-: > ar-lib
-
-$ACLOCAL
-
-set -e
-
-cp configure.in X
-echo 'AC_LIBSOURCE(maude.c)' >> configure.in
-$AUTOMAKE
-
-# Avoid timestamp-related differences.
-rm -rf autom4te.cache
-
-cp X configure.in
-echo 'AC_LIBSOURCES([maude.c, liver.c])' >> configure.in
-$AUTOMAKE
diff --git a/tests/acloca10.test b/tests/acloca10.test
deleted file mode 100755
index 581fe77..0000000
--- a/tests/acloca10.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2005, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal define macros in the same order as -I's.
-# This is the same as aclocal9.test, with the macro calls reversed.
-# (It did make a difference.)
-#
-# Also check for --install.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-MACRO2
-MACRO1
-MACRO3
-END
-
-mkdir m4_1 m4_2 dirlist-test
-
-cat >m4_1/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
-EOF
-
-cat >m4_2/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
-EOF
-
-cat >dirlist-test/macro.m4 <<EOF
-AC_DEFUN([MACRO3], [echo macro3 >> foo])
-EOF
-
-$ACLOCAL -I m4_1 -I m4_2
-$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
-grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
-
-$sleep
-
-$ACLOCAL -I m4_2 -I m4_1
-$AUTOCONF
-./configure
-grep macro12 foo
-grep macro21 foo
-grep macro3 foo
-grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
-
-$sleep
-
-$ACLOCAL -I m4_1 -I m4_2 --install
-$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
-grep MACRO3 aclocal.m4 && Exit 1
-test -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
-cp aclocal.m4 copy.m4
-
-$sleep
-
-echo '#GREPME' >>dirlist-test/macro.m4
-$ACLOCAL -I m4_1 -I m4_2 --install
-$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-grep macro3 foo
-grep MACRO3 aclocal.m4 && Exit 1
-grep GREPME m4_1/macro.m4 && Exit 1
-test -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
-diff aclocal.m4 copy.m4
diff --git a/tests/acloca11.test b/tests/acloca11.test
deleted file mode 100755
index 61e9e8a..0000000
--- a/tests/acloca11.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that when two files define the same macro in the same
-# directory, the macro from the lexically greatest file is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-MACRO2
-MACRO1
-END
-
-mkdir m4
-
-cat >m4/version1.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
-EOF
-
-cat >m4/version2.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
-EOF
-
-$ACLOCAL -I m4
-$AUTOCONF
-./configure
-grep macro12 foo
-grep macro21 foo
diff --git a/tests/acloca12.test b/tests/acloca12.test
deleted file mode 100755
index 14d699a..0000000
--- a/tests/acloca12.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that when two files define the same macro in the same
-# directory, the macro from the lexically greatest file is used.
-# Same as acloca11.test, but without calling MACRO2.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-MACRO1
-END
-
-mkdir m4
-
-cat >m4/version1.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 >> foo])
-AC_DEFUN([MACRO2], [echo macro21 > foo])
-EOF
-
-cat >m4/version2.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 >> foo])
-EOF
-
-$ACLOCAL --verbose -I m4
-$AUTOCONF
-./configure
-grep macro11 foo && Exit 1
-grep macro21 foo && Exit 1
-grep macro12 foo
diff --git a/tests/acloca13.test b/tests/acloca13.test
deleted file mode 100755
index 56a54eb..0000000
--- a/tests/acloca13.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure changes to m4_included files also cause aclocal.m4 to change.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-m4_include([somefile.m4])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'EOF'
-check-local:
-       test -f "$(srcdir)/somefile.m4"
-       test -f "$(srcdir)/m4/version1.m4"
-       test -f "$(srcdir)/m4/otherfile.m4"
-EOF
-
-mkdir m4
-
-echo MACRO1 >somefile.m4
-echo 'AC_PREREQ([2.58])' >m4/otherfile.m4
-
-cat >m4/version1.m4 <<EOF
-AC_DEFUN([MACRO1])
-AC_DEFUN([MACRO2])
-m4_sinclude(m4/otherfile.m4)
-EOF
-
-cat >m4/version2.m4 <<EOF
-AC_DEFUN([MACRO1])
-EOF
-
-$ACLOCAL -I m4
-grep version2 aclocal.m4
-grep version1 aclocal.m4 && Exit 1
-
-$sleep
-echo MACRO2 >somefile.m4
-
-$ACLOCAL -I m4
-grep version2 aclocal.m4 && Exit 1
-grep version1 aclocal.m4
-
-$sleep
-# aclocal.m4 should change if we touch otherfile.m4
-touch m4/otherfile.m4
-$sleep
-$ACLOCAL -I m4
-test `ls -1t aclocal.m4 m4/otherfile.m4 | sed 1q` = aclocal.m4
-
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE distcheck
diff --git a/tests/acloca14.test b/tests/acloca14.test
deleted file mode 100755
index 1bdf7c7..0000000
--- a/tests/acloca14.test
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure m4_included files are also scanned for definitions.
-# Report from Phil Edwards.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-echo 'm4_include([a.m4])' > acinclude.m4
-echo 'm4_include([b.m4])' > a.m4
-
-cat >b.m4 <<EOF
-m4_include([c.m4])
-AC_DEFUN([AM_PROG_LIBTOOL],
-[AC_REQUIRE([SOMETHING])dnl
-AC_REQUIRE([SOMETHING_ELSE])dnl
-])
-
-AC_DEFUN([SOMETHING])
-EOF
-
-echo 'm4_include([d.m4])' > c.m4
-echo 'AC_DEFUN([SOMETHING_ELSE])' >d.m4
-
-mkdir defs
-echo 'AC_DEFUN([SOMETHING_ELSE])' >defs/e.m4
-echo 'AC_DEFUN([ANOTHER_MACRO])' >defs/f.m4
-
-cat >>Makefile.am<<\EOF
-ACLOCAL_AMFLAGS = -I defs
-testdist1: distdir
-       test -f $(distdir)/acinclude.m4
-       test -f $(distdir)/a.m4
-       test -f $(distdir)/b.m4
-       test -f $(distdir)/c.m4
-       test -f $(distdir)/d.m4
-       test ! -d $(distdir)/defs
-testdist2: distdir
-       test -f $(distdir)/acinclude.m4
-       test -f $(distdir)/a.m4
-       test -f $(distdir)/b.m4
-       test -f $(distdir)/c.m4
-       test -f $(distdir)/d.m4
-       test ! -f $(distdir)/defs/e.m4
-       test -f $(distdir)/defs/f.m4
-EOF
-
-$ACLOCAL -I defs
-
-$FGREP acinclude.m4 aclocal.m4
-# None of the following macro should be included.  acinclude.m4
-# includes the first four, and the last two are not needed at all.
-$FGREP a.m4 aclocal.m4 && Exit 1
-$FGREP b.m4 aclocal.m4 && Exit 1
-$FGREP c.m4 aclocal.m4 && Exit 1
-$FGREP d.m4 aclocal.m4 && Exit 1
-$FGREP defs/e.m4 aclocal.m4 && Exit 1
-$FGREP defs/f.m4 aclocal.m4 && Exit 1
-
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE testdist1
-
-cp aclocal.m4 stamp
-$sleep
-
-cat >>c.m4 <<\EOF
-AC_DEFUN([FOO], [ANOTHER_MACRO])
-EOF
-
-$MAKE
-
-# Because c.m4 has changed, aclocal.m4 must have been rebuilt.
-test `ls -1t aclocal.m4 stamp | sed 1q` = aclocal.m4
-# However, since FOO is not used, f.m4 should not be included
-# and the contents of aclocal.m4 should remain the same
-diff aclocal.m4 stamp
-
-# If FOO where to be used, that would be another story, of course.
-cat >>configure.in <<EOF
-FOO
-EOF
-
-cp aclocal.m4 stamp
-$sleep
-
-$MAKE
-
-$FGREP defs/f.m4 aclocal.m4
-$MAKE testdist2
-
-# Make sure aclocal diagnose missing included files with correct `file:line:'.
-rm -f b.m4
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'a\.m4:1: .*b\.m4.*does not exist' stderr
-
-:
diff --git a/tests/acloca15.test b/tests/acloca15.test
deleted file mode 100755
index dd612ec..0000000
--- a/tests/acloca15.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal scans configure.in for macro definitions.
-# PR/319.
-
-. ./defs || Exit 1
-
-set -e
-
-# Start macros with AM_ because that causes aclocal to complain if it
-# cannot find them.
-
-cat >> configure.in << 'END'
-m4_include([somedef.m4])
-AC_DEFUN([AM_SOME_MACRO])
-AC_DEFUN([AM_SOME_OTHER_MACRO])
-AM_SOME_MACRO
-AM_SOME_OTHER_MACRO
-AM_MORE_MACRO
-END
-
-mkdir m4
-echo 'AC_DEFUN([AM_SOME_MACRO])' > m4/some.m4
-echo 'AC_DEFUN([AM_SOME_DEF])' > somedef.m4
-echo 'AC_DEFUN([AM_MORE_MACRO], [AC_REQUIRE([AM_SOME_DEF])])' > m4/more.m4
-
-$ACLOCAL -I m4
-$FGREP AM_SOME_MACRO aclocal.m4 && Exit 1
-$FGREP AM_MORE_MACRO aclocal.m4 && Exit 1
-$FGREP 'm4_include([m4/more.m4])' aclocal.m4
-test 1 = `grep m4_include aclocal.m4 | wc -l`
diff --git a/tests/acloca16.test b/tests/acloca16.test
deleted file mode 100755
index 93bde8b..0000000
--- a/tests/acloca16.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal does not include definitions that are not actually
-# evaluated.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([POM])
-END
-
-mkdir m4
-cat >m4/some.m4 <<'EOF'
-AC_DEFUN([AM_SOME_MACRO],
-[AC_DEFUN([AC_SUBST], [GREPME])])
-EOF
-
-$ACLOCAL -I m4
-grep m4/some.m4 aclocal.m4 && Exit 1
-:
diff --git a/tests/acloca17.test b/tests/acloca17.test
deleted file mode 100755
index 884f24b..0000000
--- a/tests/acloca17.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal report unused required macros.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-SOME_DEFS
-END
-
-mkdir m4
-cat >m4/somedefs.m4 <<EOF
-AC_DEFUN([SOME_DEFS], [
-  AC_REQUIRE([UNDEFINED_MACRO])
-])
-EOF
-
-# FIXME: We want autom4te's 'undefined required macro' warning to be fatal,
-# but have no means to say so to aclocal.  We use WARNINGS=error instead.
-
-WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'configure.in:4:.*UNDEFINED_MACRO' stderr
diff --git a/tests/acloca18.test b/tests/acloca18.test
deleted file mode 100755
index 7c97301..0000000
--- a/tests/acloca18.test
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006, 2008, 2010, 2012 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for --install with #serial numbers.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MACRO1
-AM_MACRO2
-END
-
-mkdir 1 2 3 4
-
-cat >1/m1.m4 <<EOF
-#serial 1.8.1230.9
-AC_DEFUN([AM_MACRO1], [echo macro11 >> foo])
-AC_DEFUN([AM_MACRO2], [echo macro21 >> foo])
-EOF
-
-cat >2/m1.m4 <<EOF
-#serial 1.8.1231.9
-AC_DEFUN([AM_MACRO1], [echo macro12 >> foo])
-EOF
-
-cat >3/m2.m4 <<EOF
-#serial 13
-AC_DEFUN([AM_MACRO2], [echo macro23 >> foo])
-EOF
-
-cat >3/m1.m4 <<EOF
-#serial 1.8.1230.1
-AC_DEFUN([AM_MACRO1], [echo macro13 >> foo])
-EOF
-
-cat >4/mumble.m4 <<EOF
-#serial 0
-AC_DEFUN([AM_MACRO1], [echo macro14 >> foo])
-EOF
-
-clean_stale ()
-{
-  rm -rf aclocal.m4 configure foo autom4te*.cache
-}
-
-$ACLOCAL -I 1 -I 2 -I 3 -I 4
-$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-
-clean_stale
-$ACLOCAL  -I 1 -I 2 -I 3 -I 4 --install
-$AUTOCONF
-./configure
-grep macro12 foo
-grep macro23 foo
-
-cp -f aclocal.m4 aclocal-m4.sav
-clean_stale
-mv -f aclocal-m4.sav aclocal.m4
-$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
-$AUTOCONF
-./configure
-grep macro12 foo
-grep macro23 foo
-
-clean_stale
-$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
-$AUTOCONF
-./configure
-grep macro14 foo
-grep macro23 foo
-
-clean_stale
-$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'macro.*AM_MACRO2.*not found' stderr
-
-clean_stale
-$ACLOCAL -I 4 -I 1 --install
-$AUTOCONF
-./configure
-grep macro14 foo
-grep macro21 foo
-
-mkdir dirlist-test
-cat >dirlist-test/m1.m4 <<EOF
-#serial 456
-AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
-AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
-EOF
-clean_stale
-$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
-  cat stderr >&2
-  cat stdout
-  Exit 1
-}
-cat stderr >&2
-cat stdout
-grep '#serial 456' stdout
-test ! -f 4/m1.m4
-grep 'installing.*4/m1\.m4' stderr
-
-:
diff --git a/tests/acloca19.test b/tests/acloca19.test
deleted file mode 100755
index a198d9a..0000000
--- a/tests/acloca19.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal does not fail on configure.ac inclusions that do
-# more than just variable definitions.
-# Report from Peter Breitenlohner (PR/450).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<'END'
-AC_INIT([acloca19], [1.0])
-m4_include([aconfig.ac])
-FOO
-AC_OUTPUT
-END
-
-cat >aconfig.ac <<'END'
-AM_INIT_AUTOMAKE
-AC_DEFUN([FOO], [echo GREPME])
-sinclude([bconfig.ac])
-END
-
-cat >bconfig.ac <<'END'
-AC_ARG_WITH([grepme], [string])
-END
-
-$ACLOCAL
-$AUTOCONF
-./configure >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep GREPME stdout
-grep 'aconfig\.ac' aclocal.m4 && Exit 1
-grep 'bconfig\.ac' aclocal.m4 && Exit 1
-grep with-grepme configure
-
-:
diff --git a/tests/acloca20.test b/tests/acloca20.test
deleted file mode 100755
index 6408bef..0000000
--- a/tests/acloca20.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal does not write into symlinked aclocal.m4.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >foo.m4 <<'END'
-m4_define([FOO], [echo wrong foo])
-END
-
-cat >doit.in <<'END'
address@hidden@ foo.m4 aclocal.m4
-END
-
-cat >configure.in <<'END'
-AC_INIT([acloca20], [1.0])
-AC_PROG_LN_S
-dnl FOO
-AC_CONFIG_FILES([doit], [chmod +x doit])
-AC_OUTPUT
-END
-
-$AUTOCONF
-./configure
-./doit
-grep 'wrong foo' aclocal.m4
-
-cat >acinclude.m4 <<'END'
-m4_define([FOO], [echo right foo])
-END
-sed 's/dnl //' <configure.in >configure.int
-mv -f configure.int configure.in
-
-$ACLOCAL
-$AUTOCONF --force
-./configure | grep 'right foo'
-grep 'wrong foo' foo.m4
diff --git a/tests/acloca21.test b/tests/acloca21.test
deleted file mode 100755
index 7b66279..0000000
--- a/tests/acloca21.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal ignores include() commands in comments.
-# Report from Mike Frysinger.
-# Also make sure aclocal does not think 'include' is
-# an Autoconf macro.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-dnl m4_include(__some_really_bogus_nonexistent_file__.m4)
-  # m4_include(__some_really_bogus_nonexistent_file__.m4)
-##  m4_include(__some_really_bogus_nonexistent_file__.m4)
-echo 'include(foobar)' is OK
-EOF
-$ACLOCAL
diff --git a/tests/acloca22.test b/tests/acloca22.test
deleted file mode 100755
index 913e4d9..0000000
--- a/tests/acloca22.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the "deleted header file" issue is fixed wrt. aclocal.m4
-# dependencies.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-FOO
-AC_OUTPUT
-EOF
-cat >foo.m4 <<EOF
-AC_DEFUN([FOO], [AC_SUBST([GREPFOO])])
-EOF
-cat >bar.m4 <<EOF
-AC_DEFUN([BAR], [AC_SUBST([GREPBAR])])
-EOF
-cat >Makefile.am <<EOF
-ACLOCAL_AMFLAGS = -I .
-EOF
-$ACLOCAL -I .
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE
-grep GREPFOO Makefile
-grep GREPBAR Makefile && Exit 1
-sed 's/FOO/BAR/' < configure.in > t
-mv -f t configure.in
-rm -f foo.m4
-$MAKE
-grep GREPFOO Makefile && Exit 1
-grep GREPBAR Makefile
diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
deleted file mode 100755
index e02db30..0000000
--- a/tests/aclocal-acdir.test
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test aclocal's `--acdir', `--automake-acdir' and `--system-acdir'
-# options.  Also check that stuff in the automake acdir takes precedence
-# over stuff in the system acdir.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir am sys
-
-cat >> configure.in <<'END'
-MY_MACRO
-END
-
-cat > am/foo.m4 <<'END'
-AC_DEFUN([AM_INIT_AUTOMAKE], [fake--init--automake])
-END
-
-cat > sys/foo.m4 <<'END'
-AC_DEFUN([MY_MACRO], [my--macro])
-END
-
-$ACLOCAL --automake-acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'MY_MACRO' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL --system-acdir sys
-$AUTOCONF --force
-$FGREP 'am__api_version' configure
-$FGREP 'my--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL --automake-acdir am --system-acdir sys
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'my--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL --system-acdir sys --automake-acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'my--macro' configure
-
-rm -rf autom4te*.cache
-
-# Stuff in automake acdir takes precedence over stuff in system acdir.
-cat > am/bar.m4 <<'END'
-AC_DEFUN([MY_MACRO], [am--macro])
-END
-$ACLOCAL --automake-acdir am --system-acdir sys
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
-
-rm -rf autom4te*.cache
-
-# Obsolescent `--acdir' option.
-$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '.*--acdir.*deprecated' stderr
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr
-
-:
diff --git a/tests/aclocal-install-absdir.test 
b/tests/aclocal-install-absdir.test
deleted file mode 100755
index 1a642b5..0000000
--- a/tests/aclocal-install-absdir.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure "aclocal --install" install files also in directories
-# passed to `-I' as absolute paths.  Now that we support the
-# ACLOCAL_PATH variable, it is clear that this is the right thing
-# to do.  See also automake bug#8407.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir loc sys
-
-echo 'AM_DUMMY_MACRO' >> configure.in
-echo 'AC_DEFUN([AM_DUMMY_MACRO], [:])' >> sys/foo.m4
-
-cwd=`pwd` || fatal_ "cannot get current working directory"
-env ACLOCAL_PATH="$cwd/sys" $ACLOCAL --verbose --install -I "$cwd/loc"
-diff sys/foo.m4 loc/foo.m4
-
-:
diff --git a/tests/aclocal-install-fail.test b/tests/aclocal-install-fail.test
deleted file mode 100755
index cf493aa..0000000
--- a/tests/aclocal-install-fail.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that "aclocal --install" fails when it should.
-# FIXME: this is a good candidate for a conversion to TAP.
-
-am_create_testdir=empty
-required=ro-dir
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-MY_MACRO
-END
-
-mkdir sys-acdir
-cat > sys-acdir/my-defs.m4 <<END
-AC_DEFUN([MY_MACRO], [:])
-END
-
-ACLOCAL="$ACLOCAL -Wnone --system-acdir=sys-acdir"
-
-: > a-regular-file
-mkdir unwritable-dir
-chmod a-w unwritable-dir
-
-$ACLOCAL -I a-regular-file --install 2>stderr \
-  && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$EGREP '(mkdir:|directory ).*a-regular-file' stderr
-test ! -f aclocal.m4
-
-$ACLOCAL --install -I unwritable-dir/sub 2>stderr \
-  && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$EGREP '(mkdir:|directory ).*unwritable-dir/sub' stderr
-test ! -f aclocal.m4
-
-$ACLOCAL -I unwritable-dir --install 2>stderr \
-  && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$EGREP '(cp:|copy ).*unwritable-dir' stderr
-test ! -f aclocal.m4
-
-# Sanity check.
-mkdir m4
-$ACLOCAL -I m4 --install && test -f aclocal.m4 \
-  || fatal_ "aclocal failed also when expected to succeed"
-
-:
diff --git a/tests/aclocal-install-mkdir.test b/tests/aclocal-install-mkdir.test
deleted file mode 100755
index 54e97ab..0000000
--- a/tests/aclocal-install-mkdir.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that "aclocal --install" creates the local m4 directory if
-# necessary.
-# FIXME: this is a good candidate for a conversion to TAP.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-MY_MACRO
-END
-
-mkdir sys-acdir
-cat > sys-acdir/my-defs.m4 <<END
-AC_DEFUN([MY_MACRO], [:])
-END
-
-ACLOCAL="$ACLOCAL --system-acdir=sys-acdir"
-
-$ACLOCAL -I foo --install
-test -f foo/my-defs.m4
-
-$ACLOCAL --install -I "`pwd`/bar"
-test -f bar/my-defs.m4
-
-$ACLOCAL --install -I baz/sub/sub2
-test -f baz/sub/sub2/my-defs.m4
-
-# What should happen:
-#  * zardoz1 should be created, and required m4 files copied into there.
-#  * zardoz2 shouldn't be preferred to quux, even if the former exists
-#    while the latter does not.
-mkdir zardoz2
-$ACLOCAL --install -I zardoz1 -I zardoz2
-test -d zardoz1
-grep MY_MACRO zardoz1/my-defs.m4
-ls zardoz2 | grep . && Exit 1
-
-# Directories in ACLOCAL_PATH should never be created if they don't
-# exist.
-ACLOCAL_PATH="`pwd`/none:`pwd`/none2" $ACLOCAL --install && Exit 1
-test ! -d none
-test ! -d none2
-ACLOCAL_PATH="`pwd`/none:`pwd`/none2" $ACLOCAL --install -I x
-test -f x/my-defs.m4
-test ! -d none
-test ! -d none2
-
-# It's better if aclocal doesn't create the first include dir on failure.
-$ACLOCAL --install -I none -I none2 && Exit 1
-test ! -d none
-test ! -d none2
-
-:
diff --git a/tests/aclocal-no-install-no-mkdir.test 
b/tests/aclocal-no-install-no-mkdir.test
deleted file mode 100755
index 73a6116..0000000
--- a/tests/aclocal-no-install-no-mkdir.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that aclocal does not create a non-existent local m4 directory
-# if the '--install' option is not given.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-MY_MACRO
-END
-
-mkdir sys-acdir
-cat > sys-acdir/my-defs.m4 <<END
-AC_DEFUN([MY_MACRO], [:])
-END
-
-$ACLOCAL -I foo --system-acdir=sys-acdir && Exit 1
-test ! -d foo
-test ! -r foo
-
-:
diff --git a/tests/aclocal-path-install-serial.test 
b/tests/aclocal-path-install-serial.test
deleted file mode 100755
index 511ccee..0000000
--- a/tests/aclocal-path-install-serial.test
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# ACLOCAL_PATH, acdir and `--install' interactions when serial number
-# are involved.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_FOO
-END
-
-set_serial ()
-{
-  serial=$1 file=$2
-  sed '/^# serial/d' $file > t
-  case $serial in
-    none) mv -f t $file;;
-       *) (echo "# serial $serial" && cat t) > $file; rm -f t;;
-  esac
-  cat $file # For debugging.
-}
-
-win ()
-{
-  case $1 in
-    sdir) ok=sdir ko=pdir;;
-    pdir) ok=pdir ko=sdir;;
-       *) fatal_ "win(): invalud argument \`$1'";;
-  esac
-  # This is required on fast machine, to avoid caching and timestamp
-  # issues with the autotools (already happened in practice).
-  rm -rf configure aclocal.m4 autom4te*.cache m4/*
-  $ACLOCAL -I m4 --install
-  test -f m4/foo.m4 # Sanity check.
-  $AUTOCONF
-  $FGREP "::$ok:"  m4/foo.m4
-  $FGREP "::$ok::" configure
-  $FGREP "::$ko::" m4/foo.m4 configure && Exit 1
-  :
-}
-
-mkdir sdir pdir m4
-
-ACLOCAL="$ACLOCAL --system-acdir=`pwd`/sdir"
-ACLOCAL_PATH=./pdir; export ACLOCAL_PATH
-
-cat > sdir/foo.m4 << 'END'
-AC_DEFUN([AM_FOO], [::sdir::])
-END
-cat > pdir/foo.m4 << 'END'
-AC_DEFUN([AM_FOO], [::pdir::])
-END
-
-set_serial 2 sdir/foo.m4
-set_serial 1 pdir/foo.m4
-win sdir
-
-set_serial 3.3 sdir/foo.m4
-set_serial 5.7 pdir/foo.m4
-win pdir
-
-set_serial 0    sdir/foo.m4
-set_serial none pdir/foo.m4
-win sdir
-
-set_serial none  sdir/foo.m4
-set_serial 1.2.3 pdir/foo.m4
-win pdir
-
-:
diff --git a/tests/aclocal-path-install.test b/tests/aclocal-path-install.test
deleted file mode 100755
index 5e46eb6..0000000
--- a/tests/aclocal-path-install.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# ACLOCAL_PATH and `--install' interactions.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_FOO
-END
-
-mkdir acdir pdir ldir
-
-ACLOCAL="$ACLOCAL --system-acdir=`pwd`/acdir"
-ACLOCAL_PATH=./pdir; export ACLOCAL_PATH
-
-cat > acdir/foo.m4 << 'END'
-AC_DEFUN([AM_FOO], [:])
-END
-
-cat > pdir/bar.m4 << 'END'
-AC_DEFUN([AM_BAR], [:])
-END
-
-# The `--install' option should never cause anything to be installed
-# in a directory specified in ACLOCAL_PATH.
-$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep ' no -I was supplied' stderr
-test ! -f pdir/foo.m4
-
-# The `--install' option should cause a required macro found in a
-# directory specified in ACLOCAL_PATH to be installed locally.
-echo AM_BAR >> configure.in
-$ACLOCAL --install -I ldir
-diff pdir/bar.m4 ldir/bar.m4
-
-:
diff --git a/tests/aclocal-path-nonexistent.test 
b/tests/aclocal-path-nonexistent.test
deleted file mode 100755
index e1157a1..0000000
--- a/tests/aclocal-path-nonexistent.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Non-existent directories in ACLOCAL_PATH are ok.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_FOO
-END
-
-mkdir mdir
-echo 'AC_DEFUN([AM_FOO], [am--foo])' > mdir/foo.m4
-
-ACLOCAL_PATH=./nonesuch:./mdir:`pwd`/nonesuch2:nonesuch3 $ACLOCAL
-$AUTOCONF
-$FGREP 'am--foo' configure
-
-:
diff --git a/tests/aclocal-path-precedence.test 
b/tests/aclocal-path-precedence.test
deleted file mode 100755
index c02fd3b..0000000
--- a/tests/aclocal-path-precedence.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check precedence rules for ACLOCAL_PATH.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([parallel-tests])
-FOO_MACRO
-BAR_MACRO
-AC_PROG_LIBTOOL
-AM_GNU_GETTEXT
-END
-
-mkdir mdir1 mdir2 mdir3 sysdir extradir
-
-cat > mdir1/foo1.m4 << 'END'
-AC_DEFUN([FOO_MACRO], [::pass-foo::])
-END
-
-cat > mdir2/foo2.m4 << 'END'
-AC_DEFUN([FOO_MACRO], [::fail-foo::])
-END
-
-cat > mdir1/baz.m4 << 'END'
-AC_DEFUN([BAR_MACRO], [::fail-bar::])
-END
-
-cat > mdir3/bar.m4 << 'END'
-AC_DEFUN([BAR_MACRO], [::pass-bar::])
-END
-
-cat > mdir2/quux.m4 << 'END'
-AC_DEFUN([AM_INIT_AUTOMAKE], [::fail-init::])
-AC_DEFUN([AC_PROG_LIBTOOL],  [::pass-libtool::])
-AC_DEFUN([AM_GNU_GETTEXT],   [::pass-gettext::])
-END
-
-cat > sysdir/libtool.m4 << 'END'
-AC_DEFUN([AC_PROG_LIBTOOL], [::fail-libtool::])
-END
-
-cat > extradir/gettext.m4 << 'END'
-AC_DEFUN([AM_GNU_GETTEXT], [::fail-gettext::])
-END
-
-echo ./extradir > sysdir/dirlist
-
-ACLOCAL_PATH=mdir1:mdir2 $ACLOCAL -I mdir3 --system-acdir sysdir
-$AUTOCONF
-
-$FGREP '::' configure # For debugging.
-
-# Directories coming first in ACLOCAL_PATH should take precedence
-# over those coming later.
-$FGREP '::pass-foo::' configure
-
-# Directories from `-I' options should take precedence over directories
-# in ACLOCAL_PATH.
-$FGREP '::pass-bar::' configure
-
-# Directories in ACLOCAL_PATH should take precedence over system acdir
-# (typically `${prefix}/share/aclocal'), and any directory added through
-# the `dirlist' special file.
-$FGREP '::pass-gettext::' configure
-$FGREP '::pass-libtool::' configure
-
-# Directories in ACLOCAL_PATH shouldn't take precedence over the internal
-# automake acdir (typically `${prefix}/share/aclocal-${APIVERSION}').
-$FGREP 'am__api_version' configure
-
-# A final sanity check.
-$FGREP '::fail' configure && Exit 1
-
-:
diff --git a/tests/aclocal-path.test b/tests/aclocal-path.test
deleted file mode 100755
index 16fd3f9..0000000
--- a/tests/aclocal-path.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check basic ACLOCAL_PATH support.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_FOO_MACRO
-AM_BAR_MACRO
-AM_BAZ_MACRO
-END
-
-mkdir mdir1 mdir2 mdir3
-
-cat > mdir1/foo.m4 << 'END'
-AC_DEFUN([AM_FOO_MACRO], [am--foo])
-END
-
-cat > mdir2/bar.m4 << 'END'
-AC_DEFUN([AM_BAR_MACRO], [am--bar])
-END
-
-cat > mdir3/baz.m4 << 'END'
-AC_DEFUN([AM_BAZ_MACRO], [am--baz])
-END
-
-ACLOCAL_PATH=mdir1:./mdir2:`pwd`/mdir3 $ACLOCAL
-$AUTOCONF
-
-# there should be no m4_include in aclocal.m4, even though ACLOCAL_PATH
-# contains `mdir1' and `./mdir2' as relative directories.  Only -I
-# directories should be subject to file inclusion.
-$FGREP m4_include aclocal.m4 && Exit 1
-
-$EGREP 'AM_(FOO|BAR|BAZ)_MACRO' configure && Exit 1
-$FGREP 'am--foo' configure
-$FGREP 'am--bar' configure
-$FGREP 'am--baz' configure
-
-:
diff --git a/tests/aclocal-print-acdir.test b/tests/aclocal-print-acdir.test
deleted file mode 100755
index 368416c..0000000
--- a/tests/aclocal-print-acdir.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test on aclocal's `--print-ac-dir' option.
-
-. ./defs || Exit 1
-
-set -e
-
-$ACLOCAL --print-ac-dir
-test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir/acdir"
-
-$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir
-test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo
-
-$ACLOCAL --system-acdir /bar --print-ac-dir
-test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar
-
-$ACLOCAL --automake-acdir /bar --print-ac-dir
-test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = 
"$testaclocaldir/acdir"
-
-:
diff --git a/tests/aclocal-verbose-install.test 
b/tests/aclocal-verbose-install.test
deleted file mode 100755
index 589d540..0000000
--- a/tests/aclocal-verbose-install.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check verbose messages by `aclocal --install'.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-MY_MACRO_BAR
-MY_MACRO_QUUX
-END
-
-mkdir sys-acdir
-cat > sys-acdir/bar.m4 <<END
-AC_DEFUN([MY_MACRO_BAR], [:])
-END
-cat > sys-acdir/quux.m4 <<END
-AC_DEFUN([MY_MACRO_QUUX], [:])
-END
-
-mkdir foodir
-: > foodir/bar.m4
-
-$ACLOCAL --system-acdir=sys-acdir --install --verbose -I foodir 2>stderr \
- || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep ' installing .*sys-acdir/bar\.m4.* to .*foodir/bar\.m4' stderr
-grep ' installing .*sys-acdir/quux\.m4.* to .*foodir/quux\.m4' stderr
-grep ' overwriting .*foodir/bar\.m4.* with .*sys-acdir/bar\.m4' stderr
-grep ' installing .*foodir/quux\.m4.* from .*sys-acdir/quux\.m4' stderr
-
-# Sanity checks.
-ls -l foodir
-grep MY_MACRO_BAR foodir/bar.m4
-grep MY_MACRO_QUUX foodir/quux.m4
-
-:
diff --git a/tests/aclocal.in b/tests/aclocal.in
deleted file mode 100644
index 5326ad0..0000000
--- a/tests/aclocal.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# @configure_input@
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-fi
-
-perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
-export perllibdir
-
-exec "@abs_top_builddir@/aclocal" "address@hidden@/m4" \
-     "address@hidden@/m4/acdir" ${1+"$@"}
diff --git a/tests/aclocal.test b/tests/aclocal.test
deleted file mode 100755
index 439faa9..0000000
--- a/tests/aclocal.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test on some aclocal options.  Report from Alexandre Oliva.
-
-. ./defs || Exit 1
-
-set -e
-
-$ACLOCAL --output=fred
-test -f fred
-
-$ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'option.*--output.*an argument' stderr
-grep '[Tt]ry.*--help.*for more information' stderr
-
-$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'unrecognized.*--unknown-option' stderr
-grep '[Tt]ry.*--help.*for more information' stderr
-
-$ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'unrecognized.*--ver' stderr
-grep '[Tt]ry.*--help.*for more information' stderr
-
-$ACLOCAL --versi
-
-:
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
deleted file mode 100755
index a6aee0f..0000000
--- a/tests/aclocal3.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure include of include detects missing macros
-. ./defs || Exit 1
-
-set -e
-
-echo GNOME_X_CHECKS >> configure.in
-
-mkdir macros
-
-cat > macros/gnome.m4 << 'END'
-AC_DEFUN([GNOME_X_CHECKS], [
-       AM_PATH_GTK(0.99.5,,AC_MSG_ERROR(GTK not installed, or gtk-config not 
in path))
-])
-END
-
-$ACLOCAL -I macros 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr
-grep 'macros/gnome.m4:2:.*AM_PATH_GTK.*not found' stderr
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
deleted file mode 100755
index eab8ca8..0000000
--- a/tests/aclocal4.test
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure dependencies on aclocal.m4 are set correctly.
-# Report from Jim Meyering.
-
-# We need GNU make for the `rebuild rules' to be triggered.
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_RANLIB
-AM_PROG_AR
-AC_PROG_CC
-MY_MACRO
-AC_CONFIG_FILES([lib/Makefile])
-AC_OUTPUT
-EOF
-
-mkdir m4
-cat >m4/mymacro.m4 <<EOF
-AC_DEFUN([MY_MACRO], [])
-EOF
-
-mkdir lib
-: > lib/foo.c
-: > lib/bar.c
-cat >lib/Makefile.am <<'EOF'
-noinst_LIBRARIES = liberi.a
-liberi_a_SOURCES = bar.c
-liberi_a_LIBADD = $(LIBOBJS)
-EOF
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib
-EXTRA_DIST = m4/mymacro.m4
-ACLOCAL_AMFLAGS = -I m4
-check-foo: distdir
-       test -f $(distdir)/lib/foo.c
-       test -f $(distdir)/lib/bar.c
-
-check-not-foo: distdir
-       test ! -f $(distdir)/lib/foo.c
-       test -f $(distdir)/lib/bar.c
-EOF
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE check-not-foo
-
-# Update one of the macros.  This should cause ./configure, Makefile.in,
-# Makefile, lib/Makefile.in, and lib/Makfile to be updated.  This assumes
-# GNU make.
-
-cat >m4/mymacro.m4 <<'EOF'
-AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
-EOF
-
-$MAKE check-foo
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
deleted file mode 100755
index ec032e4..0000000
--- a/tests/aclocal5.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that aclocal.m4's dependencies are honored
-# in sub-directories.
-
-# This test assumes that the `make' utility is able to start
-# over and reload Makefiles which have been remade (a non-POSIX feature).
-required='GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_TEST([GREPME])
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-ACLOCAL_AMFLAGS = -I m4
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-mkdir m4
-echo 'AC_DEFUN([AM_TEST], [echo address@hidden)' > m4/moredefs.m4
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-./configure
-$MAKE
-
-# Update an aclocal.m4 dependency, then make sure all Makefiles are
-# updated, even from a sub-directory.  Check that AU_ALIAS is
-# recognized. Change the definition of AM_TEST to check that its new
-# definition is used.
-$sleep # Modified configure dependencies must be newer than config.status.
-echo 'AU_ALIAS([AM_TEST], [AC_SUBST])' > m4/moredefs.m4
-cd sub
-$MAKE
-cd ..
-grep GREPME Makefile
-grep GREPME sub/Makefile
-
-# Make sure configure dependencies are distributed.
-$MAKE distdir
-test -f $me-1.0/m4/moredefs.m4
-
-# Change the definition of AM_TEST to check that its new definition is
-# used.  Check that AC_DEFUN_ONCE is caught.
-$sleep # Modified configure dependencies must be newer than config.status.
-echo 'AC_DEFUN_ONCE([AM_TEST], [AC_SUBST(__$1__)])' > m4/moredefs.m4
-$MAKE
-grep 'm4/moredefs\.m4' aclocal.m4
-grep '__GREPME__' configure
-
-:
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
deleted file mode 100755
index ddf9401..0000000
--- a/tests/aclocal6.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal.m4 is rebuilt whenever a configure
-# dependency changes.  Test for acinclude.m4 and VPATH too.
-
-required='GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-SOME_DEFS
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-ACLOCAL_AMFLAGS = -I m4
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-mkdir m4
-echo 'AC_DEFUN([SOME_DEFS], [])' > m4/somedefs.m4
-echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-
-mkdir build
-cd build
-
-../configure
-$MAKE
-
-# Modified configure dependencies must be newer than config.status.
-$sleep
-# Update an aclocal.m4 dependency, then make sure all Makefiles
-# are updated, even from a sub-directory.
-echo 'AC_DEFUN([SOME_DEFS], [MORE_DEFS])' > ../m4/somedefs.m4
-# Because aclocal will run again, it should also pick up acinclude.m4.
-echo 'AC_SUBST([METOO])' > ../acinclude.m4
-
-cd sub
-$MAKE
-cd ..
-grep GREPME Makefile
-grep GREPME sub/Makefile
-grep GREPME sub/Makefile
-grep METOO Makefile
-grep METOO sub/Makefile
-grep METOO sub/Makefile
-
-# Make sure configure dependencies are distributed.
-$MAKE distdir
-test -f $me-1.0/m4/moredefs.m4
-test -f $me-1.0/m4/somedefs.m4
-test -f $me-1.0/acinclude.m4
-
-:
diff --git a/tests/aclocal7.test b/tests/aclocal7.test
deleted file mode 100755
index e123a3f..0000000
--- a/tests/aclocal7.test
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal does not overwrite aclocal.m4 needlessly.
-# Also make sure automake --no-force does not overwrite Makefile.in needlessly.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-SOME_DEFS
-AC_CONFIG_FILES([sub/Makefile])
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-cat >> Makefile.am << 'END'
-SUBDIRS = sub
-include fragment.inc
-END
-
-: > fragment.inc
-
-mkdir m4
-echo 'AC_DEFUN([SOME_DEFS], [])' > m4/somedefs.m4
-
-$sleep
-
-$ACLOCAL -I m4
-
-# Automake will take aclocal.m4 to be newer if it has the same timestamp
-# as Makefile.in.  Avoid the confusing by sleeping.
-$sleep
-
-$AUTOMAKE --no-force
-
-$sleep
-
-touch foo
-$ACLOCAL -I m4
-$AUTOMAKE --no-force
-
-# aclocal.m4 and Makefile.in should not have been updated, so `foo'
-# should be younger
-test `ls -1t aclocal.m4 Makefile.in sub/Makefile.in foo | sed 1q` = foo
-
-$sleep
-$ACLOCAL -I m4 --force
-test `ls -1t aclocal.m4 foo | sed 1q` = aclocal.m4
-# We still use --no-force for automake, but since aclocal.m4 has
-# changed all Makefile.ins should be updated.
-$sleep
-$AUTOMAKE --no-force
-test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
-
-touch m4/somedefs.m4
-$sleep
-touch foo
-$sleep
-$ACLOCAL -I m4
-$sleep
-$AUTOMAKE --no-force
-
-# aclocal.m4 should have been updated, although its contents haven't changed.
-test `ls -1t aclocal.m4 foo | sed 1q` = aclocal.m4
-test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
-
-touch fragment.inc
-$sleep
-touch foo
-$sleep
-$ACLOCAL -I m4
-$AUTOMAKE --no-force
-# Only ./Makefile.in should change.
-test `ls -1t aclocal.m4 foo | sed 1q` = foo
-test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-test `ls -1t sub/Makefile.in foo | sed 1q` = foo
-
-grep README Makefile.in && Exit 1
-
-: > README
-$sleep
-touch foo
-$sleep
-$AUTOMAKE --no-force
-# Even if no dependency change, the content changed.
-test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-test `ls -1t sub/Makefile.in foo | sed 1q` = foo
-
-grep README Makefile.in
-
-: > sub/Makefile.in
-$sleep
-touch foo
-$sleep
-$ACLOCAL -I m4
-$AUTOMAKE --no-force
-# Only sub/Makefile.in should change.
-test `ls -1t aclocal.m4 foo | sed 1q` = foo
-test `ls -1t Makefile.in foo | sed 1q` = foo
-test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
deleted file mode 100755
index d935f4f..0000000
--- a/tests/aclocal8.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal does not require unused macros.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-SOME_DEFS
-END
-
-mkdir m4
-cat >m4/somedefs.m4 <<EOF
-AC_DEFUN([SOME_DEFS], [
-  m4_if([a], [a], [MACRO1], [MACRO2])
-])
-EOF
-
-echo 'AC_DEFUN([MACRO1],)' >m4/macro1.m4
-echo 'AC_DEFUN([MACRO2], [AC_REQUIRE([AM_UNUSED_MACRO])])' >m4/macro2.m4
-
-$ACLOCAL -I m4 >output 2>&1 || { cat output; Exit 1; }
-test 0 = `wc -l <output`
-grep macro1.m4 aclocal.m4
-grep macro2.m4 aclocal.m4 && Exit 1
-
-:
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
deleted file mode 100755
index 7a786aa..0000000
--- a/tests/aclocal9.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal define macros in the same order as -I's.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-MACRO1
-MACRO2
-END
-
-mkdir m4_1 m4_2
-
-cat >m4_1/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro11 > foo])
-AC_DEFUN([MACRO2], [echo macro21 >> foo])
-EOF
-
-cat >m4_2/somedefs.m4 <<EOF
-AC_DEFUN([MACRO1], [echo macro12 > foo])
-EOF
-
-$ACLOCAL -I m4_1 -I m4_2
-$AUTOCONF
-./configure
-grep macro11 foo
-grep macro21 foo
-
-$ACLOCAL --force -I m4_2 -I m4_1
-$AUTOCONF --force
-./configure
-grep macro12 foo
-grep macro21 foo
diff --git a/tests/acoutbs.test b/tests/acoutbs.test
deleted file mode 100755
index 0ce981c..0000000
--- a/tests/acoutbs.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by François Pinard.
-# If \ is in AC_OUTPUT, automake barfs.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile \
-zot)
-END
-
-: > Makefile.am
-: > zot.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-test -f zot || Exit 1
-ls -a | grep '\\' && Exit 1
-
-:
diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test
deleted file mode 100755
index 5e03c08..0000000
--- a/tests/acoutbs2.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2002, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by David A. Swierczek.
-# Another bug with \ in AC_OUTPUT (this time with whitespace).
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_OUTPUT(\
-   Makefile \
-   zot
-)
-END
-
-: > Makefile.am
-: > zot.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-test -f zot || Exit 1
-ls -a | grep '\\' && Exit 1
-
-:
diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
deleted file mode 100755
index 344905f..0000000
--- a/tests/acoutnoq.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Jerome Santini.
-# If I put this line in my configure.in:
-# AC_OUTPUT(Makefile src/Makefile tests/Makefile, echo timestamp > stamp-h)dnl
-# automake is not happy:
-# [ ... ]
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile, [true])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/acoutpt.test b/tests/acoutpt.test
deleted file mode 100755
index e18e4e4..0000000
--- a/tests/acoutpt.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug when AC_OUTPUT has 2 args on the same line, eg:
-#   AC_OUTPUT([Makefile automake tests/Makefile],[chmod +x automake])
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT([Makefile], [true])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/acoutpt2.test b/tests/acoutpt2.test
deleted file mode 100755
index 2d0743c..0000000
--- a/tests/acoutpt2.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Eric Magnien.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_OUTPUT([subdir/Makefile subdir/foo Makefile foo], [true])
-END
-
-mkdir subdir
-
-: > Makefile.am
-: > subdir/Makefile.am
-: > foo.in
-: > subdir/foo.in
-
-$ACLOCAL
-$AUTOMAKE
-
-count=`$FGREP foo.in Makefile.in | wc -l`
-test $count -eq 2
-
-# This ought to work as well.
-$ACLOCAL
-$AUTOMAKE --add-missing --force-missing
-
-:
diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
deleted file mode 100755
index 75736f2..0000000
--- a/tests/acoutqnl.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by François Pinard.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT([Makefile],
-[echo zardoz has spoken])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/acsilent.test b/tests/acsilent.test
deleted file mode 100755
index abbfc92..0000000
--- a/tests/acsilent.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2008, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure there are no spurious acinclude warnings.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<EOF
-AC_INIT
-AM_INIT_GUILE_MODULE
-EOF
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([AM_INIT_GUILE_MODULE],[
-. $srcdir/../GUILE-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_CONFIG_AUX_DIR(..)
-module=[$1]
-AC_SUBST(module)])
-END
-
-$ACLOCAL >output 2>&1 || { cat output; Exit 1; }
-cat output
-test ! -s output
diff --git a/tests/acsubst.test b/tests/acsubst.test
deleted file mode 100755
index e8eaace..0000000
--- a/tests/acsubst.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([FOOBAR_LDFLAGS],[blablabla])
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = mumble
-mumble_SOURCES = a.c b.c d.h
-mumble_LDFLAGS = $(FOOBAR_LDFLAGS)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
deleted file mode 100755
index b1c0bce..0000000
--- a/tests/acsubst2.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_SUBST([FOOBAR_CFLAGS],[blablabla])
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = mumble
-mumble_SOURCES = a.c b.c d.h
-mumble_CFLAGS = $(FOOBAR_CFLAGS)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
diff --git a/tests/all.test b/tests/all.test
deleted file mode 100755
index 791d081..0000000
--- a/tests/all.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2007, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure several *-local's in a single rule work.
-
-. ./defs || Exit 1
-
-set -e
-
-targets='all install-exec install-data uninstall'
-echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am
-cat Makefile.am  # might be useful for debugging
-
-$ACLOCAL
-$AUTOMAKE
-
-for target in $targets; do
-  grep "${target}-local" Makefile.in  # might be useful for debugging
-  grep "${target}-am:.*${target}-local" Makefile.in
-done
-
-:
diff --git a/tests/all2.test b/tests/all2.test
deleted file mode 100755
index 38b6f8c..0000000
--- a/tests/all2.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure all-local and other -local targets work correctly.
-
-. ./defs || Exit 1
-
-set -e
-
-$ACLOCAL
-
-targets='all install-exec install-data uninstall'
-for target in $targets; do
-  : Doing $target
-  echo "${target}-local:" > Makefile.am
-  $AUTOMAKE
-  grep "${target}-local ${target}-local" Makefile.in && Exit 1
-  grep "${target}-am:.*${target}-local" Makefile.in
-done
-
-:
diff --git a/tests/alloca.test b/tests/alloca.test
deleted file mode 100755
index 6304002..0000000
--- a/tests/alloca.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we complain if @ALLOCA@ is used without being set in configure.in
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AM_PROG_AR
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @ALLOCA@
-END
-
-: > alloca.c
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '^Makefile\.am:1:.*define .*RANLIB.* add .*AC_PROG_RANLIB' stderr
-grep '^Makefile\.am:3:.*define .*ALLOCA.* add .*AC_FUNC_ALLOCA' stderr
-
-:
diff --git a/tests/alloca2.test b/tests/alloca2.test
deleted file mode 100755
index a459338..0000000
--- a/tests/alloca2.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we complain if @LTALLOCA@ is used without being set in configure.in
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-END
-
-cat > Makefile.am << 'END'
-noinst_LTLIBRARIES = libtu.la
-libtu_la_SOURCES =
-libtu_la_LIBADD = @LTALLOCA@
-END
-
-: > alloca.c
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '^Makefile\.am:1:.*define.*LIBTOOL.* add .*LT_INIT' stderr
-grep '^Makefile\.am:3:.*LTALLOCA' stderr
-
-:
diff --git a/tests/alpha.test b/tests/alpha.test
deleted file mode 100755
index 1ee8ed6..0000000
--- a/tests/alpha.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure README-alpha is distributed when appropriate.  Report from
-# Jim Meyering.
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([alpha], [1.0a])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnits
-SUBDIRS = sub
-check-local: distdir
-       test -f $(distdir)/README-alpha
-       test -f $(distdir)/sub/README
-       test ! -f $(distdir)/sub/README-alpha
-       : > works
-END
-
-mkdir sub
-cat > sub/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnits
-END
-
-: > README-alpha
-: > sub/README-alpha
-: > sub/README
-
-# Gnits stuff.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-# make distdir should fail because NEWS does not mention 1.0a
-$MAKE check 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'NEWS not updated' stderr
-test ! -f works
-
-echo 'alpha 1.0a released' > NEWS
-$MAKE check
-test -f works
diff --git a/tests/alpha2.test b/tests/alpha2.test
deleted file mode 100755
index e125377..0000000
--- a/tests/alpha2.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another check for README-alpha support.  This time it is requested
-# from configure.in.  Report from Akim Demaille.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([alpha], [1.0b])
-AM_INIT_AUTOMAKE([readme-alpha])
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-check-local: distdir
-       test -f $(distdir)/README-alpha
-       test -f $(distdir)/sub/README
-       test ! -f $(distdir)/sub/README-alpha
-       : > works
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-: > README-alpha
-: > sub/README-alpha
-: > sub/README
-
-# Gnits stuff.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE check
-test -f works
diff --git a/tests/amassign.test b/tests/amassign.test
deleted file mode 100755
index af098d2..0000000
--- a/tests/amassign.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to see if AM_ name can be assigned to in configure.in.
-# Report from Steve Robbins.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CFLAGS=foo
-AC_SUBST(AM_BAR)
-AC_SUBST([AM_ZARDOZ])
-END
-
-$ACLOCAL
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
deleted file mode 100755
index 59813cc..0000000
--- a/tests/amhello-binpkg.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test an example from the manual about the `amhello' package:
-# using DESTDIR to build simple, no-frills binary packages.
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
-  || fatal_ "cannot get amhello tarball"
-
-gzip -dc amhello-1.0.tar.gz | tar xf -
-cd amhello-1.0
-
-./configure --prefix /usr
-$MAKE
-$MAKE DESTDIR="`pwd`/inst" install
-cd inst
-find . -type f -print > ../files.lst
-tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > tar.got 2>&1
-
-EXEEXT=`sed -n -e 's/^EXEEXT *= *//p' < ../Makefile`
-
-if tar --version </dev/null | grep GNU; then
-  LC_ALL=C sort tar.got > t
-  mv -f t tar.got
-  diff - tar.got <<END
-./usr/bin/hello$EXEEXT
-./usr/share/doc/amhello/README
-END
-else
-  : Be laxer with other tar implementations, to avoid spurious failures.
-  $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got
-  $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
-fi
-
-:
diff --git a/tests/amhello-cflags.test b/tests/amhello-cflags.test
deleted file mode 100755
index 56f7729..0000000
--- a/tests/amhello-cflags.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test an example from the manual about the `amhello' package:
-# using VPATH builds to configure the same package with different
-# options.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
-  || fatal_ "cannot get amhello tarball"
-
-gzip -dc amhello-1.0.tar.gz | tar xf -
-cd amhello-1.0
-
-mkdir debug optim
-cd debug
-../configure CFLAGS='-g -O0'
-$MAKE
-ls -l . src # For debugging.
-cd ../optim
-../configure CFLAGS='-O3 -fomit-frame-pointer'
-$MAKE
-ls -l . src # For debugging.
-cd ..
-
-# Check that we have really compiled the objects with two different
-# configurations.
-for exeext in '' .exe :; do
-  test -f optim/src/hello$exeext && break
-  test "$exeext" = : && fatal_ "cannot determine extension of executables"
-done
-cmp optim/src/hello$exeext debug/src/hello$exeext && Exit 1
-
-:
diff --git a/tests/amhello-cross-compile.test b/tests/amhello-cross-compile.test
deleted file mode 100755
index 6db91ba..0000000
--- a/tests/amhello-cross-compile.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test an example from the manual about the `amhello' package:
-# cross-compiling a package from Linux/Unix to MinGW.
-
-required=i586-mingw32msvc-gcc
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
-  || fatal_ "cannot get amhello tarball"
-
-host=i586-mingw32msvc
-build=`"$testsrcdir"/../lib/config.guess` && test -n "$build" \
-  || fatal_ "cannot guess build platform"
-case $build in *mingw*) skip_ "build system is MinGW too";; esac
-
-gzip -dc amhello-1.0.tar.gz | tar xf -
-cd amhello-1.0
-
-./configure --build "$build" --host "$host" > stdout \
-  || { cat stdout ; Exit 1; }
-cat stdout
-grep '^checking for i586-mingw32msvc-strip\.\.\.' stdout
-grep '^checking for i586-mingw32msvc-gcc\.\.\.' stdout
-grep '^checking for suffix of executables\.\.\. \.exe *$' stdout
-grep '^checking for suffix of object files\.\.\. o *$' stdout
-grep '^checking whether i586-mingw32msvc-gcc accepts -g\.\.\. yes' stdout
-
-$MAKE
-
-cd src
-file hello.exe > whatis
-cat whatis
-$EGREP 'DOS|Win' whatis
-grep 'executable' whatis
-grep 'ELF' whatis && Exit 1
-
-:
diff --git a/tests/ammissing.test b/tests/ammissing.test
deleted file mode 100755
index 79d9fc2..0000000
--- a/tests/ammissing.test
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to see if aclocal correctly reports missing AM_ macro.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AM_ZARDOZ >> configure.in
-
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr
-grep 'configure.in:.*AM_ZARDOZ.*not found' stderr
diff --git a/tests/amopt.test b/tests/amopt.test
deleted file mode 100755
index e83b800..0000000
--- a/tests/amopt.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make Automake diagnose a conditional AUTOMAKE_OPTIONS.
-# Report from Bas Wijnen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AM_CONDITIONAL([COND], [true])
-END
-
-mkdir sub
-
-# These two Makefile contain the same errors, but have different
-# warnings disabled.
-
-cat >Makefile.am <<END
-if COND
-AUTOMAKE_OPTIONS = -Wall
-endif
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2.*AUTOMAKE_OPTIONS.*conditional' stderr
diff --git a/tests/amsubst.test b/tests/amsubst.test
deleted file mode 100755
index 1fad2ca..0000000
--- a/tests/amsubst.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for _AM_SUBST_NOTMAKE.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([backslash], "\\")
-_AM_SUBST_NOTMAKE([backslash])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test:
-       @echo $(backslash) @address@hidden
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-# If _AM_SUBST_NOTMAKE is not honored, the backslash
-# variable will not be empty.
-$MAKE test | grep '^[$]$'
diff --git a/tests/ansi.test b/tests/ansi.test
deleted file mode 100755
index 0aa000e..0000000
--- a/tests/ansi.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where ansi2knr.c is not included in distribution.
-# From François Pinard.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-.PHONY: test1 test2
-test1:
-       echo ' $(DISTFILES) ' | grep ' ansi2knr\.c '
-       echo ' $(DISTFILES) ' | grep ' ansi2knr\.1 '
-test2: distdir
-       test -f $(distdir)/ansi2knr.c
-       test -f $(distdir)/ansi2knr.1
-END
-
-cat >> configure.in << 'END'
-AM_C_PROTOTYPES
-AC_OUTPUT
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete
-
-./configure
-
-$MAKE test1
-$MAKE test2
-
-:
diff --git a/tests/ansi10.test b/tests/ansi10.test
deleted file mode 100755
index 68e1249..0000000
--- a/tests/ansi10.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure ansi2knr works with $(LIBOBJS).
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_C_PROTOTYPES
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([hello])
-AC_CONFIG_FILES([dir/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = dir
-END
-
-mkdir dir
-
-cat > dir/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES =
-liblib_a_LIBADD = $(LIBOBJS)
-END
-
-cat > dir/hello.c << 'END'
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-   printf ("hello\n");
-}
-END
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-test -f dir/hello_.c
-$MAKE distclean
-test ! -f dir/hello_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-./configure
-$MAKE
-test ! -f dir/hello_.c
diff --git a/tests/ansi2.test b/tests/ansi2.test
deleted file mode 100755
index 504c8c3..0000000
--- a/tests/ansi2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure ansi2knr built at the right time.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = joe
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in
diff --git a/tests/ansi2knr-deprecation.test b/tests/ansi2knr-deprecation.test
deleted file mode 100755
index 543d9c6..0000000
--- a/tests/ansi2knr-deprecation.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the use of automatic de-ANSI-fication feature is deprecated.
-# That feature will be removed in the next major Automake release.
-
-. ./defs || Exit 1
-
-set -e
-
-warn_rx='automatic de-ANSI-fication.*deprecated'
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-$ACLOCAL
-
-$AUTOCONF -Wall -Werror -Wno-obsolete
-$AUTOCONF -Wnone -Wobsolete -Werror 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep "^configure\\.in:5:.* AM_C_PROTOTYPES:.*$warn_rx" stderr
-
-sed '/AM_C_PROTOTYPES/d' configure.in > config.stub
-diff configure.in config.stub && fatal_ "failed to edit configure.in"
-rm -f configure.in
-
-cat > Makefile.stub <<'END'
-ANSI2KNR = :
-U =
-END
-
-for opt in ansi2knr lib/ansi2knr; do
-  # ansi2knr option in Makefile.am
-  cp config.stub configure.in
-  cp Makefile.stub Makefile.am
-  echo "AUTOMAKE_OPTIONS = $opt" >> Makefile.am
-  cat Makefile.am # For debugging.
-  $AUTOMAKE -Wno-obsolete
-  AUTOMAKE_fails
-  grep "^Makefile\.am:3:.*$warn_rx" stderr
-  AUTOMAKE_fails -Wnone -Wobsolete
-  grep "^Makefile\.am:3:.*$warn_rx" stderr
-  # ansi2knr option in configure.in
-  cp Makefile.stub Makefile.am
-  sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" config.stub > configure.in
-  cat configure.in # For debugging.
-  $AUTOMAKE -Wno-obsolete
-  AUTOMAKE_fails
-  grep "^configure\.in:2:.*$warn_rx" stderr
-  AUTOMAKE_fails -Wnone -Wobsolete
-  grep "^configure\.in:2:.*$warn_rx" stderr
-done
-
-:
diff --git a/tests/ansi3.test b/tests/ansi3.test
deleted file mode 100755
index 22ef485..0000000
--- a/tests/ansi3.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Actual test of ansi2knr functionality.  Relies on existence
-# of working gcc.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr no-dependencies
-bin_PROGRAMS = hello
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-   printf ("yeah, yeah\n");
-   return 0;
-}
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-# We use gcc and not gcc -traditional as the latter fails on some
-# Linux boxes (Red Hat 5.1 in particular).
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'Makefile.am:1:.*ansi2knr\.c' stderr
-CC='gcc' ./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
deleted file mode 100755
index 0688781..0000000
--- a/tests/ansi3b.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Actual test of ansi2knr functionality.  Relies on existence
-# of working gcc.  Same as ansi3.test, but with AUTOMAKE_OPTIONS
-# defined in configure.in.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([hello], [0.24])
-AM_INIT_AUTOMAKE([ansi2knr no-dependencies])
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-echo 'bin_PROGRAMS = hello' > Makefile.am
-
-cat > hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-   printf ("yeah, yeah\n");
-   return 0;
-}
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-# We use gcc and not gcc -traditional as the latter fails on some
-# Linux boxes (Red Hat 5.1 in particular).
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'configure.in:2:.*ansi2knr\.1' stderr
-CC='gcc' ./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
diff --git a/tests/ansi4.test b/tests/ansi4.test
deleted file mode 100755
index 0c0d339..0000000
--- a/tests/ansi4.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2008, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Quoting regression.  Test from Thomas Gagne.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_C_PROTOTYPES
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c
-END
-
-: > ansi2knr.1
-: > ansi2knr.c
-: > hello.c
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-$FGREP 'ansi2knr.$(' Makefile.in
diff --git a/tests/ansi5.test b/tests/ansi5.test
deleted file mode 100755
index d152be0..0000000
--- a/tests/ansi5.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for ansi2knr in another directory.
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(one/joe.c)
-AM_INIT_AUTOMAKE(liver, 0.23)
-AC_PROG_CC
-AM_C_PROTOTYPES
-AC_OUTPUT(Makefile one/Makefile two/Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = one two
-END
-
-mkdir one two
-
-cat > one/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = joe
-END
-
-cat > two/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ../one/ansi2knr
-bin_PROGRAMS = maude
-END
-
-cat > one/joe.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-   printf ("joe\n");
-   return 0;
-}
-END
-
-cat > two/maude.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-   printf ("maude\n");
-   return 0;
-}
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-CC=gcc ./configure
-
-# This is ugly!  If we set U at make time then the "wrong" file gets
-# included.
-find . -name '*.Po' -print \
-| while read file; do
-    base="`echo $file | sed -e 's/\.Po//'`"
-    mv $file ${base}_.Po
-done
-
-# So is this!  If we set ANSI2KNR on the make command line then the
-# wrong value is passed to two's Makefile.
-mv one/Makefile one/Makefile.old
-sed -e 's,ANSI2KNR =,ANSI2KNR = ./ansi2knr,' < one/Makefile.old > one/Makefile
-
-U=_ $MAKE -e
-./one/joe
-./two/maude
diff --git a/tests/ansi6.test b/tests/ansi6.test
deleted file mode 100755
index 691614d..0000000
--- a/tests/ansi6.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check ansi2knr on a source file in subdirectory.
-# From Kevin Ryde.
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(ansi6, 1.0)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_C_PROTOTYPES
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c sub/dir.c
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-
-extern int foo ();
-
-int
-main (int argc, char **argv)
-{
-   printf ("%d\n", foo ());
-}
-END
-
-mkdir sub
-
-cat > sub/dir.c << 'END'
-int
-foo ()
-{
-   return 23;
-}
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-
-test -f hello_.c
-test -f dir_.c                 # Must be in current directory.
-test ! -f sub/dir_.c
-$MAKE distclean
-test ! -f hello_.c
-test ! -f dir_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-# Report from Andreas Schwab.
-
-./configure
-$MAKE
diff --git a/tests/ansi7.test b/tests/ansi7.test
deleted file mode 100755
index 9eae26b..0000000
--- a/tests/ansi7.test
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check ansi2knr on a source file in subdirectory.
-# ansi6.test is the same test without subdir-objects.
-# From Kevin Ryde.
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(ansi6, 1.0)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr subdir-objects
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c sub/dir.c
-END
-
-cat > hello.c << 'END'
-#include <stdio.h>
-
-extern int foo ();
-
-int
-main (int argc, char **argv)
-{
-   printf ("%d\n", foo ());
-}
-END
-
-mkdir sub
-
-cat > sub/dir.c << 'END'
-int
-foo ()
-{
-   return 23;
-}
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE -Wno-obsolete -a
-
-# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
-test `grep -c ac_cv_prog_cc_stdc configure` -gt 1
-
-./configure ac_cv_prog_cc_stdc=no
-$MAKE
-
-test -f hello_.c
-test -f sub/dir_.c             # Must be in sub directory, unlike ansi6.test.
-test ! -f dir_.c
-$MAKE distclean
-test ! -f hello_.c
-test ! -f sub/dir_.c
-
-# Also run without forcing ansi2knr, so we make sure the
-# rules work with ANSI compilers.
-# Report from Andreas Schwab.
-
-./configure
-$MAKE
diff --git a/tests/ansi8.test b/tests/ansi8.test
deleted file mode 100755
index bcf99b1..0000000
--- a/tests/ansi8.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that AM_C_PROTOTYPES is required by ansi2knr
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-bin_PROGRAMS = hello
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wno-obsolete -a
-grep AM_C_PROTOTYPES stderr
diff --git a/tests/ansi9.test b/tests/ansi9.test
deleted file mode 100755
index ab78dda..0000000
--- a/tests/ansi9.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that subdir sources, and file compiled using per-target flags
-# can still be deansified.
-# Report from Paul D. Smith.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr subdir-objects
-noinst_PROGRAMS = loadavg sub/sub
-loadavg_SOURCES = loadavg.c
-loadavg_CFLAGS = -DTEST
-sub_sub_SOURCES = sub/sub.c
-END
-
-cat > loadavg.c << 'END'
-int
-main ()
-{
-   return 0;
-}
-END
-
-mkdir sub
-cp loadavg.c sub/sub.c
-
-$ACLOCAL
-$AUTOCONF -Wno-obsolete
-$AUTOMAKE --add-missing -Wno-override -Wno-obsolete
-
-$FGREP 'loadavg-loadavg$U.o: loadavg$U.c' Makefile.in
-# The following rule should not exist, because the
-# default .o.c: inference rule is enough.
-$FGREP 'sub/sub$U.o: sub/sub$U.c' Makefile.in && Exit 1
-# Force ansi2knr's use, regardless of the compiler.
-./configure ac_cv_prog_cc_stdc=no
-$MAKE sub/sub_.c
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
deleted file mode 100755
index 1bb46b1..0000000
--- a/tests/ar-lib.test
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly
-
-required=xsi-shell
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/ar-lib" .
-# Use a dummy lib, since lib isn't readily available on all systems.
-cat >lib <<'END'
-#! /bin/sh
-if test x"$2" = x-LIST && test x"$3" = xfake.lib; then
-  echo fake.obj
-elif test x"$2" = x-LIST && test x"$3" = xfake2.lib; then
-  printf "%s\n" "dir\\fake2.obj"
-else
-  printf "%s\n" "lib $*"
-fi
-END
-
-chmod +x ./lib
-
-# Check if ar-lib can create an archive with "cr"
-opts=`./ar-lib ./lib cr foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.obj"
-
-# Check if ar-lib can update an existing archive with "r"
-touch foo.lib
-opts=`./ar-lib ./lib r foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
-
-# Check if ar-lib can update an existing archive with "q".
-opts=`./ar-lib ./lib q foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
-
-# Check if ar-lib accepts "u" as a modifier.
-# NOTE: "u" should have an effect, but currently doesn't.
-opts=`./ar-lib ./lib ru foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
-
-# Check if ar-lib accepts "s" as a modifier.
-opts=`./ar-lib ./lib rs foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
-
-# Check if ar-lib accepts "S" as a modifier.
-opts=`./ar-lib ./lib rS foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib foo.obj"
-
-# Check if ar-lib passes on @FILE with "r"
-opts=`./ar-lib ./lib r foo.lib @list`
-test x"$opts" = x"lib -NOLOGO -OUT:foo.lib foo.lib @list"
-
-# Check if ar-lib can delete a member from an archive with "d"
-opts=`./ar-lib ./lib d foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib"
-
-# Check if ar-lib can delete members in an @FILE
-echo foo.obj > foolist
-opts=`./ar-lib ./lib d foo.lib @foolist`
-test x"$opts" = x"lib -NOLOGO -REMOVE:foo.obj foo.lib"
-
-# Check if ar-lib can list archive members with "t"
-opts=`./ar-lib ./lib t foo.lib`
-test x"$opts" = x"lib -NOLOGO -LIST foo.lib"
-
-# Check if ar-lib accepts "v" as a modifier.
-# NOTE: "v" should have an effect, but currently doesn't.
-opts=`./ar-lib ./lib tv foo.lib`
-test x"$opts" = x"lib -NOLOGO -LIST foo.lib"
-
-# Check if ar-lib can extract archive members with "x"
-touch fake.lib
-opts=`./ar-lib ./lib x fake.lib`
-test x"$opts" = x"lib -NOLOGO -EXTRACT:fake.obj fake.lib"
-
-# Check if ar-lib can extract specified archive members with "x"
-opts=`./ar-lib ./lib x foo.lib foo.obj`
-test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
-
-# Check if ar-lib can extract members in an @FILE
-opts=`./ar-lib ./lib x foo.lib @foolist`
-test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
-
-# Check if ar-lib passes -lib and -LTCG through to the wrappee
-opts=`./ar-lib ./lib -lib -LTCG x foo.lib foo.obj`
-test x"$opts" = x"lib -lib -LTCG -NOLOGO -EXTRACT:foo.obj foo.lib"
-
-# Check if ar-lib can extract backslashed members
-touch fake2.lib
-opts=`./ar-lib ./lib x fake2.lib`
-test x"$opts" = x"lib -NOLOGO -EXTRACT:dir\\fake2.obj fake2.lib"
-
-# Check if ar-lib accepts "s" as an action.
-opts=`./ar-lib ./lib s foo.lib`
-test x"$opts" = x
-
-:
diff --git a/tests/ar-lib2.test b/tests/ar-lib2.test
deleted file mode 100755
index 67a64e9..0000000
--- a/tests/ar-lib2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if AM_PROG_AR installs ar-lib.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-# Make sure ar-lib is installed, and that Automake says so.
-grep '^configure\.in:.*install.*ar-lib' stderr
-test -f ar-lib
-
-:
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
deleted file mode 100755
index 8378e2a..0000000
--- a/tests/ar-lib3.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if lib_LIBRARIES requests AM_PROG_AR.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wextra-portability
-
-grep 'requires.*AM_PROG_AR' stderr
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-END
-
-rm -rf autom4te*.cache
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-:
diff --git a/tests/ar-lib4.test b/tests/ar-lib4.test
deleted file mode 100755
index 9e01d6c..0000000
--- a/tests/ar-lib4.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if lib_LTLIBRARIES requests AM_PROG_AR.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cp configure.in X
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = foo.c
-END
-
-libtoolize
-$ACLOCAL
-AUTOMAKE_fails -Wextra-portability
-
-grep 'requires.*AM_PROG_AR' stderr
-
-cp X configure.in
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE -Wextra-portability --add-missing
-
-:
diff --git a/tests/ar-lib5a.test b/tests/ar-lib5a.test
deleted file mode 100755
index d1de98b..0000000
--- a/tests/ar-lib5a.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if AM_PROG_AR triggers the use of the ar-lib script.
-# This test requires Microsoft lib.
-# Keep this test in sync with sister test `ar-lib5b.test'.
-
-required=lib
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([auxdir])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-# We want to test the content of am_cv_ar_interface in the Makefile.
-AC_SUBST([am_cv_ar_interface])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LIBRARIES = libwish.a
-libwish_a_SOURCES = wish.c
-
-check-local:
-       test x'$(am_cv_ar_interface)' = x'lib'
-       test -f ar-lib-worked
-       test -f libwish.a
-MOSTLYCLEANFILES = ar-lib-worked
-END
-
-cat > wish.c << 'END'
-int wish(void) { return 0; }
-END
-
-mkdir auxdir
-# FIXME: make this "installcheck-aware" once we are merged into the
-#        'testsuite-work' branch.
-cat - "$testsrcdir"/../lib/ar-lib > auxdir/ar-lib << 'END'
-#! /bin/sh
-:> ar-lib-worked
-END
-chmod +x auxdir/ar-lib
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Sanity check: test that it is ok to use `am_cv_ar_interface' as we do.
-$FGREP 'am_cv_ar_interface=' configure
-
-./configure AR=lib RANLIB=:
-
-$MAKE check
-$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='AR=lib RANLIB=:'
-
-:
diff --git a/tests/ar-lib5b.test b/tests/ar-lib5b.test
deleted file mode 100755
index 52deab5..0000000
--- a/tests/ar-lib5b.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if AM_PROG_AR triggers the use of the ar-lib script.
-# This test does not require Microsoft lib.
-# Keep this test in sync with sister test `ar-lib5a.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([auxdir])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-# We want to test the content of am_cv_ar_interface in the Makefile.
-AC_SUBST([am_cv_ar_interface])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LIBRARIES = libwish.a
-libwish_a_SOURCES = wish.c
-
-check-local:
-       test x'$(am_cv_ar_interface)' = x'lib'
-       test -f ar-lib-worked
-MOSTLYCLEANFILES = ar-lib-worked
-END
-
-cat > wish.c << 'END'
-int wish(void) { return 0; }
-END
-
-mkdir auxdir
-cat > auxdir/ar-lib << 'END'
-#! /bin/sh
-:> ar-lib-worked
-END
-chmod +x auxdir/ar-lib
-
-# Let's fake microsoft lib.
-mkdir bin
-cat > bin/lib << 'END'
-#! /bin/sh
-echo lib command line: $* >&2 # For debugging.
-case " $* " in
-  # The `-OUT:' option is used by tests in configure.  So don't create
-  # the `ar-lib-worked' file here, as that might cause spurious passes
-  # of this test; but don't fail either, as that would confuse said
-  # configure tests.
-  *' -OUT:'*) exit 0;;
-  # This means that $* looks like a command-line for `ar'.  We have to
-  # exit with failure here, to accomodate the two following ortoghonal
-  # scenarios:
-  #  1. when `lib' is tested by configure, this will tell that it does
-  #     not use the ar(1) interface, so that the `ar-lib' script will
-  #     get involved;
-  #  2. when `lib' is called by the Makefile, an ar-style command line
-  #     passed to it would mean that the `ar-lib' script has failed to
-  #     properly munge the command line, or hasn't been invoked to do so.
-  *\ c*) exit 1;;
-  # Assume everything else is OK.
-  *) : > ar-lib-worked;;
-esac
-END
-chmod +x bin/lib
-PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Sanity check: test that it is ok to use `am_cv_ar_interface' as we do.
-$FGREP 'am_cv_ar_interface=' configure
-
-./configure AR=lib RANLIB=:
-
-$MAKE check
-$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS="AR=lib RANLIB=:"
-
-:
diff --git a/tests/ar-lib6a.test b/tests/ar-lib6a.test
deleted file mode 100755
index f1b982c..0000000
--- a/tests/ar-lib6a.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test AM_PROG_AR ordering requirements
-# Keep this test in sync with sister test `ar-lib6b.test'.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
-AM_PROG_AR
-END
-
-libtoolize
-$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-
-$EGREP '(AC_PROG_LIBTOOL|LT_INIT).*before.*AM_PROG_AR' stderr
-
-:
diff --git a/tests/ar-lib6b.test b/tests/ar-lib6b.test
deleted file mode 100755
index 5487add..0000000
--- a/tests/ar-lib6b.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test AM_PROG_AR ordering requirements for older Libtools
-# Keep this test in sync with sister test `ar-lib6a.test'.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AM_PROG_AR
-END
-
-libtoolize
-$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-
-$EGREP 'AC_PROG_LIBTOOL.*before.*AM_PROG_AR' stderr
-
-:
diff --git a/tests/ar-lib7.test b/tests/ar-lib7.test
deleted file mode 100755
index 3f758a9..0000000
--- a/tests/ar-lib7.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if automake warns if ar-lib is missing when AM_PROG_AR is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-END
-
-:> Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-
-grep '^configure\.in:.*ar-lib.*not found' stderr
-
-$AUTOMAKE --add-missing
-
-:
diff --git a/tests/ar.test b/tests/ar.test
deleted file mode 100755
index 06dcde3..0000000
--- a/tests/ar.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.in.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-AC_SUBST([AR], ['echo it works'])
-AC_SUBST([ARFLAGS], ['>'])
-AC_SUBST([RANLIB], ['echo really works >>'])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES =
-END
-
-:> ar-lib
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-grep 'it works' libfoo.a
-grep 'really works' libfoo.a
-
-:
diff --git a/tests/ar2.test b/tests/ar2.test
deleted file mode 100755
index f37f514..0000000
--- a/tests/ar2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
-# Report from Kevin Ryde.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-EXTRA_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-extra-portability
-grep '^ARFLAGS =' Makefile.in
-grep '^AR =' Makefile.in
-
-:
diff --git a/tests/ar3.test b/tests/ar3.test
deleted file mode 100755
index 1d5e84e..0000000
--- a/tests/ar3.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that AR, ARFLAGS, etc. works also when the macro AM_PROG_AR
-# is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-EXTRA_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE
-$EGREP '^ARFLAGS =' Makefile.in
-$EGREP '^AR =' Makefile.in
-
-:
diff --git a/tests/ar4.test b/tests/ar4.test
deleted file mode 100755
index bb18111..0000000
--- a/tests/ar4.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if configure bails out if $AR does not work and AM_PROG_AR is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-END
-
-$ACLOCAL
-$AUTOCONF
-
-st=0; ./configure AR=/bin/false >stdout 2>stderr || st=$?
-cat stdout
-cat stderr >&2
-test $st -eq 1
-
-grep '^checking.* archiver .*interface.*\.\.\. unknown' stdout
-grep '^configure: error: could not determine /bin/false interface' stderr
-ls *conftest* && Exit 1
-
-:
diff --git a/tests/ar5.test b/tests/ar5.test
deleted file mode 100755
index 865e0bf..0000000
--- a/tests/ar5.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test the optional argument of AM_PROG_AR.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR([
-  echo spy > bad-archiver-interface-detected
-  AC_MSG_CHECKING([for something else])
-  AC_MSG_RESULT([found it])
-  echo Grep This
-])
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure AR=/bin/false >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking.* archiver .*interface.*\.\.\. unknown$' stdout
-grep '^checking for something else\.\.\. found it$' stdout
-grep '^Grep This$' stdout
-test -f bad-archiver-interface-detected
-
-:
diff --git a/tests/asm.test b/tests/asm.test
deleted file mode 100755
index f1bcb76..0000000
--- a/tests/asm.test
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of basic assembly functionality.
-# Keep this in sync with sister tests asm2.test and asm3.test.
-
-. ./defs || Exit 1
-
-set -e
-
-mv configure.in configure.stub
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = maude
-maude_SOURCES = maude.s
-END
-
-echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
-# used.  We could do `$sleep', but it's faster to erase the
-# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
-# bogus installations of Autoconf use a versioned cache.)
-rm -rf autom4te*.cache
-
-echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
-grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 4 -- we have everything needed, expect success ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-rm -rf autom4te*.cache
-
-echo '*** Try 5 -- we have everything needed, expect success ***'
-cat configure.stub - > configure.in << 'END'
-AM_PROG_AS
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/asm2.test b/tests/asm2.test
deleted file mode 100755
index ab141e7..0000000
--- a/tests/asm2.test
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of basic preprocessed assembly functionality.
-# Keep this in sync with sister tests asm.test and asm3.test.
-
-. ./defs || Exit 1
-
-set -e
-
-mv configure.in configure.stub
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = maude
-maude_SOURCES = maude.S
-END
-
-echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
-# used.  We could do `$sleep', but it's faster to erase the
-# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
-# bogus installations of Autoconf use a versioned cache.)
-rm -rf autom4te*.cache
-
-echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
-grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 4 -- we need dependency tracking. ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep ' add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 5 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-_AM_DEPENDENCIES([CCAS])
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-rm -rf autom4te*.cache
-
-echo '*** Try 6 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
-AM_PROG_AS
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/asm3.test b/tests/asm3.test
deleted file mode 100755
index 5c42c48..0000000
--- a/tests/asm3.test
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2006, 2007  Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of basic preprocessed assembly functionality with extension .sx.
-# Keep this in sync with sister tests asm.test and asm2.test.
-
-. ./defs || Exit 1
-
-set -e
-
-mv configure.in configure.stub
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = maude
-maude_SOURCES = maude.sx
-END
-
-echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
-# used.  We could do `$sleep', but it's faster to erase the
-# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
-# bogus installations of Autoconf use a versioned cache.)
-rm -rf autom4te*.cache
-
-echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCAS.* undefined' stderr
-grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Aa]ssembler source.*CCASFLAGS.* undefined' stderr
-grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 4 -- we need dependency tracking. ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep ' add .*AM_PROG_AS' stderr
-
-rm -rf autom4te*.cache
-
-echo '*** Try 5 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
-CCAS='$(CC)'
-AC_SUBST([CCAS])
-AC_PROG_CC
-_AM_DEPENDENCIES([CCAS])
-AC_SUBST([CCASFLAGS])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-rm -rf autom4te*.cache
-
-echo '*** Try 6 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
-AM_PROG_AS
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/autodist-acconfig-no-subdir.test 
b/tests/autodist-acconfig-no-subdir.test
deleted file mode 100755
index e6bd5a9..0000000
--- a/tests/autodist-acconfig-no-subdir.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that `acconfig.h' is *not* automatically distributed when
-# placed in a subdirectory.
-# Related to automake bug#7819.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-sub/acconfig.h:
-       echo target $@ should not be built >&2; exit 1
-check-local: distdir
-       ls -l $(distdir)/sub
-       test ! -f $(distdir)/sub/acconfig.h
-END
-
-mkdir sub
-
-cat > sub/Makefile.am <<'END'
-acconfig.h:
-       echo target $@ should not be built >&2; exit 1
-check-local:
-       echo $(DISTFILES) | grep 'acconfig\.h' && exit 1; :
-       echo $(DIST_COMMON) | grep 'acconfig\.h' && exit 1; :
-END
-
-: > sub/acconfig.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE check
-
-:
diff --git a/tests/autodist-acconfig.test b/tests/autodist-acconfig.test
deleted file mode 100755
index 49ab2f0..0000000
--- a/tests/autodist-acconfig.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that `acconfig.h' is automatically distributed if it exists
-# (at automake runtime).
-# Related to automake bug#7819.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-.PHONY: test
-test: distdir
-       ls -l $(distdir)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
-       test -f $(distdir)/acconfig.h
-END
-
-: > acconfig.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE test
-
-:
diff --git a/tests/autodist-aclocal-m4.test b/tests/autodist-aclocal-m4.test
deleted file mode 100755
index 3f53d59..0000000
--- a/tests/autodist-aclocal-m4.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that `aclocal.m4' is not automatically distributed if not
-# required to build `configure'.  This is *really* a corner-case
-# check, and the behaviour it checks is not documented either, so
-# if that behaviour is deliberately changed in the future, just
-# remove this test.
-# Related to automake bug#7819.
-
-. ./defs || Exit 1
-
-set -e
-
-{ echo 'm4_include([defs.m4])'
-  cat configure.in
-  echo 'AC_OUTPUT'
-} > t
-mv -f t configure.in
-
-cat > Makefile.am <<'END'
-.PHONY: test
-test: distdir
-       ls -l $(distdir)
-       test ! -f $(distdir)/aclocal.m4
-       echo $(DISTFILES) | grep 'aclocal\.m4' && exit 1; :
-       echo $(DIST_COMMON) | grep 'aclocal\.m4' && exit 1; :
-check-local: test
-END
-
-: > defs.m4
-$ACLOCAL
-mv -f aclocal.m4 defs.m4
-
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE test
-$MAKE distcheck
-
-:
diff --git a/tests/autodist-config-headers.test 
b/tests/autodist-config-headers.test
deleted file mode 100755
index 66c9bea..0000000
--- a/tests/autodist-config-headers.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that config.h.bot and config.h.top are automatically
-# distributed if the AC_CONFIG_HADERS macro is used and they
-# exist at automake runtime.
-# Related to automake bug#7819.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_CONFIG_HEADERS([config.h sub/config.h cfg2.h:conf2.hin])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-.PHONY: test
-test: distdir
-       ls -l $(distdir) $(distdir)/sub
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.bot '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.top '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.bot '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.top '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.bot '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.top '
-       test -f $(distdir)/config.h.bot
-       test -f $(distdir)/config.h.top
-       test -f $(distdir)/cfg2.h.bot
-       test -f $(distdir)/cfg2.h.top
-       test -f $(distdir)/sub/config.h.bot
-       test -f $(distdir)/sub/config.h.top
-END
-
-mkdir sub
-touch config.h.in config.h.top config.h.bot \
-      conf2.hin cfg2.h.top cfg2.h.bot \
-      sub/config.h.in sub/config.h.top sub/config.h.bot
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE test
-
-:
diff --git a/tests/autodist-configure-no-subdir.test 
b/tests/autodist-configure-no-subdir.test
deleted file mode 100755
index db640c4..0000000
--- a/tests/autodist-configure-no-subdir.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that `configure', `configure.ac' and `configure.in' are *not*
-# automatically distributed when placed in a subdirectory.
-# Related to automake bug#7819.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-dontbuild = echo target $@ should not be built >&2; exit 1
-sub/configure:
-       $(dontbuild)
-sub/configure.ac:
-       $(dontbuild)
-sub/configure.in:
-       $(dontbuild)
-check-local: distdir
-       ls -l $(distdir)/sub
-       test ! -f $(distdir)/sub/configure
-       test ! -f $(distdir)/sub/configure.in
-       test ! -f $(distdir)/sub/configure.ac
-END
-
-mkdir sub
-
-cat > sub/Makefile.am <<'END'
-dontbuild = echo target $@ should not be built >&2; exit 1
-configure:
-       $(dontbuild)
-configure.ac:
-       $(dontbuild)
-configure.in:
-       $(dontbuild)
-check-local:
-       echo $(DISTFILES) | grep 'configure' && exit 1; :
-       echo $(DIST_COMMON) | grep 'configure' && exit 1; :
-END
-
-: > sub/configure.ac
-: > sub/configure.in
-: > sub/configure
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE check
-
-:
diff --git a/tests/autodist-no-duplicate.test b/tests/autodist-no-duplicate.test
deleted file mode 100755
index 81464c0..0000000
--- a/tests/autodist-no-duplicate.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that there are no duplicates in the list of files automatically
-# distributed by automake.
-
-. ./defs || Exit 1
-
-set -e
-
-re='Files .*automatically distributed.*if found'
-
-# The automake manual states that the list of automatically-distributed
-# files should be given by `automake --help'.
-
-list1=`$AUTOMAKE --help \
-        | sed -n "/^$re.*always/,/^ *$/p" \
-        | sed 1d`
-list1=`echo $list1`
-
-list2=`$AUTOMAKE --help \
-        | sed -n "/^$re.*under certain conditions/,/^ *$/p" \
-        | sed 1d`
-list2=`echo $list2`
-
-test -n "$list1"
-test -n "$list2"
-
-st=0
-for i in 1 2; do
-  eval list=\${list$i}
-  for f in $list; do echo $f; done | sort > files$i.lst
-  uniq files$i.lst > files$i.uniq
-  cat files$i.lst
-  cat files$i.uniq
-  diff files$i.lst files$i.uniq || st=1
-done
-
-Exit $st
diff --git a/tests/autodist-stamp-vti.test b/tests/autodist-stamp-vti.test
deleted file mode 100755
index 4f37e14..0000000
--- a/tests/autodist-stamp-vti.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that `stamp-vti' is automatically distributed when info_TEXINFOS
-# and version.texi are involved.
-# Related to automake bug#7819.
-
-required=makeinfo
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << END
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-.PHONY: test
-test: all distdir
-       ls -l $(distdir)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
-       test -f $(distdir)/stamp-vti
-END
-
-cat > foo.texi << 'END'
-\input texinfo
address@hidden foo.info
address@hidden Zardoz
address@hidden Top
address@hidden version.texi
-bar baz quux
address@hidden
-END
-
-# Required when using Texinfo.
-: > texinfo.tex
-cp "$testsrcdir/../lib/mdate-sh" .
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE test
-
-:
diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
deleted file mode 100755
index 83b293e..0000000
--- a/tests/autodist-subdir.test
+++ /dev/null
@@ -1,122 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that automake really automatically distributes all the files
-# it advertises to do, even when in subdirectories.
-#
-# This behavior might be suboptimal, but it has been in place for quite
-# a long time, and it would be risky to change it now.  See also the
-# discussion of automake bug#7819:
-#  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7819>
-#
-# Keep this test in sync with sister test `autodist.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOCONF
-
-# The automake manual states that the list of automatically-distributed
-# files should be given by `automake --help'.
-list=`$AUTOMAKE --help \
-        | sed -n '/^Files.*automatically distributed.*if found.*always/,/^ 
*$/p' \
-        | sed 1d`
-# Normalize whitespace, just in case.
-list=`echo $list`
-
-test -n "$list"
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-check-local:
-## For debugging.
-       @echo DIST_COMMON:
-       @for f in $(DIST_COMMON); do echo "  $$f"; done
-       @echo DISTDIR:
-       @ls -l $(distdir) | sed 's/^/  /'
-## Now the checks.
-       @for f in $(autodist_list); do \
-         echo "file: sub/$$f"; \
-         test -f $(distdir)/sub/$$f \
-           || { echo $$f: distdir fail >&2; exit 1; }; \
-       done
-END
-
-mkdir sub
-
-cat > sub/Makefile.am <<'END'
-include distfiles.am
-check-local:
-## For debugging.
-       @echo DIST_COMMON:
-       @for f in $(DIST_COMMON); do echo "  $$f"; done
-       @echo DISTDIR:
-       @ls -l $(distdir) | sed 's/^/  /'
-## Now the checks.
-       @for f in $(autodist_list); do \
-         echo "file: $$f"; \
-         ## Some filenames might contain dots, but this won't cause spurious
-         ## failures, and "spurious successes" are so unlikely that they're
-         ## not worth worrying about.
-         echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
-           || { echo $$f: distcom fail >&2; exit 1; }; \
-       done
-END
-
-: First try listing the automatically-distributed files in proper
-: targets in Makefile.am
-
-echo "MAINTAINERCLEANFILES = $list" > sub/distfiles.am
-for f in $list; do echo "$f :; touch $f"; done >> sub/distfiles.am
-
-cat sub/distfiles.am # For debugging.
-
-$AUTOMAKE -a
-
-./configure
-
-$MAKE distdir
-autodist_list="$list" $MAKE check
-
-$MAKE maintainer-clean
-test ! -f sub/README    # Sanity check.
-rm -rf $me-1.0          # Remove $(distdir).
-
-: Now try creating the automatically-distributed files before
-: running automake.
-
-: > sub/distfiles.am
-for f in $list; do
-  echo dummy > sub/$f
-done
-
-ls -l # For debugging.
-
-$AUTOMAKE
-
-./configure
-
-$MAKE distdir
-autodist_list="$list" $MAKE check
-
-:
diff --git a/tests/autodist.test b/tests/autodist.test
deleted file mode 100755
index 9294bc3..0000000
--- a/tests/autodist.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that automake really automatically distributes all the files
-# it advertises to do.
-# Related to automake bug#7819.
-# Keep this test in sync with sister test `autodist-subdir.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-# Ensure we are run from the right directory.
-# (The last thing we want is to delete some random user files.)
-test -f ../defs
-rm -f *
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOCONF
-
-# The automake manual states that the list of automatically-distributed
-# files should be given by `automake --help'.
-list=`$AUTOMAKE --help \
-        | sed -n '/^Files.*automatically distributed.*if found.*always/,/^ 
*$/p' \
-        | sed 1d`
-# Normalize whitespace, just in case.
-list=`echo $list`
-
-test -n "$list"
-
-cat > Makefile.am <<'END'
-include distfiles.am
-check-local:
-## For debugging.
-       @echo DIST_COMMON:
-       @for f in $(DIST_COMMON); do echo "  $$f"; done
-       @echo DISTDIR:
-       @ls -l $(distdir) | sed 's/^/  /'
-## Now the checks.
-       @for f in $(autodist_list); do \
-         echo "file: $$f"; \
-         test -f $(distdir)/$$f \
-           || { echo $$f: distdir fail >&2; exit 1; }; \
-         ## Some filenames might contain dots, but this won't cause spurious
-         ## failures, and "spurious successes" are so unlikely that they're
-         ## not worth worrying about.
-         echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
-           || { echo $$f: distcom fail >&2; exit 1; }; \
-       done
-END
-
-: First try listing the automatically-distributed files in proper
-: targets in Makefile.am
-
-echo "MAINTAINERCLEANFILES = $list" > distfiles.am
-for f in $list; do echo "$f :; touch $f"; done >> distfiles.am
-
-cat distfiles.am # For debugging.
-
-$AUTOMAKE -a
-
-./configure
-
-$MAKE distdir
-autodist_list="$list" $MAKE check
-
-$MAKE maintainer-clean
-test ! -f README        # Sanity check.
-rm -rf $me-1.0          # Remove $(distdir).
-
-: Now try creating the automatically-distributed files before
-: running automake.
-
-: > distfiles.am
-for f in $list; do
-  echo dummy > $f
-done
-
-ls -l # For debugging.
-
-$AUTOMAKE
-
-./configure
-
-$MAKE distdir
-autodist_list="$list" $MAKE check
-
-:
diff --git a/tests/autohdr.test b/tests/autohdr.test
deleted file mode 100755
index 9293bd1..0000000
--- a/tests/autohdr.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_CONFIG_HEADERS([thisfile.h])
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOHEADER
-
-test -f thisfile.h.in
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
deleted file mode 100755
index e2a71cf..0000000
--- a/tests/autohdr2.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_CONFIG_HEADER([thisfile.h])
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOHEADER
-
-test -f thisfile.h.in
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
deleted file mode 100755
index f559295..0000000
--- a/tests/autohdr3.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check rebuild rules for autoheader.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-m4_include([foo.m4])
-AC_CONFIG_HEADERS([config.h:config.hin])
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-: > foo.m4
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE
-
-./configure
-$MAKE
-
-$sleep
-echo 'AC_DEFINE([GREPME], 1, [Doc for GREPME])' > foo.m4
-
-$MAKE
-grep GREPME config.hin
-grep GREPME config.h
-
-$MAKE distcheck
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
deleted file mode 100755
index 24c57fb..0000000
--- a/tests/autohdr4.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check rebuild rules for AC_CONFIG_HEADERS.
-# (This should also work without GNU Make.)
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AC_SUBST([BOT], [bot])
-AC_CONFIG_HEADERS([defs.h config.h:sub1/config.top:sub2/config.${BOT}],,
-                  [BOT=$BOT])
-AC_CONFIG_FILES([sub3/Makefile])
-AC_OUTPUT
-EOF
-
-mkdir sub1 sub2 sub3
-
-: > sub1/config.top
-echo '#define NAME "grepme1"' >sub2/config.bot
-echo SUBDIRS = sub3 >Makefile.am
-echo noinst_PROGRAMS = run >sub3/Makefile.am
-
-cat >sub3/run.c <<'EOF'
-#include <defs.h>
-#include <config.h>
-#include <stdio.h>
-
-int
-main ()
-{
-  puts (NAME); /* from config.h */
-  puts (PACKAGE); /* from defs.h */
-}
-EOF
-
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE
-
-./configure
-$MAKE
-sub3/run | grep grepme1
-
-$sleep
-echo '#define NAME "grepme2"' > sub2/config.bot
-$MAKE
-sub3/run | grep grepme2
-
-$MAKE distcheck
diff --git a/tests/autohdrdry.test b/tests/autohdrdry.test
deleted file mode 100755
index b501e76..0000000
--- a/tests/autohdrdry.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Removal recovery rules for AC_CONFIG_HEADERS should not remove files
-# with `make -n'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AC_CONFIG_HEADERS([config.h])
-AC_OUTPUT
-EOF
-
-: >Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE
-
-./configure
-$MAKE
-
-rm -f config.h
-$MAKE -n
-test -f stamp-h1
-test ! -f config.h
-
-:
diff --git a/tests/automake.in b/tests/automake.in
deleted file mode 100644
index d4c4c5c..0000000
--- a/tests/automake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# @configure_input@
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-fi
-
-perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
-export perllibdir
-exec "@abs_top_builddir@/automake" "address@hidden@/lib" ${1+"$@"}
diff --git a/tests/automake.test b/tests/automake.test
deleted file mode 100755
index f8b4fef..0000000
--- a/tests/automake.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test Automake's command-line options.
-. ./defs || Exit 1
-
-set -e
-
-$AUTOMAKE --help
-$AUTOMAKE --version
-AUTOMAKE_fails --voo
-grep 'unrecognized option.*--voo' stderr
-# older perl has a buggy Getopt::Long which makes this fail.
-if $PERL -e 'require 5.8.2;'; then
-  AUTOMAKE_fails -- --voo
-  grep 'input file.*--voo' stderr
-fi
-AUTOMAKE_fails ''
-grep 'empty argument' stderr
-AUTOMAKE_fails -W
-grep 'option.*-W.*requires an argument' stderr
-AUTOMAKE_fails --warnings
-grep 'option.*--warning.*requires an argument' stderr
-AUTOMAKE_fails --warnings --help
-grep 'unknown warning.*--help' stderr
-AUTOMAKE_fails --ver
-grep 'unrecognized option.*--ver' stderr
-$AUTOMAKE --vers
diff --git a/tests/auxdir.test b/tests/auxdir.test
deleted file mode 100755
index 95a7a20..0000000
--- a/tests/auxdir.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure AC_CONFIG_AUX_DIR works correctly.
-
-. ./defs || Exit 1
-
-# The "./." is here so we don't have to mess with subdirs.
-cat > configure.in << 'END'
-AC_INIT([auxdir], [1.0])
-AC_CONFIG_AUX_DIR(./.)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-cp "$testsrcdir/../lib/mkinstalldirs" .
-
-# The "././" prefix confuses Automake into thinking it is doing a
-# subdir build.  Yes, this is hacky.
-$ACLOCAL || Exit 1
-$AUTOMAKE ././Makefile || Exit 1
-
-grep '/\./\./mkinstalldirs' Makefile.in
diff --git a/tests/auxdir2.test b/tests/auxdir2.test
deleted file mode 100755
index 590a5df..0000000
--- a/tests/auxdir2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# It should be possible to use a computed auxdir.  This might seem
-# bizarre, but it is actually used in multilib builds.
-
-. ./defs || Exit 1
-
-# The "./." is here so we don't have to mess with subdirs.
-cat > configure.in << 'END'
-AC_INIT([auxdir2], [1.0])
-AC_CONFIG_AUX_DIR($foo)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
-: > Makefile.am
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/auxdir3.test b/tests/auxdir3.test
deleted file mode 100755
index c828051..0000000
--- a/tests/auxdir3.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_AUX_DIR(.)
-END
-
-: > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'AC_CONFIG_AUX_DIR.*AM_INIT_AUTOMAKE' stderr
diff --git a/tests/auxdir4.test b/tests/auxdir4.test
deleted file mode 100755
index 0447809..0000000
--- a/tests/auxdir4.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we diagnose dangerous AC_CONFIG_AUX_DIR names.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<'END'
-AC_INIT([auxdir4], [1.0])
-AC_CONFIG_AUX_DIR([aux])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'configure.in:2:.*aux.*does not exist' stderr
-grep 'configure.in:2:.*aux.*W32' stderr
diff --git a/tests/backsl.test b/tests/backsl.test
deleted file mode 100755
index 3947cde..0000000
--- a/tests/backsl.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for "\" problems.  Bug report from Joerg-Martin Schwarz.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = \
-   frob
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^_SOURCE' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/backsl2.test b/tests/backsl2.test
deleted file mode 100755
index 35e9b9b..0000000
--- a/tests/backsl2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# We must skip the backslash, not complain about `./\' not existing.
-# Reported by Rick Scott <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUBDIRS = \
-   .
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/backsl3.test b/tests/backsl3.test
deleted file mode 100755
index 76fdd9a..0000000
--- a/tests/backsl3.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we diagnose trailing backslash at the end of a file.
-# Report from Akim Demaile <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-foo = \
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-cat stderr
-grep 'trailing backslash' stderr
diff --git a/tests/backsl4.test b/tests/backsl4.test
deleted file mode 100755
index 16eab5f..0000000
--- a/tests/backsl4.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we diagnose and fix white spaces following backslash.
-# Report from Peter Muir.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >>configure.in
-
-# Note: trailing whitespace used during the test should not appear as
-# trailing whitespace in this file, or it will get stripped by any
-# reasonable editor.
-
-echo 'bin_SCRIPTS = foo \ ' >Makefile.am
-cat >>Makefile.am <<'END'
-bar
-ok:
-       :
-END
-echo 'data_DATA = baz \  ' >>Makefile.am
-echo ' fum' >>Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails
-grep ':1:.*whitespace' stderr
-grep ':5:.*whitespace' stderr
-$AUTOMAKE -Wno-error
-./configure
-# Older versions of Automake used to produce invalid Makefiles such input.
-$MAKE ok
diff --git a/tests/badline.test b/tests/badline.test
deleted file mode 100755
index 7c63697..0000000
--- a/tests/badline.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that line number and file name in error message
-# referring to variable is always correct.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_SUBST(TEXINFOS)
-AC_CONFIG_FILES([Makefile])
-END
-
-: > Makefile.am
-
-$ACLOCAL || Exit 1
-AUTOMAKE_fails
-grep 'configure.in:3:.*info_TEXINFOS' stderr
diff --git a/tests/badopt.test b/tests/badopt.test
deleted file mode 100755
index 2da53e9..0000000
--- a/tests/badopt.test
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure bad options cause error.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep zardoz stderr
diff --git a/tests/badprog.test b/tests/badprog.test
deleted file mode 100755
index 7a31b3f..0000000
--- a/tests/badprog.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that programs with bad names are properly
-# transformed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = a,b
-a_b_SOURCES = ab.c
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/block.test b/tests/block.test
deleted file mode 100755
index 862389e..0000000
--- a/tests/block.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure block comments are not double-spaced.
-# Report from François Pinard.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-#START
-#a
-#b
-#c
-#END
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && Exit 1
-Exit 0
diff --git a/tests/bsource.test b/tests/bsource.test
deleted file mode 100755
index 80066d8..0000000
--- a/tests/bsource.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for install-recursive appearing in a non recursive Makefile.
-# Report from Bruno Haible.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-noinst_SCRIPTS = hostname
-include_HEADERS = gettext-po.h
-BUILT_SOURCES = po-hash-gen.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-grep 'install-recursive' Makefile.in && Exit 1
-:
diff --git a/tests/canon-name.test b/tests/canon-name.test
deleted file mode 100755
index aecda17..0000000
--- a/tests/canon-name.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# PR 511: Make sure we warn about e.g. AC_CONFIG_FILES([./gmakefile]),
-# as not all make implementations treat `file' and `./file' equally.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([canon-name], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([./gmakefile ./sub/gmakefile])
-AC_OUTPUT
-END
-
-mkdir sub
-echo 'SUBDIRS = sub' >gmakefile.am
-: >sub/gmakefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'leading.*\./.*\./gmakefile' stderr
-grep 'leading.*\./.*\./sub/gmakefile' stderr
diff --git a/tests/canon.test b/tests/canon.test
deleted file mode 100755
index 2b035d0..0000000
--- a/tests/canon.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that name canonicalization error works.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = sniff-glue
-sniff-glue_SOURCES = sg.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*sniff_glue_SOURCES' stderr
diff --git a/tests/canon2.test b/tests/canon2.test
deleted file mode 100755
index ab28617..0000000
--- a/tests/canon2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure name canonicalization happens for texinfo.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = zar-doz.texi
-zar_doz_TEXINFOS = frob.texi
-END
-
-: > texinfo.tex
-echo '@setfilename zar-doz.info' > zar-doz.texi
-echo '@setfilename frob' > frob.texi
-
-$ACLOCAL
-$AUTOMAKE
-
-grep zar-doz_TEXINFOS Makefile.in && Exit 1
-
-:
diff --git a/tests/canon3.test b/tests/canon3.test
deleted file mode 100755
index 9d5a172..0000000
--- a/tests/canon3.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Yet another canonicalization test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = perm-number
-END
-
-: > perm-number.c
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'perm_number.c' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/canon4.test b/tests/canon4.test
deleted file mode 100755
index d98636f..0000000
--- a/tests/canon4.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure name canonicalization happens for libraries.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libx-y.a
-libx_y_a_SOURCES = xy.c
-END
-
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^libx-y.*=' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/canon5.test b/tests/canon5.test
deleted file mode 100755
index 53cdeb2..0000000
--- a/tests/canon5.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that we allow variable names starting in
-# non-letters.  Whatever that might mean.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-$ACLOCAL
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = 123test
-123test_SOURCES = 123.c
-END
-
-$AUTOMAKE
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = _foo
-_foo_SOURCES = foo.c
-END
-
-$AUTOMAKE
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = ,foo
-,foo_SOURCES = foo.c
-END
-
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*_foo_SOURCES' stderr
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = ,foo
-_foo_SOURCES = foo.c
-END
-
-$AUTOMAKE -Wno-portability
diff --git a/tests/ccnoco.test b/tests/ccnoco.test
deleted file mode 100755
index d6ed136..0000000
--- a/tests/ccnoco.test
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure we can compile when the compiler doesn't
-# understand `-c -o'.
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.1 << 'END'
-AC_INIT(a.c)
-AM_INIT_AUTOMAKE(nonesuch, 0.23)
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT(Makefile)
-END
-
-# This one makes sure that $CC can be used after AM_PROG_CC_C_O.
-cat > configure.3 << 'END'
-AC_INIT(a.c)
-AM_INIT_AUTOMAKE(nonesuch, 0.23)
-AC_PROG_CC
-AM_PROG_CC_C_O
-$CC -v > Hi 2>&1 || exit 1
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-# Make sure we need something strange.
-wish_CFLAGS = -g
-END
-
-cat > a.c << 'END'
-#include <stdio.h>
-
-int main ()
-{
-   printf ("hi\n");
-}
-END
-
-cat > Mycomp << 'END'
-#!/bin/sh
-
-case " "$* in
- *\ -c*\ -o* | *\ -o*\ -c*)
-    exit 1
-    ;;
-esac
-
-exec gcc "$@"
-END
-
-chmod +x Mycomp
-
-set -e
-
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-for conf in configure.1 configure.3; do
-   cp $conf configure.in
-
-   $ACLOCAL
-   $AUTOCONF
-   $AUTOMAKE --copy --add-missing
-
-   rm -rf build
-   mkdir build
-   cd build
-
-   # Make sure the compiler doesn't understand `-c -o'
-   CC=`pwd`/../Mycomp
-   export CC
-
-   ../configure
-   $MAKE
-
-   cd ..
-done
diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test
deleted file mode 100755
index 062fe6b..0000000
--- a/tests/ccnoco2.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake requires AM_PROG_CC_C_O when either per-targets
-# flags or subdir-objects are used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-wish_CPPFLAGS = -DWHATEVER
-EOF
-
-touch a.c
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails --copy --add-missing
-grep 'Makefile.am:2:.*per-target.*AM_PROG_CC_C_O' stderr
-
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = wish
-wish_SOURCES = sub/a.c
-EOF
-
-mkdir sub
-mv a.c sub
-
-$AUTOMAKE --copy --add-missing
-
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-AUTOMAKE_fails --copy --add-missing
-grep 'Makefile.am:2:.*subdir.*AM_PROG_CC_C_O' stderr
diff --git a/tests/ccnoco3.test b/tests/ccnoco3.test
deleted file mode 100755
index 2e9cd37..0000000
--- a/tests/ccnoco3.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2008, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `compile' doesn't call 'mv SRC SRC'.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-mkdir sub
-
-cat > a.c << 'END'
-#include <stdio.h>
-
-int main ()
-{
-  printf ("hi\n");
-}
-END
-
-cat > Mycomp << 'END'
-#!/bin/sh
-
-case " "$* in
- *\ -c*\ -o* | *\ -o*\ -c*)
-    exit 1
-    ;;
-esac
-
-exec gcc "$@"
-END
-
-chmod +x Mycomp
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-
-mkdir build
-cd build
-
-# Make sure the compiler doesn't understand `-c -o'
-CC=`pwd`/../Mycomp
-export CC
-
-../configure
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'mv.*the same file' stderr && Exit 1
-
-Exit 0
diff --git a/tests/check-concurrency-bug9245.test 
b/tests/check-concurrency-bug9245.test
deleted file mode 100755
index e5dd153..0000000
--- a/tests/check-concurrency-bug9245.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Look for a bug where FreeBSD make in concurrent mode reported success
-# even when the Automake-generated parallel testsuite harness failed.
-# See automake bug#9245.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test bar.test
-END
-
-cat > foo.test <<'END'
-#!/bin/sh
-exit 1
-END
-chmod a+x foo.test
-
-cp foo.test bar.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-# Some make implementations don't grok the `-j' option.
-$MAKE -j1 || Exit 77
-
-for j in '' -j1 -j2; do
-  $MAKE $j check && Exit 1
-  TESTS=foo.test $MAKE $j -e check && Exit 1
-  if test x"$parallel_tests" = x"yes"; then
-    $MAKE $j recheck && Exit 1
-    TEST_LOGS=foo.log $MAKE $j -e check && Exit 1
-    rm -f test-suite.log
-    $MAKE $j test-suite.log && Exit 1
-    test -f test-suite.log || Exit 1
-  else
-    : # For shells with buggy 'set -e'.
-  fi
-done
-
-:
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
deleted file mode 100755
index 5cec7fc..0000000
--- a/tests/check-exported-srcdir.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the testsuite driver (either with or without the
-# parallel-tests option enabled) exports the `srcdir' value in the
-# environment of the tests.  This is documented in the manual.
-
-. ./defs || Exit 1
-
-set -e
-
-show_info ()
-{
-  if test x"$parallel_tests" = x"yes"; then
-     cat foo.log
-     cat test-suite.log
-  else
-     :
-  fi
-}
-
-mkdir SrcDir
-mv [!S]* SrcDir
-mkdir BuildDir
-cd SrcDir
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test
-END
-
-cat > foo.test <<'END'
-#!/bin/sh
-echo "foo.test: srcdir='$srcdir'"
-test x"$srcdir" = x"../SrcDir"
-END
-chmod a+x foo.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cd ../BuildDir
-../SrcDir/configure
-
-$MAKE check || { show_info; Exit 1; }
-show_info
-
-:
diff --git a/tests/check-tests-in-builddir.test 
b/tests/check-tests-in-builddir.test
deleted file mode 100755
index b588f11..0000000
--- a/tests/check-tests-in-builddir.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the testsuite driver can find test in the srcdir as
-# well as in builddir, and that is prefers those in the builddir.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test bar.test
-EXTRA_DIST = $(TESTS)
-END
-
-cat > foo.test << 'END'
-#! /bin/sh
-exit ${FOO_EXIT_STATUS-0}
-END
-chmod a+x foo.test
-
-unset FOO_EXIT_STATUS || :
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir build
-cd build
-
-../configure
-
-cat > bar.test << 'END'
-#! /bin/sh
-exit 0
-END
-chmod a+x bar.test
-
-$MAKE check >out 2>&1 || { cat out; Exit1; }
-cat out
-# The simple-tests driver does not strip VPATH components from
-# the name of the test, but the parallel-tests driver should.
-if test x"$parallel_tests" = x"yes"; then
-  grep '\.\./foo' out && Exit 1
-  grep '^PASS: foo.test *$' out
-else
-  grep '^PASS: .*foo.test *$' out
-fi
-grep '^PASS: bar.test *$' out
-
-rm -f test-suite.log foo.log bar.log
-
-FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; }
-cat out
-# See comments above.
-if test x"$parallel_tests" = x"yes"; then
-  grep '\.\./foo' out && Exit 1
-  grep '^FAIL: foo.test *$' out
-else
-  grep '^FAIL: .*foo.test *$' out
-fi
-grep '^PASS: bar.test *$' out
-
-rm -f test-suite.log foo.log bar.log
-
-# Check that if the same test is present in srcdir and builddir,
-# the one in builddir is preferred.
-cp bar.test foo.test
-FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; Exit1; }
-cat out
-grep '^PASS: foo.test *$' out
-grep '^PASS: bar.test *$' out
-
-# The tests in the builddir must be preferred also by "make dist".
-FOO_EXIT_STATUS=1 $MAKE distcheck
-
-:
diff --git a/tests/check-tests_environment.test 
b/tests/check-tests_environment.test
deleted file mode 100755
index a07ab95..0000000
--- a/tests/check-tests_environment.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test
-EXTRA_DIST = $(TESTS)
-END
-
-cat > foo.test << 'END'
-#! /bin/sh
-test x"$FOO" = x"ok"
-END
-chmod a+x foo.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-FOO=bad TESTS_ENVIRONMENT='FOO=ok'  $MAKE check
-FOO=ok  TESTS_ENVIRONMENT='FOO=bad' $MAKE check && Exit 1
-
-:
diff --git a/tests/check.test b/tests/check.test
deleted file mode 100755
index 3001228..0000000
--- a/tests/check.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test Automake style tests.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-TESTS = frob.test
-END
-
-: > frob.test
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'check-TESTS.*:' Makefile.in
-grep 'check-DEJAGNU' Makefile.in && Exit 1
-
-# check-TESTS is phony.
-sed -n '/^\.PHONY:/,/^$/p' Makefile.in | grep check-TESTS
-
-# check should depend directly on check-am (similar tests are
-# in check2.test and check3.test).
-grep '^check: check-am' Makefile.in
diff --git a/tests/check10.test b/tests/check10.test
deleted file mode 100755
index ab9b529..0000000
--- a/tests/check10.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check singular and plural in test summaries.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = fail pass skip xfail xpass fail2 pass2 skip2 xfail2 xpass2
-XFAIL_TESTS = xfail xpass xfail2 xpass2
-END
-
-cat >>pass <<'END'
-#! /bin/sh
-exit 0
-END
-cat >>fail <<'END'
-#! /bin/sh
-exit 1
-END
-cat >>skip <<'END'
-#! /bin/sh
-exit 77
-END
-chmod a+x pass fail skip
-cp pass pass2
-cp pass xpass
-cp xpass xpass2
-cp fail xfail
-cp fail fail2
-cp xfail xfail2
-cp skip skip2
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-(
-  # Do not check for failure in this subshell
-  set +e
-  env TESTS=pass $MAKE -e check
-  env TESTS=fail $MAKE -e check
-  env TESTS=skip $MAKE -e check
-  env TESTS=xfail $MAKE -e check
-  env TESTS=xpass $MAKE -e check
-  env TESTS="pass pass2" $MAKE -e check
-  env TESTS="fail fail2" $MAKE -e check
-  env TESTS="skip skip2" $MAKE -e check
-  env TESTS="xfail xfail2" $MAKE -e check
-  env TESTS="xpass xpass2" $MAKE -e check
-  env TESTS='pass skip xfail' $MAKE -e check
-  $MAKE check
-  :
-) >stdout
-cat stdout
-
-grep '1 [tT]ests' stdout && Exit 1
-grep '[02-9] [tT]est ' stdout && Exit 1
-grep '1 .* were ' stdout && Exit 1
-grep '[02-9].* was .*run' stdout && Exit 1
-grep 'All 1 ' stdout && Exit 1
-$EGREP '1 (un)?expected (failures|passes)' stdout && Exit 1
-$EGREP '[^1] (un)?expected (failure|pass)\)' stdout && Exit 1
-
-:
diff --git a/tests/check11.test b/tests/check11.test
deleted file mode 100755
index 1fe6a4d..0000000
--- a/tests/check11.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check skip summary.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = skip skip2
-END
-
-cat >>skip <<'END'
-#! /bin/sh
-exit 77
-END
-chmod a+x skip
-cp skip skip2
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
-grep '1.*passed' stdout && Exit 1
-
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
-grep '2.*passed' stdout && Exit 1
-
-:
diff --git a/tests/check12.test b/tests/check12.test
deleted file mode 100755
index 34c8409..0000000
--- a/tests/check12.test
+++ /dev/null
@@ -1,206 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dejagnu tests, automake-style tests, and check-local
-# target can coexist.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS =
-EXTRA_DIST =
-CLEANFILES =
-END
-
-## Simple tests.
-
-cat > a.test << 'END'
-#!/bin/sh
-exit ${A_EXIT_STATUS-0}
-END
-cat > b.test << 'END'
-#!/bin/sh
-exit ${B_EXIT_STATUS-0}
-END
-chmod +x a.test b.test
-
-cat >> Makefile.am << 'END'
-TESTS = a.test b.test
-EXTRA_DIST += $(TESTS)
-END
-
-A_EXIT_STATUS=0; export A_EXIT_STATUS
-B_EXIT_STATUS=0; export B_EXIT_STATUS
-
-## DejaGnu tests.
-
-cat >> Makefile.am << 'END'
-AUTOMAKE_OPTIONS += dejagnu
-DEJATOOL = hammer spanner
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
-EXTRA_DIST += hammer.test/hammer.exp
-EXTRA_DIST += spanner.test/spanner.exp
-END
-
-cat > hammer << 'END'
-#! /bin/sh
-echo "Everything looks like a ${NAIL-nail} to me!"
-END
-
-NAIL=nail; export NAIL
-
-cat > spanner << 'END'
-#! /bin/sh
-echo "I'm a right spanner!"
-END
-chmod +x hammer spanner
-
-mkdir hammer.test spanner.test
-
-cat > hammer.test/hammer.exp << 'END'
-set test test_hammer
-spawn $HAMMER
-expect {
-    "Everything looks like a nail to me!" { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-cat > spanner.test/spanner.exp << 'END'
-set test test_spanner
-spawn $SPANNER
-expect {
-    "I'm a right spanner!" { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-## User-defined extra tests.
-
-cat >> Makefile.am <<'END'
-check-local:
-       case $$CHECKLOCAL_EXIT_STATUS in \
-         0) echo 'check-local succeded :-)';; \
-         *) echo 'check-local failed :-(';; \
-       esac >local.log
-       exit $$CHECKLOCAL_EXIT_STATUS
-CLEANFILES += local.log
-END
-CHECKLOCAL_EXIT_STATUS=0; export CHECKLOCAL_EXIT_STATUS
-
-## Go with the testcase execution.
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-for vpath in : false; do
-
-  if $vpath; then
-    srcdir=..
-    mkdir build_
-    cd build_
-  else
-    srcdir=.
-  fi
-
-  if test -f config.status; then
-    $MAKE distclean
-  fi
-
-  $srcdir/configure
-
-  $MAKE check
-  test -f hammer.log
-  test -f hammer.sum
-  test -f spanner.log
-  test -f spanner.sum
-  # This checks will be run only by the autogenerated `check12-p.test'.
-  if test x"$parallel_tests" = x"yes"; then
-    cat test-suite.log
-    grep '^PASS: a\.test (exit: 0)' a.log
-    grep '^PASS: b\.test (exit: 0)' b.log
-  else
-    :
-  fi
-  grep 'check-local succeded :-)' local.log
-
-  cp -f config.status config-status.sav
-
-  $MAKE distclean
-  test ! -r hammer.log
-  test ! -r hammer.sum
-  test ! -r spanner.log
-  test ! -r spanner.sum
-  test ! -r test-suite.log
-  test ! -r a.log
-  test ! -r b.log
-  test ! -r local.log
-
-  mv -f config-status.sav config.status
-  ./config.status
-
-  NAIL=screw $MAKE check && Exit 1
-  test -f hammer.log
-  test -f hammer.sum
-  test -f spanner.log
-  test -f spanner.sum
-  grep 'FAIL: test_hammer' hammer.sum
-  grep 'FAIL:' spanner.sum && Exit 1
-
-  B_EXIT_STATUS=1 $MAKE check && Exit 1
-  # This checks will be run only by the autogenerated `check12-p.test'.
-  if test x"$parallel_tests" = x"yes"; then
-    cat test-suite.log
-    grep '^PASS: a\.test (exit: 0)' a.log
-    grep '^FAIL: b\.test (exit: 1)' b.log
-    grep '^FAIL: b\.test (exit: 1)' test-suite.log
-  else :; fi
-
-  CHECKLOCAL_EXIT_STATUS=1 $MAKE check && Exit 1
-  grep 'check-local failed :-(' local.log
-
-  # Do not trust the exit status of `make -k'.
-  NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || :
-  test -f hammer.log
-  test -f hammer.sum
-  test -f spanner.log
-  test -f spanner.sum
-  grep 'FAIL: test_hammer' hammer.sum
-  grep 'FAIL:' spanner.sum && Exit 1
-  # This checks will be run only by the autogenerated `check12-p.test'.
-  if test x"$parallel_tests" = x"yes"; then
-    cat test-suite.log
-    grep '^PASS: a\.test (exit: 0)' a.log
-    grep '^FAIL: b\.test (exit: 23)' b.log
-    grep '^FAIL: b\.test (exit: 23)' test-suite.log
-  else :; fi
-  grep 'check-local failed :-(' local.log
-
-  cd $srcdir
-
-done
-
-$MAKE distcheck
-
-:
diff --git a/tests/check2.test b/tests/check2.test
deleted file mode 100755
index 1db0454..0000000
--- a/tests/check2.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test Automake style tests.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([dir/Makefile])
-AC_OUTPUT
-END
-
-mkdir dir
-
-cat > Makefile.am << 'END'
-SUBDIRS = dir
-TESTS = \
-  subrun.sh
-subrun.sh:
-       (echo '#! /bin/sh'; echo 'dir/echo.sh') > $@
-       chmod +x $@
-CLEANFILES = subrun.sh
-END
-
-cat > dir/Makefile.am << 'END'
-check_SCRIPTS = echo.sh
-echo.sh:
-       (echo '#! /bin/sh'; echo 'echo Hello') > $@
-       chmod +x $@
-CLEANFILES = echo.sh
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE check >stdout
-cat stdout
-grep 'PASS: subrun.sh' stdout
-
-# check should depend directly on check-am (similar tests are
-# in check.test and check3.test).
-grep 'check: check-recursive' Makefile.in
-grep 'check: check-am' dir/Makefile.in
-
-# Make sure subrun.sh is still on its line as above.  This means Automake
-# hasn't rewritten the TESTS line unnecessarily (we can tell, because all
-# Automake variables are reformatted by VAR_PRETTY).
-grep '  subrun.sh' Makefile.in
diff --git a/tests/check3.test b/tests/check3.test
deleted file mode 100755
index 65705c4..0000000
--- a/tests/check3.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `check:' and `install:' honor $(BUILT_SOURCES).
-# PR/359.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([dir/Makefile])
-AC_OUTPUT
-END
-
-mkdir dir
-
-cat > Makefile.am << 'END'
-BUILT_SOURCES = command1.inc
-SUBDIRS = dir
-TESTS = subrun.sh
-subrun.sh:
-       (echo '#! /bin/sh'; cat command1.inc) > $@
-       chmod +x $@
-command1.inc:
-       echo 'dir/echo.sh' > $@
-CLEANFILES = subrun.sh command1.inc
-END
-
-cat > dir/Makefile.am << 'END'
-BUILT_SOURCES = command2.inc
-check_SCRIPTS = echo.sh
-echo.sh:
-## The next line ensures that command1.inc has been built before
-## recurring into the subdir.
-       test -f ../command1.inc
-       (echo '#! /bin/sh'; cat command2.inc) > $@
-       chmod +x $@
-command2.inc:
-       echo 'echo Hello' > $@
-CLEANFILES = echo.sh command2.inc
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure --prefix "`pwd`/inst"
-$MAKE check >stdout
-cat stdout
-grep 'PASS: subrun.sh' stdout
-
-# check should depend directly on check-am (similar tests are
-# in check.test and check2.test).
-$FGREP 'check: $(BUILT_SOURCES)' Makefile.in
-$FGREP 'check: $(BUILT_SOURCES)' dir/Makefile.in
-
-$MAKE clean
-# Sanity checks
-test ! -f command1.inc
-test ! -f dir/command2.inc
-# Now make sure these two files are rebuilt during make install.
-$MAKE install
-test -f command1.inc
-test -f dir/command2.inc
diff --git a/tests/check4.test b/tests/check4.test
deleted file mode 100755
index 70dc55a..0000000
--- a/tests/check4.test
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2007, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `make -k check' processes all directories.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([dir/Makefile])
-AC_OUTPUT
-END
-
-mkdir dir
-
-cat > Makefile.am <<'END'
-SUBDIRS = dir
-TESTS = ok.sh
-END
-
-echo TESTS = fail.sh >dir/Makefile.am
-
-cat >ok.sh <<'END'
-#!/bin/sh
-:
-END
-
-cat >dir/fail.sh <<'END'
-#!/bin/sh
-exit 1
-END
-
-chmod +x ok.sh dir/fail.sh
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure --prefix "`pwd`/inst"
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-grep 'FAIL: fail.sh' stdout
-grep 'PASS: ok.sh' stdout && Exit 1
-
-# The exit status of `make -k' can be anything
-# (depending on the Make implementation)
-$MAKE -k check >stdout || :
-cat stdout
-grep 'FAIL: fail.sh' stdout
-grep 'PASS: ok.sh' stdout
-
-# should also works when -k is not in first position
-$MAKE -s -k check >stdout || :
-cat stdout
-grep 'FAIL: fail.sh' stdout
-grep 'PASS: ok.sh' stdout
-
-# The rest of the test is for GNU Make.
-
-# Use --version AND -v, because SGI Make doesn't fail on --version.
-# Also grep for GNU because newer versions of FreeBSD make do
-# not complain about `--version' (they seem to silently ignore it).
-($MAKE --version -v | grep GNU) || Exit 0
-
-# Try with a long-option that do not have a short option equivalent
-# (here, --no-print-directory).  That should cause all options to
-# appear verbatim in MAKEFLAGS.
-$MAKE --no-print-directory -k check >stdout || :
-cat stdout
-grep 'FAIL: fail.sh' stdout
-grep 'PASS: ok.sh' stdout
diff --git a/tests/check5.test b/tests/check5.test
deleted file mode 100755
index 7113e1b..0000000
--- a/tests/check5.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2009, 2010  Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test TESTS = $(check_PROGRAMS)
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-check_PROGRAMS = one two
-TESTS = $(check_PROGRAMS)
-check-local:
-       test -f one$(EXEEXT)
-       test -f two$(EXEEXT)
-       touch ok
-print-tests:
-       echo BEG: $(TESTS) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cat >one.c <<END
-int main() { return 0; }
-END
-cp one.c two.c
-
-./configure
-$MAKE check
-test -f ok
-EXEEXT=.bin $MAKE -e print-tests >output
-cat output
-# No am__EXEEXT_* variable is needed.
-grep '_EXEEXT_[1-9]' Makefile.in && Exit 1
-grep 'BEG: one.bin two.bin :END' output
-$FGREP 'TESTS = $(check_PROGRAMS)' Makefile.in
diff --git a/tests/check6.test b/tests/check6.test
deleted file mode 100755
index e32499c..0000000
--- a/tests/check6.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 400: XFAIL_TESTS delimited by TABs.
-# Also test that Solaris make VPATH rewriting is honored
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = $(XFAIL_TESTS)
-XFAIL_TESTS = a        b       c
-END
-
-cat >>a <<'END'
-#! /bin/sh
-exit 1
-END
-
-cp a b
-cp a c
-
-chmod a+x a b c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check
-$MAKE distclean
-mkdir build
-cd build
-../configure
-$MAKE check
diff --git a/tests/check7.test b/tests/check7.test
deleted file mode 100755
index 1653a8d..0000000
--- a/tests/check7.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check EXEEXT extension for XFAIL_TESTS.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = $(XFAIL_TESTS)
-XFAIL_TESTS = a b c d
-check_PROGRAMS = a c d
-check_SCRIPTS = b
-
-print-xfail-tests:
-       @echo BEG: $(XFAIL_TESTS) :END
-END
-
-cat >>b <<'END'
-#! /bin/sh
-exit 1
-END
-chmod a+x b
-
-cat >>a.c <<'END'
-#include <stdlib.h>
-int main() { return EXIT_FAILURE; }
-END
-
-cp a.c c.c
-cp a.c d.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check
-EXEEXT=.bin $MAKE -e print-xfail-tests >foo
-cat foo
-grep 'BEG: a.bin b c.bin d.bin :END' foo
-
-$MAKE distclean
-mkdir build
-cd build
-../configure
-$MAKE check
diff --git a/tests/check8.test b/tests/check8.test
deleted file mode 100755
index cbf1052..0000000
--- a/tests/check8.test
+++ /dev/null
@@ -1,100 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check subdir TESTS.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-TESTS = foo sub/foo $(check_PROGRAMS)
-XFAIL_TESTS = foo sub/baz
-check_PROGRAMS = bar sub/bar baz sub/baz
-END
-
-mkdir sub
-
-cat >>foo <<'END'
-#! /bin/sh
-test -f "$srcdir/Makefile.am"
-END
-cat >>sub/foo <<'END'
-#! /bin/sh
-test -f "$srcdir/Makefile.am"
-END
-chmod a+x foo sub/foo
-
-cat >>bar.c <<'END'
-int main() { return 0; }
-END
-cat >>sub/bar.c <<'END'
-int main() { return 0; }
-END
-cat >>baz.c <<'END'
-#include <stdlib.h>
-int main() { return EXIT_FAILURE; }
-END
-cat >>sub/baz.c <<'END'
-#include <stdlib.h>
-int main() { return EXIT_FAILURE; }
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr &&
-  { cat stdout; cat stderr >&2; Exit 1; }
-cat stdout
-cat stderr >&2
-grep 'XPASS.* foo$' stdout
-grep '^[^X]*PASS.* sub/foo$' stdout
-grep '^[^X]*PASS.* bar' stdout
-grep '^[^X]*PASS.* sub/bar' stdout
-grep '^[^X]*FAIL.* baz' stdout
-grep 'XFAIL.* sub/baz' stdout
-# parallel-tests should not add circular dependencies.
-# Look for known warnings from a couple of `make' implementations.
-grep -i 'circular.*dependency' stderr && Exit 1
-grep -i 'graph cycles' stderr && Exit 1
-
-$MAKE distclean
-
-mkdir build
-cd build
-../configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-# Note: we are not grepping for the space in the lines from the 'foo'
-# tests, due to the Solaris make VPATH rewriting (if we fix that, we
-# can still write a separate test for it).
-grep 'XPASS.*foo$' stdout
-grep '^[^X]*PASS.*sub/foo$' stdout
-grep '^[^X]*PASS.* bar' stdout
-grep '^[^X]*PASS.* sub/bar' stdout
-grep '^[^X]*FAIL.* baz' stdout
-grep 'XFAIL.* sub/baz' stdout
-
-:
diff --git a/tests/check9.test b/tests/check9.test
deleted file mode 100755
index c80d780..0000000
--- a/tests/check9.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check @substituted@ TESTS.
-# Note that in this test, we rely on the .test extension for the
-# substituted names: this is necessary for parallel-tests.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([script_tests], ['subst-pass-script.test subst-xfail-script.test'])
-AC_SUBST([prog_tests], ['subst-pass-prog.test$(EXEEXT) 
subst-xfail-prog.test$(EXEEXT)'])
-AC_SUBST([xfail_tests], ['xfail-script.test subst-xfail-script.test 
xfail-prog$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = pass-script.test xfail-script.test @script_tests@ $(check_PROGRAMS)
-XFAIL_TESTS = @xfail_tests@
-check_PROGRAMS = pass-prog xfail-prog @prog_tests@
-EXTRA_PROGRAMS = subst-pass-prog.test subst-xfail-prog.test
-END
-
-cat >>pass-script.test <<'END'
-#! /bin/sh
-exit 0
-END
-cat >>xfail-script.test <<'END'
-#! /bin/sh
-exit 1
-END
-chmod a+x pass-script.test xfail-script.test
-cp pass-script.test subst-pass-script.test
-cp xfail-script.test subst-xfail-script.test
-
-cat >>pass-prog.c <<'END'
-int main() { return 0; }
-END
-cat >>xfail-prog.c <<'END'
-#include <stdlib.h>
-int main() { return EXIT_FAILURE; }
-END
-# The .test extension is removed for the default source file name:
-cp pass-prog.c subst-pass-prog.c
-cp xfail-prog.c subst-xfail-prog.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE all
-$MAKE check
-$MAKE distclean
-
-mkdir build
-cd build
-../configure
-$MAKE all
-$MAKE check
-$MAKE distclean
-:
diff --git a/tests/checkall.test b/tests/checkall.test
deleted file mode 100755
index 7dff8fc..0000000
--- a/tests/checkall.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where check target doesn't depend on all.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_SCRIPTS = derived
-check-local:
-       true
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^check-am:.*all-am' Makefile.in
-grep 'MAKE.*check-local' Makefile.in
diff --git a/tests/clean.test b/tests/clean.test
deleted file mode 100755
index 23ab2ac..0000000
--- a/tests/clean.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure a clean target depends on previous one.
-
-. ./defs || Exit 1
-
-set -e
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^clean-am:.*mostlyclean-am' Makefile.in
diff --git a/tests/clean2.test b/tests/clean2.test
deleted file mode 100755
index 99e4c2e..0000000
--- a/tests/clean2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure distclean works in cygnus mode.
-# Report from Daniel Jacobowitz
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-END
-
-mkdir sub
-
-cat > sub/Makefile.am << 'END'
-data_DATA = foo
-
-foo:
-       touch $@
-
-CLEANFILES = $(data_DATA)
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --cygnus
-
-./configure
-$MAKE
-test -f sub/foo
-$MAKE distclean
-test ! -f sub/foo
diff --git a/tests/colneq.test b/tests/colneq.test
deleted file mode 100755
index 59d2414..0000000
--- a/tests/colneq.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that := definitions produce warnings, but otherwise work.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-ICONS := $(wildcard *.xbm)
-data_DATA = $(ICONS)
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep ':=.*not portable' stderr
-
-echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
-grep 'ICONS :=' Makefile.in
diff --git a/tests/colneq2.test b/tests/colneq2.test
deleted file mode 100755
index e454c46..0000000
--- a/tests/colneq2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that := in var substitutions works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-t = a b c
-EXTRA_DIST = $(t:=.test)
-END
-
-: > a.test
-: > b.test
-: > c.test
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/colon.test b/tests/colon.test
deleted file mode 100755
index 22b5ed3..0000000
--- a/tests/colon.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Nyul Laszlo.  When using the ":" syntax in
-# AC_OUTPUT, Automake fails to find the correct file.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_CONFIG_FILES([foo.h:foo.hin])
-AC_OUTPUT
-END
-
-: > Makefile.am
-: > foo.hin
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/colon2.test b/tests/colon2.test
deleted file mode 100755
index a52dfa8..0000000
--- a/tests/colon2.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure ":" works with files automake generates.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile:zardoz.in])
-AC_OUTPUT
-END
-
-echo 'dummy:' > zardoz.am
-
-$ACLOCAL
-$AUTOMAKE
-
-# We actually check several things here.
-test -f zardoz.in
-grep '^zardoz:' zardoz.in && Exit 1
-grep '^dummy:' zardoz.in
-
-:
diff --git a/tests/colon3.test b/tests/colon3.test
deleted file mode 100755
index 151d015..0000000
--- a/tests/colon3.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure ":" works with files automake generates.
-# This test is for multiple ":"s.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile:zardoz.in:two.in:three.in])
-AC_OUTPUT
-END
-
-: > zardoz.am
-: > two.in
-: > three.in
-
-$ACLOCAL
-$AUTOMAKE
-
-# Automake should have created zardoz.in.
-test -f zardoz.in
-
-# The generated file should refer to zardoz.in and zardoz.am, but
-# never just "zardoz".
-sed -e 's|zardoz\.am|zrdz.am|g' \
-    -e 's|zardoz\.in|zrdz.in|g' \
-  <zardoz.in | $FGREP 'zardoz' && Exit 1
-
-# FIXME: Do something like this after planned enahncements to tests/defs.
-# FIXME: Or even do proper functional testing.
-## Also, Makefile should depend on two.in and three.in.
-# extract_makefile_deps Makefile zardoz.in > deps
-#$FGREP ' $(srcdir)/two.in ' deps
-#$FGREP ' $(srcdir)/three.in ' deps
-#
-# FIXME: for the moment, we content ourselves with these inferior tests.
-# Makefile should depend on two.in.
-grep '^Makefile:.* \$(srcdir)/two.in' zardoz.in
-# Likewise three.in.
-grep '^Makefile:.* \$(srcdir)/three.in' zardoz.in
-
-:
diff --git a/tests/colon4.test b/tests/colon4.test
deleted file mode 100755
index 9af6b4e..0000000
--- a/tests/colon4.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure multiple ":"s in AC_CONFIG_FILES do not generate broken
-# rebuild rules.
-# Test from Maciej W. Rozycki.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_CONFIG_FILES([zardoz:one:two:three])
-AC_OUTPUT
-END
-
-: > Makefile.am
-: > one
-: > two
-: > three
-
-$ACLOCAL
-$AUTOMAKE
-
-# The rule should regenerate the file "zardoz", not a meaningless
-# file "'zardoz:one:two".
-$FGREP 'zardoz:one:two' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/colon5.test b/tests/colon5.test
deleted file mode 100755
index 9dae9c8..0000000
--- a/tests/colon5.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another multi-":" test, this time from Doug Evans.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile:Makefile.in:Makefile.dep])
-AC_OUTPUT
-END
-
-: > Makefile.dep
-
-cat > Makefile.am <<'END'
-.PHONY: test
-test:
-       case ' $(DIST_COMMON) ' in \
-         *' $(srcdir)/Makefile.dep '*|*' Makefile.dep '*) exit 0;; \
-         *) exit 1;; \
-       esac
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'Makefile:Makefile\.in' Makefile.in
-grep '^Makefile:.* \$(srcdir)/Makefile\.dep' Makefile.in
-
-sed -e '/@SET_MAKE@/d' -e "address@hidden@!$SHELL!g" <Makefile.in >Makefile.sed
-$MAKE -f Makefile.sed SHELL=$SHELL test
-
-:
diff --git a/tests/colon6.test b/tests/colon6.test
deleted file mode 100755
index 7c620d6..0000000
--- a/tests/colon6.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Yet another multi-":" test, this time from Ken Pizzini.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([demo/Makefile demo/version.good:demo/version.gin])
-AC_OUTPUT
-END
-
-mkdir demo
-
-: > demo/version.gin
-
-cat > demo/Makefile.am <<'END'
-.PHONY: test
-test:
-       case ' $(DIST_COMMON) ' in \
-         *' $(srcdir)/version.gin '*) exit 0;; \
-         *) exit 1;; \
-       esac
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
-grep 'version\.good:.*version\.gin' demo/Makefile.in
-
-sed -e '/@SET_MAKE@/d' -e "address@hidden@!$SHELL!g" <demo/Makefile.in 
>Makefile.sed
-$MAKE -f Makefile.sed SHELL=$SHELL test
-
-:
diff --git a/tests/colon7.test b/tests/colon7.test
deleted file mode 100755
index 4195188..0000000
--- a/tests/colon7.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another test for a failing ":" in AC_OUTPUT.  Report from Maciej
-# Stachowiak.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([colon7], [1.0])
-AM_INIT_AUTOMAKE
-dnl: Please do not add proper m4 quoting here.
-AC_OUTPUT(subdir/bar:subdir/foo \
-   Makefile \
-   subdir/Makefile
-)
-END
-
-: > Makefile.am
-
-mkdir subdir
-: > subdir/Makefile.am
-: > subdir/foo
-
-$ACLOCAL
-$AUTOMAKE
-
-# shouldn't have any bar.in
-grep 'bar.in' subdir/Makefile.in && Exit 1
-
-# DIST_COMMON should have foo, not subdir/foo
-grep 'DIST_COMMON.*subdir/foo' subdir/Makefile.in && Exit 1
-
-:
diff --git a/tests/color.test b/tests/color.test
deleted file mode 100755
index c1032fd..0000000
--- a/tests/color.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test Automake TESTS color output, by forcing it.
-# Keep this in sync with the sister test `color2.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-TERM=ansi
-export TERM
-
-red=''
-grn=''
-lgn=''
-blu=''
-std=''
-
-# Check that grep can parse nonprinting characters.
-# BSD 'grep' works from a pipe, but not a seekable file.
-# GNU or BSD 'grep -a' works on files, but is not portable.
-case `echo "$std" | grep .` in
-  "$std") ;;
-  *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
-esac
-
-cat >>configure.in <<END
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = color-tests
-TESTS = $(check_SCRIPTS)
-check_SCRIPTS = pass fail skip xpass xfail
-XFAIL_TESTS = xpass xfail
-END
-
-cat >pass <<END
-#! /bin/sh
-exit 0
-END
-
-cat >fail <<END
-#! /bin/sh
-exit 1
-END
-
-cat >skip <<END
-#! /bin/sh
-exit 77
-END
-
-cp fail xfail
-cp pass xpass
-chmod +x pass fail skip xpass xfail
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-
-test_color ()
-{
-  # Not a useless use of cat; see above comments about grep.
-  cat stdout | grep ": pass" | $FGREP "$grn"
-  cat stdout | grep ": fail" | $FGREP "$red"
-  cat stdout | grep ": xfail" | $FGREP "$lgn"
-  cat stdout | grep ": xpass" | $FGREP "$red"
-  cat stdout | grep ": skip" | $FGREP "$blu"
-}
-
-test_no_color ()
-{
-  # Not a useless use of cat; see above comments about grep.
-  cat stdout | grep ": pass" | $FGREP "$grn" && Exit 1
-  cat stdout | grep ": fail" | $FGREP "$red" && Exit 1
-  cat stdout | grep ": xfail" | $FGREP "$lgn" && Exit 1
-  cat stdout | grep ": xpass" | $FGREP "$red" && Exit 1
-  cat stdout | grep ": skip" | $FGREP "$blu" && Exit 1
-  :
-}
-
-AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
-cat stdout
-test_color
diff --git a/tests/color2.test b/tests/color2.test
deleted file mode 100755
index bc97313..0000000
--- a/tests/color2.test
+++ /dev/null
@@ -1,139 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test Automake TESTS color output, using the expect(1) program.
-# Keep this in sync with the sister test `color.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-TERM=ansi
-export TERM
-
-red=''
-grn=''
-lgn=''
-blu=''
-std=''
-
-# Check that grep can parse nonprinting characters.
-# BSD 'grep' works from a pipe, but not a seekable file.
-# GNU or BSD 'grep -a' works on files, but is not portable.
-case `echo "$std" | grep .` in
-  "$std") ;;
-  *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
-esac
-
-# This test requires a working a working `expect' program.
-# Creative quoting required to avoid spurious maintainer-check failure.
-(set +e; expect -c 'exit ''77'; test $? -eq 77) \
-  || skip_ "requires a working expect program"
-
-# Also, if the $MAKE program fails to consider the standard output as a
-# tty (this happens with e.g., BSD make and Solaris dmake when they're
-# run in parallel mode; see the autoconf manual), there is little point
-# in proceeding.
-cat > Makefile <<'END'
-all:
-## Creaive quoting in the `echo' below to avoid risk of spurious output
-## matches by `expect', below.
-       @test -t 1 && echo "stdout" "is" "a" "tty"
-END
-cat > expect-check <<'END'
-spawn $env(MAKE)
-expect {
-  "stdout is a tty" { exit 0 }
-  default { exit 1 }
-}
-exit 1
-END
-MAKE=$MAKE expect -f expect-check \
-  || skip_ "make spawned by expect should have a tty stdout"
-rm -f check Makefile
-
-# Do the tests.
-
-cat >>configure.in <<END
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = color-tests
-TESTS = $(check_SCRIPTS)
-check_SCRIPTS = pass fail skip xpass xfail
-XFAIL_TESTS = xpass xfail
-END
-
-cat >pass <<END
-#! /bin/sh
-exit 0
-END
-
-cat >fail <<END
-#! /bin/sh
-exit 1
-END
-
-cat >skip <<END
-#! /bin/sh
-exit 77
-END
-
-cp fail xfail
-cp pass xpass
-chmod +x pass fail skip xpass xfail
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-
-test_color ()
-{
-  # Not a useless use of cat; see above comments about grep.
-  cat stdout | grep ": pass" | $FGREP "$grn"
-  cat stdout | grep ": fail" | $FGREP "$red"
-  cat stdout | grep ": xfail" | $FGREP "$lgn"
-  cat stdout | grep ": xpass" | $FGREP "$red"
-  cat stdout | grep ": skip" | $FGREP "$blu"
-}
-
-test_no_color ()
-{
-  # Not a useless use of cat; see above comments about grep.
-  cat stdout | grep ": pass" | $FGREP "$grn" && Exit 1
-  cat stdout | grep ": fail" | $FGREP "$red" && Exit 1
-  cat stdout | grep ": xfail" | $FGREP "$lgn" && Exit 1
-  cat stdout | grep ": xpass" | $FGREP "$red" && Exit 1
-  cat stdout | grep ": skip" | $FGREP "$blu" && Exit 1
-  :
-}
-
-cat >expect-make <<'END'
-spawn $env(MAKE) -e check
-expect eof
-END
-
-MAKE=$MAKE expect -f expect-make >stdout \
-  || { cat stdout; Exit 1; }
-cat stdout
-test_color
-
-AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout \
-  || { cat stdout; Exit 1; }
-cat stdout
-test_no_color
diff --git a/tests/commen10.test b/tests/commen10.test
deleted file mode 100755
index d7148f8..0000000
--- a/tests/commen10.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure comments following trailing backslashes are diagnosed.
-# Report from Harald Dunkel.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUBDIRS = foo \
-# bar
-
-END
-
-mkdir foo
-
-$ACLOCAL
-AUTOMAKE_fails
-grep backslash stderr
diff --git a/tests/commen11.test b/tests/commen11.test
deleted file mode 100755
index 963f2f8..0000000
--- a/tests/commen11.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure backslash-newline-hash combinations are diagnosed as
-# comments following a trailing backslash, even when the combination
-# follows a variable assignment that is preceded by a comment.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-# initial comment
-variable = value-before-comment \
-#
-
-# comment
-SUBDIRS = foo \
-# bar
-
-END
-
-mkdir foo
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 3.*backslash stderr
-grep 7.*backslash stderr
-:
diff --git a/tests/comment.test b/tests/comment.test
deleted file mode 100755
index 761dbf5..0000000
--- a/tests/comment.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that `#' as start of word in AUTOMAKE_OPTIONS means
-# comment.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = #no such option
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/comment2.test b/tests/comment2.test
deleted file mode 100755
index 97e6a26..0000000
--- a/tests/comment2.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure comment recognition works in PROGRAMS.  Report from Mark
-# Galassi.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = sim_products receive_th receive_pos # image_proc
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^image_proc' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/comment3.test b/tests/comment3.test
deleted file mode 100755
index 14980c8..0000000
--- a/tests/comment3.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that `#' after a tab is a failure.
-# The Tru64 Unix V5.1 system make will pass these to the
-# shell, which in turn can't find `#' as a command.
-# Sigh.  Some vendors must be destroyed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-install-data-local:
-       # Tru64 Unix must die
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*#' stderr
diff --git a/tests/comment4.test b/tests/comment4.test
deleted file mode 100755
index f6e6a3f..0000000
--- a/tests/comment4.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure commented variables are output near their comments.
-
-. ./defs || Exit 1
-
-cat >> configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-# UnIqUe_COPYRIGHT_BOILERPLATE
-
-# UnIqUe_MUMBLE_COMMENT
-mumble = UnIqUe_MUMBLE_VALUE
-EOF
-
-set -e
-$ACLOCAL
-$AUTOMAKE
-# UnIqUe_COPYRIGHT_BOILERPLATE should appear near the top of the file
-test `sed -n -e '1,/UnIqUe_COPYRIGHT_BOILERPLATE/p' Makefile.in \
-      | wc -l` -le 30
-# UnIqUe_MUMBLE_COMMENT should appear right before the mumble declaration.
-test `sed -n -e '/UnIqUe_MUMBLE_COMMENT/,/UnIqUe_MUMBLE_VALUE/p' Makefile.in \
-      | wc -l` -eq 2
diff --git a/tests/comment5.test b/tests/comment5.test
deleted file mode 100755
index 21b5e87..0000000
--- a/tests/comment5.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR/280.
-# (Automake should complain about trailing backslashes in comments.)
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-all-local:
-       @echo ${var}
-
-# a comment with backslash \
-
-
-var = foo
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '^Makefile.am:5: blank line following trailing backslash' stderr
-
-
-## Here is a second test because head comments are
-## handled differently in Automake 1.5.
-
-cat > Makefile.am << 'EOF'
-# a comment with backslash \
-
-
-all-local:
-       @echo ${var}
-
-var = foo
-EOF
-
-AUTOMAKE_fails
-grep '^Makefile.am:2: blank line following trailing backslash' stderr
-
-
-## Make sure we print an 'included' stack on errors.
-
-echo 'include Makefile.inc'> Makefile.am
-cat > Makefile.inc << 'EOF'
-# a comment with backslash \
-
-EOF
-
-AUTOMAKE_fails
-grep '^Makefile.inc:2: blank line following trailing backslash' stderr
-grep '^Makefile.am:1: .*included from here' stderr
-
-
-## Make sure backslashes are still allowed within a comment.
-## This usually happens when commenting out a Makefile rule.
-
-cat > Makefile.am << 'EOF'
-all-local:
-       @echo ${var}
-
-# a comment with backslash \
-# but terminated by a line without backslash
-
-var = foo
-EOF
-
-$AUTOMAKE
diff --git a/tests/comment6.test b/tests/comment6.test
deleted file mode 100755
index efa8482..0000000
--- a/tests/comment6.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR/322.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-## There are two tests: one with backslashed comments at the top
-## of the file, and one with a rule first.  This is because
-## Comments at the top of the file are handled specially
-## since Automake 1.5.
-
-cat > Makefile.am << 'EOF'
-# SOME_FILES = \
-         file1 \
-         file2 \
-         file3
-
-all-local:
-       @echo Good
-
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-
-grep '# SOME_FILES' Makefile
-grep '# *file3' Makefile
-
-cat > Makefile.am << 'EOF'
-all-local:
-       @echo Good
-
-# SOME_FILES = \
-         file1 \
-         file2 \
-         file3
-EOF
-
-$AUTOMAKE
-./configure
-$MAKE
-grep '# SOME_FILES' Makefile
-grep '# *file3' Makefile
diff --git a/tests/comment7.test b/tests/comment7.test
deleted file mode 100755
index f28b711..0000000
--- a/tests/comment7.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure comment for conditional variables are output near the
-# corresponding conditional definitions.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AM_CONDITIONAL([COND], [true])
-EOF
-
-cat > Makefile.am << 'EOF'
-if COND
-# Comment for VAR in COND_TRUE.
-VAR = foo
-else
-# Comment for VAR in COND_FALSE.
-VAR = bar
-endif
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-
-# The VAR definition appears once for each condition.
-test `grep '@address@hidden' Makefile.in | wc -l` = 1
-test `grep '@address@hidden' Makefile.in | wc -l` = 1
-
-# Make sure the right definition follows each comment.
-sed -n '/^#.*VAR.*COND_TRUE/ {
-         n
-         p
-       }' Makefile.in |
-  grep '@address@hidden = foo'
-sed -n '/^#.*VAR.*COND_FALSE/ {
-         n
-         p
-       }' Makefile.in |
-  grep '@address@hidden = bar'
diff --git a/tests/comment8.test b/tests/comment8.test
deleted file mode 100755
index 58ef56a..0000000
--- a/tests/comment8.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure += does not append to a comment.
-# Report from Stepan Kasal.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [true])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-VAR = valA# comA ## com C
-VAR += valB # comB
-if COND1
-  VAR += val1 # com1
-endif COND1
-VAR += valC
-if COND2
-  VAR += val2 # com2
-endif COND2
-
-test:
-       test "`echo $(VAR)`" = 'valA valB val1 valC val2'
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test
diff --git a/tests/comment9.test b/tests/comment9.test
deleted file mode 100755
index b106b3a..0000000
--- a/tests/comment9.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure ##-comments are ignored in variable definitions.
-# Report from Julien Sopena.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-TESTS = \
-   1.test \
-   2.test \
-   3.test \
-## 4.test \
-   5.test \
-   6.test \
-   7.test
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-
-sed -n -e '/^TESTS =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e '/^TESTS =/ p' Makefile.in > tests
-
-grep '3\.test' tests
-grep '##' tests && Exit 1
-grep '4\.test' tests && Exit 1
-grep '5\.test' tests
diff --git a/tests/comments-in-var-def.test b/tests/comments-in-var-def.test
deleted file mode 100755
index b00ee6b..0000000
--- a/tests/comments-in-var-def.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake ignores in-line comments when using variables,
-# but preserve them in the output.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-# Use a slash in the comment, because automake takes the dirname
-# of TEXINFO_TEX to compute $(am__TEXINFO_TEX_DIR).
-cat > Makefile.am << 'END'
-TEXINFO_TEX = tex/texinfo.tex    # some comment w/ a slash
-info_TEXINFOS = main.texi
-.PHONY: test
-test:
-       test tex/texinfo.tex = $(TEXINFO_TEX)
-       test -d '$(am__TEXINFO_TEX_DIR)'
-       case '$(am__TEXINFO_TEX_DIR)' in tex|./tex) :;; *) exit 1;; esac
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
-END
-
-mkdir tex
-: > tex/texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-grep TEX Makefile.in # for debugging
-grep '^TEXINFO_TEX *= *tex/texinfo\.tex  *# some comment w/ a slash *$' 
Makefile.in
-
-$AUTOCONF
-./configure
-$MAKE test
-
-:
diff --git a/tests/compile.test b/tests/compile.test
deleted file mode 100755
index ef27afe..0000000
--- a/tests/compile.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' preserves spaces in its arguments.
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/compile" .
-
-# -o 'a  c' should not be stripped because 'a  c' is not an object
-# (it does not matter whether touch creates ./-- or not)
-./compile touch a.o -- -o 'a  c' a.c
-test -f 'a  c'
-test -f ./-o
-test -f a.o
-test -f a.c
-
-rm -f 'a  c' ./-o a.o a.c
-
-./compile touch a.o -- -o 'a  c.o' a.c
-test -f 'a  c.o'
-test ! -f ./-o
-test ! -f a.o
-test -f a.c
-
-# Make sure `compile' works for .obj too.
-./compile touch a.obj -- -o ac.obj a.c
-test ! -f a.obj
-test ac.obj
diff --git a/tests/compile2.test b/tests/compile2.test
deleted file mode 100755
index 334f154..0000000
--- a/tests/compile2.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' deals correctly with w32 style paths.
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/compile" .
-
-cat >mycc <<'END'
-source_seen=no
-for arg
-do
-  test "X$arg" = X-o && exit 1
-  test "X$arg" = "X$amtest_source" && source_seen=yes
-done
-if test "$source_seen" != yes; then
-  echo "$0: no source file seen" >&2
-  exit 1
-fi
-if test ! -f "$amtest_source"; then
-  echo "$0: $amtest_source not readable" >&2
-  exit 1
-fi
-if test ! -d "$amtest_lock"; then
-  echo "$0: no lockdir $amtest_lock" >&2
-  exit 1
-fi
-touch "$amtest_obj"
-END
-
-chmod +x ./mycc
-
-# In case this test runs on a system with backslash directory separators:
-mkdir libltdl libltdl/libltdl
-
-# Backslashes in the input and the output name should be accepted.
-# Since this test might run on non-w32 systems, we need to be careful not
-# to use any backslash sequences which might be interpreted by `echo'.
-amtest_source='libltdl\libltdl\slist.c'
-amtest_object='libltdl\libltdl\libltdl_libltdl_la-slist.obj'
-amtest_obj='slist.o'
-amtest_lock='slist_o.d'
-export amtest_source amtest_object amtest_obj amtest_lock
-
-: > "$amtest_source"
-./compile ./mycc -c "$amtest_source" -o "$amtest_object"
-test -f "$amtest_object"
-
-
-# Absolute w32 paths should be accepted.
-# Do not actually run this test on anything that could be w32.
-test -d "C:\\" && Exit 77
-case $PATH_SEPARATOR in ';'|':');; *) Exit 77;; esac
-
-amtest_source='C:\libltdl\libltdl\slist.c'
-amtest_object='C:\libltdl\libltdl\libltdl_libltdl_la-slist.obj'
-amtest_obj='slist.o'
-amtest_lock='slist_o.d'
-export amtest_source amtest_object amtest_obj amtest_lock
-
-: > "$amtest_source"
-./compile ./mycc -c "$amtest_source" -o "$amtest_object"
-test -f "$amtest_object"
-
-:
diff --git a/tests/compile3.test b/tests/compile3.test
deleted file mode 100755
index 5f2df7d..0000000
--- a/tests/compile3.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' wraps the Microsoft C/C++ compiler (cl) correctly
-
-required=xsi-shell
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/compile" .
-
-# Use a dummy cl, since cl isn't readily available on all systems
-cat >cl <<'END'
-#! /bin/sh
-echo "$@"
-END
-
-chmod +x ./cl
-
-# POSIX mandates that the compiler accepts a space between the -I,
-# -l and -L options and their respective arguments.  Traditionally,
-# this should work also without a space.  Try both usages.
-for sp in '' ' '; do
-  # Check if compile handles "-o foo", -I, -l, -L, -Xlinker -Wl,
-  opts=`LIB= ./compile ./cl foo.c -o foo -l${sp}bar -L${sp}gazonk -I${sp}baz 
-Xlinker foobar -Wl,-foo,bar`
-  test x"$opts" = x"foo.c -Fefoo bar.lib -Ibaz -link -LIBPATH:gazonk foobar 
-foo bar"
-
-  # Check if compile handles "-o foo.obj"
-  opts=`./compile ./cl -c foo.c -o foo.obj -I${sp}baz`
-  test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
-
-  # Check if compile handles "-o foo.o"
-  opts=`./compile ./cl -c foo.c -o foo.o -I${sp}baz`
-  test x"$opts" = x"-c foo.c -Fofoo.o -Ibaz"
-
-  # Check if compile handles "foo.cc" as C++.
-  opts=`./compile ./cl -c foo.cc -o foo.o -I${sp}baz`
-  test x"$opts" = x"-c -Tpfoo.cc -Fofoo.o -Ibaz"
-
-  # Check if compile clears the "eat" variable properly.
-  opts=`eat=1 ./compile ./cl -c foo.c -o foo.obj -I${sp}baz`
-  test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
-done
-
-:
diff --git a/tests/compile4.test b/tests/compile4.test
deleted file mode 100755
index bac8a54..0000000
--- a/tests/compile4.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' wraps the Microsoft C/C++ compiler (cl) correctly
-# with respect to absolute paths.
-
-required='cl'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >sub/foo.c <<'EOF'
-int
-foo ()
-{
-  return 0;
-}
-EOF
-
-cat >main.c <<'EOF'
-extern int foo ();
-int
-main ()
-{
-  return foo ();
-}
-EOF
-
-absfoodir=`pwd`/sub
-absmainc=`pwd`/main.c
-absmainobj=`pwd`/main.obj
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-END
-
-cat > sub/Makefile.am << 'END'
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE
-
-./compile cl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc"
-
-# cl expects archives to be named foo.lib, not libfoo.a so
-# make a simple copy here if needed. This is a severe case
-# of badness, but ignore that since this is not what is
-# being tested here...
-if test -f sub/libfoo.a; then
-  cp sub/libfoo.a sub/foo.lib
-fi
-
-# POSIX mandates that the compiler accepts a space between the -I,
-# -l and -L options and their respective arguments.  Traditionally,
-# this should work also without a space.  Try both usages.
-for sp in '' ' '; do
-  rm -f main
-
-  ./compile cl $CFLAGS $LDFLAGS -L${sp}"$absfoodir" "$absmainobj" -o main 
-l${sp}foo
-
-  ./main
-done
-
-:
diff --git a/tests/compile5.test b/tests/compile5.test
deleted file mode 100755
index e80a76f..0000000
--- a/tests/compile5.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the file name translation in the `compile' script works
-# correctly
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/compile" .
-
-# Use a dummy cl, since cl isn't readily available on all systems
-cat >cl <<'END'
-#! /bin/sh
-echo "$@"
-END
-
-chmod +x ./cl
-
-cat >>configure.in << 'END'
-AC_CANONICAL_HOST
-AC_CONFIG_FILES([check_host], [chmod +x check_host])
-AC_OUTPUT
-END
-
-: >Makefile.am
-
-cat >check_host.in << 'END'
-#! /bin/sh
-case @host_os@ in
-  mingw*)
-    ;;
-  *)
-    exit 77
-    ;;
-esac
-case @build_os@ in
-  mingw* | cygwin*)
-    ;;
-  *)
-    winepath -w / || exit 77
-    ;;
-esac
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-./check_host
-
-pwd=`pwd`
-
-# POSIX mandates that the compiler accepts a space between the -I,
-# -l and -L options and their respective arguments.  Traditionally,
-# this should work also without a space.  Try both usages.
-for sp in '' ' '; do
-  # Check if "compile cl" transforms absolute file names to
-  # host format (e.g /somewhere -> c:/msys/1.0/somewhere).
-
-  res=`./compile ./cl -L${sp}"$pwd" | sed -e 's/-link -LIBPATH://'`
-
-  case $res in
-    ?:[\\/]*)
-      ;;
-    *)
-      Exit 1
-      ;;
-  esac
-done
-
-:
diff --git a/tests/compile6.test b/tests/compile6.test
deleted file mode 100755
index c2eadc0..0000000
--- a/tests/compile6.test
+++ /dev/null
@@ -1,106 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' searches libraries correctly
-
-required=xsi-shell
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/compile" .
-
-# Use a dummy cl, since cl isn't readily available on all systems
-cat >cl <<'END'
-#! /bin/sh
-echo "$@"
-END
-
-chmod +x ./cl
-
-# POSIX mandates that the compiler accepts a space between the -I,
-# -l and -L options and their respective arguments.  Traditionally,
-# this should work also without a space.  Try both usages.
-for sp in '' ' '; do
-  rm -rf lib lib2 syslib "sys  lib2"
-
-  mkdir syslib
-  :> syslib/foo.lib
-
-  syslib=`pwd`/syslib
-  LIB=$syslib
-  export LIB
-
-  mkdir lib
-  :> lib/bar.lib
-  :> lib/bar.dll.lib
-
-  # Check if compile library search correctly
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib"
-
-  # Check if -static makes compile avoid bar.dll.lib
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib -static -l${sp}bar -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo lib/bar.lib $syslib/foo.lib -link 
-LIBPATH:lib"
-
-  :> syslib/bar.lib
-  :> syslib/bar.dll.lib
-
-  # Check if compile finds bar.dll.lib in syslib
-  opts=`./compile ./cl foo.c -o foo -l${sp}bar -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo $syslib/bar.dll.lib $syslib/foo.lib"
-
-  # Check if compile prefers -L over $LIB
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib"
-
-  mkdir lib2
-  :> lib2/bar.dll.lib
-
-  # Check if compile avoids bar.dll.lib in lib2 when -static
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -static -l${sp}bar -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo $syslib/bar.lib $syslib/foo.lib -link 
-LIBPATH:lib2"
-
-  # Check if compile gets two different bar libraries when -static
-  # is added in the middle
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -L${sp}lib -l${sp}bar -static 
-l${sp}bar`
-  test x"$opts" = x"foo.c -Fefoo lib2/bar.dll.lib lib/bar.lib -link 
-LIBPATH:lib2 -LIBPATH:lib"
-
-  # Check if compile gets the correct bar.dll.lib
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib -L${sp}lib2 -l${sp}bar 
-l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib -LIBPATH:lib2"
-
-  # Check if compile gets the correct bar.dll.lib
-  opts=`./compile ./cl foo.c -o foo -L${sp}lib2 -L${sp}lib -l${sp}bar 
-l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo lib2/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib2 -LIBPATH:lib"
-
-  mkdir "sys  lib2"
-  :> "sys  lib2/foo.dll.lib"
-
-  syslib2="`pwd`/sys  lib2"
-  LIB="$syslib2;$LIB"
-
-  # Check if compile handles spaces in $LIB and that it prefers the order
-  # in a multi-component $LIB.
-  opts=`./compile ./cl foo.c -o foo -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo $syslib2/foo.dll.lib"
-
-  # Check if compile handles the 2nd directory in a multi-component $LIB.
-  opts=`./compile ./cl foo.c -o foo -static -l${sp}foo`
-  test x"$opts" = x"foo.c -Fefoo $syslib/foo.lib"
-done
-
-:
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
deleted file mode 100755
index 21ed65d..0000000
--- a/tests/compile_f90_c_cxx.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure rules to invoke all compilers are selected with
-# mixed source objects.
-# (copied from compile_f_c_cxx.test) Mike Nolta <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_FC
-AC_FC_LIBRARY_LDFLAGS
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES  = foo.f90 bar.c baz.cc
-foo_LDADD    = @FLIBS@
-END
-
-: > foo.f90
-: > bar.c
-: > baz.cc
-
-$ACLOCAL
-$AUTOMAKE
-
-# Look for the macros at the beginning of rules.  Be careful, as there
-# are literal tabs at the beginning of the search strings.
-$FGREP '       $(COMPILE)'    Makefile.in
-$FGREP '       $(CXXCOMPILE)' Makefile.in
-$FGREP '       $(FCCOMPILE)'  Makefile.in
-
-Exit 0
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
deleted file mode 100755
index d1836fb..0000000
--- a/tests/compile_f_c_cxx.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure rules to invoke all compilers are selected with
-# mixed source objects.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_F77
-AC_F77_LIBRARY_LDFLAGS
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES  = foo.f bar.c baz.cc
-foo_LDADD    = @FLIBS@
-END
-
-: > foo.f
-: > bar.c
-: > baz.cc
-: > config.guess
-: > config.sub
-
-$ACLOCAL
-$AUTOMAKE
-
-# Look for the macros at the beginning of rules.  Be careful, as there
-# are literal tabs at the beginning of the search strings.
-$FGREP '       $(COMPILE)'    Makefile.in
-$FGREP '       $(CXXCOMPILE)' Makefile.in
-$FGREP '       $(F77COMPILE)' Makefile.in
-
-Exit 0
diff --git a/tests/cond.test b/tests/cond.test
deleted file mode 100755
index 586d80a..0000000
--- a/tests/cond.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check basic use of conditionals.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL(TEST, true)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if TEST
-VAR = true
-else
-VAR = false
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^TEST_FALSE' Makefile.in && Exit 1
-grep '^TEST_TRUE' Makefile.in && Exit 1
-grep 'address@hidden@VAR = true$' Makefile.in
-grep 'address@hidden@VAR = false$' Makefile.in
diff --git a/tests/cond10.test b/tests/cond10.test
deleted file mode 100755
index 974dfdc..0000000
--- a/tests/cond10.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.  From Raja R Harinath.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL(USE_A,[test x = y])
-AM_CONDITIONAL(USE_B,[test x = z])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if USE_A
-out=output_a.c
-else
-if USE_B
-out=output_b.c
-else
-out=output_c.c
-endif
-endif
-
-noinst_PROGRAMS=foo
-foo_SOURCES=foo.c $(out)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-grep 'USE_A_FALSE.*USE_B_FALSE.*output_c\...OBJEXT.' Makefile.in
diff --git a/tests/cond11.test b/tests/cond11.test
deleted file mode 100755
index 15c6c2a..0000000
--- a/tests/cond11.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.  From Richard Boulton.
-# This checks that, if LDADD is set from a conditional variable
-# and an AC_SUBST, the _DEPENDENCIES variable is set correctly.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([USE_A], [test -z "$two"])
-AC_SUBST([SUBSTVAR], [bar])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-
-if USE_A
-foolibs=faz.la
-else
-foolibs=
-endif
-
-noinst_PROGRAMS = foo
-foo_SOURCES = foo.c
-LDADD = $(SUBSTVAR) $(foolibs)
-
-print:
-       @echo BEG: $(foo_DEPENDENCIES) :END
-END
-
-: > config.guess
-: > config.sub
-: > compile
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: faz.la :END' stdout
-
-./configure two=yes
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: :END' stdout
diff --git a/tests/cond13.test b/tests/cond13.test
deleted file mode 100755
index 28f6cd3..0000000
--- a/tests/cond13.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.
-# Report from Lars J. Aas.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_AR
-AC_PROG_RANLIB
-AM_CONDITIONAL(COND1, true)
-AM_CONDITIONAL(COND2, true)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtest.a
-
-if COND1
-SOURCEVAR1 =
-SOURCEVAR2 = habla.cpp espanol.cpp
-else
-SOURCEVAR1 = dummy.cpp
-SOURCEVAR2 =
-endif
-
-if COND2
-TESTSOURCES = $(SOURCEVAR1)
-else
-TESTSOURCES = $(SOURCEVAR2)
-endif
-
-libtest_a_SOURCES = $(TESTSOURCES)
-END
-
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'am_libtest_a_OBJECTS = .*$' Makefile.in
diff --git a/tests/cond14.test b/tests/cond14.test
deleted file mode 100755
index 09701f7..0000000
--- a/tests/cond14.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.
-# Report from Robert Boehne
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([COND1], [true])
-END
-
-cat > Makefile.am << 'END'
-
-if COND1
-BUILD_helldl = helldl
-helldl_SOURCES = dlmain.c
-helldl_DEPENDENCIES = libhello.la
-else
-BUILD_helldl =
-bin_SCRIPTS = helldl
-helldl$(EXEEXT):
-       rm -f $@
-       echo '#! /bin/sh' > $@
-       echo '-dlopen is unsupported' >> $@
-       chmod +x $@
-endif
-
-bin_PROGRAMS = $(BUILD_helldl)
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-num=`grep 'helldl$(EXEEXT):' Makefile.in | wc -l`
-test $num -eq 2
-
-:
diff --git a/tests/cond15.test b/tests/cond15.test
deleted file mode 100755
index 0789074..0000000
--- a/tests/cond15.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for conditionally defined overriding of automatic rules.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [true])
-END
-
-cat > Makefile.am << 'END'
-
-if COND1
-if COND2
-bin_SCRIPTS = helldl
-helldl$(EXEEXT):
-       rm -f $@
-       echo '#! /bin/sh' > $@
-       echo '-dlopen is unsupported' >> $@
-       chmod +x $@
-endif
-else
-if COND2
-else
-bin_SCRIPTS = helldl
-helldl$(EXEEXT):
-       rm -f $@
-       echo '#! /bin/sh' > $@
-       echo '-dlopen is unsupported' >> $@
-       chmod +x $@
-endif
-endif
-
-bin_PROGRAMS = helldl
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-num1=`$FGREP 'helldl$(EXEEXT):' Makefile.in | wc -l`
-num2=`$FGREP '@COND1_FALSE@@address@hidden(EXEEXT):' Makefile.in | wc -l`
-test $num1 -eq 4
-test $num2 -eq 1
-
-:
diff --git a/tests/cond16.test b/tests/cond16.test
deleted file mode 100755
index 467b718..0000000
--- a/tests/cond16.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals in SOURCES with variable substitution 
references.
-# Report from Richard Boulton
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(hello.c)
-AM_INIT_AUTOMAKE(hello,0.23)
-AC_PROG_CC
-AM_CONDITIONAL(COND1, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > hello.c << 'END'
-END
-
-cat > Makefile.am << 'END'
-
-if COND1
-var = foo.c
-else
-var = foo.c
-endif
-
-bin_PROGRAMS = hell
-hell_SOURCES = $(var:=)
-
-echorule:
-       @echo $(hell_SOURCES) $(hell_OBJECTS)
-
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-val=`$MAKE -s echorule`;
-echo $val
-test "x$val" = "xfoo.c foo.o"
diff --git a/tests/cond17.test b/tests/cond17.test
deleted file mode 100755
index 7368d9a..0000000
--- a/tests/cond17.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for being able to define an object to be generated in different ways
-# according to a conditional.
-# Report from Richard Boulton
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hello,0.23)
-AC_PROG_CC
-AC_PROG_CXX
-AM_CONDITIONAL(COND1, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = helldl
-if COND1
-helldl_SOURCES = foo.cc
-else
-helldl_SOURCES = foo.c
-endif
-END
-
-set -e
-
-$ACLOCAL
-$AUTOMAKE -a
diff --git a/tests/cond18.test b/tests/cond18.test
deleted file mode 100755
index 3119658..0000000
--- a/tests/cond18.test
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for substitution references to conditional variables.
-# Report from Richard Boulton
-
-required='GNUmake gcc'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hello,0.23)
-AC_PROG_CC
-AM_CONDITIONAL(COND1, true)
-AM_CONDITIONAL(COND2, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-
-var1 = dlmain
-
-if COND1
-var2 = $(var1:=.c) foo.cc
-else
-var2 = $(var1:=.c)
-endif
-
-if COND2
-var3 = $(var2:.cc=.c)
-else
-var3 = $(var2:.cc=.c)
-endif
-
-helldl_SOURCES = $(var3)
-
-echorule:
-       @echo $(helldl_SOURCES) $(helldl_OBJECTS)
-
-bin_PROGRAMS = helldl
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-val=`$MAKE --no-print-directory echorule`;
-echo $val
-test "x$val" = "xdlmain.c foo.c dlmain.o foo.o"
diff --git a/tests/cond19.test b/tests/cond19.test
deleted file mode 100755
index 14dfb51..0000000
--- a/tests/cond19.test
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for substitution references to conditional variables.
-# Report from Richard Boulton
-
-required='GNUmake gcc'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hello,0.23)
-AC_PROG_CC
-AM_CONDITIONAL(COND1, test "x$CONDITION1" = "xtrue")
-AM_CONDITIONAL(COND2, test "x$CONDITION2" = "xtrue")
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-
-var1 = dlmain
-
-if COND1
-var2 = $(var1:=.c)
-else
-var2 = $(var1:=.c)
-endif
-
-if COND2
-var3 = $(var2:.c=a.c)
-var4 = $(var2:.c=b.c)
-else
-var3 = $(var2:.c=b.c)
-var4 = $(var2:.c=a.c)
-endif
-
-helldl_SOURCES = $(var3:.c=1.c) $(var4:.c=2.c)
-
-echorule:
-       @echo $(helldl_SOURCES) $(helldl_OBJECTS)
-
-bin_PROGRAMS = helldl
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-CONDITION1=true CONDITION2=true ./configure
-vala=`$MAKE --no-print-directory echorule`;
-CONDITION1=true CONDITION2=false ./configure
-valb=`$MAKE --no-print-directory echorule`;
-CONDITION1=false CONDITION2=true ./configure
-valc=`$MAKE --no-print-directory echorule`;
-CONDITION1=false CONDITION2=false ./configure
-vald=`$MAKE --no-print-directory echorule`;
-
-echo $vala
-echo $valb
-echo $valc
-echo $vald
-test "x$vala" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || Exit 1
-test "x$valb" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || Exit 1
-test "x$valc" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || Exit 1
-test "x$vald" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || Exit 1
diff --git a/tests/cond2.test b/tests/cond2.test
deleted file mode 100755
index a548ef6..0000000
--- a/tests/cond2.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check SUBDIRS set based on conditionals.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONDITIONAL(TEST, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-if TEST
-DIR = dir1
-else
-DIR = dir2
-endif
-SUBDIRS = $(DIR)
-END
-
-mkdir dir1
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:4:.*dir2.*does not exist' stderr
diff --git a/tests/cond20.test b/tests/cond20.test
deleted file mode 100755
index d0557e5..0000000
--- a/tests/cond20.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for recursion handling in substitution references to
-# conditional variables.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hello,0.23)
-AC_PROG_CC
-AM_CONDITIONAL(COND1, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-
-var1 = $(var2)
-
-if COND1
-var2 = $(var1:=.c) foo.c
-else
-var2 = $(var1:=.c)
-endif
-
-helldl_SOURCES = $(var2)
-
-bin_PROGRAMS = helldl
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails -a
-grep "recursively defined" stderr
diff --git a/tests/cond21.test b/tests/cond21.test
deleted file mode 100755
index 160c76f..0000000
--- a/tests/cond21.test
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for use of = and += in different conditions.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL(COND1, true)
-AM_CONDITIONAL(COND2, true)
-AM_CONDITIONAL(COND3, true)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-
-FOO = foo
-if COND1
-  FOO += foo1
-else
-  FOO += foon1
-endif
-if COND2
-  FOO += foo2
-else
-  FOO += foon2
-endif
-if COND1
-  FOO += foo1b
-else
-  FOO += foon1b
-endif
-
-if COND1
-if COND2
-  BAR = bar12
-else
-  BAR = bar1n2
-endif
-else
-  BAR = barn1
-endif
-
-BAR += bar
-
-if COND3
-  BAR += bar3
-endif
-
-test:
-       @echo BAR: $(BAR) :BAR
-       @echo FOO: $(FOO) :FOO
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
-$MAKE test | $FGREP 'FOO: foo foo1 foo2 foo1b :FOO'
diff --git a/tests/cond22.test b/tests/cond22.test
deleted file mode 100755
index 4ef1967..0000000
--- a/tests/cond22.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for bug when sources listed in conditional.
-# Report from Richard Boulton.  PR/326.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL(ONE, true)
-AM_CONDITIONAL(TWO, false)
-AM_CONDITIONAL(THREE, false)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = targ
-
-if ONE
-SONE = one.c
-endif
-
-if TWO
-STWO =
-else
-STWO = two.c
-endif
-
-if THREE
-STHREE =
-else
-STHREE = three.c
-endif
-
-if THREE
-STHREE2 =
-else
-STHREE2 = three2.c
-endif
-
-targ_SOURCES = $(SONE) $(STWO) $(STHREE) $(STHREE2)
-
-echo:
-       echo BEG: $(targ_OBJECTS) :END;
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-OBJEXT=oo $MAKE -e echo > output
-cat output
-$FGREP 'BEG: one.oo two.oo three.oo three2.oo :END' output
diff --git a/tests/cond23.test b/tests/cond23.test
deleted file mode 100755
index e2b133c..0000000
--- a/tests/cond23.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
-# Report from Patrik Weiskircher
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_CONDITIONAL([COND], [true])
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-if COND
-libdir = mumble
-endif
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'libdir was already defined' stderr
diff --git a/tests/cond24.test b/tests/cond24.test
deleted file mode 100755
index e548211..0000000
--- a/tests/cond24.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
-# Report from Patrik Weiskircher
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_SUBST([foo], [bar])
-AM_CONDITIONAL([COND], [true])
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-if COND
-foo = baz
-endif
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'foo was already defined' stderr
diff --git a/tests/cond25.test b/tests/cond25.test
deleted file mode 100755
index 02614f9..0000000
--- a/tests/cond25.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that conditional primaries can use non-conditional directories.
-# From Pavel Roskin.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'EOF'
-AM_CONDITIONAL([USE_FOO], [true])
-AC_PROG_CC
-EOF
-
-cat >Makefile.am << 'EOF'
-if USE_FOO
-foo_PROGRAMS = foo
-endif
-
-foodir = $(libdir)/foo
-foo_SOURCES = foo.c
-EOF
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond26.test b/tests/cond26.test
deleted file mode 100755
index 1d93cc0..0000000
--- a/tests/cond26.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that non-conditional primaries can use conditional directories.
-# Reported by Juergen Keil.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'EOF'
-AM_CONDITIONAL([USE_FOO], [true])
-EOF
-
-cat >Makefile.am << 'EOF'
-if USE_FOO
-mydir = /foo
-else
-mydir = /bar
-endif
-my_DATA = foo
-EOF
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond27.test b/tests/cond27.test
deleted file mode 100755
index 250b1ef..0000000
--- a/tests/cond27.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that non-conditional primaries cannot use directories defined
-# in some conditions (but not others).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'EOF'
-AM_CONDITIONAL([USE_FOO], [true])
-EOF
-
-cat >Makefile.am << 'EOF'
-if USE_FOO
-mydir = /foo
-endif
-my_DATA = foo
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep ' USE_FOO' stderr && Exit 1
-grep '!USE_FOO' stderr
diff --git a/tests/cond28.test b/tests/cond28.test
deleted file mode 100755
index 006ef57..0000000
--- a/tests/cond28.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that conditional primaries can use directories defined
-# in the same conditions (but not others).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'EOF'
-AM_CONDITIONAL([USE_FOO], [true])
-EOF
-
-cat >Makefile.am << 'EOF'
-if USE_FOO
-mydir = /foo
-endif
-if USE_FOO
-my_DATA = foo
-endif
-EOF
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond29.test b/tests/cond29.test
deleted file mode 100755
index 8310eab..0000000
--- a/tests/cond29.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that many conditions do not lead to combinatorial explosion.
-# (This is related to PR/352.)
-#
-# On this test, Automake 1.7.x would compute all 2**22 = 4194304
-# possible combinations of conditionals (it would do this five times,
-# to define a01_DEPENDENCIES, a02_DEPENDENCIES, a03_OBJECTS,
-# a04_OBJECTS, and to rewrite bin_PROGRAM), eating all memory, swap,
-# or cpu time it can found.  Although this test won't print `FAIL' if
-# it fails, it will take long enough so it can't go unnoticed.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >>configure.in
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = a
-a02_LDADD =
-a03_SOURCES =
-EOF
-
-for i in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22; do
-cat >>Makefile.am <<EOF
-if C$i
-bin_PROGRAMS += a$i
-a01_LDADD = foo${i}.o
-a02_LDADD += bar${i}.o
-a03_SOURCES += baz${i}.c
-a04_SOURCES = quux${i}.c
-endif C$i
-EOF
-echo "AM_CONDITIONAL([C$i], [:])" >>configure.in
-done
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond3.test b/tests/cond3.test
deleted file mode 100755
index e2dbdaf..0000000
--- a/tests/cond3.test
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test sources listed in conditional.
-# Report from Rob Savoye <address@hidden>, and Lars J. Aas.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AM_CONDITIONAL(ONE, true)
-AM_CONDITIONAL(TWO, false)
-AM_CONDITIONAL(THREE, maybe)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = targ
-
-if ONE
-SONE = one.c
-else
-SONE =
-endif
-
-if TWO
-STWO = two.c
-else
-STWO =
-endif
-
-if THREE
-STHREE = three.c
-else
-STHREE =
-endif
-
-targ_SOURCES = $(SONE) $(STWO) $(STHREE)
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# `b top' so that
-sed -n '
-/[oO][bB][jJ][eE][cC][tT].* =/ {
-  : loop
-  /\\$/ {
-    p
-    n
-    b loop
-  }
-  p
-}' Makefile.in >produced
-
-cat >expected << 'EOF'
address@hidden@am__objects_1 = one.$(OBJEXT)
address@hidden@am__objects_2 = two.$(OBJEXT)
address@hidden@am__objects_3 = three.$(OBJEXT)
-am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)
-targ_OBJECTS = $(am_targ_OBJECTS)
-EOF
-
-diff expected produced
diff --git a/tests/cond30.test b/tests/cond30.test
deleted file mode 100755
index d1935f7..0000000
--- a/tests/cond30.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AM_CONDITIONAL(C1, [test -z "$two"])
-AM_CONDITIONAL(C2, [test -n "$two"])
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-if C1
-bin_PROGRAMS = a
-endif
-if C2
-bin_PROGRAMS = b $(undefined)
-endif
-
-print:
-       @echo 'BEG: $(bin_PROGRAMS) :END'
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
-grep 'BEG: a.foo :END' stdout
-
-./configure two=yes
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
-grep 'BEG: b.foo :END' stdout
-
-grep 'a_SOURCES = a.c' Makefile.in
-grep 'b_SOURCES = b.c' Makefile.in
diff --git a/tests/cond31.test b/tests/cond31.test
deleted file mode 100755
index 224d32c..0000000
--- a/tests/cond31.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we define conditional _DEPENDENCIES correctly.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AM_CONDITIONAL(C1, [test -z "$two"])
-AM_CONDITIONAL(C2, [test -n "$two"])
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-bin_PROGRAMS = a
-a_LDADD = c0.o -L/some/where
-if C1
-a_LDADD += c1.o -llibfoo.a
-endif
-if C2
-a_LDADD += c2.o -dlopen c3.la
-endif
-print:
-       @echo BEG: $(a_DEPENDENCIES) :END
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: c0.o c1.o :END' stdout
-
-./configure two=yes
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: c0.o c2.o c3.la :END' stdout
diff --git a/tests/cond32.test b/tests/cond32.test
deleted file mode 100755
index 6ec5a20..0000000
--- a/tests/cond32.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the user can override a conditional _DEPENDENCIES.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AM_CONDITIONAL(C1, [test -z "$two"])
-AM_CONDITIONAL(C2, [test -n "$two"])
-AM_CONDITIONAL(C3, [test -z "$three"])
-AC_SUBST([MYSUB], [foo.o])
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-bin_PROGRAMS = a
-if C1
-a_LDADD = $(MYSUB)
-a_DEPENDENCIES = $(MYSUB) nonsense.a
-# Note that `nonsense.a' is there just to make sure Automake insn't
-# using some self computed a_DEPENDENCIES variable.
-endif
-if C2
-if C3
-BAR = bar.o
-else
-BAR = baz.o
-endif
-a_LDADD = $(BAR)
-endif
-print:
-       @echo BEG: $(a_DEPENDENCIES) :END
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: foo.o nonsense.a :END' stdout
-
-./configure two=yes three=
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: bar.o :END' stdout
-
-./configure two=yes three=yes
-$MAKE -e print > stdout
-cat stdout
-grep 'BEG: baz.o :END' stdout
diff --git a/tests/cond33.test b/tests/cond33.test
deleted file mode 100755
index f327cb7..0000000
--- a/tests/cond33.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for conditional library with a conditional directory.
-# Report from Ralf Corsepius
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([INC], [test -z "$two"])
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-if INC
-include_foodir = $(includedir)/foo
-include_foo_HEADERS = foo.h
-else
-bardir = $(bindir)
-dist_bar_SCRIPTS = x.sh
-endif
-
-foo.h x.sh:
-       :>$@
-distdircheck: distdir
-       test -f $(distdir)/foo.h
-       test -f $(distdir)/x.sh
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-mkdir nowhere
-chmod a-w nowhere
-./configure "--prefix=`pwd`/nowhere" "--bindir=`pwd`/bin" 
"--includedir=`pwd`/inc"
-$MAKE installdirs
-test ! -d bin
-test -d inc/foo
-test ! -f inc/foo/foo.h
-rm -rf inc
-$MAKE install
-test ! -d bin
-test -f inc/foo/foo.h
-rm -rf inc
-./configure two=two \
-            "--prefix=`pwd`/nowhere" "--bindir=`pwd`/bin" 
"--includedir=`pwd`/inc"
-$MAKE install
-test ! -d inc
-test -f bin/x.sh
-$MAKE installdirs
-test ! -d inc
-test -d bin
-$MAKE distdircheck
diff --git a/tests/cond34.test b/tests/cond34.test
deleted file mode 100755
index ecb1616..0000000
--- a/tests/cond34.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for _DEPDENDENCIES definition with conditional _LDADD.
-# Report from Elena A. Vengerova
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([TWO], test -n "$two")
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-OBJEXT=z
-
-bin_PROGRAMS = test1 test2
-
-if TWO
-  test1_LDADD = two.$(OBJEXT)
-  test2_LDADD = two.$(OBJEXT)
-  test2_DEPENDENCIES = $(test2_LDADD) somethingelse.a
-else !TWO
-  test1_LDADD = one.$(OBJEXT)
-  test2_LDADD = three.$(OBJEXT)
-endif !TWO
-
-test1_DEPENDENCIES = $(test1_LDADD) somethingelse.a
-
-dep-test1:
-       echo BEG: $(test1_DEPENDENCIES) :END
-dep-test2:
-       echo BEG: $(test2_DEPENDENCIES) :END
-
-EOF
-
-:> test.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE dep-test1 >out
-grep 'BEG: one.z somethingelse.a :END' out
-$MAKE dep-test2 >out
-grep 'BEG: three.z :END' out
-
-./configure two=2
-$MAKE dep-test1 >out
-grep 'BEG: two.z somethingelse.a :END' out
-$MAKE dep-test2 >out
-grep 'BEG: two.z somethingelse.a :END' out
diff --git a/tests/cond35.test b/tests/cond35.test
deleted file mode 100755
index 0e75c79..0000000
--- a/tests/cond35.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check rules output for parser defined conditionally.
-# Report from Roman Fietze.
-
-required='flex bison gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([CASE_A], test -z "$case_B")
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_YACC
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-AM_YFLAGS               =       -d
-
-BUILT_SOURCES           =       tparse.h
-
-if CASE_A
-bin_PROGRAMS            =       ta
-ta_SOURCES              =       ta.c tparse.h tscan.l tparse.y
-ta_LDADD                =       $(LEXLIB)
-else
-bin_PROGRAMS            =       tb
-tb_SOURCES              =       tb.c tparse.h tscan.l tparse.y
-tb_LDADD                =       $(LEXLIB)
-endif
-
-
-test-ta:
-       test -f ta$(EXEEXT)
-test-tb:
-       test -f tb$(EXEEXT)
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-test `grep tparse.h: Makefile.in | wc -l` = 1
-
-cat > tscan.l << 'END'
-%%
-"END"   return EOF;
-%%
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
-END
-
-cat > tparse.y << 'END'
-%{
-void yyerror (char *s) {}
-%}
-%token EOF
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-END
-
-cat >ta.c <<'END'
-int main()
-{
-  return 0;
-}
-END
-
-cp ta.c tb.c
-
-./configure
-$MAKE
-$MAKE test-ta
-
-./configure case_B=yes
-$MAKE
-$MAKE test-tb
diff --git a/tests/cond36.test b/tests/cond36.test
deleted file mode 100755
index 6826cd5..0000000
--- a/tests/cond36.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check rules output for parser defined conditionally.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([CASE_A], test -z "$case_B")
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_YACC
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-AM_YFLAGS               =       -d
-
-BUILT_SOURCES           =       tparse.h
-
-if CASE_A
-bin_PROGRAMS            =       ta
-ta_SOURCES              =       ta.c tparse.h tscan.l tparse.y
-ta_LDADD                =       $(LEXLIB)
-else
-bin_PROGRAMS            =       tb
-tb_SOURCES              =       tb.c tparse.h tscan.l tparse.y
-tb_LDADD                =       $(LEXLIB)
-tparse.h: tparce.c
-       echo whatever
-endif
-EOF
-
-$ACLOCAL
-
-# Presently Automake doesn't fully support partially overriden rules
-# and should complain.
-AUTOMAKE_fails --add-missing
-grep 'tparse.h.*already defined' stderr
-$AUTOMAKE -Wno-error
-
-# Still and all, it should generate two rules.
-test `grep tparse.h: Makefile.in | wc -l` = 2
-grep '@address@hidden:' Makefile.in
-grep '@address@hidden:' Makefile.in
-
-:
diff --git a/tests/cond37.test b/tests/cond37.test
deleted file mode 100755
index a4ae078..0000000
--- a/tests/cond37.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check conditional local rules.
-# Report from Simon Josefsson.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([CASE_A], test -n "$case_A")
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-if CASE_A
-check-local:
-       @echo GrepMe1
-else
-install-data-local:
-       @echo GrepMe2
-endif
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE check >stdout
-cat stdout
-grep GrepMe1 stdout && Exit 1
-$MAKE install >stdout
-cat stdout
-grep GrepMe2 stdout
-
-./configure case_A=1
-$MAKE check >stdout
-cat stdout
-grep GrepMe1 stdout
-$MAKE install >stdout
-cat stdout
-grep GrepMe2 stdout && Exit 1
-
-:
diff --git a/tests/cond38.test b/tests/cond38.test
deleted file mode 100755
index b1c3036..0000000
--- a/tests/cond38.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check conditional variable ordering.
-# Report from Ed Hartnett.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_CONDITIONAL([CASE_A], :)
-AM_CONDITIONAL([CASE_B], :)
-AC_OUTPUT
-EOF
-
-cat >>Makefile.am <<'EOF'
-SUBDIRS = a
-if CASE_A
-SUBDIRS += b
-endif
-SUBDIRS += c
-if CASE_A
-SUBDIRS += d
-if CASE_B
-SUBDIRS += e
-endif
-SUBDIRS += f
-endif
-SUBDIRS += g
-if CASE_B
-SUBDIRS += h
-endif
-if CASE_B
-SUBDIRS += iXYZ
-SUBDIRS += jZYX
-endif
-print:
-       @echo BEG: $(SUBDIRS) :END
-EOF
-
-mkdir a b c d e f g h iXYZ jZYX
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE print >stdout
-cat stdout
-# Check good ordering
-grep 'BEG: a b c d e f g h iXYZ jZYX :END' stdout
-# Make sure no extra variable was created for the last 3 items.
-grep 'append.*=.* h iXYZ jZYX' Makefile
diff --git a/tests/cond39.test b/tests/cond39.test
deleted file mode 100755
index c75c7b5..0000000
--- a/tests/cond39.test
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Build either as CONFIG_FILE or as PROGRAM.
-
-. ./defs || Exit 1
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_CONDITIONAL([COND], [test "$COND" = true])
-AM_COND_IF([COND], [],
-          [AC_CONFIG_FILES([prog1], [chmod 755 prog1])
-           AC_CONFIG_FILES([sub/prog2], [chmod 755 sub/prog2])])
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-SUBDIRS = sub
-if COND
-bin_PROGRAMS = prog1
-prog1_SOURCES = prog.c
-else
-bin_SCRIPTS = prog1
-CLEANFILES = prog1
-endif
-
-sure-exist:
-       test -f prog1 || test -f prog1$(EXEEXT)
-       test -f sub/prog2 || test -f sub/prog2$(EXEEXT)
-
-sure-not-exist:
-       test ! -f prog1 && test ! -f prog1$(EXEEXT)
-       test ! -f sub/prog2 && test ! -f sub/prog2$(EXEEXT)
-END
-
-cat >sub/Makefile.am <<'END'
-if COND
-bin_PROGRAMS = prog2
-prog2_SOURCES = prog.c
-else
-bin_SCRIPTS = prog2
-CLEANFILES = prog2
-endif
-END
-
-cat >prog.c <<'END'
-int main () { return 42; }
-END
-
-cat >prog1.in <<'END'
-#! /bin/sh
-bindir='@bindir@'
-echo "hi, this is $0, and bindir is $bindir"
-END
-
-cp prog.c sub
-cp prog1.in sub/prog2.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure COND=true
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'overriding commands' stderr && Exit 1
-$MAKE sure-exist
-./prog1 && Exit 1
-./sub/prog2 && Exit 1
-$MAKE clean
-$MAKE sure-not-exist
-$MAKE
-$MAKE sure-exist
-./prog1 && Exit 1
-./sub/prog2 && Exit 1
-$MAKE distclean
-
-./configure COND=false
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'overriding commands' stderr && Exit 1
-./prog1
-./sub/prog2
-$MAKE clean
-$MAKE sure-not-exist
-$MAKE
-./prog1
-./sub/prog2
-
-:
diff --git a/tests/cond4.test b/tests/cond4.test
deleted file mode 100755
index 6efc9ce..0000000
--- a/tests/cond4.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another sources-in-conditional test.  Report from Tim Goodwin.
-
-required='GNUmake gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([ONE], [test "x$CONDITION1" = "xtrue"])
-AM_CONDITIONAL([TWO], [test "x$CONDITION2" = "xtrue"])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = targ
-
-if ONE
-OPT1 = one.c
-endif
-
-if TWO
-OPT2 = two.c
-endif
-
-targ_SOURCES = main.c $(OPT1) $(OPT2)
-
-echo-objects:
-       @echo $(targ_OBJECTS)
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should not output useless definitions.
-test "`grep 'address@hidden@' Makefile.in | wc -l`" -eq 0
-
-$AUTOCONF
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-CONDITION1=true CONDITION2=true ./configure
-msgtt=`$MAKE --no-print-directory echo-objects`
-CONDITION1=true CONDITION2=false ./configure
-msgtf=`$MAKE --no-print-directory echo-objects`
-CONDITION1=false CONDITION2=true ./configure
-msgft=`$MAKE --no-print-directory echo-objects`
-CONDITION1=false CONDITION2=false ./configure
-msgff=`$MAKE --no-print-directory echo-objects`
-
-: msgtt = $msgtt
-: msgtf = $msgtf
-: msgft = $msgft
-: msgff = $msgff
-
-test x"$msgtt" = x"main.o one.o two.o"
-test x"$msgtf" = x"main.o one.o"
-test x"$msgft" = x"main.o two.o"
-test x"$msgff" = x"main.o"
-
-:
diff --git a/tests/cond40.test b/tests/cond40.test
deleted file mode 100755
index 8552cef..0000000
--- a/tests/cond40.test
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test AM_COND_IF.
-
-. ./defs || Exit 1
-set -e
-
-cat >>configure.in <<'END'
-AC_DEFUN([FOO],
-        [AC_CONFIG_FILES([$1])])
-
-AM_CONDITIONAL([COND], [test "$cond" = yes])
-# Next lines should not cause a shell syntax error.
-AM_COND_IF([COND])
-AM_COND_IF([COND],
-          [AC_SUBST([BAR])])
-AM_COND_IF([COND],
-          [AC_CONFIG_FILES([file1])])
-
-# Things should work even at a time when the shell expressions
-# for the conditional are not valid any more.
-ok=$cond1
-AM_CONDITIONAL([COND1], [test "$ok" = yes])
-ok=$cond2
-AM_CONDITIONAL([COND2], [test "$ok" = yes])
-ok=$cond3
-AM_CONDITIONAL([COND3], [test "$ok" = yes])
-
-AM_COND_IF([COND1],
-          [AM_COND_IF([COND2], [FOO([file2])],
-                      [AM_COND_IF([COND3],
-                                  [FOO([file3])])])])
-
-AC_OUTPUT
-END
-
-: >Makefile.am
-: >file1.in
-: >file2.in
-: >file3.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure cond=yes cond1=yes cond2=no cond3=yes
-test -f file1
-test ! -f file2
-test -f file3
-rm -f file1 file3
-$MAKE file1 file3
-$MAKE file2 && Exit 1
-test -f file1
-test ! -f file2
-test -f file3
-$MAKE distclean
-
-./configure cond=no cond1=yes cond2=yes
-test ! -f file1
-test -f file2
-test ! -f file3
-rm -f file2
-$MAKE file1 && Exit 1
-$MAKE file2
-$MAKE file3 && Exit 1
-test ! -f file1
-test -f file2
-test ! -f file3
-:
diff --git a/tests/cond41.test b/tests/cond41.test
deleted file mode 100755
index dd9ffda..0000000
--- a/tests/cond41.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# AM_COND_IF with an undefined condition should fail.
-
-. ./defs || Exit 1
-set -e
-
-cat >>configure.in <<'END'
-AM_COND_IF([COND],
-          [AC_CONFIG_FILES([file1])])
-AC_OUTPUT
-END
-
-$ACLOCAL && Exit 1
-:
diff --git a/tests/cond42.test b/tests/cond42.test
deleted file mode 100755
index 428c02b..0000000
--- a/tests/cond42.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Ensure an error with inconsistent state of conditionals in configure.ac.
-# This shouldn't happen with user input, as _AM_COND_* are not documented,
-# but better to be safe.
-
-. ./defs || Exit 1
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND], [:])
-# next line needed so that cond-if.m4 is pulled in.
-AM_COND_IF([COND])
-_AM_COND_IF([COND])
-AC_OUTPUT
-END
-: >Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'condition stack' stderr
-
-sed 's/_AM_COND_IF/_AM_COND_ELSE/' < configure.in >configure.int
-mv -f configure.int configure.in
-rm -rf autom4te*.cache
-AUTOMAKE_fails
-grep 'else without if' stderr
-
-sed 's/_AM_COND_ELSE/_AM_COND_ENDIF/' < configure.in >configure.int
-mv -f configure.int configure.in
-rm -rf autom4te*.cache
-AUTOMAKE_fails
-grep 'endif without if' stderr
-
-sed 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
-_AM_COND_ENDIF/' < configure.in >configure.int
-mv -f configure.int configure.in
-rm -rf autom4te*.cache
-AUTOMAKE_fails
-test 2 = `grep -c 'not enough arguments' stderr`
-:
diff --git a/tests/cond43.test b/tests/cond43.test
deleted file mode 100755
index 1fa413d..0000000
--- a/tests/cond43.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
-
-. ./defs || Exit 1
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND1], [:])
-AM_CONDITIONAL([COND2], [:])
-AM_COND_IF([COND1],
-          AM_COND_IF([COND2], [:])
-)
-AC_OUTPUT
-END
-: >Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-
-sed '/.AM_COND_IF/{
-       s/^/[/
-       s/$/]/
-     }' < configure.in > configure.int
-mv -f configure.int configure.in
-rm -rf autom4te*.cache
-$AUTOMAKE
diff --git a/tests/cond44.test b/tests/cond44.test
deleted file mode 100755
index 4b5adc2..0000000
--- a/tests/cond44.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
-# are not diagnosed.  See cond23.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_CONDITIONAL([COND], [true])
-AM_SUBST_NOTMAKE([libdir])
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-if COND
-libdir = mumble
-endif
-EOF
-
-$ACLOCAL
-AUTOMAKE_run 0
-grep 'libdir was already defined' stderr && Exit 1
-grep '^libdir = ' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/cond45.test b/tests/cond45.test
deleted file mode 100755
index c70fecb..0000000
--- a/tests/cond45.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
-# are not diagnosed.  See cond24.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_SUBST([foo], [bar])
-AM_SUBST_NOTMAKE([foo])
-AM_CONDITIONAL([COND], [true])
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-if COND
-foo = baz
-endif
-EOF
-
-$ACLOCAL
-AUTOMAKE_run 0
-grep 'foo was already defined' stderr && Exit 1
-grep '^foo =' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/cond5.test b/tests/cond5.test
deleted file mode 100755
index 50101a6..0000000
--- a/tests/cond5.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Yet another sources-in-conditional test.  Report from Tim Goodwin.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([ONE], [true])
-AM_CONDITIONAL([TWO], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = targ
-
-if ONE
-OPT_SRC = one.c
-endif
-
-if TWO
-OPT_SRC = $(OPT_SRC) two.c
-endif
-
-targ_SOURCES = main.c $(OPT_SRC)
-END
-
-# The bug is that automake hangs.  So we give it an appropriate grace
-# time, then kill it if necessary.
-$ACLOCAL
-$AUTOMAKE 2>stderr &
-pid=$!
-
-# MSYS bash seems to have a bug in kill, so don't try to kill too soon;
-# and avoid maintainer-check test.
-sleep '2'
-
-# Make at most 30 tries, one every 10 seconds (= 300 seconds = 5 min).
-try=1
-while test $try -le 30; do
-  if kill -0 $pid; then
-    : process $pid is still alive, wait and retry
-    sleep '10'
-    try=`expr $try + 1`
-  else
-    cat stderr >&2
-    # Automake must fail with a proper error message.
-    grep 'variable.*OPT_SRC.*recursively defined' stderr
-    Exit 0
-  fi
-done
-# The automake process probably hung.  Kill it, and exit with failure.
-echo "$me: automake process $pid hung"
-kill $pid
-Exit 1
diff --git a/tests/cond6.test b/tests/cond6.test
deleted file mode 100755
index ec40032..0000000
--- a/tests/cond6.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for an odd conditional bug.  Report from Matt Leach.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
-
-cat > Makefile.am << 'END'
-
-if FOO
-
-helpdir = $(prefix)/Help
-# The continuation line below must start with a Tab to see the bug.
-help_DATA = a b c d e \
-       f g h
-
-else
-
-helpdir = $(prefix)/help
-help_DATA = foo
-
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond7.test b/tests/cond7.test
deleted file mode 100755
index b11dddf..0000000
--- a/tests/cond7.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for an odd conditional bug.  Report from Pavel Roskin.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-compat=yes
-AM_CONDITIONAL([Compatible], [test x$compat = xyes])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if Compatible
-abdir = none
-ab_HEADERS = \
-        minus.h
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^[^#].*002' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/cond8.test b/tests/cond8.test
deleted file mode 100755
index 0a45ad3..0000000
--- a/tests/cond8.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure _PROGRAMS conditionals can be written in a useful
-# way.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL(X, false)
-END
-
-cat > Makefile.am << 'END'
-if X
-bin_PROGRAMS = x y
-else
-noinst_PROGRAMS = x y
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/cond9.test b/tests/cond9.test
deleted file mode 100755
index e798099..0000000
--- a/tests/cond9.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.  From Raja R Harinath.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL(WRONG, [test x = y])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if WRONG
-this=
-else
-this=is_something_interesting
-endif
-
-echo-something:
-       echo '$(this)'
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE echo-something | grep interesting > /dev/null
diff --git a/tests/condd.test b/tests/condd.test
deleted file mode 100755
index b70d691..0000000
--- a/tests/condd.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-dnl Define a macro with the same name as the conditional to exhibit
-dnl any underquoted bug.
-AC_DEFUN([COND1], ["some'meaningless;characters`])
-AM_CONDITIONAL([COND1], false)
-AC_CONFIG_FILES([foo/Makefile])
-AC_CONFIG_FILES([bar/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = foo
-if COND1
-SUBDIRS += bar
-endif
-
-# Small example from the manual
-bin_PROGRAMS = hello
-hello_SOURCES = hello-common.c
-if COND1
-hello_SOURCES += hello-cond1.c
-else
-hello_SOURCES += hello-generic.c
-endif
-
-test: distdir
-       test -f $(distdir)/foo/Makefile.am
-       test -f $(distdir)/bar/Makefile.am
-       test -f $(distdir)/hello-common.c
-       test -f $(distdir)/hello-cond1.c
-       test -f $(distdir)/hello-generic.c
-END
-
-mkdir foo bar
-
-: > foo/Makefile.am
-: > bar/Makefile.am
-: > hello-common.c
-: > hello-cond1.c
-: > hello-generic.c
-
-$ACLOCAL
-$AUTOCONF
-grep "meaningless;characters" configure && Exit 1
-$AUTOMAKE
-./configure
-$MAKE test
-
-:
diff --git a/tests/condhook.test b/tests/condhook.test
deleted file mode 100755
index bf9225b..0000000
--- a/tests/condhook.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test install when a conditional install-*-hook is not defined.
-# Keep this in sync with sister test condhook2.test.
-# Report by Nik A. Melchior (PR/428).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([TEST], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-sysconf_DATA = mumble
-if TEST
-install-data-hook:
-       : > $(top_srcdir)/bad
-endif
-END
-
-: > mumble
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --prefix "`pwd`/inst"
-
-$MAKE install
-test -f inst/etc/mumble
-test ! -f bad
-
-:
diff --git a/tests/condhook2.test b/tests/condhook2.test
deleted file mode 100755
index 45e2d43..0000000
--- a/tests/condhook2.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test install when a conditional install-*-hook is defined.
-# Keep this in sync with sister test condhook.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([TEST], [true])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-sysconf_DATA = mumble
-if TEST
-install-data-hook:
-       : > $(top_srcdir)/good
-endif
-END
-
-: > mumble
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --prefix "`pwd`/inst"
-
-$MAKE install
-test -f inst/etc/mumble
-test -f good
-
-:
diff --git a/tests/condinc.test b/tests/condinc.test
deleted file mode 100755
index cf9e35f..0000000
--- a/tests/condinc.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure a conditional include statement is handled properly.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([TOBE], [false])
-END
-
-cat > Makefile.am << 'END'
-if TOBE
-include adjunct
-endif
-END
-
-cat > adjunct << 'END'
-target: dependency
-       rule
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^target:' Makefile.in && Exit 1
-grep 'address@hidden@target:' Makefile.in
-
-:
diff --git a/tests/condinc2.test b/tests/condinc2.test
deleted file mode 100755
index 9001028..0000000
--- a/tests/condinc2.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another test of conditional include statements.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([TOBE], [false])
-END
-
-cat > Makefile.am << 'END'
-if TOBE
-include adjunct
-endif
-END
-
-cat > adjunct << 'END'
-target: dependency
-       rule
-endif
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'adjunct:3: too many conditionals closed' stderr
-
-:
diff --git a/tests/condlib.test b/tests/condlib.test
deleted file mode 100755
index 88ef308..0000000
--- a/tests/condlib.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug with conditional library.
-# From Harlan Stenn
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AM_MAINTAINER_MODE
-AM_PROG_AR
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = @LIBRSAREF@
-EXTRA_LIBRARIES = librsaref.a
-
-nodist_librsaref_a_SOURCES = desc.c digit.c
-
-BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
-END
-
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP librsaref.a.c Makefile.in && Exit 1
-Exit 0
diff --git a/tests/condman.test b/tests/condman.test
deleted file mode 100755
index ee2d41b..0000000
--- a/tests/condman.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure conditionals work with man pages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([FRED], [true])
-END
-
-cat > Makefile.am << 'END'
-if FRED
-man_MANS = foo.1
-else
-man_MANS = joe.1
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/condman2.test b/tests/condman2.test
deleted file mode 100755
index c0e7216..0000000
--- a/tests/condman2.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure appropriate man install targets generated in all cases.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-man_MANS = foo.1 foo.2
-man5_MANS = foo.5
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^install-man1:' Makefile.in
-grep '^install-man2:' Makefile.in
-grep '^install-man5:' Makefile.in
-
-:
diff --git a/tests/condman3.test b/tests/condman3.test
deleted file mode 100755
index ff93daf..0000000
--- a/tests/condman3.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure conditionals work with man pages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND], [test x"$FOO" = x"true"])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if COND
-man_MANS = foo.1
-else
-man_MANS = bar.2
-endif
-
-.PHONY: test1 test2
-test1:
-       test -f $(mandir)/man1/foo.1
-       test ! -f $(mandir)/man2/bar.2
-test2:
-       test ! -f $(mandir)/man1/foo.1
-       test -f $(mandir)/man2/bar.2
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-mkdir dir1
-cd dir1
-../configure FOO=true --prefix="`pwd`/_inst"
-sed -n '/man_MANS/p' Makefile # useful for debugging
-: > foo.1
-$MAKE install
-$MAKE test1
-
-cd ..
-mkdir dir2
-cd dir2
-../configure FOO=false --prefix="`pwd`/_inst"
-sed -n '/man_MANS/p' Makefile # useful for debugging
-: > bar.2
-$MAKE install
-$MAKE test2
-
-:
diff --git a/tests/confdeps.test b/tests/confdeps.test
deleted file mode 100755
index b09f816..0000000
--- a/tests/confdeps.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that config* files are properly regenerated.
-
-. ./defs || Exit 1
-
-set -e
-
-echo "FOO = foo" > Makefile.am
-
-$ACLOCAL
-
-echo "$me: Generated by aclocal..."
-$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in
-
-echo "$me: Not generated by aclocal..."
-# Pretend it is not from aclocal (remove the signature),
-# but keep it correct, i.e., with AM_INIT_AUTOMAKE etc.
-sed -n '3,$p' aclocal.m4 >aclocal.m4t
-mv -f aclocal.m4t aclocal.m4
-$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in && Exit 1
-
-:
diff --git a/tests/conff.test b/tests/conff.test
deleted file mode 100755
index dc6677c..0000000
--- a/tests/conff.test
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
-# Report from Alexander Turbov.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([bar/Makefile:bar/Makefile.in:Makefile.bot])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = bar
-EXTRA_DIST = Makefile.bot
-END
-
-mkdir bar
-cat > bar/Makefile.am << 'END'
-top-rule:
-       @echo 'top rule'
-END
-
-cat > Makefile.bot << 'END'
-bot-rule:
-       @echo 'bot rule'
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-
-cd bar
-$MAKE top-rule >stdout
-cat stdout
-grep 'top rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
-grep 'bot rule' stdout
-cd ..
-
-$sleep
-
-cat > bar/Makefile.am << 'END'
-top-rule:
-       @echo 'top2 rule'
-END
-$MAKE
-
-cd bar
-$MAKE top-rule >stdout
-cat stdout
-grep 'top2 rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
-grep 'bot rule' stdout
-cd ..
-
-$sleep
-
-cat > Makefile.bot << 'END'
-bot-rule:
-       @echo 'bot2 rule'
-END
-$MAKE
-
-cd bar
-$MAKE top-rule >stdout
-cat stdout
-grep 'top2 rule' stdout
-$MAKE bot-rule >stdout
-cat stdout
-grep 'bot2 rule' stdout
-cd ..
-
-$MAKE distcheck
-
-:
diff --git a/tests/conff2.test b/tests/conff2.test
deleted file mode 100755
index a0101e1..0000000
--- a/tests/conff2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed.
-
-. ./defs || Exit 1
-
-set -e
-
-# We avoid using configure.in stub initialized by ./defs, since we need
-# to keep track of line numbers (to grep for error messages).
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES ([oops])
-AC_CONFIG_HEADERS
-AC_OUTPUT
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'configure\.in:3:.* arguments .*AC_CONFIG_FILES' stderr
-grep 'configure\.in:4:.* arguments .*AC_CONFIG_HEADERS' stderr
-
-:
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
deleted file mode 100755
index 8eaed4b..0000000
--- a/tests/conffile-leading-dot.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Automake must complain if AC_CONFIG_FILES is passed something starting
-# with a dot (like "./Makefile"), since the remake rules might be subtly
-# broken in that case.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([./Makefile])
-AC_CONFIG_FILES([./foo:a.in:b.in:c.in])
-AC_OUTPUT
-END
-
-touch a.in b.in c.in Makefile.am
-
-$ACLOCAL
-
-AUTOMAKE_fails -Wnone -Wunsupported
-grep "^configure\.in:3:.*'\\./Makefile'" stderr
-grep "^configure\.in:3:.* omit leading '\\./'" stderr
-grep "^configure\.in:3:.*remake rules might be subtly broken" stderr
-grep "^configure\.in:4:.*'\\./foo'" stderr
-grep "^configure\.in:4:.* omit leading '\\./'" stderr
-grep "^configure\.in:4:.*remake rules might be subtly broken" stderr
-
-# Check that our warning was actually justified.
-sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.in >t
-mv -f t configure.in
-rm -rf autom4te*.cache
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wall -Wno-unsupported
-./configure
-$MAKE
-$sleep
-touch Makefile.am
-# Check that remake rules do truly break -- otherwise automake is
-# giving a bogus warning.
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep "config\\.status:.*invalid argument.*Makefile" stderr
-
-:
diff --git a/tests/confh.test b/tests/confh.test
deleted file mode 100755
index 93badef..0000000
--- a/tests/confh.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config.h works in a subdir.
-# Report from Alexandre Oliva.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONFIG_HEADER([include/config.h])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-.PHONY: test1 test2
-test1:
-       @echo DIST_COMMON = $(DIST_COMMON)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
-test2: distdir
-       ls -l $(distdir)/*
-       test -f $(distdir)/acconfig.h
-check-local: test1 test2
-END
-
-mkdir include
-: > include/config.h.in
-: > acconfig.h
-
-# The test used to fail if `include/Makefile.am' was created (!)
-: > include/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-$MAKE test1
-$MAKE test2
-$MAKE distcheck
-
-# Make sure re-running automake in a different way generates same
-# Makefile.in.
-mv Makefile.in Makefile.sav
-$ACLOCAL
-$AUTOMAKE Makefile
-diff Makefile.sav Makefile.in
-
-:
diff --git a/tests/confh4.test b/tests/confh4.test
deleted file mode 100755
index 8e36cfa..0000000
--- a/tests/confh4.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 34.
-# > Description:
-#  Automake fails to add -I option to include configuration
-#  header indicated like AM_CONFIG_HEADER(magick/config.h)
-# > How-To-Repeat:
-#  Use AM_CONFIG_HEADER(subdir/config.h) to place configuration
-#  header in subdirectory and observe that it is not included.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([include/Makefile])
-AM_CONFIG_HEADER([include/config.h])
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-END
-
-mkdir include
-: > include/Makefile.am
-: > include/config.h.in
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^ *DEFAULT_INCLUDES *=.* -I\$(top_builddir)/include' Makefile.in
-
-:
diff --git a/tests/confh5.test b/tests/confh5.test
deleted file mode 100755
index 9af83dc..0000000
--- a/tests/confh5.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we do not distribute header sources when they are built.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([FOO], [NameToBeGrepped])
-AC_CONFIG_FILES([include/config.h.in])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([include/config.h])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-.PHONY: test
-test: distdir
-       test -f $(distdir)/config.h.in
-       test -f $(distdir)/include/config.h.in.in
-       : # Solaris Sh does not support 'test -e'
-       test ! -f $(distdir)/include/config.h.in
-       test ! -r $(distdir)/include/config.h.in
-END
-
-mkdir include
-: > include/config.h.in.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE
-
-./configure
-$MAKE
-
-$sleep
-echo '#undef @FOO@' > include/config.h.in.in
-$MAKE include/config.h
-# Don't try to be too strict in this grepping, since the substutition
-# is done by config.status, and we don't have too much control on it.
-grep '/\*.*#undef.*NameToBeGrepped' include/config.h
-$MAKE test
-$MAKE distcheck
-
-:
diff --git a/tests/confh6.test b/tests/confh6.test
deleted file mode 100755
index 532a2fd..0000000
--- a/tests/confh6.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config.h rule made even if it is in a subdir.  The
-# idea is that if config.h is in a subdir, and there is no Makefile in
-# that subdir, then we want to build config.h as the top level.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONFIG_HEADER([subdir/config.h])
-AC_OUTPUT
-END
-
-: > Makefile.am
-mkdir subdir
-: > subdir/config.h.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-
-$sleep
-echo '#define gRePmE' > subdir/config.h.in
-$MAKE subdir/config.h
-$FGREP gRePmE subdir/config.h
-
-$MAKE distcheck
-
-:
diff --git a/tests/confh7.test b/tests/confh7.test
deleted file mode 100755
index 4e4f7da..0000000
--- a/tests/confh7.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure several config headers are allowed.
-# See also sister "semantic" test `confh8.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONFIG_HEADER([config.h two.h])
-END
-
-: > Makefile.am
-
-: > config.h.in
-: > two.h.in
-
-$ACLOCAL
-$AUTOMAKE
-
-# Try again with more macros.
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-$ACLOCAL --force
-$AUTOMAKE
-
-:
diff --git a/tests/confh8.test b/tests/confh8.test
deleted file mode 100755
index 146d2f0..0000000
--- a/tests/confh8.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure several config headers are allowed.
-# See also sister "minimalistic" test `confh7.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONFIG_HEADER([one.h two.h])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-.PHONY: test0 test1 test2
-test0:
-       @echo DIST_COMMON = $(DIST_COMMON)
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]one\.h\.in '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]two\.h\.in '
-       : Processed header files should not be distributed.
-       if echo ' ' $(DIST_COMMON) ' ' | grep '\.h '; then \
-         exit 1; \
-       else \
-         exit 0; \
-       fi
-test1: all
-       test -f one.h
-       test -f two.h
-test2: distdir
-       ls -l $(distdir)/*
-       test -f $(distdir)/one.h.in
-       test -f $(distdir)/two.h.in
-       : Processed header files should not be distributed.
-       test ! -r $(distdir)/one.h
-       test ! -r $(distdir)/two.h
-check-local: test0 test1 test2
-END
-
-: > one.h.in
-: > two.h.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-$MAKE test0
-$MAKE test1
-$MAKE test2
-$MAKE distcheck
-
-:
diff --git a/tests/configure.test b/tests/configure.test
deleted file mode 100755
index 0773a00..0000000
--- a/tests/configure.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Diagnose if both configure.in and configure.ac are present, prefer
-# configure.ac.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.ac <<EOF
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-EOF
-
-cat >configure.in <<EOF
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([an-invalid-automake-option])
-AC_CONFIG_FILES([Makefile])
-EOF
-
-: >Makefile.am
-
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-
-$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-# Ensure we really proceed with configure.ac.
-AUTOMAKE_fails -Werror
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-AUTOMAKE_run 0 -Wno-error
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-:
diff --git a/tests/confincl.test b/tests/confincl.test
deleted file mode 100755
index c4f0cde..0000000
--- a/tests/confincl.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This tests for a bug reported by Gord Matzigkeit.
-# If config.h is not used, @CONFIG_INCLUDE_SPEC@ should not appear
-# in Makefile.in.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = fred
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP '@CONFIG_INCLUDE_SPEC@' Makefile.in && Exit 1
-
-:
diff --git a/tests/conflnk.test b/tests/conflnk.test
deleted file mode 100755
index 8dfafbc..0000000
--- a/tests/conflnk.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure links created by AC_CONFIG_LINKS get removed with
-# `make distclean'
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'SUBDIRS = sdir' > Makefile.am
-: > src
-mkdir sdir
-: > sdir/Makefile.am
-: > sdir/src2
-mkdir sdir-no-make
-
-cat >>configure.in << 'EOF'
-AC_CONFIG_FILES([sdir/Makefile])
-AC_CONFIG_LINKS([dest:src])
-AC_CONFIG_LINKS([dest2:src])
-AC_CONFIG_LINKS([sdir/dest3:src])
-AC_CONFIG_LINKS([dest4:sdir/src2])
-AC_CONFIG_LINKS([sdir/dest5:sdir/src2 sdir-no-make/dest6:src])
-AC_OUTPUT
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-
-# Make sure nothing is deleted by `make clean'
-$MAKE clean
-
-test -r dest
-test -r dest2
-test -r sdir/dest3
-test -r dest4
-test -r sdir/dest5
-test -r sdir-no-make/dest6
-test -f src
-test -f sdir/src2
-
-# Make sure the links are deleted by `make distclean' and the original files
-# are not.
-$MAKE distclean
-
-test -f src
-test -f sdir/src2
-
-test -r dest && Exit 1
-test -r dest2 && Exit 1
-test -r sdir/dest3 && Exit 1
-test -r dest4 && Exit 1
-test -r sdir/dest5 && Exit 1
-test -r sdir-no-make/dest6 && Exit 1
-
-:
diff --git a/tests/conflnk2.test b/tests/conflnk2.test
deleted file mode 100755
index 8c68c38..0000000
--- a/tests/conflnk2.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that sources for links created by AC_CONFIG_LINKS
-# are distributed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUBDIRS = sdir
-.PHONY: test
-test: distdir
-       test -f $(distdir)/src
-       test -f $(distdir)/src2
-       test -f $(distdir)/sdir/src3
-       test -f $(distdir)/sdir-no-make/src4
-       test 2 -gt `find $(distdir)/sdir -type d | wc -l`
-       test 2 -gt `find $(distdir)/sdir-no-make -type d | wc -l`
-       test 4 -gt `find $(distdir) -type d | wc -l`
-END
-
-: > src
-: > src2
-mkdir sdir
-: > sdir/Makefile.am
-: > sdir/src3
-mkdir sdir-no-make
-: > sdir-no-make/src4
-
-cat >>configure.in << 'EOF'
-AC_CONFIG_FILES([sdir/Makefile])
-AC_CONFIG_LINKS([dest:src])
-AC_CONFIG_LINKS([sdir/dest2:src2 sdir-no-make/dest3:sdir/src3])
-AC_CONFIG_LINKS([sdir/dest4:sdir-no-make/src4])
-AC_OUTPUT
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE test
-
-:
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
deleted file mode 100755
index 20f4786..0000000
--- a/tests/conflnk3.test
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that AC_CONFIG_LINKS using a variable source
-# is not broken.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUBDIRS = sdir
-.PHONY: test
-test: distdir
-       test ! -r $(distdir)/sdir/dest3
-       test ! -r $(distdir)/sdir/dest2
-       test ! -r $(distdir)/dest3
-       test ! -r $(distdir)/dest2
-       test -f $(distdir)/src2
-## src3 cannot be distributed, Automake knows nothing about it
-       test ! -r $(distdir)/sdir/src3
-       test ! -r $(distdir)/src3
-END
-
-: > src
-: > src2
-mkdir sdir
-: > sdir/Makefile.am
-: > sdir/src3
-
-cat >>configure.in << 'EOF'
-AC_CONFIG_FILES([sdir/Makefile])
-my_src_dir=sdir
-my_dest=dest
-AC_CONFIG_LINKS([sdir/dest2:src2 sdir/dest3:$my_src_dir/src3])
-AC_CONFIG_LINKS([$my_dest:src])
-# the following is a link whose source is itself a link
-AC_CONFIG_LINKS([dest4:sdir/dest2])
-# Some package prefer to compute links.
-cmplink='dest5:src';
-AC_CONFIG_LINKS([$cmplink])
-AC_OUTPUT
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-# $my_src_dir and $my_dest are variables local to configure, they should
-# not appear in Makefile.
-grep my_src_dir Makefile.in && Exit 1
-grep my_dest Makefile.in && Exit 1
-
-./configure
-test -r sdir/dest2
-test -r sdir/dest3
-test -r dest
-test -r dest4
-test -r dest5
-$MAKE test
-
-$MAKE distclean
-test ! -r sdir/dest2
-test ! -r sdir/dest3
-test -r dest  # Should still exist, Automake knows nothing about it.
-test -r dest5 # ditto
-rm -f dest dest5
-test ! -r dest4
-
-mkdir build
-cd build
-../configure
-$MAKE test
-
-:
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
deleted file mode 100755
index fd96054..0000000
--- a/tests/conflnk4.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
-# removed with `make distclean' only if doing a VPATH build.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir nonmk-subdir sdir sdir/mk-subdir
-: > src
-: > sdir/Makefile.am
-: > sdir/src2
-: > nonmk-subdir/src3
-: > sdir/mk-subdir/src4
-
-cat >> Makefile.am <<'EOF'
-SUBDIRS = sdir
-.PHONY: test
-test: distdir
-       test -f $(distdir)/src
-       test -f $(distdir)/sdir/src2
-       test -f $(distdir)/nonmk-subdir/src3
-       test -f $(distdir)/sdir/mk-subdir/src4
-EOF
-
-cat >>configure.in << 'EOF'
-AC_CONFIG_FILES([sdir/Makefile])
-AC_CONFIG_LINKS([src:src])
-AC_CONFIG_LINKS([sdir/src2:sdir/src2])
-AC_CONFIG_LINKS([nonmk-subdir/src3:nonmk-subdir/src3])
-AC_CONFIG_LINKS([sdir/mk-subdir/src4:sdir/mk-subdir/src4])
-AC_OUTPUT
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-
-$MAKE test
-
-# Make sure nothing is deleted by `make clean'
-$MAKE clean
-
-test -f ../src
-test -f ../sdir/src2
-test -f ../nonmk-subdir/src3
-test -f ../sdir/mk-subdir/src4
-
-# Make sure the links are deleted by `make distclean' and the original files
-# are not.
-$MAKE distclean
-
-test -f ../src
-test -f ../sdir/src2
-test -f ../nonmk-subdir/src3
-test -f ../sdir/mk-subdir/src4
-
-test -r src && Exit 1
-test -r sdir/src2 && Exit 1
-test -r nonmk-subdir/src3 && Exit 1
-test -r sdir/mk-subdir/src4 && Exit 1
-
-cd ..
-./configure
-
-$MAKE test
-
-# Make sure nothing is deleted by `make distclean'
-$MAKE distclean
-
-test -f src
-test -f sdir/src2
-test -f nonmk-subdir/src3
-test -f sdir/mk-subdir/src4
-
-:
diff --git a/tests/confsub.test b/tests/confsub.test
deleted file mode 100755
index a0d4fe3..0000000
--- a/tests/confsub.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config.h can be in subdir.
-# Also, make sure config.h is properly rebuilt.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
-AC_OUTPUT(Makefile subdir/Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-mkdir subdir
-cat > subdir/Makefile.am << 'END'
-END
-
-echo 'Before.' > subdir/config.hin
-
-$ACLOCAL
-$AUTOMAKE
-
-# Make sure subdir Makefile.in doesn't itself look in the subdir.
-# One line is allowed though:
-#
-# cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h
-($FGREP 'subdir/config.h' subdir/Makefile.in |
-   $FGREP -v 'cd $(top_builddir)') && Exit 1
-
-$AUTOCONF
-./configure
-$FGREP 'Before.' subdir/config.h
-
-$sleep
-echo 'After.' > subdir/config.hin
-$MAKE
-$FGREP 'After.' subdir/config.h
-
-:
diff --git a/tests/confvar.test b/tests/confvar.test
deleted file mode 100755
index 13cc7dd..0000000
--- a/tests/confvar.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure configure_vars stuff works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([QBERT])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^QBERT =' Makefile.in
-
-:
diff --git a/tests/confvar2.test b/tests/confvar2.test
deleted file mode 100755
index 1cfd2d3..0000000
--- a/tests/confvar2.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([OTHER_SCRIPTS])
-END
-
-cat > Makefile.am << 'END'
-bin_SCRIPTS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^OTHER_SCRIPTS =' Makefile.in
-
-:
diff --git a/tests/copy.test b/tests/copy.test
deleted file mode 100755
index 770ae51..0000000
--- a/tests/copy.test
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `-c' works.  Report from Andris Pavenis.
-
-. ./defs || Exit 1
-
-: > Makefile.am
-rm -f install-sh
-
-$ACLOCAL || Exit 1
-$AUTOMAKE -c -a
diff --git a/tests/ctarget1.test b/tests/ctarget1.test
deleted file mode 100755
index d2191f6..0000000
--- a/tests/ctarget1.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check basic use of conditionals.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONDITIONAL(TEST, true)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-if TEST
-target: true
-       action
-else
-target: false
-endif
-END
-
-set -e
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
-grep 'address@hidden@target: true' Makefile.in
-grep 'address@hidden@  action' Makefile.in
-grep 'address@hidden@target: false' Makefile.in
-Exit 0
diff --git a/tests/cxx.test b/tests/cxx.test
deleted file mode 100755
index aa2f225..0000000
--- a/tests/cxx.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that `.c++' extension works.
-# From Ralf Corsepius.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.c++
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^\.SUFFIXES:.*c[+][+]' Makefile.in
diff --git a/tests/cxx2.test b/tests/cxx2.test
deleted file mode 100755
index 0b9e880..0000000
--- a/tests/cxx2.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that Automake suggests using AC_PROG_CXX if C++ sources are used.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >>configure.in
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.cpp
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AC_PROG_CXX stderr
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
deleted file mode 100755
index 9d6fd6e..0000000
--- a/tests/cxxansi.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure ansi2knr doesn't use `$U' for C++.
-# Report from Robert Boehne.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-AM_C_PROTOTYPES
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.c jane.C
-END
-
-: > ansi2knr.c
-: > ansi2knr.1
-
-: > doe.C
-: > jane.C
-
-$ACLOCAL
-$AUTOMAKE -Wno-obsolete
-
-$FGREP 'jane$U' Makefile.in && Exit 1
-$FGREP 'doe$U' Makefile.in
-
-Exit 0
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
deleted file mode 100755
index 09bb4eb..0000000
--- a/tests/cxxcpp.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure automake sees AC_PROG_CXXCPP.  From Garth Corral.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXXCPP
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^CXXCPP' Makefile.in
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
deleted file mode 100755
index 5f5ee30..0000000
--- a/tests/cxxlibobj.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure LIBOBJS and C++ sources work right.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-AC_PROG_CC
-AC_REPLACE_FUNCS(strdup)
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.C jane.C
-anonymous_LDADD = @LIBOBJS@
-END
-
-: > strdup.c
-: > doe.C
-: > jane.C
-
-$ACLOCAL
-$AUTOMAKE
-
-grep CC Makefile.in
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
deleted file mode 100755
index 66b3d29..0000000
--- a/tests/cxxlink.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure C++ linker is used when appropriate.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.c lamp.cxx
-END
-
-: > lava.c
-: > lamp.cxx
-
-$ACLOCAL
-$AUTOMAKE
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.CXXLINK' Makefile.in
diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
deleted file mode 100755
index 9d5fa7b..0000000
--- a/tests/cxxnoc.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure pure C++ sources don't include C-specific code.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.C jane.C
-END
-
-: > doe.C
-: > jane.C
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP '(CC)' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/cxxo.test b/tests/cxxo.test
deleted file mode 100755
index a69fb2a..0000000
--- a/tests/cxxo.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure C++ files are rewritten to ".o" and not just "o".
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.C
-END
-
-: > doe.C
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
deleted file mode 100755
index ec3f43d..0000000
--- a/tests/cygwin32.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1999, 2001, 2002, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test basic Cygwin32 functionality.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = www
-www_SOURCES = www.c
-EXTRA_www_SOURCES = xtra.c
-www_LDADD = @extra_stuff@
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^CYGWIN' Makefile.in && Exit 1
-grep 'EXEEXT' Makefile.in
-
-:
diff --git a/tests/dash.test b/tests/dash.test
deleted file mode 100755
index 335b891..0000000
--- a/tests/dash.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `-' can be used in path.
-# Report from Matthew D. Langston.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-include Make-lang
-END
-
-: > Make-lang
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/defs.in b/tests/defs.in
deleted file mode 100644
index 6c7a168..0000000
--- a/tests/defs.in
+++ /dev/null
@@ -1,601 +0,0 @@
-# -*- shell-script -*-
-# @configure_input@
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Defines for Automake testing environment.
-# Tom Tromey <address@hidden>
-
-# Be more Bourne compatible.
-# (Snippet copied from configure's initialization in Autoconf 2.64)
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-
-# A single whitespace character.
-sp=' '
-# A tabulation character.
-tab='  '
-# A newline character.
-nl='
-'
-
-# As autoconf-generated configure scripts do, ensure that IFS
-# is defined initially, so that saving and restoring $IFS works.
-IFS=$sp$tab$nl
-
-# Ensure we are running from the right directory.
-test -f ./defs || {
-   echo "defs: not found in current directory" 1>&2
-   exit 1
-}
-
-if test -z "$srcdir"; then
-   # compute $srcdir.
-   srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
-   test "$srcdir" = $0 && srcdir=.
-else :; fi
-
-# Ensure $srcdir is set correctly.
-test -f "$srcdir/defs.in" || {
-   echo "$srcdir/defs.in not found, check \$srcdir" 1>&2
-   exit 1
-}
-
-# The name of the current test (without the `.test' suffix).
-# Test scripts can override it if they need to (but this should
-# be done carefully, and *before* including ./defs).
-if test -z "$me"; then
-  me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
-elif env | grep '^me=' >/dev/null; then
-  echo "$0: variable \`me' is set in the environment: this is unsafe" >&2
-  exit 99
-fi
-
-# Check that the environment is properly sanitized.
-for var in required parallel_tests; do
-  if env | grep "^$var=" >/dev/null; then
-    echo "$me: variable \`$var' is set in the environment:" \
-         "this is unsafe" >&2
-    exit 99
-  fi
-done
-unset var
-
-# This might be used in testcases checking distribution-related features.
-# Test scripts are free to override this if they need to.
-distdir=$me-1.0
-
-APIVERSION='@APIVERSION@'
-PATH_SEPARATOR='@PATH_SEPARATOR@'
-
-# Make sure we override the user shell.
-SHELL='@SHELL@'
-export SHELL
-# User can override various tools used.
-MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
-test -z "$PERL" && PERL='@PERL@'
-test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
-test -z "$AUTOM4TE" && AUTOM4TE="@am_AUTOM4TE@"
-test -z "$AUTORECONF" && AUTORECONF="@am_AUTORECONF@"
-test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
-test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@"
-test -z "$MISSING" && MISSING=`pwd`/../lib/missing
-
-# This is a hack to seamlessly support the infamous "autoconf wrappers",
-# that might dispatch different autoconf versions depending on the name
-# of the input files and/or the command-line options used.  See:
-# <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
-# FIXME: in the long run, the better fix will be to convert our testsuite
-# to use `configure.ac' instead of `configure.in' as autoconf input.
-AUTOCONF="$AUTOCONF -B /no/such/dir"
-AUTOM4TE="$AUTOM4TE -B /no/such/dir"
-AUTORECONF="$AUTORECONF -B /no/such/dir"
-
-# Use -Werror because this also turns some Perl warnings into error.
-# (Tests for which this is inappropriate should use -Wno-error.)
-test -z "$ACLOCAL" && ACLOCAL="aclocal-$APIVERSION -Werror"
-
-# See how Automake should be run.  We put --foreign as the default
-# strictness to avoid having to create lots and lots of files.  A test
-# can override this by specifying a different strictness.  Use -Wall
-# -Werror by default.  Tests for which this is inappropriate
-# (e.g. when testing that a warning is enabled by a specific switch)
-# should use -Wnone or/and -Wno-error
-test -z "$AUTOMAKE" && AUTOMAKE="automake-$APIVERSION --foreign -Werror -Wall"
-
-PATH="`pwd`$PATH_SEPARATOR$PATH"
-echo "$PATH"
-# Some shells forget to export modified environment variables.
-# (See note about `export' in the Autoconf manual.)
-export PATH
-
-# We use a trap below for cleanup.  This requires us to go through
-# hoops to get the right exit status transported through the signal.
-# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
-# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
-# sh inside this function.
-Exit ()
-{
-  set +e
-  (exit $1)
-  exit $1
-}
-
-# Print warnings (e.g., about skipped and failed tests) to this file
-# number.  Override by putting, say:
-#   stderr_fileno_=9; export stderr_fileno_; exec 9>&2;
-# in the definition of AM_TESTS_ENVIRONMENT.
-# This is useful when using automake's parallel tests mode, to print the
-# reason for skip/failure to console, rather than to the *.log files.
-: ${stderr_fileno_=2}
-
-# Copied from Gnulib's `tests/init.sh'.
-warn_ () { echo "$@" 1>&$stderr_fileno_; }
-fail_ () { warn_ "$me: failed test: $@"; Exit 1; }
-skip_ () { warn_ "$me: skipped test: $@"; Exit 77; }
-fatal_ () { warn_ "$me: hard error: $@"; Exit 99; }
-framework_failure_ () { warn_ "$me: set-up failure: $@"; Exit 99; }
-
-# cross_compiling
-# ---------------
-# Tell whether we are cross-compiling.  This is especially useful to skip
-# tests (or portions of them) that requires a native compiler.
-cross_compiling ()
-{
-  test x"$host_alias" != x
-}
-
-# So that we can force the use of correct gcc, g++ etc., consistently
-# with cross-compilation settings.
-if cross_compiling; then
-  am__tool_prefix="$host_alias-"
-else
-  am__tool_prefix=
-fi
-
-for tool in : $required
-do
-  # Check that each required tool is present.
-  case $tool in
-    :) ;;
-    bison|yacc)
-      # Since bison is required, we pick YACC for ./configure.
-      YACC='bison -y'
-      export YACC
-      echo "$me: running bison --version"
-      ( bison --version ) || exit 77
-      ;;
-    flex|lex)
-      # Since flex is required, we pick LEX for ./configure.
-      LEX=flex
-      export LEX
-      echo "$me: running flex --version"
-      flex --version || exit 77
-      ;;
-    cc|c++|fortran|fortran77)
-      echo "$me: dummy requirement '$tool', no check done"
-      ;;
-    bzip2)
-      # Do not use --version, bzip2 still tries to compress stdin.
-      echo "$me: running bzip2 --help"
-      ( bzip2 --help ) || exit 77
-      ;;
-    cl)
-      CC=cl
-      export CC
-      echo "$me: running $CC -?"
-      ( $CC -? ) || exit 77
-      ;;
-    etags)
-      # Exuberant Ctags will create a TAGS file even
-      # when asked for --help or --version.  (Emacs's etags
-      # does not have such problem.)  Use -o /dev/null
-      # to make sure we do not pollute the tests/ directory.
-      echo "$me: running etags --version -o /dev/null"
-      ( etags --version -o /dev/null ) || exit 77
-      ;;
-    GNUmake)
-      # Use --version AND -v, because SGI Make doesn't fail on --version.
-      # Also grep for GNU because newer versions of FreeBSD make do
-      # not complain about `--version' (they seem to silently ignore it).
-      echo "$me: running $MAKE --version -v | grep GNU"
-      ( $MAKE --version -v | grep GNU ) || exit 77
-      ;;
-    gcc)
-      # When gcc is required, export `CC=gcc' so that ./configure
-      # always use it.  This is important only when the user
-      # has defined CC in his environment, otherwise ./configure will
-      # prefer gcc to other compilers.
-      CC=${am__tool_prefix}gcc
-      export CC
-      echo "$me: running $CC --version"
-      ( $CC --version ) || exit 77
-      ;;
-    gcj)
-      GCJ=${am__tool_prefix}gcj
-      export GCJ
-      echo "$me: running $GCJ --version"
-      ( $GCJ --version ) || exit 77
-      ( $GCJ -v ) || exit 77
-      ;;
-    g++)
-      CXX=${am__tool_prefix}g++
-      export CXX
-      echo "$me: running $CXX --version"
-      ( $CXX --version ) || exit 77
-      ;;
-    gfortran)
-      FC=${am__tool_prefix}gfortran
-      export FC
-      echo "$me: running $FC --version"
-      $FC --version || skip_ "GNU Fortran compiler not available"
-      echo "$me: running $FC -v"
-      $FC -v || skip_ "botched installation for GNU Fortran compiler"
-      case " $required " in
-        *\ g77\ *) ;;
-        *) F77=$FC; export F77;;
-      esac
-      ;;
-    g77)
-      F77=${am__tool_prefix}g77
-      export F77
-      echo "$me: running $F77 --version"
-      $F77 --version || skip_ "GNU Fortran 77 compiler not available"
-      echo "$me: running $F77 -v"
-      $F77 -v || skip_ "botched installation for GNU Fortran 77 compiler"
-      case " $required " in
-        *\ gfortran\ *) ;;
-        *) FC=$F77; export FC;;
-      esac
-      ;;
-    icc)
-      CC=icc
-      export CC
-      # There is no way to ask *only* the compiler's version.
-      # This tool always wants to do something (by default
-      # it will try link *nothing* and complain it cannot find
-      # main(); funny).  Use -help so it does not try linking anything.
-      echo "$me: running $CC -V -help"
-      ( $CC -V -help ) || exit 77
-      ;;
-    javac)
-      # The Java compiler from JDK 1.5 (and presumably earlier versions)
-      # cannot handle the `-version' option by itself: it bails out
-      # telling that source files are missing.  Adding also the `-help'
-      # option seems to solve the problem.
-      echo "$me: running javac -version -help"
-      javac -version -help || exit 77
-      ;;
-    lib)
-      AR=lib
-      export AR
-      # Attempting to create an empty archive will actually not
-      # create the archive, but lib will output its version.
-      echo "$me: running $AR -out:defstest.lib"
-      $AR -out:defstest.lib || skip_ "Microsoft \`lib' utility not available"
-      ;;
-    makedepend)
-      echo "$me: running makedepend -f-"
-      ( makedepend -f- ) || exit 77
-      ;;
-    makeinfo-html)
-      # Make sure makeinfo understands --html.
-      echo "$me: running makeinfo --html --version"
-      ( makeinfo --html --version ) || exit 77
-      ;;
-    non-root)
-      # Skip this test case if the user is root.
-      # We try to append to a read-only file to detect this.
-      priv_check_temp=priv-check.$$
-      touch $priv_check_temp || exit 1
-      chmod a-w $priv_check_temp || exit 1
-      (echo foo >> $priv_check_temp) >/dev/null 2>&1
-      overwrite_status=$?
-      rm -f $priv_check_temp
-      test $overwrite_status = 0 && exit 77
-      ;;
-    native)
-      cross_compiling && skip_ "doesn't work in cross-compile mode"
-      ;;
-    python)
-      # Python doesn't support --version, it has -V
-      echo "$me: running python -V"
-      ( python -V ) || exit 77
-      ;;
-    ro-dir)
-      # Skip this test case if read-only directories aren't supported
-      # (e.g., under DOS.)
-      ro_dir_temp=ro_dir.$$
-      mkdir $ro_dir_temp || exit 1
-      chmod a-w $ro_dir_temp || exit 1
-      (: > $ro_dir_temp/probe) >/dev/null 2>/dev/null
-      create_status=$?
-      rm -rf $ro_dir_temp
-      test $create_status = 0 && exit 77
-      ;;
-    rst2html)
-      # Try the variants that are tried in check.am.
-      while :; do
-       for r2h in $RST2HTML rst2html rst2html.py; do
-         echo "$me: running $r2h --version"
-         $r2h --version && break 2
-       done
-       exit 77
-      done
-      ;;
-    runtest)
-      # DejaGnu's runtest program. We rely on being able to specify
-      # the program on the runtest command-line. This requires
-      # DejaGnu 1.4.3 or later.
-      echo "$me: running runtest --version"
-      (runtest SOMEPROGRAM=someprogram --version) || exit 77
-      ;;
-    tex)
-      # No all versions of Tex support `--version', so we use
-      # a configure check.
-      test -n "@TEX@" || exit 77
-      ;;
-    texi2dvi-o)
-      # Texi2dvi supports `-o' since Texinfo 4.1.
-      echo "$me: running texi2dvi -o /dev/null --version"
-      ( texi2dvi -o /dev/null --version ) || exit 77
-      ;;
-    xsi-shell)
-      # Try some XSI features.
-      echo "$me: trying some XSI constructs"
-      ( _am_dummy="a/b/c"
-       test 
"${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \
-               = c,a/b,b/c, \
-       && eval 'test $(( 1 + 1 )) -eq 2 \
-       && test "${#_am_dummy}" -eq 5' ) || exit 77
-      ;;
-    # Generic case: the tool must support --version.
-    *)
-      echo "$me: running $tool --version"
-      ( $tool --version ) || exit 77
-      ;;
-  esac
-done
-
-
-# Always use an absolute srcdir.  Otherwise symlinks made in subdirs
-# of the test dir just won't work.
-case "$srcdir" in
- [\\/]* | ?:[\\/]*)
-    ;;
-
- *)
-    srcdir=`CDPATH=: && cd "$srcdir" && pwd`
-    ;;
-esac
-
-curdir=`pwd`
-testSubDir=$me.dir
-test ! -d $testSubDir || {
-  find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
-  rm -rf $testSubDir
-}
-mkdir $testSubDir
-
address@hidden@
-if test "$sh_errexit_works" = yes; then
-  trap 'exit_status=$?
-    set +e
-    cd "$curdir"
-    case $exit_status,$keep_testdirs in
-    0,)
-      find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
-      rm -rf $testSubDir
-      ;;
-    esac
-    test "$signal" != 0 &&
-      echo "$me: caught signal $signal"
-    echo "$me: exit $exit_status"
-    exit $exit_status
-  ' 0
-  for signal in 1 2 13 15; do
-    trap 'signal='$signal'; { Exit 1; }' $signal
-  done
-fi
-signal=0
-
-# Copy in some files we need.
-for file in install-sh missing depcomp; do
-   cp "$srcdir/../lib/$file" "$testSubDir/$file" || Exit 1
-done
-
-cd ./$testSubDir
-
-# Build appropriate environment in test directory.  Eg create
-# configure.in, touch all necessary files, etc.
-# Don't use AC_OUTPUT, but AC_CONFIG_FILES so that appending
-# still produces a valid configure.ac.  But then, tests running
-# config.status really need to append AC_OUTPUT.
-{
-  echo "AC_INIT([$me], [1.0])"
-  if test x"$parallel_tests" = x"yes"; then
-    echo "AM_INIT_AUTOMAKE([parallel-tests])"
-  else
-    echo "AM_INIT_AUTOMAKE"
-  fi
-  echo "AC_CONFIG_FILES([Makefile])"
-} >configure.in
-
-# Unset some make-related variables that may cause $MAKE to act like
-# a recursively invoked sub-make.  Any $MAKE invocation in a test is
-# conceptually an independent invocation, not part of the main
-# 'automake' build.
-unset MFLAGS MAKEFLAGS AM_MAKEFLAGS MAKELEVEL
-unset __MKLVL__ MAKE_JOBS_FIFO                     # For BSD make.
-unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake.
-# Unset verbosity flag.
-unset V
-# Also unset variables that will let `make -e install' divert
-# files into unwanted directories.
-unset DESTDIR
-unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
-unset htmldir includedir infodir libdir libexecdir localedir mandir
-unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
-# Unset variables that might change the "make distcheck" behaviour.
-unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS
-# Also unset variables that control our test driver.  While not
-# conceptually independent, they cause some changed semantics we
-# need to control (and test for) in some of the tests to ensure
-# backward-compatible behavior.
-unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
-unset DISABLE_HARD_ERRORS
-unset AM_COLOR_TESTS
-unset TESTS
-unset TEST_LOG_COMPILER
-unset TEST_LOGS
-unset RECHECK_LOGS
-unset VERBOSE
-
-echo "=== Running test $0"
-
-# We might need extra macros, e.g., from Libtool or Gettext.
-case " $required " in *\ libtool*) . ../libtool-macros.dir/get.sh;; esac
-case " $required " in *\ gettext*) . ../gettext-macros.dir/get.sh;; esac
-
-testaclocaldir='@abs_top_srcdir@/m4'
-
-# POSIX no longer requires 'egrep' and 'fgrep',
-# but some hosts lack 'grep -E' and 'grep -F'.
-EGREP='@EGREP@'
-FGREP='@FGREP@'
-
-# The amount we should wait after modifying files depends on the platform.
-# For instance, Windows '95, '98 and ME have 2-second granularity
-# and can be up to 3 seconds in the future w.r.t. the system clock.
-sleep='sleep @MODIFICATION_DELAY@'
-
-# The tests call `make -e' but we do not want $srcdir from the environment
-# to override the definition from the Makefile.
-testsrcdir=$srcdir
-unset srcdir
-
-# An old timestamp that can be given to a file, in "touch -t" format.
-# The time stamp should be portable to all file systems of interest.
-# Just for fun, choose the exact time of the announcement of the GNU project
-# in UTC; see <http://www.gnu.org/gnu/initial-announcement.html>.
-old_timestamp=198309271735.59
-
-# is_newest FILE FILES
-# --------------------
-# Return false if any file in FILES is newer than FILE.
-# Resolve ties in favor of FILE.
-is_newest ()
-{
-  is_newest_files=`find "$@" -prune -newer "$1"`
-  test -z "$is_newest_files"
-}
-
-# using_gmake
-# -----------
-# Return success if $MAKE is GNU make, return failure otherwise.
-# Caches the result for speed reasons.
-using_gmake ()
-{
-  case $am__using_gmake in
-    yes)
-      return 0;;
-    no)
-      return 1;;
-    '')
-      # Use --version AND -v, because SGI Make doesn't fail on --version.
-      # Also grep for GNU because newer versions of FreeBSD make do
-      # not complain about `--version' (they seem to silently ignore it).
-      if $MAKE --version -v | grep GNU; then
-        am__using_gmake=yes
-        return 0
-      else
-        am__using_gmake=no
-        return 1
-      fi;;
-    *)
-      fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
-  esac
-}
-am__using_gmake="" # Avoid interferences from the environment.
-
-# AUTOMAKE_run status [options...]
-# --------------------------------
-# Run Automake with OPTIONS, and fail if automake
-# does not exit with STATUS.
-AUTOMAKE_run ()
-{
-  expected_exitcode=$1
-  shift
-  exitcode=0
-  $AUTOMAKE ${1+"$@"} >stdout 2>stderr || exitcode=$?
-  cat stderr >&2
-  cat stdout
-  test $exitcode = $expected_exitcode || Exit 1
-}
-
-# AUTOMAKE_fails [options...]
-# ---------------------------
-# Run Automake with OPTIONS, and fail if automake
-# does not exit with STATUS.
-AUTOMAKE_fails ()
-{
-  AUTOMAKE_run 1 ${1+"$@"}
-}
-
-commented_sed_unindent_prog='
-  /^$/b                    # Nothing to do for empty lines.
-  x                        # Get x<indent> into pattern space.
-  /^$/{                    # No prior x<indent>, go prepare it.
-    g                      # Copy this 1st non-blank line into pattern space.
-    s/^\(['"$tab"' ]*\).*/x\1/   # Prepare x<indent> in pattern space.
-  }                        # Now: x<indent> in pattern and <line> in hold.
-  G                        # Build x<indent>\n<line> in pattern space, and
-  h                        # duplicate it into hold space.
-  s/\n.*$//                # Restore x<indent> in pattern space, and
-  x                        # exchange with the above duplicate in hold space.
-  s/^x\(.*\)\n\1//         # Remove leading <indent> from <line>.
-  s/^x.*\n//               # Restore <line> when there is no leading <indent>.
-'
-
-# unindent [input files...]
-# -------------------------
-# Remove the "proper" amount of leading whitespace from the given files,
-# and output the result on stdout.  That amount is determined by looking
-# at the leading whitespace of the first non-blank line in the input
-# files.  If no input file is specified, standard input is implied.
-unindent ()
-{
-  if test x"$sed_unindent_prog" = x; then
-    sed_unindent_prog=`printf '%s\n' "$commented_sed_unindent_prog" | sed -e 
"s/  *# .*//"`
-  fi
-  sed "$sed_unindent_prog" ${1+"$@"}
-}
-sed_unindent_prog="" # Avoid interferences from the environment.
-
-# Turn on shell traces.
-set -x
-
-pwd
diff --git a/tests/defun.test b/tests/defun.test
deleted file mode 100755
index 5ffb9a1..0000000
--- a/tests/defun.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal picks up on all macro definitions.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([AM_FUNC_TWO])
-AC_DEFUN([AM_FUNC_ONE], [AC_REQUIRE([AM_FUNC_TWO])])
-END
-
-$ACLOCAL
diff --git a/tests/defun2.test b/tests/defun2.test
deleted file mode 100755
index 6c10a8f..0000000
--- a/tests/defun2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we don't mistake a macro definition for an invocation.
-# From Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-dnl if buggy this will require getloadavg.c
-AC_PROG_CC
-AC_DEFUN([AC_FUNC_GETLOADAVG])
-dnl need this to avoid LIBOBJS used but not defined.
-AC_FUNC_MEMCMP
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_LDADD = @LIBOBJS@
-END
-
-: > memcmp.c
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/dejagnu-absolute-builddir.test 
b/tests/dejagnu-absolute-builddir.test
deleted file mode 100755
index ad9578f..0000000
--- a/tests/dejagnu-absolute-builddir.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that DejaGnu testsuites have 'objdir' defined (as a TCL variable)
-# to an absolute path.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = tcl env
-EXTRA_DIST = tcl.test/tcl.exp
-END
-
-mkdir tcl.test
-
-cat > tcl.test/tcl.exp << 'END'
-send_user "tcl_objdir: $objdir\n"
-if { [ regexp "^/" $objdir ] } {
-    pass "test_tcl_objdir"
-} else {
-    fail "test_tcl_objdir"
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check
-
-# Sanity check: all tests have run.
-test -f env.log
-test -f env.sum
-test -f tcl.log
-test -f tcl.sum
-
-$MAKE distcheck
-
-:
diff --git a/tests/dejagnu-relative-srcdir.test 
b/tests/dejagnu-relative-srcdir.test
deleted file mode 100755
index 8a70d58..0000000
--- a/tests/dejagnu-relative-srcdir.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that DejaGnu testsuites have 'srcdir' defined to a relative path
-# (both as TCL variable and as environment variable).
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = tcl env
-EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp lib/tcl.exp
-END
-
-mkdir env.test tcl.test lib
-
-# DejaGnu can change $srcdir behind our backs, so we have to
-# save its original value.  Thanks to Ian Lance Taylor for the
-# suggestion.
-cat > lib/tcl.exp << 'END'
-send_user "tcl_lib_srcdir: $srcdir\n"
-set orig_srcdir $srcdir
-END
-
-cat > env.test/env.exp << 'END'
-set env_srcdir $env(srcdir)
-send_user "env_srcdir: $env_srcdir\n"
-if { [ regexp "^\.\.?$" $env_srcdir ] } {
-    pass "test_env_src"
-} else {
-    fail "test_env_src"
-}
-END
-
-cat > tcl.test/tcl.exp << 'END'
-send_user "tcl_srcdir: $srcdir\n"
-if { [ regexp "^\.\.?$" $srcdir ] } {
-    pass "test_tcl_src"
-} else {
-    fail "test_tcl_src"
-}
-send_user "tcl_orig_srcdir: $orig_srcdir\n"
-if { [ regexp "^\.\.?$" $orig_srcdir ] } {
-    pass "test_tcl_orig_src"
-} else {
-    fail "test_tcl_orig_src"
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure --srcdir=.
-
-$MAKE check
-
-# Sanity check: all tests have run.
-test -f env.log
-test -f env.sum
-test -f tcl.log
-test -f tcl.sum
-
-$MAKE distcheck
-
-:
diff --git a/tests/dejagnu-siteexp-append.test 
b/tests/dejagnu-siteexp-append.test
deleted file mode 100755
index 7bd34ed..0000000
--- a/tests/dejagnu-siteexp-append.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the files in $(EXTRA_DEJAGNU_SITE_CONFIG) get appended to
-# site.exp in the same order in which they're listed in that variable.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = tool
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE site.exp
-sed '/^##.*##$/d' site.exp > expected
-
-cat > foo.exp << 'END'
-foo1
-foo2
-foo3
-END
-
-cat foo.exp - >> expected << 'END'
-BAR 1
-# foo
-BAR 2
-END
-
-cat >> Makefile.am << 'END'
-EXTRA_DEJAGNU_SITE_CONFIG = foo.exp bar.exp
-bar.exp:
-       @(echo 'BAR 1' && echo '# foo' && echo 'BAR 2') > $@
-END
-
-$AUTOMAKE Makefile
-./config.status Makefile
-
-rm -f site.exp
-$MAKE site.exp
-sed '/^##.*##$/d' site.exp > obtained
-
-cat expected
-cat site.exp
-
-diff expected obtained
-
-:
diff --git a/tests/dejagnu-siteexp-extend.test 
b/tests/dejagnu-siteexp-extend.test
deleted file mode 100755
index 591267e..0000000
--- a/tests/dejagnu-siteexp-extend.test
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the developer can extend the site.exp generated by the
-# automake-generated Makefile.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-write_check_for ()
-{
-  echo "send_user \"$1: \$$1\\n\""
-  cat << END
-if { \$$1 == "/$1/" } {
-    pass "test_$1"
-} else {
-    fail "test_$1"
-}
-END
-}
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = tool
-
-EXTRA_DIST = tool.test/tool.exp
-
-EXTRA_DEJAGNU_SITE_CONFIG = foo.exp
-EXTRA_DIST += foo.exp
-END
-
-echo 'set foo "/foo/"' > foo.exp
-
-mkdir tool.test
-write_check_for foo > tool.test/tool.exp
-cat tool.test/tool.exp
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check
-cat foo.exp
-cat site.exp
-grep 'PASS: test_foo' tool.sum
-
-write_check_for bar >> tool.test/tool.exp
-write_check_for baz >> tool.test/tool.exp
-cat tool.test/tool.exp
-
-# Ensure that foo.exp will be newer than site.exp, which will
-# thus have to be remade.
-$sleep
-# With this, below we'll also check that settings in files coming later in
-# $(EXTRA_DEJAGNU_SITE_CONFIG) override those in files coming earlier.
-cat >> foo.exp <<'END'
-set bar "/foo/"
-set baz "/foo/"
-set qux "/foo/"
-END
-
-$MAKE check && { cat site.exp; Exit 1; }
-grep 'PASS: test_foo' tool.sum
-grep 'FAIL: test_bar' tool.sum
-grep 'FAIL: test_baz' tool.sum
-
-cat >> Makefile.am << 'END'
-EXTRA_DEJAGNU_SITE_CONFIG += bar bar.dir/bar
-EXTRA_DIST += bar
-DISTCLEANFILES = bar.dir/bar
-bar.dir/bar:
-       test -d bar.dir || mkdir bar.dir
-       echo 'set baz "/baz/"' > $@
-END
-
-echo 'set bar "/bar/"' > bar
-# This will allow us to check one more time that settings in files
-# coming later in $(EXTRA_DEJAGNU_SITE_CONFIG) override those in
-# files coming earlier.
-echo 'set baz "/xyz/"' >> bar
-
-# Ensure that the Makefile will be newer than site.exp, which will
-# thus have to be remade.
-$sleep
-$AUTOMAKE Makefile
-./config.status Makefile
-
-$MAKE check || { cat site.exp; Exit 1; }
-cat site.exp
-cat bar.dir/bar
-$FGREP '/bar/' site.exp
-$FGREP '/baz/' site.exp
-grep 'PASS: test_foo' tool.sum
-grep 'PASS: test_bar' tool.sum
-grep 'PASS: test_baz' tool.sum
-
-# Check that the features we're testing behave well in VPATH builds.
-$MAKE distcheck
-
-# Check that the user can edit the site.exp file, and that his edits
-# are retained.
-write_check_for zardoz >> tool.test/tool.exp
-cat tool.test/tool.exp
-echo 'set zardoz "/zardoz/"' >> site.exp
-
-$MAKE check
-cat site.exp
-grep 'PASS: test_zardoz' tool.sum
-
-cat >> Makefile.am << 'END'
-EXTRA_DEJAGNU_SITE_CONFIG += quux.exp
-quux.exp:
-       echo 'set zardoz "/quux/"' > $@
-END
-
-# Ensure that the Makefile will be newer than on site.exp, which will
-# thus have to be remade.
-$sleep
-$AUTOMAKE Makefile
-./config.status Makefile
-grep 'zardoz.*/quux/' Makefile
-
-$MAKE site.exp
-cat site.exp
-cat quux.exp
-grep 'zardoz.*/quux/' site.exp
-
-$MAKE check
-grep 'PASS: test_zardoz' tool.sum
-grep 'zardoz: /zardoz/' tool.log
-grep 'zardoz.*quux' tool.log && Exit 1
-
-# Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
-# by default.
-$MAKE distdir
-ls -l $me-1.0
-test ! -r $me-1.0/bar.dir/bar
-test ! -r $me-1.0/quux.exp
-
-:
diff --git a/tests/dejagnu-siteexp-useredit.test 
b/tests/dejagnu-siteexp-useredit.test
deleted file mode 100755
index a51bc40..0000000
--- a/tests/dejagnu-siteexp-useredit.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the user can edit the Makefile-generated site.exp, and
-# have its edits survive to the remaking of that file.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = foo
-END
-
-# Deliberately select a variable defined automatically by
-# the Makefile-generated site.exp.
-mkdir foo.test
-cat > foo.test/foo.exp << 'END'
-send_user "objdir: $objdir\n"
-set pipe "|"
-if { $objdir == "${pipe}objdir${pipe}" } {
-    pass "test_obj"
-} else {
-    fail "test_obj"
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE site.exp
-echo 'set objdir "|objdir|"' >> site.exp
-cat site.exp
-$sleep
-touch Makefile
-$MAKE site.exp
-cat site.exp
-is_newest site.exp Makefile  # Sanity check.
-grep '|objdir|' site.exp
-test `grep -c '|objdir|' site.exp` -eq 1
-
-# We can done a "more semantic" check if DejaGnu is available.
-if runtest SOMEPROGRAM=someprogram --version; then
-  $MAKE check
-  grep 'PASS: test_obj' foo.sum
-fi
-
-:
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
deleted file mode 100755
index b3e58e7..0000000
--- a/tests/dejagnu.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Superficial test to check that dejagnu tests and automake-style
-# tests can coexist.  See also related deeper test `check12.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-TESTS = frob.test
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^check-TESTS' Makefile.in
-grep '^check-DEJAGNU' Makefile.in
-
-:
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
deleted file mode 100755
index 121f6d8..0000000
--- a/tests/dejagnu2.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we don't override the user's site.exp rule.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-
-site.exp:
-       echo :GREP:ME: > $@
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-override
-
-grep 'site\.exp' Makefile.in
-test `grep -c '^site\.exp:' Makefile.in` -eq 1
-
-./configure
-$MAKE site.exp
-grep ':GREP:ME:' site.exp
-
-AUTOMAKE_fails
-grep '^Makefile\.am:3:.*site\.exp' stderr
-
-:
diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
deleted file mode 100755
index 2c5d375..0000000
--- a/tests/dejagnu3.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the DejaGnu rules work for a simple program and test case.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat > hammer << 'END'
-#! /bin/sh
-echo "Everything looks like a nail to me!"
-END
-
-chmod +x hammer
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = hammer
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer
-EXTRA_DIST = hammer hammer.test/hammer.exp
-END
-
-mkdir hammer.test
-
-cat > hammer.test/hammer.exp << 'END'
-set test test
-spawn $HAMMER
-expect {
-    "Everything looks like a nail to me!" { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check
-test -f hammer.log
-test -f hammer.sum
-
-$MAKE distcheck
-
-# Ensure that the envvar RUNTESTFLAGS is used.
-# Report from Mark Mitchell.
-RUNTESTFLAGS=--unknown-runtest-option $MAKE check >output 2>&1 \
-  && { cat output; Exit 1; }
-cat output
-$FGREP 'unknown-runtest-option' output
-
-:
diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test
deleted file mode 100755
index fa64a31..0000000
--- a/tests/dejagnu4.test
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the DejaGnu rules work for a simple program and test case.
-# Also check PR 488: Failure of the first of several tools tested.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat > hammer << 'END'
-#! /bin/sh
-echo "Everything looks like a nail to me!"
-END
-chmod +x hammer
-
-cat > spanner << 'END'
-#! /bin/sh
-echo "I'm a right spanner!"
-END
-chmod +x spanner
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-
-DEJATOOL = hammer spanner
-
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
-
-EXTRA_DIST  = hammer  hammer.test/hammer.exp
-EXTRA_DIST += spanner spanner.test/spanner.exp
-END
-
-mkdir hammer.test spanner.test
-
-cat > hammer.test/hammer.exp << 'END'
-set test test
-spawn $HAMMER
-expect {
-    "Everything looks like a nail to me!" { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-cat > spanner.test/spanner.exp << 'END'
-set test test
-spawn $SPANNER
-expect {
-    "I'm a right spanner!" { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check
-test -f hammer.log
-test -f hammer.sum
-test -f spanner.log
-test -f spanner.sum
-
-$MAKE distcheck
-
-# Test for PR 488.
-sed 's/E\(verything\)/Not e\1/' hammer > thammer
-mv -f thammer hammer
-chmod +x hammer
-
-rm -f hammer.log hammer.sum spanner.log spanner.sum
-$MAKE check && Exit 1
-test -f hammer.log
-test -f hammer.sum
-test -f spanner.log
-test -f spanner.sum
-
-:
diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test
deleted file mode 100755
index 0237a08..0000000
--- a/tests/dejagnu5.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the DejaGnu rules do look for a testsuite named after
-# the package by default.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-package=$me
-
-cat > $package << 'END'
-#! /bin/sh
-echo "Ah, we have been expecting you, Mr. Blond."
-END
-chmod +x $package
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << END
-AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $package $package.test/$package.exp
-AM_RUNTESTFLAGS = PACKAGE=\$(srcdir)/$package
-END
-
-mkdir $package.test
-cat > $package.test/$package.exp << 'END'
-set test "a_dejagnu_test"
-spawn $PACKAGE
-expect {
-    "Ah, we have been expecting you, Mr. Blond." { pass "$test" }
-    default { fail "$test" }
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check
-test -f $package.log
-test -f $package.sum
-
-$MAKE distcheck
-
-:
diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
deleted file mode 100755
index 662ca28..0000000
--- a/tests/dejagnu6.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that "make check" fails, when a DejaGnu test fails.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-cat > faildeja << 'END'
-#! /bin/sh
-echo whatever
-END
-chmod +x faildeja
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = faildeja
-AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja
-END
-
-mkdir faildeja.test
-cat > faildeja.test/faildeja.exp << 'END'
-set test failing_deja_test
-spawn $FAILDEJA
-expect {
-    default { fail "$test" }
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check && Exit 1
-test -f faildeja.log
-test -f faildeja.sum
-$FGREP 'FAIL: failing_deja_test' faildeja.sum
-
-:
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
deleted file mode 100755
index 0be4d1f..0000000
--- a/tests/dejagnu7.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that "make check" fails, when we invoke DejaGnu tests with --status
-# (to detect TCL errors) on a file with TCL errors.
-
-required=runtest
-. ./defs || Exit 1
-
-set -e
-
-# Check whether DejaGnu supports --status
-runtest --help | grep '.*--status' || Exit 77
-
-cat > failtcl << 'END'
-#! /bin/sh
-echo whatever
-END
-chmod +x failtcl
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = failtcl
-AM_RUNTESTFLAGS = --status FAILTCL=$(srcdir)/failtcl
-END
-
-mkdir failtcl.test
-cat > failtcl.test/failtcl.exp << 'END'
-set test test
-spawn $FAILTCL
-expect {
-    default { pass "$test" }
-# Oops, no closing brace.
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE check && Exit 1
-test -f failtcl.log
-test -f failtcl.sum
-$FGREP 'missing close-brace' failtcl.sum
-
-:
diff --git a/tests/deleted-am.test b/tests/deleted-am.test
deleted file mode 100755
index 1e8d11a..0000000
--- a/tests/deleted-am.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The stub rules emitted to work around the "deleted header problem"
-# for `.am' files shouldn't prevent the remake rules from correctly
-# erroring out when a still-required file is missing.
-# See also discussion about automake bug#9768.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-echo 'include $(top_srcdir)/foobar.am' > Makefile.am
-echo 'include zardoz.am' > foobar.am
-: > zardoz.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-
-rm -f zardoz.am
-$sleep # Required to avoid racy failures with FreeBSD make.
-$MAKE >output 2>&1 && { cat output; Exit 1; }
-cat output
-# This error will come from automake, not make, so we can be stricter
-# in our grepping of it.
-grep 'cannot open.*zardoz\.am' output
-grep 'foobar\.am' output && Exit 1 # No spurious error, please.
-
-# Try with one less indirection.
-: > foobar.am
-$AUTOMAKE Makefile
-./config.status Makefile
-$MAKE # Sanity check.
-rm -f foobar.am
-$sleep # Required to avoid racy failures with FreeBSD make.
-$MAKE >output 2>&1 && { cat output; Exit 1; }
-cat output
-# This error will come from automake, not make, so we can be stricter
-# in our grepping of it.
-grep 'cannot open.*foobar\.am' output
-
-:
diff --git a/tests/deleted-m4.test b/tests/deleted-m4.test
deleted file mode 100755
index 6b0b9af..0000000
--- a/tests/deleted-m4.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The stub rules emitted to work around the "deleted header problem"
-# for `.m4' files shouldn't prevent the remake rules from correctly
-# erroring out when a still-required file is missing.
-# See also discussion about automake bug#9768.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-m4_include([foobar.m4])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-echo 'm4_include([zardoz.m4])' > foobar.m4
-: > zardoz.m4
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-
-rm -f zardoz.m4
-$MAKE >output 2>&1 && { cat output; Exit 1; }
-cat output
-# This error will come from aclocal, not make, so we can be stricter
-# in our grepping of it.
-grep ' foobar\.m4:1:.*zardoz\.m4.*does not exist' output
-# No spurious errors, please.
-$FGREP -v ' foobar.m4:1:' output | $FGREP 'foobar.m4' && Exit 1
-
-# Try with one less indirection.
-: > foobar.m4
-$ACLOCAL --force
-$AUTOCONF
-./configure
-$MAKE # Sanity check.
-rm -f foobar.m4
-$MAKE >output 2>&1 && { cat output; Exit 1; }
-cat output
-# This error will come from aclocal, not make, so we can be stricter
-# in our grepping of it.
-grep 'foobar\.m4.*does not exist' output
-# No spurious errors, please (ok, this is really paranoid).
-$FGREP 'zardoz.m4' output && Exit 1
-
-:
diff --git a/tests/depacl2.test b/tests/depacl2.test
deleted file mode 100755
index d085a50..0000000
--- a/tests/depacl2.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dependencies work when required macro is part of
-# autoconf.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_C_PROTOTYPES
-FOO
-END
-
-cat > AM_C_PROTOTYPES.m4 << 'END'
-AC_DEFUN([AM_C_PROTOTYPES], [AC_REQUIRE([AC_HEADER_STDC])])
-END
-
-# Our --acdir overrides the one in $ACLOCAL.
-$ACLOCAL -I .
diff --git a/tests/depcomp.test b/tests/depcomp.test
deleted file mode 100755
index d5b6c78..0000000
--- a/tests/depcomp.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure depcomp is installed and found properly
-# when required for multiple directories
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([subdir/Makefile subdir2/Makefile])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-rm -f depcomp
-mkdir subdir
-mkdir subdir2
-
-cat > subdir/Makefile.am << 'END'
-noinst_PROGRAMS = foo
-foo_SOURCES = foo.c
-END
-
-cp subdir/Makefile.am subdir2/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-# There used to be a bug where this was created in the first subdir with C
-# sources in it instead of in $top_srcdir or $ac_auxdir
-test -f depcomp
-
-:
diff --git a/tests/depcomp10.test b/tests/depcomp10.test
deleted file mode 100755
index 0fa6c6a..0000000
--- a/tests/depcomp10.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# hp depmode should work with GNU make in VPATH mode (bug similar to
-# depcomp9.test).
-# For automake bug#8473.
-
-# Here's the bug: hp depmode will prefix VPATH to the object file name,
-# thus the second gmake will invoke depcomp with object='../../src/foo.o',
-# causing errors such as (broken on multiple lines for clarity):
-#   cpp: "", line 0: error 4066: Cannot create
-#        "../../gllib/.deps/nonblocking.TPo" file for
-#        "-M../../gllib/.deps/nonblocking.TPo" option.
-#        (No such file or directory[errno=2])
-
-required=GNUmake
-. ./defs || Exit 1
-
-mkdir src src/sub build
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_CONFIG_FILES([src/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = src
-END
-
-cat > src/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h sub/subfoo.c
-END
-
-cat > src/foo.h <<EOF
-extern int subfoo (void);
-EOF
-
-cat >src/foo.c <<EOF
-#include "foo.h"
-int main (void)
-{
-  return subfoo ();
-}
-EOF
-
-cat >src/sub/subfoo.c <<EOF
-#include "foo.h"
-int subfoo (void)
-{
-  return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cd build
-../configure am_cv_CC_dependencies_compiler_type=hp
-# Do not error out with the first make, as the forced 'hp' depmode might
-# not actually work, but we have overridden the _AM_DEPENDENCIES tests.
-$MAKE || Exit 77
-
-# We must clean and rebuild, as the actual error only happens the second
-# time the objects are built because 'depcomp' has silently messed up the
-# .Po files the first time.
-$MAKE clean
-
-$MAKE >out 2>&1 || { cat out; Exit 1; }
-cat out
-grep 'src/[._]deps' out && Exit 1
-
-:
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
deleted file mode 100755
index e8e4a67..0000000
--- a/tests/depcomp2.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that depcomp is not used when it's not installed
-# From Pavel Roskin.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([subdir/Makefile])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-rm -f depcomp
-mkdir subdir
-
-cat > subdir/Makefile.in << 'END'
-foo:
-       $(CC) -o foo foo.c
-END
-
-: > subdir/foo.c
-
-# Ignore user CFLAGS.
-unset CFLAGS || :
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-./configure 2>stderr || { cat stderr >&2; Exit 1; }
-test ! -s stderr
-
-:
diff --git a/tests/depcomp3.test b/tests/depcomp3.test
deleted file mode 100755
index 649fada..0000000
--- a/tests/depcomp3.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure dashmstdout generates dependencies.
-
-required='gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-check_PROGRAMS = prg
-prg_SOURCES = src/sub.c src/foo.h
-
-.PHONY: grepdeps
-grepdeps:
-       grep 'src/sub\.$(OBJEXT).*:' src/$(DEPDIR)/sub.Po
-
-END
-
-mkdir src
-
-: > src/foo.h
-
-cat >src/sub.c <<EOF
-#include "foo.h"
-int
-main ()
-{
-   return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Sanity check: make sure the cache variable we force is used by configure
-grep am_cv_CC_dependencies_compiler_type configure
-
-./configure am_cv_CC_dependencies_compiler_type=dashmstdout
-$MAKE check
-$MAKE grepdeps
-
-:
diff --git a/tests/depcomp4.test b/tests/depcomp4.test
deleted file mode 100755
index 3c3602f..0000000
--- a/tests/depcomp4.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 385: makedepend doesn't work with Libtool.
-
-required='libtoolize gcc makedepend'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LTLIBRARIES = liba.la
-liba_la_SOURCES = a.c foo.h
-
-.PHONY: grepdeps
-grepdeps:
-       grep 'a\.lo *:' ./$(DEPDIR)/a.Plo
-END
-
-: > foo.h
-
-cat >a.c <<EOF
-#include "foo.h"
-int a() { return 0; }
-EOF
-
-libtoolize --force
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Sanity check: make sure the cache variable we force is used by configure
-grep am_cv_CC_dependencies_compiler_type configure
-
-./configure am_cv_CC_dependencies_compiler_type=makedepend
-$MAKE >output 2>&1 || { cat output; Exit 1; }
-cat output
-grep 'unknown directive' output && Exit 1
-$MAKE grepdeps
-
-:
diff --git a/tests/depcomp5.test b/tests/depcomp5.test
deleted file mode 100755
index 4fe7e16..0000000
--- a/tests/depcomp5.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check icc's dependency mode.
-
-required='icc'
-. ./defs || Exit 1
-
-set -e
-
-# Automake supports icc since version 7.0 through a dedicated depcomp mode.
-# icc 8.0 and greater understand gcc options, so depmode is set to gcc.
-if icc -V -help 2>&1 | grep 'Version 7'; then
-  expect='depmode=icc'
-else
-  expect='depmode=gcc'
-fi
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-check_PROGRAMS = prg
-prg_SOURCES = src/sub.c src/foo.h
-
-.PHONY: grepdeps
-grepdeps:
-       grep 'src/sub\.$(OBJEXT).*:' src/$(DEPDIR)/sub.Po
-
-END
-
-mkdir src
-
-touch src/foo.h
-
-cat >src/sub.c <<EOF
-#include "foo.h"
-int
-main ()
-{
-   return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-grep "$expect" Makefile
-$MAKE check
-$MAKE grepdeps
-
-:
diff --git a/tests/depcomp6.test b/tests/depcomp6.test
deleted file mode 100755
index c7734b1..0000000
--- a/tests/depcomp6.test
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check dependency generation (non libtool case).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_CONFIG_FILES([sub2/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub sub2 sub2/sub3
-
-cat >Makefile.am <<'END'
-SUBDIRS = sub2
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c sub/bar.c foo.h sub/bar.h
-foo_LDADD = sub2/libbaz.a
-END
-
-cat >sub2/Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_LIBRARIES = libbaz.a
-libbaz_a_SOURCES = baz.c sub3/ba3.c baz.h sub3/ba3.h
-END
-
-cat >foo.c <<'END'
-#include "foo.h"
-#include "sub2/baz.h"
-#include <stdlib.h>
-int main (void) { printf ("foo"); return bar () + baz (); }
-END
-
-cat >foo.h <<'END'
-#include <stdio.h>
-#include "sub/bar.h"
-END
-
-cat >sub/bar.c <<'END'
-#include "sub/bar.h"
-int bar (void) { return 0; }
-END
-
-touch sub2/sub3/ba3.h
-
-cat >sub/bar.h <<'END'
-#include <stdio.h>
-extern int bar (void);
-END
-
-cat >sub2/baz.c <<'END'
-#include "baz.h"
-int baz (void) { return 0; }
-END
-
-cat >sub2/baz.h <<'END'
-extern int baz (void);
-END
-
-cat >sub2/sub3/ba3.c <<'END'
-#include "ba3.h"
-int ba3 (void) { return 0; }
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure --enable-dependency-tracking
-$MAKE
-
-# Check that dependency tracking works.
-if grep 'depmode=none' Makefile; then
-  Exit 77
-fi
-
-cd sub2
-$sleep
-echo 'choke me' > sub3/ba3.h
-# Do not use `$MAKE && Exit 1' here, since even relatively-recent
-# versions of the BSD shell wrongly exit when the `errexit' shell
-# flag is active if a command within "&&" fails inside a compound
-# statement.
-if $MAKE; then Exit 1; else :; fi
-
-# Ensure the deleted header bug is fixed.
-rm -f sub3/ba3.h
-sed 1d sub3/ba3.c >sub3/ba3.t
-mv -f sub3/ba3.t sub3/ba3.c
-$MAKE
-
-:
diff --git a/tests/depcomp7.test b/tests/depcomp7.test
deleted file mode 100755
index 9b0ed22..0000000
--- a/tests/depcomp7.test
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check dependency generation (libtool case).
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AM_PROG_LIBTOOL
-AC_CONFIG_FILES([sub2/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub sub2 sub2/sub3
-
-cat >Makefile.am <<'END'
-SUBDIRS = sub2
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c sub/bar.c foo.h sub/bar.h
-foo_LDADD = sub2/libbaz.la
-END
-
-cat >sub2/Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_LTLIBRARIES = libbaz.la
-libbaz_la_SOURCES = baz.c sub3/ba3.c baz.h sub3/ba3.h
-END
-
-cat >foo.c <<'END'
-#include "foo.h"
-#include "sub2/baz.h"
-#include <stdlib.h>
-int main (void) { printf ("foo"); return bar () + baz (); }
-END
-
-cat >foo.h <<'END'
-#include <stdio.h>
-#include "sub/bar.h"
-END
-
-cat >sub/bar.c <<'END'
-#include "sub/bar.h"
-int bar (void) { return 0; }
-END
-
-echo 'extern int x;' > sub2/sub3/ba3.h
-
-cat >sub/bar.h <<'END'
-#include <stdio.h>
-extern int bar (void);
-END
-
-cat >sub2/baz.c <<'END'
-#include "baz.h"
-int baz (void) { return 0; }
-END
-
-cat >sub2/baz.h <<'END'
-extern int baz (void);
-END
-
-cat >sub2/sub3/ba3.in <<'END'
-#include "ba3.h"
-int ba3 (void) { return 0; }
-END
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-st=0
-for staticshared in --disable-shared "" --disable-static; do
-
-  cp sub2/sub3/ba3.in sub2/sub3/ba3.c
-  ./configure --enable-dependency-tracking $staticshared
-  $MAKE
-
-  # If we cannot enable dependency tracking, perform only the most basic
-  # checks, and don't consider this test to be PASSed but SKIPped, because
-  # the main purpose of this test is exposing the depmode features.
-  if grep 'depmode=none' Makefile; then
-    st=77
-  else
-    cd sub2
-    $sleep
-    echo 'choke me' > sub3/ba3.h
-    # Do not use `$MAKE && Exit 1' here, since even relatively-recent
-    # versions of the BSD shell wrongly exit when the `errexit' shell
-    # flag is active if a command within "&&" fails inside a compound
-    # statement.
-    if $MAKE; then Exit 1; else :; fi
-
-    # Ensure the deleted header bug is fixed.
-    rm -f sub3/ba3.h
-    sed 1d sub3/ba3.in >sub3/ba3.c
-    $MAKE
-    cd ..
-  fi
-
-  $MAKE distclean
-  test ! -f sub2/sub3/ba3.u
-  test ! -f sub2/sub3/ba3.d
-
-  echo 'extern int x;' > sub2/sub3/ba3.h
-
-done
-
-Exit $st
diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test
deleted file mode 100755
index b94cf1d..0000000
--- a/tests/depcomp8a.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for regressions in computation of names of .Po files for
-# automatic dependency tracking.
-# Keep this in sync with sister test `depcomp8b.test', which checks the
-# same thing for libtool objects.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-#x AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = foo.c sub/bar.c
-END
-
-mkdir sub
-cat > foo.c << 'END'
-int main (void)
-{
-  extern int bar;
-  return bar;
-}
-END
-cat > sub/bar.c << 'END'
-extern int bar = 0;
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-grep include Makefile.in # for debugging
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-./zardoz
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-sed 's/#x //' configure.in >configure.int
-mv -f configure.int configure.in
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-
-$ACLOCAL
-$AUTOMAKE -a
-grep include Makefile.in # for debugging
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-./zardoz
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-:
diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test
deleted file mode 100755
index 3a87d40..0000000
--- a/tests/depcomp8b.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for regressions in computation of names of .Plo files for
-# automatic dependency tracking.
-# Keep this in sync with sister test `depcomp8a.test', which checks the
-# same thing for non-libtool objects.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-#x AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libzardoz.la
-libzardoz_la_SOURCES = foo.c sub/bar.c
-END
-
-mkdir sub
-echo 'extern int foo = 0;' > foo.c
-echo 'extern int bar = 0;' > sub/bar.c
-
-libtoolize
-
-$ACLOCAL
-$AUTOMAKE -a
-grep include Makefile.in # for debugging
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-sed 's/#x //' configure.in >configure.int
-mv -f configure.int configure.in
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-
-$ACLOCAL
-$AUTOMAKE -a
-grep include Makefile.in # for debugging
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-:
diff --git a/tests/depcomp9.test b/tests/depcomp9.test
deleted file mode 100755
index 9972c3d..0000000
--- a/tests/depcomp9.test
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# makedepend should work in VPATH mode.
-
-# Here's the bug: makedepend will prefix VPATH to the object file name,
-# thus the second make will invoke depcomp with object='../../src/foo.o',
-# causing errors such as:
-# touch: cannot touch `../../src/.deps/foo.TPo': No such file or directory
-# makedepend: error:  cannot open "../../src/.deps/foo.TPo"
-# ../../depcomp: line 560: ../../src/.deps/foo.TPo: No such file or directory
-
-# We include subfoo only to be sure that we don't remove too much
-# from the object file name.
-
-required='makedepend'
-. ./defs || Exit 1
-
-mkdir src src/sub build
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_CONFIG_FILES([src/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = src
-END
-
-cat > src/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h sub/subfoo.c
-END
-
-cat > src/foo.h <<EOF
-extern int subfoo (void);
-EOF
-
-cat >src/foo.c <<EOF
-#include "foo.h"
-int main (void)
-{
-  return subfoo ();
-}
-EOF
-
-cat >src/sub/subfoo.c <<EOF
-#include "foo.h"
-int subfoo (void)
-{
-  return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cd build
-../configure am_cv_CC_dependencies_compiler_type=makedepend
-
-# Do not error out with the first make, as the forced 'makedepend'
-# depmode might not actually work, but we have overridden the
-# _AM_DEPENDENCIES tests.
-$MAKE || Exit 77
-
-# We must clean and rebuild, as the actual error only happens the second
-# time the objects are built because 'makedepend' has silently messed up
-# the .Po files the first time.
-$MAKE clean
-
-$MAKE >out 2>&1 || { cat out; Exit 1; }
-cat out
-grep 'src/[._]deps' out && Exit 1
-
-:
diff --git a/tests/depdist.test b/tests/depdist.test
deleted file mode 100755
index f36eb47..0000000
--- a/tests/depdist.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure depcomp is found for the distribution.
-# From Eric Magnien.
-
-. ./defs || Exit 1
-
-rm -f configure.in
-
-mkdir config
-for i in *; do
-   if test $i != "config"; then
-      mv $i config
-   fi
-done
-
-cat > configure.in << 'END'
-AC_INIT(subdir/foo.c)
-AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_OUTPUT(subdir/Makefile Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-mkdir subdir
-: > subdir/foo.c
-
-cat > subdir/Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-END
-
-set -e
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-grep config/depcomp Makefile.in
diff --git a/tests/depend.test b/tests/depend.test
deleted file mode 100755
index 5714c98..0000000
--- a/tests/depend.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This tests for a bug reported by Henrik Frystyk Nielsen <address@hidden>
-# In some cases the auto-dependency can get confused and try
-# to `-include' a directory (if a backslash-newline appears in _SOURCES).
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = fred
-fred_SOURCES = \
-   fred.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
diff --git a/tests/depend2.test b/tests/depend2.test
deleted file mode 100755
index 57d87d7..0000000
--- a/tests/depend2.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dependency tracking works with
-# --disable-dependency-tracking.
-# Report from Robert Boehne
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-END
-
-cat > hello.h << 'END'
-#include <stdio.h>
-END
-
-cat > hello.c << 'END'
-#include "hello.h"
-int
-main (int argc, char *argv[])
-{
-   printf ("yeah, yeah\n");
-   return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-./configure --disable-dependency-tracking
-
-$MAKE
diff --git a/tests/depend3.test b/tests/depend3.test
deleted file mode 100755
index f12e460..0000000
--- a/tests/depend3.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test _DEPENDENCIES variable.  From Lee Iverson.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST(DEPS)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = TerraVision
-
-TerraVision_SOURCES = \
-       AboutDialog.c Clock.c Dialogs.c DrawModel.c \
-       TsmWidget.c Gats.c GATSDialogs.c Model.c ModelAnim.c \
-       ScannedMap.c \
-        TerraVision.c TerraVisionAvs.c TerraVisionCAVE.c \
-       Texture.c ThreeDControl.c ThreeDPanel.c \
-       ThreeDWidget.c ThreeDWidget1.c TileManager.c \
-       TileRequester.c TwoDWidget.c \
-        Visible.c RequestGenerator.c X11FrameGrab.c \
-       matrix.c pixmaps.c xpmhash.c xpmread.c xcolor.c xv24to8.c
-
-DEPS = @DEPS@
-
-TerraVision_DEPENDENCIES = $(DEPS)
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/depend4.test b/tests/depend4.test
deleted file mode 100755
index 451c018..0000000
--- a/tests/depend4.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that dependencies are included when there are many header files.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-$ACLOCAL
-
-headers=
-for header in one.h two.h three.h four.h five.h six.h
-do
-    headers="$headers $header"
-    cat > Makefile.am << END
-bin_PROGRAMS = fred
-fred_SOURCES = fred1.c $headers
-END
-
-    $AUTOMAKE
-
-    test 1 = `grep 'address@hidden@@am__include@' Makefile.in | wc -l`
-done
diff --git a/tests/depend5.test b/tests/depend5.test
deleted file mode 100755
index 0d9be3b..0000000
--- a/tests/depend5.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
-# quoting in $CONFIG_FILES, done by newer Autoconf.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << END
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << END
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h
-END
-
-cat >foo.c << END
-#include "foo.h"
-END
-: >foo.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure --enable-dependency-tracking
-if test -d .deps; then
-  depdir=.deps
-elif test -d _deps; then
-  depdir=_deps
-else
-  depdir=
-fi
-
-# For the fun of it, we should also cope with makefile
-# names that contain weird characters, with Autoconf 2.62
-# and newer.
-# Pick the first name that the file system will accept.
-for name in \
-  'weird  name with $ `#() &! characters"' \
-  'weird  name with $ `#()  characters"' \
-  'weird  name with  characters'
-do
-  cp Makefile.in "$name.in" && break || :
-done
-
-for arg in Makefile \
-  --file=Makefile \
-  "--file=$name"
-do
-  rm -rf .deps _deps
-  ./config.status "$arg" depfiles >stdout 2>stderr ||
-    { cat stdout; cat stderr >&2; Exit 1; }
-  cat stdout
-  cat stderr >&2
-  grep '[Nn]o such file' stderr && Exit 1
-
-  if test -n "$depdir"; then
-    test -d $depdir || Exit 1
-  fi
-done
-:
diff --git a/tests/depend6.test b/tests/depend6.test
deleted file mode 100755
index de2adf9..0000000
--- a/tests/depend6.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug,
-# reported by Markus Duft.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << END
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << END
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c foo.h
-END
-
-cat >foo.c << END
-#include "foo.h"
-END
-: >foo.h
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure --disable-dependency-tracking 2>stderr || {
-  stat=$?; cat stderr >&2; Exit $stat;
-}
-cat stderr >&2
-grep shift stderr && Exit 1
-:
diff --git a/tests/destdir.test b/tests/destdir.test
deleted file mode 100755
index 951a4b1..0000000
--- a/tests/destdir.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that `make distcheck' can find some $(DESTDIR) omissions.
-# PR/186.
-
-# The feature we test here relies on read-only directories.
-# It will only work for non-root users.
-required='ro-dir'
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-dist_data_DATA = foo
-
-# This rule is bogus because it doesn't use $(DESTDIR) on the
-# second argument of cp.  distcheck is expected to catch this.
-install-data-hook:
-       cp $(DESTDIR)$(datadir)/foo $(datadir)/bar
-
-uninstall-local:
-       rm -f $(DESTDIR)$(datadir)/bar
-EOF
-
-: > foo
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE distcheck && Exit 1
-:
diff --git a/tests/dirlist.test b/tests/dirlist.test
deleted file mode 100755
index cfa1ed9..0000000
--- a/tests/dirlist.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check dirlist support.
-# This test relies on m4/dirlist
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<EOF
-AC_INIT
-AM_INIT_GUILE_MODULE
-EOF
-
-mkdir dirlist-test
-
-cat >dirlist-test/dirlist-check.m4 <<'END'
-AC_DEFUN([AM_INIT_GUILE_MODULE],[
-. $srcdir/../GUILE-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_CONFIG_AUX_DIR(..)
-module=[$1]
-AC_SUBST(module)])
-END
-
-cat >dirlist-test/init.m4 <<EOF
-AC_DEFUN([AM_INIT_AUTOMAKE], [I should not be included])
-EOF
-
-$ACLOCAL
-$AUTOCONF
-
-# there should be no m4_include in aclocal.m4, even tho m4/dirlist contains
-# `./dirlist-test' as a relative directory.  Only -I directories are subject
-# to file inclusion.
-grep m4_include aclocal.m4 && Exit 1
-
-grep 'GUILE-VERSION' configure
-
-# This bug can occur only when we do a VPATH build of Automake
-# (because of the `-I' passed to aclocal in tests/defs/aclocal.in) but
-# it's OK because VPATH builds are done by `make distcheck'.
-grep 'I should not be included' configure && Exit 1
-
-:
diff --git a/tests/dirlist2.test b/tests/dirlist2.test
deleted file mode 100755
index 5f49614..0000000
--- a/tests/dirlist2.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check dirlist globbing support.
-# This test relies on m4/dirlist
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<EOF
-AC_INIT
-AM_INIT_GUILE_MODULE
-AM_FOO_BAR
-EOF
-
-mkdir dirlist21-test dirlist22-test
-
-cat >dirlist21-test/dirlist21-check.m4 <<'END'
-AC_DEFUN([AM_INIT_GUILE_MODULE],[
-. $srcdir/../GUILE-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_CONFIG_AUX_DIR(..)
-module=[$1]
-AC_SUBST(module)])
-END
-
-cat >dirlist22-test/dirlist22-check.m4 <<'END'
-AC_DEFUN([AM_FOO_BAR],[
-: foo bar baz
-])
-END
-$ACLOCAL
-$AUTOCONF
-
-# there should be no m4_include in aclocal.m4, even tho m4/dirlist contains
-# `./dirlist-test' as a relative directory.  Only -I directories are subject
-# to file inclusion.
-grep m4_include aclocal.m4 && Exit 1
-
-grep 'GUILE-VERSION' configure
-grep 'foo bar baz' configure
-
-:
diff --git a/tests/discover.test b/tests/discover.test
deleted file mode 100755
index 41b11f5..0000000
--- a/tests/discover.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure LIBOBJS file cannot be mentioned explicitly.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AM_PROG_AR
-AC_PROG_CC
-AC_LIBOBJ([fsusage])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES = fsusage.c
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > fsusage.c
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-
-grep 'automatically discovered.*fsusage\.c.*explicitly mentioned' stderr
-
-Exit 0
diff --git a/tests/dist-auxfile-2.test b/tests/dist-auxfile-2.test
deleted file mode 100755
index 08daa6c..0000000
--- a/tests/dist-auxfile-2.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Files specified by AC_REQUIRE_AUX_FILE must exist, and if a Makefile
-# is present in the build-aux directory, they correctly get automatically
-# distributed.
-# Related to automake bug#9651.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([sub])
-AM_INIT_AUTOMAKE
-AC_REQUIRE_AUX_FILE([zardoz])
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-test: distdir
-       ls -l $(distdir) $(distdir)/* ;: For debugging.
-       test -f $(distdir)/sub/zardoz
-.PHONY: test
-check-local: test
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-echo dummy > sub/zardoz
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-test -f sub/install-sh
-# Should work also without `--add-missing'.
-$AUTOMAKE
-
-./configure
-
-$MAKE test
-$MAKE distcheck
-
-:
diff --git a/tests/dist-auxfile.test b/tests/dist-auxfile.test
deleted file mode 100755
index 2776a25..0000000
--- a/tests/dist-auxfile.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Files specified by AC_REQUIRE_AUX_FILE must exist, and they get
-# automatically distributed by the top-level Makefile.am.
-# Automake bug#9651 reported that this didn't happen when the build-aux
-# directory was set to `.' by AC_CONFIG_AUX_DIR.
-
-am_create_testdir=empty
-. ./defs || Exit 1
-
-set -e
-
-i=0
-for auxdir in build-aux ''; do
-
-  echo "*** Testing with auxdir '$auxdir' ***"
-
-  i=`expr $i + 1`
-  mkdir T$i.d
-  cd T$i.d
-
-  unindent > configure.in <<END
-    AC_INIT([$me], [1.0])
-    AC_CONFIG_AUX_DIR([${auxdir:-.}])
-    AM_INIT_AUTOMAKE
-    AC_REQUIRE_AUX_FILE([foo.txt])
-    AC_REQUIRE_AUX_FILE([bar.sh])
-    AC_REQUIRE_AUX_FILE([zardoz])
-    AC_CONFIG_FILES([Makefile subdir/Makefile])
-    AC_OUTPUT
-END
-
-  echo auxdir = ${auxdir:+"$auxdir/"} > Makefile.am
-  unindent >> Makefile.am <<'END'
-    SUBDIRS = subdir
-    test: distdir
-       ls -l $(distdir) $(distdir)/*      ;: For debugging.
-       @echo DIST_COMMON = $(DIST_COMMON) ;: Likewise.
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)foo.txt '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)bar.sh '
-       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)zardoz '
-       test -f $(distdir)/$(auxdir)foo.txt
-       test -f $(distdir)/$(auxdir)bar.sh
-       test -f $(distdir)/$(auxdir)zardoz
-    .PHONY: test
-    check-local: test
-END
-
-  mkdir subdir
-  : > subdir/Makefile.am
-  
-  test -z "$auxdir" || mkdir "$auxdir" || Exit 99
-
-  if test -z "$auxdir"; then
-    auxdir=.
-    auxdir_rx='\.'
-  else
-    auxdir_rx=$auxdir
-  fi
-
-  $ACLOCAL
-  $AUTOCONF
-
-  AUTOMAKE_fails
-  grep "^configure\\.in:4:.* required file.*$auxdir_rx/foo\\.txt" stderr
-  grep "^configure\\.in:5:.* required file.*$auxdir_rx/bar\\.sh"  stderr
-  grep "^configure\\.in:6:.* required file.*$auxdir_rx/zardoz"    stderr
-
-  touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
-  cp "$testsrcdir"/../lib/missing "$testsrcdir"/../lib/install-sh $auxdir
-  $AUTOMAKE
-  ./configure
-  $MAKE test
-  $EGREP '(foo\.txt|bar\.sh|zardoz)' subdir/Makefile.in && Exit 1
-
-  $MAKE distcheck
-
-  cd ..
-
-done
-
-:
diff --git a/tests/dist-included-parent-dir.test 
b/tests/dist-included-parent-dir.test
deleted file mode 100755
index b028a2c..0000000
--- a/tests/dist-included-parent-dir.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure included files in parent directory are distributed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-test: distdir
-       test -f $(distdir)/foo
-       test -f $(distdir)/bar
-       test 2 -gt `find $(distdir)/sub -type d | wc -l`
-END
-
-: > foo
-: > bar
-
-mkdir sub
-cat > sub/Makefile.am << 'END'
-include $(top_srcdir)/foo
-include ../bar
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-# Use --srcdir with an absolute path because it's harder
-# to support in `distdir'.
-./configure --srcdir "`pwd`"
-$MAKE test
diff --git a/tests/dist-missing-am.test b/tests/dist-missing-am.test
deleted file mode 100755
index bb404bc..0000000
--- a/tests/dist-missing-am.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The stub rules emitted to work around the "deleted header problem"
-# for `.am' files shouldn't prevent "make" from diagnosing a missing
-# required `.am' file from a distribution tarball.
-# See discussion about automake bug#9768.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-include $(srcdir)/foobar.am
-include $(srcdir)/zardoz.am
-END
-
-: > foobar.am
-: > zardoz.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-# A faulty distribution tarball, with a required `.am' file missing.
-# Building from it should fail, both for in-tree and VPATH builds.
-ocwd=`pwd` || fatal_ "cannot get current working directory"
-for vpath in false :; do
-  $MAKE distdir
-  test -f $distdir/zardoz.am # Sanity check.
-  rm -f $distdir/zardoz.am
-  if $vpath; then
-    # We can't just build in a subdirectory of $distdir, otherwise
-    # we'll hit automake bug#10111.
-    mkdir vpath-distcheck
-    cd vpath-distcheck
-    ../$distdir/configure
-  else
-    cd $distdir
-    ./configure
-  fi
-  $MAKE >output 2>&1 && { cat output; Exit 1; }
-  cat output
-  # This error comes from automake, not make, so we can be stricter
-  # in our grepping of it.
-  grep 'cannot open.*zardoz\.am' output
-  grep 'foobar\.am' output && Exit 1 # No spurious error, please.
-  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
-done
-
-:
diff --git a/tests/dist-missing-included-m4.test 
b/tests/dist-missing-included-m4.test
deleted file mode 100755
index 56ba24c..0000000
--- a/tests/dist-missing-included-m4.test
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The stub rules emitted to work around the "deleted header problem"
-# for `.m4' files shouldn't prevent "make" from diagnosing a missing
-# required `.m4' file from a distribution tarball.
-# See discussion about automake bug#9768.
-# See also sister test `dist-missing-m4.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-m4_include([foobar.m4])
-m4_include([zardoz.m4])
-AC_OUTPUT
-END
-
-: > foobar.m4
-: > zardoz.m4
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-# A faulty distribution tarball, with a required `.m4' file missing.
-# Building from it should fail, both for in-tree and VPATH builds.
-ocwd=`pwd` || fatal_ "cannot get current working directory"
-for vpath in false :; do
-  $MAKE distdir
-  test -f $distdir/zardoz.m4 # Sanity check.
-  rm -f $distdir/zardoz.m4
-  if $vpath; then
-    # We can't just build in a subdirectory of $distdir, otherwise
-    # we'll hit automake bug#10111.
-    mkdir vpath-distcheck
-    cd vpath-distcheck
-    ../$distdir/configure
-  else
-    cd $distdir
-    ./configure
-  fi
-  $MAKE >output 2>&1 && { cat output; Exit 1; }
-  cat output
-  # This error will come from automake, not make, so we can be stricter
-  # in our grepping of it.
-  grep 'zardoz\.m4.*does not exist' output
-  grep 'foobar\.m4' output && Exit 1 # No spurious error, please.
-  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
-done
-
-:
diff --git a/tests/dist-missing-m4.test b/tests/dist-missing-m4.test
deleted file mode 100755
index a2618e9..0000000
--- a/tests/dist-missing-m4.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The stub rules emitted to work around the "deleted header problem"
-# for `.m4' files shouldn't prevent "make" from diagnosing a missing
-# required `.m4' file from a distribution tarball.
-# See discussion about automake bug#9768.
-# See also sister test `dist-missing-included-m4.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-m4_pattern_forbid([^MY_])
-MY_FOOBAR || exit 1
-MY_ZARDOZ || exit 1
-AC_OUTPUT
-END
-
-mkdir m4
-echo 'AC_DEFUN([MY_FOOBAR], [:])' > m4/foobar.m4
-echo 'AC_DEFUN([MY_ZARDOZ], [:])' > m4/zardoz.m4
-
-echo 'ACLOCAL_AMFLAGS = -I m4' > Makefile.am
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-# A faulty distribution tarball, with a required `.m4' file missing.
-# Building from it should fail, both for in-tree and VPATH builds.
-ocwd=`pwd` || fatal_ "cannot get current working directory"
-for vpath in false :; do
-  $MAKE distdir
-  test -f $distdir/m4/zardoz.m4 # Sanity check.
-  rm -f $distdir/m4/zardoz.m4
-  if $vpath; then
-    # We can't just build in a subdirectory of $distdir, otherwise
-    # we'll hit automake bug#10111.
-    mkdir vpath-distcheck
-    cd vpath-distcheck
-    ../$distdir/configure
-  else
-    cd $distdir
-    ./configure
-  fi
-  $MAKE >output 2>&1 && { cat output; Exit 1; }
-  cat output
-  # This error will come from autoconf, not make, so we can be stricter
-  # in our grepping of it.
-  grep 'possibly undefined .*MY_ZARDOZ' output
-  grep 'MY_FOOBAR' output && Exit 1 # No spurious error, please.
-  cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
-done
-
-:
diff --git a/tests/dist-pr109765.test b/tests/dist-pr109765.test
deleted file mode 100755
index d656d56..0000000
--- a/tests/dist-pr109765.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Expose automake bug#10975: when several "dist-*" targets are invoked
-# on the make command line, the first one ends up removing the distdir,
-# so that the latter ones fail.
-
-required=bzip2
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-: > Makefile.am
-
-$ACLOCAL  || fatal_ "aclocal failed"
-$AUTOCONF || fatal_ "autoconf failed"
-$AUTOMAKE || fatal_ "automake failed"
-
-./configure
-$MAKE dist-gzip dist-bzip2
-
-gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; Exit 1; }
-cat one
-bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; Exit 1; }
-cat two
-
-$FGREP "$distdir/Makefile.am" one
-diff one two
-
-:
diff --git a/tests/distcheck-configure-flags-am.test 
b/tests/distcheck-configure-flags-am.test
deleted file mode 100755
index dc31ee3..0000000
--- a/tests/distcheck-configure-flags-am.test
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for AM_DISTCHECK_CONFIGURE_FLAGS at "make distcheck"
-# time, and its interactions with DISTCHECK_CONFIGURE_FLAGS.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
-AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
-      [:],
-      [AC_MSG_ERROR([success='$success', sentence='$sentence'])])
-AC_OUTPUT
-END
-
-unset sentence || :
-
-cat > Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
-dc_flags1 = --enable-success sentence='it works :-)'
-dc_flags2 =
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-$FGREP '$(AM_DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-grep 'DISTCHECK_CONFIGURE_FLAGS.*AM_DISTCHECK_CONFIGURE_FLAGS' Makefile.in \
-  && Exit 1
-
-$AUTOCONF
-./configure --enable-success sentence='it works :-)'
-
-# The configure call in "make distcheck" should honour
-# $(AM_DISTCHECK_CONFIGURE_FLAGS).
-
-$MAKE distcheck
-
-# $(DISTCHECK_CONFIGURE_FLAGS) takes precedence over
-# $(AM_DISTCHECK_CONFIGURE_FLAGS)
-
-cat >> Makefile.am << 'END'
-dc_flags2 += --disable-success
-END
-$AUTOMAKE Makefile
-./config.status Makefile
-
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-grep "^configure:.* success='no', sentence='it works :-)'" output
-
-$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes"
-
-:
diff --git a/tests/distcheck-configure-flags-subpkg.test 
b/tests/distcheck-configure-flags-subpkg.test
deleted file mode 100755
index 695b47c..0000000
--- a/tests/distcheck-configure-flags-subpkg.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check AM_DISTCHECK_CONFIGURE_FLAGS and DISTCHECK_CONFIGURE_FLAGS
-# are not honored in a subpackage Makefile.am, but the flags from
-# AM_DISTCHECK_CONFIGURE_FLAGS and DISTCHECK_CONFIGURE_FLAGS are
-# passed down to the configure script of the subpackage.  This is
-# explicitly documented in the manual.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SUBDIRS([subpkg])
-if test $dc != ok || test $am_dc != ok; then
-  AC_MSG_ERROR([dc=$dc am_dc=$dc])
-fi
-AC_OUTPUT
-END
-
-mkdir subpkg
-
-sed <configure.in >subpkg/configure.in \
-    -e 's/^AC_INIT.*/AC_INIT([subpkg], [2.0])/' \
-    -e '/^AC_CONFIG_SUBDIRS/d' \
-
-cat configure.in
-cat subpkg/configure.in
-
-dc=KO am_dc=KO; export dc am_dc
-
-cat > Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS = am_dc=ok
-DISTCHECK_CONFIGURE_FLAGS = dc=ok
-END
-
-: > subpkg/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-cd subpkg
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd ..
-
-# For debugging.
-$FGREP 'DISTCHECK_CONFIGURE_FLAGS' Makefile.in subpkg/Makefile.in
-
-grep '^AM_DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
-grep '^DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
-$EGREP '^(AM_)?DISTCHECK_CONFIGURE_FLAGS' subpkg/Makefile.in && Exit 1
-
-./configure dc=ok am_dc=ok
-
-# Flags in $(DISTCHECK_CONFIGURE_FLAGS) and $(AM_DISTCHECK_CONFIGURE_FLAGS)
-# should be passed down to the subpackage configure when "make distcheck"
-# is run from the top-level package ...
-$MAKE distcheck
-
-# ... but not when "make distcheck" is run from the subpackage.
-cd subpkg
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-grep '^configure:.* dc=KO am_dc=KO' output
-
-:
diff --git a/tests/distcheck-configure-flags.test 
b/tests/distcheck-configure-flags.test
deleted file mode 100755
index 117d83c..0000000
--- a/tests/distcheck-configure-flags.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for DISTCHECK_CONFIGURE_FLAGS at "make distcheck" time.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
-AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
-      [:],
-      [AC_MSG_ERROR([success='$success', sentence='$sentence'])])
-AC_OUTPUT
-END
-
-unset sentence || :
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-
-$AUTOCONF
-./configure --enable-success sentence='it works :-)'
-
-# It should be ok to define DISTCHECK_CONFIGURE_FLAGS either on the
-# make command line or in the environment.
-
-env DISTCHECK_CONFIGURE_FLAGS='--enable-success sentence=it\ works\ :-\)' \
-  $MAKE distcheck # Not `make -e' here, deliberately.
-
-$MAKE distcheck \
-  DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes sentence='it works :-)'"
-
-# Sanity check.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-grep "^configure:.* success='no', sentence=''" output
-
-:
diff --git a/tests/distcheck-hook-m4.am b/tests/distcheck-hook-m4.am
deleted file mode 100644
index 88681e9..0000000
--- a/tests/distcheck-hook-m4.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Data files for some tests.  Not used in the automake build system.
-##
-## Copyright (C) 2011 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-distcheck-hook:
-       @fatal () { echo "$@: $$*" >&2; exit 1; }; \
-       $(am__cd) $(distdir) && chmod u+w . && mkdir _m4 \
-         || fatal "cannot setup distdir"; \
-       $(ACLOCAL) -I _m4 $(ACLOCAL_AMFLAGS) --install --output=_am.m4 \
-         || fatal "cannot regenerate aclocal.m4"; \
-       lst=`ls _m4 | tr '\012\015' '  '`; \
-       if test -n "$$lst"; then \
-         fatal "required m4 files not distributed or outdated: $$lst"; \
-       fi; \
-       $(AUTOCONF) -o /dev/null || fatal "can't remake configure"; \
-       rm -rf _m4 _am.m4 autom4te.cache && chmod a-w . \
-         || fatal "cannot reset distdir"
diff --git a/tests/distcheck-hook.test b/tests/distcheck-hook.test
deleted file mode 100755
index 9a2c384..0000000
--- a/tests/distcheck-hook.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check basic support for distcheck-hook.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-distcheck-hook:
-       ls -l $(distdir)
-       chmod u+w $(distdir)
-       : > $(distdir)/dc-hook-has-run
-       chmod a-w $(distdir)
-check-local:
-       ls -l $(srcdir)
-       test -f $(srcdir)/dc-hook-has-run
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP 'distcheck-hook' Makefile.in
-$FGREP '$(MAKE) $(AM_MAKEFLAGS) distcheck-hook' Makefile.in
-grep '^distcheck-hook:' Makefile.in
-
-$AUTOCONF
-./configure
-
-$MAKE
-$MAKE check && Exit 1
-$MAKE distdir
-test -f $distdir/dc-hook-has-run && Exit 1
-$MAKE distcheck
-
-:
diff --git a/tests/distcheck-hook2.test b/tests/distcheck-hook2.test
deleted file mode 100755
index befc1d6..0000000
--- a/tests/distcheck-hook2.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that no 'distcheck-hook' target is created automatically by
-# Automake, and that a used-defined 'distcheck-hook' is *not* honored
-# in a subpackage Makefile.am.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SUBDIRS([subpkg])
-AC_OUTPUT
-END
-
-mkdir subpkg
-
-cat > subpkg/configure.in << 'END'
-AC_INIT([subpkg], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-distcheck-hook:
-       ls -l $(distdir)
-       chmod u+w $(distdir)
-       : > $(distdir)/dc-hook-has-run
-       chmod a-w $(distdir)
-check-local:
-       ls -l $(srcdir)
-       test -f $(srcdir)/dc-hook-has-run
-END
-
-cat > subpkg/Makefile.am <<'END'
-check-local:
-       ls -l $(srcdir)
-       test ! -r $(srcdir)/dc-hook-has-run
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd subpkg
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd ..
-
-# For debugging.
-$FGREP 'distcheck-hook' Makefile.in subpkg/Makefile.in
-
-$FGREP 'distcheck-hook' subpkg/Makefile.in && Exit 1
-$FGREP '$(MAKE) $(AM_MAKEFLAGS) distcheck-hook' Makefile.in
-grep '^distcheck-hook:' Makefile.in
-
-./configure
-
-$MAKE
-$MAKE check && Exit 1
-cd subpkg
-$MAKE check
-cd ..
-$MAKE distcheck
-
-:
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
deleted file mode 100755
index 1d42748..0000000
--- a/tests/distcheck-missing-m4.test
+++ /dev/null
@@ -1,120 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that we can define a distcheck-hook to diagnose m4 files
-# missing from the dist tarball (interaction with `--install').
-# See automake bug#9037.
-
-. ./defs || Exit 1
-
-set -e
-
-cwd=`pwd` || fatal_ "cannot get current working directory"
-
-cp "$testsrcdir"/distcheck-hook-m4.am . \
-  || fatal_ "cannot fetch makefile fragment \`distcheck-hook-m4.am'"
-
-cat > Makefile.am << 'END'
-## The lack of `--install' here is meant.
-ACLOCAL_AMFLAGS = -I m4
-include $(srcdir)/distcheck-hook-m4.am
-END
-
-cat >> configure.in << 'END'
-dnl We *deliberately* don't use m4_pattern_forbid here.
-AC_OUTPUT
-MY_FOO
-MY_BAR
-MY_BAZ
-MY_ZAR
-END
-
-mkdir m4 acdir acdir1 acdir2 pth
-
-cat > acdir/dirlist << END
-$cwd/acdir1
-$cwd/acdir2
-END
-
-echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
-echo 'AC_DEFUN([MY_BAR], [:])' > acdir1/bar.m4
-echo 'AC_DEFUN([MY_BAZ], [:])' > acdir1/baz.m4
-echo 'AC_DEFUN([MY_QUX], [:])' > acdir2/qux.m4
-echo 'AC_DEFUN([MY_ZAR], [:])' > pth/zar.m4
-echo 'AC_DEFUN([MY_BLA], [:])' > pth/bla.m4
-
-ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
-ACLOCAL_PATH=$cwd/pth; export ACLOCAL_PATH
-
-# We don't use `--install' here.  Our distcheck-hook should catch this.
-$ACLOCAL -I m4
-$AUTOCONF
-$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && Exit 1 # Sanity check.
-$AUTOMAKE
-
-check_no_spurious_error ()
-{
-  $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
-  # On failure, some make implementations (such as Solaris make) print the
-  # whole failed recipe on stdout.  The first grep works around this.
-  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
-  : # To placate `set -e'.
-}
-
-./configure
-
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-for x in bar baz zar; do
-  $EGREP "required m4 file.*not distributed.* $x.m4( |$)" output
-done
-check_no_spurious_error
-
-# Now we use `--install', and "make distcheck" should pass.
-$ACLOCAL -I m4 --install
-test -f m4/bar.m4 # Sanity check.
-test -f m4/baz.m4 # Likewise.
-test -f m4/zar.m4 # Likewise.
-using_gmake || $MAKE Makefile
-$MAKE distcheck
-
-# We start to use new "third-party" macros from new .m4 files, but forget
-# to re-run "aclocal --install" by hand, relying on automatic remake rules.
-# Our distcheck-hook should catch this too.
-cat >> configure.in << 'END'
-MY_QUX
-MY_BLA
-END
-
-$MAKE
-$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && Exit 1 # Sanity check.
-
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-$EGREP "required m4 file.*not distributed.* qux.m4( |$)" output
-$EGREP "required m4 file.*not distributed.* bla.m4( |$)" output
-check_no_spurious_error
-# Check that we don't complain for files that should have been found.
-$FGREP " (bar|baz|zar).m4" output && Exit 1
-
-# Now we again use `--install', and "make distcheck" should pass.
-$ACLOCAL -I m4 --install
-test -f m4/qux.m4 # Sanity check.
-test -f m4/bla.m4 # Likewise.
-using_gmake || $MAKE Makefile
-$MAKE distcheck
-
-:
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
deleted file mode 100755
index e3f265e..0000000
--- a/tests/distcheck-outdated-m4.test
+++ /dev/null
@@ -1,139 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that we can define a distcheck-hook to diagnose outdated m4
-# files in a dist tarball (interaction with `--install').
-# See automake bug#9037.
-
-. ./defs || Exit 1
-
-set -e
-
-cwd=`pwd` || fatal_ "cannot get current working directory"
-
-cp "$testsrcdir"/distcheck-hook-m4.am . \
-  || fatal_ "cannot fetch makefile fragment \`distcheck-hook-m4.am'"
-
-cat > Makefile.am << 'END'
-## The lack of `--install' here is meant.
-ACLOCAL_AMFLAGS = -I m4
-include $(srcdir)/distcheck-hook-m4.am
-END
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-MY_FOO
-MY_BAR
-MY_BAZ
-END
-
-mkdir m4 acdir
-echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
-echo 'AC_DEFUN([MY_BAR], [:])' > acdir/bar.m4
-cat > acdir/baz.m4 << 'END'
-# serial 1
-AC_DEFUN([MY_BAZ], [:])
-END
-
-ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
-
-# The use of `--install' here won't help when the installed file `.m4'
-# will become out-of-date w.r.t. the one in the system acdir.
-$ACLOCAL -I m4 --install
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE distcheck # Sanity check.
-
-check_no_spurious_error ()
-{
-  $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
-  # On failure, some make implementations (such as Solaris make) print the
-  # whole failed recipe on stdout.  The first grep works around this.
-  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
-  : # To placate `set -e'.
-}
-
-# We start to use a new "third-party" macro in a new version
-# of a pre-existing third-party m4 file, but forget to re-run
-# "aclocal --install" by hand, relying on automatic remake
-# rules.  Our distcheck-hook should catch this too.
-echo MY_ZARDOZ >> configure.in
-
-cat > acdir/baz.m4 << 'END'
-# serial 2
-AC_DEFUN([MY_BAZ], [:])
-AC_DEFUN([MY_ZARDOZ], [:])
-END
-
-$MAKE # Rebuild configure and makefiles.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-
-$EGREP "required m4 file.* outdated.* baz.m4( |$)" output
-check_no_spurious_error
-# Check that we don't complain for files that aren't outdated.
-$EGREP " (foo|bar).m4" output && Exit 1
-
-# Now we again use `--install' explicitly, and "make distcheck"
-# should pass.
-$ACLOCAL -I m4 --install
-using_gmake || $MAKE Makefile
-$MAKE distcheck
-
-# Similar to what have been done above, but this time we:
-#  - use ACLOCAL_PATH, and
-#  - do not add the use of a new macro.
-
-echo MY_FNORD >> configure.in
-
-mkdir pth
-cat > pth/fnord.m4 << 'END'
-# serial 1
-AC_DEFUN([MY_FNORD], [:])
-END
-
-ACLOCAL_PATH="$cwd/pth"; export ACLOCAL_PATH
-
-# The explicit use of `--install' here won't help when the installed file
-# `.m4' will become out-of-date w.r.t. the one in the system acdir.
-$ACLOCAL -I m4 --install
-using_gmake || $MAKE Makefile
-$MAKE distcheck
-
-# Only increase serial number, without changing the other contents; this
-# is deliberate.
-cat > pth/fnord.m4 << 'END'
-# serial 2
-AC_DEFUN([MY_FNORD], [:])
-END
-
-$MAKE # Rebuild configure and makefiles.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-$EGREP "required m4 file.* outdated.* fnord.m4( |$)" output
-check_no_spurious_error
-# Check that we don't complain for files that aren't outdated.
-$EGREP " (foo|bar|baz).m4" output && Exit 1
-
-# Now we again use `--install' explicitly, and "make distcheck"
-# should pass.
-$ACLOCAL -I m4 --install
-using_gmake || $MAKE Makefile
-$MAKE distcheck
-
-:
diff --git a/tests/distcheck-override-infodir.test 
b/tests/distcheck-override-infodir.test
deleted file mode 100755
index 3cf38c5..0000000
--- a/tests/distcheck-override-infodir.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that we can override ${infodir} while having distcheck still
-# working.  Relate to automake bug#9579.
-
-required='makeinfo tex texi2dvi install-info'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-infodir = ${prefix}/blah/blah/foobar
-info_TEXINFOS = main.texi
-## Sanity check.
-installcheck-local:
-       if test x$${infodir+set} != xset; then \
-         ls -l "$(DESTDIR)$(prefix)/blah/blah/foobar/" || exit 1; \
-         test -f "$(DESTDIR)$(prefix)/blah/blah/foobar/dir" || exit 1; \
-       else \
-         ls -l "$(DESTDIR)$$infodir/" || exit 1; \
-         test -f "$(DESTDIR)$$infodir/dir" || exit 1; \
-       fi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-./configure
-$MAKE
-
-$MAKE distcheck
-infodir="`pwd`"/_info $MAKE -e distcheck
-test -f _info/dir || Exit 99 # Sanity check.
-
-:
diff --git a/tests/distcheck-pr10470.test b/tests/distcheck-pr10470.test
deleted file mode 100755
index e774dd7..0000000
--- a/tests/distcheck-pr10470.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure "make distcheck" does not experience racy failures on
-# systems (like MinGW/MSYS) that cannot remove a directory "in use"
-# by a process (e.g., that is its "current working directory").
-# See automake bug#10470.
-
-parallel_tests=no
-. ./defs || Exit 1
-
-set -e
-
-mkdir foo.d
-sh -c "cd foo.d && sleep '4'" &
-# Without this sleep, the "rm -rf foo.d" below would reliably beat
-# the "cd foo.d" in the subshell above, and the test would be always
-# skipped, even on MinGW/MSYS.
-sleep '1'
-rm -rf foo.d && skip_ 'system is able to remove "in use" directories'
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<END
-TESTS = foo.test
-EXTRA_DIST= foo.test
-END
-
-cat > foo.test <<END
-#!/bin/sh
-sleep '4' &
-exit 0
-END
-chmod a+x foo.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-# We can build the distribution.
-$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
-cat output
-# Sanity check: verify that our code has hit a problem removing
-# the distdir, but has recovered from it.
-grep "rm:.*$destdir" output || fatal_ "expected code path not covered"
-
-:
diff --git a/tests/distcheck-pr9579.test b/tests/distcheck-pr9579.test
deleted file mode 100755
index 667401d..0000000
--- a/tests/distcheck-pr9579.test
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check against automake bug#9579: distcheck does not always detect
-# incomplete uninstall as advertised.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-# NOTE: the use of `dir' as the name of the data file installed by hand
-# is deliberate, and enhances coverage -- see definition and comments of
-# lib/am/distdir.am:$(am__distuninstallcheck_listfiles).
-
-cat > Makefile.am << 'END'
-dist_data_DATA = foo
-EXTRA_DIST = dir
-install-data-local:
-       $(MKDIR_P) '$(DESTDIR)$(datadir)'
-       cp '$(srcdir)/dir' '$(DESTDIR)$(datadir)/dir'
-END
-
-: > foo
-: > dir
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure --prefix="`pwd`/inst"
-
-# Sanity checks.
-$MAKE install
-find inst -type f
-test -f inst/share/foo
-test -f inst/share/dir
-# We expect the uninstall target of our Makefile to be definitely broken.
-$MAKE uninstall
-test -f inst/share/dir
-rm -rf inst
-
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-
-$FGREP 'ERROR: files left after uninstall:' output
-grep '/share/dir *$' output
-
-# A few trickier corner cases.
-
-cat > Makefile.am << 'END'
-EXTRA_DIST = dir
-install-data-local:
-install-data-local:
-       $(MKDIR_P) '$(DESTDIR)$(prefix)/mu/share/info'
-       cp '$(srcdir)/dir' '$(DESTDIR)$(prefix)/mu/share/info'
-       $(MKDIR_P) '$(DESTDIR)$(infodir)/more'
-       cp '$(srcdir)/dir' '$(DESTDIR)$(infodir)/more'
-END
-
-$AUTOMAKE
-./config.status Makefile
-
-# Sanity checks, again.
-$MAKE install
-find inst -type f
-test -f inst/mu/share/info/dir
-test -f inst/share/info/more/dir
-# We expect the uninstall target of our Makefile to be definitely broken.
-$MAKE uninstall
-test -f inst/mu/share/info/dir
-test -f inst/share/info/more/dir
-rm -rf inst
-
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
-cat output
-
-$FGREP 'ERROR: files left after uninstall:' output
-grep '/mu/share/info/dir *$' output
-grep '/share/info/more/dir *$' output
-
-:
diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
deleted file mode 100755
index 0f32e33..0000000
--- a/tests/distcleancheck.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the suggested `distcleancheck_listfiles' in the manual works.
-# The example Makefile.am we use is from the FAQ entry `distcleancheck'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-# This Makefile.am is bogus.  See @node{distcleancheck} in the manual
-# for how to fix it properly.
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-dist_man_MANS = foo.1
-
-# We write `./foo.1' inside the rule on purpose, to avoid VPATH rewriting
-# done by some `make' implementations.
-foo.1: foo$(EXEEXT)
-       echo man page for foo$(EXEEXT) > ./foo.1
-
-## Ignore warnings about overridden variables
-AUTOMAKE_OPTIONS = -Wno-override
-distcleancheck_listfiles = \
-  find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
-       sh '{}' ';'
-END
-
-cat >foo.c <<'END'
-int main () { return 0; }
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-$MAKE distcheck
-
-# Now ensure that we really needed the override.
-sed '/distcleancheck_listfiles/,$d' Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE
-./configure
-$MAKE
-$MAKE distcheck 2>stderr && { cat srderr >&2; Exit 1; }
-cat stderr >&2
-
-grep 'ERROR:.*files left in build directory after distclean' stderr
-grep '^\./foo\.1$' stderr
-
-:
diff --git a/tests/distcom2.test b/tests/distcom2.test
deleted file mode 100755
index 23841c6..0000000
--- a/tests/distcom2.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2006, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that depcomp and compile are added to DIST_COMMON
-# From Pavel Roskin.
-# Please keep this in sync with sister test 'distcom6.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_CONFIG_FILES([subdir/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-mkdir subdir
-: > subdir/foo.c
-
-cat > subdir/Makefile.am << 'END'
-noinst_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DBAR
-END
-
-rm -f compile depcomp
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-test -f compile
-test -f depcomp
-
-sed -n -e '/^DIST_COMMON =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e 's/$/ /' -e '/^DIST_COMMON =/p' Makefile.in > dc.txt
-
-cat dc.txt # might be useful for debugging
-
-$FGREP ' compile ' dc.txt
-$FGREP ' depcomp ' dc.txt
-
-:
diff --git a/tests/distcom3.test b/tests/distcom3.test
deleted file mode 100755
index 9cc62ea..0000000
--- a/tests/distcom3.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that non-existing common files are distributed
-# if they are buildable.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-README:
-       echo 'I bet you are reading me.' > README
-END
-
-# Files required by --gnu
-: > NEWS
-: > AUTHORS
-: > ChangeLog
-
-$ACLOCAL
-
-# Should not warn about missing README, since it is a target.
-$AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output; Exit 1; }
-cat output
-grep README output && Exit 1
-
-sed -n -e '/^DIST_COMMON =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e '/^DIST_COMMON =/ p' Makefile.in | grep README
-
-
-# Should warn about missing README.
-: > Makefile.am
-AUTOMAKE_fails --add-missing --gnu
-grep 'required file.*README.*not found' stderr
-
-:
diff --git a/tests/distcom4.test b/tests/distcom4.test
deleted file mode 100755
index 5dde663..0000000
--- a/tests/distcom4.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config files are distributed, and only once.
-# This tries to distribute a file from a subdirectory, without
-# Makefile in that directory.  distcom5.test performs the same
-# test with a Makefile in the directory.
-# Also make sure that README appears first in DIST_COMMON.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-   AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
-                   [chmod +x tests/autoconf])
-   AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
-                   [chmod +x tests/autoheader])
-   AC_CONFIG_FILES([tests/autom4te:tests/wrapper.in],
-                   [chmod +x tests/autom4te])
-   AC_CONFIG_FILES([tests/autoreconf:tests/wrapper.in],
-                   [chmod +x tests/autoreconf])
-   AC_CONFIG_FILES([tests/autoscan:tests/wrapper.in],
-                   [chmod +x tests/autoscan])
-   AC_CONFIG_FILES([tests/autoupdate:tests/wrapper.in],
-                   [chmod +x tests/autoupdate])
-   AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
-                   [chmod +x tests/ifnames])
-   AC_OUTPUT
-END
-
-mkdir tests
-: > README
-: > tests/wrapper.in
-cat > Makefile.am << 'END'
-.PHONY: test
-test: distdir
-       test -f $(distdir)/tests/wrapper.in
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE test
-
-sed -n -e '/^DIST_COMMON =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e '/^DIST_COMMON =/ p' Makefile.in > dc.txt
-
-cat dc.txt # might be useful for debugging
-
-test 1 = `grep tests dc.txt | wc -l`
-grep configure dc.txt
-# README must come first.
-grep 'DIST_COMMON = README' Makefile.in
-
-:
diff --git a/tests/distcom5.test b/tests/distcom5.test
deleted file mode 100755
index 7cadfd5..0000000
--- a/tests/distcom5.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config files are distributed, and only once.
-# This tries to distribute a file from a subdirectory, with
-# a Makefile in that directory.  distcom4.test performs the same
-# test without Makefile in the directory.
-
-. ./defs || Exit 1
-
-set -e
-
-extract_distcommon ()
-{
-  sed -n -e '/^DIST_COMMON =.*\\$/ {
-    :loop
-    p
-    n
-    t clear
-    :clear
-    s/\\$/\\/
-    t loop
-    p
-    n
-    }' -e '/^DIST_COMMON =/ p' ${1+"$@"}
-}
-
-cat >> configure.in << 'END'
-   AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
-                   [chmod +x tests/autoconf])
-   AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
-                   [chmod +x tests/autoheader])
-   AC_CONFIG_FILES([tests/autom4te:tests/wrapper.in],
-                   [chmod +x tests/autom4te])
-   AC_CONFIG_FILES([tests/autoreconf:tests/wrapper.in],
-                   [chmod +x tests/autoreconf])
-   AC_CONFIG_FILES([tests/autoscan:tests/wrapper.in],
-                   [chmod +x tests/autoscan])
-   AC_CONFIG_FILES([tests/autoupdate:tests/wrapper.in],
-                   [chmod +x tests/autoupdate])
-   AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
-                   [chmod +x tests/ifnames])
-   AC_CONFIG_FILES([tests/Makefile])
-   AC_OUTPUT
-END
-
-mkdir tests
-: > tests/wrapper.in
-: > tests/Makefile.am
-cat > Makefile.am << 'END'
-SUBDIRS = tests
-.PHONY: test
-test: distdir
-       test -f $(distdir)/tests/wrapper.in
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE test
-
-extract_distcommon Makefile.in > top.txt
-extract_distcommon tests/Makefile.in > inner.txt
-
-# might be useful for debugging
-cat top.txt
-cat inner.txt
-
-test 0 = `grep tests top.txt | wc -l`
-test 1 = `grep wrapper inner.txt | wc -l`
-
-:
diff --git a/tests/distcom6.test b/tests/distcom6.test
deleted file mode 100755
index ca71571..0000000
--- a/tests/distcom6.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that depcomp and compile required in subdirectories
-# are added to the top-level DIST_COMMON even with --no-force.
-# This is similar to distcom2.test, but with --no-force added.
-# Report from Scott James Remnant (Debian #206299).
-# Please keep this in sync with sister test 'distcom2.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_CONFIG_FILES([subdir/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-mkdir subdir
-: > subdir/foo.c
-
-cat > subdir/Makefile.am << 'END'
-noinst_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DBAR
-END
-
-rm -f compile depcomp
-
-$ACLOCAL
-$AUTOMAKE --add-missing --no-force
-
-test -f compile
-test -f depcomp
-
-sed -n -e '/^DIST_COMMON =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e 's/$/ /' -e '/^DIST_COMMON =/p' Makefile.in > dc.txt
-
-cat dc.txt # might be useful for debugging
-
-$FGREP ' compile ' dc.txt
-$FGREP ' depcomp ' dc.txt
-
-:
diff --git a/tests/distcom7.test b/tests/distcom7.test
deleted file mode 100755
index 3ea5096..0000000
--- a/tests/distcom7.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that Automake complains when an auxfile (here depcomp)
-# is installed, but the Makefile that distributes it is not processed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([subdir/Makefile])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = subdir
-END
-
-rm -f depcomp
-mkdir subdir
-
-cat > subdir/Makefile.am << 'END'
-bin_PROGRAMS = foo
-END
-
-: > subdir/foo.c
-
-$ACLOCAL
-AUTOMAKE_fails --add-missing subdir/Makefile
-grep 'full run' stderr
-
-:
diff --git a/tests/distdir.test b/tests/distdir.test
deleted file mode 100755
index 04ba363..0000000
--- a/tests/distdir.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2006, 2007, 2009, 2010 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure subdirs in EXTRA_DIST work.  Also tests to make
-# sure *srcdir is properly handled.  Note that using `./', as in
-#   EXTRA_DIST = ./joe
-# does not work portably: it fails with HP-UX and Tru64 make.
-# Also test DISTFILES containing a directory and a file in it,
-# and repeated directories.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-include_HEADERS = some/file another/sub/subsub/file2 yet/another/file3
-EXTRA_DIST = foo/bar joe $(top_srcdir)/woo/doo $(srcdir)/dada \
-            some another/sub yet \
-            some another/sub yet
-
-
-all-local:
-       $(MKDIR_P) another/sub/subsub
-       touch another/sub/subsub/file2
-
-CLEANFILES = another/sub/subsub/file2
-
-check-local:
-       test -f $(srcdir)/foo/bar
-       test -f $(srcdir)/woo/doo
-       test -f $(srcdir)/joe
-       test -f $(srcdir)/dada
-       test -f $(srcdir)/some/file
-       test -f $(srcdir)/another/sub/subsub/file2 \
-       || test -f /another/sub/subsub/file2
-       test -f $(srcdir)/yet/another/file3
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-mkdir foo woo some another another/sub another/sub/subsub yet yet/another
-touch foo/bar joe woo/doo dada some/file another/sub/subsub/file2
-touch yet/another/file3
-
-mkdir build
-cd build
-../configure
-$MAKE distdir
-# Check to make sure `foo' isn't made in build directory.
-test -d foo && Exit 1
-
-rm -rf $me-1.0
-# Remove the dot from VERSION for the next grep.
-VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir >stdout || :
-cat stdout
-
-# Make sure no `./' appear in the directory names.  srcdir is `..', so
-# this also checks that no directory is created in the source tree.
-grep 'MKDIR_P.*\.' stdout && Exit 1
-
-cd ..
-./configure --prefix "`pwd`"
-$MAKE distcheck
-
-:
diff --git a/tests/distlinks.test b/tests/distlinks.test
deleted file mode 100755
index 268cfcb..0000000
--- a/tests/distlinks.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that distributed symlinks in the source tree will be expanded
-# as regular files in $(distdir).
-
-. ./defs || Exit 1
-
-set -e
-
-echo text > file
-
-ln -s file lnk || {
-  echo "$me: cannot create symlinks to files" >&2
-  Exit 77
-}
-
-mkdir A
-mkdir B
-echo aaa > A/aaa
-cd B
-ln -s ../A/aaa bbb
-cd ..
-
-echo FooBarBaz > foo
-
-ln -s foo  bar1
-ln -s bar1 bar2
-ln -s bar2 bar3
-
-ln -s "`pwd`/foo" quux
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-echo "me = $me" > Makefile.am  # for better failure messages
-cat >> Makefile.am << 'END'
-EXTRA_DIST = lnk B/bbb bar1 bar2 bar3 quux
-.PHONY: test
-test: distdir
-       ls -l $(distdir) $(distdir)/B
-       fail() { echo "$(me): $$*" >&2; e=1; }; \
-       e=0; \
-       set file lnk A/aaa B/bbb foo quux foo bar1 foo bar2 foo bar3; \
-       while test $$# -ge 2; do \
-         file=$$1; shift; link=$(distdir)/$$1; shift; \
-         test -f $$link || fail "$$link is not a regular file"; \
-         test ! -h $$link || fail "$$link is a symlink"; \
-         diff $$file $$link || fail "$$link differs from $$file"; \
-       done; \
-       exit $$e;
-END
-
-ls -l . A B
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE test
-
-:
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
deleted file mode 100755
index 2314408..0000000
--- a/tests/distlinksbrk.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that distributed broken symlinks cause `make dist' to fail, and
-# to do so with (mostly) meaningful diagnostic.
-
-. ./defs || Exit 1
-
-set -e
-
-# We need, for our broken symlinks, names that make it hard to get false
-# positives when grepping make output to look for them.
-lnk_base=BrknSymlnk
-lnk1=${lnk_base}__001
-lnk2=${lnk_base}__002
-lnka=${lnk_base}__aaa
-lnkb=${lnk_base}__bbb
-
-ln -s nonesuch $lnk1 || {
-  echo "$me: cannot create broken symlinks" >&2
-  Exit 77
-}
-
-ln -s "`pwd`/nonesuch" $lnk2
-
-ln -s $lnk1 $lnka
-ln -s $lnka $lnkb
-
-# Sanity checks.  Use `test -r', since Solaris Sh doesn't grok `test -e'.
-test ! -r $lnk1
-test ! -r $lnk2
-test ! -r $lnka
-test ! -r $lnkb
-test -h $lnk1
-test -h $lnk2
-test -h $lnka
-test -h $lnkb
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOCONF
-
-ls -l # for debugging
-
-# Don't try to use "make -k", because some botched make implementations
-# (HP-UX, IRIX) might still exit on the first error in this situations.
-for lnk in $lnk1 $lnk2 $lnka $lnkb; do
-  echo "EXTRA_DIST = $lnk" > Makefile.am
-  $AUTOMAKE
-  ./configure
-  # Distribution must fail, with a decent error message.
-  $MAKE distdir >out 2>&1 && { cat out; Exit 1; }
-  cat out
-  $FGREP $lnk out
-done
-
-:
diff --git a/tests/distname.test b/tests/distname.test
deleted file mode 100755
index 117d986..0000000
--- a/tests/distname.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of names in tar file.
-# From Rainer Orth
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SRCDIR([a.c])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-: > a.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --add-missing
-./configure
-$MAKE dist
-
-gzip -d $me-1.0.tar.gz
-tar tf $me-1.0.tar > stdout || { cat stdout; Exit 1; }
-cat stdout
-$FGREP ./$me-1.0/a.c stdout && Exit 1
-
-:
diff --git a/tests/dmalloc.test b/tests/dmalloc.test
deleted file mode 100755
index 629c949..0000000
--- a/tests/dmalloc.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Simple checks on the `AM_WITH_DMALLOC' macro.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_HEADERS([config.h])
-AM_WITH_DMALLOC
-AC_SUBST([LDFLAGS])
-AC_OUTPUT
-END
-
-cat > config.h.in <<'END'
-#undef WITH_DMALLOC
-END
-
-cat > Makefile.am <<'END'
-check-with-dmalloc:
-## The AM_WITH_DMALLOC assumes that the user is a developer, so that
-## he is expected to install and make available the `dmalloc' library
-## by his own.  So we just check that proper linker and libs flags get
-## added.
-       echo ' ' $(LDFLAGS) ' ' | grep ' -g '
-       echo ' ' $(LIBS) ' ' | grep ' -ldmalloc '
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-cat config.h # debug info
-grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
-
-./configure --without-dmalloc
-cat config.h # debug info
-grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
-
-./configure --with-dmalloc
-cat config.h # debug info
-grep '^# *define  *WITH_DMALLOC  *1 *$' config.h
-$MAKE check-with-dmalloc
-
-:
diff --git a/tests/doc-parsing-buglets-colneq-subst.test 
b/tests/doc-parsing-buglets-colneq-subst.test
deleted file mode 100755
index 685d2b6..0000000
--- a/tests/doc-parsing-buglets-colneq-subst.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check a documented limitation of the Automake's Makefile parser
-# w.r.t. POSIX variable substitutions used in the name of targets.
-# See Section "General Operation" in the Automake manual.
-# If you cause some parts of this test to fail, chances are that you've
-# improved the Automake parser ;-)
-# See: <http://lists.gnu.org/archive/html/automake/2010-08/msg00074.html>
-# or: 
<http://thread.gmane.org/gmane.comp.sysutils.automake.general/11943/focus=11962>
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am <<'END'
-$(FOO:=x): bar
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-
-grep 'bad characters.*variable name.*\$(FOO' stderr
-grep ':=.*assignments.*not portable' stderr
-
-:
diff --git a/tests/doc-parsing-buglets-tabs.test 
b/tests/doc-parsing-buglets-tabs.test
deleted file mode 100755
index acff363..0000000
--- a/tests/doc-parsing-buglets-tabs.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check the documented limitation of the Automake's Makefile parser w.r.t.
-# use of TAB characters; see Section "General Operation" in the Automake
-# manual, and automake bug#8360.
-# If you cause some parts of this test to fail, chances are that you've
-# improved the Automake parser ;-)
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am <<END
-.PHONY: test
-test: all check
-
-fail:
address@hidden "'\$@ recipe executed'"; exit 1
-
-## This won't be recognized as a target+recipe by Automake.
-all-local${tab}:
address@hidden 1
-
-## This won't be recognized as a target+rdependency by Automake.
-all-local${tab}: fail
-
-just_to_separate: dummy deps
-
-## This won't be recognized as a variable assignment by Automake.
-${tab}bin_PROGRAMS = foo
-END
-
-echo AC_OUTPUT >> configure.in
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP '$(EXEEEXT)' Makefile.in && Exit 1
-grep 'all:.*all-local' Makefile.in && Exit 1
-grep "^${tab}bin_PROGRAMS = foo" Makefile.in
-
-$AUTOCONF
-./configure
-
-$MAKE test
-
-:
diff --git a/tests/dollar.test b/tests/dollar.test
deleted file mode 100755
index 77b5129..0000000
--- a/tests/dollar.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# We should support files with `$' characters in their names.
-# Java people need this.
-# PR/317, reported by Eric Siegerman and Philip Fong.
-
-# Require GNU make for this test.  SunOS Make does not support
-# `$$' in a target or a dependency (it outputs the empty string instead).
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'EOF'
-mydir = $(prefix)/my
-dist_my_DATA = hello$$world
-
-check-dist: distdir
-       test -f '$(distdir)/hello$$world'
-EOF
-
-: > 'hello$world'
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure --prefix "`pwd`/inst"
-$MAKE install
-test -f 'inst/my/hello$world'
-$MAKE check-dist
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
deleted file mode 100755
index 7105cb0..0000000
--- a/tests/dollarvar.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that -Wportability complains about recursive
-# variable expansions and variables containing `$', `$(...)', or
-# `${...}' in the name.  We support recursive variable expansions using
-# the latter two constructs for the `silent-rules' option, and they are
-# rather widely supported in practice.  OTOH variable definitions
-# containing a `$' on the left hand side of an assignment are not
-# portable in practice, even though POSIX allows them.  :-/
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am <<'EOF'
-x = 1
-foo$x = 1
-bar$(x) = 1
-baz${x} = 1
-bla = $(foo$x)
-bli = $(foo$(x))
-blo = $(foo${x})
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails -Wportability
-grep 'Makefile.am:2' stderr
-grep 'Makefile.am:3' stderr
-grep 'Makefile.am:4' stderr
-grep 'Makefile.am:5' stderr
-grep 'Makefile.am:6' stderr
-grep 'Makefile.am:7' stderr
-
-# On the other hand, if we allow `silent-rules' mode, then we need to
-# allow recursive variable expansion, too.
-
-# This should work with the AM_SILENT_RULES macro.
-$sleep
-echo 'AM_SILENT_RULES' >> configure.in
-
-$ACLOCAL --force
-AUTOMAKE_fails -Wportability
-grep 'Makefile.am:2' stderr
-grep 'Makefile.am:3' stderr
-grep 'Makefile.am:4' stderr
-grep 'Makefile.am:5' stderr
-grep 'Makefile.am:6' stderr && Exit 1
-grep 'Makefile.am:7' stderr && Exit 1
-
-
-:
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
deleted file mode 100755
index 7a6db37..0000000
--- a/tests/dollarvar2.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that -Wportability turns on portability-recursive,
-# likewise for -Wno-...
-
-. ./defs || Exit 1
-
-set -e
-
-#
-# First, try a setup where we have a `portability-recursive' warning,
-# but no "simple" `portability' warning.
-#
-
-cat >Makefile.am <<'EOF'
-x = 1
-bla = $(foo$(x))
-EOF
-
-$ACLOCAL
-
-# Enabling `portability' warnings should enable `portability-recursive'
-# warnings.
-AUTOMAKE_fails -Wnone -Wportability
-grep 'recursive variable expansion' stderr
-# `portability-recursive' warnings can be enabled by themselves.
-AUTOMAKE_fails -Wnone -Wportability-recursive
-grep 'recursive variable expansion' stderr
-
-# Various ways to disable `portability-recursive'.
-$AUTOMAKE -Wno-all
-$AUTOMAKE -Wno-portability
-$AUTOMAKE -Wall -Wno-portability-recursive
-
-# `-Wno-portability-recursive' after `-Wportability' correctly disables
-# `portability-recursive' warnings.
-$AUTOMAKE -Wportability -Wno-portability-recursive
-
-# `-Wno-portability' disables `portability-recursive' warnings; but
-# a later `-Wportability-recursive' re-enables them.  This time, we
-# use AUTOMAKE_OPTIONS to specify the warning levels.
-echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
-echo 'AUTOMAKE_OPTIONS += -Wportability-recursive' >> Makefile.am
-AUTOMAKE_fails
-grep 'recursive variable expansion' stderr
-
-#
-# Now try a setup where we have both a `portability' warning and
-# a `portability-recursive' one.
-#
-
-cat >Makefile.am <<'EOF'
-x = 1
-bla = $(foo$(x))
-noinst_PROGRAMS = foo
-foo_CPPFLAGS = -Dwhatever
-EOF
-
-echo AC_PROG_CC >> configure.in
-
-$ACLOCAL --force
-
-# Can disable both `portability' and `portability-recursive' warnings.
-$AUTOMAKE -Wno-portability
-
-# Disabling `portability-recursive' warnings should not disable
-# `portability' warnings.
-AUTOMAKE_fails -Wportability -Wno-portability-recursive
-grep AM_PROG_CC_C_O stderr
-grep 'recursive variable expansion' stderr && Exit 1
-
-# Enabling `portability-recursive' warnings should not enable
-# all the `portability' warning.
-AUTOMAKE_fails -Wno-portability -Wportability-recursive
-grep AM_PROG_CC_C_O stderr && Exit 1
-grep 'recursive variable expansion' stderr
-
-:
diff --git a/tests/double.test b/tests/double.test
deleted file mode 100755
index b4e9c50..0000000
--- a/tests/double.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure listing a program twice is ok.
-# Report from Manu Rouat.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/dup2.test b/tests/dup2.test
deleted file mode 100755
index 654d99b..0000000
--- a/tests/dup2.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure aclocal only warns about definitions overridden by acinclude.m4.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_FUNC_STRTOD
-END
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([AM_FUNC_STRTOD])
-END
-
-$ACLOCAL
diff --git a/tests/else.test b/tests/else.test
deleted file mode 100755
index 32cf81a..0000000
--- a/tests/else.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure line numbers are correct in some error reports.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
-
-cat > Makefile.am << 'END'
-# flag to tell us if apache dir is a source distribution
-APACHE_DIR_IS_SRC = @APACHE_DIR_IS_SRC@
-
-# we only need to descend into the c dir if we're doing a 1.3 DSO configuration
-ifeq ("${APACHE_DIR_IS_SRC}","yes")
-SUBDIRS = java
-else
-SUBDIRS = c java
-endif
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:7:.*else without if' stderr
diff --git a/tests/empty.test b/tests/empty.test
deleted file mode 100755
index db5af87..0000000
--- a/tests/empty.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2007
-# Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where if the list of installables is empty, invalid sh
-# code is generated.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >>configure.in
-echo 'data_DATA =' >Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure --prefix "`pwd`/inst"
-$MAKE install
diff --git a/tests/empty2.test b/tests/empty2.test
deleted file mode 100755
index efebb70..0000000
--- a/tests/empty2.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure empty _SOURCES suppresses assumption about default
-# name.  Report from Pavel Roskin.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = pavel
-pavel_SOURCES =
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'pavel\.[co]' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/empty3.test b/tests/empty3.test
deleted file mode 100755
index e88152f..0000000
--- a/tests/empty3.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# A test for missing _SOURCES variable.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = pavel
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'pavel\.[co]' Makefile.in
diff --git a/tests/empty4.test b/tests/empty4.test
deleted file mode 100755
index 71c7552..0000000
--- a/tests/empty4.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure empty _SOURCES works.
-# From Paul Berrevoets.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST(ZOO_OBJ)
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = zoo
-zoo_SOURCES =
-EXTRA_zoo_SOURCES = bar.c foo.c
-zoo_DEPENDENCIES = $(ZOO_OBJ)
-zoo_LDADD = $(zoo_DEPENDENCIES)
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP zoo. Makefile.in && Exit 1
-Exit 0
diff --git a/tests/exdir.test b/tests/exdir.test
deleted file mode 100755
index 013b80a..0000000
--- a/tests/exdir.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure new extended directory mechanism works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-htmldir = $(prefix)/html
-html_DATA = zot.html
-pkgdata_DATA = qbert
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^DATA' Makefile.in | grep html
diff --git a/tests/exdir2.test b/tests/exdir2.test
deleted file mode 100755
index aca1497..0000000
--- a/tests/exdir2.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure undefined directories are invalid.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-quuz_DATA = zot.html
-pkgdata_DATA = qbert
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'pkgdatadir' stderr && Exit 1
-grep 'Makefile.am:1:.*quuzdir.*undefined' stderr
diff --git a/tests/exdir3.test b/tests/exdir3.test
deleted file mode 100755
index d51bdf9..0000000
--- a/tests/exdir3.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure pkgdatadir can be overridden via AC_SUBST.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_SUBST([pkgdatadir], ["FOO"])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-showme:
-       @echo $(pkgdatadir)
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE showme | grep FOO
diff --git a/tests/exeext.test b/tests/exeext.test
deleted file mode 100755
index 3fd42a8..0000000
--- a/tests/exeext.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `.' in an exe name doesn't fool us.
-# Report from Robert Collins.
-# Also make sure we rewrite conditionals variables.
-# Also check for PR/352.
-# Also make sure the old definitions of bin_PROGRAMS and friend
-# aren't left around.  Report from Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([WANT_MT], [test -z "$revert"])
-AM_CONDITIONAL([WANT_RMT], [test -z "$revert"])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-## Use a different dir for each to make grep easy.
-bin_PROGRAMS = maude
-sbin_PROGRAMS = maude.static
-## We don't define this one for now.  Probably it is an error.
-## noinst_PROGRAMS = maude2.exe
-check_PROGRAMS = maude3$(EXEEXT)
-
-if WANT_MT
-  bin_PROGRAMS += mt
-endif
-if WANT_RMT
-  libexec_PROGRAMS = rmt
-endif
-
-print:
-       @echo 1BEG: $(bin_PROGRAMS) :END1
-       @echo 2BEG: $(sbin_PROGRAMS) :END2
-       @echo 3BEG: $(check_PROGRAMS) :END3
-       @echo 4BEG: $(libexec_PROGRAMS) :END4
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-grep '^maude$(EXEEXT):' Makefile.in
-grep '^maude\.static$(EXEEXT):' Makefile.in
-grep '^maude3$(EXEEXT):' Makefile.in
-grep '^mt$(EXEEXT):' Makefile.in
-grep '^rmt$(EXEEXT):' Makefile.in
-test `grep '^bin_PROGRAMS =' Makefile.in | wc -l` = 1
-
-# Make sure $(EXEEXT) gets stripped before canonicalization.
-grep 'maude3__EXEEXT__OBJECTS' Makefile.in && Exit 1
-
-./configure
-
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
-
-grep '1BEG: maude.foo mt.foo :END1' stdout
-grep '2BEG: maude.static.foo :END2' stdout
-grep '3BEG: maude3.foo :END3' stdout
-grep '4BEG: rmt.foo :END4' stdout
-
-./configure revert=yes
-
-EXEEXT=.foo $MAKE -e print > stdout
-cat stdout
-
-grep '1BEG: maude.foo :END1' stdout
-grep '2BEG: maude.static.foo :END2' stdout
-grep '3BEG: maude3.foo :END3' stdout
-grep '4BEG: :END4' stdout
diff --git a/tests/exeext2.test b/tests/exeext2.test
deleted file mode 100755
index fc05712..0000000
--- a/tests/exeext2.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure no-exeext option works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude
-
-maude:
-       yeah
-END
-
-$ACLOCAL
-
-$AUTOMAKE -Wnone
-AUTOMAKE_fails -Wnone -Wobsolete
-grep 'deprecated.*maude' stderr
-AUTOMAKE_fails -Wall
-grep 'deprecated.*maude' stderr
-grep 'overrid.*maude' stderr
-
-echo 'AUTOMAKE_OPTIONS = no-exeext' >> Makefile.am
-
-$AUTOMAKE -Wall -Wno-override
diff --git a/tests/exeext3.test b/tests/exeext3.test
deleted file mode 100755
index 28a7d5e..0000000
--- a/tests/exeext3.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we can override a program rule.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude 3dldf
-
-maude$(EXEEXT):
-       yeah
-
-3dldf$(EXEEXT):
-       yippie
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-override
-
-$FGREP 'maude$(EXEEXT):' Makefile.in
-test 1 = `grep 'maude.*:' Makefile.in | wc -l`
-$FGREP '3dldf$(EXEEXT):' Makefile.in
-test 1 = `grep '3dldf.*:' Makefile.in | wc -l`
diff --git a/tests/exeext4.test b/tests/exeext4.test
deleted file mode 100755
index e6cfe7d..0000000
--- a/tests/exeext4.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure $(EXEEXT) is appended to programs and to tests that are
-# programs, but not to @address@hidden
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND], [test -n "$cond"])
-AC_SUBST([programs], ['prg1$(EXEEXT) prg2$(EXEEXT)'])
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-EXEEXT = .bin
-if COND
-  BAR = bar
-  DEP = bar
-  BAZE = baz$(EXEEXT)
-  BAZ = baz $(DEP)
-endif
-bin_PROGRAMS = $(programs) @programs@ prg3 $(BAR) $(BAZE)
-EXTRA_PROGRAMS = prg1 prg2 prg3
-TESTS = prg1 prg3 prg4 $(BAZ)
-
-print-bin:
-       @echo BEG: $(bin_PROGRAMS) :END
-print-extra:
-       @echo BEG: $(EXTRA_PROGRAMS) :END
-print-tests:
-       @echo BEG: $(TESTS) :END
-print-barbaz:
-       @echo BEG: $(BAR) $(BAZ) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE print-bin > output
-cat output
-$FGREP 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin' output
-$MAKE print-extra > output
-cat output
-$FGREP 'prg1.bin prg2.bin prg3.bin' output
-$MAKE print-tests > output
-cat output
-$FGREP 'prg1.bin prg3.bin prg4' output
-
-./configure cond=yes
-$MAKE print-bin > output
-cat output
-$FGREP 'prg1.bin prg2.bin prg1.bin prg2.bin prg3.bin bar.bin baz.bin' output
-$MAKE print-tests > output
-cat output
-$FGREP 'prg1.bin prg3.bin prg4 baz.bin bar.bin' output
-$MAKE print-barbaz > output
-cat output
-$FGREP 'bar baz bar' output
-
-# Only two am__EXEEXT_* variables are needed here: one for BAR, and one
-# BAZ.  The latter must use the former.
-test 2 = `grep '__EXEEXT_. =' Makefile.in | wc -l`
-grep 'am__EXEEXT_2 = .*am__EXEEXT_1' Makefile.in
diff --git a/tests/exsource.test b/tests/exsource.test
deleted file mode 100755
index 2747f6e..0000000
--- a/tests/exsource.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2004
-# Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure EXTRA_..._SOURCES actually works.
-# Bug report from Henrik Frystyk Nielsen.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = www
-www_SOURCES = www.c
-EXTRA_www_SOURCES = xtra.c
-www_LDADD = @extra_stuff@
-END
-
-: > www.c
-: > xtra.c
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '@am__include@ .*/xtra\.P' Makefile.in
diff --git a/tests/ext.test b/tests/ext.test
deleted file mode 100755
index af2eab2..0000000
--- a/tests/ext.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure extensions are set correctly for various languages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-AC_PROG_FC
-AC_PROG_OBJC
-AM_PROG_UPC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = 1.f 2.for 3.f90 4.f95 5.F 6.F90 7.F95 8.r 9.m 10.upc
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-for ext in f for f90 f95 F F90 F95 r m upc
-do
-   # Some versions of the BSD shell wrongly exit when `set -e' is active
-   # if the last command within a compound statement fails and is guarded
-   # by an && only.  So we play safe and use the following idiom, instead
-   # of the apparently simpler `grep ... && Exit 1'.
-   if grep "^$ext\.o:" Makefile.in; then Exit 1; else :; fi
-   grep "^\.$ext\.o:" Makefile.in
-done
-Exit 0
diff --git a/tests/ext2.test b/tests/ext2.test
deleted file mode 100755
index 185b708..0000000
--- a/tests/ext2.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for a bug reported by Ladislav Strojil.
-# Using different extensions for the same language should not
-# output the build rules several times.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CXX
-EOF
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = p q r
-p_SOURCES = a.cc b.cpp c.cxx
-q_SOURCES = sub/d.cc sub/e.cpp sub/f.cxx
-r_SOURCES = g.cc h.cpp i.cxx
-r_CXXFLAGS = -DFOO
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '\.o:' Makefile.in > rules
-cat rules
-
-# Here is an example of bogus output.  The rules are output several
-# times.
-#|  .cc.o:
-#|  d.o: sub/d.cc
-#|  e.o: sub/e.cpp
-#|  f.o: sub/f.cxx
-#|  r-g.o: g.cc
-#|  r-h.o: h.cpp
-#|  r-i.o: i.cxx
-#|  .cpp.o:
-#|  d.o: sub/d.cc
-#|  e.o: sub/e.cpp
-#|  f.o: sub/f.cxx
-#|  r-g.o: g.cc
-#|  r-h.o: h.cpp
-#|  r-i.o: i.cxx
-#|  .cxx.o:
-#|  #d.o: sub/d.cc
-#|  #e.o: sub/e.cpp
-#|  #f.o: sub/f.cxx
-#|  #r-g.o: g.cc
-#|  #r-h.o: h.cpp
-#|  #r-i.o: i.cxx
-
-# Bail out if we find a duplicate.
-$PERL -ne 'if (exists $a{$_}) { exit 1 } else { $a{$_} = 1 }' < rules
diff --git a/tests/extra-portability.test b/tests/extra-portability.test
deleted file mode 100755
index 62a6335..0000000
--- a/tests/extra-portability.test
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check interactions between the `portability' and `extra-portability'
-# warning categories:
-#   1. `-Wextra-portability' must imply `-Wportability'.
-#   2. `-Wno-portability' must imply `-Wno-extra-portability'.
-#   3. `-Wall' does *not* imply `-Wextra-portability'.
-
-. ./defs || Exit 1
-
-set -e
-
-# We want (almost) complete control over automake options.
-# FIXME: use $original_AUTOMAKE here once we are merged into master.
-AUTOMAKE="`(set $AUTOMAKE && echo $1)` --foreign -Werror"
-
-cat >>configure.in <<END
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-$ACLOCAL
-
-#
-# First, a setup where only an extra-portability warning is present
-# (no "simple" portability-warnings are).
-#
-
-cat >Makefile.am <<END
-EXTRA_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = sub/foo.c
-END
-
-# Sanity check: extra-portability warnings causes the expected error.
-AUTOMAKE_fails -Wextra-portability
-grep 'requires.*AM_PROG_AR' stderr
-
-# Warnings in extra-portability category are not enabled by default.
-$AUTOMAKE
-
-# `-Wall' does not enable extra-portability warnings.
-$AUTOMAKE -Wall -Werror
-
-# Enabling extra-portability works.
-AUTOMAKE_fails -Wnone -Wextra-portability
-grep 'requires.*AM_PROG_AR' stderr
-# Disabling portability disables extra-portability.
-$AUTOMAKE -Wno-portability -Wall
-$AUTOMAKE -Wextra-portability -Wno-portability -Wall
-
-echo libfoo_a_CPPFLAGS = -Dwhatever >> Makefile.am
-
-# Enabling extra-portability enables portability.
-AUTOMAKE_fails -Wnone -Wextra-portability
-# The expected diagnostic is
-#    Makefile.am:2: compiling `foo.c' with per-target flags requires 
`AM_PROG_CC_C_O' in `configure.in'
-#    .../lib/am/library.am: `libfoo.a': linking libraries using a non-POSIX
-#    .../lib/am/library.am: archiver requires `AM_PROG_AR' in `configure.in'
-#    Makefile.am:1:   while processing library `libfoo.a'
-grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr
-
-# `-Wall' does not reset extra portability warnings to their
-# default (i.e., disabled).
-AUTOMAKE_fails -Wextra-portability -Wall
-grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr
-
-# Disabling extra-portability leaves portability intact.
-AUTOMAKE_fails -Wportability -Wno-extra-portability
-grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
-
-# `-Wall' does not set extra portability warnings if they have
-# been previously disabled.
-AUTOMAKE_fails -Wno-extra-portability -Wall
-grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
-
-# Enabling portability does not enable extra-portability.
-AUTOMAKE_fails -Wnone -Wportability
-grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
-
-# Disabling portability disables extra-portability.
-$AUTOMAKE -Wno-portability
-$AUTOMAKE -Wextra-portability -Wno-portability
-$AUTOMAKE -Wall -Wno-portability
-
-:
diff --git a/tests/extra-portability2.test b/tests/extra-portability2.test
deleted file mode 100755
index 9a01e74..0000000
--- a/tests/extra-portability2.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that extra-portability warnings are not enabled by --gnits,
-# --gnu and --foreign.
-
-. ./defs || Exit 1
-
-set -e
-
-# Satisfy --gnits and --gnu.
-: > INSTALL
-: > NEWS
-: > README
-: > AUTHORS
-: > ChangeLog
-: > COPYING
-: > THANKS
-
-cat >>configure.in <<END
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat >Makefile.am <<END
-EXTRA_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-$ACLOCAL
-
-# In the 1.11.x series, `extra-portability' warnings are not enabled
-# by `-Wall'.
-AUTOMAKE="$AUTOMAKE -Wextra-portability"
-
-# Make sure the test is useful.
-AUTOMAKE_fails
-
-$AUTOMAKE --foreign
-$AUTOMAKE --gnu
-$AUTOMAKE --gnits
-
-:
diff --git a/tests/extra-portability3.test b/tests/extra-portability3.test
deleted file mode 100755
index 7ca19b1..0000000
--- a/tests/extra-portability3.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check interactions between the `portability-recursive' and
-# `extra-portability' warning categories.
-
-. ./defs || Exit 1
-
-set -e
-
-# We want (almost) complete control over automake options.
-# FIXME: use $original_AUTOMAKE here once we are merged into master.
-AUTOMAKE="`(set $AUTOMAKE && echo $1)` --foreign -Werror"
-
-cat >>configure.in <<END
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-$ACLOCAL
-
-cat >Makefile.am <<'END'
-baz = $(foo$(bar))
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-# 'extra-portability' implies 'portability-recursive'.
-AUTOMAKE_fails -Wextra-portability
-grep 'requires.*AM_PROG_AR' stderr
-grep 'recursive variable expansion' stderr
-
-# We can disable 'extra-portability' while leaving
-# 'portability-recursive' intact.
-AUTOMAKE_fails -Wportability-recursive -Wno-extra-portability
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
-grep 'recursive variable expansion' stderr
-
-# We can disable 'portability-recursive' while leaving
-# 'extra-portability' intact.
-AUTOMAKE_fails -Wextra-portability -Wno-portability-recursive
-grep 'requires.*AM_PROG_AR' stderr
-grep 'recursive variable expansion' stderr && Exit 1
-
-# Disabling 'portability' disables 'portability-recursive' and
-# 'extra-portability'.
-$AUTOMAKE -Wextra-portability -Wno-portability
-
-:
diff --git a/tests/extra.test b/tests/extra.test
deleted file mode 100755
index 134e875..0000000
--- a/tests/extra.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure EXTRA_ targets are generated.  This test used to
-# make sure the targets were *not* generated.  That is wrong; the
-# targets should always be generated.  However, they should not be
-# built by default.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = @foo@
-EXTRA_PROGRAMS = zardoz
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep "^zardoz" Makefile.in
-
-# Can't have EXTRA clean rules.
-grep 'clean.*EXTRA' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/extra10.test b/tests/extra10.test
deleted file mode 100755
index 7bd6556..0000000
--- a/tests/extra10.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that wildcards in EXTRA_DIST are honoured.
-# Suggested by observations from Braden McDaniel.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-EXTRA_DIST=*.foo
-.PHONY: test
-test: distdir
-       diff a.foo $(distdir)/a.foo
-       diff b.foo $(distdir)/b.foo
-       test ! -r $(distdir)/c.bar
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-echo aaa > a.foo
-echo bbb > b.foo
-echo ccc > c.foo
-./configure
-$MAKE test
diff --git a/tests/extra11.test b/tests/extra11.test
deleted file mode 100755
index a0c55ca..0000000
--- a/tests/extra11.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for more complex usage of wildcards in EXTRA_DIST.
-# Suggested by observations from Braden McDaniel.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-EXTRA_DIST = [!c-z].t d.t [ab].dir foo.* *zardoz*
-
-.PHONY: prereq
-prereq:
-       echo a > a.t
-       echo b > b.t
-       echo c > c.t
-       echo d > d.t
-       echo m > m.t
-       echo z > z.t
-       mkdir a.dir b.dir c.dir
-       echo a1 > a.dir/f1
-       echo a2 > a.dir/f2
-       echo bb > b.dir/f
-       echo cc > c.dir/x
-       echo 0 > foo
-       echo 1 > foo.x
-       echo 2 > foo.bar
-       echo foo > _zardoz_
-
-.PHONY: test
-test: distdir
-       diff a.t $(distdir)/a.t
-       diff b.t $(distdir)/b.t
-       test ! -r $(distdir)/c.t
-       diff d.t $(distdir)/d.t
-       test ! -r $(distdir)/m.t
-       test ! -r $(distdir)/z.t
-       diff a.dir/f1 $(distdir)/a.dir/f1
-       diff a.dir/f2 $(distdir)/a.dir/f2
-       diff b.dir/f $(distdir)/b.dir/f
-       test ! -r $(distdir)/c.dir
-       diff foo.x $(distdir)/foo.x
-       diff foo.bar $(distdir)/foo.bar
-       test ! -r $(distdir)/foo
-       diff _zardoz_ $(distdir)/_zardoz_
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE prereq
-ls -l . *.dir
-$MAKE test
diff --git a/tests/extra12.test b/tests/extra12.test
deleted file mode 100755
index db3bcc7..0000000
--- a/tests/extra12.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that wildcards in elements of EXTRA_DIST are honoured when
-# $srcdir != $builddir, if properly declared.
-# Suggested by observations from Braden McDaniel.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-
-cat > Makefile.am <<'END'
-EXTRA_DIST = *.foo $(srcdir)/*.foo $(builddir)/*.bar $(srcdir)/*.bar
-
-.PHONY: test
-test: distdir
-       ls -l $(srcdir) $(builddir) $(distdir)
-       diff $(srcdir)/a.foo $(distdir)/a.foo
-       diff $(srcdir)/b.bar $(distdir)/b.bar
-       diff $(builddir)/c.foo $(distdir)/c.foo
-       diff $(builddir)/d.bar $(distdir)/d.bar
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-echo aaa > a.foo
-echo bbb > b.bar
-mkdir build
-echo ccc > build/c.foo
-echo ddd > build/d.bar
-
-cd build
-../configure
-$MAKE test
diff --git a/tests/extra2.test b/tests/extra2.test
deleted file mode 100755
index e6c85a0..0000000
--- a/tests/extra2.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_foo_SOURCES not defined unnecessarily.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep EXTRA_foo_SOURCES Makefile.in && Exit 1
-Exit 0
diff --git a/tests/extra3.test b/tests/extra3.test
deleted file mode 100755
index aea67bc..0000000
--- a/tests/extra3.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DATA not required.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AC_SUBST(CODICIL)' >> configure.in
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/extra4.test b/tests/extra4.test
deleted file mode 100755
index cf5e4a6..0000000
--- a/tests/extra4.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DATA can be specified.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AC_SUBST(CODICIL)' >> configure.in
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-EXTRA_DATA = codicil.txt
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/extra5.test b/tests/extra5.test
deleted file mode 100755
index ebdda32..0000000
--- a/tests/extra5.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DIST can contain a directory from $buildir.
-# From Dean Povey.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-EXTRA_DIST=foo
-
-foo:
-       mkdir foo
-       touch foo/bar
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-mkdir build
-cd build
-../configure
-$MAKE distdir
diff --git a/tests/extra6.test b/tests/extra6.test
deleted file mode 100755
index 0dbf735..0000000
--- a/tests/extra6.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DIST can contain a directory or
-# a subdirectory, in $(builddir) or $(srcdir).
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-EXTRA_DIST=foo/bar baz foo2/bar2 baz2
-
-check: distdir
-       test -f $(distdir)/foo/bar/baz
-       test -f $(distdir)/baz/foo
-       test -f $(distdir)/foo2/bar2/baz2
-       test -f $(distdir)/baz2/foo2
-END
-
-# Create some files in $(srcdir)
-mkdir foo
-mkdir foo/bar
-touch foo/bar/baz
-mkdir baz
-touch baz/foo
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-mkdir build
-cd build
-../configure
-
-# Create some files in $(builddir)
-mkdir foo2
-mkdir foo2/bar2
-touch foo2/bar2/baz2
-mkdir baz2
-touch baz2/foo2
-
-$MAKE check
diff --git a/tests/extra7.test b/tests/extra7.test
deleted file mode 100755
index 233cb0f..0000000
--- a/tests/extra7.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure that when distdir is invoked in a VPATH
-# configuration and has to distribute directory X, it actually merge
-# $(srcdir)/X and ./X, with the files from the later overriding the
-# files from the former.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-EXTRA_DIST=foo/bar baz
-
-check: distdir
-       test -f $(distdir)/foo/bar/baz
-       test -f $(distdir)/foo/bar/baz2
-       test -f $(distdir)/baz/foo
-       test -f $(distdir)/baz/foo2
-       grep source $(distdir)/foo/bar/baz
-       grep build $(distdir)/foo/bar/baz2
-       grep source $(distdir)/baz/foo
-       grep build $(distdir)/baz/foo2
-END
-
-# Create some files in $(srcdir)
-mkdir foo
-mkdir foo/bar
-echo source > foo/bar/baz
-echo source > foo/bar/baz2
-mkdir baz
-echo source > baz/foo
-echo source > baz/foo2
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-mkdir build
-cd build
-../configure
-
-# Create some files in $(builddir) that will override part of the
-# files if $(srcdir) when the distribution is made.
-mkdir foo
-mkdir foo/bar
-echo build > foo/bar/baz2
-mkdir baz
-echo build > baz/foo2
-
-$MAKE check
diff --git a/tests/extra8.test b/tests/extra8.test
deleted file mode 100755
index eb9f9a1..0000000
--- a/tests/extra8.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
-# and that referring to the same program with inconsistent addition
-# of $(EXEEXT) works, too.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-cat >Makefile.am <<'END'
-EXTRA_PROGRAMS = foo bar
-bin_PROGRAMS = $(EXTRA_PROGRAMS) baz
-noinst_PROGRAMS = baz$(EXEEXT)
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/extradep.test b/tests/extradep.test
deleted file mode 100755
index cdcb5e8..0000000
--- a/tests/extradep.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test EXTRA_*_DEPENDENCIES.  See extradep2 for libtool variant.
-
-required=cc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_SUBST([deps], [bardep])
-AM_CONDITIONAL([COND], [test -n "$cond"])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libfoo.a
-EXTRA_libfoo_a_DEPENDENCIES = libfoodep
-libfoodep:
-       @echo making $@
-       @: > $@
-CLEANFILES = libfoodep
-
-bin_PROGRAMS = foo bar
-EXTRA_foo_DEPENDENCIES = foodep
-if COND
-EXTRA_foo_DEPENDENCIES += foodep2
-endif
-bar_LDADD = libfoo.a
-EXTRA_bar_DEPENDENCIES = $(deps)
-
-EXTRA_DIST = foodep bardep
-
-.PHONY: bar-has-been-updated
-bar-has-been-updated:
-       stat older bar$(EXEEXT) libfoo.a || : For debugging.
-       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
-END
-
-cat >libfoo.c <<'END'
-int libfoo () { return 0; }
-END
-
-cat >foo.c <<'END'
-int main () { return 0; }
-END
-
-cat >bar.c <<'END'
-extern int libfoo ();
-int main () { return libfoo (); }
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure cond=yes
-
-# Hypotheses:
-#  - EXTRA_*_DEPENDENCIES are honored.
-#  - Conditionals and substitutions are honored.
-#  - *_DEPENDENCIES are not overwritten by their EXTRA_* counterparts.
-
-: >foodep
-: >foodep2
-: >bardep
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'making libfoodep' stdout
-
-rm -f foodep
-$MAKE && Exit 1
-: >foodep
-
-rm -f foodep2
-$MAKE && Exit 1
-: >foodep2
-
-rm -f bardep
-$MAKE && Exit 1
-: >bardep
-
-$MAKE
-: > older
-$sleep
-touch libfoo.a
-$MAKE
-$MAKE bar-has-been-updated
-
-$MAKE distcheck
-
-:
diff --git a/tests/extradep2.test b/tests/extradep2.test
deleted file mode 100755
index 8f3f0cf..0000000
--- a/tests/extradep2.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test EXTRA_*_DEPENDENCIES, libtool version; see extradep.test.
-
-required='cc libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_SUBST([deps], [bardep])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LTLIBRARIES = libfoo.la
-EXTRA_libfoo_la_DEPENDENCIES = libfoodep
-libfoodep:
-       @echo making $@
-       @: > $@
-CLEANFILES = libfoodep
-
-bin_PROGRAMS = bar
-bar_LDADD = libfoo.la
-EXTRA_bar_DEPENDENCIES = $(deps)
-
-EXTRA_DIST = bardep
-
-.PHONY: bar-has-been-updated
-bar-has-been-updated:
-       stat older bar$(EXEEXT) libfoo.la || : For debugging.
-       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
-END
-
-cat >libfoo.c <<'END'
-int libfoo () { return 0; }
-END
-
-cat >bar.c <<'END'
-extern int libfoo ();
-int main () { return libfoo (); }
-END
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-
-# Hypothesis: EXTRA_*_DEPENDENCIES are honored.
-
-: >foodep
-: >foodep2
-: >bardep
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'making libfoodep' stdout
-
-rm -f bardep
-$MAKE && Exit 1
-: >bardep
-
-$MAKE
-: > older
-$sleep
-touch libfoo.la
-$MAKE
-$MAKE bar-has-been-updated
-
-$MAKE distcheck
-
-:
diff --git a/tests/f90only.test b/tests/f90only.test
deleted file mode 100755
index 83b9767..0000000
--- a/tests/f90only.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure programs with only Fortran 90 source are handled properly.
-# (copied from fonly.test) Mike Nolta <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_FC
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.f90
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'zardoz.f90' Makefile.in
diff --git a/tests/flavor.test b/tests/flavor.test
deleted file mode 100755
index a7e8f77..0000000
--- a/tests/flavor.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure flavors like `cygnus', `gnu', `gnits' and command line
-# options like `--ignore-deps' and `--silent-rules' are preserved across
-# automake reruns.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-AC_OUTPUT
-END
-
-: > Makefile.am
-: > NEWS
-: > README
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-$AUTOCONF
-# Order flavors so that all needed files are installed early.
-for flavor in --gnits --gnu --foreign --cygnus --ignore-deps
-do
-  $AUTOMAKE --add-missing $flavor
-  ./configure --enable-maintainer-mode
-  grep " $flavor" Makefile
-  $MAKE
-
-  # Two code paths in configure.am:
-  # - either a file in $(am__configure_deps) has been updated ...
-  $sleep
-  touch aclocal.m4
-  $MAKE
-  grep " $flavor" Makefile
-
-  # - ... or not; i.e., Makefile.am or an included file has.
-  $sleep
-  touch Makefile.am
-  $MAKE
-  grep " $flavor" Makefile
-done
-
-:
diff --git a/tests/flibs.test b/tests/flibs.test
deleted file mode 100755
index d35c4c6..0000000
--- a/tests/flibs.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `AC_F77_LIBRARY_LDFLAGS' works properly.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-AC_F77_LIBRARY_LDFLAGS
-END
-
-# Tue Aug 11 09:50:48 1998  Matthew D. Langston  <address@hidden>
-#
-# This test currently fails with automake v. 1.3 since automake assumes
-# that elements of `bin_PROGRAMS' (e.g. zardoz) without a corresponding
-# `_SOURCES' (e.g. zardoz_SOURCES) should be compiled from `zardoz.c'
-# whether or not `zardoz.c' actually exists.  For example, even if the
-# file `zardoz.c' doesn't exist but the file `zardoz.f' does exist, this
-# tests would still fail.
-#
-# Therefore, for now I have put in the line `zardoz_SOURCES = zardoz.f'
-# (see below) so that automake's top-level `make check' won't fail, but
-# this line should be removed once automake handles this situation
-# correctly.
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.f
-zardoz_LDADD = @FLIBS@
-END
-
-: > zardoz.f
-: > config.guess
-: > config.sub
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '@FLIBS@' Makefile.in
diff --git a/tests/fn99.test b/tests/fn99.test
deleted file mode 100755
index a63f2ca..0000000
--- a/tests/fn99.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2008, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check the filename-length-max=99 option.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = filename-length-max=99
-EXTRA_DIST = 12345678
-END
-
-(for i in 1 2 3 4 5 6 7 8 9
-do
-  mkdir -p 12345678 || Exit 77
-  cd 12345678
-  touch x
-done) || Exit 77
-
-# AIX 5.3 `cp -R' is too buggy for `make dist'.
-cp -R 12345678 t || Exit 77
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE distcheck
-
-(for i in 1 2 3 4 5 6 7 8 9 10 11
-do
-  mkdir -p 12345678 || Exit 77
-  cd 12345678
-  touch x
-done) || Exit 77
-
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'filenames are too long' stderr
-test 2 = `grep 12345678 stderr | wc -l`
-:
diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test
deleted file mode 100755
index 33ac663..0000000
--- a/tests/fn99subdir.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# PR 507: Check the filename-length-max=99 option
-# in conjunction with AC_CONFIG_SUBDIRS.
-
-. ./defs || Exit 1
-
-set -e
-
-# The name is so that 99 is exactly hit (including final \0).
-subdirname='cnfsubdir'
-
-cat >>configure.in <<END
-AC_CONFIG_SUBDIRS([${subdirname}])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<END
-AUTOMAKE_OPTIONS = filename-length-max=99
-SUBDIRS = ${subdirname}
-END
-
-mkdir ${subdirname} || Exit 1
-
-cat >> ${subdirname}/configure.in <<EOF
-AC_INIT([${subdirname}], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-cat >${subdirname}/Makefile.am <<'END'
-AUTOMAKE_OPTIONS = filename-length-max=99
-EXTRA_DIST = 12345678
-END
-
-(cd ${subdirname}; for i in 1 2 3 4 5 6 7 8
-do
-  mkdir -p 12345678 || Exit 77
-  cd 12345678
-  touch x
-done)
-
-# AIX 5.3 `cp -R' is too buggy for `make dist'.
-cp -R ${subdirname} t || Exit 77
-
-for init_dir in ${subdirname} .; do
-       (
-               cd ${init_dir} || Exit 1
-               $ACLOCAL
-               $AUTOCONF
-               $AUTOMAKE
-       ) || Exit 1
-done
-./configure
-$MAKE distcheck
-
-(cd ${subdirname}; for i in 1 2 3 4 5 6 7 8 9
-do
-  mkdir -p 12345678 || Exit 77
-  cd 12345678
-  touch x
-done)
-
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'filenames are too long' stderr
-test 1 = `grep 12345678 stderr | wc -l`
-:
diff --git a/tests/fnoc.test b/tests/fnoc.test
deleted file mode 100755
index d2d521c..0000000
--- a/tests/fnoc.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that pure Fortran 77 sources don't include
-# C-specific code.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.f jane.f
-END
-
-: > doe.f
-: > jane.f
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1
-Exit 0
diff --git a/tests/fo.test b/tests/fo.test
deleted file mode 100755
index 93d7d3f..0000000
--- a/tests/fo.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Fortran 77 files are rewritten to ".o" and not just "o".
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-sbin_PROGRAMS = anonymous
-anonymous_SOURCES = doe.f
-END
-
-: > doe.f
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/fonly.test b/tests/fonly.test
deleted file mode 100755
index b93b602..0000000
--- a/tests/fonly.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure programs with only Fortran 77 source are handled properly.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.f
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'zardoz.f' Makefile.in
diff --git a/tests/forcemiss.test b/tests/forcemiss.test
deleted file mode 100755
index 4b9f63c..0000000
--- a/tests/forcemiss.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that `automake --force-missing' works.
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f install-sh
-
-echo zot > install-sh
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE --add-missing --force-missing
-
-ls -l install-sh
-test -f install-sh
-grep zot install-sh && Exit 1
-
-:
diff --git a/tests/forcemiss2.test b/tests/forcemiss2.test
deleted file mode 100755
index 408ea8a..0000000
--- a/tests/forcemiss2.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that `automake --force-missing' works, even with
-# symlinked files.
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f install-sh
-
-echo zot > foo
-cp foo foo2
-
-ln -s foo2 install-sh || {
-  echo "$me: cannot create symlinks to files" >&2
-  Exit 77
-}
-
-: > Makefile.am
-
-$ACLOCAL
-ls -l install-sh
-$AUTOMAKE --add-missing --force-missing
-ls -l install-sh
-
-test -f install-sh
-grep zot install-sh && Exit 1
-diff foo foo2
-
-:
diff --git a/tests/fort1.test b/tests/fort1.test
deleted file mode 100755
index 930ae02..0000000
--- a/tests/fort1.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that Automake suggests using AC_PROG_F77/FC if Fortran sources
-# are used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am <<END
-bin_PROGRAMS = hello
-hello_SOURCES = hello.f foo.f95
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AC_PROG_F77 stderr
-grep AC_PROG_FC stderr
diff --git a/tests/fort2.test b/tests/fort2.test
deleted file mode 100755
index 70d13f2..0000000
--- a/tests/fort2.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that AC_FC_SRCEXT(f9x) works as intended:
-# - $(FCFLAGS_f) will be used
-
-# Cf. fort1.test and link_f90_only.test.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'END'
-AC_PROG_FC
-AC_FC_SRCEXT([f90])
-AC_FC_SRCEXT([f95])
-AC_FC_SRCEXT([f03])
-AC_FC_SRCEXT([f08])
-AC_FC_SRCEXT([blabla])
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello goodbye
-hello_SOURCES = hello.f90 foo.f95 sub/bar.f95 hi.f03 sub/howdy.f03 greets.f08 
sub/bonjour.f08
-goodbye_SOURCES = bye.f95 sub/baz.f90
-goodbye_FCFLAGS =
-END
-
-$ACLOCAL
-$AUTOMAKE
-# The following tests aren't fool-proof, but they don't
-# need a Fortran compiler.
-grep '.\$(LINK)'       Makefile.in && Exit 1
-grep '.\$(FCLINK)'     Makefile.in
-grep '.\$(FCCOMPILE)'  Makefile.in > stdout
-cat stdout
-grep -v '\$(FCFLAGS_f' stdout && Exit 1
-grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
-# Notice the TAB:
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f90' Makefile.in
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f95).*\.f95' Makefile.in
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f03).*\.f03' Makefile.in
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f08).*\.f08' Makefile.in
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && Exit 1
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && Exit 1
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && Exit 1
-grep '^[       ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && Exit 1
-:
diff --git a/tests/fort4.test b/tests/fort4.test
deleted file mode 100755
index 84df399..0000000
--- a/tests/fort4.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test mixing Fortran 77 and Fortran (FC).
-
-# For now, require the GNU compilers (to avoid some Libtool/Autoconf
-# issues).
-required='g77 gfortran'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >hello.f <<'END'
-      program hello
-      call foo
-      call bar
-      stop
-      end
-END
-
-cat >bye.f90 <<'END'
-program goodbye
-  call baz
-  stop
-end
-END
-
-cat >foo.f90 <<'END'
-      subroutine foo
-      return
-      end
-END
-
-sed s,foo,bar, foo.f90 > sub/bar.f90
-sed s,foo,baz, foo.f90 > sub/baz.f
-
-cat >>configure.in <<'END'
-AC_PROG_F77
-AC_PROG_FC
-AC_FC_SRCEXT([f90], [],
-  [AC_MSG_FAILURE([$FC compiler cannot create executables], 77)])
-AC_FC_LIBRARY_LDFLAGS
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello goodbye
-hello_SOURCES = hello.f foo.f90 sub/bar.f90
-goodbye_SOURCES = bye.f90 sub/baz.f
-goodbye_FCFLAGS =
-LDADD = $(FCLIBS)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-# The Fortran 77 linker should be preferred:
-grep '.\$(FCLINK)' Makefile.in && Exit 1
-
-$AUTOCONF
-# configure may Exit 77 if no compiler is found,
-# or if the compiler cannot compile Fortran 90 files).
-./configure
-$MAKE
-subobjs=`echo sub/*.o sub/*.obj`
-test "$subobjs" = 'sub/*.o sub/*.obj'
-$MAKE distcheck
-
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE
-./configure
-$MAKE
-test ! -f bar.o
-test ! -f bar.obj
-test ! -f baz.o
-test ! -f baz.obj
-test ! -f goodbye-baz.o
-test ! -f goodbye-baz.obj
-$MAKE distcheck
diff --git a/tests/fort5.test b/tests/fort5.test
deleted file mode 100755
index cc93403..0000000
--- a/tests/fort5.test
+++ /dev/null
@@ -1,108 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test mixing Fortran 77 and Fortran (FC), libtool version.
-
-# For now, require the GNU compilers (to avoid some Libtool/Autoconf
-# issues).
-required='libtoolize g77 gfortran'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >hello.f <<'END'
-      program hello
-      call foo
-      call bar
-      call goodbye
-      stop
-      end
-END
-
-cat >bye.f90 <<'END'
-subroutine goodbye
-  call baz
-  return
-end
-END
-
-cat >foo.f90 <<'END'
-      subroutine foo
-      return
-      end
-END
-
-sed s,foo,bar, foo.f90 > sub/bar.f90
-sed s,foo,baz, foo.f90 > sub/baz.f
-
-cat >>configure.in <<'END'
-AC_PROG_F77
-AC_PROG_FC
-AC_FC_SRCEXT([f90], [],
-  [AC_MSG_FAILURE([$FC compiler cannot create executables], 77)])
-AC_FC_LIBRARY_LDFLAGS
-AM_PROG_AR
-LT_PREREQ([2.0])
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello
-lib_LTLIBRARIES = libhello.la
-noinst_LTLIBRARIES = libgoodbye.la
-hello_SOURCES = hello.f
-hello_LDADD = libhello.la
-libhello_la_SOURCES = foo.f90 sub/bar.f90
-libhello_la_LIBADD = libgoodbye.la
-libgoodbye_la_SOURCES = bye.f90 sub/baz.f
-libgoodbye_la_FCFLAGS =
-LDADD = $(FCLIBS)
-END
-
-libtoolize --force
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-# This test requires Libtool >= 2.0.  Earlier Libtool does not
-# have the LT_PREREQ macro to cause autoconf failure, so let's
-# skip in this case:
-grep LT_PREREQ configure && Exit 77
-
-# Ensure we use --tag for f90, too.
-grep " --tag=FC" Makefile.in
-
-# configure may Exit 77 if no compiler is found,
-# or if the compiler cannot compile Fortran 90 files).
-./configure
-$MAKE
-subobjs=`echo sub/*.lo`
-test "$subobjs" = 'sub/*.lo'
-$MAKE distcheck
-
-# The following will be fixed in a later patch:
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE -a
-./configure
-$MAKE
-test ! -f bar.lo
-test ! -f baz.lo
-test ! -f libgoodbye_la-baz.lo
-$MAKE distcheck
diff --git a/tests/fortdep.test b/tests/fortdep.test
deleted file mode 100755
index 585e7c1..0000000
--- a/tests/fortdep.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dependency tracking doesn't interfere with Fortran.
-# For PR 75.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SRCDIR([foo.f])
-AC_PROG_F77
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS=foo
-foo_SOURCES=foo.f
-END
-
-: > foo.f
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'foo\.Po' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/gcj.test b/tests/gcj.test
deleted file mode 100755
index c32a1b2..0000000
--- a/tests/gcj.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of compiled java.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-AC_SUBST(GCJ)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = x/y/convert.java
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^x/y/convert' Makefile.in
diff --git a/tests/gcj2.test b/tests/gcj2.test
deleted file mode 100755
index 3e3af60..0000000
--- a/tests/gcj2.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `..' invalid in subdir .o's.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-AC_SUBST(GCJ)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = x/../convert.java
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:.*\.\.' stderr
diff --git a/tests/gcj3.test b/tests/gcj3.test
deleted file mode 100755
index 7d8a981..0000000
--- a/tests/gcj3.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure dependency tracking works for java.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-AC_SUBST(GCJ)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = x/y/convert.java
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-num=`grep depcomp Makefile.in | wc -l`
-test $num -gt 1
diff --git a/tests/gcj4.test b/tests/gcj4.test
deleted file mode 100755
index f3828ea..0000000
--- a/tests/gcj4.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure dependency tracking works for Java.
-
-required=gcj
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AM_PROG_GCJ
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = convert.java
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure >stdout
-cat stdout
-
-# Configure must be checking the dependency style of gcj ...
-grep 'dependency style of gcj' stdout >filt
-cat filt
-
-# ... only once.
-test `wc -l < filt` = 1
-
-# Accept any outcome but `none'
-# (at the time of writing it should be gcc or gcc3).
-grep -v none filt
diff --git a/tests/gcj5.test b/tests/gcj5.test
deleted file mode 100755
index 6ef171d..0000000
--- a/tests/gcj5.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake suggests AM_PROG_GCJ when GCJ is needed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = convert.java
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PROG_GCJ stderr
diff --git a/tests/gcj6.test b/tests/gcj6.test
deleted file mode 100755
index be5f49c..0000000
--- a/tests/gcj6.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
-
-required='gcj'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_GCJ
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = test
-test_SOURCES = Test.java
-test_LDFLAGS = --main=Test
-END
-
-cat >Test.java << 'END'
-public class Test {
-    public static void main(String[] argv) {
-        System.out.println("Hello, automake!");
-    }
-}
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-
-# These fail without e.g., AC_PROG_CC.
-$MAKE
-grep "OBJEXT = " Makefile
-grep "EXEEXT = " Makefile
-
-:
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
deleted file mode 100755
index fa51327..0000000
--- a/tests/gen-parallel-tests
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Generate parallel-tests.am.
-#
-# Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# For each automake test case that checks features of the TESTS automake
-# interface, generate a sibling test that does likewise, but with the
-# option `parallel-tests' enabled.  Individual tests can prevent the
-# creation of such a sibling by explicitly setting the `$parallel_tests'
-# variable to either "yes" or "no".  The rationale for this is that if
-# the variable is set to "yes", the test already uses the `parallel-tests'
-# option, so that a sibling would be just a duplicate; while if the
-# variable is set to "no", the test doesn't support, or is not meant to
-# run with, the `parallel-tests' option, and forcing it to do so in the
-# sibling would likely cause a spurious failure.
-
-set -e
-
-tests=`sed -n '/^handwritten_TESTS *=/,$p' <list-of-tests.mk \
-         | sed -n 's/\(.*\.test\).*/\1/p'`
-{
-  grep -l '^TESTS ' $tests
-  grep -l ' TESTS ' $tests
-} |
-grep -v '.-p\.test' |
-LC_ALL=C sort -u |
-while read tst; do
-  if grep '^[^#]*parallel-tests' $tst >/dev/null \
-     || grep "parallel_tests=" $tst >/dev/null
-  then :; else echo $tst; fi;
-done |
-{
-  echo "## Generated by gen-parallel-tests.  Edit Makefile.am instead of this."
-  echo "parallel_tests = \\"
-  sed 's,\.test$,-p.test,; $!s,$, \\,'
-}
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
deleted file mode 100755
index cbcf076..0000000
--- a/tests/get-sysconf.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Dummy test case, aimed at reporting useful system information in the
-# final `test-suite.log'.  This way, if a user experiences a failure in
-# the Automake test suite and then only sends us the `test-suite.log',
-# we won't have to ask him for more information to start analyzing the
-# failure (that had happened too many times in the past!).
-
-. ./defs || Exit 1
-
-set -e
-
-# FIXME: remove these once we are merged into master.
-top_testsrcdir=$testsrcdir/..
-testbuilddir=`(cd .. && pwd)`
-top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
-
-st=0
-if test -d "$top_testsrcdir"/.git; then
-  # We are running from a git checkout.
-  (cd "$top_testsrcdir" && git log -1) || st=1
-elif test -f "$top_testsrcdir"/ChangeLog; then
-  # We are probably running from a distribution tarball.
-  awk '
-    BEGIN { first = 1 }
-    (first == 1) { print; first = 0; next; }
-    /^[^\t]/ { exit(0); }
-    { print }
-  ' "$top_testsrcdir"/ChangeLog || st=1
-else
-  # Some non-common but possibly valid setup (see for example the Homebrew
-  # problem reported in automake bug#10866); so just give an harmless
-  # warning instead of failing.
-  warn_ "no .git directory nor ChangeLog file found, some info won't" \
-        "be available"
-fi
-$PERL -V || st=1
-cat "$top_testbuilddir/config.log" || st=1
-cat "$testbuilddir/aclocal-$APIVERSION" || st=1
-cat "$testbuilddir/automake-$APIVERSION" || st=1
-
-if test $st -eq 0; then
-  # This test SKIPs, so that all the information it has gathered and
-  # printed will get unconditionally copied into the `test-suite.log'
-  # file.
-  Exit 77
-fi
-
-# Some unexpected error occurred; this must be reported as an hard
-# error by the testsuite driver.
-Exit 99
diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test
deleted file mode 100755
index 03efe85..0000000
--- a/tests/gettext-macros.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Try to find the gettext `.m4' files and make them easily accessed
-# to the test cases requiring them.
-# See also automake bug#9807.
-
-. ./defs || Exit 1
-
-extract_program_version ()
-{
-  "$1" --version | sed 1q | $PERL -ne '/(\d(?:\.\d+)+)/ and print "$1\n"'
-}
-
-echo "# Automatically generated by $me." > get.sh
-echo : >> get.sh
-
-# The `gettextize' and `autopoint' scripts will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
-
-# Prefer autopoint to gettextize, since the more modern versions of the
-# latter might unconditionally require user interaction to complete;
-# yes, this means confirmation from /dev/tty (!) -- see:
-#  <http://lists.gnu.org/archive/html/bug-gettext/2011-12/msg00000.html>
-# Since this "forced interaction" behaviour of gettextize wasn't present
-# before the introduction of autopoint, we should be able to safely
-# fall back to calling gettextize non-interactively if autopoint is not
-# present.
-if autopoint --version; then
-  am_gettextize_command=autopoint
-else
-  am_gettextize_command=gettextize
-fi
-
-# We will need to specify the correct autopoint (or gettextize) version
-# in the AM_GNU_GETTEXT_VERSION call in configure.in if we want autopoint
-# (or gettextize) to setup the correct infrastructure -- in particular,
-# for what concerns us, to bring in all the required .m4 files.
-autopoint_version=`extract_program_version $am_gettextize_command` \
-  && test -n "$autopoint_version" \
-  || autopoint_version=0.10.35
-
-cat > configure.in <<END
-AC_INIT([foo], [1.0])
-AC_PROG_CC
-# Both required by autopoint.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([$autopoint_version])
-END
-
-if $am_gettextize_command --force && test -f m4/gettext.m4; then
-  echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
-  echo "export ACLOCAL_PATH" >> get.sh
-else
-  # Older versions of gettext might not have a gettextize program
-  # available, but this doesn't mean the user hasn't made the gettext
-  # macros available, e.g., by properly setting ACLOCAL_PATH.
-  rm -rf m4
-  mkdir m4
-  # See below for an explanation about the use the of `-Wno-syntax'.
-  if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/gettext.m4; then
-    : # Gettext macros already accessible by default.
-  else
-    echo "skip_ \"couldn't find or get gettext macros\"" >> get.sh
-  fi
-fi
-
-. ./get.sh
-
-$ACLOCAL --force -I m4 || cat >> get.sh <<'END'
-# We need to use `-Wno-syntax', since we do not want our test suite
-# to fail merely because some third-party `.m4' file is underquoted.
-ACLOCAL="$ACLOCAL -Wno-syntax"
-END
-
-# The file gettextize or autopoint might have copied in the `m4'
-# subdirectory of the test directory are going to be needed by
-# other tests, so we must not remove the test directory.
-keep_testdirs=yes
-
-:
diff --git a/tests/gettext.test b/tests/gettext.test
deleted file mode 100755
index b0bb2d2..0000000
--- a/tests/gettext.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check gettext support.
-
-required='gettext'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.3])
-AC_OUTPUT
-END
-
-: >Makefile.am
-mkdir po intl
-
-# config.rpath is required by versions >= 0.14.3.  We try to verify
-# this requirement, but only when we find we have a working and recent
-# gettext installation.
-
-# If aclocal fails here, it may be that gettext is too old to
-# provide AM_GNU_GETTEXT_VERSION.
-if $ACLOCAL; then
-
-  # autopoint will fail if it's from an older version.
-  # If gettext is too old to provide autopoint, this will
-  # fail as well, so we're safe here.
-  if autopoint -n; then
-    AUTOMAKE_fails --add-missing
-    grep 'required.*config.rpath' stderr
-  fi
-fi
-
-: >config.rpath
-sed '/AM_GNU_GETTEXT_VERSION/d' configure.in >configure.int
-mv -f configure.int configure.in
-
-$ACLOCAL
-
-# po/ and intl/ are required
-
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
-
-echo 'SUBDIRS = po' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*intl' stderr
-
-echo 'SUBDIRS = intl' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*po' stderr
-
-# Ok.
-
-echo 'SUBDIRS = po intl' >Makefile.am
-$AUTOMAKE --add-missing
-
-# Make sure distcheck runs ./configure --with-included-gettext
-grep 'with-included-gettext' Makefile.in
-
-# `SUBDIRS = po intl' isn't required if po/ doesn't exist.
-# PR/381.
-
-rmdir po
-mkdir sub
-echo 'SUBDIRS = sub' >Makefile.am
-$AUTOMAKE
-
-# Still, SUBDIRS must be defined.
-
-: >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
diff --git a/tests/gettext2.test b/tests/gettext2.test
deleted file mode 100755
index a8c95ad..0000000
--- a/tests/gettext2.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check gettext `external' support.
-# PR/338, reported by Charles Wilson.
-
-required='gettext'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AM_GNU_GETTEXT([external])
-AC_OUTPUT
-END
-
-: >Makefile.am
-mkdir foo po
-
-$ACLOCAL
-
-# config.rpath is required.
-: >config.rpath
-
-# po/ is required, but intl/ isn't.
-
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
-
-echo 'SUBDIRS = foo' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*po' stderr
-
-# Ok.
-
-echo 'SUBDIRS = po' >Makefile.am
-$AUTOMAKE --add-missing
-
-# Don't try running ./configure --with-included-gettext if the
-# user is using AM_GNU_GETTEXT([external]).
-grep 'with-included-gettext' Makefile.in && Exit 1
-
-# intl/ isn't wanted with AM_GNU_GETTEXT([external]).
-
-mkdir intl
-echo 'SUBDIRS = po intl' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'intl.*AM_GNU_GETTEXT' stderr
-
-:
diff --git a/tests/gettext3.test b/tests/gettext3.test
deleted file mode 100755
index a25af87..0000000
--- a/tests/gettext3.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check gettext `AM_GNU_GETTEXT_INTL_SUBDIR' support.
-
-required='gettext'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_INTL_SUBDIR
-AC_OUTPUT
-END
-
-echo 'SUBDIRS = po' >Makefile.am
-mkdir po
-
-# if aclocal fails, assume the gettext macros are too old and do not
-# define AM_GNU_GETTEXT_INTL_SUBDIR.
-$ACLOCAL || Exit 77
-
-# config.rpath is required.
-: >config.rpath
-
-# intl/ is required.
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
-
-mkdir intl
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
-
-echo 'SUBDIRS = po intl' > Makefile.am
-$AUTOMAKE --add-missing
diff --git a/tests/gnits.test b/tests/gnits.test
deleted file mode 100755
index 897d0ab..0000000
--- a/tests/gnits.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure --gnits version checking is correct.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [3.5.3.2])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES(Makefile)
-END
-
-cat > Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-# Files required by Gnits.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-AUTOMAKE_fails --gnits
-grep 'configure.in:.*3\.5\.3\.2' stderr
diff --git a/tests/gnits2.test b/tests/gnits2.test
deleted file mode 100755
index 4c5d54f..0000000
--- a/tests/gnits2.test
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure std-options checking is correct.
-
-required=gcc
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnits
-noinst_PROGRAMS = fubar2
-bin_PROGRAMS = fubar sub/fine
-nobase_bin_PROGRAMS = sub/fubar3
-fubar_SOURCES = fubar.c
-fubar2_SOURCES = fubar.c
-sub_fubar3_SOURCES = fubar.c
-sub_fine_SOURCES = fine.c
-bin_SCRIPTS = sub/scriptok.sh sub/scriptnok.sh
-
-grep-stderr:
-       grep 'pfubar$(EXEEXT) does not support' stderr
-       grep 'pfubar3$(EXEEXT) does not support' stderr
-       grep 'pscriptnok.sh does not support' stderr
-## Only three failures please.
-       test `grep 'does not support --help' stderr | wc -l` = 3
-       test `grep 'does not support --version' stderr | wc -l` = 3
-
-test-install: install
-       test -f ../inst-dir/bin/pfine$(EXEEXT)
-       test ! -f ../inst-dir/bin/fine$(EXEEXT)
-END
-
-echo 'int main () { return 0; }' > fubar.c
-
-cat > fine.c << 'END'
-#include <stdio.h>
-int
-main ()
-{
-  puts ("Which version? Which usage?");
-  return 0;
-}
-END
-
-mkdir sub
-
-cat >sub/scriptok.sh <<EOF
-#!/bin/sh
-echo "Which version? Which usage?"
-EOF
-
-# Not only does this script not support --help/--version, but
-# it will also hang when run without input.
-cat >sub/scriptnok.sh <<EOF
-#!/bin/sh
-cat
-EOF
-
-chmod +x sub/scriptok.sh
-chmod +x sub/scriptnok.sh
-
-# Files required by Gnits.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-# The following file should not be distributed.
-# (alpha.test checks the case where it must be distributed.)
-: > README-alpha
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-grep README-alpha Makefile.in && Exit 1
-
-mkdir build
-cd build
-
-# Use --program-prefix to make sure the std-options check honors it.
-../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
-$MAKE all
-$MAKE test-install
-$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
-cat stderr
-$MAKE grep-stderr
diff --git a/tests/gnits3.test b/tests/gnits3.test
deleted file mode 100755
index 7a08fb8..0000000
--- a/tests/gnits3.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
-
-required=gcc
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-# We use the same basename for all targets on purpose.  This way
-# we make sure that `AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = nok'
-# will not match anything containing `nok'.
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnits
-
-nobase_bin_PROGRAMS = nok sub/nok
-nok_SOURCES = nok.c
-sub_nok_SOURCES = nok.c
-
-nobase_bin_SCRIPTS = nok.sh sub/nok.sh
-
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = nok$(EXEEXT) nok.sh
-
-grep-stderr:
-       grep 'sub/pnok$(EXEEXT) does not support' stderr
-       grep 'sub/pnok.sh does not support' stderr
-## Only two failures please.
-       test `grep 'does not support --help' stderr | wc -l` = 2
-       test `grep 'does not support --version' stderr | wc -l` = 2
-END
-
-echo 'int main () { return 0; }' > nok.c
-
-mkdir sub
-
-cat >nok.sh <<EOF
-#!/bin/sh
-echo "Which version? Which usage?"
-exit 1
-EOF
-
-cp nok.sh sub/nok.sh
-
-chmod +x nok.sh
-chmod +x sub/nok.sh
-
-# Files required by Gnits.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir build
-cd build
-
-# Use --program-prefix to make sure the std-options check honors it.
-../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
-$MAKE
-$MAKE install
-$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
-cat stderr
-$MAKE grep-stderr
-
-# Make sure there is no more error when all targets are exempted.
-cd ..
-echo 'AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += sub/nok$(EXEEXT) sub/nok.sh' >> 
Makefile.am
-$AUTOMAKE
-cd build
-./config.status  # Don't rely on the rebuild rules (they need GNU make).
-$MAKE installcheck
diff --git a/tests/gnumake.test b/tests/gnumake.test
deleted file mode 100755
index 72bfa66..0000000
--- a/tests/gnumake.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Automake should not assume that make files are called Makefile.
-# Report from Braden McDaniel.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/GNUmakefile])
-AC_OUTPUT
-END
-
-mkdir sub
-
-echo SUBDIRS = sub > Makefile.am
-
-cat > sub/GNUmakefile.am <<'EOF'
-# In this project, the Makefile is an installed data file.
-dist_data_DATA = Makefile
-EOF
-
-echo 'this should not cause any problem' > sub/Makefile
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE distcheck
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
deleted file mode 100755
index 9c8aeb4..0000000
--- a/tests/gnuwarn.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that Automake warns about user variables being overridden.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-# Needed by --gnu.
-: > NEWS
-: > README
-: > AUTHORS
-: > ChangeLog
-
-cat > Makefile.am << 'END'
-CFLAGS += -I..
-LDFLAGS = -lfoo
-CXXFLAGS = -Wall
-bin_PROGRAMS = bar
-END
-
-$ACLOCAL
-# Don't warn in foreign mode
-$AUTOMAKE -Wnone --add-missing --foreign
-# Warn in gnu mode
-AUTOMAKE_fails -Wnone --add-missing --gnu
-grep 'Makefile.am:1:.*CFLAGS' stderr
-grep 'Makefile.am:2:.*LDFLAGS' stderr
-# No reason to warn about CXXFLAGS since it's not used.
-grep CXXFLAGS stderr && Exit 1
-# Don't warn if -Wno-gnu.
-$AUTOMAKE -Wnone --gnu -Wno-gnu
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
deleted file mode 100755
index 0227e3a..0000000
--- a/tests/gnuwarn2.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check diagnostics about no-installman being disallowed in `gnu'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([gnuwarn2], [1.0])
-AM_INIT_AUTOMAKE([no-installman])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-# --gnu files
-: > NEWS
-: > README
-: > AUTHORS
-: > ChangeLog
-: > COPYING
-: > INSTALL
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnu
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'configure.in:2:.*no-installman' stderr
diff --git a/tests/hdr-vars-defined-once.test b/tests/hdr-vars-defined-once.test
deleted file mode 100755
index 350f8fc..0000000
--- a/tests/hdr-vars-defined-once.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2005, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure header vars defined only once when including.
-# Report from Marcus G. Daniels.
-
-. ./defs || Exit 1
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-include foo
-END
-
-: > foo
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-len="`grep '^srcdir' Makefile.in | wc -l`"
-echo "len = $len"
-test $len -eq 1 || Exit 1
-
-# Also make sure include file is distributed.
-(sed -n -e '/^DIST_COMMON =.*\\$/ {
-   :loop
-   p
-   n
-   t clear
-   :clear
-   s/\\$/\\/
-   t loop
-   p
-   n
-   }' -e '/^DIST_COMMON =/ p' Makefile.in | grep foo)
diff --git a/tests/header.test b/tests/header.test
deleted file mode 100755
index 2ad2735..0000000
--- a/tests/header.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 68.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_SUBST(MY_HEADERS)
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zoo
-zoo_SOURCES = joe.c
-END
-
-: > joe.c
-: > qq.h
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'address@hidden' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/help-depend.test b/tests/help-depend.test
deleted file mode 100755
index e676e5e..0000000
--- a/tests/help-depend.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our private macro `AM_DEP_TRACK' adds proper text to
-# the configure help screen.
-# Keep this in sync with sister test `help-depend2.test'
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_DEP_TRACK
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$EGREP '^  *--enable-dependency-tracking( |$)' stdout
-$EGREP '^  *--disable-dependency-tracking( |$)' stdout
-$FGREP ' speeds up one-time build' stdout
-$FGREP ' slow dependency extract' stdout
-
-:
diff --git a/tests/help-depend2.test b/tests/help-depend2.test
deleted file mode 100755
index 6bad661..0000000
--- a/tests/help-depend2.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that when automake automatically activates support for
-# dependency tracking, it adds proper text to the configure help screen.
-# Keep this in sync with sister test `help-depend.test'
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$EGREP '^  *--enable-dependency-tracking( |$)' stdout
-$EGREP '^  *--disable-dependency-tracking( |$)' stdout
-$FGREP ' speeds up one-time build' stdout
-$FGREP ' slow dependency extract' stdout
-
-:
diff --git a/tests/help-dmalloc.test b/tests/help-dmalloc.test
deleted file mode 100755
index 51b3ba4..0000000
--- a/tests/help-dmalloc.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_WITH_DMALLOC' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_WITH_DMALLOC
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$EGREP '^   *--with-dmalloc( |$) ' stdout
-$FGREP ' use dmalloc' stdout
-$FGREP 'www.dmalloc.com' stdout
-
-:
diff --git a/tests/help-init.test b/tests/help-init.test
deleted file mode 100755
index fdd9fa0..0000000
--- a/tests/help-init.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our grand macro `AM_INIT_AUTOMAKE' add proper text
-# to the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep '^  *--program-prefix[= ]' stdout
-grep '^  *--program-suffix[= ]' stdout
-grep '^  *--program-transform-name[= ]' stdout
-
-:
diff --git a/tests/help-lispdir.test b/tests/help-lispdir.test
deleted file mode 100755
index 5eb7ab9..0000000
--- a/tests/help-lispdir.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_PATH_LISPDIR' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_PATH_LISPDIR
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$EGREP '^  *--with-lispdir( |$)' stdout
-grep ' override.*lisp directory' stdout
-$EGREP '^  *EMACS( |$)' stdout
-grep ' .*[eE]macs editor' stdout
-$EGREP '^  *EMACSLOADPATH( |$)' stdout
-grep ' .*[eE]macs library search path' stdout
-
-:
diff --git a/tests/help-multilib.test b/tests/help-multilib.test
deleted file mode 100755
index 1657c34..0000000
--- a/tests/help-multilib.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_ENABLE_MULTILIB' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_ENABLE_MULTILIB
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$EGREP '^  *--enable-multilib( |$)' stdout
-$FGREP ' many library versions (default)' stdout
-
-:
diff --git a/tests/help-python.test b/tests/help-python.test
deleted file mode 100755
index ba20013..0000000
--- a/tests/help-python.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that macro `AM_PATH_PYTHON' adds proper text to the
-# configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_PATH_PYTHON
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep '^  *PYTHON  *the Python interpreter$' stdout
-
-:
diff --git a/tests/help-regex.test b/tests/help-regex.test
deleted file mode 100755
index 3eff5f9..0000000
--- a/tests/help-regex.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-$FGREP ' --without-regex ' stdout
-$FGREP ' use GNU rx ' stdout
-
-:
diff --git a/tests/help-silent.test b/tests/help-silent.test
deleted file mode 100755
index e59f2f1..0000000
--- a/tests/help-silent.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_SILENT_RULES' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_SILENT_RULES
-END
-
-$ACLOCAL
-
-mv -f configure.in configure.tmpl
-
-for args in '' '([])' '([yes])' '([no])'; do
-  sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.in
-  cat configure.in
-  $AUTOCONF --force
-  ./configure --help >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  $EGREP '^  *--enable-silent-rules( |$)' stdout
-  grep ' less verbose build.*undo.*make V=1' stdout
-  $EGREP '^  *--disable-silent-rules ( |$)' stdout
-  grep ' verbose build.*undo.*make V=0' stdout
-done
-
-:
diff --git a/tests/help-upc.test b/tests/help-upc.test
deleted file mode 100755
index 8f5ff5f..0000000
--- a/tests/help-upc.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_PROG_UPC' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_PROG_UPC
-END
-
-$ACLOCAL
-$AUTOCONF
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep '^  *UPCFLAGS .*Unified Parallel C compiler flags' stdout
-grep '^  *UPC .*Unified Parallel C compiler command' stdout
-
-:
diff --git a/tests/help.test b/tests/help.test
deleted file mode 100755
index dd8b3b4..0000000
--- a/tests/help.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure --help and --version work, even when no configure.ac nor
-# configure.in is in the current directory.
-
-. ./defs || Exit 1
-
-set -e
-
-# Ensure we run in an empty directory.
-mkdir emptydir
-cd emptydir
-
-# Honour user overrides for $ACLOCAL and $AUTOMAKE.
-ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
-AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
-
-$ACLOCAL --version
-$ACLOCAL --help
-$AUTOMAKE --version
-$AUTOMAKE --help
-
-# Sanity checks: aclocal and automake cannot work without configure.ac
-# or configure.in.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$FGREP configure.ac stderr
-$FGREP configure.in stderr
-AUTOMAKE_fails
-$FGREP configure.ac stderr
-$FGREP configure.in stderr
-
-:
diff --git a/tests/help2.test b/tests/help2.test
deleted file mode 100755
index b74f30a..0000000
--- a/tests/help2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure --help and --version work, even when the current directory
-# contains a broken configure.in and a broken acinclude.m4.
-. ./defs || Exit 1
-
-set -e
-
-# Ensure we run in a new, clean directory.
-mkdir cleandir
-cd cleandir
-
-# Honour user overrides for $ACLOCAL and $AUTOMAKE.
-ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
-AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
-
-echo '[' > configure.in
-echo '[' > acinclude.m4
-
-$AUTOMAKE --version
-$AUTOMAKE --help
-$ACLOCAL --version
-$ACLOCAL --help
-
-# Sanity check: aclocal cannot work with broken acinclude.m4.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$FGREP acinclude.m4 stderr
-
-rm -f acinclude.m4
-
-# Sanity checks: aclocal and automake cannot work with broken configure.in.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-$FGREP configure.in stderr
-AUTOMAKE_fails
-$FGREP configure.in stderr
-
-:
diff --git a/tests/help3.test b/tests/help3.test
deleted file mode 100755
index 72399e3..0000000
--- a/tests/help3.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure --help and --version takes precedence over other options.
-
-. ./defs || Exit 1
-
-set -e
-
-# We must have full control over the content of the current directory.
-mkdir cleandir
-cd cleandir
-
-# Honour user overrides for $ACLOCAL and $AUTOMAKE.
-ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
-AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([.]) dnl prevent automake from looking into '..'
-AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am <<END
-## so that install-sh will be required
-pkgdata_DATA =
-END
-
-$ACLOCAL --force --help --output=foo.m4
-test ! -r foo.m4
-$ACLOCAL --output=foo.m4 --version --force
-test ! -r foo.m4
-# Sanity check.
-$ACLOCAL --output=foo.m4 --force
-test -f foo.m4
-
-mv -f foo.m4 aclocal.m4 # autoconf will need aclocal.m4
-
-$AUTOMAKE --add-missing --help --copy
-test ! -r install-sh
-$AUTOMAKE --copy --version --add-mising
-test ! -r install-sh
-# Sanity check.
-$AUTOMAKE --add-missing --copy
-test -f install-sh
-
-:
diff --git a/tests/help4.test b/tests/help4.test
deleted file mode 100755
index 1b7de41..0000000
--- a/tests/help4.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the first among --help and --version to be specified on
-# the command line takes precedence over the following one.
-
-. ./defs || Exit 1
-
-set -e
-
-# Ensure we run in an empty directory.
-mkdir emptydir
-cd emptydir
-
-# Honour user overrides for $ACLOCAL and $AUTOMAKE.
-ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
-AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
-
-escape_dots () { sed 's/\./\\./g'; } # avoid issues with `\' in backquotes
-apiversion_rx=`echo "$APIVERSION" | escape_dots`
-
-$ACLOCAL --version --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep "^aclocal.*$apiversion_rx" stdout
-grep "^Usage" stdout && Exit 1
-
-$ACLOCAL --help --version >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep "^Usage" stdout
-grep "^aclocal.*$apiversion_rx" stdout && Exit 1
-
-$AUTOMAKE --version --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep "^automake.*$apiversion_rx" stdout
-grep "^Usage" stdout && Exit 1
-
-$AUTOMAKE --help --version >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep "^Usage" stdout
-grep "^automake.*$apiversion_rx" stdout && Exit 1
-
-:
diff --git a/tests/hfs.test b/tests/hfs.test
deleted file mode 100755
index 8f0c5cc..0000000
--- a/tests/hfs.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# Automake should not think that ChangeLog == CHANGELOG on
-# case-preserving case-insensitive filesystems (such as HFS+, on
-# Darwin).
-# Report from Peter O'Gorman.
-
-. ./defs || Exit 1
-set -e
-
-echo AC_OUTPUT >>configure.in
-
-: >CHANGELOG
-echo 'EXTRA_DIST = CHANGELOG' >Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE distcheck
diff --git a/tests/hosts.test b/tests/hosts.test
deleted file mode 100755
index 2df150b..0000000
--- a/tests/hosts.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure automake correctly recognizes presence of
-# AC_CANONICAL_(BUILD|HOST|SYSTEM|TARGET), and creates config.* in all
-# those cases.
-# From Norman Gray.
-
-. ./defs || Exit 1
-
-set -e
-
-: >Makefile.am
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-test ! -f config.guess
-test ! -f config.sub
-
-# Test all four of the AC_CANONICAL_* targets, including _SYSTEM, which is
-# supported but deprecated by autoconf.
-for macro in AC_CANONICAL_BUILD AC_CANONICAL_HOST \
-             AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
-do
-  rm -rf autom4te.cache config.sub config.guess
-
-  cat >configure.in<<EOF
-AC_INIT([hosts], [1.0])
-$macro
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-EOF
-
-  $ACLOCAL
-  $AUTOMAKE --add-missing
-
-  # Show the files which were installed
-  ls
-
-  test -f config.guess
-  test -f config.sub
-done
diff --git a/tests/implicit.test b/tests/implicit.test
deleted file mode 100755
index 210b2dc..0000000
--- a/tests/implicit.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure implicit .o's are listed as appropriate.  Report
-# from Henrik Frystyk Nielsen.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = libapp_1
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
diff --git a/tests/info.test b/tests/info.test
deleted file mode 100755
index 2cde524..0000000
--- a/tests/info.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure info files are distributed correctly.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-
-magic:
-       @echo $(INFOS)
-END
-
-echo '@setfilename foo.info' > foo.texi
-: > texinfo.tex
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do
-   echo $i
-   case "$i" in
-    foo*)
-       ;;
-    *)
-       Exit 1
-       ;;
-   esac
-done
diff --git a/tests/init.test b/tests/init.test
deleted file mode 100755
index 38ec681..0000000
--- a/tests/init.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we give a sensible error message when neither AC_INIT nor
-# AM_INIT_AUTOMAKE are given arguments.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<END
-AC_INIT
-AM_INIT_AUTOMAKE
-END
-
-# The error message should mension AC_INIT, not AC_PACKAGE_VERSION.
-($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep AC_PACKAGE_VERSION stderr && Exit 1
-grep AC_INIT stderr
diff --git a/tests/init2.test b/tests/init2.test
deleted file mode 100755
index 31631d7..0000000
--- a/tests/init2.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we give a sensible error message when AM_INIT_AUTOMAKE
-# contains junk.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<END
-AC_INIT([init2], [1.0])
-AM_INIT_AUTOMAKE([nosuchoption])
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'nosuchoption.*recognized' stderr
-Exit 0
diff --git a/tests/insh2.test b/tests/insh2.test
deleted file mode 100755
index c64f1f7..0000000
--- a/tests/insh2.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where install-sh not included in distribution.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-pkgdata_DATA =
-magic:
-       @echo $(DISTFILES)
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep install-sh
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
deleted file mode 100755
index 405480d..0000000
--- a/tests/install-info-dir.test
+++ /dev/null
@@ -1,178 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Checks on the `install-info' target.
-# Details about the individual checks' purposes and motivations are
-# inlined, below.
-
-# FIXME: this test is a good candidate for a conversion to TAP,
-# FIXME: and could be merged with `txinfo27.test'.
-
-required=makeinfo
-. ./defs || Exit 1
-
-cwd=`pwd` || fatal_ "cannot get current working directory"
-
-mkdir bin
-saved_PATH=$PATH; export saved_PATH
-PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-END
-
-cat > foo.texi << 'END'
-\input texinfo
address@hidden foo.info
address@hidden All the following directives might be required to allow older
address@hidden versions of the `install-info' program (e.g., version 4.8) to
address@hidden create the `dir' index file in ${infodir}.  Don't remove them.
address@hidden foo
address@hidden Dummy utilities
address@hidden
-* Foo: (foo).  Does nothing at all, but has a nice name.
address@hidden direntry
address@hidden Top
-Hello world!
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-instdir=_inst
-destdir=_dest
-
-./configure --prefix="$cwd/$instdir" --infodir="$cwd/$instdir/info"
-
-$MAKE info
-test -f foo.info
-
-if install-info --version; then
-  have_installinfo=yes
-else
-  have_installinfo=no
-fi
-
-# The `install-info' target updates the `${infodir}/dir' file
-# by default (if the `install-info' program is available).
-# This should happen in a normal as well as in a DESTDIR installation.
-if test $have_installinfo = yes; then
-
-  $MAKE install-info
-  test -f $instdir/info/foo.info
-  test -f $instdir/info/dir
-  $FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
-
-  $MAKE uninstall
-  test ! -f $instdir/info/foo.info
-  $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
-
-  dir="$destdir/$cwd/$instdir/info"
-
-  $MAKE DESTDIR="$cwd/$destdir" install-info
-  test -f "$dir"/foo.info
-  test -f "$dir"/dir
-  $FGREP 'Does nothing at all, but has a nice name' "$dir"/dir
-  $MAKE DESTDIR="$cwd/$destdir" uninstall
-  test ! -f "$dir"/foo.info
-  $FGREP 'but has a nice name' "$dir"/dir && Exit 1
-
-  unset dir
-
-fi
-
-rm -rf $instdir $destdir
-
-# The `install-info' target doesn't fail if the `install-info'
-# program is not available.
-cat > bin/install-info <<'END'
-#!/bin/sh
-echo error from install-info >&2
-exit 127
-END
-chmod a+x bin/install-info
-$MAKE install-info >output 2>&1 || { cat output; Exit 1; }
-cat output
-test -f $instdir/info/foo.info
-test ! -f $instdir/info/dir
-grep 'error from install-info' output && Exit 1
-
-rm -rf $instdir output
-
-if test $have_installinfo = yes; then
-  # The `install-info' target doesn't try to guess whether the `install-info'
-  # is the GNU or debian version.
-  unindent > bin/install-info <<'END'
-    #!/bin/sh
-    set -e; set -u;
-    for fd in 1 2; do
-      for str in dpkg debian Debian; do
-        eval "echo This is $str install-info >&$fd"
-      done
-    done
-    PATH=$saved_PATH; export PATH
-    exec install-info ${1+"$@"}
-END
-  $MAKE install-info
-  test -f $instdir/info/foo.info
-  test -f $instdir/info/dir
-  $MAKE uninstall
-  test ! -f $instdir/info/foo.info
-  test -f $instdir/info/dir
-  $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
-  : For shells with busted 'set -e'.
-fi
-
-rm -rf $instdir bin/install-info
-
-# The `AM_UPDATE_INFO_DIR' environment variable can be used to
-# prevent the creation or update of the `${infodir}/dir' file,
-# if set to a "no" value.
-for val in no NO n; do
-  rm -rf $instdir
-  env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
-  test -f $instdir/info/foo.info
-  test ! -f $instdir/info/dir
-done
-
-$MAKE install-info
-chmod a-w $instdir/info/dir
-for val in no NO n; do
-  env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
-  $FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
-done
-
-if test $have_installinfo = yes; then
-  for val in 'yes' 'who cares!'; do
-    rm -rf $instdir
-    env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
-    test -f $instdir/info/foo.info
-    test -f $instdir/info/dir
-    env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
-    test ! -f $instdir/info/foo.info
-    $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
-  done
-fi
-
-:
diff --git a/tests/install2.test b/tests/install2.test
deleted file mode 100755
index 3cc71f5..0000000
--- a/tests/install2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in `make dist'
-# From Pavel Roskin.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foo, 0.1)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = .
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-chmod 000 Makefile.am
-
-# On some systems (like DOS and Windows), files are always readable.
-test ! -r Makefile.am || Exit 77
-
-./configure
-
-# `dist' should fail because we can't copy Makefile.am.
-if $MAKE dist; then
-  Exit 1
-else
-  Exit 0
-fi
diff --git a/tests/installdir.test b/tests/installdir.test
deleted file mode 100755
index 2fc1285..0000000
--- a/tests/installdir.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 203.
-# See also automake bug#11030.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-foodir = $(datadir)/$(distdir)
-installdirs-local:
-       $(MKDIR_P) $(DESTDIR)$(foodir)
-install-data-hook: installdirs-local
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-test `grep installdirs-local Makefile.in | wc -l` -eq 4
-
-cwd=`pwd` || fatal_ "getting current working directory"
-
-$AUTOCONF
-./configure --prefix="$cwd/inst"
-
-$MAKE installdirs
-test -d inst/share/$me-1.0
-rm -rf inst
-
-$MAKE install
-test -d inst/share/$me-1.0
-rm -rf inst
-
-./configure --prefix=/foo
-
-$MAKE installdirs DESTDIR="$cwd/dest"
-test -d dest/foo/share/$me-1.0
-rm -rf dest
-
-$MAKE install DESTDIR="$cwd/dest"
-test -d dest/foo/share/$me-1.0
-rm -rf dest
-
-:
diff --git a/tests/instdat.test b/tests/instdat.test
deleted file mode 100755
index a6ec01a..0000000
--- a/tests/instdat.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to see if defining INSTALL_DATA causes problems.  From EGCS
-# list.
-
-. ./defs || Exit 1
-
-echo 'AC_SUBST(INSTALL_DATA)' >> configure.in
-
-: > Makefile.am
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && Exit 1
-Exit 0
diff --git a/tests/instdat2.test b/tests/instdat2.test
deleted file mode 100755
index 966f0cf..0000000
--- a/tests/instdat2.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that installing under $exec_prefix is handled by install-exec.
-# Testing with headers for instance.
-
-. ./defs || Exit 1
-
-cat >Makefile.am << 'EOF'
-# User directories.
-inclexecdir = $(exec_prefix)/include
-inclexec_HEADERS = my-config.h
-
-incldatadir = $(prefix)/include
-incldata_HEADERS = my-data.h
-
-## Standard directories: _DATA
-## Commented out are invalid combinations.
-##bin_DATA = data
-##sbin_DATA = data
-##libexec_DATA = data
-data_DATA = data
-sysconf_DATA = data
-localstate_DATA = data
-##lib_DATA = data
-##info_DATA = data
-##man_DATA = data
-##include_DATA = data
-##oldinclude_DATA = data
-pkgdata_DATA = data
-##pkglib_DATA = data
-##pkginclude_DATA = data
-
-## Standard directories: _SCRIPTS
-## Commented out are invalid combinations.
-bin_SCRIPTS = script
-sbin_SCRIPTS = script
-libexec_SCRIPTS = script
-##data_SCRIPTS = script
-##sysconf_SCRIPTS = script
-##localstate_SCRIPTS = script
-##lib_SCRIPTS = script
-##info_SCRIPTS = script
-##man_SCRIPTS = script
-##include_SCRIPTS = script
-##oldinclude_SCRIPTS = script
-pkgdata_SCRIPTS = script
-##pkglib_SCRIPTS = script
-##pkginclude_SCRIPTS = script
-EOF
-
-set -e
-$ACLOCAL || Exit 1
-$AUTOMAKE
-
-# install-SCRIPTS targets.
-sed -n '/^install-data-am/,/^  /p' Makefile.in > produced
-
-cat > expected <<'EOF'
-install-data-am: install-dataDATA install-incldataHEADERS \
-       install-pkgdataDATA install-pkgdataSCRIPTS
-EOF
-
-diff expected produced
-
-
-# install-exec targets.
-sed -n '/^install-exec-am/,/^  /p' Makefile.in > produced
-
-cat > expected <<'EOF'
-install-exec-am: install-binSCRIPTS install-inclexecHEADERS \
-       install-libexecSCRIPTS install-localstateDATA \
-EOF
-
-diff expected produced
-
-Exit 0
diff --git a/tests/instdir-cond.test b/tests/instdir-cond.test
deleted file mode 100644
index 9cdd810..0000000
--- a/tests/instdir-cond.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check against automake bug#10997: directories holding only
-# conditionally-installed files should not be created unconditionally.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([ENABLE_FOO], [false])
-AC_OUTPUT
-END
-
-: > foo
-: > bar
-
-cat > Makefile.am << 'END'
-pkglibexec_SCRIPTS =
-if ENABLE_FOO
-pkgdata_DATA = foo
-pkglibexec_SCRIPTS += bar
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure --prefix="`pwd`/inst"
-
-$MAKE install
-test ! -d inst/share/instdir-cond
-test ! -d inst/libexec/instdir-cond
-
-:
diff --git a/tests/instdir-cond2.test b/tests/instdir-cond2.test
deleted file mode 100644
index 6cdc26d..0000000
--- a/tests/instdir-cond2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check against automake bug#10997: directories holding only
-# conditionally-installed files should not be created unconditionally.
-# FIXME: this test tries to check that the above also hold for the
-# FIXME: "installdirs" target, but that doesn't currently work :-(
-# FIXME: So this test is still xfailing.
-# See sister test 'instdir-cond.test' for the succeeding part.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([ENABLE_FOO], [false])
-AC_OUTPUT
-END
-
-: > foo
-: > bar
-
-cat > Makefile.am << 'END'
-pkglibexec_SCRIPTS =
-if ENABLE_FOO
-pkgdata_DATA = foo
-pkglibexec_SCRIPTS += bar
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure --prefix="`pwd`/inst"
-
-$MAKE installdirs
-test ! -d inst || { find inst; Exit 1; }
-
-:
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
deleted file mode 100755
index 94a6a25..0000000
--- a/tests/instdir-java.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(javadir) is the empty string, then nothing should be installed there.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-javadir = $(datarootdir)/java
-java_JAVA = foo.java
-END
-
-cat >foo.java <<'END'
-class foo {
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-javadir=
-export javadir
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
deleted file mode 100755
index 475e935..0000000
--- a/tests/instdir-lisp.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(lispdir) is the empty string, then nothing should be installed there.
-
-required=emacs
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_PATH_LISPDIR
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-lisp_LISP = l.el
-END
-
-: >l.el
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-lispdir=
-export lispdir
-
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
deleted file mode 100755
index f400377..0000000
--- a/tests/instdir-ltlib.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(libdir) is the empty string, then nothing should be installed there.
-# This test exercises the libtool code paths.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = p
-nobase_bin_PROGRAMS = np sub/np
-lib_LTIBRARIES = libfoo.la
-nobase_lib_LTLIBRARIES = libnfoo.la sub/libnfoo.la
-END
-
-cat >p.c <<'END'
-int main () { return 0; }
-END
-cp p.c np.c
-cp p.c sub/np.c
-cp p.c libfoo.c
-cp p.c libnfoo.c
-cp p.c sub/libnfoo.c
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-bindir= libdir=
-export bindir libdir
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir-no-empty.test b/tests/instdir-no-empty.test
deleted file mode 100755
index cf57996..0000000
--- a/tests/instdir-no-empty.test
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# An empty "foo_PRIMARY" declaration should *not* cause "make install"
-# to create directory $(foodir).  See automake bug#10997 and bug#11030.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_SUBST([CC], [whatever])
-AC_SUBST([JAVAC], [whatever])
-AM_PATH_PYTHON(,,:)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-mydir = $(prefix)/my
-myexecdir = $(prefix)/myexec
-javadir = $(prefix)/java
-END
-
-# Write Makefile.am.
-{
-
-  for dir in sbin bin libexec pkglibexec myexec; do
-    for dst in '' dist_ nodist_; do
-      echo "${dst}${dir}_SCRIPTS ="
-    done
-    echo "${dir}_PROGRAMS ="
-  done
-
-  for dir in lib pkglib myexec my; do
-    echo "${dir}_LIBRARIES ="
-    echo "${dir}_LTLIBRARIES ="
-  done
-
-  for p1 in '' notrans_; do
-    for p2 in '' dist_ nodist_; do
-      for s in '' 1 2 3 4 5 6 7 8 9; do
-        echo "${p1}${p2}man${s}_MANS ="
-      done
-    done
-  done
-
-  for dst in '' dist_ nodist_; do
-    for dir in dataroot data pkgdata doc lisp my; do
-      echo "${dst}${dir}_DATA ="
-    done
-    for dir in include pkginclude oldinclude my; do
-      echo "${dst}${dir}_HEADERS ="
-    done
-    for dir in python my; do
-      echo "${dst}${dir}_PYTHON ="
-    done
-    for dir in info my; do
-      echo "${dst}${dir}_TEXINFOS ="
-    done
-    for dir in java my; do
-      echo "${dst}${dir}_JAVA ="
-    done
-    for dir in lisp my; do
-      echo "${dst}${dir}_LISP ="
-    done
-  done
-
-} > t
-
-cat t >> Makefile.am
-sed 's/^/nobase_/' t >> Makefile.am
-rm -f t
-
-cat Makefile.am # For debugging.
-
-# Sanity check.
-grep '^oldinclude_HEADERS =' Makefile.am \
-  && grep '^nodist_my_PYTHON =' Makefile.am \
-  && grep '^notrans_dist_man5_MANS =' Makefile.am \
-  || fatal_ "creating Makefile.am"
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cwd=`pwd` || fatal_ "getting current working directory"
-
-doinst ()
-{
-  $MAKE install install-pdf install-ps install-dvi ${1+"$@"}
-}
-
-: > foo.sh
-
-./configure --prefix="$cwd/inst"
-doinst
-test ! -d inst || { find inst; Exit 1; }
-$MAKE uninstall
-doinst bin_SCRIPTS=foo.sh
-test -f inst/bin/foo.sh
-
-./configure
-doinst DESTDIR="$cwd/dest"
-test ! -d dest || { find dest; Exit 1; }
-$MAKE uninstall
-doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh
-test -f dest/usr/local/bin/foo.sh
-
-:
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
deleted file mode 100755
index 66a4892..0000000
--- a/tests/instdir-prog.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(bindir) is the empty string, then nothing should be installed there.
-# This test exercises the prog and libs code paths.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = p
-nobase_bin_PROGRAMS = np sub/np
-lib_LIBRARIES = libfoo.a
-nobase_lib_LIBRARIES = libnfoo.a sub/libnfoo.a
-END
-
-cat >p.c <<'END'
-int main () { return 0; }
-END
-cp p.c np.c
-cp p.c sub/np.c
-cp p.c libfoo.c
-cp p.c libnfoo.c
-cp p.c sub/libnfoo.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-bindir= libdir=
-export bindir libdir
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir-python.test b/tests/instdir-python.test
deleted file mode 100755
index 2af2408..0000000
--- a/tests/instdir-python.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(pythondir) is the empty string, then nothing should be installed there.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_PATH_PYTHON
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<'END'
-python_PYTHON = one.py
-END
-
-cat >one.py <<'END'
-def one(): return 1
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-pythondir=
-export pythondir
-
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
deleted file mode 100755
index 8210535..0000000
--- a/tests/instdir-texi.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(infodir) is the empty string, then nothing should be installed there.
-# Likewise for the other install-* targets used for texinfo files.
-
-required='makeinfo-html tex texi2dvi'
-. ./defs || Exit 1
-
-dvips --help || Exit 77
-pdfetex --help || pdftex --help || Exit 77
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-info_TEXINFOS = foo.texi
-END
-
-cat >foo.texi << 'END'
-\input texinfo
address@hidden foo.info
address@hidden foo
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE all dvi ps pdf html
-ls -l
-
-infodir= htmldir= dvidir= psdir= pdfdir=
-export infodir htmldir dvidir psdir pdfdir
-
-$MAKE -e install install-html install-dvi install-ps install-pdf
-test ! -d "$instdir"
-$MAKE -e install install-html install-dvi install-ps install-pdf 
DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-
-:
diff --git a/tests/instdir.test b/tests/instdir.test
deleted file mode 100755
index 1132738..0000000
--- a/tests/instdir.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(foodir) is the empty string, then nothing should be installed there.
-# This test only ensures this if $(foo_PRIMARY) is also empty, see
-# instdir2.test and siblings instdir-*.test for nonempty contents.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_SUBST([foodir], ['${datadir}'/foo])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_SCRIPTS =
-nobase_bin_SCRIPTS =
-data_DATA =
-nobase_data_DATA =
-include_HEADERS =
-nobase_include_HEADERS =
-foo_DATA =
-nobase_foo_DATA =
-bardir = $(datadir)/bar
-bar_DATA =
-nobase_bar_DATA =
-man1_MANS =
-man_MANS =
-notrans_man1_MANS =
-notrans_man_MANS =
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-bindir= datadir= includedir= foodir= bardir= man1dir= man2dir=
-export bindir datadir includedir foodir bardir man1dir man2dir
-
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instdir2.test b/tests/instdir2.test
deleted file mode 100755
index b0b78b7..0000000
--- a/tests/instdir2.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If $(foodir) is the empty string, then nothing should be installed there.
-# This test ensures this also if $(foo_PRIMARY) is nonempty, see
-# instdir.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_SUBST([foodir], ['${datadir}'/foo])
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<'END'
-bin_SCRIPTS = s
-nobase_bin_SCRIPTS = ns sub/ns
-data_DATA = d
-nobase_data_DATA = nd sub/nd
-include_HEADERS = h
-nobase_include_HEADERS = nh sub/nh
-foo_DATA = f
-nobase_foo_DATA = nf sub/nf
-bardir = $(datadir)/bar
-bar_DATA = b
-nobase_bar_DATA = nb sub/nb
-man1_MANS = m1.1
-man_MANS = m.2
-notrans_man1_MANS = nm1.1
-notrans_man_MANS = nm.2
-END
-
-: >s
-: >ns
-: >sub/ns
-: >d
-: >nd
-: >sub/nd
-: >h
-: >nh
-: >sub/nh
-: >f
-: >nf
-: >sub/nf
-: >b
-: >nb
-: >sub/nb
-: >m1.1
-: >m.2
-: >nm1.1
-: >nm.2
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-destdir=`pwd`/dest
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-
-bindir= datadir= includedir= foodir= bardir= man1dir= man2dir=
-export bindir datadir includedir foodir bardir man1dir man2dir
-
-$MAKE -e install
-test ! -d "$instdir"
-$MAKE -e install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'rm -f' stdout && Exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
-:
diff --git a/tests/instexec.test b/tests/instexec.test
deleted file mode 100755
index 411f867..0000000
--- a/tests/instexec.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for this bug: when a Makefile.am builds nothing, no
-# install-exec target is generated.
-
-. ./defs || Exit 1
-
-set -e
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^install-exec:' Makefile.in
diff --git a/tests/instfail-info.test b/tests/instfail-info.test
deleted file mode 100755
index 70d4657..0000000
--- a/tests/instfail-info.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The install rule should honor failures of the install program.
-# Some of these are already caught by instmany.test.
-
-# This test has a few sister tests, for java, info, libtool.
-
-required='makeinfo'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-info_TEXINFOS = info1.texi info2.texi info3.texi
-END
-
-for n in 1 2 3; do
-  cat >info$n.texi <<END
-\input texinfo
address@hidden info$n.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-./configure --prefix="$instdir"
-$MAKE
-
-$MAKE install
-$MAKE uninstall
-
-for file in info1.info
-do
-  chmod a-r $file
-  test ! -r $file || Exit 77
-  $MAKE install-data && Exit 1
-  chmod u+r $file
-done
-
-:
diff --git a/tests/instfail-java.test b/tests/instfail-java.test
deleted file mode 100755
index 8f527cf..0000000
--- a/tests/instfail-java.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The install rule should honor failures of the install program.
-# Some of these are already caught by instmany.test.
-
-# This is the java sister test of instfail.test.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-javadir = $(datadir)/java
-java_JAVA = java1.java java2.java java3.java
-END
-
-for n in 1 2 3; do
-  cat >java$n.java <<END
-class java$n
-{
-}
-END
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-./configure --prefix="$instdir"
-$MAKE
-
-$MAKE install
-$MAKE uninstall
-
-for file in java1.class
-do
-  chmod a-r $file
-  test ! -r $file || Exit 77
-  $MAKE install-data && Exit 1
-  chmod u+r $file
-done
-
-:
diff --git a/tests/instfail-libtool.test b/tests/instfail-libtool.test
deleted file mode 100755
index 2e5e312..0000000
--- a/tests/instfail-libtool.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The install rule should honor failures of the install program.
-# Some of these are already caught by instmany.test.
-
-# This is the libtool sister test of instfail.test
-
-required='libtool libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = prog1 prog2 prog3
-nobase_bin_PROGRAMS = progn1 progn2 progn3
-lib_LTLIBRARIES = liblt1.la liblt2.la liblt3.la
-nobase_lib_LTLIBRARIES = libltn1.la libltn2.la libltn3.la
-unreadable-prog:
-       chmod a-r prog1$(EXEEXT)
-readable-prog:
-       chmod a+r prog1$(EXEEXT)
-unreadable-progn:
-       chmod a-r progn1$(EXEEXT)
-readable-progn:
-       chmod a+r progn1$(EXEEXT)
-END
-
-for n in 1 2 3; do
-  echo "int main () { return 0; }" > prog$n.c
-  echo "int main () { return 0; }" > progn$n.c
-  echo "int foolt$n () { return 0; }" > liblt$n.c
-  echo "int fooltn$n () { return 0; }" > libltn$n.c
-done
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-./configure --prefix="$instdir"
-$MAKE
-
-$MAKE install
-$MAKE uninstall
-
-for file in liblt1.la libltn1.la
-do
-  chmod a-r $file
-  test ! -r $file || Exit 77
-  $MAKE install-exec && Exit 1
-  chmod u+r $file
-done
-
-$MAKE unreadable-prog
-$MAKE install-exec && Exit 1
-$MAKE readable-prog
-
-$MAKE unreadable-progn
-$MAKE install-exec && Exit 1
-$MAKE readable-progn
-
-:
diff --git a/tests/instfail.test b/tests/instfail.test
deleted file mode 100755
index 3fb60b5..0000000
--- a/tests/instfail.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The install rule should honor failures of the install program.
-# Some of these are already caught by instmany.test.
-
-# This test has a few sister tests, for java, info, libtool.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AM_PATH_LISPDIR
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = prog1 prog2 prog3
-nobase_bin_PROGRAMS = progn1 progn2 progn3
-lisp_LISP = lisp1.el lisp2.el lisp3.el
-nobase_lisp_LISP = lispn1.el lispn2.el lispn3.el
-lib_LIBRARIES = lib1.a lib2.a lib3.a
-nobase_lib_LIBRARIES = libn1.a libn2.a libn3.a
-unreadable-prog:
-       chmod a-r prog1$(EXEEXT)
-readable-prog:
-       chmod a+r prog1$(EXEEXT)
-unreadable-progn:
-       chmod a-r progn1$(EXEEXT)
-readable-progn:
-       chmod a+r progn1$(EXEEXT)
-END
-
-for n in 1 2 3; do
-  echo "int main () { return 0; }" > prog$n.c
-  echo "int main () { return 0; }" > progn$n.c
-  echo "int foo$n () { return 0; }" > lib$n.c
-  echo "int foon$n () { return 0; }" > libn$n.c
-  echo >lisp$n.el
-  echo >lispn$n.el
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-./configure --prefix="$instdir"
-$MAKE
-
-$MAKE install
-$MAKE uninstall
-
-for file in lib1.a libn1.a
-do
-  chmod a-r $file
-  test ! -r $file || Exit 77
-  $MAKE install-exec && Exit 1
-  chmod u+r $file
-done
-
-$MAKE unreadable-prog
-$MAKE install-exec && Exit 1
-$MAKE readable-prog
-
-$MAKE unreadable-progn
-$MAKE install-exec && Exit 1
-$MAKE readable-progn
-
-if grep "^EMACS = no" Makefile; then :; else
-  for file in lisp1.el lisp1.elc
-  do
-    chmod a-r $file
-    $MAKE install-data && Exit 1
-    chmod u+r $file
-  done
-fi
-
-:
diff --git a/tests/insthook.test b/tests/insthook.test
deleted file mode 100755
index 1b03324..0000000
--- a/tests/insthook.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2005, 2007, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the install-exec-hook example we give in the manual works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_LN_S
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<'END'
-dist_bin_SCRIPTS = foo
-
-install-exec-hook:
-       cd "$(DESTDIR)$(bindir)" && \
-       mv -f foo foo-$(VERSION) && \
-       $(LN_S) foo-$(VERSION) foo
-
-installcheck-local:
-       test -f "$(bindir)/foo"
-       test -f "$(bindir)/foo-$(VERSION)"
-       : > $(top_srcdir)/../ok
-
-uninstall-hook:
-       rm -f $(DESTDIR)$(bindir)/foo-$(VERSION)
-END
-
-echo 1 > foo
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE distcheck
-# Sanity check to make sure installcheck-local was run.
-test -f ok
-
-# Make sure that installing a second version doesn't erase the first
-# one.  (This is error prone since `foo' symlinks to `foo-1.0' and the
-# second version will overwrite `foo'.  Hopefully `install' and `install-sh'
-# are smart enough to erase the `foo' symlink before installing the new
-# version.)
-./configure "--bindir=`pwd`/bin"
-$MAKE install
-echo 2 > foo
-VERSION=2.0 $MAKE -e install
-grep 1 bin/foo-1.0
-grep 2 bin/foo-2.0
-grep 2 bin/foo
-
-# install-hook is an error.
-cat >>Makefile.am <<EOF
-install-hook:
-       echo test
-EOF
-
-AUTOMAKE_fails
-grep install-data-hook stderr
-grep install-exec-hook stderr
-
-:
diff --git a/tests/instman.test b/tests/instman.test
deleted file mode 100755
index 89c1a5e..0000000
--- a/tests/instman.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2003, 2006 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the MKDIR_P invocation is correct in install-man
-# target.  Bug reported by Gordon Irlam <address@hidden>.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'EOF'
-man_MANS = frob.8
-EOF
-
-: > frob.8
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '[^(/]MKDIR_P' Makefile.in > out
-test `wc -l < out` -eq 1
diff --git a/tests/instman2.test b/tests/instman2.test
deleted file mode 100755
index 77844fa..0000000
--- a/tests/instman2.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure mkinstalldirs invocation correct in install-man
-# target.  Bug reported by Gordon Irlam <address@hidden>.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'EOF'
-man8_MANS = frob.8
-EOF
-
-: > frob.8
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^install-man' Makefile.in
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
deleted file mode 100755
index fe55be4..0000000
--- a/tests/instmany-mans.test
+++ /dev/null
@@ -1,150 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Installing many files should not exceed the command line length limit.
-
-# This is the mans sister test of instmany.test, see there for details.
-
-. ./defs || Exit 1
-
-set -e
-
-# In order to have a useful test on modern systems (which have a high
-# limit, if any), use a fake install program that errors out for more
-# than 2K characters in a command line.  The POSIX limit is 4096, but
-# that may include space taken up by the environment.
-
-limit=2500
-subdir=long_subdir_name_with_many_characters
-nfiles=81
-
-# Let's use `seq' if available, it's faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || {
-  i=1
-  while test $i -le $nfiles; do
-    echo $i
-    i=\`expr $i + 1\`
-  done; }`
-
-sed "s|@limit@|$limit|g" >myinstall.in <<'END'
-#! /bin/sh
-# Fake install script.  This doesn't really install
-# (the INSTALL path below would be wrong outside this directory).
address@hidden@
-INSTALL='@INSTALL@'
-len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exit 0
-END
-
-# Creative quoting in the next line to please maintainer-check.
-sed "s|@limit@|$limit|g" >'rm' <<'END'
-#! /bin/sh
address@hidden@
-PATH=$save_PATH
-export PATH
-RM='rm -f'
-len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exec $RM "$@"
-exit 1
-END
-
-chmod +x rm
-
-cat >>configure.in <<END
-AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
-AC_CONFIG_FILES([$subdir/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<END
-SUBDIRS = $subdir
-END
-
-mkdir $subdir
-cd $subdir
-
-cat >Makefile.am <<'END'
-man_MANS =
-man3_MANS =
-notrans_man_MANS =
-notrans_man3_MANS =
-END
-
-for n in $list; do
-  cat >>Makefile.am <<END
-man_MANS += page$n.1
-man3_MANS += page$n.man
-notrans_man_MANS += npage$n.1
-notrans_man3_MANS += npage$n.man
-END
-  echo >page$n.1
-  echo >page$n.man
-  echo >npage$n.1
-  echo >npage$n.man
-done
-
-cd ..
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-# Try whether native install (or install-sh) works.
-$MAKE install
-# Multiple uninstall should work, too.
-$MAKE uninstall
-$MAKE uninstall
-test `find "$instdir" -type f -print | wc -l` = 0
-
-# Try whether we don't exceed the low limit.
-INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
-env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
-
-cd $subdir
-srcdir=../../$subdir
-
-# Ensure 'make install' fails when 'install' fails.
-
-# We cheat here, for efficiency, knowing the internal rule names.
-# For correctness, one should `$MAKE install' here always, or at
-# least use install-exec or install-data.
-
-for file in page3.1 page$nfiles.1 npage3.1 npage$nfiles.1; do
-  chmod a-r $srcdir/$file
-  test ! -r $srcdir/$file || Exit 77
-  $MAKE install-man1 && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in page3.man page$nfiles.man npage3.man npage$nfiles.man; do
-  chmod a-r $srcdir/$file
-  $MAKE install-man3 && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-:
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
deleted file mode 100755
index 7648e1b..0000000
--- a/tests/instmany-python.test
+++ /dev/null
@@ -1,138 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Installing many files should not exceed the command line length limit.
-
-# This is the python sister test of instmany.test, see there for details.
-
-required='python'
-. ./defs || Exit 1
-
-set -e
-
-limit=2500
-subdir=long_subdir_name_with_many_characters
-nfiles=81
-
-list=`(seq 1 $nfiles) 2>/dev/null || {
-  i=1
-  while test $i -le $nfiles; do
-    echo $i
-    i=\`expr $i + 1\`
-  done; }`
-
-sed "s|@limit@|$limit|g" >myinstall.in <<'END'
-#! /bin/sh
-# Fake install script.  This doesn't really install
-# (the INSTALL path below would be wrong outside this directory).
address@hidden@
-INSTALL='@INSTALL@'
-len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exit 0
-END
-
-# Creative quoting in the next line to please maintainer-check.
-sed "s|@limit@|$limit|g" >'rm' <<'END'
-#! /bin/sh
address@hidden@
-PATH=$save_PATH
-export PATH
-RM='rm -f'
-len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exec $RM "$@"
-exit 1
-END
-
-chmod +x rm
-
-cat >>configure.in <<END
-AM_PATH_PYTHON
-AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
-AC_CONFIG_FILES([$subdir/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<END
-SUBDIRS = $subdir
-END
-
-mkdir $subdir
-cd $subdir
-
-cat >Makefile.am <<'END'
-python_PYTHON =
-nobase_python_PYTHON =
-END
-
-for n in $list; do
-  cat >>Makefile.am <<END
-python_PYTHON += python$n.py
-nobase_python_PYTHON += npython$n.py
-END
-  echo >python$n.py
-  echo >npython$n.py
-done
-
-cd ..
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-# Try whether native install (or install-sh) works.
-$MAKE install
-# Multiple uninstall should work, too.
-$MAKE uninstall
-$MAKE uninstall
-test `find "$instdir" -type f -print | wc -l` = 0
-
-# Try whether we don't exceed the low limit.
-INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
-env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
-
-cd $subdir
-srcdir=../../$subdir
-
-# Ensure 'make install' fails when 'install' fails.
-
-for file in python3.py python$nfiles.py
-do
-  chmod a-r $srcdir/$file
-  test ! -r $srcdir/$file || Exit 77
-  $MAKE install && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in npython3.py npython$nfiles.py
-do
-  chmod a-r $srcdir/$file
-  $MAKE install && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-:
diff --git a/tests/instmany.test b/tests/instmany.test
deleted file mode 100755
index 2de026d..0000000
--- a/tests/instmany.test
+++ /dev/null
@@ -1,194 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Installing many files should not exceed the command line length limit.
-# Here, the main issue is that we may prepend `$(srcdir)/' to each file,
-# which may cause much longer command lines.  The list of files must
-# anyway remain below the limit, otherwise `make' won't be able to even
-# fork the command.
-#
-# Further, the install rule should honor failures of the install program.
-
-# Python is done in the sister test.
-# For texinfos, we expand names using $(srcdir) in the first place.
-# Let's hope nobody uses many texinfos.
-
-. ./defs || Exit 1
-
-set -e
-
-# In order to have a useful test on modern systems (which have a high
-# limit, if any), use a fake install program that errors out for more
-# than 2K characters in a command line.  The POSIX limit is 4096, but
-# that may include space taken up by the environment.
-
-limit=2500
-subdir=long_subdir_name_with_many_characters
-nfiles=81
-
-# Let's use `seq' if available, it's faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || {
-  i=1
-  while test $i -le $nfiles; do
-    echo $i
-    i=\`expr $i + 1\`
-  done; }`
-
-sed "s|@limit@|$limit|g" >myinstall.in <<'END'
-#! /bin/sh
-# Fake install script.  This doesn't really install
-# (the INSTALL path below would be wrong outside this directory).
address@hidden@
-INSTALL='@INSTALL@'
-len=`expr "$INSTALL $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exit 0
-END
-
-# Creative quoting in the next line to please maintainer-check.
-sed "s|@limit@|$limit|g" >'rm' <<'END'
-#! /bin/sh
address@hidden@
-PATH=$save_PATH
-export PATH
-RM='rm -f'
-len=`expr "$RM $*" : ".*" 2>/dev/null || echo $limit`
-if test $len -ge $limit; then
-  echo "$0: safe command line limit of $limit characters exceeded" >&2
-  exit 1
-fi
-exec $RM "$@"
-exit 1
-END
-
-chmod +x rm
-
-cat >>configure.in <<END
-AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
-AC_CONFIG_FILES([$subdir/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<END
-SUBDIRS = $subdir
-END
-
-mkdir $subdir
-cd $subdir
-
-cat >Makefile.am <<'END'
-bin_SCRIPTS =
-nobase_bin_SCRIPTS =
-data_DATA =
-nobase_data_DATA =
-include_HEADERS =
-nobase_include_HEADERS =
-END
-
-for n in $list; do
-  cat >>Makefile.am <<END
-bin_SCRIPTS += script$n
-nobase_bin_SCRIPTS += nscript$n
-data_DATA += data$n
-nobase_data_DATA += ndata$n
-include_HEADERS += header$n.h
-nobase_include_HEADERS += nheader$n.h
-END
-  echo >script$n
-  echo >nscript$n
-  echo >data$n
-  echo >ndata$n
-  echo >header$n.h
-  echo >nheader$n.h
-done
-
-cd ..
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-instdir=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="$instdir"
-$MAKE
-# Try whether native install (or install-sh) works.
-$MAKE install
-# Multiple uninstall should work, too.
-$MAKE uninstall
-$MAKE uninstall
-test `find "$instdir" -type f -print | wc -l` = 0
-
-# Try whether we don't exceed the low limit.
-INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install
-env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall
-
-cd $subdir
-srcdir=../../$subdir
-
-# Ensure 'make install' fails when 'install' fails.
-
-# We cheat here, for efficiency, knowing the internal rule names.
-# For correctness, one should `$MAKE install' here always, or at
-# least use install-exec or install-data.
-
-for file in script3 script$nfiles
-do
-  chmod a-r $srcdir/$file
-  test ! -r $srcdir/$file || Exit 77
-  $MAKE install-binSCRIPTS && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in nscript3 nscript$nfiles
-do
-  chmod a-r $srcdir/$file
-  $MAKE install-nobase_binSCRIPTS && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in data3 data$nfiles
-do
-  chmod a-r $srcdir/$file
-  $MAKE install-dataDATA && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in ndata3 ndata$nfiles
-do
-  chmod a-r $srcdir/$file
-  $MAKE install-nobase_dataDATA && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in header3.h header$nfiles.h
-do
-  chmod a-r $srcdir/$file
-  $MAKE install-includeHEADERS && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-for file in nheader3.h nheader$nfiles.h
-do
-  chmod a-r $srcdir/$file
-  $MAKE install-nobase_includeHEADERS && Exit 1
-  chmod u+r $srcdir/$file
-done
-
-:
diff --git a/tests/instsh.test b/tests/instsh.test
deleted file mode 100755
index 61f5f9e..0000000
--- a/tests/instsh.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for this bug:
-# automake: Makefile.am: required file "../../install-sh" not found; installing
-# This also makes sure that install-sh is created in the correct directory.
-
-. ./defs || Exit 1
-
-set -e
-
-: > Makefile.am
-rm -f install-sh
-
-# Since the default path includes '../..', we must run this test in
-# yet another subdir.
-mkdir frob
-mv Makefile.am configure.in frob/
-cd frob
-
-$ACLOCAL
-$AUTOMAKE --add-missing > output 2>&1
-
-# Only one `/' should appear in the output.
-cat output
-grep '/.*/' output && Exit 1
-
-test -f install-sh
diff --git a/tests/instsh2.test b/tests/instsh2.test
deleted file mode 100755
index 927edeb..0000000
--- a/tests/instsh2.test
+++ /dev/null
@@ -1,117 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2006, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Various install-sh checks
-
-. ./defs || Exit 1
-set -e
-
-# Basic errors
-./install-sh && Exit 1
-./install-sh -m 644 dest && Exit 1
-
-# Directories
-
-# It should be OK to create no directory.  We sometimes need
-# this when directory are conditionally defined.
-./install-sh -d
-# One directory.
-./install-sh -d d0
-test -d d0
-# Multiple directories (for make installdirs).
-./install-sh -d d1 d2 d3 d4
-test -d d1
-test -d d2
-test -d d3
-test -d d4
-# Subdirectories
-./install-sh -d p1/p2/p3 p4//p5//p6//
-test -d p1/p2/p3
-test -d p4/p5/p6
-
-# Files.
-: > x
-./install-sh -c -m 644 x y
-test -f x
-test -f y
-./install-sh -m 644 y z
-test -f y
-test -f z
-# Multiple files
-./install-sh -m 644 -c x z d1
-test -f x
-test -f z
-test -f d1/x
-test -f d1/z
-./install-sh -m 644 x z d2//
-test -f x
-test -f z
-test -f d2/x
-test -f d2/z
-./install-sh -t d3 -m 644 x z
-test -f x
-test -f z
-test -f d3/x
-test -f d3/z
-./install-sh -t d4// -m 644 x z
-test -f x
-test -f z
-test -f d4/x
-test -f d4/z
-./install-sh -T x d3/y
-test -f x
-test -f d3/y
-./install-sh -T x d3 && Exit 1
-./install-sh -T x d4// && Exit 1
-
-# Ensure that install-sh works with names that include spaces.
-touch 'a  b'
-mkdir 'x  y'
-./install-sh 'a  b' 'x  y'
-test -f x\ \ y/a\ \ b
-test -f 'a  b'
-
-# Ensure we do not run into `test' operator precedence bugs with Tru64 sh.
-for c in = '(' ')' '!'; do
-  ./install-sh $c 2>stderr && { cat stderr >&2; Exit 1; }
-  cat stderr >&2
-  grep 'test: ' stderr && Exit 1
-  # Skip tests if the file system is not capable.
-  mkdir ./$c || continue
-  rmdir ./$c
-  ./install-sh -d $c/$c/$c
-  rm -rf ./$c
-  ./install-sh -d $c d5/$c/$c
-  test -d ./$c
-  test -d d5/$c/$c
-  ./install-sh x $c
-  test -f ./$c/x
-  rm -f ./$c/x
-  ./install-sh -t $c x
-  test -f ./$c/x
-  rm -rf ./$c
-  ( : > ./$c ) || continue
-  ./install-sh $c x d5/$c/$c
-  test -f d5/$c/$c/x
-  test -f d5/$c/$c/$c
-  rm -f d5/$c/$c/?
-  ./install-sh -t d5/$c/$c $c x
-  test -f d5/$c/$c/x
-  test -f d5/$c/$c/$c
-done
-
-:
diff --git a/tests/instsh3.test b/tests/instsh3.test
deleted file mode 100755
index b7b8761..0000000
--- a/tests/instsh3.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# More install-sh checks: check -C.
-
-required=non-root
-. ./defs || Exit 1
-set -e
-
-# Solaris /usr/ucb/touch does not accept -t.
-touch -t $old_timestamp foo || Exit 77
-
-./install-sh -d d1
-
-# Do not change the timestamps when using -C.
-echo foo >file
-./install-sh -C file d1
-TZ=UTC0 touch -t $old_timestamp d1/file
-./install-sh -C file d1
-is_newest file d1/file
-echo foo1 >file
-./install-sh -C file d1
-diff file d1/file
-# Rights must be updated.
-./install-sh -C -m 444 file d1
-test -r d1/file
-test ! -w d1/file
diff --git a/tests/instspc.test b/tests/instspc.test
deleted file mode 100755
index c305461..0000000
--- a/tests/instspc.test
+++ /dev/null
@@ -1,192 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2005, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that installation to directory with shell metacharacters succeed.
-# Original report from James Amundson about file names with spaces.
-# Other characters added by Paul Eggert.
-
-# This is mostly the same input as nobase.test, but we do not use
-# libtool libraries, because Libtool does not preserve space in
-# file names (Issue observed with ltmain.sh (GNU libtool) 1.5a (1.1323
-# 2003/11/10 21:06:47))
-
-
-required='gcc'
-. ./defs || Exit 1
-
-set -e
-
-# Set up files that won't change each time through the loop.
-
-cat >> configure.in <<'EOF'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-EOF
-
-mkdir sub
-
-: > sub/base.h
-: > sub/nobase.h
-: > sub/base.dat
-: > sub/nobase.dat
-: > sub/base.sh
-: > sub/nobase.sh
-
-cat >source.c <<'EOF'
-int
-main (int argc, char **argv)
-{
-  return 0;
-}
-EOF
-cp source.c source2.c
-
-cat > Makefile.am << 'EOF'
-foodir = $(prefix)/foo
-fooexecdir = $(prefix)/foo
-
-foo_HEADERS = sub/base.h
-nobase_foo_HEADERS = sub/nobase.h
-
-dist_foo_DATA = sub/base.dat
-nobase_dist_foo_DATA = sub/nobase.dat
-
-dist_fooexec_SCRIPTS = sub/base.sh
-nobase_dist_fooexec_SCRIPTS = sub/nobase.sh
-
-fooexec_PROGRAMS = sub/base
-nobase_fooexec_PROGRAMS = sub/nobase
-sub_base_SOURCES = source.c
-sub_nobase_SOURCES = source.c
-
-fooexec_LIBRARIES = sub/libbase.a
-nobase_fooexec_LIBRARIES = sub/libnobase.a
-sub_libbase_a_SOURCES = source.c
-sub_libnobase_a_SOURCES = source.c
-
-test-install-sep: install
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.h'
-       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.h'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.h'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.dat'
-       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.dat'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.dat'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.sh'
-       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.sh'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/base.sh'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase$(EXEEXT)'
-       test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase$(EXEEXT)'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/base$(EXEEXT)'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/sub/libnobase.a'
-       test ! -f '$(DESTDIR)/$(file)-prefix/foo/libnobase.a'
-       test   -f '$(DESTDIR)/$(file)-prefix/foo/libbase.a'
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Some control characters that are white space:
-# back space, carriage return, form feed, horizontal tab, line feed, space
-bs=''
-cr='
'
-ff=''
-ht='   '
-lf='
-'
-sp=' '
-
-build_failures=
-install_failures=
-
-for file in \
-  '!' '"' '#' '$' '%' '&' \' '(' ')' '*' '+' ',' '-' ':' ';' \
-  '<' '=' '>' '?' '@' '[' '\' ']' '^' '`' '{' '|' '}' '~' \
-  "$bs" "$cr" "$ff" "$ht" "$lf" "$sp" \
-  '@<:@' '@:>@' '@S|@' '@%:@' '@&t@' \
-  "a${sp}b" "a${sp}${sp}b" "a${lf}b" ... a:
-do
-  for test in build install; do
-    case $test in
-    build)
-      build=$file
-      dest=`pwd`/sub1;;
-    install)
-      build=sub1
-      dest=`pwd`/$file;;
-    esac
-
-    # Make sure this system supports this character in file names.
-    mkdir sub1 "./$file" || Exit 77
-
-    cd "$build"
-
-    # Some make implementations eliminate leading and trailing whitespace
-    # from macros passed on the command line, and some eliminate leading
-    # whitespace from macros set from environment variables, so prepend
-    # './' and use the latter here.
-    ../configure --prefix "/$file-prefix" &&
-    $MAKE &&
-    DESTDIR=$dest file=./$file $MAKE -e test-install-sep ||
-      eval "${test}_failures=\"\$${test}_failures$lf\$file\""
-
-    cd ..
-
-    rm -fr sub1 "./$file"
-  done
-done
-
-# The list of the above file names that cannot be used as a build directory
-# on a POSIX host.  This list should be empty, but is not due to limitations
-# in Autoconf, Automake, Make, M4, or the shell.
-expected_build_failures='
-"
-#
-$
-&
-'\''
-\
-`
-'"$lf"'
-@&t@
-a'"${lf}"'b'
-
-# Similarly, the list of file names that cannot be used as an install directory
-# on a POSIX host.  This list should also be empty.
-expected_install_failures='
-"
-#
-$
-'\''
-`
-'"$lf"'
-a'"${lf}"'b'
-
-fail=0
-for test in build install; do
-  eval failures=\$${test}_failures
-  case $failures in
-  ?*)
-    cat >&2 <<EOF
-$0: $test test failed for the following file names:$failures
-EOF
-    eval test \"\$failures\" = \"\$expected_${test}_failures\" || fail=1
-  esac
-done
-
-Exit $fail
diff --git a/tests/interp.test b/tests/interp.test
deleted file mode 100755
index 05464d2..0000000
--- a/tests/interp.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure variable interpolation works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-xs = a.c b.c
-foo_SOURCES = c.c $(xs)
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP ' a.$(OBJEXT)' Makefile.in
-$FGREP ' b.$(OBJEXT)' Makefile.in
-$FGREP ' c.$(OBJEXT)' Makefile.in
-
-:
diff --git a/tests/interp2.test b/tests/interp2.test
deleted file mode 100755
index cff8d1d..0000000
--- a/tests/interp2.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure variable interpolation doesn't break other
-# features.  Report from Joel N. Weber, II.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PATH_X
-AC_PATH_XTRA
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = x
-x_SOURCES = x.c
-x_LDADD = $(X_EXTRA_LIBS)
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/java-check.test b/tests/java-check.test
deleted file mode 100755
index a67b4e8..0000000
--- a/tests/java-check.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that check_JAVA causes *.class files to be built only with
-# "make check", and not also with "make all".
-# See automake bug#8234.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-check_JAVA = One.java Two.java
-END
-
-cat > One.java <<'END'
-class One { }
-END
-
-cat > Two.java <<'END'
-class Two { // Deliberately missing closing bracket.
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-inst=`pwd`/_inst
-
-./configure --prefix="$inst"
-
-$MAKE
-ls | $EGREP '\.(class|stamp)$' && Exit 1
-
-# Make Two.java compilable.
-echo '}' >> Two.java
-
-# "make check" should compile files in $(check_JAVA) ...
-$MAKE check
-ls -l # for debugging
-test -f One.class
-test -f Two.class
-# ... but should *not* install them.
-$FGREP checkdir Makefile && Exit 1
-$MAKE install
-test -d _inst && Exit 1
-
-:
diff --git a/tests/java-clean.test b/tests/java-clean.test
deleted file mode 100755
index 7db5e53..0000000
--- a/tests/java-clean.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test cleaning of Java class files and timestamps.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-
-java_JAVA = Class.java
-dist_java_JAVA = ClassDist.java
-nodist_java_JAVA = ClassNodist.java
-
-nobase_java_JAVA = ClassNobase.java
-nobase_dist_java_JAVA = ClassNobaseDist.java
-nobase_nodist_java_JAVA = ClassNobaseNodist.java
-END
-
-for base in '' Nobase; do
-  for dist in '' Dist Nodist; do
-    echo "class Class$base$dist {}" > Class$base$dist.java
-  done
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-ls -l
-test -f classjava.stamp
-for base in '' Nobase; do
-  for dist in '' Dist Nodist; do
-    test -f Class$base$dist.class
-  done
-done
-$MAKE clean
-find . -name '*.class' -o -name '*.stamp' | grep . && Exit 1
-# We should not remove unrelated stamp files.
-echo timestamp > classjava2.stamp
-echo timestamp > classdist_java.stamp
-$MAKE clean
-test -f classjava2.stamp
-test -f classdist_java.stamp
-
-:
diff --git a/tests/java-compile-install.test b/tests/java-compile-install.test
deleted file mode 100755
index 74b7a00..0000000
--- a/tests/java-compile-install.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test on compilation and installation of Java class files.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-java_JAVA = Foo.java
-nobase_java_JAVA = Foo2.java
-nobase_dist_java_JAVA = Bar.java
-nodist_java_JAVA = Baz.java
-
-# Java files are not distributed by default, so we distribute
-# one "by hand" ...
-EXTRA_DIST = Foo.java
-# ... and make the other one generated.
-Foo2.java:
-       rm -f $@ address@hidden
-       echo 'class bClass {}' > address@hidden
-       chmod a-w address@hidden && mv -f address@hidden $@
-
-# Explicitly declared as `nodist_', so generate it.
-Baz.java:
-       rm -f $@ address@hidden
-       echo 'class Baz {}' > address@hidden
-       echo 'class Baz2 {}' >> address@hidden
-       chmod a-w address@hidden && mv -f address@hidden $@
-
-test:
-       ls -l $(srcdir) . ;: For debugging.
-       test   -f $(srcdir)/Foo.java
-       test   -f $(srcdir)/Bar.java
-       test   -f Foo2.java
-       test   -f Baz.java
-       test   -f aClass.class
-       test   -f bClass.class
-       test   -f Zardoz.class
-       test   -f Baz.class
-       test   -f Baz2.class
-       test ! -r Foo.class
-       test ! -r Bar.class
-       test   -f classjava.stamp
-
-test-install:
-       ls -l $(javadir) ;: For debugging.
-       test   -f '$(javadir)/bClass.class'
-       test   -f '$(javadir)/aClass.class'
-       test   -f '$(javadir)/Zardoz.class'
-       test   -f '$(javadir)/Baz.class'
-       test   -f '$(javadir)/Baz2.class'
-       test ! -r '$(javadir)/Foo.class'
-       test ! -r '$(javadir)/Bar.class'
-       if find $(prefix) | grep '\.stamp$$'; then exit 1; else :; fi
-
-check-local: test
-installcheck-local: test-install
-
-.PHONY: test test-install
-
-DISTCLEANFILES = Baz.java Foo2.java
-END
-
-echo 'class aClass {}' > Foo.java
-echo 'class Zardoz {}' > Bar.java
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --prefix="`pwd`"/_inst
-$MAKE
-$MAKE test
-$MAKE install
-$MAKE test-install
-$MAKE distcheck
-
-:
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
deleted file mode 100755
index e94f885..0000000
--- a/tests/java-empty-classpath.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Java compilation works also when CLASSPATH is unset or empty at
-# compilation time.  See automake bug#9306.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_CONFIG_SRCDIR([org/gnu/bug/Library.java])
-AC_CONFIG_FILES([
-    org/Makefile
-    org/gnu/Makefile
-    org/gnu/bug/Makefile
-])
-AC_OUTPUT
-END
-
-mkdir org org/gnu org/gnu/bug
-cat > Makefile.am <<END
-CLEANFILES = *.class
-SUBDIRS = org
-END
-echo SUBDIRS = gnu > org/Makefile.am
-echo SUBDIRS = bug > org/gnu/Makefile.am
-cat > org/gnu/bug/Makefile.am <<'END'
-JAVAROOT = ../../..
-dist_noinst_JAVA = Library.java Application.java
-END
-
-cat > org/gnu/bug/Library.java <<'END'
-package org.gnu.bug;
-public class Library
-{
-    public Library ()
-    {
-      // Nothing to do.
-    }
-    public static void doSomethingUseful (String arg)
-    {
-      System.out.println (arg);
-    }
-}
-END
-
-cat > org/gnu/bug/Application.java <<'END'
-import org.gnu.bug.*;
-public class Application
-{
-    public static void main (String args[])
-    {
-        Library lib = new Library ();
-        lib.doSomethingUseful ("PLUGH");
-    }
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-unset CLASSPATH || :
-$MAKE
-$MAKE clean
-
-CLASSPATH=''; export CLASSPATH
-$MAKE
-$MAKE clean
-
-unset CLASSPATH || :
-$MAKE distcheck
-
-:
diff --git a/tests/java-mix.test b/tests/java-mix.test
deleted file mode 100755
index d6a43e7..0000000
--- a/tests/java-mix.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the JAVA primary can be used freely in the same Makefile.am
-# with proper combinations of the `dist_', `nodist_' and `nobase_'
-# modifiers.  Also check that `.java' files are not ditributed by default.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-# This test does not require compilation of *.java files.
-JAVAC = false
-javadir = $(prefix)
-
-java_JAVA = Class.java
-dist_java_JAVA = ClassDist.java
-nodist_java_JAVA = ClassNodist.java
-
-nobase_java_JAVA = ClassNobase.java
-nobase_dist_java_JAVA = ClassNobaseDist.java
-nobase_nodist_java_JAVA = ClassNobaseNodist.java
-
-Class.java ClassNodist.java ClassNobase.java ClassNobaseNodist.java:
-       @echo '$@ should not be generated!' >&2; exit 1
-END
-
-: > ClassDist.java
-: > ClassNobaseDist.java
-
-$ACLOCAL
-$AUTOCONF
-# Automake used to display non-fatal warnings with this test, but
-# they were unexpected, so we want to consider them as failures in
-# this test.
-$AUTOMAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-test ! -s stderr
-
-./configure
-
-$MAKE distdir
-ls -l $distdir # For debugging.
-test ! -f $distdir/Class.java
-test -f $distdir/ClassDist.java
-test ! -f $distdir/ClassNobase.java
-test -f $distdir/ClassNobaseDist.java
-test ! -f $distdir/ClassNodist.java
-test ! -f $distdir/ClassNobaseNodist.java
-
-:
diff --git a/tests/java-no-duplicate.test b/tests/java-no-duplicate.test
deleted file mode 100755
index ec42a3b..0000000
--- a/tests/java-no-duplicate.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that some Java-related variables and rules are not repeatedly
-# defined.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-java_JAVA = a.java
-dist_java_JAVA = b.java
-nodist_java_JAVA = c.java
-nobase_java_JAVA = d.java
-nobase_dist_java_JAVA = e.java
-nobase_nodist_java_JAVA = f.java
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$EGREP -i '\.stamp|\.class|java|classpath' Makefile.in # For debugging.
-
-for var in JAVAC JAVAROOT CLASSPATH_ENV am__java_sources; do
-  grep "^$var =" Makefile.in
-  test `grep -c "^[$sp$tab]*$var[$sp$tab]*=" Makefile.in` = 1
-done
-
-grep '^classjava\.stamp:' Makefile.in
-test `grep -c "class.*java.*\.stamp.*:" Makefile.in` = 1
-
-:
diff --git a/tests/java-nobase.test b/tests/java-nobase.test
deleted file mode 100755
index 7b55290..0000000
--- a/tests/java-nobase.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test support of `nobase_' with the `JAVA' primary.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-nobase_java_JAVA = sub/subsub/Foo.java
-nobase_dist_java_JAVA = sub/Bar.java
-nobase_nodist_java_JAVA = sub2/Baz.java
-
-# Java files are not distributed by default.
-EXTRA_DIST = sub/subsub/Foo.java
-
-sub2/Baz.java:
-       rm -f $@ address@hidden
-       test -d sub2 || mkdir sub2
-       echo 'class Baz {}' > address@hidden
-       chmod a-w address@hidden && mv -f address@hidden $@
-
-.PHONY: test-install
-test-install:
-       find $(prefix) ;: For debugging.
-       test   -f $(javadir)/sub/subsub/Foo.class
-       test   -f $(javadir)/sub/Bar.class
-       test   -f $(javadir)/sub2/Baz.class
-installcheck-local: test-install
-DISTCLEANFILES = sub2/Baz.java
-END
-
-mkdir sub sub/subsub
-echo 'class Foo {}' > sub/subsub/Foo.java
-echo 'class Bar {}' > sub/Bar.java
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --prefix="`pwd`"/_inst
-$MAKE check
-$MAKE install
-$MAKE test-install
-$MAKE distcheck
-
-:
diff --git a/tests/java-sources.test b/tests/java-sources.test
deleted file mode 100755
index 770eb2d..0000000
--- a/tests/java-sources.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test definition of automake-generated private Makefile variable
-# `$(am__java_sources)'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-foodir = $(prefix)
-
-foo_JAVA = a.java
-dist_foo_JAVA = b.java
-nodist_foo_JAVA = c.java
-nobase_foo_JAVA = d.java
-nobase_dist_foo_JAVA = e.java
-nobase_nodist_foo_JAVA = f.java
-
-.PHONY: debug
-debug:
-       @echo 'am__java_sources: "$(am__java_sources)"'
-got:
-       @lst='$(am__java_sources)'; \
-         for f in $$lst; do echo $$f; done | sort > $@
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-cat > exp << 'END'
-a.java
-b.java
-c.java
-d.java
-e.java
-f.java
-END
-
-./configure
-$MAKE debug
-$MAKE got
-
-cat got
-cat exp
-diff exp got
-
-:
diff --git a/tests/java.test b/tests/java.test
deleted file mode 100755
index 4aa91d0..0000000
--- a/tests/java.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2007, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Minimal test of Java functionality.
-
-required=javac
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-dist_java_JAVA = a.java b.java
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-$EGREP '\.stamp|class' Makefile.in # For debugging.
-grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in
-test `grep -c '^all[-a-z]*:.*classjava\.stamp' Makefile.in` -eq 1
-
-cat >a.java <<EOF
-class a
-{
-}
-EOF
-
-cat >b.java <<EOF
-class b
-{
-}
-EOF
-
-./configure --prefix "`pwd`"
-$MAKE distcheck
diff --git a/tests/java2.test b/tests/java2.test
deleted file mode 100755
index d3b942c..0000000
--- a/tests/java2.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Java rules doesn't attempt to run javac when there is
-# no classes to compile.
-# Report from Braden McDaniel.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL(WITH_JDK, false)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-JAVAC = false
-JAVAROOT = $(top_builddir)/java
-
-JAVA_FILES = MyClass1.java
-
-if WITH_JDK
-noinst_JAVA = $(JAVA_FILES)
-endif
-
-EXTRA_DIST = $(JAVA_FILES)
-END
-
-: >MyClass1.java
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
diff --git a/tests/java3.test b/tests/java3.test
deleted file mode 100755
index 5701d8f..0000000
--- a/tests/java3.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Java rules don't attempt to compile or install
-# *.java files when there are none.
-# Report from Johannes Nicolai (PR/441).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([WHO_CARES], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if WHO_CARES
-JAVA_FILES = MyClass1.java
-endif
-
-javadir = $(prefix)/java
-java_JAVA = $(JAVA_FILES)
-END
-
-cat > MyClass1.java << 'END'
-class MyClass1 { // Deliberately missing right curly bracket.
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-cwd=`pwd` || Exit 1
-./configure --prefix="$cwd/_inst"
-$MAKE
-$MAKE install
-ls -l .
-find . -name '*.class' | grep . && Exit 1
-# If we have nothing to install, we shouldn't create any installation
-# directory.  Related to automake bug#11030.
-test ! -d _inst
-$MAKE uninstall
-$MAKE distcheck
-
-:
diff --git a/tests/javadir-undefined.test b/tests/javadir-undefined.test
deleted file mode 100755
index 9b6d1f3..0000000
--- a/tests/javadir-undefined.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Use of JAVA primary should not allow the use of the `java_' prefix
-# when $(javadir) is undefined.  Otherwise, we could silently end up
-# with a broken Makefile.in (where "make install" doesn't install
-# the *.class files).
-# See automake bug#8461.
-
-. ./defs || Exit 1
-
-set -e
-
-$ACLOCAL
-
-echo java_JAVA = a.java > Makefile.am
-AUTOMAKE_fails
-grep '^Makefile\.am:1:.*java_JAVA.*javadir.* undefined' stderr
-$EGREP '(uninitialized|line) ' stderr && Exit 1
-
-echo javadir = a-dummy-value >> Makefile.am
-$AUTOMAKE
-
-:
diff --git a/tests/javaprim.test b/tests/javaprim.test
deleted file mode 100755
index aa1506b..0000000
--- a/tests/javaprim.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure JAVA variable can be defined.
-
-. ./defs || Exit 1
-
-echo 'AC_SUBST(JAVA)' >> configure.in
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-java_JAVA = a.java b.java c.java
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/javasubst.test b/tests/javasubst.test
deleted file mode 100755
index d018645..0000000
--- a/tests/javasubst.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure redefining JAVAC works.
-
-. ./defs || Exit 1
-
-echo 'AC_SUBST(JAVAC)' >> configure.in
-
-cat > Makefile.am << 'END'
-javadir = $(datadir)/java
-java_JAVA = a.java b.java c.java
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'address@hidden@' Makefile.in
diff --git a/tests/ldadd.test b/tests/ldadd.test
deleted file mode 100755
index 3515a4e..0000000
--- a/tests/ldadd.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure incorrect LDADD usage is diagnosed.
-
-required=libtool
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AC_SUBST([LTLIBOBJS], [q.lo])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libtu.la
-libtu_la_SOURCES = foo.c
-libtu_la_LDADD = @LTLIBOBJS@
-END
-
-: > ltconfig
-: > ltmain.sh
-: > config.guess
-: > config.sub
-: > q.c
-
-$ACLOCAL || Exit 1
-AUTOMAKE_fails -Wno-extra-portability
-grep "libtu_la_LDADD" stderr
-grep " use [\`"']libtu_la_LIBADD' stderr
-Exit 0
diff --git a/tests/ldflags.test b/tests/ldflags.test
deleted file mode 100755
index c00f227..0000000
--- a/tests/ldflags.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for LDFLAGS in conditional.
-# PR 77.
-required=libtool
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_SUBST([LTLIBOBJS], [q.o])
-AM_CONDITIONAL(USE_SWIG, :)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if USE_SWIG
-lib_LTLIBRARIES = libtu.la
-libtu_la_SOURCES = foo.c
-libtu_la_LDFLAGS = -module
-endif
-END
-
-: > ltconfig
-: > ltmain.sh
-: > ar-lib
-: > config.guess
-: > config.sub
-: > q.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/lex-subobj-nodep.test b/tests/lex-subobj-nodep.test
deleted file mode 100755
index 4449715..0000000
--- a/tests/lex-subobj-nodep.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure subdirs for subdir scanners are generated when subdir-objects
-# are used, even when dependency tracking is disabled.
-
-required=flex
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<\END
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_OUTPUT
-END
-
-cat >Makefile.am <<\END
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = p1 p2
-p1_SOURCES = sub1/s1.l
-p2_SOURCES = sub2/s2.l
-p2_CPPFLAGS = -DWHATEVER
-END
-
-mkdir sub1 sub2
-
-cat >sub1/s1.l <<\END
-%%
-"END"   return EOF;
-.
-%%
-int main (void)
-{
-  while (yylex () != EOF)
-    ;
-  return 0;
-}
-
-int yywrap(void)
-{
-  return 0;
-}
-END
-
-cp sub1/s1.l sub2/s2.l
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-mkdir build
-cd build
-../configure --disable-dependency-tracking
-$MAKE sub1/s1.c
-$MAKE sub2/s2.c
-rm -rf sub1 sub2
-$MAKE
-
-:
diff --git a/tests/lex.test b/tests/lex.test
deleted file mode 100755
index c59c4e3..0000000
--- a/tests/lex.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_LEX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zot
-zot_SOURCES = joe.l
-LDADD = @LEXLIB@
-END
-
-: > joe.l
-
-$ACLOCAL
-$AUTOMAKE -a
-
-
-# Test to make sure that lex source generates correct target.
-
-$FGREP '$(LEX)' Makefile.in
-
-# Test to make sure that lex source generates correct clean rule.
-# From Ralf Corsepius.
-
-$FGREP joel Makefile.in && Exit 1
-
-:
diff --git a/tests/lex2.test b/tests/lex2.test
deleted file mode 100755
index d588edf..0000000
--- a/tests/lex2.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Automake suggest using AM_PROG_LEX when a lexer is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zot
-zot_SOURCES = joe.l
-END
-
-: > joe.l
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PROG_LEX stderr
diff --git a/tests/lex3.test b/tests/lex3.test
deleted file mode 100755
index c0af6b2..0000000
--- a/tests/lex3.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test associated with PR 19.
-# From Matthew D. Langston.
-
-required='gcc flex GNUmake'
-. ./defs || Exit 1
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-cat > configure.in << 'END'
-AC_INIT
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(am_lex_bug, 0.1.1)
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_YACC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-LDADD             = @LEXLIB@
-noinst_PROGRAMS   = foo
-foo_SOURCES       = foo.l
-END
-
-cat > foo.l << 'END'
-%%
-"END"   return EOF;
-.
-%%
-int
-main ()
-{
-  while (yylex () != EOF)
-    ;
-
-  return 0;
-}
-
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE
-echo 'This is the END' | ./foo
-$MAKE distcheck
-
-# foo.c must be shipped.
-gunzip am_lex_bug-0.1.1.tar.gz
-tar tf am_lex_bug-0.1.1.tar | $FGREP foo.c
-
-# While we are at it, make sure that foo.c is erased by
-# maintainer-clean, and not by distclean.
-test -f foo.c
-$MAKE distclean
-test -f foo.c
-./configure
-$MAKE maintainer-clean
-test ! -f foo.c
diff --git a/tests/lex4.test b/tests/lex4.test
deleted file mode 100755
index fee140d..0000000
--- a/tests/lex4.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dependencies work with .ll files.
-# Test synthesized from PR automake/6.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zoo
-zoo_SOURCES = joe.ll
-END
-
-: > joe.ll
-
-$ACLOCAL
-$AUTOMAKE -a
-
-$FGREP joe.Po Makefile.in
diff --git a/tests/lex5.test b/tests/lex5.test
deleted file mode 100755
index 88924b2..0000000
--- a/tests/lex5.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for subdir lexers.
-
-required='gcc GNUmake flex'
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([lex5], [1.0])
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_LEX
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS  = subdir-objects
-LDADD             = @LEXLIB@
-
-bin_PROGRAMS    = foo/foo
-foo_foo_SOURCES = foo/foo.l
-END
-
-mkdir foo
-
-cat > foo/foo.l << 'END'
-%%
-"END"   return EOF;
-.
-%%
-int
-main ()
-{
-  while (yylex () != EOF)
-    ;
-
-  return 0;
-}
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir sub
-cd sub
-../configure
-$MAKE foo/foo.o
-
-test -f foo/foo.c
-test -f foo/foo.o
-# ylwrap is not needed
-test ! -f ./ylwrap
-
-# Now, adds another lexer to test ylwrap.
-
-cd ..
-cp foo/foo.l foo/foo2.l
-cat >> Makefile.am << 'END'
-EXTRA_foo_foo_SOURCES = foo/foo2.l
-END
-
-# Make sure Makefile.in has a new time stamp: the rebuild rules are
-# used below.  We do this after updating Makefile.am, that way we can
-# ensure that automake, even with --no-force, is not confused if the
-# new Makefile.am has the same time stamp as the older one (since the
-# output will change, --no-force should have no effect).
-$sleep
-
-$AUTOMAKE -a --no-force
-test -f ./ylwrap
-
-cd sub
-$MAKE foo/foo2.o
-test -f foo/foo2.c
-test -f foo/foo2.o
-
-Exit 0
diff --git a/tests/lflags.test b/tests/lflags.test
deleted file mode 100755
index 4c3e048..0000000
--- a/tests/lflags.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
-# $(foo_LFLAGS).
-# Please keep this in sync with the sister tests lflags2.test, yflags.test
-# and yflags2.test
-
-. ./defs || Exit 1
-
-set -e
-
-cat >fake-lex <<'END'
-#!/bin/sh
-echo '/*' "$*" '*/' >lex.yy.c
-echo 'extern int dummy;' >> lex.yy.c
-END
-chmod a+x fake-lex
-
-# Remove Lex from the environment, so that it won't interfere
-# with `make -e' below.
-unset LEX || :
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-# Simulate presence of Lex using our fake-lex script.
-AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
-AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
-AC_SUBST([LEXLIB], [''])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = main.c foo.l
-bar_SOURCES = main.c bar.l
-AM_LFLAGS = __am_flags__
-bar_LFLAGS = __bar_flags__
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
-grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
-
-echo 'int main(void){ return 0; }' > main.c
-: > foo.l
-: > bar.l
-
-$AUTOCONF
-./configure
-env LFLAGS=__user_flags__ $MAKE -e
-
-ls -l
-
-cat foo.c
-grep '__am_flags__.*__user_flags__' foo.c
-cat bar-bar.c
-grep '__bar_flags__.*__user_flags__' bar-bar.c
-
-:
diff --git a/tests/lflags2.test b/tests/lflags2.test
deleted file mode 100755
index f13c656..0000000
--- a/tests/lflags2.test
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
-# $(foo_LFLAGS).
-# Please keep this in sync with the sister tests lflags.test, yflags.test
-# and yflags2.test
-
-required=g++ # FIXME: any working C++ compiler should be OK
-. ./defs || Exit 1
-
-set -e
-
-cat >fake-lex <<'END'
-#!/bin/sh
-echo '/*' "$*" '*/' >lex.yy.c
-echo 'extern int dummy;' >> lex.yy.c
-END
-chmod a+x fake-lex
-
-# Remove Lex from the environment, so that it won't interfere
-# with `make -e' below.
-unset LEX || :
-
-cat >> configure.in <<'END'
-AC_PROG_CXX
-# Simulate presence of Lex using our fake-lex script.
-AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
-AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
-AC_SUBST([LEXLIB], [''])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = main.cc foo.ll
-bar_SOURCES = main.cc bar.l++
-AM_LFLAGS = __am_flags__
-bar_LFLAGS = __bar_flags__
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
-grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
-
-echo 'int main(void) { return 0; }' > main.cc
-: > foo.ll
-: > bar.l++
-
-$AUTOCONF
-./configure
-env LFLAGS=__user_flags__ $MAKE -e
-
-ls -l
-
-cat foo.cc
-grep '__am_flags__.*__user_flags__' foo.cc
-cat bar-bar.c++
-grep '__bar_flags__.*__user_flags__' bar-bar.c++
-
-:
diff --git a/tests/libexec.test b/tests/libexec.test
deleted file mode 100755
index a6561b7..0000000
--- a/tests/libexec.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# PROGRAMS and LIBRARIES can be installed in (pkg)libexecdir.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-libexec_PROGRAMS = foo
-pkglibexec_PROGRAMS = bar
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-: > foo.c
-: > bar.c
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/libobj10.test b/tests/libobj10.test
deleted file mode 100755
index 97dffec..0000000
--- a/tests/libobj10.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Do not complain about the nonexistence of a source for LIBOBJS if
-# it's in BUILT_SOURCES.  Reported by Erez Zadok.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([foo])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libfoo.a
-libfoo_a_LIBADD = @LIBOBJS@
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*foo\.c' stderr
-
-echo 'BUILT_SOURCES = foo.c' >> Makefile.am
-
-$AUTOMAKE
diff --git a/tests/libobj11.test b/tests/libobj11.test
deleted file mode 100755
index fc7f173..0000000
--- a/tests/libobj11.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# AC_LIBOBJ must allow [] around its argument.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([mountlist])
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > ar-lib
-: > mountlist.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
diff --git a/tests/libobj12.test b/tests/libobj12.test
deleted file mode 100755
index e4522bc..0000000
--- a/tests/libobj12.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# Test if a file can be mentioned in LIBOBJS and explicitly.
-# (See libobj13.test for the LTLIBRARIES check.)
-
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([foo])
-AC_LIBOBJ([bar])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libfoo.a libbar.a
-noinst_PROGRAMS = p1 p2
-
-libfoo_a_SOURCES =
-libfoo_a_LIBADD = @LIBOBJS@
-
-libbar_a_SOURCES = foo.c
-
-p1_SOURCES =
-p1_LDADD = @LIBOBJS@
-
-p2_SOURCES = bar.c
-END
-
-: > ar-lib
-: > foo.c
-: > bar.c
-
-$ACLOCAL
-$AUTOMAKE
-
-# This however should be diagnosed, since foo.c and bar.c are in 
@address@hidden
-echo 'libfoo_a_SOURCES += foo.c' >> Makefile.am
-echo 'p1_SOURCES += bar.c' >> Makefile.am
-AUTOMAKE_fails
-$FGREP foo.c stderr
-$FGREP bar.c stderr
-
-# Global `LDADD' can also come into play.
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = a b
-LDADD = @LIBOBJS@
-END
-$AUTOMAKE
-grep 'a_DEPENDENCIES.*LIBOBJS' Makefile.in
-echo 'a_SOURCES = foo.c' >> Makefile.am
-AUTOMAKE_fails
-$FGREP foo.c stderr
diff --git a/tests/libobj13.test b/tests/libobj13.test
deleted file mode 100755
index fc3112b..0000000
--- a/tests/libobj13.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# Test if a file can be mentioned in LTLIBOBJS and explicitly.
-# (Like libobj12.test, but for Libtool libraries.)
-
-required='libtoolize'
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_LIBOBJ([foo])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LTLIBRARIES = libfoo.la libbar.la
-
-libfoo_la_SOURCES =
-libfoo_la_LIBADD = @LTLIBOBJS@
-
-libbar_la_SOURCES = foo.c
-END
-
-: > foo.c
-
-$ACLOCAL
-: > ltmain.sh
-$AUTOMAKE --add-missing
-
-# This however should be diagnosed, since foo.c is in @address@hidden
-echo 'libfoo_la_SOURCES += foo.c' >> Makefile.am
-AUTOMAKE_fails
-$FGREP foo.c stderr
diff --git a/tests/libobj14.test b/tests/libobj14.test
deleted file mode 100755
index 0ee750c..0000000
--- a/tests/libobj14.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for an internal error when @LIBOBJS@ is used in
-# a variable that is not defined in the same conditions as the _LDADD
-# that uses it.
-# Report from Bill Davidson
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AC_LIBSOURCE([bar.c])
-AM_CONDITIONAL([CASE], :)
-AC_OUTPUT
-EOF
-
-: >bar.c
-
-cat >>Makefile.am <<'EOF'
-COMMON_LIBS = @LIBOBJS@
-bin_PROGRAMS = foo
-if ! CASE
-foo_LDADD = $(COMMON_LIBS)
-endif
-EOF
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/libobj2.test b/tests/libobj2.test
deleted file mode 100755
index 36c01b3..0000000
--- a/tests/libobj2.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure LIBOBJS works in subdirs.
-# Bug from Josh MacDonald.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([fsusage])
-AC_OUTPUT(subdir/Makefile)
-END
-
-mkdir subdir
-
-cat > subdir/Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > ar-lib
-: > subdir/fsusage.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'fsusage\.c' subdir/Makefile.in
diff --git a/tests/libobj3.test b/tests/libobj3.test
deleted file mode 100755
index 7304b09..0000000
--- a/tests/libobj3.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we complain if @LIBOBJS@ is used without being set in configure.in
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AM_PROG_AR
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:3:.*LIBOBJS' stderr
diff --git a/tests/libobj4.test b/tests/libobj4.test
deleted file mode 100755
index d6639be..0000000
--- a/tests/libobj4.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure LIBOBJS error only occurs if LIBOBJS seen.  Report
-# from Jim Meyering.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_REPLACE_FUNCS(foo)
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/libobj5.test b/tests/libobj5.test
deleted file mode 100755
index 6add9e3..0000000
--- a/tests/libobj5.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure AC_REPLACE_FUNCS works across lines.  Report from
-# Jim Meyering.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = joe
-LDADD = @LIBOBJS@
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_REPLACE_FUNCS(\
-   foo)
-END
-
-: > foo.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-$FGREP foo.c Makefile.in
diff --git a/tests/libobj7.test b/tests/libobj7.test
deleted file mode 100755
index 1ff36c4..0000000
--- a/tests/libobj7.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for multiple replacement functions.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_REPLACE_FUNCS(basename dirname strsignal)
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > ar-lib
-: > basename.c
-: > dirname.c
-: > strsignal.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-sed -n -e ': again
-  /^DIST_COMMON.*[^\]$/ p
-  /^DIST_COMMON/ {
-     s/^DIST_COMMON//p
-     n
-     s/^/DIST_COMMON/
-     b again
-  }' < Makefile.in | $FGREP dirname.c
diff --git a/tests/libobj8.test b/tests/libobj8.test
deleted file mode 100755
index e143753..0000000
--- a/tests/libobj8.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `_.c' dependencies are generated for LIBOBJS
-# objects.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_REPLACE_FUNCS(basename dirname strsignal)
-AM_C_PROTOTYPES
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = ansi2knr
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > basename.c
-: > dirname.c
-: > strsignal.c
-
-: > ansi2knr.1
-: > ansi2knr.c
-: > ar-lib
-
-$ACLOCAL || Exit 1
-$AUTOMAKE  -Wno-obsolete || Exit 1
-
-grep 'strsignal_.c:' Makefile.in
diff --git a/tests/library.test b/tests/library.test
deleted file mode 100755
index 8adc575..0000000
--- a/tests/library.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for _DEPENDENCIES with libraries.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AM_MAINTAINER_MODE
-AC_PROG_CC
-AM_PROG_AR
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = dejagnu cygnus
-lib_LIBRARIES = libfoo.a
-libfoo_a_DEPENDENCIES = libzot.a
-END
-
-: > ar-lib
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/library2.test b/tests/library2.test
deleted file mode 100755
index d30c504..0000000
--- a/tests/library2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-EXTRA_LIBRARIES = libfoo.a
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wno-portability
-grep AC_PROG_RANLIB stderr
diff --git a/tests/library3.test b/tests/library3.test
deleted file mode 100755
index 9d30d87..0000000
--- a/tests/library3.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake simplify conditions in diagnostics.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AM_CONDITIONAL([A], [:])
-AM_CONDITIONAL([B], [:])
-AM_CONDITIONAL([C], [:])
-AM_CONDITIONAL([D], [:])
-EOF
-
-cat > Makefile.am << 'END'
-if A
-if !B
-  RANLIB = anb
-else
-  RANLIB = ab
-endif
-endif
-if C
-  RANLIB = c
-endif
-if !C
-if D
-  RANLIB = ncd
-endif
-endif
-EXTRA_LIBRARIES = libfoo.a
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '^Makefile.am:.*:   !A and !C and !D$' stderr
-# Is there only one missing condition?
-test `grep ':   !' stderr | wc -l` = 1 || Exit 1
diff --git a/tests/libtoo10.test b/tests/libtoo10.test
deleted file mode 100755
index 44c0726..0000000
--- a/tests/libtoo10.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure .libs directories are removed for _PROGRAMS.
-# Report from Guillermo Ontañón.
-
-required=libtoolize
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = lib/libfoo.la
-lib_libfoo_la_SOURCES = foo.c
-bin_PROGRAMS = src/main
-check_PROGRAMS = check/test
-src_main_SOURCES = main.c
-check_test_SOURCES = main.c
-LDADD = lib/libfoo.la
-END
-
-mkdir lib src check
-cat > foo.c << 'END'
-int foo () { return 0; }
-END
-
-cat > main.c << 'END'
-extern int foo ();
-int main () { return foo (); }
-END
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-./configure
-$MAKE all check
-$MAKE clean
-test ! -d src/.libs
-test ! -d src/_libs
-test ! -d check/.libs
-test ! -d check/_libs
-$MAKE distcheck
diff --git a/tests/libtoo11.test b/tests/libtoo11.test
deleted file mode 100755
index 850ca82..0000000
--- a/tests/libtoo11.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
-# Report by Charles Wilson.
-
-required=libtoolize
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_LIBTOOL
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-./configure
-$MAKE distcheck
-:
diff --git a/tests/libtool-macros.test b/tests/libtool-macros.test
deleted file mode 100755
index 06a35d9..0000000
--- a/tests/libtool-macros.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Try to find the libtool `.m4' files and make them easily accessed
-# to the test cases requiring them.
-# See also automake bug#9807.
-
-. ./defs || Exit 1
-
-echo "# Automatically generated by $me." > get.sh
-echo : >> get.sh
-
-# The `libtoolize' script will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
-
-if libtoolize --copy --install && test -f m4/libtool.m4; then
-  echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
-  echo "export ACLOCAL_PATH" >> get.sh
-else
-  # Libtoolize from libtool < 2.0 didn't support the `--install' option,
-  # but this doesn't mean the user hasn't made the libtool macros
-  # available, e.g., by properly setting ACLOCAL_PATH.
-  rm -rf m4
-  mkdir m4
-  echo AC_PROG_LIBTOOL >> configure.in
-  # See below for an explanation about the use the of `-Wno-syntax'.
-  if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then
-    : # Libtool macros already accessible by default.
-  else
-    echo "skip_ \"couldn't find or get libtool macros\"" >> get.sh
-  fi
-fi
-
-. ./get.sh
-
-$ACLOCAL --force -I m4 || cat >> get.sh <<'END'
-# We need to use `-Wno-syntax', since we do not want our test suite
-# to fail merely because some third-party `.m4' file is underquoted.
-ACLOCAL="$ACLOCAL -Wno-syntax"
-END
-
-# The file libtoolize might have just copied in the `m4' subdirectory of
-# the test directory are going to be needed by other tests, so we must
-# not remove the test directory.
-keep_testdirs=yes
-
-:
diff --git a/tests/libtool.test b/tests/libtool.test
deleted file mode 100755
index dd2a939..0000000
--- a/tests/libtool.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure libtool is removed.
-# Report from Kevin Dalley
-required=libtool
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_LIBTOOL_DLOPEN
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-END
-
-: > Makefile.am
-
-: > ltmain.sh
-: > config.guess
-: > config.sub
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'rm -f libtool' Makefile.in
diff --git a/tests/libtool2.test b/tests/libtool2.test
deleted file mode 100755
index 0120fa9..0000000
--- a/tests/libtool2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure libtool clean targets exist.
-# Report from Eric Magnien.
-required=libtoolize
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(mypackage,0.1)
-
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-
-AC_CONFIG_FILES([
-  sub/Makefile
-  Makefile
-])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIR = subdir
-lib_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = foo.c
-END
-
-mkdir sub
-cat > sub/Makefile.am << 'END'
-lib_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = foo.c
-END
-
-$ACLOCAL || Exit 1
-: > ltmain.sh
-$AUTOMAKE -a || Exit 1
-
-grep 'rm -f .*\.lo' sub/Makefile.in
diff --git a/tests/libtool3.test b/tests/libtool3.test
deleted file mode 100755
index 1643f31..0000000
--- a/tests/libtool3.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Try to build and package a program linked to a Libtool library.
-# Also make sure we do not bloat the Makefile with unneeded rules.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AM_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = lib0.la liba/liba.la
-lib0_la_SOURCES = 0.c
-liba_liba_la_SOURCES = liba/a.c
-
-bin_PROGRAMS = 1
-1_SOURCES = sub/1.c
-1_LDADD = lib0.la liba/liba.la
-END
-
-mkdir liba sub
-
-cat > 0.c << 'END'
-int
-zero (void)
-{
-   return 0;
-}
-END
-
-cat > sub/1.c << 'END'
-int zero ();
-
-int
-main ()
-{
-   return zero ();
-}
-END
-
-cat > liba/a.c << 'END'
-int
-a (void)
-{
-   return 'a';
-}
-END
-
-# Use --copy to workaround a bug in Cygwin's `cp -p' during distcheck.
-# (This bug is already exhibited by subobj9.test.)  In brief: Cygwin's
-# `cp -p' tries to preserve group and owner of the source and fails
-# to do so under normal accounts.  With --copy we ensure we own all files.
-
-libtoolize --force --copy
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing --copy
-
-# We need explicit rules to build 1.o and a.lo.  Make sure
-# Automake did not output additional rules for 1.lo and and a.lo.
-$FGREP '1.o:' Makefile.in
-$FGREP '1.lo:' Makefile.in && Exit 1
-$FGREP 'a.o:' Makefile.in && Exit 1
-$FGREP 'a.lo:' Makefile.in
-
-./configure
-
-$MAKE
-$MAKE distcheck
diff --git a/tests/libtool4.test b/tests/libtool4.test
deleted file mode 100755
index 814b537..0000000
--- a/tests/libtool4.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-END
-
-cat > Makefile.am << 'END'
-EXTRA_LTLIBRARIES = liblib.la
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '[Ll]ibtool library .*LIBTOOL.* undefined' stderr
-grep 'define .*LIBTOOL.* add .*LT_INIT' stderr
-
-:
diff --git a/tests/libtool5.test b/tests/libtool5.test
deleted file mode 100755
index 8208388..0000000
--- a/tests/libtool5.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure it's ok to install a library under different conditions
-# in the same directory.
-# Report from Harlan Stenn.
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [false])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-if COND1
-  lib_LTLIBRARIES = liba.la
-endif
-if COND2
-  lib_LTLIBRARIES = liba.la
-endif
-END
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
diff --git a/tests/libtool6.test b/tests/libtool6.test
deleted file mode 100755
index ea5fd9c..0000000
--- a/tests/libtool6.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure it's OK to install a library under different conditions
-# in different directories.  PR/285.
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [false])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-if COND1
-  lib_LTLIBRARIES = liba.la
-endif
-if COND2
-  pkglib_LTLIBRARIES = liba.la
-endif
-END
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-# am_liba_la_rpath is defined twice, and used once
-test 3 = `grep 'am_liba_la_rpath' Makefile.in | wc -l`
diff --git a/tests/libtool7.test b/tests/libtool7.test
deleted file mode 100755
index 8ebce0a..0000000
--- a/tests/libtool7.test
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we allow Libtool's -dlopen/-dlpreopen
-# Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-AM_LIBTOOLFLAGS = --silent
-lib_LTLIBRARIES = libmod1.la mod2.la
-libmod1_la_SOURCES = sub/mod1.c
-libmod1_la_LDFLAGS = -module
-libmod1_la_LIBADD = -dlopen mod2.la
-mod2_la_SOURCES = mod2.c
-mod2_la_LDFLAGS = -module
-mod2_la_LIBTOOLFLAGS =
-
-bin_PROGRAMS = prg
-prg_SOURCES = prg.c
-prg_LDADD = -dlopen libmod1.la -dlpreopen mod2.la
-
-print:
-       @echo 1BEG: $(prg_DEPENDENCIES) :END1
-       @echo 2BEG: $(libmod1_la_DEPENDENCIES) :END2
-       @echo 3BEG: $(LTCOMPILE) :END3
-END
-
-mkdir sub liba
-
-cat > sub/mod1.c << 'END'
-int
-mod1 ()
-{
-   return 1;
-}
-END
-
-cat > mod2.c << 'END'
-int
-mod2 ()
-{
-   return 2;
-}
-END
-
-cat > prg.c << 'END'
-int
-main ()
-{
-   return 0;
-}
-END
-
-libtoolize --force --copy
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing --copy
-
-./configure "--prefix=`pwd`/_inst"
-env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1
-cat output
-grep '1BEG: libmod1.la mod2.la :END1' output
-grep '2BEG: mod2.la :END2' output
-grep '3BEG: .*silent.*silent.* :END3' output
-test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l`
-$MAKE
-
-env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1
-cat output
-grep 'silent.*silent.*prg' output
-grep 'silent.*silent.*libmod1' output
-
-env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1
-cat output
-grep 'silent.*silent.*libmod1' output
diff --git a/tests/libtool8.test b/tests/libtool8.test
deleted file mode 100755
index ed1b6cf..0000000
--- a/tests/libtool8.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake diagnoses conflicting installations.
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [false])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-if COND1
-  lib_LTLIBRARIES = liba.la
-  EXTRA_LTLIBRARIES = libc.la libc.la libb.la
-else
-  lib_LTLIBRARIES = libb.la
-endif
-if COND2
-if COND1
-    pkglib_LTLIBRARIES = liba.la
-endif
-LIBTOOLFLAGS = ouch
-endif
-END
-
-libtoolize
-$ACLOCAL
-AUTOMAKE_fails --add-missing
-grep libb stderr && Exit 1
-grep 'Makefile.am:3:.*libc.la.*multiply defined' stderr
-grep 'Makefile.am:9:.*`pkglib' stderr
-grep 'Makefile.am:2:.*`lib' stderr
-grep 'Makefile.am:11:.*AM_LIBTOOLFLAGS' stderr
diff --git a/tests/libtool9.test b/tests/libtool9.test
deleted file mode 100755
index a27a1da..0000000
--- a/tests/libtool9.test
+++ /dev/null
@@ -1,104 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure xxx_LINK is defined for each target that requires specific
-# flags.
-# Quite similar to libtool7.test, using AM_LDFLAGS in addition to xxx_LDFLAGS.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AM_LDFLAGS = -module
-lib_LTLIBRARIES = libmod1.la mod2.la
-libmod1_la_SOURCES = mod1.c
-libmod1_la_LDFLAGS =
-libmod1_la_LIBADD = -dlopen mod2.la
-mod2_la_SOURCES = mod2.c
-
-bin_PROGRAMS = prg prg2
-prg_SOURCES = prg.c
-prg_LDADD = -dlopen libmod1.la -dlpreopen mod2.la
-prg_CPPFLAGS = -DXYZ=1
-prg2_SOURCES = prg.c
-prg2_CFLAGS =
-
-print:
-       @echo 1BEG: $(prg_DEPENDENCIES) :END1
-       @echo 2BEG: $(libmod1_la_DEPENDENCIES) :END2
-       @echo 3BEG: $(libmod1_la_LINK) :END3
-       @echo 4BEG: $(mod2_la_LINK) :END4
-       @echo 5BEG: $(prg_LINK) :END5
-       @echo 6BEG: $(prg2_LINK) :END6
-
-END
-
-mkdir liba
-
-cat > mod1.c << 'END'
-int
-mod1 ()
-{
-   return 1;
-}
-END
-
-cat > mod2.c << 'END'
-int
-mod2 ()
-{
-   return 2;
-}
-END
-
-cat > prg.c << 'END'
-int
-main ()
-{
-   return 0;
-}
-END
-
-libtoolize --force --copy
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing --copy
-
-./configure
-env LDFLAGS=ldflags AM_LDFLAGS=am_ldflags libmod1_la_LDFLAGS=lm1_la_ldflags \
-    CFLAGS=cflags AM_CFLAGS=am_cflags prg2_CFLAGS=prg2_cflags \
-    $MAKE -e print >output 2>&1
-cat output
-grep '1BEG: libmod1.la mod2.la :END1' output
-grep '2BEG: mod2.la :END2' output
-grep '3BEG:.* am_cflags cflags .*lm1_la_ldflags ldflags.* :END3' output
-grep '3BEG: .*am_ldflags.* :END3' output && Exit 1
-grep '4BEG: :END4' output
-grep '5BEG: :END5' output
-grep '6BEG:.* prg2_cflags cflags .*am_ldflags ldflags.* :END6' output
-grep '6BEG: .*am_cflags.* :END6' output && Exit 1
-$MAKE
diff --git a/tests/license.test b/tests/license.test
deleted file mode 100755
index 4a69791..0000000
--- a/tests/license.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure COPYING is not overwritten, even with -a -f.
-
-required=makeinfo
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >>configure.in
-cat >Makefile.am <<\EOF
-test1: distdir
-       grep 'GNU GENERAL PUBLIC LICENSE' $(distdir)/COPYING
-test2: distdir
-       grep 'MY-OWN-LICENSE' $(distdir)/COPYING
-test3: distdir
-       test ! -f $(distdir)/COPYING
-       grep 'MY-OWN-LICENSE' $(distdir)/COPYING.LIB
-EOF
-
-:> NEWS
-:> AUTHORS
-:> ChangeLog
-:> README
-
-test ! -f COPYING
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --gnu --add-missing
-
-./configure
-$MAKE test1
-
-# rm before echo, because COPYING is likely to be a symlink to
-# the real COPYING...
-rm -f COPYING
-echo 'MY-OWN-LICENSE' >COPYING
-$MAKE test2
-
-$AUTOMAKE --gnu --add-missing --force-missing
-./configure
-$MAKE test2
-
-rm -f COPYING
-echo 'MY-OWN-LICENSE' >COPYING.LIB
-$AUTOMAKE --gnu --add-missing --force-missing
-./configure
-$MAKE test3
diff --git a/tests/license2.test b/tests/license2.test
deleted file mode 100755
index 75f7811..0000000
--- a/tests/license2.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that installing `COPYING' outputs a warning.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = gnu
-END
-
-: >AUTHORS
-: >NEWS
-: >README
-: >ChangeLog
-: >INSTALL
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'COPYING' stderr
-
-AUTOMAKE_run 0 --add-missing
-grep 'COPYING' stderr
-grep 'GNU General Public License' stderr
-grep 'Consider adding.*version control' stderr
-test -f COPYING
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
deleted file mode 100755
index d1a093c..0000000
--- a/tests/link_c_cxx.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the C++ linker is used when appropriate.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.c lamp.cxx
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the C++ linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(FLINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'  Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_cond.test b/tests/link_cond.test
deleted file mode 100755
index 0d61865..0000000
--- a/tests/link_cond.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that automatic determination of the linker works well with
-# conditional use of languages in a single program.
-# This currently doesn't truly work, but we have an easy workaround
-# at least, that is tested here.
-# See automake bug#11089.
-
-required='cc c++'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AM_CONDITIONAL([HAVE_CXX], [test $have_cxx = yes])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-if HAVE_CXX
-foo_SOURCES = more.c++
-else
-foo_SOURCES = less.c
-endif
-## FIXME: ideally, this workaround shouldn't be needed.
-if HAVE_CXX
-foo_LINK = $(CXXLINK)
-else
-foo_LINK = $(LINK)
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-rm -f *.c++
-cat > less.c <<'END'
-/* Valid C but deliberately invalid C++ */
-main ()
-{
-  int new = 0;
-  return new;
-}
-END
-
-./configure have_cxx=no
-CXX=false $MAKE -e
-
-# Sanity check.
-rm -f foo foo.exe
-CC=false $MAKE -e && Exit 99
-
-$MAKE distclean
-
-rm -f *.c
-cat > more.c++ <<'END'
-/* Valid C++ but deliberately invalid C */
-using namespace std;
-int main (void)
-{
-  return 0;
-}
-END
-
-./configure have_cxx=yes
-CC=false $MAKE -e
-
-# Sanity check.
-rm -f foo foo.exe
-CXX=false $MAKE -e && Exit 99
-
-:
diff --git a/tests/link_dist.test b/tests/link_dist.test
deleted file mode 100755
index 661d683..0000000
--- a/tests/link_dist.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the linker for a dist_*_SOURCES can override that for
-# *_SOURCES
-# Richard Boulton <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.c
-dist_lavalamp_SOURCES = lamp.cxx
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the C++ linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(FLINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'  Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
deleted file mode 100755
index 979eb67..0000000
--- a/tests/link_f90_only.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the Fortran 90 linker is used when appropriate.
-# (copied from link_f_only.test) Mike Nolta <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_FC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lamp.f90
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the Fortran linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(FCLINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(CXXLINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'    Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
deleted file mode 100755
index c4df8ce..0000000
--- a/tests/link_f_only.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the Fortran 77 linker is used when appropriate.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lamp.f
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the Fortran linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(F77LINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(CXXLINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'    Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_fc.test b/tests/link_fc.test
deleted file mode 100755
index 8c80f8c..0000000
--- a/tests/link_fc.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the Fortran 77 linker is used when appropriate.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.c lamp.f
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the Fortran 77 linker in the rules of
-# `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(F77LINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(LINK)'    Makefile.in && Exit 1
-grep '.\$(CXXLINK)' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
deleted file mode 100755
index 30263d0..0000000
--- a/tests/link_fccxx.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the C++ linker is used when appropriate.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.c lamp.cxx lamp2.f
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the C++ linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(F77LINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'    Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
deleted file mode 100755
index c75ffc7..0000000
--- a/tests/link_fcxx.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the C++ linker is used when appropriate.
-# Matthew D. Langston <address@hidden>
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = lavalamp
-lavalamp_SOURCES = lava.cxx lamp.f
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# We should only see the C++ linker in the rules of `Makefile.in'.
-
-# Look for this macro not at the beginning of any line; that will have
-# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in
-
-# We should not see these patterns:
-grep '.\$(F77LINK)' Makefile.in && Exit 1
-grep '.\$(LINK)'    Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/lisp2.test b/tests/lisp2.test
deleted file mode 100755
index 2fccdb2..0000000
--- a/tests/lisp2.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 1
-
-cat > Makefile.am << 'END'
-lisp_LISP = foo.el
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PATH_LISPDIR stderr
-
-
-echo 2
-# Setting lispdir should not be enough.
-
-cat > Makefile.am << 'END'
-lispdir = /usr/share/emacs/site-lisp
-lisp_LISP = foo.el
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PATH_LISPDIR stderr
-
-echo 3
-# Setting EMACS should not be enough.
-
-cat > Makefile.am << 'END'
-EMACS = emacs
-lisp_LISP = foo.el
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PATH_LISPDIR stderr
-
-
-echo 4
-# Setting both is OK.
-
-cat > Makefile.am << 'END'
-lispdir = /usr/share/emacs/site-lisp
-EMACS = emacs
-lisp_LISP = foo.el
-END
-
-$ACLOCAL
-$AUTOMAKE -a
diff --git a/tests/lisp3.test b/tests/lisp3.test
deleted file mode 100755
index 809d491..0000000
--- a/tests/lisp3.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Test that compiling interdependent elisp files works.
-
-required=emacs
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-lisp_LISP = am-one.el am-two.el am-three.el
-EXTRA_DIST = am-one.el am-two.el
-am-three.el:
-       echo "(provide 'am-three)" > $@
-CLEANFILES = am-three.el
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-# am-three.el is a built source
-
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-
-$MAKE
-
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-# Make sure we can recover from a deletion.
-rm -f am-one.elc
-$MAKE
-test -f am-one.elc
-
-# Make sure we build all files when any of them change.
-# (We grep a message to make sure the compilation happens.)
-unique=0a3346e2af8a689b85002b53df09142a
-$sleep
-echo "(message \"$unique\")(provide 'am-three)" > am-three.el
-$MAKE >output 2>&1
-cat output
-grep $unique output
-
-# It should also work for VPATH-builds.
-$MAKE distcheck
diff --git a/tests/lisp4.test b/tests/lisp4.test
deleted file mode 100755
index 080ab3b..0000000
--- a/tests/lisp4.test
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Make sure setting ELCFILES= disable byte-compilation as documented.
-# Report from Simon Josefsson.
-
-required=emacs
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-lisp_LISP = am-one.el am-two.el am-three.el
-EXTRA_DIST = am-one.el am-two.el
-ELCFILES=
-am-three.el:
-       echo "(provide 'am-three)" > $@
-CLEANFILES = am-three.el
-
-test:
-       test ! -f am-one.elc
-       test ! -f am-two.elc
-       test ! -f am-three.elc
-       test ! -f elc-stamp
-
-install-test: install
-       test -f "$(lispdir)/am-one.el"
-       test -f "$(lispdir)/am-two.el"
-       test -f "$(lispdir)/am-three.el"
-       test ! -f "$(lispdir)/am-one.elc"
-       test ! -f "$(lispdir)/am-two.elc"
-       test ! -f "$(lispdir)/am-three.elc"
-
-install-test2: install
-       test ! -f "$(lispdir)/am-one.el"
-       test ! -f "$(lispdir)/am-two.el"
-       test ! -f "$(lispdir)/am-three.el"
-       test ! -f "$(lispdir)/am-one.elc"
-       test ! -f "$(lispdir)/am-two.elc"
-       test ! -f "$(lispdir)/am-three.elc"
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-# am-tree.el is a built source
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure --prefix "`pwd`"
-$MAKE
-$MAKE test
-$MAKE install-test
-$MAKE uninstall
-
-# Fake the absence of emacs.
-# *.el files should not be installed.
-./configure EMACS=no --prefix "`pwd`"
-$MAKE
-$MAKE test
-$MAKE install-test2
diff --git a/tests/lisp5.test b/tests/lisp5.test
deleted file mode 100755
index e7b29e7..0000000
--- a/tests/lisp5.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Same as lisp4.test, but using the now-recommended way to install
-# non-bytecompiled *.el files.
-
-required=emacs
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-lisp_DATA = am-one.el am-two.el am-three.el
-EXTRA_DIST = am-one.el am-two.el
-am-three.el:
-       echo "(provide 'am-three)" > $@
-CLEANFILES = am-three.el
-
-test:
-       test ! -f am-one.elc
-       test ! -f am-two.elc
-       test ! -f am-three.elc
-       test ! -f elc-stamp
-
-install-test: install
-       test -f "$(lispdir)/am-one.el"
-       test -f "$(lispdir)/am-two.el"
-       test -f "$(lispdir)/am-three.el"
-       test ! -f "$(lispdir)/am-one.elc"
-       test ! -f "$(lispdir)/am-two.elc"
-       test ! -f "$(lispdir)/am-three.elc"
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-# am-tree.el is a built source
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure --prefix "`pwd`"
-$MAKE
-$MAKE test
-$MAKE install-test
-$MAKE uninstall
-
-# Fake the absence of emacs.
-# *.el files SHOULD be installed.
-./configure EMACS=no --prefix "`pwd`"
-$MAKE
-$MAKE test
-$MAKE install-test
diff --git a/tests/lisp6.test b/tests/lisp6.test
deleted file mode 100755
index f386534..0000000
--- a/tests/lisp6.test
+++ /dev/null
@@ -1,104 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2005, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Test for conditional _LISP.
-
-required=emacs
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-dist_lisp_LISP = am-one.el
-if WANT_TWO
-  dist_lisp_LISP += am-two.el
-endif
-dist_noinst_LISP = am-three.el
-
-dist-test: distdir
-       test -f $(distdir)/am-one.el
-       test -f $(distdir)/am-two.el
-       test -f $(distdir)/am-three.el
-EOF
-
-cat >> configure.in << 'EOF'
-AM_CONDITIONAL([WANT_TWO], test -n "$want_two")
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(provide 'am-one)" > am-one.el
-echo "(require 'am-one)" > am-two.el
-echo "(require 'am-one)" > am-three.el
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure "--with-lispdir=`pwd`/lisp"
-
-$MAKE
-test -f am-one.elc
-test ! -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-$MAKE install
-test -f lisp/am-one.el
-test -f lisp/am-one.elc
-test ! -f lisp/am-two.el
-test ! -f lisp/am-two.elc
-test ! -f lisp/am-three.el
-test ! -f lisp/am-three.elc
-
-$MAKE dist-test
-
-$MAKE distclean
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
-
-
-./configure "--with-lispdir=`pwd`/lisp" want_two=1
-$MAKE
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-# Let's mutilate the source tree, the check the recover rule.
-rm -f am-*.elc
-$MAKE
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-$MAKE install
-test -f lisp/am-one.el
-test -f lisp/am-one.elc
-test -f lisp/am-two.el
-test -f lisp/am-two.elc
-test ! -f lisp/am-three.el
-test ! -f lisp/am-three.elc
-
-$MAKE dist-test
-
-$MAKE distclean
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
diff --git a/tests/lisp7.test b/tests/lisp7.test
deleted file mode 100755
index cf52527..0000000
--- a/tests/lisp7.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Make sure that lisp_LISP also works when emacs is not installed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-dist_lisp_LISP = am-one.el am-two.el am-three.el
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-EMACS=no # Simulate no emacs.
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-echo "(provide 'am-three)" > am-three.el
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-
-$MAKE >stdout
-
-cat stdout
-test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
-
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test -f elc-stamp
-
-$MAKE distcheck
diff --git a/tests/lisp8.test b/tests/lisp8.test
deleted file mode 100755
index 8a3edf2..0000000
--- a/tests/lisp8.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Check the recover rule of lisp_LISP with parallel make.
-
-required='GNUmake emacs'
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-dist_lisp_LISP = am-one.el am-two.el am-three.el
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-echo "(provide 'am-three)" > am-three.el
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-
-: >stdout
-$MAKE -j >>stdout || { cat stdout; Exit 1; }
-
-cat stdout
-test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
-
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-rm -f am-*.elc
-
-: >stdout
-$MAKE -j >>stdout
-
-cat stdout
-test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
diff --git a/tests/lispdry.test b/tests/lispdry.test
deleted file mode 100755
index 3bca21a..0000000
--- a/tests/lispdry.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Automake; see the file COPYING.  If not, write to
-
-# Check that `make -n' works with the lisp_LISP recover rule.
-
-required='emacs non-root'
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'EOF'
-dist_lisp_LISP = am-one.el am-two.el am-three.el
-EOF
-
-cat >> configure.in << 'EOF'
-AM_PATH_LISPDIR
-AC_OUTPUT
-EOF
-
-echo "(require 'am-two)" > am-one.el
-echo "(require 'am-three) (provide 'am-two)" > am-two.el
-echo "(provide 'am-three)" > am-three.el
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-
-$MAKE
-
-test -f am-one.elc
-test -f am-two.elc
-test -f am-three.elc
-test -f elc-stamp
-
-rm -f am-*.elc elc-stamp
-
-chmod a-w .
-
-$MAKE -n
-
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
-
-:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
deleted file mode 100644
index c344171..0000000
--- a/tests/list-of-tests.mk
+++ /dev/null
@@ -1,973 +0,0 @@
-## Makefile fragment that holds the list of test scripts of the automake
-## testsuite.  This fragment is meant to be included by the Makefile.am,
-## but also to be executed directly by make when bootstrapping automake.
-
-## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-XFAIL_TESTS = \
-all.test \
-auxdir2.test \
-cond17.test \
-dist-auxfile.test \
-dist-auxfile-2.test \
-dist-pr109765.test \
-gcj6.test \
-instdir-cond2.test \
-java-nobase.test \
-objext-pr10128.test \
-pr8365-remake-timing.test \
-lex-subobj-nodep.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
-txinfo5.test
-
-perl_TESTS = \
-pm/Condition.pl \
-pm/Condition-t.pl \
-pm/DisjConditions.pl \
-pm/DisjConditions-t.pl \
-pm/Version.pl \
-pm/Wrap.pl
-
-# The order here is mostly alphabetical, with the deliberate exception
-# that tests having a high runtime (especially TAP tests that run various
-# checks sequentially) are listed early; this improves performance on
-# concurrent testsuite runs.
-handwritten_TESTS = \
-get-sysconf.test \
-$(perl_TESTS) \
-self-check-env-sanitize.test \
-self-check-report.test \
-aclibobj.test \
-aclocal.test \
-aclocal3.test \
-aclocal4.test \
-aclocal5.test \
-aclocal6.test \
-aclocal7.test \
-aclocal8.test \
-aclocal9.test \
-acloca10.test \
-acloca11.test \
-acloca12.test \
-acloca13.test \
-acloca14.test \
-acloca15.test \
-acloca16.test \
-acloca17.test \
-acloca18.test \
-acloca19.test \
-acloca20.test \
-acloca21.test \
-acloca22.test \
-aclocal-acdir.test \
-aclocal-install-absdir.test \
-aclocal-print-acdir.test \
-aclocal-path.test \
-aclocal-path-install.test \
-aclocal-path-install-serial.test \
-aclocal-path-nonexistent.test \
-aclocal-path-precedence.test \
-aclocal-install-fail.test \
-aclocal-install-mkdir.test \
-aclocal-no-install-no-mkdir.test \
-aclocal-verbose-install.test \
-acoutnoq.test \
-acoutpt.test \
-acoutpt2.test \
-acoutqnl.test \
-acoutbs.test \
-acoutbs2.test \
-acsilent.test \
-acsubst.test \
-acsubst2.test \
-all.test \
-all2.test \
-alloca.test \
-alloca2.test \
-alpha.test \
-alpha2.test \
-amhello-cflags.test \
-amhello-cross-compile.test \
-amhello-binpkg.test \
-amassign.test \
-ammissing.test \
-amopt.test \
-amsubst.test \
-ansi2knr-deprecation.test \
-ansi.test \
-ansi2.test \
-ansi3.test \
-ansi3b.test \
-ansi4.test \
-ansi5.test \
-ansi6.test \
-ansi7.test \
-ansi8.test \
-ansi9.test \
-ansi10.test \
-ar-lib.test \
-ar-lib2.test \
-ar-lib3.test \
-ar-lib4.test \
-ar-lib5a.test \
-ar-lib5b.test \
-ar-lib6a.test \
-ar-lib6b.test \
-ar-lib7.test \
-ar.test \
-ar2.test \
-ar3.test \
-ar4.test \
-ar5.test \
-asm.test \
-asm2.test \
-asm3.test \
-autodist.test \
-autodist-subdir.test \
-autodist-acconfig.test \
-autodist-acconfig-no-subdir.test \
-autodist-aclocal-m4.test \
-autodist-config-headers.test \
-autodist-configure-no-subdir.test \
-autodist-no-duplicate.test \
-autodist-stamp-vti.test \
-autohdr.test \
-autohdr2.test \
-autohdr3.test \
-autohdr4.test \
-autohdrdry.test \
-automake.test \
-auxdir.test \
-auxdir2.test \
-auxdir3.test \
-auxdir4.test \
-backsl.test \
-backsl2.test \
-backsl3.test \
-backsl4.test \
-badline.test \
-badopt.test \
-badprog.test \
-block.test \
-bsource.test \
-canon.test \
-canon2.test \
-canon3.test \
-canon4.test \
-canon5.test \
-canon-name.test \
-ccnoco.test \
-ccnoco2.test \
-ccnoco3.test \
-check.test \
-check2.test \
-check3.test \
-check4.test \
-check5.test \
-check6.test \
-check7.test \
-check8.test \
-check9.test \
-check10.test \
-check11.test \
-check12.test \
-check-exported-srcdir.test \
-check-tests-in-builddir.test \
-check-tests_environment.test \
-check-concurrency-bug9245.test \
-tests-environment-backcompat.test \
-checkall.test \
-clean.test \
-clean2.test \
-colneq.test \
-colneq2.test \
-colon.test \
-colon2.test \
-colon3.test \
-colon4.test \
-colon5.test \
-colon6.test \
-colon7.test \
-color.test \
-color2.test \
-comment.test \
-comment2.test \
-comment3.test \
-comment4.test \
-comment5.test \
-comment6.test \
-comment7.test \
-comment8.test \
-comment9.test \
-commen10.test \
-commen11.test \
-comments-in-var-def.test \
-compile.test \
-compile2.test \
-compile3.test \
-compile4.test \
-compile5.test \
-compile6.test \
-compile_f90_c_cxx.test \
-compile_f_c_cxx.test \
-cond.test \
-cond2.test \
-cond3.test \
-cond4.test \
-cond5.test \
-cond6.test \
-cond7.test \
-cond8.test \
-cond9.test \
-cond10.test \
-cond11.test \
-cond13.test \
-cond14.test \
-cond15.test \
-cond16.test \
-cond17.test \
-cond18.test \
-cond19.test \
-cond20.test \
-cond21.test \
-cond22.test \
-cond23.test \
-cond24.test \
-cond25.test \
-cond26.test \
-cond27.test \
-cond28.test \
-cond29.test \
-cond30.test \
-cond31.test \
-cond32.test \
-cond33.test \
-cond34.test \
-cond35.test \
-cond36.test \
-cond37.test \
-cond38.test \
-cond39.test \
-cond40.test \
-cond41.test \
-cond42.test \
-cond43.test \
-cond44.test \
-cond45.test \
-condd.test \
-condhook.test \
-condhook2.test \
-condinc.test \
-condinc2.test \
-condlib.test \
-condman.test \
-condman2.test \
-condman3.test \
-configure.test \
-confdeps.test \
-conff.test \
-conff2.test \
-conffile-leading-dot.test \
-confh.test \
-confh4.test \
-confh5.test \
-confh6.test \
-confh7.test \
-confh8.test \
-confincl.test \
-conflnk.test \
-conflnk2.test \
-conflnk3.test \
-conflnk4.test \
-confsub.test \
-confvar.test \
-confvar2.test \
-copy.test \
-ctarget1.test \
-cxx.test \
-cxx2.test \
-cxxansi.test \
-cxxcpp.test \
-cxxlibobj.test \
-cxxlink.test \
-cxxnoc.test \
-cxxo.test \
-cygwin32.test \
-dash.test \
-defun.test \
-defun2.test \
-dejagnu.test \
-dejagnu2.test \
-dejagnu3.test \
-dejagnu4.test \
-dejagnu5.test \
-dejagnu6.test \
-dejagnu7.test \
-dejagnu-absolute-builddir.test \
-dejagnu-relative-srcdir.test \
-dejagnu-siteexp-extend.test \
-dejagnu-siteexp-append.test \
-dejagnu-siteexp-useredit.test \
-deleted-am.test \
-deleted-m4.test \
-depacl2.test \
-depcomp.test \
-depcomp2.test \
-depcomp3.test \
-depcomp4.test \
-depcomp5.test \
-depcomp6.test \
-depcomp7.test \
-depcomp8a.test \
-depcomp8b.test \
-depcomp9.test \
-depcomp10.test \
-depdist.test \
-depend.test \
-depend2.test \
-depend3.test \
-depend4.test \
-depend5.test \
-depend6.test \
-destdir.test \
-dirlist.test \
-dirlist2.test \
-discover.test \
-dist-auxfile.test \
-dist-auxfile-2.test \
-dist-included-parent-dir.test \
-dist-missing-am.test \
-dist-missing-included-m4.test \
-dist-missing-m4.test \
-dist-pr109765.test \
-distcleancheck.test \
-distcom2.test \
-distcom3.test \
-distcom4.test \
-distcom5.test \
-distcom6.test \
-distcom7.test \
-distdir.test \
-distlinks.test \
-distlinksbrk.test \
-distname.test \
-distcheck-configure-flags.test \
-distcheck-configure-flags-am.test \
-distcheck-configure-flags-subpkg.test \
-distcheck-hook.test \
-distcheck-hook2.test \
-distcheck-missing-m4.test \
-distcheck-outdated-m4.test \
-distcheck-pr9579.test \
-distcheck-pr10470.test \
-distcheck-override-infodir.test \
-dmalloc.test \
-doc-parsing-buglets-colneq-subst.test \
-doc-parsing-buglets-tabs.test \
-dollar.test \
-dollarvar.test \
-dollarvar2.test \
-double.test \
-dup2.test \
-else.test \
-empty.test \
-empty2.test \
-empty3.test \
-empty4.test \
-exdir.test \
-exdir2.test \
-exdir3.test \
-exeext.test \
-exeext2.test \
-exeext3.test \
-exeext4.test \
-exsource.test \
-ext.test \
-ext2.test \
-extra-portability.test \
-extra-portability2.test \
-extra-portability3.test \
-extra.test \
-extra2.test \
-extra3.test \
-extra4.test \
-extra5.test \
-extra6.test \
-extra7.test \
-extra8.test \
-extra10.test \
-extra11.test \
-extra12.test \
-extradep.test \
-extradep2.test \
-f90only.test \
-flavor.test \
-flibs.test \
-fn99.test \
-fn99subdir.test \
-fnoc.test \
-fo.test \
-forcemiss.test \
-forcemiss2.test \
-fort1.test \
-fort2.test \
-fort4.test \
-fort5.test \
-fonly.test \
-fortdep.test \
-gcj.test \
-gcj2.test \
-gcj3.test \
-gcj4.test \
-gcj5.test \
-gcj6.test \
-gettext.test \
-gettext2.test \
-gettext3.test \
-gnumake.test \
-gnuwarn.test \
-gnuwarn2.test \
-gnits.test \
-gnits2.test \
-gnits3.test \
-hdr-vars-defined-once.test \
-header.test \
-help.test \
-help2.test \
-help3.test \
-help4.test \
-help-depend.test \
-help-depend2.test \
-help-dmalloc.test \
-help-init.test \
-help-lispdir.test \
-help-multilib.test \
-help-python.test \
-help-regex.test \
-help-silent.test \
-help-upc.test \
-hfs.test \
-hosts.test \
-implicit.test \
-info.test \
-init.test \
-init2.test \
-insh2.test \
-install2.test \
-installdir.test \
-install-info-dir.test \
-instsh.test \
-instsh2.test \
-instsh3.test \
-instdat.test \
-instdat2.test \
-instdir.test \
-instdir2.test \
-instdir-cond.test \
-instdir-cond2.test \
-instdir-no-empty.test \
-instdir-java.test \
-instdir-lisp.test \
-instdir-ltlib.test \
-instdir-prog.test \
-instdir-python.test \
-instdir-texi.test \
-instexec.test \
-instfail.test \
-instfail-info.test \
-instfail-java.test \
-instfail-libtool.test \
-insthook.test \
-instman.test \
-instman2.test \
-instmany.test \
-instmany-mans.test \
-instmany-python.test \
-instspc.test \
-interp.test \
-interp2.test \
-java.test \
-java2.test \
-java3.test \
-java-check.test \
-java-empty-classpath.test \
-javadir-undefined.test \
-javaprim.test \
-javasubst.test \
-java-clean.test \
-java-nobase.test \
-java-compile-install.test \
-java-sources.test \
-java-no-duplicate.test \
-java-mix.test \
-ldadd.test \
-ldflags.test \
-lex.test \
-lex2.test \
-lex3.test \
-lex4.test \
-lex5.test \
-lex-subobj-nodep.test \
-lflags.test \
-lflags2.test \
-libexec.test \
-libobj2.test \
-libobj3.test \
-libobj4.test \
-libobj5.test \
-libobj7.test \
-libobj8.test \
-libobj10.test \
-libobj11.test \
-libobj12.test \
-libobj13.test \
-libobj14.test \
-library.test \
-library2.test \
-library3.test \
-libtool.test \
-libtool2.test \
-libtool3.test \
-libtool4.test \
-libtool5.test \
-libtool6.test \
-libtool7.test \
-libtool8.test \
-libtool9.test \
-libtoo10.test \
-libtoo11.test \
-license.test \
-license2.test \
-link_c_cxx.test \
-link_cond.test \
-link_dist.test \
-link_f90_only.test \
-link_fc.test \
-link_fccxx.test \
-link_fcxx.test \
-link_f_only.test \
-lisp2.test \
-lisp3.test \
-lisp4.test \
-lisp5.test \
-lisp6.test \
-lisp7.test \
-lisp8.test \
-lispdry.test \
-listval.test \
-location.test \
-longline.test \
-longlin2.test \
-ltcond.test \
-ltcond2.test \
-ltconv.test \
-ltdeps.test \
-ltinit.test \
-ltinstloc.test \
-ltlibobjs.test \
-ltlibsrc.test \
-ltorder.test \
-lzip.test \
-lzma.test \
-m4-inclusion.test \
-maintclean.test \
-maintclean-vpath.test \
-maintmode-configure-msg.test \
-make.test \
-makefile-deps.test \
-makej.test \
-makej2.test \
-maken.test \
-maken3.test \
-make-dryrun.test \
-makevars.test \
-man.test \
-man2.test \
-man3.test \
-man4.test \
-man5.test \
-mdate.test \
-mdate2.test \
-mdate3.test \
-mdate4.test \
-mdate5.test \
-mdate6.test \
-missing.test \
-missing2.test \
-missing3.test \
-missing4.test \
-missing5.test \
-missing6.test \
-mkinstall.test \
-mkinst2.test \
-mkinst3.test \
-mmode.test \
-mmodely.test \
-multlib.test \
-nobase.test \
-nobase-libtool.test \
-nobase-python.test \
-nobase-nodist.test \
-nodef.test \
-nodef2.test \
-nodep.test \
-nodep2.test \
-nodepcomp.test \
-nodist.test \
-nodist2.test \
-nodist3.test \
-nogzip.test \
-nogzip2.test \
-noinst.test \
-noinstdir.test \
-nolink.test \
-nostdinc.test \
-notrans.test \
-number.test \
-objc.test \
-objc2.test \
-objext-pr10128.test \
-obsolete.test \
-order.test \
-outdir.test \
-output.test \
-output2.test \
-output3.test \
-output4.test \
-output5.test \
-output6.test \
-output7.test \
-output8.test \
-output9.test \
-output10.test \
-output11.test \
-output12.test \
-output13.test \
-output-order.test \
-overrid.test \
-parallel-am.test \
-parallel-am2.test \
-parallel-am3.test \
-parallel-tests.test \
-parallel-tests2.test \
-parallel-tests3.test \
-parallel-tests4.test \
-parallel-tests5.test \
-parallel-tests6.test \
-parallel-tests7.test \
-parallel-tests8.test \
-parallel-tests9.test \
-parallel-tests10.test \
-parallel-tests-dryrun.test \
-parallel-tests-harderror.test \
-parallel-tests-unreadable-log.test \
-parallel-tests-subdir.test \
-parallel-tests-log-override-1.test \
-parallel-tests-log-override-2.test \
-parallel-tests-log-override-recheck.test \
-parallel-tests-log-compiler-example.test \
-test-extensions.test \
-test-extensions-cond.test \
-parse.test \
-percent.test \
-percent2.test \
-phony.test \
-pluseq.test \
-pluseq2.test \
-pluseq3.test \
-pluseq4.test \
-pluseq5.test \
-pluseq6.test \
-pluseq7.test \
-pluseq8.test \
-pluseq9.test \
-pluseq10.test \
-pluseq11.test \
-postproc.test \
-ppf77.test \
-pr2.test \
-pr9.test \
-pr72.test \
-pr87.test \
-pr204.test \
-pr211.test \
-pr220.test \
-pr224.test \
-pr229.test \
-pr243.test \
-pr266.test \
-pr279.test \
-pr279-2.test \
-pr287.test \
-pr300-lib.test \
-pr300-ltlib.test \
-pr300-prog.test \
-pr307.test \
-pr401.test \
-pr401b.test \
-pr401c.test \
-prefix.test \
-primary.test \
-primary2.test \
-primary3.test \
-primary-prefix-invalid-couples.test \
-primary-prefix-valid-couples.test \
-primary-prefix-couples-force-valid.test \
-primary-prefix-couples-documented-valid.test \
-proginst.test \
-py-compile-basic.test \
-py-compile-basic2.test \
-py-compile-basedir.test \
-py-compile-destdir.test \
-py-compile-env.test \
-py-compile-option-terminate.test \
-py-compile-usage.test \
-python.test \
-python2.test \
-python3.test \
-python4.test \
-python5.test \
-python6.test \
-python7.test \
-python8.test \
-python9.test \
-python10.test \
-python11.test \
-python12.test \
-python-pr10995.test \
-recurs.test \
-recurs2.test \
-remake.test \
-remake2.test \
-remake3.test \
-remake4.test \
-remake5.test \
-remake6.test \
-remake7.test \
-remake-subdir-from-subdir.test \
-remake-subdir-gnu.test \
-remake-subdir.test \
-remake-subdir2.test \
-remake-subdir-long-time.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
-remake-deleted-am.test \
-remake-deleted-am-2.test \
-remake-deleted-am-subdir.test \
-remake-renamed-am.test \
-pr8365-remake-timing.test \
-regex.test \
-regex-obsolete.test \
-req.test \
-reqd.test \
-reqd2.test \
-rulepat.test \
-sanity.test \
-scripts.test \
-seenc.test \
-silent.test \
-silent2.test \
-silent3.test \
-silent4.test \
-silent6.test \
-silent7.test \
-silent9.test \
-silentcxx.test \
-silentf77.test \
-silentf90.test \
-silent-many-gcc.test \
-silent-many-generic.test \
-silent-lex-gcc.test \
-silent-lex-generic.test \
-silent-nested-vars.test \
-silent-yacc-gcc.test \
-silent-yacc-generic.test \
-silent-configsite.test \
-srcsub.test \
-srcsub2.test \
-space.test \
-specflg.test \
-specflg2.test \
-specflg3.test \
-specflg6.test \
-specflg7.test \
-specflg8.test \
-specflg9.test \
-specflg10.test \
-specflg-dummy.test \
-spell.test \
-spell2.test \
-spell3.test \
-spelling.test \
-spy.test \
-stdinc.test \
-stamph2.test \
-stdlib.test \
-stdlib2.test \
-strip.test \
-strip2.test \
-strip3.test \
-subdir.test \
-subdir2.test \
-subdir3.test \
-subdir4.test \
-subdir5.test \
-subdir6.test \
-subdir7.test \
-subdir8.test \
-subdir9.test \
-subdir10.test \
-subdirbuiltsources.test \
-subcond.test \
-subcond2.test \
-subcond3.test \
-subobj.test \
-subobj2.test \
-subobj3.test \
-subobj4.test \
-subobj5.test \
-subobj6.test \
-subobj7.test \
-subobj8.test \
-subobj9.test \
-subobj10.test \
-subobj11a.test \
-subobj11b.test \
-subobj11c.test \
-subobjname.test \
-subpkg.test \
-subpkg2.test \
-subpkg3.test \
-subpkg4.test \
-subpkg-yacc.test \
-subst.test \
-subst2.test \
-subst3.test \
-subst4.test \
-substref.test \
-substre2.test \
-substtarg.test \
-suffix.test \
-suffix2.test \
-suffix3.test \
-suffix4.test \
-suffix5.test \
-suffix6.test \
-suffix7.test \
-suffix8.test \
-suffix9.test \
-suffix10.test \
-suffix11.test \
-suffix12.test \
-suffix13.test \
-symlink.test \
-symlink2.test \
-syntax.test \
-tags.test \
-tagsub.test \
-tar.test \
-tar2.test \
-tar3.test \
-tar-override.test \
-target-cflags.test \
-targetclash.test \
-txinfo.test \
-txinfo2.test \
-txinfo3.test \
-txinfo4.test \
-txinfo5.test \
-txinfo5b.test \
-txinfo6.test \
-txinfo7.test \
-txinfo8.test \
-txinfo9.test \
-txinfo10.test \
-txinfo13.test \
-txinfo16.test \
-txinfo17.test \
-txinfo18.test \
-txinfo19.test \
-txinfo20.test \
-txinfo21.test \
-txinfo22.test \
-txinfo23.test \
-txinfo24.test \
-txinfo25.test \
-txinfo26.test \
-txinfo27.test \
-txinfo28.test \
-txinfo29.test \
-txinfo30.test \
-txinfo31.test \
-txinfo32.test \
-txinfo33.test \
-transform.test \
-transform2.test \
-uninstall-pr9578.test \
-uninstall-fail.test \
-unused.test \
-upc.test \
-upc2.test \
-upc3.test \
-vala.test \
-vala1.test \
-vala2.test \
-vala3.test \
-vala4.test \
-vala5.test \
-vala-vapi.test \
-vala-vpath.test \
-vala-mix.test \
-vala-mix2.test \
-vars.test \
-vars3.test \
-vartar.test \
-version.test \
-version2.test \
-version3.test \
-version4.test \
-version6.test \
-version7.test \
-version8.test \
-vpath.test \
-vtexi.test \
-vtexi2.test \
-vtexi3.test \
-vtexi4.test \
-warnopts.test \
-werror.test \
-werror2.test \
-werror3.test \
-whoami.test \
-xsource.test \
-xz.test \
-yacc.test \
-yacc2.test \
-yacc3.test \
-yacc4.test \
-yacc5.test \
-yacc6.test \
-yacc7.test \
-yacc8.test \
-yaccdry.test \
-yaccpp.test \
-yaccvpath.test \
-yacc-dist-nobuild-subdir.test \
-yflags.test \
-yflags2.test \
-libtool-macros.test \
-gettext-macros.test
diff --git a/tests/listval.test b/tests/listval.test
deleted file mode 100755
index d7cc884..0000000
--- a/tests/listval.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure variable is expanded properly.
-# From Adam J. Richter.
-required=libtool
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_SUBST(LTLIBOBJS)
-AM_PROG_AR
-AC_PROG_LIBTOOL
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libpanel_applet.la
-libpanel_applet_la_SOURCES = \
-       applet-widget.c
-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
-libpanel_applet_la_LIBADD = -lm
-END
-
-: > ltconfig
-: > ltmain.sh
-: > ar-lib
-: > config.guess
-: > config.sub
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/location.test b/tests/location.test
deleted file mode 100755
index 6098796..0000000
--- a/tests/location.test
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for locations in error messages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [true])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = libfoo.a
-if COND2
-  lib_LIBRARIES = libfoo.a
-endif
-if COND1
-  bin_PROGRAMS += ctags
-endif
-VAR = 1 \
-      2 \
-      3
-
-VAR = 1 \
-      2 \
-      3
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-
-# Smash the useless difference of lib file locations.
-sed 's,^.*lib/am/\([a-z]*\.am\),\1,' stderr >observed
-cat >expected <<\EOF
-Makefile.am:12: VAR multiply defined in condition TRUE ...
-Makefile.am:8: ... `VAR' previously defined here
-automake: libfoo_a_OBJECTS should not be defined
-Makefile.am:3:   while processing library `libfoo.a'
-automake: use `libfoo_a_LDADD', not `libfoo_a_LIBADD'
-Makefile.am:3:   while processing library `libfoo.a'
-library.am: deprecated feature: target `libfoo.a' overrides `libfoo.a$(EXEEXT)'
-library.am: change your target to read `libfoo.a$(EXEEXT)'
-Makefile.am:3:   while processing library `libfoo.a'
-program.am: target `libfoo.a$(EXEEXT)' was defined here
-Makefile.am:1:   while processing program `libfoo.a'
-program.am: redefinition of `libfoo.a$(EXEEXT)'...
-Makefile.am:1:   while processing program `libfoo.a'
-library.am: ... `libfoo.a' previously defined here
-Makefile.am:3:   while processing library `libfoo.a'
-tags.am: redefinition of `ctags'...
-program.am: ... `ctags$(EXEEXT)' previously defined here
-Makefile.am:6:   while processing program `ctags'
-EOF
-
-diff expected observed || Exit 1
diff --git a/tests/longlin2.test b/tests/longlin2.test
deleted file mode 100755
index 2d81afa..0000000
--- a/tests/longlin2.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Long lines should be wrapped.
-# Report from Albert Chin.
-
-. ./defs || Exit 1
-
-set -e
-
-n=1
-files=
-match=
-while test $n -le 100
-do
-  files="$files filename$n"
-  match="..........$match"
-  n=`expr $n + 1`
-done
-files2=`echo "$files" | sed s/filename/filenameb/g`
-
-cat >Makefile.am <<EOF
-FOO = $files $files2 \
-  grepme
-EOF
-
-# The `FOO = ...' line is 2293-byte long.  More than what a POSIX
-# conformant system is expected to support.  So do not use grep
-# on the non-text file.
-
-# grep $match Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep $match Makefile.in && Exit 1
-grep 'filenameb100 grepme' Makefile.in
diff --git a/tests/longline.test b/tests/longline.test
deleted file mode 100755
index aefd9a8..0000000
--- a/tests/longline.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Long lines of += should be wrapped.
-# Report from Simon Josefsson.
-
-. ./defs || Exit 1
-
-set -e
-
-(echo DUMMY = some_long_filename_1;
-for i in 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20;
-do
-  echo DUMMY += some_long_filename_$i
-done) > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-test 80 -ge `grep DUMMY Makefile.in | wc -c`
diff --git a/tests/ltcond.test b/tests/ltcond.test
deleted file mode 100755
index 401572b..0000000
--- a/tests/ltcond.test
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for conditional libtool libraries.
-# This combines two examples from the manual.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([WANT_LIBFOO], [true])
-AM_CONDITIONAL([WANT_LIBBAR], [false])
-AC_SUBST([WANTEDLIBS], ['lib1foo.la lib1bar.la'])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-EXTRA_LTLIBRARIES = lib1foo.la lib1bar.la lib3bar.la
-lib_LTLIBRARIES = $(WANTEDLIBS)
-lib1foo_la_SOURCES = foo.c
-lib1foo_la_LDFLAGS = -rpath '$(libdir)'
-lib1bar_la_SOURCES = bar.c
-lib1bar_la_LDFLAGS = -rpath '$(libdir)'
-lib3bar_la_SOURCES = bar.c
-
-if WANT_LIBFOO
-lib_LTLIBRARIES += lib2foo.la
-check_LTLIBRARIES = lib3foo.la
-endif
-if WANT_LIBBAR
-lib_LTLIBRARIES += lib2bar.la
-endif
-lib2foo_la_SOURCES = foo.c
-lib2bar_la_SOURCES = bar.c
-lib3foo_la_SOURCES = foo.c
-END
-
-echo 'int one () { return 1; }' >foo.c
-echo 'int two () { return 2; }' >bar.c
-
-mkdir empty
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Install libraries in lib/, and the rest in empty/.
-# (in fact there is no "rest", so as the name imply empty/ is
-# expected to remain empty).
-./configure "--prefix=`pwd`/empty" "--libdir=`pwd`/lib"
-
-$MAKE
-test -f lib1foo.la
-test -f lib1bar.la
-test -f lib2foo.la
-test ! -f lib2bar.la
-test ! -f lib3foo.la
-test ! -f lib3bar.la
-
-$MAKE check
-test ! -f lib2bar.la
-test -f lib3foo.la
-test ! -f lib3bar.la
-
-$MAKE install
-test -f lib/lib1foo.la
-test -f lib/lib1bar.la
-test -f lib/lib2foo.la
-test ! -f lib/lib3foo.la
-find empty -type f -print > empty.lst
-cat empty.lst
-test 0 = `wc -l < empty.lst`
-
-$MAKE uninstall
-find lib -type f -print > lib.lst
-test 0 = `wc -l < lib.lst`
-test -f lib1foo.la
-test -f lib1bar.la
-test -f lib2foo.la
-test -f lib3foo.la
-
-$MAKE clean
-test ! -f lib1foo.la
-test ! -f lib1bar.la
-test ! -f lib2foo.la
-test ! -f lib3foo.la
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
deleted file mode 100755
index 898c971..0000000
--- a/tests/ltcond2.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in conditionals.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_SUBST([HELLO_SYSTEM], [hello-generic.lo])
-AM_CONDITIONAL([LINUX], true)
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libhello.la
-libhello_la_SOURCES = hello-common.c
-EXTRA_libhello_la_SOURCES = hello-linux.c hello-generic.c
-libhello_la_LIBADD = $(HELLO_SYSTEM)
-libhello_la_DEPENDENCIES = $(HELLO_SYSTEM)
-
-lib_LTLIBRARIES += libhello2.la
-libhello2_la_SOURCES = hello-common.c
-if LINUX
-libhello2_la_SOURCES += hello-linux.c
-else
-libhello2_la_SOURCES += hello-generic.c
-endif
-
-bin_PROGRAMS = hello hello2
-hello_SOURCES = main.c
-hello_LDADD = libhello.la
-hello2_SOURCES = main.c
-hello2_LDADD = libhello2.la
-
-check-local:
-       ./hello$(EXEEXT) | grep hello-generic
-       ./hello2$(EXEEXT) | grep hello-linux
-       : > check-ok
-END
-
-echo 'char* str() { return "hello-linux"; }' >hello-linux.c
-echo 'char* str() { return "hello-generic"; }' >hello-generic.c
-cat >hello-common.c <<'END'
-#include <stdio.h>
-char* str();
-void print()
-{
-  puts (str ());
-}
-END
-echo 'int main() { print(); return 0; }' >main.c
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE check
-test -f check-ok
diff --git a/tests/ltconv.test b/tests/ltconv.test
deleted file mode 100755
index a130b94..0000000
--- a/tests/ltconv.test
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for libtool convenience libraries.
-# This example is taken from the manual.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_CONFIG_FILES(sub1/Makefile
-               sub2/Makefile
-               sub2/sub21/Makefile
-               sub2/sub22/Makefile)
-AC_OUTPUT
-END
-
-mkdir sub1
-mkdir sub2
-mkdir sub2/sub21
-mkdir sub2/sub22
-mkdir empty
-
-cat >Makefile.am <<'END'
-SUBDIRS = sub1 sub2
-lib_LTLIBRARIES = libtop.la
-libtop_la_SOURCES =
-libtop_la_LIBADD = \
-  sub1/libsub1.la \
-  sub2/libsub2.la
-
-bin_PROGRAMS = ltconvtest
-ltconvtest_SOURCES = test.c
-ltconvtest_LDADD = libtop.la
-
-check-local:
-       ./ltconvtest$(EXEEXT)
-       : > check-ok
-installcheck-local:
-       $(bindir)/ltconvtest$(EXEEXT)
-       : > installcheck-ok
-END
-
-cat >sub1/Makefile.am <<'END'
-noinst_LTLIBRARIES = libsub1.la
-libsub1_la_SOURCES = sub1.c
-END
-
-echo 'int sub1 () { return 1; }' > sub1/sub1.c
-
-cat >sub2/Makefile.am <<'END'
-SUBDIRS = sub21 sub22
-noinst_LTLIBRARIES = libsub2.la
-libsub2_la_SOURCES = sub2.c
-libsub2_la_LIBADD = \
-  sub21/libsub21.la \
-  sub22/libsub22.la
-END
-
-echo 'int sub2 () { return 2; }' > sub2/sub2.c
-
-cat >sub2/sub21/Makefile.am <<'END'
-noinst_LTLIBRARIES = libsub21.la
-libsub21_la_SOURCES = sub21.c
-END
-
-echo 'int sub21 () { return 21; }' > sub2/sub21/sub21.c
-
-cat >sub2/sub22/Makefile.am <<'END'
-noinst_LTLIBRARIES = libsub22.la
-libsub22_la_SOURCES = sub22.c
-END
-
-echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c
-
-cat >test.c <<EOF
-#include <stdio.h>
-int main ()
-{
-  if (1 != sub1 ())
-    return 1;
-  if (2 != sub2 ())
-    return 2;
-  if (21 != sub21 ())
-    return 3;
-  if (22 != sub22 ())
-    return 4;
-  return 0;
-}
-EOF
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Install libraries in lib/, programs in bin/, and the rest in empty/.
-# (in fact there is no "rest", so as the name imply empty/ is
-# expected to remain empty).
-./configure "--prefix=`pwd`/empty" "--libdir=`pwd`/lib" "--bindir=`pwd`/bin"
-
-$MAKE
-test -f libtop.la
-test -f sub1/libsub1.la
-test -f sub2/libsub2.la
-test -f sub2/sub21/libsub21.la
-test -f sub2/sub22/libsub22.la
-$MAKE check
-test -f check-ok
-rm -f check-ok
-
-$MAKE install
-test -f lib/libtop.la
-$MAKE installcheck
-test -f installcheck-ok
-rm -f installcheck-ok
-
-find empty -type f -print > empty.lst
-cat empty.lst
-test 0 = `wc -l < empty.lst`
-
-$MAKE clean
-test ! -f libtop.la
-test ! -f sub1/libsub1.la
-test ! -f sub2/libsub2.la
-test ! -f sub2/sub21/libsub21.la
-test ! -f sub2/sub22/libsub22.la
-test ! -f ltconvtest
-
-$MAKE installcheck
-test -f installcheck-ok
-rm -f installcheck-ok
-
-$MAKE uninstall
-find lib -type f -print > lib.lst
-test 0 = `wc -l < lib.lst`
-find bin -type f -print > bin.lst
-test 0 = `wc -l < bin.lst`
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
deleted file mode 100755
index 7ece4d4..0000000
--- a/tests/ltdeps.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure libtool library dependencies are correct.
-# Report from Lars J. Aas.
-required=libtool
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_PROG_CXX
-AM_CONDITIONAL(HACKING_COMPACT_BUILD, whatever)
-END
-
-cat > Makefile.am << 'END'
-RegularSources = \
-        SbBSPTree.cpp \
-        SbBox2f.cpp \
-        SbBox2s.cpp
-
-LinkHackSources = \
-        all.cpp
-
-if HACKING_COMPACT_BUILD
-BuildSources = $(LinkHackSources)
-else
-BuildSources = $(RegularSources)
-endif
-
-noinst_LTLIBRARIES = libbase.la
-libbase_la_SOURCES = $(BuildSources)
-
-EXTRA_libbase_la_SOURCES = \
-        $(RegularSources) $(LinkHackSources)
-END
-
-: > ltconfig
-: > ltmain.sh
-: > ar-lib
-: > config.guess
-: > config.sub
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'OBJECTS =$' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/ltinit.test b/tests/ltinit.test
deleted file mode 100755
index 58f1926..0000000
--- a/tests/ltinit.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that libtool support works correctly when "newer" libtool
-# interface (with LT_INIT etc.) is used (this interface has been
-# present since libtool 1.9b, circa 2004).
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-dnl Older libtool versions don't define LT_PREREQ :-(
-m4_ifdef([LT_PREREQ],
-    [LT_PREREQ([2.0])],
-    [m4_fatal([Libtool version too old], [63])])
-LT_INIT([dlopen])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-lib_LTLIBRARIES = libfoo.la
-END
-
-cat > libfoo.c <<'END'
-int foo (void)
-{
-  return 1;
-}
-END
-
-libtoolize
-# Skip if older libtool (pre-2.0) is used.
-{ $ACLOCAL && $AUTOCONF; } || {
-  if test $? -eq 63; then Exit 77; else Exit 1; fi
-}
-$EGREP 'LT_(INIT|PREREQ)' configure && Exit 1 # Sanity check.
-$AUTOMAKE -a
-
-cwd=`pwd`
-./configure --prefix="$cwd/inst" >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking.*dlfcn\.h.* no$' stdout || grep '^checking.*dlopen' stdout
-
-$MAKE
-$MAKE install
-$MAKE distcheck
-
-:
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
deleted file mode 100755
index a4d715e..0000000
--- a/tests/ltinstloc.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for libtool errors for multiple install locations, esp. with nobase.
-
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AM_CONDITIONAL([COND], [:])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-if COND
-lib_LTLIBRARIES = liba1.la sub/liba2.la
-#else
-pkglib_LTLIBRARIES = liba1.la
-nobase_lib_LTLIBRARIES = sub/liba2.la
-endif
-END
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails --add-missing
-
-# libtoolize might have installed config.guess and config.sub already,
-# and autom4te might warn about bugs in Libtool macro files, so filter
-# out warnings about Makefile.am only.  We don't care in this test
-# whether automake installs config.guess, config.sub and ar-lib.
-
-cat >expected <<'END'
-Makefile.am:5: sub/liba2.la multiply defined in condition COND
-Makefile.am:5: `sub/liba2.la' should be installed below `lib' in condition 
COND ...
-Makefile.am:2: ... and should also be installed in `lib' in condition COND.
-Makefile.am:4: liba1.la multiply defined in condition COND
-Makefile.am:4: `liba1.la' should be installed in `pkglib' in condition COND ...
-Makefile.am:2: ... and should also be installed in `lib' in condition COND.
-Makefile.am:2: Libtool libraries can be built for only one destination.
-END
-
-grep '^Makefile.am' stderr | diff - expected
-
-sed 's/#//' < Makefile.am > t
-mv -f t Makefile.am
-
-$AUTOMAKE
-grep ' -rpath \$(libdir)/sub' Makefile.in
-:
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
deleted file mode 100755
index 2df0017..0000000
--- a/tests/ltlibobjs.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure LTLIBOBJS alone works ok.
-# Report from Vadim Zeitlin.
-required=libtool
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_SUBST(LTLIBOBJS)
-AM_PROG_AR
-AC_PROG_LIBTOOL
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libtu.la
-libtu_la_SOURCES = foo.c
-libtu_la_LIBADD = @LTLIBOBJS@
-END
-
-: > ltconfig
-: > ltmain.sh
-: > ar-lib
-: > config.guess
-: > config.sub
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
deleted file mode 100755
index e8fa6f0..0000000
--- a/tests/ltlibsrc.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure a sensible default source for libraries is used.
-
-required='libtool gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-mkdir zoo.d
-
-cat > Makefile.am << 'END'
-AM_LDFLAGS = -module
-pkglib_LTLIBRARIES = zoo.d/bar.la old.la
-noinst_LTLIBRARIES = foo.la zoo.d/old2.la
-
-$(srcdir)/zoo_d_old2_la.c: $(srcdir)/old_la.c
-       cp $(srcdir)/old_la.c $@
-END
-
-cat > foo.c << 'END'
-int foo (void) { return 0; }
-END
-
-cp foo.c zoo.d/bar.c
-cp foo.c old_la.c
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails -a
-grep 'Makefile.am:2:.*old_la.c' stderr
-grep 'Makefile.am:2:.*old.c' stderr
-grep 'Makefile.am:3:.*zoo_d_old2_la.c' stderr
-grep 'Makefile.am:3:.*zoo\.d/old2.c' stderr
-
-$AUTOMAKE -Wno-obsolete
-
-mkdir sub
-cd sub
-
-../configure
-$MAKE
-
-test -f foo.la
-test -f zoo.d/bar.la
-test -f old.la
-test -f zoo.d/old2.la
-
-$MAKE distcheck
diff --git a/tests/ltorder.test b/tests/ltorder.test
deleted file mode 100755
index ef4a5f7..0000000
--- a/tests/ltorder.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for correct installation order of nobase libtool libraries.
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-nobase_lib_LTLIBRARIES = liba1.la sub/liba2.la sub/liba3.la liba4.la liba5.la
-sub_liba2_la_LIBADD = liba1.la
-sub_liba3_la_LIBADD = sub/liba2.la
-liba4_la_LIBADD = sub/liba3.la
-liba5_la_LIBADD = liba4.la
-bin_PROGRAMS = p
-p_LDADD = liba5.la
-END
-
-mkdir sub
-echo 'int a1 () { return 1; }' >liba1.c
-echo 'extern int a1 (); int a2 () { return a1 (); }' >sub/liba2.c
-echo 'extern int a2 (); int a3 () { return a2 (); }' >sub/liba3.c
-echo 'extern int a3 (); int a4 () { return a3 (); }' >liba4.c
-echo 'extern int a4 (); int a5 () { return a4 (); }' >liba5.c
-echo 'extern int a5 (); int main () { return a5 (); }' >p.c
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure "--prefix=`pwd`/inst"
-
-$MAKE
-$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'has not been installed' stderr && Exit 1
-
-$MAKE uninstall
-test `find inst -type f -print | wc -l` -eq 0
-:
diff --git a/tests/lzip.test b/tests/lzip.test
deleted file mode 100755
index ab62990..0000000
--- a/tests/lzip.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for no-dist-gzip with lzip.
-
-required=lzip
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([lzip], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-lzip])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test: distcheck
-       test $(DIST_ARCHIVES) = lzip-1.0.tar.lz
-       test -f $(DIST_ARCHIVES)
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test
-
-:
diff --git a/tests/lzma.test b/tests/lzma.test
deleted file mode 100755
index bf65aea..0000000
--- a/tests/lzma.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for no-dist-gzip with lzma
-
-. ./defs || Exit 1
-
-errmsg='lzma.*deprecated.*dist-xz.*dist-lzip.*instead'
-
-set -e
-
-echo AUTOMAKE_OPTIONS = dist-lzma > Makefile.am
-$ACLOCAL --force
-AUTOMAKE_fails -Wnone -Wobsolete
-grep "^Makefile\\.am:1:.*$errmsg" stderr
-
-cat > configure.in << 'END'
-AC_INIT([lzma], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test: distcheck
-       test $(DIST_ARCHIVES) = lzma-1.0.tar.lzma
-       test -f $(DIST_ARCHIVES)
-END
-
-rm -rf autom4te*.cache
-$ACLOCAL
-AUTOMAKE_fails
-grep "^configure\\.in:2:.*$errmsg" stderr
-
-$AUTOMAKE -Wno-obsolete
-
-lzma --version || skip_ "lzma compressor required for the rest of the test"
-
-$AUTOCONF
-./configure
-$MAKE test
-
-:
diff --git a/tests/m4-inclusion.test b/tests/m4-inclusion.test
deleted file mode 100755
index 025d44f..0000000
--- a/tests/m4-inclusion.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to see if `m4_sinclude' and `m4_include' works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-sinclude([doesntexist.m4])
-EOF
-
-mkdir sub
-cat > sub/p.m4 << 'END'
-AC_SUBST(MAGICALPIG)
-END
-
-cat > sub/h.m4 << 'END'
-AC_SUBST(MAGICALHOG)
-END
-
-cat > sub/g.m4 << 'END'
-AC_SUBST(GREPME)
-END
-
-: > Makefile.am
-
-echo 'sinclude(sub/g.m4)' >> acinclude.m4
-echo 'm4_sinclude(sub/doesntexist.m4)' >> acinclude.m4
-
-$ACLOCAL
-
-echo 'm4_sinclude(sub/p.m4)' >> aclocal.m4
-echo 'm4_include(sub/h.m4)' >> aclocal.m4
-
-$AUTOMAKE
-
-grep doesntexist Makefile.in && Exit 1
-grep MAGICALPIG Makefile.in
-grep MAGICALHOG Makefile.in
-grep GREPME Makefile.in
diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test
deleted file mode 100755
index 4b93ab1..0000000
--- a/tests/maintclean-vpath.test
+++ /dev/null
@@ -1,106 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure distclean and maintainer-clean erase the right files.
-# This test is for VPATH builds; see sister test `maintclean.test'
-# for in-tree builds.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([bar sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-noinst_DATA = foo.c
-foo.c:
-       touch foo.c
-MAINTAINERCLEANFILES = foo.c
-END
-
-mkdir sub
-cat > sub/Makefile.am <<'END'
-noinst_SCRIPTS = zap
-zap: zap.sh
-       cp $(srcdir)/zap.sh $@ && chmod a+x $@
-MAINTAINERCLEANFILES = zap
-END
-
-: > bar.in
-: > sub/zap.sh
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-# Users can disable autom4te.cache.
-if test -d autom4te.cache; then
-  test_cache='test -d ../autom4te.cache'
-else
-  test_cache=:
-fi
-
-mkdir build
-
-chmod a-w . sub
-
-cd build
-
-../configure
-test -f bar
-
-$MAKE
-test -f foo.c
-test -f sub/zap
-$test_cache
-
-$MAKE distclean
-test ! -f bar
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test -f foo.c
-test -f sub/zap
-test -f ../sub/zap.sh
-$test_cache
-
-../configure
-test -f bar
-
-$MAKE foo.c
-test -f foo.c
-cd sub
-$MAKE zap
-test -f zap
-cd ..
-
-chmod u+w ..
-
-$MAKE maintainer-clean
-test -f ../sub/zap.sh
-test ! -f bar
-test ! -f foo.c
-test ! -f sub/zap
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test ! -d ../autom4te.cache
-
-:
diff --git a/tests/maintclean.test b/tests/maintclean.test
deleted file mode 100755
index 9e22463..0000000
--- a/tests/maintclean.test
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure distclean and maintainer-clean erase the right files.
-# This test is for in-tree builds; see sister test `maintclean-vpath.test'
-# for VPATH builds.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([bar sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-noinst_DATA = foo.c
-foo.c:
-       touch foo.c
-MAINTAINERCLEANFILES = foo.c
-END
-
-mkdir sub
-cat > sub/Makefile.am <<'END'
-noinst_SCRIPTS = zap
-zap: zap.sh
-       cp $(srcdir)/zap.sh $@ && chmod a+x $@
-MAINTAINERCLEANFILES = zap
-END
-
-: > bar.in
-: > sub/zap.sh
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-# Users can disable autom4te.cache.
-if test -d autom4te.cache; then
-  test_cache='test -d autom4te.cache'
-else
-  test_cache=:
-fi
-
-./configure
-test -f bar
-
-$MAKE
-test -f foo.c
-test -f sub/zap
-$test_cache
-
-$MAKE distclean
-test ! -f bar
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test -f foo.c
-test -f sub/zap
-test -f sub/zap.sh
-$test_cache
-
-./configure
-test -f bar
-
-$MAKE foo.c
-test -f foo.c
-cd sub
-$MAKE zap
-test -f zap
-cd ..
-
-$MAKE maintainer-clean
-test -f sub/zap.sh
-test ! -f bar
-test ! -f foo.c
-test ! -f sub/zap
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test ! -d autom4te.cache
-
-:
diff --git a/tests/maintmode-configure-msg.test 
b/tests/maintmode-configure-msg.test
deleted file mode 100755
index 5771392..0000000
--- a/tests/maintmode-configure-msg.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that our macro `AM_MAINTAINER_MODE' adds proper text to
-# the configure help screen.  Also make sure the "checking ..." messages
-# related to the enabling/disabling of maintainer mode are correct (see
-# automake bug#9890).
-
-. ./defs || Exit 1
-
-set -e
-
-set_maintmode ()
-{
-  rm -rf autom4te*.cache # Just to be sure not to use a stale cache.
-  echo "AC_INIT([$me], [1.0])" > configure.in
-  case $1 in
-    DEFAULT) echo AM_MAINTAINER_MODE;;
-          *) echo "AM_MAINTAINER_MODE([$*])";;
-  esac >> configure.in
-}
-
-check_configure_message_with ()
-{
-  answer=$1; shift
-  ./configure ${1+"$@"} >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  grep "^checking whether to enable maintainer-specific.*\\.\\.\\. $answer$" 
stdout
-  test `grep -c 'checking.*maint' stdout` -eq 1
-  :
-}
-
-set_maintmode "DEFAULT"
-
-$ACLOCAL
-
-$AUTOCONF --force
-
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^  *--enable-maintainer-mode.* enable make rules' stdout
-
-check_configure_message_with "no"
-check_configure_message_with "yes" --enable-maintainer-mode
-
-set_maintmode "disable"
-
-$AUTOCONF --force
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^  *--enable-maintainer-mode.* enable make rules' stdout
-
-check_configure_message_with "no"
-check_configure_message_with "yes" --enable-maintainer-mode
-
-set_maintmode "enable"
-
-$AUTOCONF --force
-./configure --help >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^  *--disable-maintainer-mode.* disable make rules' stdout
-
-check_configure_message_with "yes"
-check_configure_message_with "no" --disable-maintainer-mode
-
-:
diff --git a/tests/make-dryrun.test b/tests/make-dryrun.test
deleted file mode 100755
index 072d02f..0000000
--- a/tests/make-dryrun.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that $(am__make_dryrun) works as expected.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-all:
-       : Dummy, nothing to do.
-foo:
-       $(MAKE) all
-notdry:
-       @echo ":: $$MAKEFLAGS ::"; : For debugging.
-       $(am__make_dryrun) && exit 1; exit 0
-dry:
-       address@hidden ":: $$MAKEFLAGS ::"; : For debugging.
-       +$(am__make_dryrun) || exit 1; echo ok > from-dry-mode
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-$MAKE notdry
-
-# Test against a known regressions.  This was especially
-# heinous, since make running in normal mode was sometimes
-# mistaken for make running in dry mode.
-$MAKE notdry TESTS="n1.test n2.test"
-$MAKE notdry TESTS="n1 n2" AM_MAKEFLAGS="TESTS='n1 n2'"
-$MAKE notdry TESTS="n1 n2" AM_MAKEFLAGS='TESTS="n1 n2"'
-$MAKE notdry FOOFLAGS="-n -n -knf2 \\n --none -n"
-$MAKE notdry BARFLAGS="-n \"n\" '-n' --none -n"
-
-if echo 'all: ; @+printf %sbb%s aa cc' | $MAKE -n -f - | grep aabbcc; then
-  $MAKE -n dry
-  test -f from-dry-mode
-  rm -f from-dry-mode
-fi
-
-if using_gmake; then
-  $MAKE --dry-run -k dry
-  test -f from-dry-mode
-fi
-
-:
diff --git a/tests/make.test b/tests/make.test
deleted file mode 100755
index 1e3184d..0000000
--- a/tests/make.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `make' check works.
-# From Ralf Corsepius.
-
-required=GNUmake
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(foo,0,no)
-AM_MAKE_INCLUDE
-AC_OUTPUT(Makefile)
-END
-
-: > Makefile.am
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-export ACLOCAL
-export AUTOCONF
-export AUTOMAKE
-
-# Do the test twice -- once with make and once with make -w.
-# This tests for a bug reported by Rainer Orth (see PR 175).
-
-save="$MAKE"
-for flag in '' -w; do
-   MAKE="$save $flag" ./configure
-
-   $FGREP 'am__include = include' Makefile
-
-   touch configure.in
-   $MAKE $flag
-
-   $FGREP 'am__include = include' Makefile
-
-   rm -f config.cache
-done
-
-Exit 0
diff --git a/tests/makefile-deps.test b/tests/makefile-deps.test
deleted file mode 100755
index 819c7d3..0000000
--- a/tests/makefile-deps.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we don't emit a rule with empty target if list of
-# automatically-computed dependencies for Makefile.in is empty.
-
-. ./defs || Exit 1
-
-set -e
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep "^ *:" Makefile.in && Exit 1
-
-:
diff --git a/tests/makej.test b/tests/makej.test
deleted file mode 100755
index e5d55a1..0000000
--- a/tests/makej.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# `make -j' used to fail with Autoconf < 2.58, because tools like
-# autoconf and automake can try to update autom4te's cache in parallel.
-#
-# Note that failures might not be reproducible systematically as they
-# depend on the time at which autoconf and automake update the cache
-# via autom4te.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<'END'
-m4_include([version.m4])
-AC_INIT([version7], [THE_VERSION])
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-echo 'm4_define([THE_VERSION], [2.718])' > version.m4
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE --add-missing
-./configure --version | grep '2\.718'
-./configure
-$MAKE
-
-$sleep
-echo 'm4_define([THE_VERSION], [3.141])' > version.m4
-$MAKE -j
-./configure --version | grep '3\.141'
diff --git a/tests/makej2.test b/tests/makej2.test
deleted file mode 100755
index e702999..0000000
--- a/tests/makej2.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure known BSD `make -jN' issues are fixed:
-# without -B, it may reuse the same shell for separate commands in a
-# rule, which can lead to interesting results.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test-distdir-removed:
-       test ! -d $(distdir)
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-mkdir build
-cd build
-../configure "--prefix=`pwd`/inst"
-
-$MAKE -j2 || Exit 77
-$MAKE -j2 distcheck
-$MAKE test-distdir-removed
-
-Exit 0
diff --git a/tests/maken.test b/tests/maken.test
deleted file mode 100755
index 61f6886..0000000
--- a/tests/maken.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure that `make -n dist' and `make -n distcheck' do not change files
-# on disk, due to GNU make executing rules containing `$(MAKE)'.
-# Also, ensure that `make -n dist' and `make -n distcheck' show what
-# would happen, at least when using GNU make.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-distcheck-hook:
-       @: > stamp-distcheck-hook
-test-no-distdir:
-       test ! -d $(distdir)
-       test ! -f stamp-distcheck-hook
-       test ! -f sub/stamp-sub-dist-hook
-END
-cat >sub/Makefile.am <<'END'
-dist-hook:
-       @: > stamp-sub-dist-hook
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-$sleep
-echo stamp > stampfile
-$sleep
-for target in dist distcheck; do
-  $MAKE -n $target
-  if using_gmake; then
-    $MAKE -n $target | grep stamp-sub-dist-hook || Exit 1
-  fi
-  $MAKE test-no-distdir
-  test `ls -1t | sed 1q` = stampfile
-done
-
-Exit 0
diff --git a/tests/maken3.test b/tests/maken3.test
deleted file mode 100755
index 27494cc..0000000
--- a/tests/maken3.test
+++ /dev/null
@@ -1,181 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test `make -n' for various targets, to ensure that:
-#
-#  1. no files or directories are created or removed, and
-#
-#  2. if using GNU make, stdout output is sufficiently complete.
-#
-# FIXME: The checks in (2) should also work with BSD make implementations
-# FIXME: that support the `.MAKE' special target, but currently we don't
-# FIXME: explicitly test that this is truly the case.
-#
-# This test exercises the GCS-mandated targets (except for dist)
-# as well as tags, TAGS.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub sub2
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = foo.test
-SUBDIRS = sub sub2
-##BUILT_SOURCES = foo
-foo:
-foo.test:
-all-local:
-       @: > stamp-all
-install-data-local:
-       @: > stamp-install
-uninstall-local:
-       @: > stamp-uninstall
-clean-local:
-       @: > stamp-clean
-distclean-local:
-       @: > stamp-distclean
-info-local:
-       @: > stamp-info
-html-local:
-       @: > stamp-html
-dvi-local:
-       @: > stamp-dvi
-ps-local:
-       @: > stamp-ps
-pdf-local:
-       @: > stamp-pdf
-check-local:
-       @: > stamp-check
-installcheck-local:
-       @: > stamp-installcheck
-mostlyclean-local:
-       @: > stamp-mostlyclean
-maintainer-clean-local:
-       @: > stamp-maintainer-clean
-END
-cat >sub/Makefile.am <<'END'
-all-local:
-       @: > stamp-all-sub
-install-data-local:
-       @: > stamp-install-sub
-uninstall-local:
-       @: > stamp-uninstall-sub
-clean-local:
-       @: > stamp-clean-sub
-distclean-local:
-       @: > stamp-distclean-sub
-info-local:
-       @: > stamp-info-sub
-html-local:
-       @: > stamp-html-sub
-dvi-local:
-       @: > stamp-dvi-sub
-ps-local:
-       @: > stamp-ps-sub
-pdf-local:
-       @: > stamp-pdf-sub
-check-local:
-       @: > stamp-check-sub
-installcheck-local:
-       @: > stamp-installcheck-sub
-tags:
-       @: > stamp-tags-sub
-TAGS:
-       @: > stamp-TAGS-sub
-mostlyclean-local:
-       @: > stamp-mostlyclean-sub
-maintainer-clean-local:
-       @: > stamp-maintainer-clean-sub
-END
-cat >sub2/Makefile.am <<'END'
-all install uninstall clean check:
-       @: > address@hidden
-info dvi pdf ps:
-       @: > address@hidden
-html:
-       @: > address@hidden
-install-info install-html install-dvi install-pdf install-ps:
-       @: > address@hidden
-installcheck installdirs tags TAGS mostlyclean:
-       @: > address@hidden
-## These targets cannot be overridden like this:
-## install-strip distclean maintainer-clean
-END
-
-$ACLOCAL
-$AUTOCONF
-
-check_targets ()
-{
-  set -e
-  for target in \
-    all install install-strip uninstall clean distclean check \
-    info html dvi pdf ps \
-    install-info install-html install-dvi install-pdf install-ps \
-    installcheck installdirs tags TAGS mostlyclean maintainer-clean
-  do
-    $MAKE -n $target >stdout || { cat stdout; Exit 1; }
-    cat stdout
-    case $target in
-    install-* | installdirs | tags | TAGS ) ;;
-    *)
-      if using_gmake; then
-        grep "stamp-$target$" stdout || Exit 1
-      fi
-      test ! -f "stamp-$target$" || Exit 1
-      ;;
-    esac
-    case $target in
-    install-* | installdirs ) ;;
-    *)
-      if using_gmake; then
-        grep "stamp-$target-sub" stdout || Exit 1
-      fi
-      test ! -f "sub/stamp-$target-sub" || Exit 1
-      ;;
-    esac
-    case $target in
-    distclean | maintainer-clean ) ;;
-    *)
-      if using_gmake; then
-        grep "should-not-be-executed" stdout || Exit 1
-      fi
-      test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
-      ;;
-    esac
-  done
-}
-
-$AUTOMAKE -Wno-override
-./configure
-check_targets || Exit 1
-
-# Now, introduce BUILT_SOURCES into the toplevel Makefile
-# TODO: add BUILT_SOURCES to sub2, fix fallout.
-sed 's/##//' < Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE -Wno-override --force Makefile
-./configure
-check_targets || Exit 1
-
-Exit 0
diff --git a/tests/makevars.test b/tests/makevars.test
deleted file mode 100755
index f4a80aa..0000000
--- a/tests/makevars.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that automake includes the needed variables,
-# but not too many.
-
-. ./defs || Exit 1
-
-# Find the macros wanted by Automake.
-$ACLOCAL || Exit 1
-
-# Create some dummy Makefile.in.
-: > Makefile.am
-
-$AUTOMAKE || Exit 1
-
-# We are definitely not needing a compiler or preprocessor.
-$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/man.test b/tests/man.test
deleted file mode 100755
index 93b3bb2..0000000
--- a/tests/man.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `dist' prefix works with man pages.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-nodist_man1_MANS = bar.man
-END
-
-: > foo.1
-: > bar.man
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-grep '^MANS ' Makefile.in
diff --git a/tests/man2.test b/tests/man2.test
deleted file mode 100755
index 0027645..0000000
--- a/tests/man2.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that man pages listed in man_MANS are installed and
-# renamed as documented.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-man_MANS = foo.2
-man4_MANS = foo.4 bar.man
-END
-
-: > foo.2
-: > foo.4
-: > bar.man
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-# Let's play with $DESTDIR too, it shouldn't hurt.
-./configure --prefix='' --mandir=/man
-DESTDIR="`pwd`/_inst" $MAKE -e install
-
-test -f ./_inst/man/man2/foo.2
-test -f ./_inst/man/man4/foo.4
-test -f ./_inst/man/man4/bar.4
-
-DESTDIR="`pwd`/_inst" $MAKE -e uninstall
-
-test ! -f ./_inst/man/man2/foo.2
-test ! -f ./_inst/man/man4/foo.4
-test ! -f ./_inst/man/man4/bar.4
diff --git a/tests/man3.test b/tests/man3.test
deleted file mode 100755
index b5afe0e..0000000
--- a/tests/man3.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# PR 516: Prefer generated manpages to distributed ones.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
-END
-
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
-AC_OUTPUT
-END
-
-cat > foo.1.in <<'END'
address@hidden@
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
diff --git a/tests/man4.test b/tests/man4.test
deleted file mode 100755
index de75f837..0000000
--- a/tests/man4.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure `make dist' fails when help2man replacement man pages are created.
-#
-# The assumption here is the following: if the developer uses help2man to
-# generate man pages from --help output, then these man pages may not be
-# stored in VCS.  However, they should be distributed, so that the end user
-# that receives the tarball doesn't have to install help2man.  If they are
-# not distributed, then the developer should make help2man a prerequisite
-# to building the package from a tarball, e.g., with a configure check for
-# help2man that errors out if it is unavailable.  In both cases it is
-# sufficient to check only distributed man pages.
-#
-# Idea of this whole shenanigan is to allow somebody to check out sources from
-# a VCS and build and install them without needing help2man installed.  The
-# installed man pages will be bogus in this case.  Typically, this happens
-# when developers ask users to try out a fix from VCS; the developers 
themselves
-# will usually have help2man installed (or should install it).
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-dist_man_MANS = $(srcdir)/foo.1 bar.1
-dist_bin_SCRIPTS = foo bar
-$(srcdir)/foo.1:
-       $(HELP2MAN) --output=$@ $(srcdir)/foo
-bar.1:
-       $(HELP2MAN) --output=$(srcdir)/bar.1 $(srcdir)/bar
-
-## It is a bug that we need to list $(srcdir)/bar.1 explicitly here.
-MAINTAINERCLEANFILES = $(dist_man_MANS) $(srcdir)/bar.1
-END
-
-cat >>configure.in <<'END'
-AM_MISSING_PROG([HELP2MAN], [help2man])
-AC_OUTPUT
-END
-
-cat > foo <<'END'
-#! /bin/sh
-while test $# -gt 0; do
-  case $1 in
-    -h | --help) echo "usage: $0 [OPTIONS]..."; exit 0;;
-    -v | --version) echo "$0 1.0"; exit 0;;
-  esac
-  shift
-done
-END
-
-cp foo bar
-
-cat > help2man <<'END'
-#! /bin/sh
-# fake help2man script that lets `missing' think it is not installed
-exit 127
-END
-
-chmod +x foo bar help2man
-save_PATH=$PATH
-PATH=`pwd`$PATH_SEPARATOR$PATH
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE
-$MAKE dist && Exit 1
-$MAKE distcheck && Exit 1
-$MAKE distclean
-
-mkdir build
-cd build
-../configure
-$MAKE
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'install help2man' stderr
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'install help2man' stderr
-
-rm -f ../help2man
-PATH=$save_PATH
-export PATH
-
-# If help2man is installed, then ensure that the recommendation works.
-if (help2man --version) >/dev/null 2>&1; then
-  $MAKE maintainer-clean
-  ../configure
-  $MAKE
-  $MAKE distcheck
-fi
-:
diff --git a/tests/man5.test b/tests/man5.test
deleted file mode 100755
index 437dc33..0000000
--- a/tests/man5.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure to extract the correct mansection from files in man_MANS.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-man_MANS = foo-1.4.5/foo.2 foo-1.4.5/bar.3 baz-1.4.2
-notrans_man_MANS = foo-1.4.5/nfoo.2 foo-1.4.5/nbar.3 nbaz-1.4.2
-END
-
-mkdir foo-1.4.5
-
-: > foo-1.4.5/foo.2
-: > foo-1.4.5/nfoo.2
-: > foo-1.4.5/bar.3
-: > foo-1.4.5/nbar.3
-: > baz-1.4.2
-: > nbaz-1.4.2
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-# Let's play with $DESTDIR too, it shouldn't hurt.
-./configure --mandir=/man
-DESTDIR="`pwd`/_inst" $MAKE -e install
-
-test -f ./_inst/man/man2/foo.2
-test -f ./_inst/man/man2/nfoo.2
-test -f ./_inst/man/man2/baz-1.4.2
-test -f ./_inst/man/man2/nbaz-1.4.2
-test -f ./_inst/man/man3/bar.3
-test -f ./_inst/man/man3/nbar.3
-
-test ! -d ./_inst/man/man1
-test ! -d ./_inst/man/man4
-test ! -d ./_inst/man/man5
-
-DESTDIR="`pwd`/_inst" $MAKE -e uninstall
-
-test ! -f ./_inst/man/man2/foo.2
-test ! -f ./_inst/man/man2/nfoo.2
-test ! -f ./_inst/man/man2/baz-1.4.2
-test ! -f ./_inst/man/man2/nbaz-1.4.2
-test ! -f ./_inst/man/man3/bar.3
-test ! -f ./_inst/man/man3/nbar.3
-
-:
diff --git a/tests/mdate.test b/tests/mdate.test
deleted file mode 100755
index 0dfba07..0000000
--- a/tests/mdate.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that mdate-sh is required when Texinfo used and version.texi needed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
-END
-
-# Required when using Texinfo.
-: > texinfo.tex
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required file.*mdate-sh.*not found' stderr
-
-:
diff --git a/tests/mdate2.test b/tests/mdate2.test
deleted file mode 100755
index 11b6d5d..0000000
--- a/tests/mdate2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure mdate-sh is included in distribution.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
address@hidden version.texi
-END
-
-# Required when using Texinfo.
-: > texinfo.tex
-: > mdate-sh
-echo '@setfilename textutils' > textutils.texi
-
-# Use "././" to confuse Automake into thinking this is a subdir build.
-$ACLOCAL || Exit 1
-$AUTOMAKE ././Makefile || Exit 1
-
-grep 'mdate-sh' Makefile.in | grep -v SHELL
diff --git a/tests/mdate3.test b/tests/mdate3.test
deleted file mode 100755
index 75105f9..0000000
--- a/tests/mdate3.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure mdate-sh run correctly.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT([mdate3], [1.0])
-AC_CONFIG_AUX_DIR([foo])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
-END
-
-mkdir foo
-
-# Required when using Texinfo.
-: > foo/texinfo.tex
-: > foo/mdate-sh
-mv install-sh foo
-mv missing foo
-mv mkinstalldirs foo
-mv depcomp foo
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '[^/]mdate-sh' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/mdate4.test b/tests/mdate4.test
deleted file mode 100755
index ca24f56..0000000
--- a/tests/mdate4.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that mdate-sh is added to the right directory.
-# Report from Kevin Dalley
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile sub/Makefile)
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-END
-
-mkdir sub
-
-cat > sub/Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > sub/textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE -a || Exit 1
-test -f sub/mdate-sh
diff --git a/tests/mdate5.test b/tests/mdate5.test
deleted file mode 100755
index c9140b6..0000000
--- a/tests/mdate5.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2007  Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure mdate-sh works correctly.
-
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-set x `$SHELL ./mdate-sh Makefile.am`
-shift
-# Check that mdate output looks like a date:
-test $# = 3
-case $1$3 in *[!0-9]*) Exit 1;; esac
-test $1 -lt 32
diff --git a/tests/mdate6.test b/tests/mdate6.test
deleted file mode 100755
index e7f7d69..0000000
--- a/tests/mdate6.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# mdate-sh can work with weird file names, doesn't eval too much.
-
-. ./defs || Exit 1
-
-set -e
-
-a=
-file='file  name $a'
-( : > "$file" ) || Exit 77
-
-cp "$testsrcdir"/../lib/mdate-sh .
-$SHELL ./mdate-sh "$file" >stdout 2>stderr ||
-  { cat stdout; cat stderr >&2; Exit 1; }
-cat stdout
-cat stderr >&2
-grep '[12][0-9]\{3\}' stdout
-test ! -s stderr
-
-:
diff --git a/tests/missing.test b/tests/missing.test
deleted file mode 100755
index eaf6f54..0000000
--- a/tests/missing.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007, 2008  Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test missing with version mismatches.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Make sure we do use missing, even if the user exported AUTOCONF.
-# (We cannot export this new value, because it would be used by Automake
-# when tracing, and missing is no good for this.)
-MYAUTOCONF="./missing --run $AUTOCONF"
-unset AUTOCONF
-
-./configure AUTOCONF="$MYAUTOCONF"
-$MAKE
-$sleep
-# Hopefully the install version of Autoconf cannot compete with this one...
-echo 'AC_PREREQ(9999)' >> aclocal.m4
-$MAKE distdir
-
-# Try version number suffixes if we can add them safely.
-case $MYAUTOCONF in *autoconf)
-  ./configure AUTOCONF="${MYAUTOCONF}6789"
-  $MAKE
-  $sleep
-  # Hopefully the install version of Autoconf cannot compete with this one...
-  echo 'AC_PREREQ(9999)' >> aclocal.m4
-  $MAKE distdir
-esac
-
-# Run again, but without missing, to ensure that timestamps were updated.
-export AUTOMAKE ACLOCAL
-./configure AUTOCONF="$MYAUTOCONF"
-$MAKE
-
-# Make sure $MAKE fails when timestamps aren't updated and missing is not used.
-$sleep
-touch aclocal.m4
-$MAKE && Exit 1
-:
diff --git a/tests/missing2.test b/tests/missing2.test
deleted file mode 100755
index 2629198..0000000
--- a/tests/missing2.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test missing with version mismatches.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-m4_include([v.m4])
-AC_OUTPUT
-EOF
-
-: > v.m4
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# See missing.test for explanations about this.
-MYAUTOCONF="./missing --run $AUTOCONF"
-unset AUTOCONF
-
-./configure AUTOCONF="$MYAUTOCONF"
-
-$MAKE
-$sleep
-# Hopefully the install version of Autoconf cannot compete with this one...
-echo 'AC_PREREQ(9999)' > v.m4
-$MAKE distdir
-
-# Run again, but without missing, to ensure that timestamps were updated.
-export AUTOMAKE ACLOCAL
-./configure AUTOCONF="$MYAUTOCONF"
-$MAKE
-
-# Make sure $MAKE fail when timestamps aren't updated and missing is not used.
-$sleep
-touch v.m4
-$MAKE && Exit 1
-:
diff --git a/tests/missing3.test b/tests/missing3.test
deleted file mode 100755
index 54044f5..0000000
--- a/tests/missing3.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test missing when running a tool's --version.
-
-. ./defs || Exit 1
-
-set -e
-
-# b7cb8259 assumed not to exist.
-
-./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep . stderr && Exit 1
-./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep WARNING stderr
-
-./missing --run b7cb8259 --version && Exit 1
-./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep WARNING stderr
-
-# missing itself it known to exist :)
-
-./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep . stderr && Exit 1
-./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep WARNING stderr
-
-./missing --run ./missing --version 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep . stderr && Exit 1
-./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep WARNING stderr && Exit 1
-grep Unknown stderr
diff --git a/tests/missing4.test b/tests/missing4.test
deleted file mode 100755
index 13a4c22..0000000
--- a/tests/missing4.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See how well the rebuild rule handles an aclocal.m4 that was
-# generated for another version of autoconf.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >>configure.in
-
-touch Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-
-sed '1,20 s/m4_defn(\[AC_AUTOCONF_VERSION\]),/9999,/' < aclocal.m4 > 
aclocal.tmp
-cmp aclocal.m4 aclocal.tmp && Exit 1
-
-mv aclocal.tmp aclocal.m4
-
-$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'You have another version of autoconf' stderr
-grep 'aclocal.m4:.*this file was generated for' stderr
-
-$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'You have another version of autoconf' stderr && Exit 1
-grep 'aclocal.m4:.*this file was generated for' stderr && Exit 1
-
-:
diff --git a/tests/missing5.test b/tests/missing5.test
deleted file mode 100755
index a96e14e..0000000
--- a/tests/missing5.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# test how well `missing' finds output file names of various tools.
-# PR automake/483.
-
-. ./defs || Exit 1
-
-set -e
-
-# these programs may be invoked by `missing'
-needed_tools='chmod find sed test touch'
-needed_tools_csep=`echo $needed_tools | sed 's/ /, /g'`
-
-cat >configure.in <<EOF
-AC_INIT([missing4], [1.0])
-m4_foreach([tool], [$needed_tools_csep],
-          [AC_PATH_PROG(tool, tool, [false])
-           AC_CONFIG_FILES(tool, chmod +x tool)
-          ])
-AC_OUTPUT
-EOF
-
-for tool in $needed_tools; do
-  cat >$tool.in <<EOF
-#! /bin/sh
-exec @$tool@ "\$@"
-EOF
-done
-
-$AUTOCONF
-./configure
-
-echo output-file > output-file
-cp output-file my--output--file-o
-
-save_PATH=$PATH
-PATH=.
-export PATH
-missing --help
-missing --version
-for tool in autom4te help2man makeinfo; do
-  missing --run $tool -o my--output--file-o input
-  missing --run $tool --output my--output--file-o input
-done
-PATH=$save_PATH
-export PATH
-diff output-file my--output--file-o
-test ! -f ./--file-o
-test ! -f input
diff --git a/tests/missing6.test b/tests/missing6.test
deleted file mode 100755
index e543697..0000000
--- a/tests/missing6.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure autoconf version checks in aclocal.m4 are robust.
-
-. ./defs || Exit 1
-
-set -e
-
-{
-  echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
-  echo 'dnl!! m4_define([a], [oops])'
-  cat configure.in
-  echo AC_OUTPUT
-} >configure.ac
-rm -f configure.in
-
-touch Makefile.am
-
-$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'You have another version of autoconf' stderr
-grep 'aclocal.m4:.*this file was generated for' stderr
-$AUTOMAKE
-./configure
-$MAKE
-
-sed 's/^dnl!! //' < configure.ac > configure.tmp
-cmp configure.ac configure.tmp && Exit 99 # sanity check
-mv -f configure.tmp configure.ac
-
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'You have another version of autoconf' stderr
-grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
-
-:
diff --git a/tests/mkinst2.test b/tests/mkinst2.test
deleted file mode 100755
index 359f562..0000000
--- a/tests/mkinst2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2007  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure no-installman suppresses man dir creation.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-installman
-man_MANS = foo.1
-END
-
-: > foo.1
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure --prefix "`pwd`/sub"
-
-$MAKE installdirs
-test ! -d sub/man
diff --git a/tests/mkinst3.test b/tests/mkinst3.test
deleted file mode 100755
index 20b9b04..0000000
--- a/tests/mkinst3.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test mkinstalldirs with spaces in directory names.
-
-. ./defs || Exit 1
-
-set -e
-
-# Make sure the directory we will create can be created...
-mkdir '~a b' || Exit 77
-mkdir '~a b/-x  y' || Exit 77
-rm -rf '~a b'
-
-cp "$testsrcdir/../lib/mkinstalldirs" .
-
-# Test mkinstalldirs with the installed mkdir.
-
-./mkinstalldirs '~a b/-x  y'
-test -d '~a b/-x  y'
-rm -rf '~a b'
-
-# Trick mkinstalldirs into thinking mkdir does not support -p.
-
-mkdir bin
-cat >bin/mkdir <<'EOF'
-#!/bin/sh
-for arg
-do
-  case $arg in
-  -p) exit 1;;
-  esac
-done
-PATH=$AM_PATH
-export PATH
-exec mkdir "$@"
-EOF
-
-chmod +x bin/mkdir
-AM_PATH=$PATH
-export AM_PATH
-PATH=`pwd`/bin$PATH_SEPARATOR$PATH
-export PATH
-
-# Test mkinstalldirs without mkdir -p.
-
-./mkinstalldirs '~a b/-x  y'
-test -d '~a b/-x  y'
-rm -rf '~a b'
-
-./mkinstalldirs "`pwd`///~a b//-x  y"
-test -d "`pwd`/~a b/-x  y"
-rm -rf '~a b'
diff --git a/tests/mkinstall.test b/tests/mkinstall.test
deleted file mode 100755
index 4a65307..0000000
--- a/tests/mkinstall.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where mkinstalldirs variable can be set incorrectly.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-# The "././" prefix confuses Automake into thinking it is doing a
-# subdir build.  Yes, this is hacky.
-$ACLOCAL || Exit 1
-$AUTOMAKE ././Makefile || Exit 1
-
-grep ' /mkinstalldirs' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/mmode.test b/tests/mmode.test
deleted file mode 100755
index c5a16c9..0000000
--- a/tests/mmode.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for AM_MAINTAINER_MODE defaults.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-AC_OUTPUT
-END
-
-: >Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-grep '^MAINT.*#' Makefile
-
-./configure --disable-maintainer-mode
-grep '^MAINT.*#' Makefile
-
-./configure --enable-maintainer-mode
-grep '^MAINT.*#' Makefile && Exit 1
-
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in > configure.int
-mv -f configure.int configure.in
-mv configure configure1
-$AUTOCONF --force
-diff configure configure1
-
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in > configure.int
-mv -f configure.int configure.in
-$AUTOCONF --force
-
-./configure
-grep '^MAINT.*#' Makefile && Exit 1
-
-./configure --enable-maintainer-mode
-grep '^MAINT.*#' Makefile && Exit 1
-
-./configure --disable-maintainer-mode
-grep '^MAINT.*#' Makefile
-
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.in > configure.int
-mv -f configure.int configure.in
-$AUTOCONF --force -Werror && Exit 1
-
-:
diff --git a/tests/mmodely.test b/tests/mmodely.test
deleted file mode 100755
index fc94d37..0000000
--- a/tests/mmodely.test
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2006, 2007, 2009, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Verify that intermediate files are only built from Yacc and Lex
-# sources in maintainer mode.
-# From Derek R. Price.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-AC_PROG_CC
-AM_PROG_LEX
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-YACC = false
-LEX = false
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.y joe.l
-LDADD = @LEXLIB@
-END
-
-# The point of this test is that it is not dependent on a working lex or yacc.
-cat > joe.c <<EOF
-int joe (int arg)
-{
-    return arg * 2;
-}
-EOF
-# On systems which link in libraries non-lazily and whose linkers
-# complain about unresolved symbols by default, such as Solaris, an
-# yylex function needs to be defined to avoid an error due to an
-# unresolved symbol.
-cat > zardoz.c <<EOF
-int joe (int arg);
-int yylex (void)
-{
-    return 0;
-}
-int main (int argc, char **argv)
-{
-    return joe (argc);
-}
-EOF
-
-# Ensure a later timestamp for our Lex & Yacc sources.
-$sleep
-: > joe.l
-: > zardoz.y
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-
-cat >myyacc.sh <<'END'
-#! /bin/sh
-echo "$@" >y.tab.c
-END
-cat >mylex.sh <<'END'
-echo "$@" >lex.yy.c
-END
-chmod +x myyacc.sh mylex.sh
-PATH="`pwd`$PATH_SEPARATOR$PATH"
-
-# make maintainer-clean; ./configure; make should always work,
-# per GNU Standard.
-$MAKE maintainer-clean
-./configure
-YACC="myyacc.sh" LEX="mylex.sh" \
-   LEX_OUTPUT_ROOT='lex.yy' $MAKE -e zardoz.c joe.c
-grep zardoz.y zardoz.c
-grep joe.l joe.c
diff --git a/tests/multlib.test b/tests/multlib.test
deleted file mode 100755
index 59a2260..0000000
--- a/tests/multlib.test
+++ /dev/null
@@ -1,159 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2010, 2012 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check multilib support.
-# Based on a test case from Ralf Corsepius.
-
-required='gcc GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-# Multilib support has been deprecated in the Automake core.
-
-cat >>configure.in <<'END'
-AM_ENABLE_MULTILIB([Makefile], [.])
-END
-
-$ACLOCAL
-$AUTOCONF -Wall -Werror 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '^configure\.in:4:.*AM_ENABLE_MULTILIB.* removed.* soon' stderr
-grep '"multilib".*feature' stderr
-grep 'contrib.* in the Automake distribution' stderr
-
-rm -rf autom4te*.cache aclocal.m4 configure
-
-# Functional tests now.
-
-cat >configure.in <<'END'
-AC_INIT([multlib], [1.0])
-AC_CONFIG_SRCDIR(libfoo/foo.c)
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_SUBDIRS(libfoo)
-AC_CONFIG_SUBDIRS(libbar)
-AC_OUTPUT
-END
-
-cat >mycc <<'END'
-#! /bin/sh
-case ${1+"$@"} in
- *-print-multi-lib*)
-  echo ".;"
-  echo "debug;@g"
-  exit 0 ;;
-esac
-gcc ${1+"$@"}
-END
-
-chmod +x mycc
-PATH=`pwd`$PATH_SEPARATOR$PATH
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = @subdirs@
-EXTRA_DIST = config-ml.in symlink-tree
-EOF
-
-# libfoo tests multilib supports when there are no subdirectories
-# libbar tests multilib supports when there are subdirectories
-
-mkdir libfoo
-
-cat >libfoo/configure.in <<'END'
-AC_PREREQ(2.57)
-AC_INIT(libfoo, 0.1, address@hidden)
-AC_CONFIG_SRCDIR(foo.c)
-# Apparently it doesn't work to have auxdir=.. when
-# multilib uses symlinked trees.
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AM_ENABLE_MULTILIB(Makefile,[..])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat >libfoo/Makefile.am <<'END'
-noinst_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-: > libfoo/foo.c
-
-mkdir libbar
-
-cat >libbar/configure.in <<'END'
-AC_PREREQ(2.57)
-AC_INIT(libbar, 0.1, address@hidden)
-# Apparently it doesn't work to have auxdir=.. when
-# multilib uses symlinked trees.
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AM_ENABLE_MULTILIB(Makefile,[..])
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_OUTPUT
-END
-
-cat >libbar/Makefile.am <<'END'
-SUBDIRS = sub
-noinst_LIBRARIES = libbar.a
-libbar_a_SOURCES = bar.c
-END
-
-mkdir libbar/sub
-
-: >libbar/sub/Makefile.am
-
-: > libbar/bar.c
-
-cp "$testsrcdir/../lib/config-ml.in" .
-cp "$testsrcdir/../lib/symlink-tree" .
-
-$ACLOCAL -Wno-obsolete
-$AUTOCONF -Werror -Wall -Wno-obsolete
-$AUTOMAKE --add-missing
-cd libfoo
-$ACLOCAL
-$AUTOCONF -Werror -Wall -Wno-obsolete
-$AUTOMAKE --add-missing
-cd ../libbar
-$ACLOCAL
-$AUTOCONF -Werror -Wall -Wno-obsolete
-$AUTOMAKE --add-missing
-cd ..
-
-
-# Check VPATH builds
-mkdir build
-cd build
-../configure --enable-multilib CC=mycc
-$MAKE
-$MAKE install
-$MAKE distcleancheck
-
-# Check standard builds.
-cd ..
-# Why to I have to specify --with-target-subdir?
-./configure --enable-multilib --with-target-subdir=. CC=mycc
-$MAKE
diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test
deleted file mode 100755
index 2a0cf68..0000000
--- a/tests/nobase-libtool.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008  Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure nobase_* works for libtool libraries and programs as well.
-# This is just the libtool equivalent of nobase.test, split
-# up for greater exposure of nobase.test.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-fooexecdir = $(prefix)/foo
-fooexec_LTLIBRARIES = sub/libbase.la
-nobase_fooexec_LTLIBRARIES = sub/libnobase.la
-fooexec_PROGRAMS = sub/base
-nobase_fooexec_PROGRAMS = sub/nobase
-sub_libbase_la_SOURCES = source2.c
-sub_libnobase_la_SOURCES = source2.c
-sub_base_SOURCES = source.c
-sub_nobase_SOURCES = source.c
-
-test-install-data: install-data
-       test ! -f inst/foo/sub/libnobase.la
-       test ! -f inst/foo/libbase.la
-
-test-install-exec: install-exec
-       test   -f inst/foo/sub/libnobase.la
-       test ! -f inst/foo/libnobase.la
-       test   -f inst/foo/libbase.la
-EOF
-
-mkdir sub
-
-cat >source.c <<'EOF'
-int
-main (int argc, char *argv[])
-{
-  return 0;
-}
-EOF
-cp source.c source2.c
-
-rm -f install-sh
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a --copy
-./configure --prefix "`pwd`/inst" --program-prefix=p
-
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-
-test `find inst/foo -type f -print | wc -l` = 0
-
-$MAKE install-strip
-
-# Likewise, in a VPATH build.
-
-$MAKE uninstall
-$MAKE distclean
-mkdir build
-cd build
-../configure --prefix "`pwd`/inst" --program-prefix=p
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-test `find inst/foo -type f -print | wc -l` = 0
diff --git a/tests/nobase-nodist.test b/tests/nobase-nodist.test
deleted file mode 100755
index 90823e2..0000000
--- a/tests/nobase-nodist.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Interaction of `nobase_' and `nodist_' prefixes.
-
-. ./defs || Exit 1
-
-set -e
-
-# Simulate no emacs and no python (it shouldn't be needed in this test).
-EMACS="no" PYTHON=":"; export EMCAS PYTHON
-
-cat >> configure.in << 'END'
-AM_PATH_LISPDIR
-AM_PATH_PYTHON([], [], [:])
-# Simulate no javac (it shouldn't be needed in this test).
-AC_SUBST([JAVAC], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-nobase_nodist_noinst_PYTHON = baz1.py sub/baz2.py
-# Lisp and Java sources are not distributed by default, so try both
-# with and without the `nodist_' prefix, for more coverage.
-nobase_noinst_LISP = foo1.el sub/foo2.el
-nobase_nodist_noinst_LISP = foo3.el sub/foo4.el
-nobase_noinst_JAVA = bar1.java sub/bar2.java
-nobase_nodist_noinst_JAVA = bar3.java sub/bar4.java
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE distdir
-
-ls -l $distdir $distdir/* # For debugging.
-test ! -f $distdir/foo1.el
-test ! -f $distdir/sub/foo2.el
-test ! -f $distdir/foo3.el
-test ! -f $distdir/sub/foo4.el
-test ! -f $distdir/bar1.java
-test ! -f $distdir/sub/bar2.java
-test ! -f $distdir/bar3.java
-test ! -f $distdir/sub/bar4.java
-test ! -f $distdir/baz1.py
-test ! -f $distdir/sub/baz2.py
-
-:
diff --git a/tests/nobase-python.test b/tests/nobase-python.test
deleted file mode 100755
index db5b830..0000000
--- a/tests/nobase-python.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure nobase_* works for python files.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_PATH_PYTHON
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'END'
-mydir=$(prefix)/my
-my_PYTHON = one.py sub/base.py
-nobase_my_PYTHON = two.py sub/nobase.py
-
-test-install-data: install-data
-       test   -f inst/my/one.py
-       test   -f inst/my/one.pyc
-       test   -f inst/my/two.py
-       test   -f inst/my/two.pyc
-       test   -f inst/my/base.py
-       test   -f inst/my/base.pyc
-       test   -f inst/my/sub/nobase.py
-       test   -f inst/my/sub/nobase.pyc
-       test ! -f inst/my/nobase.py
-       test ! -f inst/my/nobase.pyc
-END
-
-mkdir sub
-
-for file in one.py sub/base.py two.py sub/nobase.py
-do
-  echo 'def one(): return 1' >$file
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-mkdir inst
-inst=`pwd`/inst
-
-./configure --prefix "`pwd`/inst" --program-prefix=p
-
-$MAKE
-$MAKE test-install-data
-$MAKE uninstall
-
-test `find inst/my -type f -print | wc -l` = 0
-
-$MAKE install-strip
-
-# Likewise, in a VPATH build.
-
-$MAKE uninstall
-$MAKE distclean
-mkdir build
-cd build
-../configure --prefix "`pwd`/inst" --program-prefix=p
-$MAKE
-$MAKE test-install-data
-$MAKE uninstall
-test `find inst/my -type f -print | wc -l` = 0
diff --git a/tests/nobase.test b/tests/nobase.test
deleted file mode 100755
index cac8756..0000000
--- a/tests/nobase.test
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009  Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure nobase_* works.
-
-required='gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-foodir = $(prefix)/foo
-fooexecdir = $(prefix)/foo
-
-foo_HEADERS = sub/base.h sub/base-gen.h
-nobase_foo_HEADERS = sub/nobase.h sub/nobase-gen.h
-
-dist_foo_DATA = sub/base.dat sub/base-gen.dat
-nobase_dist_foo_DATA = sub/nobase.dat sub/nobase-gen.dat
-
-dist_fooexec_SCRIPTS = sub/base.sh sub/base-gen.sh
-nobase_dist_fooexec_SCRIPTS = sub/nobase.sh sub/nobase-gen.sh
-
-fooexec_PROGRAMS = sub/base
-nobase_fooexec_PROGRAMS = sub/nobase
-sub_base_SOURCES = source.c
-sub_nobase_SOURCES = source.c
-
-fooexec_LIBRARIES = sub/libbase.a
-nobase_fooexec_LIBRARIES = sub/libnobase.a
-sub_libbase_a_SOURCES = source.c
-sub_libnobase_a_SOURCES = source.c
-
-generated_files = sub/base-gen.h sub/nobase-gen.h sub/base-gen.dat \
-sub/nobase-gen.dat sub/base-gen.sh sub/nobase-gen.sh
-
-$(generated_files):
-       $(MKDIR_P) sub
-       echo "generated file $@" > $@
-
-CLEANFILES = $(generated_files)
-
-test-install-data: install-data
-       test   -f inst/foo/sub/nobase.h
-       test ! -f inst/foo/nobase.h
-       test   -f inst/foo/sub/nobase-gen.h
-       test ! -f inst/foo/nobase-gen.h
-       test   -f inst/foo/base.h
-       test   -f inst/foo/base-gen.h
-       test   -f inst/foo/sub/nobase.dat
-       test ! -f inst/foo/nobase.dat
-       test   -f inst/foo/sub/nobase-gen.dat
-       test ! -f inst/foo/nobase-gen.dat
-       test   -f inst/foo/base.dat
-       test   -f inst/foo/base-gen.dat
-       test ! -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/sub/pnobase-gen.sh
-       test ! -f inst/foo/pbase.sh
-       test ! -f inst/foo/pbase-gen.sh
-       test ! -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pbase$(EXEEXT)
-       test ! -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libbase.a
-
-test-install-exec: install-exec
-       test   -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/pnobase.sh
-       test   -f inst/foo/sub/pnobase-gen.sh
-       test ! -f inst/foo/pnobase-gen.sh
-       test   -f inst/foo/pbase.sh
-       test   -f inst/foo/pbase-gen.sh
-       test   -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pnobase$(EXEEXT)
-       test   -f inst/foo/pbase$(EXEEXT)
-       test   -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libnobase.a
-       test   -f inst/foo/libbase.a
-EOF
-
-mkdir sub
-
-: > sub/base.h
-: > sub/nobase.h
-: > sub/base.dat
-: > sub/nobase.dat
-: > sub/base.sh
-: > sub/nobase.sh
-
-cat >source.c <<'EOF'
-int
-main (int argc, char *argv[])
-{
-  return 0;
-}
-EOF
-cp source.c source2.c
-
-rm -f install-sh
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a --copy
-./configure --prefix "`pwd`/inst" --program-prefix=p
-
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-
-test `find inst/foo -type f -print | wc -l` = 0
-
-$MAKE install-strip
-
-# Likewise, in a VPATH build.
-
-$MAKE uninstall
-$MAKE distclean
-mkdir build
-cd build
-../configure --prefix "`pwd`/inst" --program-prefix=p
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-test `find inst/foo -type f -print | wc -l` = 0
diff --git a/tests/nodef.test b/tests/nodef.test
deleted file mode 100755
index 1a58bb7..0000000
--- a/tests/nodef.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
-
-. ./defs || Exit 1
-
-set -e
-
-# -------------------------------------------------------------------
-# Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE
-# forms.  The day these obsolete AC_INIT and AM_INIT_AUTOMAKE forms
-# are dropped, just erase the file.
-# nodef2.test contains the modern version of this test.
-# -------------------------------------------------------------------
-
-# First, check that PACKAGE and VERSION are output by default.
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
-AC_OUTPUT(output)
-END
-
-echo 'DEFS = @DEFS@' > output.in
-
-$ACLOCAL
-$AUTOCONF
-./configure
-
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output
-
-# Then, check that PACKAGE and VERSION are not output if requested.
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN], [no])
-AC_OUTPUT(output)
-END
-
-$ACLOCAL
-$AUTOCONF
-./configure
-
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
-:
diff --git a/tests/nodef2.test b/tests/nodef2.test
deleted file mode 100755
index 5a6c0ee..0000000
--- a/tests/nodef2.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
-
-. ./defs || Exit 1
-
-set -e
-
-# First, check that PACKAGE and VERSION are output by default.
-
-cat > configure.in << 'END'
-AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
-AM_INIT_AUTOMAKE
-AC_OUTPUT(output)
-END
-
-echo 'DEFS = @DEFS@' > output.in
-
-$ACLOCAL
-$AUTOCONF
-./configure
-
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output
-
-# Then, check that PACKAGE and VERSION are not output if requested.
-
-cat > configure.in << 'END'
-AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
-AM_INIT_AUTOMAKE([no-define])
-AC_OUTPUT(output Makefile)
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE   # Dummy call to make sure Automake grok `no-define' silently.
-./configure
-
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1
-:
diff --git a/tests/nodep.test b/tests/nodep.test
deleted file mode 100755
index 650bbd0..0000000
--- a/tests/nodep.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure no-dependencies option does the right thing.
-# Bug report from Greg A. Woods.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = y.c
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-mkdir x
-
-: > y.c
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '%' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/nodep2.test b/tests/nodep2.test
deleted file mode 100755
index 53bcaad..0000000
--- a/tests/nodep2.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another test to make sure no-dependencies option does the right thing.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = a.c b.cpp c.m d.S e.java f.upc
-END
-
-cat > configure.in << 'END'
-AC_INIT([nodep2], [1], address@hidden)
-AM_INIT_AUTOMAKE([no-dependencies])
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_OBJC
-AM_PROG_AS
-AM_PROG_GCJ
-AM_PROG_UPC
-AC_OUTPUT
-END
-
-: > a.c
-: > b.cpp
-: > c.m
-: > d.S
-: > e.java
-: > f.upc
-
-$ACLOCAL
-$AUTOMAKE
-
-grep DEPMODE Makefile.in && Exit 1
-:
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
deleted file mode 100755
index 735c363..0000000
--- a/tests/nodepcomp.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure depcomp isn't always required.
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f depcomp
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/nodist.test b/tests/nodist.test
deleted file mode 100755
index 7239338..0000000
--- a/tests/nodist.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dist_*_SOURCES and nodist_*_SOURCES work.
-
-. ./defs || Exit 1
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = eyeball
-
-eyeball_SOURCES = a.c
-nodist_eyeball_SOURCES = b.c
-dist_eyeball_SOURCES = c.c
-END
-
-: > a.c
-: > b.c
-: > c.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^am_eyeball_OBJECTS' Makefile.in || Exit 1
-grep '^DIST_SOURCES =' Makefile.in || Exit 1
-grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/nodist2.test b/tests/nodist2.test
deleted file mode 100755
index 3d9e6ce..0000000
--- a/tests/nodist2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure nodist_noinst_HEADERS work.
-# For PR 249.
-
-. ./defs || Exit 1
-
-cat >> configure.in <<'EOF'
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-nodist_noinst_HEADERS = baz.h
-EOF
-
-: > baz.h
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure --prefix "`pwd`/install"
-$MAKE install-data
diff --git a/tests/nodist3.test b/tests/nodist3.test
deleted file mode 100755
index 21cfec3..0000000
--- a/tests/nodist3.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure no-dist option works.
-
-. ./defs || Exit 1
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dist
-bin_PROGRAMS = eyeball
-eyeball_SOURCES = a.c
-END
-
-: > a.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^dist:' Makefile.in && Exit 1
-grep '^DIST_SOURCES =' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/nogzip.test b/tests/nogzip.test
deleted file mode 100755
index 77adcdc..0000000
--- a/tests/nogzip.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for no-dist-gzip
-
-required=bzip2
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([nogzip], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test: distcheck
-       test $(DIST_ARCHIVES) = nogzip-1.0.tar.bz2
-       test -f $(DIST_ARCHIVES)
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test
diff --git a/tests/nogzip2.test b/tests/nogzip2.test
deleted file mode 100755
index f6e01ab..0000000
--- a/tests/nogzip2.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check diagnostic for no-dist-gzip without dist-*.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([nogzip], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'configure.in:2:.*no-dist-gzip' stderr
-
-echo 'AUTOMAKE_OPTIONS = dist-bzip2' > Makefile.am
-$AUTOMAKE
diff --git a/tests/noinst.test b/tests/noinst.test
deleted file mode 100755
index dd97481..0000000
--- a/tests/noinst.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure "make install" will build all in directory with
-# nothing to install.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-all-local:
-       exit 1
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^install[-a-z]*:.* all' Makefile.in
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
deleted file mode 100755
index b04bb0d..0000000
--- a/tests/noinstdir.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that noinst_* and check_* are not installed.
-# From Pavel Roskin.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-noinst_SCRIPTS = foo.sh
-noinst_DATA = foo.xpm
-noinst_LIBRARIES = libfoo.a
-noinst_PROGRAMS = foo
-noinst_HEADERS = foo.h
-check_SCRIPTS = bar.sh
-check_DATA = bar.xpm
-check_LIBRARIES = libbar.a
-check_PROGRAMS = bar
-check_HEADERS = bar.h
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-: > ar-lib
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'noinstdir' Makefile.in && Exit 1
-grep 'checkdir' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/nolink.test b/tests/nolink.test
deleted file mode 100755
index 5e42076..0000000
--- a/tests/nolink.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake does not emit a link rule for unknown languages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-exeext
-
-bin_PROGRAMS = meal
-meal_SOURCES = beans.veg beef.meat
-
-meal: beans.veg beef.meat
-       cat beans.veg beef.meat > meal
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-override
-
-grep '^meal.*:' Makefile.in | grep -v beef.meat && Exit 1
-
-Exit 0
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
deleted file mode 100755
index 43535ef..0000000
--- a/tests/nostdinc.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure nostdinc option works correctly.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = nostdinc
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '.*-I *\.' Makefile.in && Exit 1
-
-# We'll test the fully-processed Makefile too.
-$AUTOCONF
-
-# Test with $builddir != $srcdir
-mkdir build
-cd build
-../configure
-$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
-
-# Test with $builddir = $srcdir
-cd ..
-./configure
-$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
-
-Exit 0
diff --git a/tests/notrans.test b/tests/notrans.test
deleted file mode 100755
index d3ee2b2..0000000
--- a/tests/notrans.test
+++ /dev/null
@@ -1,133 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check all notrans_, dist_, nodist_ prefix combinations for MANS
-# primary and install-man dependencies.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'EOF'
-man_MANS = foo.1 foo2.1
-dist_man_MANS = bar.2 bar2.2
-nodist_man_MANS = baz.3 baz2.3
-notrans_man_MANS = x-foo.4 x-foo2.4
-notrans_dist_man_MANS = x-bar.5 x-bar2.5
-notrans_nodist_man_MANS = x-baz.6 x-baz2.6
-man7_MANS = y-foo.man y-foo2.man
-dist_man5_MANS = y-bar.man y-bar2.man
-nodist_man4_MANS = y-baz.man y-baz2.man
-notrans_man3_MANS = z-foo.man z-foo2.man
-notrans_dist_man2_MANS = z-bar.man z-bar2.man
-notrans_nodist_man1_MANS = z-baz.man z-baz2.man
-
-# These two are ignored
-dist_notrans_man_MANS = nosuch.8
-nodist_notrans_man9_MANS = nosuch.man
-
-y-foo.man y-foo2.man:
-       : >$@
-y-bar.man y-bar2.man:
-       : >$@
-y-baz.man y-baz2.man:
-       : >$@
-z-foo.man z-foo2.man:
-       : >$@
-z-bar.man z-bar2.man:
-       : >$@
-z-baz.man z-baz2.man:
-       : >$@
-
-test-install: install
-       test -f inst/man/man1/gnu-foo.1
-       test -f inst/man/man1/gnu-foo2.1
-       test -f inst/man/man2/gnu-bar.2
-       test -f inst/man/man2/gnu-bar2.2
-       test -f inst/man/man3/gnu-baz.3
-       test -f inst/man/man3/gnu-baz2.3
-       test -f inst/man/man4/x-foo.4
-       test -f inst/man/man4/x-foo2.4
-       test -f inst/man/man5/x-bar.5
-       test -f inst/man/man5/x-bar2.5
-       test -f inst/man/man6/x-baz.6
-       test -f inst/man/man6/x-baz2.6
-       test -f inst/man/man7/gnu-y-foo.7
-       test -f inst/man/man7/gnu-y-foo2.7
-       test -f inst/man/man5/gnu-y-bar.5
-       test -f inst/man/man5/gnu-y-bar2.5
-       test -f inst/man/man4/gnu-y-baz.4
-       test -f inst/man/man4/gnu-y-baz2.4
-       test -f inst/man/man3/z-foo.3
-       test -f inst/man/man3/z-foo2.3
-       test -f inst/man/man2/z-bar.2
-       test -f inst/man/man2/z-bar2.2
-       test -f inst/man/man1/z-baz.1
-       test -f inst/man/man1/z-baz2.1
-       if test -d inst/man/man8; then (exit 1); else :; fi
-       if test -d inst/man/man9; then (exit 1); else :; fi
-EOF
-
-: > foo.1
-: > foo2.1
-: > bar.2
-: > bar2.2
-: > baz.3
-: > baz2.3
-: > x-foo.4
-: > x-foo2.4
-: > x-bar.5
-: > x-bar2.5
-: > x-baz.6
-: > x-baz2.6
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-grep '^install-man1:' Makefile.in | grep '\$(man_MANS)'
-grep '^install-man2:' Makefile.in | grep '\$(dist_man_MANS)'
-grep '^install-man3:' Makefile.in | grep '\$(nodist_man_MANS)'
-grep '^install-man4:' Makefile.in | grep '\$(notrans_man_MANS)'
-grep '^install-man5:' Makefile.in | grep '\$(notrans_dist_man_MANS)'
-grep '^install-man6:' Makefile.in | grep '\$(notrans_nodist_man_MANS)'
-
-if grep '^install-man8:' Makefile.in; then Exit 1; else :; fi
-if grep '^install-man9:' Makefile.in; then Exit 1; else :; fi
-
-./configure --program-prefix=gnu- --prefix "`pwd`"/inst --mandir 
"`pwd`"/inst/man
-$MAKE
-$MAKE test-install
-test `find inst/man -type f -print | wc -l` = 24
-$MAKE uninstall
-test `find inst/man -type f -print | wc -l` = 0
-
-# Opportunistically test for installdirs.
-rm -rf inst
-$MAKE installdirs
-test -d inst/man/man1
-test -d inst/man/man2
-test -d inst/man/man3
-test -d inst/man/man4
-test -d inst/man/man5
-test -d inst/man/man6
-test -d inst/man/man7
-if test -d inst/man/man8; then Exit 1; else :; fi
-if test -d inst/man/man9; then Exit 1; else :; fi
diff --git a/tests/number.test b/tests/number.test
deleted file mode 100755
index a43ff2f..0000000
--- a/tests/number.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure _OBJECTS only generated once.  Bug reported by
-# Joerg-Martin Schwarz.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-count=`grep -c '^zardoz_OBJECTS' Makefile.in`
-test $count -eq 1
diff --git a/tests/objc.test b/tests/objc.test
deleted file mode 100755
index facc4d4..0000000
--- a/tests/objc.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that `.m' extension works.
-# From Ralf Corsepius (for C++).
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_OBJC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.m
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^\.SUFFIXES:.*\.m' Makefile.in
diff --git a/tests/objc2.test b/tests/objc2.test
deleted file mode 100755
index 9931ef7..0000000
--- a/tests/objc2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that Automake suggests using AC_PROG_OBJC if Objective C sources
-# are used.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >>configure.in
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.m
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AC_PROG_OBJC stderr
diff --git a/tests/objext-pr10128.test b/tests/objext-pr10128.test
deleted file mode 100755
index 0692164..0000000
--- a/tests/objext-pr10128.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for automake bug#10128: $(OBJEXT) redefinition causes
-# $(foo_OBJECTS) to be defined as empty.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-LINK = echo >$@ Linked $@ from
-OBJEXT = fasl
-EXEEXT =
-
-noinst_PROGRAMS = foo zardoz
-foo_SOURCES = foo.lisp
-zardoz_SOURCES = mu1.lisp mu2.lisp
-
-## Un-commenting this is enough to make the test pass.  Weird!
-##.lisp.o:
-
-.lisp.fasl:
-       touch $@
-
-.PHONY: test
-test:
-       test '$(foo_OBJECTS)'    = 'foo.fasl'
-       test '$(zardoz_OBJECTS)' = 'mu1.fasl mu2.fasl'
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE test
-touch foo.lisp mu1.lisp mu2.lisp
-$MAKE all
-cat foo
-cat zardoz
-test "`cat foo`"    = "Linked foo from foo.fasl"
-test "`cat zardoz`" = "Linked zardoz from mu1.fasl mu2.fasl"
-
-:
diff --git a/tests/obsolete.test b/tests/obsolete.test
deleted file mode 100755
index 337e4db..0000000
--- a/tests/obsolete.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure obsolete macros can be autoupdated.
-
-# We need the following indirection in case someone exported e.g.
-# AUTOUPDATE='autoupdate --verbose'.
-set x ${AUTOUPDATE-autoupdate}
-required=$2
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-END
-
-$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
-    "$testsrcdir/../m4/obsolete.m4" >> obs
-cat obs >> configure.in
-$PERL -ne 'chomp; print "grep $_ stderr || Exit 1\n"; ' obs > obs.1
-$PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2
-
-# Sanity check.  Make sure we have added something to configure.in.
-test `cat configure.in | wc -l` -gt 1 || Exit 1
-
-$ACLOCAL || Exit 1
-
-# Expect Autoconf to complain about each of the macros in obs.
-$AUTOCONF -Wobsolete >stderr 2>&1
-. ./obs.1
-# Make sure Autoupdate remove each of these macros.
-$AUTOUPDATE || Exit 1
-. ./obs.2
-
-# Autoconf should be able to grok the updated configure.in.
-$AUTOCONF || Exit 1
-
-Exit 0
diff --git a/tests/order.test b/tests/order.test
deleted file mode 100755
index 0f39b79..0000000
--- a/tests/order.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure AC_DEFUN is handled correctly.  This test isn't named very
-# well.  Report from Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-jm_TEST
-FOO
-END
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([jm_TEST])
-AC_DEFUN([FOO], [AC_REQUIRE([jm_TEST])])
-END
-
-$ACLOCAL
diff --git a/tests/outdir.test b/tests/outdir.test
deleted file mode 100755
index 4bafb4e..0000000
--- a/tests/outdir.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure that --output-dir works.  Bug report from Joshua
-# Cowan.
-
-. ./defs || Exit 1
-
-cat > Makefile.am <<'END'
-pkgdata_DATA =
-END
-
-mkdir zardir
-
-$ACLOCAL || Exit 1
-$AUTOMAKE -Wno-obsolete --output-dir=zardir || Exit 1
-
-test -f Makefile.in && Exit 1
-test -f zardir/Makefile.in
diff --git a/tests/output-order.test b/tests/output-order.test
deleted file mode 100755
index cb9ffff..0000000
--- a/tests/output-order.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that `automake -a' output order is stable.
-# From report by Bruno Haible.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-: >Makefile.am
-: >AUTHORS
-: >ChangeLog
-: >NEWS
-: >README
-
-cat >.autom4te.cfg <<'END'
-begin-language: "Autoconf"
-args: --no-cache
-end-language: "Autoconf"
-begin-language: "Autoconf-without-aclocal-m4"
-args: --no-cache
-end-language: "Autoconf-without-aclocal-m4"
-END
-
-$ACLOCAL
-$AUTOCONF
-rm -f missing install-sh
-$AUTOMAKE --add-missing --copy 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-
-for i in 1 2 3 4 5 6; do
-  rm -f missing install-sh INSTALL COPYING
-  # The grep prevents a Heisenbug with the HP-UX shell and VERBOSE=yes.
-  $AUTOMAKE --add-missing --copy 2>&1 >/dev/null |
-  grep -v /dev/null |
-  diff - stderr
-done
diff --git a/tests/output.test b/tests/output.test
deleted file mode 100755
index 4f6a7cd..0000000
--- a/tests/output.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure files listed in AC_OUTPUT are found.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile frob/zardoz)
-END
-
-: > Makefile.am
-
-mkdir frob
-: > frob/zardoz.in
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/output10.test b/tests/output10.test
deleted file mode 100755
index a973559..0000000
--- a/tests/output10.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
-# This is comparable to output9.test, but testing Makefile rules.
-# PR/411
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << END
-AC_SUBST([FOO], [top])
-AC_SUBST([BAR], [bot])
-AC_CONFIG_FILES([a/top])
-AC_CONFIG_FILES([a/bot])
-AC_CONFIG_FILES([b/Makefile:a/top:b/Makefile.in:a/bot])
-AC_OUTPUT
-END
-
-mkdir a
-mkdir b
-
-cat >Makefile.am <<\EOF
-SUBDIRS = b
-dist-hook:
-       test ! -f $(distdir)/a/top
-       test ! -f $(distdir)/a/bot
-EOF
-
-cat >b/Makefile.am <<\EOF
-output:
-       echo $(TOP)$(BOT) > ok
-EOF
-
-echo address@hidden@ >a/top.in
-echo address@hidden@ >a/bot.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-mkdir build
-cd build
-../configure
-cd b
-$MAKE output
-grep topbot ok
-cd ..
-$MAKE distcheck
diff --git a/tests/output11.test b/tests/output11.test
deleted file mode 100755
index 9d5328b..0000000
--- a/tests/output11.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure an AC_CONFIG_FILES ignore filenames with shell variables.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << \END
-AC_SUBST([FOO], [foo])
-file1=this.in
-echo @FOO@ >$file1
-file2=that
-file3=mumble
-file4=foo
-AC_CONFIG_FILES([this:$file1],, [file1=$file1])
-AC_CONFIG_FILES([sub/this:$file1])
-AC_CONFIG_FILES([${file2}:this],, [file2=$file2])
-AC_CONFIG_FILES([$file3],, [file3=$file3])
-AC_CONFIG_FILES([$file4:foo.in],, [file4=$file4])
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<\EOF
-SUBDIRS = sub
-EXTRA_DIST = mumble.in
-DISTCLEANFILES = this.in that mumble foo
-dist-hook:
-       test -f $(distdir)/foo.in
-       test ! -f $(distdir)/this
-EOF
-
-echo @FOO@ >mumble.in
-echo @FOO@ >foo.in
-: >sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-$FGREP ' $file' Makefile.in sub/Makefile.in && Exit 1
-
-./configure
-$MAKE distcheck
-cd sub
-rm -f this
-$MAKE this
-grep foo this
diff --git a/tests/output12.test b/tests/output12.test
deleted file mode 100755
index 2f8027c..0000000
--- a/tests/output12.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << \END
-AC_SUBST([FOO], [foo])
-AC_SUBST([file1], [this.in])
-echo @FOO@ >$file1
-AC_SUBST([file2], [that])
-AC_SUBST([file3], [mumble])
-AC_SUBST([file4], [foo])
-AC_CONFIG_FILES([this:$file1],, [file1=$file1])
-AC_CONFIG_FILES([sub/this:$file1])
-AC_CONFIG_FILES([${file2}:this],, [file2=$file2])
-AC_CONFIG_FILES([${file3}],, [file3=$file3])
-AC_CONFIG_FILES([${file4}:foo.in],, [file4=$file4])
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat >Makefile.am <<\EOF
-SUBDIRS = sub
-DISTCLEANFILES = $(file1)
-dist-hook:
-       test -f $(distdir)/foo.in
-       test ! -f $(distdir)/this
-EOF
-
-echo @FOO@ >mumble.in
-echo @FOO@ >foo.in
-: >sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE distcheck
-cd sub
-rm -f this
-$MAKE this
-grep foo this
diff --git a/tests/output13.test b/tests/output13.test
deleted file mode 100755
index c862f07..0000000
--- a/tests/output13.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure an AC_CONFIG_FILES, AC_CONFIG_LINKS, and AC_CONFIG_COMMANDS
-# are not prerequisites of `all'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << \END
-AC_SUBST([FOO], [foo])
-if $create; then
-  AC_CONFIG_FILES([file])
-  AC_CONFIG_LINKS([link:input])
-  AC_CONFIG_COMMANDS([stamp], [echo stamp > stamp])
-fi
-AC_OUTPUT
-END
-
-: >Makefile.am
-
-echo link > input
-echo @FOO@ >file.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure create=false
-$MAKE
-test ! -f file
-test ! -f link
-test ! -f stamp
-
-./configure create=:
-test -f file
-test -f link
-test -f stamp
diff --git a/tests/output2.test b/tests/output2.test
deleted file mode 100755
index c9bdbc3..0000000
--- a/tests/output2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another AC_OUTPUT test.  From report by Ulrich Drepper.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile intl/intlh.inst po/Makefile.in misc/gettextize)
-END
-
-: > Makefile.am
-
-mkdir intl po misc
-: > intl/intlh.inst.in
-: > po/Makefile.in.am
-: > misc/gettextize.in
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^gettextize' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/output3.test b/tests/output3.test
deleted file mode 100755
index 02d7e6f..0000000
--- a/tests/output3.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Yet another AC_OUTPUT test.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT([Makefile
-tests/Makefile tests/defs],
-[blah])
-END
-
-: > Makefile.am
-
-mkdir tests
-: > tests/Makefile.am
-: > tests/defs.in
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/output4.test b/tests/output4.test
deleted file mode 100755
index fc5a022..0000000
--- a/tests/output4.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# It's hard to believe there are so many AC_OUTPUT-related bugs.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(tests/Makefile tests/defs)
-END
-
-mkdir tests
-: > tests/defs.in
-: > tests/Makefile.am
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep tests/defs.in tests/Makefile.in && Exit 1
-Exit 0
diff --git a/tests/output5.test b/tests/output5.test
deleted file mode 100755
index 4323f62..0000000
--- a/tests/output5.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004  Free Software
-#   Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake complains when there is no Makefile specified.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([foo], [bar], [baz])
-AM_INIT_AUTOMAKE
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'AC_CONFIG_FILES(.Makefile.)' stderr
diff --git a/tests/output6.test b/tests/output6.test
deleted file mode 100755
index 88daa74..0000000
--- a/tests/output6.test
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for support for colon separated input files in AC_CONFIG_FILES
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES(foo:a.in:b.in:c.in:d.in)
-AC_OUTPUT
-END
-
-cat >a.in <<'EOF'
-a = A
-b = A
-c = A
-d = A
-EOF
-
-cat >b.in <<'EOF'
-b = B
-c = B
-d = B
-EOF
-
-cat >c.am <<'EOF'
-c = C
-d = C
-
-print:
-       @echo $a$b$c$d
-EOF
-
-echo 'd = D' > d.in
-
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE -f foo print | grep 'ABCD'
-
-$sleep
-cat >b.in <<'EOF'
-a = G
-b = F
-c = F
-d = F
-EOF
-
-# This involves the rebuild rule, hence it requires GNUmake
-$MAKE -f foo print | grep 'GFCD'
diff --git a/tests/output7.test b/tests/output7.test
deleted file mode 100755
index 878c091..0000000
--- a/tests/output7.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for support for colon separated input files in AC_CONFIG_FILES,
-# with sources in sub directories.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([
-  Makefile:mk/toplevel.in
-  sub/Makefile:mk/sub.in
-  mk/Makefile
-])
-AC_OUTPUT
-END
-
-mkdir mk sub
-cat >mk/Makefile.am <<'EOF'
-all-local:
-       @echo in--mk
-EOF
-
-cat >mk/sub.am <<'EOF'
-EXTRA_DIST = foo
-all-local:
-       @echo in--sub
-EOF
-
-cat >mk/toplevel.am <<'EOF'
-all-local:
-       @echo at--toplevel
-SUBDIRS = mk sub
-EOF
-
-# We have to distribute something in foo, because some versions
-# of tar do not archive empty directories when passed the `o'
-# flags.  (This was fixed in GNU tar 1.12, but older
-# versions are still used: NetBSD 1.6.1 ships with tar 1.11.2).
-#
-# If sub/ is missing from the archive, config.status will fail
-# to compute $ac_abs_srcdir during a VPATH build: config.status
-# is able to create sub/ in the build tree, but it assumes the
-# directory already exists in the source tree.
-echo bar > sub/foo
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE >output
-cat output
-grep in--mk output
-grep in--sub output
-grep at--toplevel output
-
-$MAKE distcheck
diff --git a/tests/output8.test b/tests/output8.test
deleted file mode 100755
index 1c11a16..0000000
--- a/tests/output8.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check AC_CONFIG_FILES support for files starting with `../'.
-# Report from Bruno Haible.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir testdir
-cd testdir
-
-mv ../configure.in .
-cat >> configure.in << END
-AC_CONFIG_FILES([a/foo.sh:../testdir/a/foo.sh.in])
-AC_CONFIG_FILES([a/Makefile])
-AC_OUTPUT
-END
-
-mkdir a
-
-echo SUBDIRS = a >Makefile.am
-: >a/Makefile.am
-
-echo foo >a/foo.sh.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-$MAKE
-test "`cat a/foo.sh`" = foo
-
-$sleep
-echo 'bar' >a/foo.sh.in
-
-cd a
-$MAKE foo.sh
-test "`cat foo.sh`" = bar
diff --git a/tests/output9.test b/tests/output9.test
deleted file mode 100755
index d4cf15a..0000000
--- a/tests/output9.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << END
-AC_CONFIG_FILES([a/mid.in:a/input.in.in])
-AC_CONFIG_FILES([b/out:a/mid.in])
-AC_CONFIG_FILES([a/Makefile b/Makefile])
-AC_OUTPUT
-END
-
-mkdir a
-mkdir b
-
-
-cat >Makefile.am <<\EOF
-SUBDIRS = a b
-dist-hook:
-       test -f $(distdir)/a/input.in.in
-       test ! -f $(distdir)/a/mid.in
-       if test ! -f check; then :; else : > ok; fi
-EOF
-
-: >a/Makefile.am
-: >b/Makefile.am
-
-echo foo >a/input.in.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-: > check
-$MAKE distcheck
-test -f ok
diff --git a/tests/overrid.test b/tests/overrid.test
deleted file mode 100755
index df453ca..0000000
--- a/tests/overrid.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure automake -Woverride suggests using TARGET-local instead
-# of TARGET when possible.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND], [:])
-END
-
-cat > Makefile.am << 'END'
-install:
-       :
-installcheck:
-       :
-html:
-       :
-clean-am:
-       :
-
-if COND
-ps: mine
-       :
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-override
-AUTOMAKE_fails
-grep ':.*install-local' stderr && Exit 1 # There is no such thing as 
install-local
-grep ':.*installcheck-local' stderr
-grep ':.*html-local' stderr
-# Make sure overriding *-am targets suggest using *-local, not *-am.
-grep ':.*clean-am-local' stderr && Exit 1
-grep ':.*clean-local' stderr
-
-# Conditional overrides ought to be diagnosed, but it can't be done yet.
-# See the FIXME in Automake::Rule::define.  Once this is fixed, the grep below
-# will fail.  If you see the failure, it means you fixed Automake.  Well done!
-# Just strip out the next '&& Exit 1' and this comment.
-grep ':.*overrides.*ps' stderr && Exit 1
-
-# Test for another issue.  Overriding html: should cause only one
-# html: rule to be output.
-test `grep '^html:' Makefile.in | wc -l` = 1
-
-# ps: should be output in two conditions
-test `grep '[^-]ps:' Makefile.in | wc -l` = 2
-grep '@address@hidden: mine' Makefile.in
-grep '@address@hidden: ps-am' Makefile.in
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
deleted file mode 100755
index 4aef628..0000000
--- a/tests/parallel-am.test
+++ /dev/null
@@ -1,104 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test parallel automake execution.
-
-# There are several hypotheses to be tested:  Independently of the number
-# of threads used by automake,
-# 0) the generated Makefile.in files must be identical without --add-missing,
-# 1) the Makefile.in that distributes auxiliary files must be generated
-#    after all other ones, so all installed aux files are caught,
-# 2) normal automake output should have identical content and be ordered
-#    in the same way, when --add-missing is not passed, or when
-#    --add-missing is passed but there are no concurrent file requirements
-#    (i.e., two Makefile.am files call for the same needed aux file)
-# 3) normal automake output should be identical and ordered in the same way
-#    with --add-missing, even with concurrent file requirements, and the
-#    installation of aux files should be race-free,
-# 4) warning and normal error output should be identical, in that duplicate
-#    warnings should be omitted in the same way as without threads,
-# 5) fatal error and debug messages could be identical.  This is not
-#    intended, though.
-#
-# This test checks (0), (1), and (2).  See sister tests for further coverage.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([parallel-am], [1.0])
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AM_PATH_LISPDIR
-AM_PATH_PYTHON
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS =
-END
-
-list='1 2 3 4 5 6 7 8 9'
-for i in $list; do
-  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
-  echo "SUBDIRS += sub$i" >> Makefile.am
-  mkdir sub$i
-  echo > sub$i/Makefile.am
-done
-# Use an include chain to cause a nontrivial location object to be
-# serialized through a thread queue.
-echo 'include foo.am' >> sub7/Makefile.am
-echo 'include bar.am' > sub7/foo.am
-echo 'python_PYTHON = foo.py' > sub7/bar.am
-echo 'lisp_LISP = foo.el' >> sub8/Makefile.am
-echo 'bin_PROGRAMS = p' >> sub9/Makefile.am
-
-rm -f install-sh missing depcomp
-mkdir build-aux
-
-$ACLOCAL
-
-# This test may have to be run several times in order to expose the
-# race that, when the last Makefile.in (the toplevel one) is created
-# before the other ones have finished, not all auxiliary files may
-# be installed yet, thus some may not be distributed.
-#
-# Further, automake output should be stable.
-
-# Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS || :
-AUTOMAKE_run 0 --add-missing
-mv stderr expected
-Makefile_ins=`find . -name Makefile.in`
-for file in $Makefile_ins; do
-  mv $file $file.exp
-done
-
-AUTOMAKE_JOBS=5
-export AUTOMAKE_JOBS
-
-for run in 1 2 3 4 5 6 7; do
-  rm -f build-aux/* sub*/Makefile.in
-  AUTOMAKE_run 0 --add-missing
-  diff stderr expected
-  for file in $Makefile_ins; do
-    diff $file $file.exp
-  done
-done
-
-:
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
deleted file mode 100755
index 20225a0..0000000
--- a/tests/parallel-am2.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test parallel automake execution.
-
-# This tests:
-# 4) warning and normal error output should be identical, in that duplicate
-#    warnings should be omitted in the same way as without threads,
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = main
-main_SOURCES = sub/main.c
-SUBDIRS =
-END
-
-list='1 2 3'
-for i in $list; do
-  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
-  echo "SUBDIRS += sub$i" >> Makefile.am
-  mkdir sub$i sub$i/sub
-  cat > sub$i/Makefile.am << END
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = sub$i
-sub${i}_SOURCES = sub/main$i.c
-END
-done
-
-mkdir build-aux
-
-$ACLOCAL
-
-# Independently of the number of worker threads, automake output
-# should be
-# - stable (multiple runs should produce the same output),
-# - properly uniquified,
-# - complete (output from worker threads should not be lost).
-#
-# The parts output by --add-missing are unstable not only wrt. order
-# but also wrt. content: any of the Makefile.am files may cause the
-# depcomp script to be installed (or several of them).
-# Thus we install the auxiliary files in a prior step.
-
-# Generate expected output using non-threaded code.
-unset AUTOMAKE_JOBS || :
-rm -f install-sh missing depcomp
-AUTOMAKE_fails --add-missing
-mv stderr expected
-
-AUTOMAKE_JOBS=5
-export AUTOMAKE_JOBS
-
-for i in 1 2 3 4 5 6 7 8; do
-  rm -f install-sh missing depcomp
-  AUTOMAKE_fails --add-missing
-  diff expected stderr
-done
-
-:
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
deleted file mode 100755
index 5db9c67..0000000
--- a/tests/parallel-am3.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test parallel automake execution.
-
-# This tests:
-# 3) normal automake output should be identical and ordered in the same way
-#    with --add-missing, even with concurrent file requirements, and the
-#    installation of aux files should be race-free,
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([parallel-am], [1.0])
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AM_PATH_LISPDIR
-AM_PATH_PYTHON
-AC_CONFIG_FILES([Makefile])
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS =
-END
-
-list='1 2 3'
-for i in $list; do
-  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
-  echo "SUBDIRS += sub$i" >> Makefile.am
-  mkdir sub$i
-  cat > sub$i/Makefile.am <<END
-python_PYTHON = foo$i.py
-lisp_LISP = foo$i.el
-bin_PROGRAMS = p$i
-END
-done
-
-rm -f install-sh missing depcomp
-mkdir build-aux
-
-$ACLOCAL
-
-# Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS || :
-AUTOMAKE_run 0 --add-missing
-mv stderr expected
-mv Makefile.in Makefile.in.exp
-
-AUTOMAKE_JOBS=3
-export AUTOMAKE_JOBS
-
-for run in 1 2 3 4 5 6 7; do
-  rm -f build-aux/* sub*/Makefile.in
-  AUTOMAKE_run 0 --add-missing
-  diff stderr expected
-  diff Makefile.in Makefile.in.exp
-done
-
-:
diff --git a/tests/parallel-tests-dryrun.test b/tests/parallel-tests-dryrun.test
deleted file mode 100755
index c79a293..0000000
--- a/tests/parallel-tests-dryrun.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests interactions with "make -n".
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-TESTS = foo.test bar.test
-$(TESTS):
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-# Avoid confusion with test logs.
-rm -f config.log
-
-log_files='test-suite.log foo.log bar.log'
-html_files='test-suite.html foo.html bar.html'
-the_files="$log_files $html_files"
-
-all_exist ()
-{
-  st=0
-  for i in $*; do
-    test -f $i || { echo File $i not found; st=1; }
-  done
-  test $st -eq 0
-}
-
-none_exist ()
-{
-  st=0
-  for i in $*; do
-    { test -r $i || test -f $i; } && { echo File $i found; st=1; }
-  done
-  test $st -eq 0
-}
-
-for targ in check recheck check-html recheck-html $the_files; do
-  $MAKE -n "$targ"
-  none_exist $the_files
-done
-
-touch $the_files
-
-$MAKE -n mostlyclean
-all_exist $the_files
-$MAKE -n clean
-all_exist $the_files
-
-cat > foo.test <<'END'
-#! /bin/sh
-exit 0
-END
-
-cat > bar.test <<'END'
-#! /bin/sh
-exit 1
-END
-
-chmod a+x foo.test bar.test
-
-$MAKE check && Exit 1
-
-for targ in recheck recheck-html clean mostlyclean distclean; do
-  $MAKE -n "$targ"
-  all_exist $the_files
-done
-
-:
diff --git a/tests/parallel-tests-harderror.test 
b/tests/parallel-tests-harderror.test
deleted file mode 100755
index 8680e29..0000000
--- a/tests/parallel-tests-harderror.test
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: DISABLE_HARD_ERRORS
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat > Makefile.am << 'END'
-SUBDIRS = . sub
-TESTS = foo.test
-XFAIL_TESTS = foo.test
-EXTRA_DIST = $(TESTS)
-END
-
-cat > sub/Makefile.am << 'END'
-TESTS = bar.test
-XFAIL_TESTS = $(TESTS)
-EXTRA_DIST = $(TESTS)
-END
-
-cat > foo.test <<'END'
-#! /bin/sh
-exit 99
-END
-chmod a+x foo.test
-cp foo.test sub/bar.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-# DISABLE_HARD_ERRORS is not defined as a make variable, so that it
-# should be possible to define either from the environment or from
-# command-line, also when recursive make invocations are involved,
-# and also without using the `-e' make flag; this should work also
-# for non-GNU make. Moreover, it shouldn't be necessary to define
-# DISABLE_HARD_ERRORS to "yes" to really disable hard errors: any
-# non-empty value should do.
-$MAKE check DISABLE_HARD_ERRORS=yes
-DISABLE_HARD_ERRORS=x $MAKE check
-
-# But an empty values for DISABLE_HARD_ERRORS means that hard errors
-# are not to be counted like normal failures.
-
-$MAKE check DISABLE_HARD_ERRORS='' && Exit 1
-cat test-suite.log
-grep '^FAIL: foo\.test .*exit.*99' test-suite.log
-
-cd sub
-# The `-e' is wanted here.
-DISABLE_HARD_ERRORS='' $MAKE -e check && Exit 1
-cat test-suite.log
-grep '^FAIL: bar\.test .*exit.*99' test-suite.log
-cd ..
-
-# Check the distributions.
-$MAKE DISABLE_HARD_ERRORS=y distcheck
-
-# Finally, DISABLE_HARD_ERRORS should work also when the developer
-# sets it directly in Makefile.am or Makefile.  And its effects
-# should remain local to that specific Makefile, obviously.
-
-echo 'DISABLE_HARD_ERRORS = yes' >> Makefile.am
-$AUTOMAKE Makefile
-./config.status Makefile
-VERBOSE=yes $MAKE check && Exit 1
-grep '^FAIL' test-suite.log && Exit 1
-grep '^FAIL: bar\.test .*exit.*99' sub/test-suite.log
-
-echo 'DISABLE_HARD_ERRORS = zardoz' >> sub/Makefile
-VERBOSE=yes $MAKE check
-
-:
diff --git a/tests/parallel-tests-log-compiler-example.test 
b/tests/parallel-tests-log-compiler-example.test
deleted file mode 100755
index 746c128..0000000
--- a/tests/parallel-tests-log-compiler-example.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test the example of usage of generic and extension-specific
-# LOG_COMPILER and LOG_FLAGS given in the manual.
-
-parallel_tests=yes
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_SUBST([PERL], ['$PERL'])
-AM_PATH_PYTHON
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.pl bar.py baz
-TEST_EXTENSIONS = .pl .py
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -w
-PY_LOG_COMPILER = $(PYTHON)
-AM_PY_LOG_FLAGS = -v
-LOG_COMPILER = ./wrapper-script
-AM_LOG_FLAGS = -d
-END
-
-echo 'my $a =+ 2; exit (0);' > foo.pl
-echo 'import sys; sys.exit(0);' > bar.py
-: > baz
-
-cat > wrapper-script <<'END'
-#!/bin/sh
-echo "wrapper args: $*"
-END
-chmod a+x wrapper-script
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-st=0
-$MAKE check || st=$?
-cat foo.log
-cat bar.log
-cat baz.log
-test $st -eq 0 || Exit $st
-
-# Check that the wrappers have been run with the expected flags.
-grep '[rR]eversed.*+=.*operator.*foo\.pl' foo.log
-grep '^# *[cC]lear.*sys\.argv' bar.log
-grep '^wrapper args:.* -d .*baz' baz.log
-
-:
diff --git a/tests/parallel-tests-log-override-1.test 
b/tests/parallel-tests-log-override-1.test
deleted file mode 100755
index 6e98380..0000000
--- a/tests/parallel-tests-log-override-1.test
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = pass.test skip.test xfail.test
-XFAIL_TESTS = xfail.test
-EXTRA_DIST = $(TESTS)
-END
-
-cat > pass.test <<'END'
-#! /bin/sh
-exit 0
-END
-
-cat > skip.test <<'END'
-#! /bin/sh
-echo "% test skipped %"
-exit 77
-END
-
-cat > xfail.test <<'END'
-#! /bin/sh
-echo "# expected failure #"
-exit 1
-END
-
-chmod a+x *.test
-
-test_log_edit ()
-{
-  sed -e "s|^  *$me 1\.0:.*$|  $me 1.0: ???|" \
-      -e "s|^=====*|=======================|" $*
-}
-
-test_log_expected ()
-{
-  test_log_edit orig > exp
-  test_log_edit $1   > got
-  diff exp got || Exit 1
-  rm -f exp got
-}
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-$MAKE check
-ls -l
-cat test-suite.log
-cp test-suite.log orig
-
-$MAKE clean
-test -f test-suite.log && Exit 99 # Sanity check.
-
-# Check that we can override the testsuite log file at runtime.
-TEST_SUITE_LOG=zardoz.log $MAKE -e check
-ls -l
-test ! -f test-suite.log
-cat zardoz.log
-test_log_expected zardoz.log
-# Sanity check the distribution too (this also does minimal checks on
-# VPATH support).
-TEST_SUITE_LOG=zardoz.log $MAKE -e distcheck
-
-# Check that cleanup rules remove the correct file even when
-# user overrides are in place.
-cp orig test-suite.log
-TEST_SUITE_LOG=zardoz.log $MAKE -e clean
-ls -l
-test ! -f zardoz.log
-diff orig test-suite.log
-
-# Check that the default testsuite log doesn't get unduly modified.
-# Also check that the testsuite log file doesn't need to be named
-# accordingly to the `*.log' pattern.
-chmod a-w test-suite.log
-TEST_SUITE_LOG=TheLogFile $MAKE -e check
-ls -l
-diff orig test-suite.log
-test_log_expected TheLogFile
-TEST_SUITE_LOG=TheLogFile $MAKE -e clean
-ls -l
-test ! -f TheLogFile
-diff orig test-suite.log
-
-:
diff --git a/tests/parallel-tests-log-override-2.test 
b/tests/parallel-tests-log-override-2.test
deleted file mode 100755
index 649360c..0000000
--- a/tests/parallel-tests-log-override-2.test
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: runtime redefinition of:
-#  - $(TEST_SUITE_LOG) and $(TESTS)
-#  - $(TEST_SUITE_LOG) and $(TEST_LOGS)
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = pass.test pass2.test skip.test skip2.test fail.test
-END
-
-cat > pass.test <<'END'
-#! /bin/sh
-exit 0
-END
-
-cp pass.test pass2.test
-
-cat > skip.test <<'END'
-#! /bin/sh
-echo "% skipped test %"
-exit 77
-END
-
-cp skip.test skip2.test
-
-cat > fail.test <<'END'
-#! /bin/sh
-exit 1
-END
-
-chmod a+x *.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-for test_list_override in \
-  'TESTS=pass.test skip.test' \
-  'TEST_LOGS=pass.log skip.log'
-do
-  env TEST_SUITE_LOG=partial.log "$test_list_override" \
-    $MAKE -e check >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  ls -l
-  cat pass.log
-  cat skip.log
-  cat partial.log
-  test ! -f test-suite.log
-  test ! -f pass2.log
-  test ! -f skip2.log
-  test ! -f fail.log
-  grep '^PASS: .*pass\.test' stdout
-  grep '^SKIP: .*skip\.test' stdout
-  $FGREP 'skip.test' partial.log
-  $FGREP '% skipped test %' partial.log
-  for t in pass2 skip2 fail; do
-    $FGREP "$t.test" stdout && Exit 1
-    $FGREP "$t.test" partial.log && Exit 1
-  done
-  rm -f *.log
-done
-
-:
diff --git a/tests/parallel-tests-log-override-recheck.test 
b/tests/parallel-tests-log-override-recheck.test
deleted file mode 100755
index 8a50d29..0000000
--- a/tests/parallel-tests-log-override-recheck.test
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG)
-# for the recheck target.
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = foo.test bar.test baz.test
-END
-
-cat > foo.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 0
-END
-
-cat > bar.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 99
-END
-
-cat > baz.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit ${BAZ_EXIT_STATUS-1}
-END
-
-chmod a+x *.test
-
-unset BAZ_EXIT_STATUS || :
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
-chmod a-rw test-suite.log
-TEST_SUITE_LOG=my.log $MAKE -e recheck >stdout \
-  && { cat stdout; Exit 1; }
-cat stdout
-ls -l
-grep '^2 of 2 .*failed' stdout
-for x in stdout my.log; do
-  $FGREP foo.test $x && Exit 1
-  $FGREP bar.test $x
-  $FGREP baz.test $x
-done
-
-chmod a-rw my.log
-BAZ_EXIT_STATUS=0 TEST_SUITE_LOG=my2.log $MAKE -e recheck >stdout \
-  && { cat stdout; Exit 1; }
-cat stdout
-ls -l
-grep '^1 of 2 .*failed' stdout
-$FGREP foo.test stdout && Exit 1
-$FGREP bar.test stdout
-$FGREP baz.test stdout
-$FGREP foo.test my2.log && Exit 1
-$FGREP bar.test my2.log
-$FGREP baz.test my2.log && Exit 1
-
-chmod u+r test-suite.log my.log
-$FGREP baz.test test-suite.log
-$FGREP baz.test my.log
-
-:
diff --git a/tests/parallel-tests-subdir.test b/tests/parallel-tests-subdir.test
deleted file mode 100755
index 18695fe..0000000
--- a/tests/parallel-tests-subdir.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the parallel-tests driver creates parent directories for
-# the log files when needed.
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = dir1/foo.test dir2/dir3/foo.test
-TEST_LOG_COMPILER = sh
-END
-
-mkdir dir1 dir2 dir2/dir3
-echo : > dir1/foo.test
-echo : > dir2/dir3/foo.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir build
-cd build
-../configure
-$MAKE check
-find . # For debugging.
-test -f test-suite.log
-test -f dir1/foo.log
-test -f dir2/dir3/foo.log
-
-:
diff --git a/tests/parallel-tests-unreadable-log.test 
b/tests/parallel-tests-unreadable-log.test
deleted file mode 100755
index 572f03d..0000000
--- a/tests/parallel-tests-unreadable-log.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the testsuite driver copes well with unreadable test logs.
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test bar.test
-XFAIL_TESTS = bar.test
-END
-
-cat > foo.test << 'END'
-#! /bin/sh
-exit 0
-END
-cat > bar.test << 'END'
-#! /bin/sh
-exit 1
-END
-chmod a+x foo.test bar.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# The testsuite driver will use this variable, so ensure it sanitizes
-# it and do not allow in spurious values from the environment.
-line=PASS; export line
-
-./configure
-
-$MAKE foo.log
-$MAKE bar.log
-chmod a-r foo.log bar.log
-test ! -r foo.log || Exit 77
-$MAKE test-suite.log >stdout && { cat stdout; Exit 1; }
-cat stdout
-grep '^2 of 2 tests failed *$' stdout
-grep '^2 of 2 tests failed\. *$' test-suite.log
-
-:
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
deleted file mode 100755
index 54f0cd5..0000000
--- a/tests/parallel-tests.test
+++ /dev/null
@@ -1,154 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - VERBOSE
-# - clean
-# - TEST_SUITE_LOG
-# - dependencies between tests
-# - TESTS
-# - TEST_LOGS
-# - RECHECK_LOGS
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TEST_SUITE_LOG = mylog.log
-TESTS = foo.test bar.test baz.test
-XFAIL_TESTS = bar.test
-foo.log: bar.log
-bar.log: baz.log
-END
-
-# foo.test and bar.test sleep to ensure their logs are always strictly newer
-# than the logs of their prerequisites, for HP-UX make.  The quoting pleases
-# maintainer-check.
-cat >>foo.test <<'END'
-#! /bin/sh
-echo "this is $0"
-sleep '1'
-exit 0
-END
-cat >>bar.test <<'END'
-#! /bin/sh
-echo "this is $0"
-sleep '1'
-exit 99
-END
-cat >>baz.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 1
-END
-chmod a+x foo.test bar.test baz.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-# There should be two errors: bar.test is a hard error.
-test `grep -c '^FAIL' stdout` -eq 2
-test -f mylog.log
-test `grep -c '^FAIL' mylog.log` -eq 2
-test -f baz.log
-test -f bar.log
-test -f foo.log
-# The summary should be formatted correctly.
-grep 'failedn' stdout && Exit 1
-
-# clean should remove all log files (but not more).
-: > unrelated.log
-$MAKE clean
-test ! -f baz.log
-test ! -f bar.log
-test ! -f foo.log
-test ! -f mylog.log
-test -f unrelated.log
-
-# Check dependencies: baz.test needs to run before bar.test,
-# but foo.test is not needed.
-# Note that this usage has a problem: the summary will only
-# take bar.log into account, because the $(TEST_SUITE_LOG) rule
-# does not "see" baz.log.  Hmm.
-env TESTS='bar.test' $MAKE -e check && Exit 1
-test -f baz.log
-test -f bar.log
-test ! -f foo.log
-test -f mylog.log
-
-# Upon a lazy rerun, foo.test should be run, but the others shouldn't.
-# Note that the lazy rerun still exits with a failure, due to the previous
-# test failures.
-# Note that the previous test and this one taken together expose the timing
-# issue that requires the check-TESTS rule to always remove TEST_SUITE_LOG
-# before running the tests lazily.
-env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-test -f foo.log
-grep foo.test stdout
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
-grep '2.*tests.*failed' stdout
-
-# Now, explicitly retry with all test logs already updated, and ensure
-# that the summary is still displayed.
-env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
-grep '2.*tests.*failed' stdout
-
-# Lazily rerunning only foo should only rerun this one test.
-env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
-grep '2.*tests.*failed' stdout
-
-# Test VERBOSE.
-env VERBOSE=yes $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep 'this is.*bar.test' stdout
-grep 'this is.*baz.test' stdout
-
-$MAKE clean
-env TEST_LOGS=baz.log $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
-grep baz.test stdout
-
-$MAKE clean
-env TESTS=baz.test $MAKE -e check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
-grep baz.test stdout
-
-:
diff --git a/tests/parallel-tests10.test b/tests/parallel-tests10.test
deleted file mode 100755
index 5cd3310..0000000
--- a/tests/parallel-tests10.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - trailing whitespace in TESTS
-# GNU make 3.80 may expand trailing white space to `.log'.
-
-parallel_tests=yes
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo $(BAR)
-BAR =
-END
-
-cat >foo <<'END'
-#! /bin/sh
-exit 0
-END
-
-chmod +x ./foo
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check
-
-Exit 0
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
deleted file mode 100755
index 78d5a76..0000000
--- a/tests/parallel-tests2.test
+++ /dev/null
@@ -1,124 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - check-html
-# - recheck-html
-
-parallel_tests=yes
-required=rst2html
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TEST_SUITE_LOG = mylog.log
-TESTS = foo.test bar.test baz.test
-check_SCRIPTS = bla
-bla:
-       echo bla > $@
-CLEANFILES = bla
-END
-
-cat >>foo.test <<'END'
-#! /bin/sh
-echo "this is $0"
-test -f bla || exit 1
-exit 0
-END
-cat >>bar.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 99
-END
-cat >>baz.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 1
-END
-chmod a+x foo.test bar.test baz.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check-html >stdout && { cat stdout; Exit 1; }
-cat stdout
-test -f mylog.html
-
-# Always create the HTML output, even if there were no failures.
-rm -f mylog.html
-env TESTS=foo.test $MAKE -e check-html >stdout || { cat stdout; Exit 1; }
-cat stdout
-test -f mylog.html
-
-# Create HTML output also with recheck-html
-rm -f mylog.html
-env TESTS=foo.test $MAKE -e recheck-html >stdout || { cat stdout; Exit 1; }
-cat stdout
-test -f mylog.html
-
-# Create HTML output for an individual test.
-$MAKE foo.html
-grep 'this is .*foo\.test' foo.html
-test ! -f bar.html
-test ! -f baz.html
-
-# Create HTML output for individual tests.  Since the pre-existing log
-# files are expected to be used for the HTML conversion, this should
-# go smoothly even for failed tests.
-$MAKE bar.html baz.html
-grep 'this is .*bar\.test' bar.html
-grep 'this is .*baz\.test' baz.html
-
-# HTML output removed by mostlyclean.
-$MAKE mostlyclean
-test ! -f foo.html
-test ! -f bar.html
-test ! -f baz.html
-test ! -f mylog.html
-
-# check-html and recheck-html should cause check_SCRIPTS to be created,
-# and recheck-html should rerun no tests if check has not been run.
-
-$MAKE clean
-test ! -f mylog.html
-env TESTS=foo.test $MAKE -e check-html
-test -f bla
-test -f foo.log
-test ! -f bar.log
-test ! -f baz.log
-
-$MAKE clean
-env TESTS=foo.test $MAKE -e recheck-html
-test -f bla
-test ! -f foo.log
-test -f mylog.html
-
-$MAKE clean
-$MAKE recheck-html
-test -f bla
-test ! -f foo.log
-test ! -f bar.log
-test ! -f baz.log
-test -f mylog.html
-
-:
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
deleted file mode 100755
index 69ba1d0..0000000
--- a/tests/parallel-tests3.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - concurrent parallel execution
-
-parallel_tests=yes
-required=GNUmake
-. ./defs || Exit 1
-
-# This test does not work well if $MAKE contains -j.
-case $MAKE in
-*\ -j*) Exit 77 ;;
-esac
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS =
-END
-
-for i in 1 2 3 4 5 6 7 8; do
-  echo "TESTS += foo$i.test" >> Makefile.am
-  cat >foo$i.test <<'END'
-#! /bin/sh
-echo "this is $0"
-# hack around maintainer-check check:
-sleep='sleep '1
-$sleep
-exit 0
-END
-  chmod a+x foo$i.test
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-for build in serial parallel; do
-  mkdir $build
-  cd $build
-  ../configure
-  $MAKE
-  cd ..
-done
-
-cd serial
-$MAKE -j1 check &
-cd ../parallel
-$sleep
-# Use append mode here to avoid dropping output.
-# Yes, this actually happens.
-: >stdout
-$MAKE -j4 check >> stdout
-cd ..
-# Ensure the tests are really being run in parallel mode: if this is
-# the case, the serial run of the dummy testsuite started above should
-# still be ongoing when the parallel one has terminated.
-kill -0 $!
-cat parallel/stdout
-test `grep -c PASS parallel/stdout` -eq 8
-
-# Wait long enough so that there are no open files any more when the
-# post-test cleanup runs.  But exit after we've waited for two minutes
-# or more, to avoid testsuite hangs in unusual situations (this has
-# already happened).
-i=1
-while test ! -f serial/test-suite.log && test $i -le 120; do
-  i=`expr $i + 1`
-  sleep '1' # Extra quoting to please maintainer-check.
-done
-$sleep
-
-:
diff --git a/tests/parallel-tests4.test b/tests/parallel-tests4.test
deleted file mode 100755
index efe7e8d..0000000
--- a/tests/parallel-tests4.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - suffix rules
-
-parallel_tests=yes
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-## Note that automake should not match the '/test' part
-## of 'sub/test' as '.test' suffix.
-TESTS = foo.chk bar.test $(check_PROGRAMS) sub/test
-check_PROGRAMS = baz bla.test bli.suff
-TEST_EXTENSIONS = .chk .test
-END
-
-mkdir sub
-
-cat >foo.chk << 'END'
-#! /bin/sh
-exit 0
-END
-chmod a+x foo.chk
-cp foo.chk bar.test
-cp foo.chk sub/test
-
-cat >baz.c << 'END'
-int main (void)
-{
-  return 0;
-}
-END
-cp baz.c bla.c
-cp baz.c bli.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-$MAKE check
-test -f foo.log
-test -f bar.log
-test -f baz.log
-test -f bla.log
-test -f bli.suff.log
-test -f sub/test.log
-:
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
deleted file mode 100755
index c4ff5b9..0000000
--- a/tests/parallel-tests5.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - concurrent program compilation and testing (with EXTRA_PROGRAMS)
-#
-# Actually, this test doesn't ensure that things happen concurrently.
-# It merely serves as demonstration.  :-)
-
-parallel_tests=yes
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = $(programs) $(scripts)
-EXTRA_PROGRAMS = $(programs)
-CLEANFILES = $(EXTRA_PROGRAMS)
-dist_noinst_SCRIPTS = $(scripts)
-programs =
-scripts =
-END
-
-for i in 1 2 3 4 5 6 7 8; do
-  echo "scripts += foo$i.test" >> Makefile.am
-  echo "programs += foo$i.prog" >> Makefile.am
-  cat >foo$i.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 0
-END
-  cat >foo$i.c <<'END'
-int main()
-{
-  return 0;
-}
-END
-  chmod a+x foo$i.test
-done
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE -j4 check
-$MAKE distcheck
-:
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
deleted file mode 100755
index 44caf0c..0000000
--- a/tests/parallel-tests6.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - empty TESTS
-# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
-# See parallel-tests10.test for a similar issue.
-
-parallel_tests=yes
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS =
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '0 tests' stdout
-
-Exit 0
diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test
deleted file mode 100755
index d01ada1..0000000
--- a/tests/parallel-tests7.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - per-extension test drivers
-
-parallel_tests=yes
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-## Note that automake should not match the '/test' part
-## of 'sub/test' as '.test' suffix.
-TESTS = foo.chk bar.test $(check_PROGRAMS) sub/test
-check_PROGRAMS = baz bla.test bli.suff
-TEST_EXTENSIONS = .chk .test
-CHK_LOG_COMPILER = ./chk-driver
-TEST_LOG_COMPILER = ./test-driver
-LOG_COMPILER = ./noext-driver
-AM_CHK_LOG_FLAGS = 1
-CHK_LOG_FLAGS = 2
-AM_TEST_LOG_FLAGS = 3
-TEST_LOG_FLAGS = 4
-AM_LOG_FLAGS = 5
-LOG_FLAGS = 6
-END
-
-mkdir sub
-
-cat >chk-driver <<'END'
-#! /bin/sh
-echo $0 "$@"
-shift
-shift
-exec "$@"
-exit 127
-END
-chmod a+x chk-driver
-cp chk-driver test-driver
-cp chk-driver noext-driver
-
-cat >foo.chk << 'END'
-#! /bin/sh
-exit 0
-END
-chmod a+x foo.chk
-cp foo.chk bar.test
-cp foo.chk sub/test
-
-cat >baz.c << 'END'
-int main (void)
-{
-  return 0;
-}
-END
-cp baz.c bla.c
-cp baz.c bli.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-$MAKE check
-grep 'chk-driver  *1  *2' foo.log
-grep 'test-driver  *3  *4' bar.log
-grep 'noext-driver  *5  *6' baz.log
-grep 'test-driver  *3  *4' bla.log
-grep 'noext-driver  *5  *6' bli.suff.log
-grep 'noext-driver  *5  *6' sub/test.log
-:
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
deleted file mode 100755
index 524b82b..0000000
--- a/tests/parallel-tests8.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - generated distributed tests.
-# - listing $(srcdir)/ or $(top_srcdir)/ in TESTS doesn't work ATM,
-#   and is thus diagnosed.
-
-# TODO: this test should also ensure that the `make' implementation
-#       properly adheres to rules in all cases.  See the Autoconf
-#       manual for the ugliness in this area, when VPATH comes into
-#       play.  :-/
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test
-## the next line will cause automake to error out:
-TESTS += $(srcdir)/bar.test $(top_srcdir)/baz.test
-.in.test:
-## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
-       cp `test -f '$<' || echo $(srcdir)/`$< $@
-       chmod +x $@
-check_SCRIPTS = $(TESTS)
-EXTRA_DIST = foo.in foo.test
-DISTCLEANFILES = foo.test
-END
-
-cat >>foo.in <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 0
-END
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails -a
-grep '(srcdir.*bar' stderr
-grep 'top_srcdir.*baz' stderr
-
-sed '/^TESTS +=.*srcdir/d' < Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE -a
-
-./configure
-$MAKE check
-$MAKE distcheck
-$MAKE distclean
-
-mkdir build
-cd build
-../configure
-$MAKE check
-test ! -f ../foo.log
-$MAKE distcheck
-
-:
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
deleted file mode 100755
index 337328f..0000000
--- a/tests/parallel-tests9.test
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features:
-# - recheck
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TEST_SUITE_LOG = mylog.log
-TESTS = foo.test bar.test baz.test
-check_SCRIPTS = bla
-CLEANFILES = bla
-bla:
-       echo bla > $@
-END
-
-cat >>foo.test <<'END'
-#! /bin/sh
-echo "this is $0"
-test -f bla || exit 1
-exit 0
-END
-cat >>bar.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 99
-END
-cat >>baz.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 1
-END
-chmod a+x foo.test bar.test baz.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
-$MAKE recheck >stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout || Exit 1
-grep baz.test stdout || Exit 1
-grep '2 of 2.*failed' stdout
-
-# If we cannot read the log file, then redo it as well.
-chmod a-r foo.log
-if test ! -r foo.log; then
-   $MAKE recheck >stdout && { cat stdout; Exit 1; }
-   cat stdout
-   grep foo.test stdout || Exit 1
-fi
-
-# Ensure that recheck builds check_SCRIPTS, and that
-# recheck reruns nothing if check has not been run.
-$MAKE clean
-$MAKE recheck
-test -f bla
-test ! -f foo.log
-test ! -f bar.log
-test ! -f baz.log
-test -f mylog.log
-:
diff --git a/tests/parse.test b/tests/parse.test
deleted file mode 100755
index bf5b63a..0000000
--- a/tests/parse.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure backslash-newline is treated as whitespace.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zot
-zot_SOURCES = \
-zar.c\
-doz.c
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-$FGREP zar.cdoz Makefile.in && Exit 1
-Exit 0
diff --git a/tests/percent.test b/tests/percent.test
deleted file mode 100755
index dfb48ae..0000000
--- a/tests/percent.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that -Wportability understands %-style pattern
-# rules.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-EOF
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = liver
-liver_SOURCES = foo.c
-
-%.o: %.c
-       echo "gnu make extension"
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails -Wportability
-grep 'Makefile.am:4:.*%' stderr
diff --git a/tests/percent2.test b/tests/percent2.test
deleted file mode 100755
index 09e4f84..0000000
--- a/tests/percent2.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another test for -Wportability warning about %-style rules, plus
-# make sure we don't warn about duplicate definition for
-# `${ARCH}/%.$(OBJEXT):'.
-# Report from Ralf Corsepius.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>Makefile.am << 'EOF'
-${ARCH}/%.$(OBJEXT): %.S
-       test -d ${ARCH} || mkdir ${ARCH}
-       ${CCASCOMPILE} -o $@ -c $<
-
-${ARCH}/%.$(OBJEXT): %.c
-       test -d ${ARCH} || mkdir ${ARCH}
-       ${COMPILE} -o $@ -c $<
-EOF
-
-$ACLOCAL
-AUTOMAKE_fails
-grep '%.*pattern.*rules' stderr
-
-# No error otherwise.
-$AUTOMAKE -Wno-portability
diff --git a/tests/phony.test b/tests/phony.test
deleted file mode 100755
index 9c9f3d3..0000000
--- a/tests/phony.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure .PHONY can be given dependencies several times.
-# From Ralf Corsepius.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am << 'EOF'
-.PHONY: foo
-.PHONY: bar
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-test `$FGREP .PHONY: Makefile.in | wc -l` = 3
diff --git a/tests/pluseq.test b/tests/pluseq.test
deleted file mode 100755
index 66eec8f..0000000
--- a/tests/pluseq.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test `+=' functionality.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-data_DATA = zar
-data_DATA += doz
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP 'zar doz' Makefile.in
-
-:
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
deleted file mode 100755
index 9273415..0000000
--- a/tests/pluseq10.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for += and backslashes.
-# Reported by Ralf Corsepius.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'END'
-AM_CONDITIONAL([A], [true])
-AM_CONDITIONAL([B], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-foo =  0.h
-if A
-foo += a0.h \
-  a1.h
-foo += a2.h \
-  a3.h
-endif
-if B
-foo += b0.h \
-  b1.h
-endif
-
-.PHONY: print
-print:
-       @echo BEG: $(foo) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE print >stdout || { cat stdout; Exit 1; }
-cat stdout
-$FGREP 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
-
-:
diff --git a/tests/pluseq11.test b/tests/pluseq11.test
deleted file mode 100755
index 12ec4d7..0000000
--- a/tests/pluseq11.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for bug in variable concatenation with `+=': an extra backslash
-# is erroneously retained in the final value.
-# See also sister test pluseq11b.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-## Use more line continuation to ensure we are robust and can (hopefully)
-## cope any number of them, and not just one
-FOO = \
-\
-\
-bar
-## Both these two variable additions are required to trigger the bug.
-FOO +=
-FOO += baz
-
-.PHONY: test
-test:
-       case '$(FOO)' in *\\*) exit 1;; *) exit 0;; esac
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^ *FOO *=.*\\.' Makefile.in && Exit 1
-
-$AUTOCONF
-./configure
-$MAKE test
-
-:
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
deleted file mode 100755
index f9db345..0000000
--- a/tests/pluseq2.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test `+=' with conditionals.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([CHECK], [true])
-END
-
-cat > Makefile.am << 'END'
-
-if CHECK
-data_DATA = zar
-else
-data_DATA =
-endif
-
-if CHECK
-data_DATA += doz
-else
-data_DATA += dog
-endif
-
-END
-
-$ACLOCAL
-$AUTOMAKE
-grep 'CHECK_TRUE.*zar doz' Makefile.in
-grep 'CHECK_FALSE.*dog' Makefile.in
-
-:
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
deleted file mode 100755
index 755002c..0000000
--- a/tests/pluseq3.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2004, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another `+=' test with conditionals.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([CHECK], [true])
-END
-
-cat > Makefile.am << 'END'
-
-if CHECK
-data_DATA = zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
-else
-data_DATA =
-endif
-
-if CHECK
-data_DATA += \
- doz
-else
-data_DATA += dog
-endif
-
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'address@hidden@data_DATA = 
zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$' 
Makefile.in
-grep 'address@hidden@  doz$' Makefile.in
-
-grep 'address@hidden@data_DATA = dog$' Makefile.in
-
-:
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
deleted file mode 100755
index 744b489..0000000
--- a/tests/pluseq4.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Yet another `+=' test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-CC += -Dwhatever
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP '@CC@ -Dwhatever' Makefile.in
-
-:
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
deleted file mode 100755
index 4e03d37..0000000
--- a/tests/pluseq5.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for another `+=' problem.  Report from Brian Jones.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([CHECK], [true])
-END
-
-cat > Makefile.am << 'END'
-if CHECK
-INCLUDES = abc
-endif
-INCLUDES += def
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-
-# We expect the following diagnostic:
-#
-# Makefile.am:4: Cannot apply `+=' because `INCLUDES' is not defined in
-# Makefile.am:4: the following conditions:
-# Makefile.am:4:   !CHECK
-# Makefile.am:4: Either define `INCLUDES' in these conditions, or use
-# Makefile.am:4: `+=' in the same conditions as the definitions.
-
-# Is !CHECK mentioned?
-grep ':.*!CHECK$' stderr
-# Is there only one missing condition?
-test `grep ':  ' stderr | wc -l` = 1
-
-# By the way, Automake should suggest using AM_CPPFLAGS,
-# because INCLUDES is an obsolete name.
-grep AM_CPPFLAGS stderr
-
-# A way to suppress the obsolete warning is to use
-# -Wno-obsolete:
-echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am
-AUTOMAKE_fails
-grep AM_CPPFLAGS stderr && Exit 1
-# !CHECK should still be mentioned.
-grep ':.*!CHECK$' stderr
-
-:
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
deleted file mode 100755
index af05239..0000000
--- a/tests/pluseq6.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that `+=' works with standard header-vars.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_SUBST([ZZZ])
-END
-
-# If you do this in a real Makefile.am, I will kill you.
-cat > Makefile.am << 'END'
-mandir += foo
-zq = zzz
-END
-
-$ACLOCAL
-$AUTOMAKE
-$FGREP '@mandir@ foo' Makefile.in
-
-num=`grep '^mandir =' Makefile.in | wc -l`
-test $num -eq 1
-
-:
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
deleted file mode 100755
index 31a4246..0000000
--- a/tests/pluseq7.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that `+=' fails when required.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_RANLIB
-END
-
-# If you do this in a real Makefile.am, I will kill you.
-cat > Makefile.am << 'END'
-lib_LIBRARIES = libq.a
-libq_a_SOURCES = q.c
-AR += qq
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wno-portability
-q="[\`'\"]"
-grep "^Makefile\.am:3:.* AR .* with $q=$q before .*$q+=$q" stderr
-
-:
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
deleted file mode 100755
index 901f8b6..0000000
--- a/tests/pluseq8.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2006, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another `+=' test.  From Paul Berrevoets.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-VAR = \
-    one \
-    two
-VAR += three
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-sed -n -e '/^VAR =/ {
-   :loop
-    p
-    n
-    t clear
-    :clear
-    s/\\$/\\/
-    t loop
-    p
-    n
-   }' Makefile.in | grep three
-
-:
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
deleted file mode 100755
index fb30a1d..0000000
--- a/tests/pluseq9.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test the += diagnostics.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'END'
-AM_CONDITIONAL([COND1], [true])
-AM_CONDITIONAL([COND2], [true])
-AM_CONDITIONAL([COND3], [true])
-END
-
-cat > Makefile.am << 'END'
-if COND1
-  C = c
-if COND2
-    A = a
-    B = aa
-    C += cc
-else
-    A = b
-    B = bb
-endif
-  A += c
-else
-  A = d
-endif
-A += e
-
-if COND3
-  A += f
-  B = cc
-endif
-B += dd
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-
-# We expect the following diagnostic:
-#
-# Makefile.am:19: Cannot apply `+=' because `B' is not defined in
-# Makefile.am:19: the following conditions:
-# Makefile.am:19:   !COND1 and !COND3
-# Makefile.am:19: Either define `B' in these conditions, or use
-# Makefile.am:19: `+=' in the same conditions as the definitions.
-#
-# It would be nice if Automake could print only COND3_FALSE and
-# COND1_FALSE (merging the last two conditions), so we'll support
-# this case in the check too.
-
-grep '[cC]annot apply.*+=' stderr
-grep ':   !COND1 and !COND3$' stderr
-# Make sure there is exactly one missing condition.
-test `grep ':  ' stderr | wc -l` = 1
-
-:
diff --git a/tests/pm/Condition-t.pl b/tests/pm/Condition-t.pl
deleted file mode 100644
index 06eb34e..0000000
--- a/tests/pm/Condition-t.pl
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BEGIN {
-  use Config;
-  if (eval { require 5.007_002; }      # for CLONE support
-      && $Config{useithreads})
-    {
-      require threads;
-      import threads;
-    }
-  else
-    {
-      exit 77;
-    }
-}
-use Automake::Condition qw/TRUE FALSE/;
-
-sub test_basics ()
-{
-  my @tests = (# [[Conditions], is_true?, is_false?, string, subst-string]
-              [[], 1, 0, 'TRUE', ''],
-              [['TRUE'], 1, 0, 'TRUE', ''],
-              [['FALSE'], 0, 1, 'FALSE', '#'],
-              [['A_TRUE'], 0, 0, 'A_TRUE', '@A_TRUE@'],
-              [['A_TRUE', 'B_FALSE'],
-               0, 0, 'A_TRUE B_FALSE', '@A_TRUE@@B_FALSE@'],
-              [['B_TRUE', 'FALSE'], 0, 1, 'FALSE', '#'],
-              [['B_TRUE', 'B_FALSE'], 0, 1, 'FALSE', '#']);
-
-  for (@tests)
-    {
-      my $a = new Automake::Condition @{$_->[0]};
-      return 1
-        if threads->new(sub {
-         return 1 if $_->[1] != $a->true;
-         return 1 if $_->[1] != ($a == TRUE);
-         return 1 if $_->[2] != $a->false;
-         return 1 if $_->[2] != ($a == FALSE);
-         return 1 if $_->[3] ne $a->string;
-         return 1 if $_->[4] ne $a->subst_string;
-       })->join;
-    }
-  return 0;
-}
-
-sub test_true_when ()
-{
-  my $failed = 0;
-
-  my @tests = (# [When,
-              #  [Implied-Conditions],
-              #  [Not-Implied-Conditions]]
-              [['TRUE'],
-               [['TRUE']],
-               [['A_TRUE'], ['A_TRUE', 'B_FALSE'], ['FALSE']]],
-              [['A_TRUE'],
-               [['TRUE'], ['A_TRUE']],
-               [['A_TRUE', 'B_FALSE'], ['FALSE']]],
-              [['A_TRUE', 'B_FALSE'],
-               [['TRUE'], ['A_TRUE'], ['B_FALSE'], ['A_TRUE', 'B_FALSE']],
-               [['FALSE'], ['C_FALSE'], ['C_FALSE', 'A_TRUE']]]);
-
-  for my $t (@tests)
-    {
-      my $a = new Automake::Condition @{$t->[0]};
-      return 1
-        if threads->new(sub {
-         for my $u (@{$t->[1]})
-           {
-             my $b = new Automake::Condition @$u;
-             return threads->new(sub {
-               if (! $b->true_when ($a))
-                 {
-                   print "`" . $b->string .
-                     "' not implied by `" . $a->string . "'?\n";
-                   $failed = 1;
-                 }
-             })->join;
-           }
-         for my $u (@{$t->[2]})
-           {
-             my $b = new Automake::Condition @$u;
-             return threads->new(sub {
-               if ($b->true_when ($a))
-                 {
-                   print "`" . $b->string .
-                     "' implied by `" . $a->string . "'?\n";
-                   $failed = 1;
-                 }
-
-               return threads->new(sub {
-                 return 1 if $b->true_when ($a);
-               })->join;
-             })->join;
-           }
-        })->join;
-    }
-  return $failed;
-}
-
-sub test_reduce_and ()
-{
-  my @tests = (# If no conditions are given, TRUE should be returned
-              [[], ["TRUE"]],
-              # An empty condition is TRUE
-              [[""], ["TRUE"]],
-              # A single condition should be passed through unchanged
-              [["FOO"], ["FOO"]],
-              [["FALSE"], ["FALSE"]],
-              [["TRUE"], ["TRUE"]],
-              # TRUE and false should be discarded and overwhelm
-              # the result, respectively
-              [["FOO", "TRUE"], ["FOO"]],
-              [["FOO", "FALSE"], ["FALSE"]],
-              # Repetitions should be removed
-              [["FOO", "FOO"], ["FOO"]],
-              [["TRUE", "FOO", "FOO"], ["FOO"]],
-              [["FOO", "TRUE", "FOO"], ["FOO"]],
-              [["FOO", "FOO", "TRUE"], ["FOO"]],
-              # Two different conditions should be preserved,
-              # but TRUEs should be removed
-              [["FOO", "BAR"], ["BAR,FOO"]],
-              [["TRUE", "FOO", "BAR"], ["BAR,FOO"]],
-              [["FOO", "TRUE", "BAR"], ["BAR,FOO"]],
-              [["FOO", "BAR", "TRUE"], ["BAR,FOO"]],
-              # A condition implied by another condition should be removed.
-              [["FOO BAR", "BAR"], ["FOO BAR"]],
-              [["BAR", "FOO BAR"], ["FOO BAR"]],
-              [["TRUE", "FOO BAR", "BAR"], ["FOO BAR"]],
-              [["FOO BAR", "TRUE", "BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR", "TRUE"], ["FOO BAR"]],
-
-              [["BAR FOO", "BAR"], ["BAR FOO"]],
-              [["BAR", "BAR FOO"], ["BAR FOO"]],
-              [["TRUE", "BAR FOO", "BAR"], ["BAR FOO"]],
-              [["BAR FOO", "TRUE", "BAR"], ["BAR FOO"]],
-              [["BAR FOO", "BAR", "TRUE"], ["BAR FOO"]],
-
-              # Check that reduction happens even when there are
-              # two conditions to remove.
-              [["FOO", "FOO BAR", "BAR"], ["FOO BAR"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["FOO BAR", "FOO BAZ"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
-               ["FOO BAZ BAR"]],
-
-              # Duplicated conditionals should be removed.
-              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
-
-              # Equivalent conditions in different forms should be
-              # reduced: which one is left is unfortunately order
-              # dependent.
-              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
-
-  my $failed = 0;
-  foreach (@tests)
-    {
-      my ($inref, $outref) = @$_;
-      my @inconds = map { new Automake::Condition $_ } @$inref;
-      return 1
-        if threads->new(sub {
-         my @outconds = map { (new Automake::Condition $_)->string } @$outref;
-         return threads->new(sub {
-           my @res =
-             map { $_->string } (Automake::Condition::reduce_and (@inconds));
-           return threads->new(sub {
-             my $result = join (",", sort @res);
-             my $exresult = join (",", @outconds);
-
-             if ($result ne $exresult)
-               {
-                 print '"' . join(",", @$inref) . '" => "' .
-                   $result . '" expected "' .
-                     $exresult . '"' . "\n";
-                 $failed = 1;
-               }
-             return $failed;
-           })->join;
-         })->join;
-       })->join;
-    }
-  return $failed;
-}
-
-sub test_reduce_or ()
-{
-  my @tests = (# If no conditions are given, FALSE should be returned
-              [[], ["FALSE"]],
-              # An empty condition is TRUE
-              [[""], ["TRUE"]],
-              # A single condition should be passed through unchanged
-              [["FOO"], ["FOO"]],
-              [["FALSE"], ["FALSE"]],
-              [["TRUE"], ["TRUE"]],
-              # FALSE and TRUE should be discarded and overwhelm
-              # the result, respectively
-              [["FOO", "TRUE"], ["TRUE"]],
-              [["FOO", "FALSE"], ["FOO"]],
-              # Repetitions should be removed
-              [["FOO", "FOO"], ["FOO"]],
-              [["FALSE", "FOO", "FOO"], ["FOO"]],
-              [["FOO", "FALSE", "FOO"], ["FOO"]],
-              [["FOO", "FOO", "FALSE"], ["FOO"]],
-              # Two different conditions should be preserved,
-              # but FALSEs should be removed
-              [["FOO", "BAR"], ["BAR,FOO"]],
-              [["FALSE", "FOO", "BAR"], ["BAR,FOO"]],
-              [["FOO", "FALSE", "BAR"], ["BAR,FOO"]],
-              [["FOO", "BAR", "FALSE"], ["BAR,FOO"]],
-              # A condition implying another condition should be removed.
-              [["FOO BAR", "BAR"], ["BAR"]],
-              [["BAR", "FOO BAR"], ["BAR"]],
-              [["FALSE", "FOO BAR", "BAR"], ["BAR"]],
-              [["FOO BAR", "FALSE", "BAR"], ["BAR"]],
-              [["FOO BAR", "BAR", "FALSE"], ["BAR"]],
-
-              [["BAR FOO", "BAR"], ["BAR"]],
-              [["BAR", "BAR FOO"], ["BAR"]],
-              [["FALSE", "BAR FOO", "BAR"], ["BAR"]],
-              [["BAR FOO", "FALSE", "BAR"], ["BAR"]],
-              [["BAR FOO", "BAR", "FALSE"], ["BAR"]],
-
-              # Check that reduction happens even when there are
-              # two conditions to remove.
-              [["FOO", "FOO BAR", "BAR"], ["BAR,FOO"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["BAZ,FOO"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
-               ["BAZ,FOO"]],
-
-              # Duplicated conditionals should be removed.
-              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
-
-              # Equivalent conditions in different forms should be
-              # reduced: which one is left is unfortunately order
-              # dependent.
-              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
-
-  my $failed = 0;
-  foreach (@tests)
-    {
-      my ($inref, $outref) = @$_;
-      my @inconds = map { new Automake::Condition $_ } @$inref;
-      return 1
-        if threads->new(sub {
-         my @outconds = map { (new Automake::Condition $_)->string } @$outref;
-         return threads->new(sub {
-           my @res =
-             map { $_->string } (Automake::Condition::reduce_or (@inconds));
-           return threads->new(sub {
-             my $result = join (",", sort @res);
-             my $exresult = join (",", @outconds);
-
-             if ($result ne $exresult)
-               {
-                 print '"' . join(",", @$inref) . '" => "' .
-                   $result . '" expected "' .
-                     $exresult . '"' . "\n";
-                 $failed = 1;
-               }
-             return $failed;
-           })->join;
-         })->join;
-       })->join;
-    }
-  return $failed;
-}
-
-exit (test_basics || test_true_when || test_reduce_and || test_reduce_or);
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/pm/Condition.pl b/tests/pm/Condition.pl
deleted file mode 100644
index 86f1745..0000000
--- a/tests/pm/Condition.pl
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use Automake::Condition qw/TRUE FALSE/;
-
-sub test_basics ()
-{
-  my @tests = (# [[Conditions], is_true?, is_false?, string, subst-string]
-              [[], 1, 0, 'TRUE', ''],
-              [['TRUE'], 1, 0, 'TRUE', ''],
-              [['FALSE'], 0, 1, 'FALSE', '#'],
-              [['A_TRUE'], 0, 0, 'A_TRUE', '@A_TRUE@'],
-              [['A_TRUE', 'B_FALSE'],
-               0, 0, 'A_TRUE B_FALSE', '@A_TRUE@@B_FALSE@'],
-              [['B_TRUE', 'FALSE'], 0, 1, 'FALSE', '#'],
-              [['B_TRUE', 'B_FALSE'], 0, 1, 'FALSE', '#']);
-
-  for (@tests)
-    {
-      my $a = new Automake::Condition @{$_->[0]};
-      return 1 if $_->[1] != $a->true;
-      return 1 if $_->[1] != ($a == TRUE);
-      return 1 if $_->[2] != $a->false;
-      return 1 if $_->[2] != ($a == FALSE);
-      return 1 if $_->[3] ne $a->string;
-      return 1 if $_->[4] ne $a->subst_string;
-    }
-  return 0;
-}
-
-sub test_true_when ()
-{
-  my $failed = 0;
-
-  my @tests = (# [When,
-              #  [Implied-Conditions],
-              #  [Not-Implied-Conditions]]
-              [['TRUE'],
-               [['TRUE']],
-               [['A_TRUE'], ['A_TRUE', 'B_FALSE'], ['FALSE']]],
-              [['A_TRUE'],
-               [['TRUE'], ['A_TRUE']],
-               [['A_TRUE', 'B_FALSE'], ['FALSE']]],
-              [['A_TRUE', 'B_FALSE'],
-               [['TRUE'], ['A_TRUE'], ['B_FALSE'], ['A_TRUE', 'B_FALSE']],
-               [['FALSE'], ['C_FALSE'], ['C_FALSE', 'A_TRUE']]]);
-
-  for my $t (@tests)
-    {
-      my $a = new Automake::Condition @{$t->[0]};
-      for my $u (@{$t->[1]})
-       {
-         my $b = new Automake::Condition @$u;
-         if (! $b->true_when ($a))
-           {
-             print "`" . $b->string .
-               "' not implied by `" . $a->string . "'?\n";
-             $failed = 1;
-           }
-       }
-      for my $u (@{$t->[2]})
-       {
-         my $b = new Automake::Condition @$u;
-         if ($b->true_when ($a))
-           {
-             print "`" . $b->string .
-               "' implied by `" . $a->string . "'?\n";
-             $failed = 1;
-           }
-
-         return 1 if $b->true_when ($a);
-       }
-    }
-  return $failed;
-}
-
-sub test_reduce_and ()
-{
-  my @tests = (# If no conditions are given, TRUE should be returned
-              [[], ["TRUE"]],
-              # An empty condition is TRUE
-              [[""], ["TRUE"]],
-              # A single condition should be passed through unchanged
-              [["FOO"], ["FOO"]],
-              [["FALSE"], ["FALSE"]],
-              [["TRUE"], ["TRUE"]],
-              # TRUE and false should be discarded and overwhelm
-              # the result, respectively
-              [["FOO", "TRUE"], ["FOO"]],
-              [["FOO", "FALSE"], ["FALSE"]],
-              # Repetitions should be removed
-              [["FOO", "FOO"], ["FOO"]],
-              [["TRUE", "FOO", "FOO"], ["FOO"]],
-              [["FOO", "TRUE", "FOO"], ["FOO"]],
-              [["FOO", "FOO", "TRUE"], ["FOO"]],
-              # Two different conditions should be preserved,
-              # but TRUEs should be removed
-              [["FOO", "BAR"], ["BAR,FOO"]],
-              [["TRUE", "FOO", "BAR"], ["BAR,FOO"]],
-              [["FOO", "TRUE", "BAR"], ["BAR,FOO"]],
-              [["FOO", "BAR", "TRUE"], ["BAR,FOO"]],
-              # A condition implied by another condition should be removed.
-              [["FOO BAR", "BAR"], ["FOO BAR"]],
-              [["BAR", "FOO BAR"], ["FOO BAR"]],
-              [["TRUE", "FOO BAR", "BAR"], ["FOO BAR"]],
-              [["FOO BAR", "TRUE", "BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR", "TRUE"], ["FOO BAR"]],
-
-              [["BAR FOO", "BAR"], ["BAR FOO"]],
-              [["BAR", "BAR FOO"], ["BAR FOO"]],
-              [["TRUE", "BAR FOO", "BAR"], ["BAR FOO"]],
-              [["BAR FOO", "TRUE", "BAR"], ["BAR FOO"]],
-              [["BAR FOO", "BAR", "TRUE"], ["BAR FOO"]],
-
-              # Check that reduction happens even when there are
-              # two conditions to remove.
-              [["FOO", "FOO BAR", "BAR"], ["FOO BAR"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["FOO BAR", "FOO BAZ"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
-               ["FOO BAZ BAR"]],
-
-              # Duplicated conditionals should be removed.
-              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
-
-              # Equivalent conditions in different forms should be
-              # reduced: which one is left is unfortunately order
-              # dependent.
-              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
-
-  my $failed = 0;
-  foreach (@tests)
-    {
-      my ($inref, $outref) = @$_;
-      my @inconds = map { new Automake::Condition $_ } @$inref;
-      my @outconds = map { (new Automake::Condition $_)->string } @$outref;
-      my @res =
-       map { $_->string } (Automake::Condition::reduce_and (@inconds));
-      my $result = join (",", sort @res);
-      my $exresult = join (",", @outconds);
-
-      if ($result ne $exresult)
-       {
-         print '"' . join(",", @$inref) . '" => "' .
-           $result . '" expected "' .
-             $exresult . '"' . "\n";
-         $failed = 1;
-       }
-    }
-  return $failed;
-}
-
-sub test_reduce_or ()
-{
-  my @tests = (# If no conditions are given, FALSE should be returned
-              [[], ["FALSE"]],
-              # An empty condition is TRUE
-              [[""], ["TRUE"]],
-              # A single condition should be passed through unchanged
-              [["FOO"], ["FOO"]],
-              [["FALSE"], ["FALSE"]],
-              [["TRUE"], ["TRUE"]],
-              # FALSE and TRUE should be discarded and overwhelm
-              # the result, respectively
-              [["FOO", "TRUE"], ["TRUE"]],
-              [["FOO", "FALSE"], ["FOO"]],
-              # Repetitions should be removed
-              [["FOO", "FOO"], ["FOO"]],
-              [["FALSE", "FOO", "FOO"], ["FOO"]],
-              [["FOO", "FALSE", "FOO"], ["FOO"]],
-              [["FOO", "FOO", "FALSE"], ["FOO"]],
-              # Two different conditions should be preserved,
-              # but FALSEs should be removed
-              [["FOO", "BAR"], ["BAR,FOO"]],
-              [["FALSE", "FOO", "BAR"], ["BAR,FOO"]],
-              [["FOO", "FALSE", "BAR"], ["BAR,FOO"]],
-              [["FOO", "BAR", "FALSE"], ["BAR,FOO"]],
-              # A condition implying another condition should be removed.
-              [["FOO BAR", "BAR"], ["BAR"]],
-              [["BAR", "FOO BAR"], ["BAR"]],
-              [["FALSE", "FOO BAR", "BAR"], ["BAR"]],
-              [["FOO BAR", "FALSE", "BAR"], ["BAR"]],
-              [["FOO BAR", "BAR", "FALSE"], ["BAR"]],
-
-              [["BAR FOO", "BAR"], ["BAR"]],
-              [["BAR", "BAR FOO"], ["BAR"]],
-              [["FALSE", "BAR FOO", "BAR"], ["BAR"]],
-              [["BAR FOO", "FALSE", "BAR"], ["BAR"]],
-              [["BAR FOO", "BAR", "FALSE"], ["BAR"]],
-
-              # Check that reduction happens even when there are
-              # two conditions to remove.
-              [["FOO", "FOO BAR", "BAR"], ["BAR,FOO"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ"], ["BAZ,FOO"]],
-              [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
-               ["BAZ,FOO"]],
-
-              # Duplicated conditionals should be removed.
-              [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
-
-              # Equivalent conditions in different forms should be
-              # reduced: which one is left is unfortunately order
-              # dependent.
-              [["BAR FOO", "FOO BAR"], ["FOO BAR"]],
-              [["FOO BAR", "BAR FOO"], ["BAR FOO"]]);
-
-  my $failed = 0;
-  foreach (@tests)
-    {
-      my ($inref, $outref) = @$_;
-      my @inconds = map { new Automake::Condition $_ } @$inref;
-      my @outconds = map { (new Automake::Condition $_)->string } @$outref;
-      my @res =
-       map { $_->string } (Automake::Condition::reduce_or (@inconds));
-      my $result = join (",", sort @res);
-      my $exresult = join (",", @outconds);
-
-      if ($result ne $exresult)
-       {
-         print '"' . join(",", @$inref) . '" => "' .
-           $result . '" expected "' .
-             $exresult . '"' . "\n";
-         $failed = 1;
-       }
-    }
-  return $failed;
-}
-
-exit (test_basics || test_true_when || test_reduce_and || test_reduce_or);
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/pm/DisjConditions-t.pl b/tests/pm/DisjConditions-t.pl
deleted file mode 100644
index 2fe275b..0000000
--- a/tests/pm/DisjConditions-t.pl
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BEGIN {
-  use Config;
-  if (eval { require 5.007_002; }      # for CLONE support
-      && $Config{useithreads})
-    {
-      require threads;
-      import threads;
-    }
-  else
-    {
-      exit 77;
-    }
-}
-use Automake::Condition qw/TRUE FALSE/;
-use Automake::DisjConditions;
-
-sub test_basics ()
-{
-  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
-  return threads->new (sub {
-    my $other = new Automake::Condition "COND3_FALSE";
-    return threads->new (sub {
-      my $set1 = new Automake::DisjConditions $cond, $other;
-      return threads->new (sub {
-       my $set2 = new Automake::DisjConditions $other, $cond;
-       return 1 unless $set1 == $set2;
-       return 1 if $set1->false;
-       return 1 if $set1->true;
-       return 1 unless (new Automake::DisjConditions)->false;
-       return 1 if (new Automake::DisjConditions)->true;
-      })->join;
-    })->join;
-  })->join;
-}
-
-sub build_set (@)
-{
-  my @conds = @_;
-  my @set = ();
-  for my $cond (@conds)
-    {
-      push @set, new Automake::Condition @$cond;
-    }
-  return new Automake::DisjConditions @set;
-}
-
-sub test_invert ()
-{
-  my @tests = ([[["FALSE"]],
-               [["TRUE"]]],
-
-              [[["TRUE"]],
-               [["FALSE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["COND3_FALSE", "COND2_TRUE"]],
-               [["COND2_FALSE"],
-                ["COND1_FALSE", "COND3_TRUE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["TRUE"]],
-               [["FALSE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["FALSE"]],
-               [["COND1_FALSE"],
-                ["COND2_FALSE"]]],
-
-              [[["COND1_TRUE"],
-                ["COND2_FALSE"]],
-               [["COND1_FALSE", "COND2_TRUE"]]]
-              );
-
-  for my $t (@tests)
-    {
-      my $set = build_set @{$t->[0]};
-      return 1
-        if threads->new(sub {
-         my $res = build_set @{$t->[1]};
-         my $inv = $set->invert;
-         if ($inv != $res)
-           {
-             print " (I) " . $set->string . "\n\t"
-               . $inv->string . ' != ' . $res->string . "\n";
-             return 1;
-           }
-         return 0
-       })-> join;
-    }
-  return 0;
-}
-
-sub test_simplify ()
-{
-  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"]],
-               [["FOO_TRUE", "BAR_FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_TRUE", "BAR_TRUE"]],
-               [["FOO_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_TRUE", "BAR_TRUE"],
-                ["FOO_FALSE"]],
-               [["TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                            ["BAR_TRUE",  "BAZ_TRUE"],
-                            ["BAR_FALSE", "BAZ_TRUE"]],
-               [["BAZ_TRUE"], ["FOO_TRUE", "BAR_FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                            ["BAR_TRUE",  "BAZ_TRUE"],
-                            ["BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               [["FOO_FALSE"], ["BAZ_TRUE"], ["BAR_FALSE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_TRUE"]],
-               [["B_TRUE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE"]],
-               [["A_FALSE"], ["B_TRUE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE"],
-                ["A_TRUE", "B_FALSE"]],
-               [["TRUE"]]],
-
-              [[["A_TRUE", "B_TRUE"],
-                ["A_TRUE", "B_FALSE"],
-                ["A_TRUE", "C_FALSE", "D_FALSE"]],
-               [["A_TRUE"]]],
-
-              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"]],
-               [           ["B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                           ["B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                           ["B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                           ["B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"]]],
-
-              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"]],
-               [["C_FALSE", "E_FALSE"],
-                ["C_TRUE", "E_TRUE"]]],
-
-              [[["A_FALSE"],
-                ["A_TRUE", "B_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE", "F_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE"]],
-               [["TRUE"]]],
-
-              # Simplify should work with up to 31 variables.
-              [[["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_TRUE"],
-                ["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_FALSE"],
-                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_TRUE"],
-                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_FALSE"]],
-               [[            "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE"
-                 ]]]);
-
-  for my $t (@tests)
-    {
-      my $set = build_set @{$t->[0]};
-      return 1
-       if threads->new(sub {
-         my $res = build_set @{$t->[1]};
-         return threads->new(sub {
-
-           # Make sure simplify() yields the expected result.
-           my $sim = $set->simplify;
-           return threads->new(sub {
-             if ($sim != $res)
-               {
-                 print " (S1) " . $set->string . "\n\t"
-                   . $sim->string . ' != ' . $res->string . "\n";
-                 return 1;
-               }
-
-             # Make sure simplify() is idempotent.
-             my $sim2 = $sim->simplify;
-             return threads->new(sub {
-               if ($sim2 != $sim)
-                 {
-                   print " (S2) " . $sim->string . "\n\t"
-                     . $sim2->string . ' != ' . $sim->string . "\n";
-                   return 1;
-                 }
-
-               # Also exercise invert() while we are at it.
-
-               my $inv1 = $set->invert->simplify;
-               return threads->new(sub {
-                 my $inv2 = $sim->invert->simplify;
-                 return threads->new(sub {
-                   if ($inv1 != $inv2)
-                     {
-                       print " (S3) " . $set->string . ", " . $sim->string . 
"\n\t"
-                         . $inv1->string . ' -= ' . $inv2->string . "\n";
-                       return 1;
-                     }
-                 })->join;
-               })->join;
-             })->join;
-           })->join;
-         })->join;
-       })->join;
-    }
-
-  return 0;
-}
-
-sub test_sub_conditions ()
-{
-  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE"],
-               [["BAR_FALSE", "BAZ_FALSE"],
-                ["BAR_FALSE", "BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_FALSE"],
-               [["BAZ_FALSE"],
-                ["BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE"],
-                ["FOO_TRUE", "BAR_TRUE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["TRUE"]]],
-
-              [[["TRUE"]],
-               ["TRUE"],
-               [["TRUE"]]],
-
-              [[["FALSE"]],
-               ["TRUE"],
-               [["FALSE"]]],
-
-              [[["FALSE"]],
-               ["FALSE"],
-               [["FALSE"]]]);
-
-  for my $t (@tests)
-    {
-      my $t1 = build_set @{$t->[0]};
-      return 1
-        if threads->new(sub {
-         my $t2 = new Automake::Condition @{$t->[1]};
-         return threads->new(sub {
-           my $t3 = build_set @{$t->[2]};
-           return threads->new(sub {
-
-             # Make sure sub_conditions() yields the expected result.
-             my $s = $t1->sub_conditions ($t2);
-             threads->new(sub {
-               if ($s != $t3)
-                 {
-                   print " (SC) " . $t1->string . "\n\t"
-                     . $s->string . ' != ' . $t3->string . "\n";
-                   return 1;
-                 }
-             })->join;
-           })->join;
-         })->join;
-       })->join;
-    }
-}
-
-sub test_ambig ()
-{
-  my @tests = ([[["TRUE"]],
-               ["TRUE"],
-               "multiply defined"],
-              [[["C1_TRUE"]],
-               ["C1_TRUE"],
-               "multiply defined"],
-              [[["TRUE"]],
-                ["C1_FALSE"],
-               "which includes"],
-              [[["C1_TRUE"]],
-               ["C1_TRUE", "C2_TRUE"],
-               "which includes"],
-              [[["C1_TRUE", "C2_TRUE"]],
-               ["C2_TRUE"],
-               "which is included in"],
-              [[["C1_TRUE"]],
-               ["C2_TRUE"],
-               ''],
-              [[["C1_TRUE"],
-                ["C2_FALSE"]],
-               ["C1_FALSE", "C2_TRUE"],
-               '']);
-
-  my $failed = 0;
-  for my $t (@tests)
-    {
-      my $t1 = build_set @{$t->[0]};
-      $failed = 1
-        if threads->new(sub {
-         my $t2 = new Automake::Condition @{$t->[1]};
-         my $t3 = $t->[2];
-         return threads->new(sub {
-           my ($ans, $cond) = $t1->ambiguous_p ("FOO", $t2);
-           return threads->new(sub {
-             if ($t3 && $ans !~ /FOO.*$t3/)
-               {
-                 print " (A1) " . $t1->string . " vs. " . $t2->string . "\n\t"
-                   . "Error message '$ans' does not match '$t3'\n";
-                 return 1;
-               }
-             if (!$t3 && $ans ne '')
-               {
-                 print " (A2) " . $t1->string . " vs. " . $t2->string . "\n\t"
-                   . "Unexpected error message: $ans\n";
-                 return 1;
-               }
-           })->join;
-         })->join;
-       })->join;
-    }
-  return $failed;
-}
-
-exit (test_basics
-      || test_invert
-      || test_simplify
-      || test_sub_conditions
-      || test_ambig);
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/pm/DisjConditions.pl b/tests/pm/DisjConditions.pl
deleted file mode 100644
index 47dea83..0000000
--- a/tests/pm/DisjConditions.pl
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use Automake::Condition qw/TRUE FALSE/;
-use Automake::DisjConditions;
-
-sub test_basics ()
-{
-  my $cond = new Automake::Condition "COND1_TRUE", "COND2_FALSE";
-  my $other = new Automake::Condition "COND3_FALSE";
-  my $set1 = new Automake::DisjConditions $cond, $other;
-  my $set2 = new Automake::DisjConditions $other, $cond;
-  return 1 unless $set1 == $set2;
-  return 1 if $set1->false;
-  return 1 if $set1->true;
-  return 1 unless (new Automake::DisjConditions)->false;
-  return 1 if (new Automake::DisjConditions)->true;
-}
-
-sub build_set (@)
-{
-  my @conds = @_;
-  my @set = ();
-  for my $cond (@conds)
-    {
-      push @set, new Automake::Condition @$cond;
-    }
-  return new Automake::DisjConditions @set;
-}
-
-sub test_invert ()
-{
-  my @tests = ([[["FALSE"]],
-               [["TRUE"]]],
-
-              [[["TRUE"]],
-               [["FALSE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["COND3_FALSE", "COND2_TRUE"]],
-               [["COND2_FALSE"],
-                ["COND1_FALSE", "COND3_TRUE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["TRUE"]],
-               [["FALSE"]]],
-
-              [[["COND1_TRUE", "COND2_TRUE"],
-                ["FALSE"]],
-               [["COND1_FALSE"],
-                ["COND2_FALSE"]]],
-
-              [[["COND1_TRUE"],
-                ["COND2_FALSE"]],
-               [["COND1_FALSE", "COND2_TRUE"]]]
-              );
-
-  for my $t (@tests)
-    {
-      my $set = build_set @{$t->[0]};
-      my $res = build_set @{$t->[1]};
-      my $inv = $set->invert;
-      if ($inv != $res)
-       {
-         print " (I) " . $set->string . "\n\t"
-           . $inv->string . ' != ' . $res->string . "\n";
-         return 1;
-       }
-    }
-  return 0;
-}
-
-sub test_simplify ()
-{
-  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"]],
-               [["FOO_TRUE", "BAR_FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_TRUE", "BAR_TRUE"]],
-               [["FOO_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_TRUE", "BAR_TRUE"],
-                ["FOO_FALSE"]],
-               [["TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                            ["BAR_TRUE",  "BAZ_TRUE"],
-                            ["BAR_FALSE", "BAZ_TRUE"]],
-               [["BAZ_TRUE"], ["FOO_TRUE", "BAR_FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                            ["BAR_TRUE",  "BAZ_TRUE"],
-                            ["BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               [["FOO_FALSE"], ["BAZ_TRUE"], ["BAR_FALSE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_TRUE"]],
-               [["B_TRUE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE"]],
-               [["A_FALSE"], ["B_TRUE"]]],
-
-              [[["B_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE"],
-                ["A_TRUE", "B_FALSE"]],
-               [["TRUE"]]],
-
-              [[["A_TRUE", "B_TRUE"],
-                ["A_TRUE", "B_FALSE"],
-                ["A_TRUE", "C_FALSE", "D_FALSE"]],
-               [["A_TRUE"]]],
-
-              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"]],
-               [           ["B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                           ["B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                           ["B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                           ["B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"]]],
-
-              [[["A_FALSE", "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"],
-                ["A_FALSE", "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_FALSE", "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_FALSE", "D_TRUE",  "E_FALSE"],
-                ["A_TRUE",  "B_TRUE",  "C_TRUE",  "D_TRUE",  "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_TRUE",  "D_FALSE", "E_TRUE"],
-                ["A_TRUE",  "B_FALSE", "C_FALSE", "D_FALSE", "E_FALSE"]],
-               [["C_FALSE", "E_FALSE"],
-                ["C_TRUE", "E_TRUE"]]],
-
-              [[["A_FALSE"],
-                ["A_TRUE", "B_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE", "F_FALSE"],
-                ["A_TRUE", "B_TRUE", "C_TRUE", "D_TRUE", "E_TRUE"]],
-               [["TRUE"]]],
-
-              # Simplify should work with up to 31 variables.
-              [[["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_TRUE"],
-                ["V01_TRUE", "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_FALSE"],
-                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_TRUE"],
-                ["V01_FALSE","V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE",
-                 "V31_FALSE"]],
-               [[            "V02_TRUE", "V03_TRUE", "V04_TRUE", "V05_TRUE",
-                 "V06_TRUE", "V07_TRUE", "V08_TRUE", "V09_TRUE", "V10_TRUE",
-                 "V11_TRUE", "V12_TRUE", "V13_TRUE", "V14_TRUE", "V15_TRUE",
-                 "V16_TRUE", "V17_TRUE", "V18_TRUE", "V19_TRUE", "V20_TRUE",
-                 "V21_TRUE", "V22_TRUE", "V23_TRUE", "V24_TRUE", "V25_TRUE",
-                 "V26_TRUE", "V27_TRUE", "V28_TRUE", "V29_TRUE", "V30_TRUE"
-                 ]]]);
-
-  for my $t (@tests)
-    {
-      my $set = build_set @{$t->[0]};
-      my $res = build_set @{$t->[1]};
-
-      # Make sure simplify() yields the expected result.
-      my $sim = $set->simplify;
-      if ($sim != $res)
-       {
-         print " (S1) " . $set->string . "\n\t"
-           . $sim->string . ' != ' . $res->string . "\n";
-         return 1;
-       }
-
-      # Make sure simplify() is idempotent.
-      my $sim2 = $sim->simplify;
-      if ($sim2 != $sim)
-       {
-         print " (S2) " . $sim->string . "\n\t"
-           . $sim2->string . ' != ' . $sim->string . "\n";
-         return 1;
-       }
-
-      # Also exercise invert() while we are at it.
-
-      my $inv1 = $set->invert->simplify;
-      my $inv2 = $sim->invert->simplify;
-      if ($inv1 != $inv2)
-       {
-         print " (S3) " . $set->string . ", " . $sim->string . "\n\t"
-           . $inv1->string . ' != ' . $inv2->string . "\n";
-         return 1;
-       }
-    }
-
-  return 0;
-}
-
-sub test_sub_conditions ()
-{
-  my @tests = ([[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE"],
-               [["BAR_FALSE", "BAZ_FALSE"],
-                ["BAR_FALSE", "BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_FALSE"],
-               [["BAZ_FALSE"],
-                ["BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAR_FALSE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["FALSE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE", "BAZ_FALSE"],
-                ["FOO_TRUE", "BAZ_TRUE"],
-                ["FOO_FALSE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["BAZ_TRUE"]]],
-
-              [[["FOO_TRUE", "BAR_FALSE"],
-                ["FOO_TRUE", "BAR_TRUE"]],
-               ["FOO_TRUE", "BAR_TRUE"],
-               [["TRUE"]]],
-
-              [[["TRUE"]],
-               ["TRUE"],
-               [["TRUE"]]],
-
-              [[["FALSE"]],
-               ["TRUE"],
-               [["FALSE"]]],
-
-              [[["FALSE"]],
-               ["FALSE"],
-               [["FALSE"]]]);
-
-  for my $t (@tests)
-    {
-      my $t1 = build_set @{$t->[0]};
-      my $t2 = new Automake::Condition @{$t->[1]};
-      my $t3 = build_set @{$t->[2]};
-
-      # Make sure sub_conditions() yields the expected result.
-      my $s = $t1->sub_conditions ($t2);
-      if ($s != $t3)
-       {
-         print " (SC) " . $t1->string . "\n\t"
-           . $s->string . ' != ' . $t3->string . "\n";
-         return 1;
-       }
-    }
-}
-
-sub test_ambig ()
-{
-  my @tests = ([[["TRUE"]],
-               ["TRUE"],
-               "multiply defined"],
-              [[["C1_TRUE"]],
-               ["C1_TRUE"],
-               "multiply defined"],
-              [[["TRUE"]],
-                ["C1_FALSE"],
-               "which includes"],
-              [[["C1_TRUE"]],
-               ["C1_TRUE", "C2_TRUE"],
-               "which includes"],
-              [[["C1_TRUE", "C2_TRUE"]],
-               ["C2_TRUE"],
-               "which is included in"],
-              [[["C1_TRUE"]],
-               ["C2_TRUE"],
-               ''],
-              [[["C1_TRUE"],
-                ["C2_FALSE"]],
-               ["C1_FALSE", "C2_TRUE"],
-               '']);
-
-  for my $t (@tests)
-    {
-      my $t1 = build_set @{$t->[0]};
-      my $t2 = new Automake::Condition @{$t->[1]};
-      my $t3 = $t->[2];
-      my ($ans, $cond) = $t1->ambiguous_p ("FOO", $t2);
-      if ($t3 && $ans !~ /FOO.*$t3/)
-       {
-         print " (A1) " . $t1->string . " vs. " . $t2->string . "\n\t"
-           . "Error message '$ans' does not match '$t3'\n";
-         return 1;
-       }
-      if (!$t3 && $ans ne '')
-       {
-         print " (A2) " . $t1->string . " vs. " . $t2->string . "\n\t"
-           . "Unexpected error message: $ans\n";
-         return 1;
-       }
-    }
-  return 0;
-}
-
-exit (test_basics
-      || test_invert
-      || test_simplify
-      || test_sub_conditions
-      || test_ambig);
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/pm/Version.pl b/tests/pm/Version.pl
deleted file mode 100644
index e496435..0000000
--- a/tests/pm/Version.pl
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use Automake::Version;
-
-my $failed = 0;
-
-sub test_version_compare
-{
-  my ($left, $right, $result) = @_;
-  my @leftver = Automake::Version::split ($left);
-  my @rightver = Automake::Version::split ($right);
-  if ($#leftver == -1)
-  {
-    print "can't grok \"$left\"\n";
-    $failed = 1;
-    return;
-  }
-  if ($#rightver == -1)
-  {
-    print "can't grok \"$right\"\n";
-    $failed = 1;
-    return;
-  }
-  my $res = Automake::Version::compare (@leftver, @rightver);
-  if ($res != $result)
-  {
-    print "compare (\"$left\", \"$right\") = $res! (not $result?)\n";
-    $failed = 1;
-  }
-}
-
-my @tests = (
-# basics
-  ['1.0', '2.0', -1],
-  ['2.0', '1.0', 1],
-  ['1.2', '1.2', 0],
-  ['1.1', '1.2', -1],
-  ['1.2', '1.1', 1],
-# alphas
-  ['1.4', '1.4g', -1],
-  ['1.4g', '1.5', -1],
-  ['1.4g', '1.4', 1],
-  ['1.5', '1.4g', 1],
-  ['1.4a', '1.4g', -1],
-  ['1.5a', '1.3g', 1],
-  ['1.6a', '1.6a', 0],
-# micros
-  ['1.5.1', '1.5', 1],
-  ['1.5.0', '1.5', 0],
-  ['1.5.4', '1.6.1', -1],
-# micros and alphas
-  ['1.5a', '1.5.1', 1],
-  ['1.5a', '1.5.1a', 1],
-  ['1.5a', '1.5.1f', 1],
-  ['1.5', '1.5.1a', -1],
-  ['1.5.1a', '1.5.1f', -1],
-# special exceptions
-  ['1.6-p5a', '1.6.5a', 0],
-  ['1.6', '1.6-p5a', -1],
-  ['1.6-p4b', '1.6-p5a', -1],
-  ['1.6-p4b', '1.6-foo', 1],
-  ['1.6-p4b', '1.6a-foo', -1]
-);
-
-test_version_compare (@{$_}) foreach @tests;
-
-exit $failed;
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/pm/Wrap.pl b/tests/pm/Wrap.pl
deleted file mode 100644
index 8d840fc..0000000
--- a/tests/pm/Wrap.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use Automake::Wrap 'wrap';
-
-my $failed = 0;
-
-sub test_wrap
-{
-  my ($in, $exp_out) = @_;
-
-  my $out = &wrap (@$in);
-  if ($out ne $exp_out)
-    {
-      print STDERR "For: @$in\nGot:\n$out\nInstead of:\n$exp_out\n---\n";
-      ++$failed;
-    }
-}
-
-my @tests = (
-  [["HEAD:", "NEXT:", "CONT", 13, "v" ,"a", "l", "ue", "s", "values"],
-"HEAD:v aCONT
-NEXT:l ueCONT
-NEXT:sCONT
-NEXT:values
-"],
-  [["rule: ", "\t", " \\", 20, "dep1" ,"dep2", "dep3", "dep4", "dep5",
-    "dep06", "dep07", "dep08"],
-"rule: dep1 dep2 \\
-\tdep3 dep4 \\
-\tdep5 dep06 \\
-\tdep07 \\
-\tdep08
-"],
-  [["big header:", "big continuation:", " END", 5, "diag1", "diag2", "diag3"],
-"big header:diag1 END
-big continuation:diag2 END
-big continuation:diag3
-"],
-  [["big header:", "cont: ", " END", 16, "word1", "word2"],
-"big header: END
-cont: word1 END
-cont: word2
-"]);
-
-
-test_wrap (@{$_}) foreach @tests;
-
-exit $failed;
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/tests/postproc.test b/tests/postproc.test
deleted file mode 100755
index 44570fe..0000000
--- a/tests/postproc.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure we recognize a Makefile.in, even if post-processed
-# and renamed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([myMakefile])
-AC_OUTPUT
-END
-
-cat > myMakefile.am << 'END'
-bin_PROGRAMS = fred
-fred_SOURCES = fred.c
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -- myMakefile
-
-mv myMakefile.in myMakefile.old
-echo '# Post-processed by post-processor 3.14.' > myMakefile.in
-cat myMakefile.old >> myMakefile.in
-
-./configure || Exit $?
-
-test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1
-
-:
diff --git a/tests/ppf77.test b/tests/ppf77.test
deleted file mode 100755
index 6c61a2e..0000000
--- a/tests/ppf77.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure preprocessed F77 works.
-# Report from Jochen Kuepper.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_F77
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = ppf
-ppf_SOURCES = foo.F q.r
-END
-
-: > foo.F
-: > q.r
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/pr2.test b/tests/pr2.test
deleted file mode 100755
index ceb2729..0000000
--- a/tests/pr2.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported in PR 2.
-# "make dist" fails for AC_OUTPUT(README.foo:templ/README.foo.in).
-#
-# == Report ==
-# When my AC_OUTPUT macro in configure.in contains something
-# like the following (among the Makefiles)
-#       README.foo:templ/README.foo.in
-# the generated dist target in the Makefile.in fails,
-# because DIST_COMMON will contain templ/README.foo.in
-# and the dist target will try to copy templ/README.foo.in
-# to the distribution directory before it creates a templ
-# subdirectory in the distribution directory.
-
-. ./defs || Exit 1
-
-set -e
-
-# Please keep this underquoted and old-style.
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(README.foo:templ/README.foo.in Makefile)
-END
-
-: > Makefile.am
-
-mkdir templ
-: > templ/README.foo.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE distdir
-test -f nonesuch-nonesuch/templ/README.foo.in
-
-:
diff --git a/tests/pr204.test b/tests/pr204.test
deleted file mode 100755
index 22a1e54..0000000
--- a/tests/pr204.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# For PR 204.
-# Sources derived from nodist_ sources should not be distributed.
-
-required='bison gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AM_MAINTAINER_MODE
-AC_PROG_CC
-AC_PROG_YACC
-AC_OUTPUT
-EOF
-
-# The PARSE2 intermediate variable is there to make
-# sure Automake match 'nodist_' against the right
-# variable name...
-cat > Makefile.am << 'EOF'
-AM_YFLAGS = -d
-EXTRA_PROGRAMS = foo
-PARSE2 = parse2.y
-nodist_foo_SOURCES = parse.y $(PARSE2)
-
-distdirtest: distdir
-       test ! -f $(distdir)/parse.c
-       test ! -f $(distdir)/parse.y
-       test ! -f $(distdir)/parse.h
-       test ! -f $(distdir)/parse2.c
-       test ! -f $(distdir)/parse2.y
-       test ! -f $(distdir)/parse2.h
-EOF
-
-cat > parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-maude : 'm' 'a' 'u' 'd' 'e' {};
-END
-
-cp parse.y parse2.y
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE distdirtest
-
-# Make sure parse.c and parse2.c are still targets.
-$MAKE parse.c parse2.c
-test -f parse.c
-test -f parse2.c
-
-# Ensure the rebuild rule works despite AM_MAINTAINER_MODE, because
-# it's a nodist_ parser.
-$sleep
-touch parse.y
-$sleep
-$MAKE parse.c parse2.c
-test `ls -1t parse.c parse.y | sed 1q` = parse.c
-
-:
diff --git a/tests/pr211.test b/tests/pr211.test
deleted file mode 100755
index 798e4f6..0000000
--- a/tests/pr211.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 211.
-#
-# == Description ==
-# Suppose you have a library and an ltlibrary in the same
-# directory which use the same source:
-#
-#   libfoo_la_SOURCES = foo.c
-#   libbar_a_SOURCES = foo.c
-#
-# In this case foo.c will be compiled twice but using different
-# compilers.  This is a conflict.  In this case the user should
-# rename one of the `foo.o's.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = helldl
-lib_LTLIBRARIES = libfoo.la
-helldl_SOURCES = foo.c
-libfoo_la_SOURCES = foo.c
-END
-
-libtoolize
-$ACLOCAL
-AUTOMAKE_fails -Wnone -a
-$FGREP 'foo.$(OBJEXT)' stderr
-
-:
diff --git a/tests/pr220.test b/tests/pr220.test
deleted file mode 100755
index 95212ab..0000000
--- a/tests/pr220.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2008, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR automake/220.
-# Test for problems when conditionals are not actually defined.
-# Check that the problems is diagnosed by configure.
-# This isn't perfect (ideally we'd like an error from autoconf),
-# but it is the best we can do.  It certainly makes it easier
-# to debug the problem.
-# Note that this should be also in the documentation.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat > main.c <<'EOF'
-int main() { return 0; }
-EOF
-
-cat > Makefile.am << 'EOF'
-if NEVER_TRUE
-NEVER_DEFINED = missingfile.c
-endif
-
-bin_PROGRAMS = main
-main_SOURCES = main.c $(NEVER_DEFINED)
-EOF
-
-cat >> configure.in << 'EOF'
-AC_PROG_CC
-AC_ARG_ENABLE(foo,
-[  --enable-foo          Enable foo],
-[ if test "foo" = "bar" ; then
-    AM_CONDITIONAL(NEVER_TRUE, true)
-  else
-    AM_CONDITIONAL(NEVER_TRUE, false)
-  fi
-])
-AC_OUTPUT
-EOF
-
-mkdir build
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cd build
-# configure should fail since we've done something invalid.
-../configure 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'conditional.*NEVER_TRUE' stderr
-
-:
diff --git a/tests/pr224.test b/tests/pr224.test
deleted file mode 100755
index 00a7aad..0000000
--- a/tests/pr224.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR automake/224: $(top_srcdir) w.r.t. dependencies.
-#
-# == Description ==
-# Dependency tracking data should be stored in in the relative path
-# of the source file, as opposed the object file.
-# I.e., for `foo.c' in `$(top_srcdir)/bar', being built in
-# `$(top_srcdir)/build', the location of the `.deps' directory
-# should be `$(top_builddir)/bar/.deps'.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-mkdir foo
-
-cat >foo/main.c <<'EOF'
-int main() { return 0; }
-EOF
-
-cat >Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = bar
-bar_SOURCES = foo/main.c
-EOF
-
-cat >>configure.in <<'EOF'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-mkdir build
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-cd build
-../configure
-
-$MAKE
-test -d foo/.deps
-$MAKE distclean
-test -d foo/.deps && Exit 1
-
-:
diff --git a/tests/pr229.test b/tests/pr229.test
deleted file mode 100755
index 0d3f153..0000000
--- a/tests/pr229.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR automake/229.
-# Make sure AC_CYGWIN requires config.{sub,guess}.
-# Reported by James Youngman.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<EOF
-AC_CYGWIN
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test -f config.sub
-test -f config.guess
-
-:
diff --git a/tests/pr243.test b/tests/pr243.test
deleted file mode 100755
index 58fb2a8..0000000
--- a/tests/pr243.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 243.
-# AM_OUTPUT_DEPENDENCY_COMMANDS doesn't handle
-# `Makefile:Makefile.in:tail.mk' in AC_OUTPUT.
-#
-# == Report ==
-# If configure.in has something like:
-#       AC_OUTPUT(Makefile:Makefile.in:tail.mk)
-# then config.status cannot parse the Makefile to build the
-# dependency files in the .deps directory.  This is because
-# the AM_OUTPUT_DEPENDENCY_COMMANDS macro cannot cope with
-# the colon in the CONFIG_FILES variable.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([Makefile:Makefile.in:tail.mk])
-AC_OUTPUT
-END
-
-: > tail.mk
-
-cat > Makefile.am << 'END'
-include_HEADERS  = 3dfx.h linutil.h
-noinst_HEADERS   = fx64.h fxdll.h fximg.h fxglob.h \
-                   fxos.h fxver.h glob.h
-noinst_PROGRAMS = fxmisc
-fxmisc_SOURCES  = fx64.c fximg.c fxos.c linutil.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-# FIXME: require compiler in $required rather than skipping here
-./configure || Exit $?
-
-test -f .deps/fx64.Po
-
-:
diff --git a/tests/pr266.test b/tests/pr266.test
deleted file mode 100755
index 2bace6f..0000000
--- a/tests/pr266.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 266.
-# Dependency tracking -vs- nonstandard Makefile names
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_CONFIG_FILES([Maudefile])
-AC_OUTPUT
-END
-
-cat > Maudefile.am << 'END'
-include_HEADERS = 3dfx.h linutil.h
-noinst_HEADERS  = fx64.h fxdll.h fximg.h fxglob.h \
-                  fxos.h fxver.h glob.h
-noinst_PROGRAMS = fxmisc
-fxmisc_SOURCES  = fx64.c fximg.c fxos.c linutil.c
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-# FIXME: require compiler in $required rather than skipping here
-./configure --enable-dependency-tracking || Exit $?
-
-test -f .deps/fx64.Po
-
-:
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
deleted file mode 100755
index f4e6fb2..0000000
--- a/tests/pr279-2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another test related to PR 279.
-# Multiple DEPENDENCIES on conditionals.
-# Please keep this in sync with sister test pr279.test.
-#
-# == Report ==
-# When defining xxx_LDADD and xxx_DEPENDENCIES variables where the
-# xxx_LDADD one contains values set in conditionals, automake will
-# fail with messages like:
-#       foo_DEPENDENCIES was already defined in condition TRUE, ...
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([FOOTEST], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if FOOTEST
-foo_LDADD = zardoz
-else
-foo_LDADD = maude
-endif
-
-bin_PROGRAMS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'address@hidden@foo_DEPENDENCIES *= *zardoz$' Makefile.in
-grep 'address@hidden@foo_DEPENDENCIES *= *maude$' Makefile.in
-
-:
diff --git a/tests/pr279.test b/tests/pr279.test
deleted file mode 100755
index d658668..0000000
--- a/tests/pr279.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 279.
-# Multiple DEPENDENCIES on conditionals.
-# Please keep this in sync with sister test pr279-2.test.
-#
-# == Report ==
-# When defining xxx_LDADD and xxx_DEPENDENCIES variables where the
-# xxx_LDADD one contains values set in conditionals, automake will
-# fail with messages like:
-#       foo_DEPENDENCIES was already defined in condition TRUE, ...
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([FOOTEST], [false])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-if FOOTEST
-xtralib =
-else
-xtralib =
-endif
-
-bin_PROGRAMS = foo
-foo_LDADD = ${xtralib}
-foo_DEPENDENCIES =
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/pr287.test b/tests/pr287.test
deleted file mode 100755
index 3a6f902..0000000
--- a/tests/pr287.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 287: empty SUBDIRS.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS =
-bin_SCRIPTS = foo
-END
-
-cat > foo << 'END'
-#! /bin/sh
-echo Maude
-END
-
-chmod +x foo
-
-mkdir install
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure "--prefix=`cd install && pwd`"
-
-$MAKE
-$MAKE distdir
-
-:
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
deleted file mode 100755
index d2ea942..0000000
--- a/tests/pr300-lib.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007, 2010, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that installing subdirectory libraries works.
-# PR/300
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LIBRARIES = subdir/liba.a
-subdir_liba_a_SOURCES = a.c
-
-nobase_lib_LIBRARIES = subdir/libb.a
-subdir_libb_a_SOURCES = a.c
-END
-
-cat > a.c << 'END'
-int i = 3;
-END
-
-## A rule in the Makefile should create subdir
-# mkdir subdir
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability --copy --add-missing
-
-# We pass '--libdir' explicitly, to avoid spurious failures due to users
-# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
-# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
-# as is the case with openSUSE 12.1).  See automake bug#10426.
-cwd=`pwd` || Exit 99
-./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
-
-$MAKE
-
-test -f subdir/liba.a
-test -f subdir/libb.a
-
-$MAKE install
-
-test -f inst/lib/liba.a
-test -f inst/lib/subdir/libb.a
-
-$MAKE uninstall
-
-test -f inst/lib/liba.a && Exit 1
-test -f inst/lib/subdir/libb.a && Exit 1
-
-$MAKE install-strip
-
-test -f inst/lib/liba.a
-test -f inst/lib/subdir/libb.a
-
-:
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
deleted file mode 100755
index 6976683..0000000
--- a/tests/pr300-ltlib.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2012 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that installing subdirectory libtool libraries works.
-# PR/300
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = subdir/liba.la
-subdir_liba_la_SOURCES = a.c
-
-nobase_lib_LTLIBRARIES = subdir/libb.la
-subdir_libb_la_SOURCES = a.c
-END
-
-cat > a.c << 'END'
-int i = 3;
-END
-
-## A rule in the Makefile should create subdir
-# mkdir subdir
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability --copy --add-missing
-
-# We pass '--libdir' explicitly, to avoid spurious failures due to users
-# or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
-# file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
-# as is the case with openSUSE 12.1).  See automake bug#10426.
-cwd=`pwd` || Exit 99
-./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
-
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep 'liba.la .*-rpath .*lib' stdout
-grep 'liba.la .*-rpath .*lib/subdir' stdout && Exit 1
-grep 'libb.la .*-rpath .*lib/subdir' stdout
-
-test -f subdir/liba.la
-test -f subdir/libb.la
-
-$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'remember.*--finish' stderr && Exit 1
-
-test -f inst/lib/liba.la
-test -f inst/lib/subdir/libb.la
-
-$MAKE uninstall
-
-test -f inst/lib/liba.la && Exit 1
-test -f inst/lib/subdir/libb.la && Exit 1
-
-$MAKE install-strip
-
-test -f inst/lib/liba.la
-test -f inst/lib/subdir/libb.la
-
-:
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
deleted file mode 100755
index 917a8a2..0000000
--- a/tests/pr300-prog.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that installing subdirectory programs works.
-# PR/300
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = subdir/wish
-subdir_wish_SOURCES = a.c
-
-nobase_bin_PROGRAMS = subdir/want
-subdir_want_SOURCES = a.c
-
-test-all: all
-       test -f subdir/wish$(EXEEXT)
-       test -f subdir/want$(EXEEXT)
-test-install: install
-       test -f inst/bin/wish$(EXEEXT)
-       test -f inst/bin/subdir/want$(EXEEXT)
-test-uninstall: uninstall
-       test ! -f inst/bin/wish$(EXEEXT)
-       test ! -f inst/bin/subdir/want$(EXEEXT)
-test-install-strip: install-strip
-       test -f inst/bin/wish$(EXEEXT)
-       test -f inst/bin/subdir/want$(EXEEXT)
-END
-
-cat > a.c << 'END'
-#include <stdio.h>
-int main ()
-{
-   printf ("hi liver!\n");
-   return 0;
-}
-END
-
-## A rule in the Makefile should create subdir
-# mkdir subdir
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-
-./configure --prefix "`pwd`/inst"
-
-$MAKE test-all
-$MAKE test-install
-$MAKE test-uninstall
-$MAKE test-install-strip
-
-:
diff --git a/tests/pr307.test b/tests/pr307.test
deleted file mode 100755
index 3496817..0000000
--- a/tests/pr307.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 307: depcomp with depmode=dashmstdout libtool race condition
-# Report from Laurent Morichetti.
-# (Also exercises check_LTLIBRARIES.)
-#
-# == Report ==
-#  The dashmstdout depmode calls libtool in parallel to generate the
-#  dependencies (with -M flag) and to build the objfile (both have
-#  --mode=compile and -o).
-#  The process with 'libtool --mode=compile .* -M' can corrupt the objfile
-#  as none is generated by the compiler.  Since --mode=compile and -o are
-#  set libtool assumes that a objfile should be generated and will execute
-#  invalid $mv & $LN_S.
-#
-# == Fix ==
-#  Now 'depcomp' never compute dependencies in the background, as this can
-#  cause races with libtool.  Compute the dependencies after the actual
-#  compilation.
-
-required='libtoolize gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-check_LTLIBRARIES = librace.la
-librace_la_SOURCES = a.c b.c c.c d.c e.c f.c g.c h.c
-
-# Make sure the dependencies are updated.
-check-local:
-       for i in $(librace_la_SOURCES:.c=.Plo); do \
-         echo "checking ./$(DEPDIR)/$$i"; \
-         grep 'foo\.h' ./$(DEPDIR)/$$i >tst || exit 1; \
-         test `wc -l <tst` -eq 2 || exit 1; \
-       done
-END
-
-: >foo.h
-
-for i in a b c d e f g h; do
-  cat >$i.c <<EOF
-#include "foo.h"
-int $i() { return 0; }
-EOF
-done
-
-libtoolize --force
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability -a
-
-# Sanity check: make sure the variable we are attempting to force
-# is used by configure
-grep am_cv_CC_dependencies_compiler_type configure
-
-./configure am_cv_CC_dependencies_compiler_type=dashmstdout
-
-$MAKE
-test -f librace.la && Exit 1
-$MAKE check
-
-# The failure we check usually occurs during the above build,
-# with an output such as
-#
-# mv -f .libs/f.lo f.lo
-# mv: cannot stat `.libs/f.lo': No such file or directory
-#
-# (This may happen on `f' or on some other files.)
-
-test -f librace.la
-test -f tst # a proof that check-local was run
-
-:
diff --git a/tests/pr401.test b/tests/pr401.test
deleted file mode 100755
index 6009315..0000000
--- a/tests/pr401.test
+++ /dev/null
@@ -1,183 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
-# (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
-
-parallel_tests=no
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-mkdir lib src
-
-cat >lib/feep.c <<'EOF'
-char *
-feep ()
-{
-  return "feep";
-}
-EOF
-
-cat >src/main.c <<'EOF'
-#include <stdio.h>
-
-extern char *feep ();
-
-int
-main (int argc, char **argv)
-{
-  puts (feep ());
-  return 0;
-}
-EOF
-
-cat >>configure.in << 'EOF'
-## These lines are activated for later tests
-#: AC_CONFIG_LIBOBJ_DIR([lib])
-AC_PROG_CC
-#x AM_PROG_CC_C_O
-AC_LIBOBJ([feep])
-AC_LIBSOURCE([feep.c])
-AC_PROG_RANLIB
-AC_CONFIG_FILES([lib/Makefile src/Makefile])
-AC_OUTPUT
-EOF
-
-## ------------------------------------------ ##
-## First a test of traditional LIBOBJS usage. ##
-## ------------------------------------------ ##
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib src
-EOF
-
-cat >lib/Makefile.am <<'EOF'
-noinst_LIBRARIES = libfeep.a
-libfeep_a_SOURCES =
-libfeep_a_LIBADD = $(LIBOBJS)
-EOF
-
-cat >src/Makefile.am <<'EOF'
-check_PROGRAMS = main
-main_LDADD = ../lib/libfeep.a
-
-TESTS = main
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-$MAKE distcheck
-
-## ------------------------------------------ ##
-## Traditional LIBOBJS with LIBOBJDIR set.    ##
-## ------------------------------------------ ##
-
-# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
-# unrelated to Automake or Makefile.am layout.
-
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-test ! -d lib/lib
-$MAKE distcheck
-
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails -Wno-extra-portability
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
-
-## -------------------------------------------- ##
-## Test using LIBOBJS from a sibling directory. ##
-## -------------------------------------------- ##
-
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = src
-EOF
-
-cat > src/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LIBRARIES = libfeep.a
-libfeep_a_SOURCES =
-libfeep_a_LIBADD = $(LIBOBJS)
-
-check_PROGRAMS = main
-main_LDADD = libfeep.a
-
-TESTS = main
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability --add-missing
-./configure
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
-$MAKE
-$MAKE check
-$MAKE distclean
-
-
-## ----------------------------------------- ##
-## Test using LIBOBJS from parent directory. ##
-## ----------------------------------------- ##
-
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LIBRARIES = lib/libfeep.a
-lib_libfeep_a_SOURCES =
-lib_libfeep_a_LIBADD = $(LIBOBJS)
-
-check_PROGRAMS = src/main
-src_main_SOURCES = src/main.c
-src_main_LDADD = lib/libfeep.a
-
-TESTS = src/main
-
-check-local:
-       test -f src/main.$(OBJEXT)
-       test -f lib/feep.$(OBJEXT)
-       test ! -f src/$(DEPDIR)/feep.Po
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-$MAKE distcheck
-
-:
diff --git a/tests/pr401b.test b/tests/pr401b.test
deleted file mode 100755
index 4bd2f36..0000000
--- a/tests/pr401b.test
+++ /dev/null
@@ -1,184 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
-# (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
-
-parallel_tests=no
-required='gcc libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-mkdir lib src
-
-cat >lib/feep.c <<'EOF'
-char *
-feep ()
-{
-  return "feep";
-}
-EOF
-
-cat >src/main.c <<'EOF'
-#include <stdio.h>
-
-extern char *feep ();
-
-int
-main (int argc, char **argv)
-{
-  puts (feep ());
-  return 0;
-}
-EOF
-
-cat >>configure.in << 'EOF'
-## These lines are activated for later tests
-#: AC_CONFIG_LIBOBJ_DIR([lib])
-AC_PROG_CC
-#x AM_PROG_CC_C_O
-AC_LIBOBJ([feep])
-AC_LIBSOURCE([feep.c])
-AC_PROG_LIBTOOL
-AC_CONFIG_FILES([lib/Makefile src/Makefile])
-AC_OUTPUT
-EOF
-
-## -------------------------------------------- ##
-## First a test of traditional LTLIBOBJS usage. ##
-## -------------------------------------------- ##
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib src
-EOF
-
-cat >lib/Makefile.am <<'EOF'
-noinst_LTLIBRARIES = libfeep.la
-libfeep_la_SOURCES =
-libfeep_la_LIBADD = $(LTLIBOBJS)
-EOF
-
-cat >src/Makefile.am <<'EOF'
-check_PROGRAMS = main
-main_LDADD = ../lib/libfeep.la
-
-TESTS = main
-EOF
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability -a
-./configure
-$MAKE distcheck
-
-
-## ------------------------------------------ ##
-## Traditional LIBOBJS with LIBOBJDIR set.    ##
-## ------------------------------------------ ##
-
-# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
-# unrelated to Automake or Makefile.am layout.
-
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability -a
-./configure
-test ! -d lib/lib
-$MAKE distcheck
-
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails -Wno-extra-portability
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
-## ---------------------------------------------- ##
-## Test using LTLIBOBJS from a sibling directory. ##
-## ---------------------------------------------- ##
-
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = src
-EOF
-
-cat > src/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LTLIBRARIES = libfeep.la
-libfeep_la_SOURCES =
-libfeep_la_LIBADD = $(LTLIBOBJS)
-
-check_PROGRAMS = main
-main_LDADD = libfeep.la
-
-TESTS = main
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability --add-missing
-./configure
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
-$MAKE
-$MAKE check
-$MAKE distclean
-
-
-## ------------------------------------------- ##
-## Test using LTLIBOBJS from parent directory. ##
-## ------------------------------------------- ##
-
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LTLIBRARIES = lib/libfeep.la
-lib_libfeep_la_SOURCES =
-lib_libfeep_la_LIBADD = $(LTLIBOBJS)
-
-check_PROGRAMS = src/main
-src_main_SOURCES = src/main.c
-src_main_LDADD = lib/libfeep.la
-
-TESTS = src/main
-
-check-local:
-       test -f src/main.$(OBJEXT)
-       test -f lib/feep.lo
-       test ! -f src/$(DEPDIR)/feep.Po
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-$MAKE distcheck
-
-:
diff --git a/tests/pr401c.test b/tests/pr401c.test
deleted file mode 100755
index 1d0511f..0000000
--- a/tests/pr401c.test
+++ /dev/null
@@ -1,186 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
-# (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
-
-parallel_tests=no
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-mkdir lib src
-
-ac_cv_func_alloca_works=no
-export  ac_cv_func_alloca_works
-
-cat >lib/alloca.c <<'EOF'
-char *
-feep ()
-{
-  return "feep";
-}
-EOF
-
-cat >src/main.c <<'EOF'
-#include <stdio.h>
-
-extern char *feep ();
-
-int
-main (int argc, char **argv)
-{
-  puts (feep ());
-  return 0;
-}
-EOF
-
-cat >>configure.in << 'EOF'
-## These lines are activated for later tests
-#: AC_CONFIG_LIBOBJ_DIR([lib])
-AC_PROG_CC
-#x AM_PROG_CC_C_O
-AC_PROG_RANLIB
-AC_FUNC_ALLOCA
-AC_CONFIG_FILES([lib/Makefile src/Makefile])
-AC_OUTPUT
-EOF
-
-## ----------------------------------------- ##
-## First a test of traditional ALLOCA usage. ##
-## ----------------------------------------- ##
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib src
-EOF
-
-cat >lib/Makefile.am <<'EOF'
-noinst_LIBRARIES = libfeep.a
-libfeep_a_SOURCES =
-libfeep_a_LIBADD = $(ALLOCA)
-EOF
-
-cat >src/Makefile.am <<'EOF'
-check_PROGRAMS = main
-main_LDADD = ../lib/libfeep.a
-
-TESTS = main
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-$MAKE distcheck
-
-
-## ------------------------------------------ ##
-## Traditional LIBOBJS with LIBOBJDIR set.    ##
-## ------------------------------------------ ##
-
-# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
-# unrelated to Automake or Makefile.am layout.
-
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-test ! -d lib/lib
-$MAKE distcheck
-
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
-AUTOMAKE_fails -Wno-extra-portability
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
-
-## ------------------------------------------- ##
-## Test using ALLOCA from a sibling directory. ##
-## ------------------------------------------- ##
-
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = src
-EOF
-
-cat > src/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LIBRARIES = libfeep.a
-libfeep_a_SOURCES =
-libfeep_a_LIBADD = $(ALLOCA) $(LIBOBJS) # Add LIBOBJS for fun
-
-check_PROGRAMS = main
-main_LDADD = libfeep.a
-
-TESTS = main
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability --add-missing
-./configure
-$MAKE
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
-$MAKE check
-$MAKE distclean
-
-
-## ---------------------------------------- ##
-## Test using ALLOCA from parent directory. ##
-## ---------------------------------------- ##
-
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
-
-cat >Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LIBRARIES = lib/libfeep.a
-lib_libfeep_a_SOURCES =
-lib_libfeep_a_LIBADD = $(ALLOCA)
-
-check_PROGRAMS = src/main
-src_main_SOURCES = src/main.c
-src_main_LDADD = lib/libfeep.a
-
-TESTS = src/main
-
-check-local:
-       test -f src/main.$(OBJEXT)
-       test -f lib/alloca.$(OBJEXT)
-       test ! -f src/$(DEPDIR)/alloca.Po
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-extra-portability
-./configure
-$MAKE distcheck
-
-:
diff --git a/tests/pr72.test b/tests/pr72.test
deleted file mode 100755
index 5af32ec..0000000
--- a/tests/pr72.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 72
-# Empty _SOURCES results in $(LINK) undefined.
-
-required=libtool
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-END
-
-cat > Makefile.am << 'END'
-lib_LTLIBRARIES = libviewer.la
-libviewer_la_SOURCES =
-libviewer_la_LIBADD = libphony.la
-END
-
-: > ltconfig
-: > ltmain.sh
-: > config.guess
-: > config.sub
-
-$ACLOCAL
-$AUTOMAKE -Wno-extra-portability
-
-grep '^LINK =' Makefile.in
-
-:
diff --git a/tests/pr8365-remake-timing.test b/tests/pr8365-remake-timing.test
deleted file mode 100755
index 079b0c0..0000000
--- a/tests/pr8365-remake-timing.test
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for automake bug#8365, related to Makefile remake rules.
-# The bug is due to subtle timestamp issues and limitations in
-# make's behaviour, and is very unlikely to be triggered (we have
-# to resort to timestamp edit hacks to consistently expose it); in
-# any account, it is nigh to impossible to trigger it by running
-# make by hand.  Thus, fixing it would not be worth the hassle, but
-# we prefer to keep it exposed anyway.
-
-. ./defs || Exit 1
-
-set -e
-
-# We'll use calls to stat to get debugging information.
-if stat /dev/null; then stat=stat; else stat=:; fi
-
-cat >> configure.in << 'END'
-FOOBAR=zardoz
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-# Run automake *before* autoconf, because we want to ensure that
-# Makefile.in is not newer than configure.
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE Makefile
-$EGREP 'FOOBAR|zardoz' Makefile && Exit 99 # Sanity check.
-
-echo 'AC_SUBST([FOOBAR])' >> configure.in
-
-# Modified configure dependencies must have the same timestamp of
-# config.status and Makefile in order to trigger the bug.
-# We also re-touch config.status, because "touch -r" can truncate
-# timestamps on file systems with sub-second resolutions (see the
-# autoconf manual).  Finally, we also sleep before touching, to ensure
-# that the (possibly truncated) timestamps of config.status etc. are
-# strictly newer than the non-truncated configure timestamp.
-$stat config.status Makefile configure.in
-$sleep
-touch config.status
-touch -r config.status config.status Makefile configure.in
-$stat config.status Makefile configure.in
-
-# Also, the race condition is triggered only when aclocal, automake
-# and aclocal run fast enough to keep the timestamp of the generated
-# aclocal.m4, Makefile.in and configure equal to the timestamp of
-# Makefile & config.status.  To reproduce this race consistently, we
-# need the following hackish wrappers.
-
-save_AUTOCONF=$AUTOCONF
-
-cat > aclocal-wrap <<END
-#!/bin/sh
-set -ex
-# aclocal shouldn't use our autoconf wrapper when extracting
-# the races from configure.in.
-AUTOCONF='$save_AUTOCONF'; export AUTOCONF
-$ACLOCAL "\$@"
-touch -r config.status aclocal.m4
-$stat aclocal.m4
-END
-
-cat > automake-wrap <<END
-#!/bin/sh
-set -ex
-# automake shouldn't use our autoconf wrapper when extracting
-# the races from configure.in.
-AUTOCONF='$save_AUTOCONF'; export AUTOCONF
-$AUTOMAKE "\$@"
-touch -r config.status Makefile.in
-$stat Makefile.in
-END
-
-cat > autoconf-wrap <<END
-#!/bin/sh
-set -ex
-$AUTOCONF "\$@"
-touch -r config.status configure
-$stat configure
-END
-
-chmod a+x aclocal-wrap automake-wrap autoconf-wrap
-
-env \
-  ACLOCAL=./aclocal-wrap AUTOMAKE=./automake-wrap AUTOCONF=./autoconf-wrap \
-  $MAKE -e Makefile
-grep '^FOOBAR =' Makefile.in
-grep '^FOOBAR *= *zardoz *$' Makefile
-
-:
diff --git a/tests/pr87.test b/tests/pr87.test
deleted file mode 100755
index 31e6482..0000000
--- a/tests/pr87.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR automake/87.
-# "make distcheck" fails when two source dirs exist.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-subdirs="foo bar"
-
-for i in $subdirs; do
-    mkdir $i
-    cat >$i/$i.c <<EOF
-int main() { return 0; }
-EOF
-    cat >$i/Makefile.am <<EOF
-bin_PROGRAMS = $i
-${i}_SOURCES = $i.c
-EOF
-done
-
-echo "SUBDIRS = $subdirs" > Makefile.am
-cat >configure.in <<EOF
-AC_INIT(`echo $subdirs | sed 's|\([a-z][a-z]*\).*|\1/\1.c|'`)
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE($me, 1.0)
-AC_PROG_CC
-AC_OUTPUT(Makefile `echo $subdirs | sed 's|\([a-z][a-z]*\)|\1/Makefile|g'`)
-EOF
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-mkdir build
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Regression test for bug where `.c.o:' is followed by blank line.
-(while read line; do
-    if test "$line" = ".c.o:"; then
-       read next
-       if test -z "$next"; then
-         Exit 1
-       else
-          : # for shells with broken 'set -e'
-       fi
-       break
-    fi
- done) < foo/Makefile.in || Exit 1
-
-cd build
-../configure
-$MAKE distcheck
-
-:
diff --git a/tests/pr9.test b/tests/pr9.test
deleted file mode 100755
index 1f27f69..0000000
--- a/tests/pr9.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in PR 9.
-# "make dist" incorrect when AC_CONFIG_AUX_DIR is present.
-#
-# == Report ==
-# When AC_CONFIG_AUX_DIR is set (in my case to `support'), make dist
-# no longer automatically includes config.guess, config.sub, install-sh,
-# ltconfig, ltmain.sh, mdate-sh, missing, and mkinstalldirs.  In fact,
-# the entire `support/' directory is omitted.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([support])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-mkdir support
-
-$ACLOCAL
-
-$AUTOCONF
-$AUTOMAKE -a -c
-./configure
-$MAKE
-$MAKE distcheck
-
-gzip -d $distdir.tar.gz
-
-tar tf $distdir.tar | $FGREP support
-
-tar xf $distdir.tar
-ls -l . $distdir # for debugging
-test -d $distdir/support
-ls -l $distdir/support # for debugging
-test -f $distdir/support/install-sh
-
-:
diff --git a/tests/prefix.test b/tests/prefix.test
deleted file mode 100755
index 8ba92ef..0000000
--- a/tests/prefix.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure range of prefixes can be extended
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'EOF'
-bnidir = $(prefix)/bni
-bni_PROGRAMS = zardoz
-EOF
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/primary-prefix-couples-documented-valid.test 
b/tests/primary-prefix-couples-documented-valid.test
deleted file mode 100755
index c09e6ca..0000000
--- a/tests/primary-prefix-couples-documented-valid.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the "uncommon" prefix/primary combinations used in
-# examples in the Automake manual do not cause obvious errors.
-# Please keep this test in sync with the automake manual.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AM_PROG_GCJ
-AM_PATH_PYTHON
-END
-
-# Fake libtool availability.
-: > ltmain.sh
-cat > acinclude.m4 <<'END'
-AC_DEFUN([AC_PROG_LIBTOOL],
-         [AC_SUBST([LIBTOOL], [:])])
-END
-
-cat > Makefile.am <<'END'
-xmldir = $(datadir)/xml
-xml_DATA = file.xml
-
-data_DATA = file1 file2 file3
-data2dir = $(datadir)
-data2_DATA = file4 file5 file6
-
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = mymacro.m4 myothermacro.m4
-
-imagesdir = $(pkgdatadir)/images
-soundsdir = $(pkgdatadir)/sounds
-dist_images_DATA = images/vortex.pgm
-dist_sounds_DATA = sounds/whirl.ogg
-
-lisp_DATA = file1.el file2.el
-
-javadir = $(datadir)/java
-dist_java_JAVA = a.java b.java c.java
-
-pkgpython_PYTHON = foo.py
-
-pyexec_LTLIBRARIES = quaternion.la
-quaternion_la_SOURCES = quaternion.c support.c support.h
-quaternion_la_LDFLAGS = -avoid-version -module
-
-myexecbindir = /exec
-myexecbin_PROGRAMS = zardoz
-
-foodir = $(prefix)/foo
-barexecdir = $(prefix)/bar/binaries
-foo_SCRIPTS = foo.sh
-barexec_SCRIPTS = quux.pl
-
-my_execbindir = $(pkglibdir)
-my_doclibdir = $(docdir)
-my_execbin_PROGRAMS = foo
-my_doclib_LIBRARIES = libquux.a
-END
-
-$ACLOCAL
-
-# Both these two invocations are meant.
-# They exercise both code paths concerning auxiliary files.
-$AUTOMAKE -a
-$AUTOMAKE
-
-:
diff --git a/tests/primary-prefix-couples-force-valid.test 
b/tests/primary-prefix-couples-force-valid.test
deleted file mode 100755
index d60ecbf..0000000
--- a/tests/primary-prefix-couples-force-valid.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that a user who wants to use an invalid prefix/primary
-# combination can do so with a proper workaround.
-# For example, this:
-#   lib_PROGRAMS = foo
-# is expected to cause an automake error, but this:
-#   bardir = $(libdir)
-#   bar_PROGRAMS = foo
-# should work.
-
-required=cc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-my_libdir = $(libdir)
-my_lib_PROGRAMS = foo
-
-foodir = $(bindir)
-foo_LIBRARIES = libquux.a
-
-xdir = $(libexecdir)
-x_HEADERS = bar.h
-
-installcheck-local: test
-.PHONY: test
-test:
-       (cd '$(prefix)' && find .);: For debugging.
-       ls -l '$(libdir)/foo'
-       test -f '$(libdir)/foo'
-       test -x '$(libdir)/foo'
-       ls -l '$(bindir)/libquux.a'
-       test -f '$(bindir)/libquux.a'
-       ls -l '$(libexecdir)/bar.h'
-       test -f '$(libexecdir)/bar.h'
-       test ! -x '$(libexecdir)/bar.h'
-END
-
-cat > foo.c <<'END'
-int main (void)
-{
-  return 0;
-}
-END
-
-cat > libquux.c <<'END'
-int quux(void)
-{
-  return 1;
-}
-END
-
-: > bar.h
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-cwd=`pwd` || fatal_ "cannot get current working directory"
-./configure --prefix="$cwd/_inst"
-
-$MAKE install
-$MAKE installcheck
-$MAKE distcheck
-
-:
diff --git a/tests/primary-prefix-invalid-couples.test 
b/tests/primary-prefix-invalid-couples.test
deleted file mode 100755
index 60d509b..0000000
--- a/tests/primary-prefix-invalid-couples.test
+++ /dev/null
@@ -1,189 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Not all primaries/directories combinations are valid.
-# Automake should flag them as errors.
-# Originated from PR/294, extended later (following bug #7647) to
-# cover more cases.
-# See also test `primary-prefix-valid-couples.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-oIFS=$IFS # Saved for later.
-
-: > ar-lib
-: > ltmain.sh
-: > texinfo.tex
-: > elisp-comp
-: > py-compile
-: > config.guess
-: > config.sub
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_SUBST([LIBTOOL], [:]) dnl So that we don't have to require Libtool.
-AM_PROG_GCJ
-AM_PATH_PYTHON
-AM_PATH_LISPDIR
-END
-
-$ACLOCAL
-
-# Please keep this list in sync with the list of "Directory Variables"
-# in the GNU Coding Standards and with the list additional directory
-# variables provided by autoconf and/or automake (pkgdatadir, pkglibdir,
-# ...).   See also the hash `%standard_prefix' in the automake script.
-prefixes='bin data dataroot doc dvi exec html include info lib libexec
-          lisp locale localstate man man1 man2 man3 man4 man5 man6 man7
-          man8 man9 oldinclude pdf pkgdata pkginclude pkglib pkglibexec
-          ps sbin sharedstate sysconf'
-# Please keep this list in sync with the list of primaries documented in
-# the Automake manual (see the "The Uniform Naming Scheme" section).
-primaries='PROGRAMS LIBRARIES LTLIBRARIES LISP PYTHON JAVA SCRIPTS DATA
-           HEADERS MANS TEXINFOS'
-
-# Use files, not variables, to hold the list of all the possible
-# prefix_PRIMARY couples and the list of those couples valid for
-# automake, to avoid having unreadable very verbose traces.
-
-set +x # Don't be overly verbose.
-
-for prefix in $prefixes; do
-  for primary in $primaries; do
-    echo ${prefix} ${primary}
-  done
-done >all.list
-
-for primary in $primaries; do
-  prefixes_ok=''
-  case $primary in
-    LIBRARIES|LTLIBRARIES)
-      prefixes_ok='lib pkglib'
-      ;;
-    PROGRAMS)
-      prefixes_ok='bin sbin libexec pkglibexec'
-      ;;
-    SCRIPTS)
-      prefixes_ok='bin sbin libexec pkglibexec pkgdata'
-      ;;
-    DATA)
-      prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
-                   sysconf sharedstate localstate lisp'
-      ;;
-    HEADERS)
-      prefixes_ok='include oldinclude pkginclude'
-      ;;
-    LISP)
-      prefixes_ok='lisp'
-      ;;
-    PYTHON)
-      prefixes_ok='python'
-      ;;
-    JAVA)
-      prefixes_ok='java'
-      ;;
-    MANS)
-      # FIXME: Here we'd like to have:
-      #   prefixes_ok='man man1 man2 man3 man4 man5 man6 man7 man8 man9'
-      # but Automake currently fails on that, as it allows the MANS
-      # primary to be coupled to any prefix.
-      # See also Automake bug#7656.
-      # We should dig out how automake had come to behave this way, and
-      # if such a behaviour can be safely changed.
-      prefixes_ok=$prefixes
-      ;;
-    TEXINFOS)
-      # FIXME: Here we'd like to have:
-      #   prefixes_ok='info'
-      # but Automake currently fails on that, as it allows the use of
-      # `foo_TEXINFOS' to declare extra Texinfo sources for the `foo'
-      # Texinfo manual, as in e.g.:
-      #   info_TEXINFOS = foo.texi
-      #   foo_TEXINFOS = gpl.texi
-      # See also Automake bug#7657.
-      prefixes_ok=$prefixes
-      ;;
-    *)
-      fatal_ "unrecognized primary '$primary'"
-      ;;
-  esac
-  for prefix in $prefixes_ok; do
-    echo ${prefix}_${primary}
-  done
-done >allow.list
-
-# `html_TEXINFOS' is not yet supported, and might never be.
-grep -v '^html TEXINFOS$' all.list | awk '{print NR, $0}' > t
-mv -f t all.list
-
-# For debugging.
-echo '=== all.list ==='
-cat all.list
-echo '=== allow.list ==='
-cat allow.list
-
-# Create the Makefile.am.
-while read lineno prefix primary; do
-  test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
-    || fatal_ "internal error in 'all.list'"
-  pfx='' ext=''
-  case $primary in
-    LTLIBRARIES) pfx=lib ext=la;;
-    LIBRARIES) pfx=lib ext=a;;
-    MANS) ext=man;;
-    HEADERS) ext=h;;
-    JAVA) ext=java;;
-    PYTHON) ext=py;;
-    LISP) ext=el;;
-    TEXINFOS) ext=texi;;
-  esac
-  test -z "$ext" || ext=.$ext
-  if test $primary = TEXINFOS; then
-    echo @setfilename foo$lineno.info > foo$lineno.texi
-  fi
-  echo ${prefix}_${primary} = ${pfx}foo${lineno}${ext}
-done <all.list >Makefile.am
-
-# For debugging.
-echo '=== Makefile.am ==='
-cat Makefile.am
-
-set -x # Restore shell xtraces from now on.
-
-AUTOMAKE_fails -a
-
-while read lineno prefix primary; do
-  test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
-    || fatal_ "internal error in 'all.list'"
-  grep "^${prefix}_${primary}$" allow.list >/dev/null && continue
-  errmsg_rx=".*${prefix}dir.* not a legitimate directory .*$primary"
-  grep "^Makefile\\.am:$lineno: $errmsg_rx" stderr || Exit 1
-done <all.list
-
-# Check that automake really failed only for the expected reason(s).
-grep -v 'dir.* not a legitimate directory' stderr && Exit 1
-
-# Check that the same failures are present without the `--add-missing'
-# option.
-mv stderr stderr.old
-AUTOMAKE_fails
-diff stderr.old stderr
-
-:
diff --git a/tests/primary-prefix-valid-couples.test 
b/tests/primary-prefix-valid-couples.test
deleted file mode 100755
index 47aac5e..0000000
--- a/tests/primary-prefix-valid-couples.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for valid prefix/primary combinations.
-# See also test `primary-prefix-invalid-couples.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AM_PATH_PYTHON
-AM_PATH_LISPDIR
-END
-
-# Fake libtool availability.
-: > ltmain.sh
-: > config.sub
-: > config.guess
-cat > acinclude.m4 <<'END'
-AC_DEFUN([AC_PROG_LIBTOOL],
-         [AC_SUBST([LIBTOOL], [:])])
-END
-
-# Other required files.
-echo '@setfilename foo' > foo.texi
-: > texinfo.tex
-: > py-compile
-: > elisp-comp
-: > ar-lib
-
-# Setup Makefile.am.
-
-: > Makefile.am
-
-for p in bin sbin libexec pkglibexec; do
-  echo "${p}_PROGRAMS = prog-$p" >> Makefile.am
-done
-
-for p in lib pkglib; do
-  echo "${p}_LIBRARIES = libs-$p.a" >> Makefile.am
-  echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
-done
-
-for p in bin sbin libexec pkglibexec pkgdata; do
-  echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
-done
-
-for p in data dataroot pkgdata doc html dvi pdf ps sysconf \
-         sharedstate localstate lisp; do
-  echo "${p}_DATA = $p.dat" >> Makefile.am
-done
-
-for p in include oldinclude pkginclude; do
-  echo "${p}_HEADERS = $p.h" >> Makefile.am
-done
-
-for p in man man1 man2 man3 man4 man5 man6 man7 man8 man9; do
-  echo "${p}_MANS = bar.$p"
-done
-
-echo "info_TEXINFOS = foo.texi" >> Makefile.am
-echo "lisp_LISP = foo.el" >> Makefile.am
-echo "python_PYTHON = foo.py" >> Makefile.am
-
-awk '{print NR ":" $0}' Makefile.am # For debugging.
-
-# Go with the tests.
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/primary.test b/tests/primary.test
deleted file mode 100755
index a866f8f..0000000
--- a/tests/primary.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure errors in am_install_var work.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = @programs@
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'bin_PROGRAMS.*configure substitution' stderr
-grep 'EXTRA_PROGRAMS.*not defined' stderr
-
-:
diff --git a/tests/primary2.test b/tests/primary2.test
deleted file mode 100755
index 2fb3a60..0000000
--- a/tests/primary2.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure errors in am_install_var work.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = @programs@
-EXTRA_PROGRAMS = joe @more@
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'EXTRA_PROGRAMS.*configure substitution' stderr
-
-:
diff --git a/tests/primary3.test b/tests/primary3.test
deleted file mode 100755
index afccd0c..0000000
--- a/tests/primary3.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we can build programs ending in `.la'
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo.la
-foo_la_SOURCES = foo.c
-END
-
-echo 'int main () { return 0; }' > foo.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE
-
-:
diff --git a/tests/proginst.test b/tests/proginst.test
deleted file mode 100755
index 31745b7..0000000
--- a/tests/proginst.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug where when multiple scripts are installed,
-# the check for AC_PROG_INSTALL fails.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_SCRIPTS = zardoz qbert brownie
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/py-compile-basedir.test b/tests/py-compile-basedir.test
deleted file mode 100755
index a277639..0000000
--- a/tests/py-compile-basedir.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test the `--basedir' option of the `py-compile' script,
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-# We'll need to create files in `..', so we need one more subdirectory
-# level in order not to clutter up the top-level tests directory.
-mkdir sandbox
-cd sandbox
-
-cp "$testsrcdir/../lib/py-compile" .
-
-f=__init__
-for d in foo foo/bar "`pwd`/foo" . .. ../foo ''; do
-  if test -z "$d"; then
-    d2=.
-  else
-    d2=$d
-  fi
-  ../install-sh -d "$d2" "$d2/sub" || Exit 99
-  : > "$d2/$f.py"
-  : > "$d2/sub/$f.py"
-  ./py-compile --basedir "$d" "$f.py" "sub/$f.py"
-  ls -l "$d2" "$d2/sub" # For debugging.
-  test -f "$d2/$f.pyc"
-  test -f "$d2/$f.pyo"
-  test -f "$d2/sub/$f.pyc"
-  test -f "$d2/sub/$f.pyo"
-  rm -f "$d2/$f.pyc" "$d2/$f.pyo" "$d2/sub/$f.pyc" "$d2/sub/$f.pyo"
-  find . | grep '\.py[co]$' && Exit 1
-done
-
-:
diff --git a/tests/py-compile-basic.test b/tests/py-compile-basic.test
deleted file mode 100755
index a7a3f89..0000000
--- a/tests/py-compile-basic.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test more basic functionalities of the `py-compile' script,
-# with "believable" python sources.  See also related test
-# `py-compile-basic2.test'.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/py-compile" .
-
-cat > foo.py <<'END'
-# Try out some non-trivial syntax in here.
-
-'''Module docstring'''
-
-def foo (*args, **kwargs):
-  """Function docstring
-  with embedded newline"""
-  return 1
-
-class Foo:
-  r"""Class docstring"""
-  def __init__(self):
-    r'''Method docstring
-        with
-        embedded
-        newlines'''
-    pass
-
-bar = baz = (1, (2,), [3, 4]); zardoz = 0;
-END
-
-cat > bar.py <<'END'
-# Import of non-existent modules, or assertion of false conditions,
-# shouldn't cause problems, as it should be enough for the code to
-# be syntactically correct.
-import Automake.No.Such.Module
-assert False
-END
-
-./py-compile foo.py bar.py
-test -f foo.pyc
-test -f foo.pyo
-test -f bar.pyc
-test -f bar.pyo
-
-:
diff --git a/tests/py-compile-basic2.test b/tests/py-compile-basic2.test
deleted file mode 100755
index 0da0d42..0000000
--- a/tests/py-compile-basic2.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test more basic functionalities of the `py-compile' script, with
-# dummy python sources, but more complex directory layouts.  See also
-# related test `py-compile-basic.test'.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-ocwd=`pwd` || Exit 99
-
-pyfiles="
-  foo.py
-  ./foo1.py
-  ../foo2.py
-  ../dir/foo3.py
-  $ocwd/foo4.py
-  sub/bar.py
-  sub/subsub/barbar.py
-  __init__.py
-  sub/__init__.py
-  1.py
-  .././_.py
-"
-
-lst='
-  dir/foo
-  dir/foo1
-  foo2
-  dir/foo3
-  foo4
-  dir/sub/bar
-  dir/sub/subsub/barbar
-  dir/__init__
-  dir/sub/__init__
-  dir/1
-  _
-'
-
-mkdir dir
-cd dir
-cp "$testsrcdir/../lib/py-compile" .
-mkdir sub sub/subsub
-touch $pyfiles
-./py-compile $pyfiles
-cd "$ocwd"
-
-for x in $lst; do echo $x.pyc; echo $x.pyo; done | sort > exp
-find . -name '*.py[co]' | sed 's|^\./||' | sort > got
-
-cat exp
-cat got
-diff exp got
-
-:
diff --git a/tests/py-compile-destdir.test b/tests/py-compile-destdir.test
deleted file mode 100755
index 3d122e6..0000000
--- a/tests/py-compile-destdir.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test the `--destdir' option of the `py-compile' script,
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/py-compile" .
-
-# Should not give false positives when grepping for it, so use
-# an "uncommon" string (with ugly CamelCase).
-destdir=TheDestDir
-
-mkdir sub $destdir $destdir/sub
-echo 'def foo (): return "foo"' > $destdir/foo.py
-echo 'def bar (): return "bar"' > $destdir/sub/bar.py
-
-./py-compile --destdir $destdir foo.py sub/bar.py
-ls -l $destdir $destdir/sub # For debugging.
-ls . sub | grep '\.py[co]$' && Exit 1
-test -f $destdir/foo.pyc
-test -f $destdir/foo.pyo
-test -f $destdir/sub/bar.pyc
-test -f $destdir/sub/bar.pyo
-strings $destdir/*.py[co] $destdir/sub/*.py[co] || : # For debugging.
-$FGREP $destdir $destdir/*.py[co] $destdir/sub/*.py[co] && Exit 1
-
-:
diff --git a/tests/py-compile-env.test b/tests/py-compile-env.test
deleted file mode 100755
index a72d173..0000000
--- a/tests/py-compile-env.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `py-compile' honours the PYTHON environment variable.
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/py-compile" .
-
-cat > my-py <<'END'
-#!/bin/sh
-: > my-py.run
-END
-chmod a+x my-py
-
-mkdir sub1
-cd sub1
-
-PYTHON=: ../py-compile foo.py
-ls | grep . && Exit 1
-
-PYTHON=false ../py-compile foo.py && Exit 1
-ls | grep . && Exit 1
-
-PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py
-PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py | grep 'GrEpMe AndMeToo'
-ls | grep . && Exit 1
-
-cd ..
-mkdir sub2
-cd sub2
-
-PYTHON=../my-py ../py-compile foo.py
-test -f my-py.run
-ls | grep -v '^my-py\.run$' | grep . && Exit 1
-
-cd ..
-mkdir sub3
-cd sub3
-PATH=..$PATH_SEPARATOR$PATH; export PATH
-PYTHON=my-py py-compile foo.py
-test -f my-py.run
-ls | grep -v '^my-py\.run$' | grep . && Exit 1
-
-:
diff --git a/tests/py-compile-option-terminate.test 
b/tests/py-compile-option-terminate.test
deleted file mode 100755
index 69f9bb5..0000000
--- a/tests/py-compile-option-terminate.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that a non-option argument and the `--' special argument
-# explicitly terminate the option list for `py-compile'.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/py-compile" .
-
-: > ./-o.py
-: > ./--foo.py
-./py-compile -- -o.py --foo.py
-test -f ./-o.pyc
-test -f ./-o.pyo
-test -f ./--foo.pyc
-test -f ./--foo.pyo
-rm -f ./-*.py[co]
-: > x.py
-./py-compile x.py -o.py --foo.py
-test -f ./x.pyc
-test -f ./x.pyo
-test -f ./-o.pyc
-test -f ./-o.pyo
-test -f ./--foo.pyc
-test -f ./--foo.pyo
-
-:
diff --git a/tests/py-compile-usage.test b/tests/py-compile-usage.test
deleted file mode 100755
index 7e8c786..0000000
--- a/tests/py-compile-usage.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test `py-compile --help', `py-compile --version', and that `py-compile'
-# correctly complains on wrong usage.
-
-. ./defs || Exit 1
-
-set -e
-
-cp "$testsrcdir/../lib/py-compile" .
-
-# --help
-
-./py-compile --help >stdout 2>stderr \
-  || { cat stdout; cat stderr >&2; Exit 1; }
-cat stdout
-test -s stderr && { cat stderr >&2; Exit 1; }
-grep '^Usage: py-compile .' stdout
-$FGREP ' [--basedir DIR]' stdout
-$FGREP ' [--destdir DIR]' stdout
-
-# --version
-
-./py-compile --version >stdout 2>stderr \
-  || { cat stdout; cat stderr >&2; Exit 1; }
-cat stdout
-test -s stderr && { cat stderr >&2; Exit 1; }
-year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
-month='(0[0-9]|1[012])'
-day='([012][0-9]|3[01])'
-hour='([01][0-9]|2[0123])'
-LC_ALL=C $EGREP "^py-compile $year-$month-$day\.$hour" stdout
-test `wc -l <stdout` -eq 1
-
-# Unknown option.
-for opt in -b -d --foo; do
-  ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
-  cat stderr >&2
-  grep "^py-compile: unrecognized option ['\`]$opt'" stderr
-  grep "^Try [\`']py-compile --help' for more information" stderr
-done
-
-# Missing option argument.
-
-for opt in --basedir --destdir; do
-  ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
-  cat stderr >&2
-  grep "^py-compile: option ['\`]$opt' requires an argument" stderr
-  grep "^Try [\`']py-compile --help' for more information" stderr
-done
-
-# Missing files.
-
-for args in '' '--basedir dir' '--destdir dir'; do
-  ./py-compile $args 2>stderr && { cat stderr >&2; Exit 1; }
-  cat stderr >&2
-  grep '^py-compile: no files given' stderr
-  grep "^Try [\`']py-compile --help' for more information" stderr
-done
-
-:
diff --git a/tests/python-pr10995.test b/tests/python-pr10995.test
deleted file mode 100755
index 1b94cf9..0000000
--- a/tests/python-pr10995.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test automake bug#10995: am__py_compile doesn't get correctly defined
-# when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
-# declaration.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_PATH_PYTHON
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'END'
-yesinstdir = $(prefix)/py
-noinst_PYTHON = no.py
-yesinst_PYTHON = yes.py
-disttest: distdir
-       test -f $(distdir)/no.py
-       test -f $(distdir)/yes.py
-END
-
-echo 'def foo(): return 1' > yes.py
-# no.py shouldn't be byte-compiled, so lets make it syntactically invalid.
-echo 'if' > no.py
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-test -f py-compile
-
-inst=`pwd`/inst
-
-./configure --prefix="$inst"
-$MAKE install
-test -f "$inst/py/yes.py"
-test -f "$inst/py/yes.pyc"
-test ! -f "$inst/py/no.py"
-test ! -f "$inst/py/no.pyc"
-
-$MAKE disttest
-
-:
diff --git a/tests/python.test b/tests/python.test
deleted file mode 100755
index fe9d593..0000000
--- a/tests/python.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure py_compile and am__py_compile are correctly defined.
-
-. ./defs || Exit 1
-
-set -e
-
-echo 'AM_PATH_PYTHON' >> configure.in
-
-cat > Makefile.am << 'END'
-python_PYTHON = foo.py
-END
-
-cat > Makefile2.am << 'END'
-python_PYTHON = a.py
-nodist_python_PYTHON = b.py
-nobase_python_PYTHON = x/c.py
-mydir = ${prefix}
-my_PYTHON = d.py
-END
-
-# For automake bug#10995.
-cat > Makefile3.am << 'END'
-noinst_PYTHON = un.py
-python_PYTHON = in.py
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test -f py-compile
-
-$AUTOMAKE Makefile2
-$AUTOMAKE Makefile3
-
-grep "py" Makefile.in Makefile2.in Makefile3.in # For debugging.
-
-for f in Makefile.in Makefile2.in Makefile3.in; do
-  test `grep -c '^py_compile =' $f` -eq 1
-  test `grep -c '^am__py_compile =' $f` -eq 1
-done
-
-:
diff --git a/tests/python10.test b/tests/python10.test
deleted file mode 100755
index ff0ee15..0000000
--- a/tests/python10.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test _PYTHON with conditionals.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_PATH_PYTHON
-AM_CONDITIONAL([ONE], [test "x$one" = x1])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'END'
-if ONE
-mydir=$(prefix)/my
-my_PYTHON = one.py
-else
-yourdir=$(prefix)/your
-your_PYTHON = two.py
-endif
-
-one.py:
-       echo 'def one(): return 1' >$@
-two.py:
-       echo 'def two(): return 1' >$@
-
-disttest: distdir
-       test -f $(distdir)/one.py
-       test -f $(distdir)/two.py
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-mkdir inst
-inst=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="$inst"
-$MAKE install
-test -f "$inst/your/two.py"
-test -f "$inst/your/two.pyc"
-test -f "$inst/your/two.pyo"
-test ! -f "$inst/my/one.py"
-test ! -f "$inst/my/one.pyc"
-test ! -f "$inst/my/one.pyo"
-$MAKE uninstall
-test ! -f "$inst/your/two.py"
-test ! -f "$inst/your/two.pyc"
-test ! -f "$inst/your/two.pyo"
-
-../configure --prefix="$inst" one=1
-$MAKE install
-test ! -f "$inst/your/two.py"
-test ! -f "$inst/your/two.pyc"
-test ! -f "$inst/your/two.pyo"
-test -f "$inst/my/one.py"
-test -f "$inst/my/one.pyc"
-test -f "$inst/my/one.pyo"
-$MAKE uninstall
-test ! -f "$inst/my/one.py"
-test ! -f "$inst/my/one.pyc"
-test ! -f "$inst/my/one.pyo"
-
-$MAKE disttest
diff --git a/tests/python11.test b/tests/python11.test
deleted file mode 100755
index 6a14368..0000000
--- a/tests/python11.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test missing python.
-
-# Python is not required for this test.
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
-AM_PATH_PYTHON
-# The following be executed only after the first run, once a
-# third argument has been added to the previous macro.
-echo PYTHON = $PYTHON
-test "$PYTHON" = : || exit 1
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-
-./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; }
-cat stdout
-cat stderr >&2
-grep 'checking for IShouldNotExist1' stdout
-grep 'checking for IShouldNotExist2' stdout
-grep 'no suitable Python interpreter found' stderr
-
-sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int
-mv -f configure.int configure.in
-$ACLOCAL --force
-$AUTOCONF --force
-# This one should define PYTHON as ":" and exit successfully.
-./configure
-
-# Any user setting should be used.
-./configure PYTHON=foo >stdout && { cat stdout; Exit 1; }
-cat stdout
-grep 'PYTHON = foo' stdout
diff --git a/tests/python12.test b/tests/python12.test
deleted file mode 100755
index 2f52dfc..0000000
--- a/tests/python12.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure DESTDIR is not included in byte-compiled files.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_PATH_PYTHON
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<'END'
-mydir = $(datadir)/my
-my_PYTHON = my.py
-
-my.py:
-       echo 'def my(): return 1' >$@
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-rm -rf inst build
-mkdir inst
-instdir=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="/usr"
-DESTDIR=$instdir $MAKE -e install
-
-# Perfunctory test that the files were created
-test -f "$instdir/usr/share/my/my.py"
-test -f "$instdir/usr/share/my/my.pyc"
-test -f "$instdir/usr/share/my/my.pyo"
-
-# If DESTDIR has made it into the byte compiled files, fail the test
-$FGREP "$instdir" "$instdir/usr/share/my/my.pyo" \
-                  "$instdir/usr/share/my/my.pyc" && Exit 1
-
-:
diff --git a/tests/python2.test b/tests/python2.test
deleted file mode 100755
index 3e14fa2..0000000
--- a/tests/python2.test
+++ /dev/null
@@ -1,106 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Automake suggests using AM_PATH_PYTHON.
-
-. ./defs || Exit 1
-
-set -e
-
-
-echo 1. pythondir not defined
-
-cat > Makefile.am <<'END'
-PYTHON = x
-python_PYTHON = foo.py
-END
-
-$ACLOCAL
-AUTOMAKE_fails -a
-grep AM_PATH_PYTHON stderr
-
-
-echo 2. pkgpythondir not defined
-
-cat > Makefile.am <<'END'
-PYTHON = x
-pkgpython_PYTHON = foo.py
-END
-
-$ACLOCAL
-AUTOMAKE_fails -a
-grep AM_PATH_PYTHON stderr
-
-
-echo 3. pyexecdir not defined
-
-cat > Makefile.am <<'END'
-PYTHON = x
-pyexec_PYTHON = foo.py
-END
-
-$ACLOCAL
-AUTOMAKE_fails -a
-grep AM_PATH_PYTHON stderr
-
-
-echo 4. pkgpyexecdir not defined
-
-cat > Makefile.am <<'END'
-PYTHON = x
-pkgpyexec_PYTHON = foo.py
-END
-
-$ACLOCAL
-AUTOMAKE_fails -a
-grep AM_PATH_PYTHON stderr
-
-
-echo 5. PYTHON not defined.
-
-cat > Makefile.am <<'END'
-pkgpyexecdir = /here/we/go
-pkgpyexec_PYTHON = foo.py
-END
-
-$ACLOCAL
-AUTOMAKE_fails -a
-grep AM_PATH_PYTHON stderr
-
-
-echo 6. Ok.
-
-cat > Makefile.am <<'END'
-PYTHON = x
-pkgpyexecdir = /here/we/go
-pkgpyexec_PYTHON = foo.py
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-test -f py-compile
-
-
-echo 7. Ok again.
-
-cat > Makefile.am <<'END'
-PYTHON = x
-fubardir = /here/we/go
-fubar_PYTHON = foo.py
-END
-
-$ACLOCAL
-$AUTOMAKE -a
diff --git a/tests/python3.test b/tests/python3.test
deleted file mode 100755
index f01ad31..0000000
--- a/tests/python3.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we install built python files.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_PATH_PYTHON
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'END'
-mydir=$(prefix)/my
-my_PYTHON = one.py
-
-one.py:
-       echo 'def one(): return 1' >$@
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-mkdir inst
-inst=`pwd`/inst
-mkdir build
-cd build
-../configure --prefix="$inst"
-$MAKE install
-test -f "$inst/my/one.py"
-test -f "$inst/my/one.pyc"
-test -f "$inst/my/one.pyo"
diff --git a/tests/python4.test b/tests/python4.test
deleted file mode 100755
index 11bb3ed..0000000
--- a/tests/python4.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test detection of missing Python.
-
-# Python is not required for this test.
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_PATH_PYTHON
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Simulate no Python
-./configure PYTHON=: 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'no suitable Python interpreter found' stderr
diff --git a/tests/python5.test b/tests/python5.test
deleted file mode 100755
index 86f5863..0000000
--- a/tests/python5.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test detection of missing Python.
-# Same as python4.test, but requiring a version.
-
-# Python is not required for this test.
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-# Hopefully the Python team will never release such a version.
-AM_PATH_PYTHON(9999.9)
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'no suitable Python interpreter found' stderr
diff --git a/tests/python6.test b/tests/python6.test
deleted file mode 100755
index 86dcfbb..0000000
--- a/tests/python6.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test detection of missing Python.
-# Same as python4.test, but using a custom ACTION-IF-NOT-FOUND.
-
-# Python is not required for this test.
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<\EOF
-AM_PATH_PYTHON(,, [echo "GREP ME$PYTHON" >&2])
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-# Simulate no Python
-./configure PYTHON=: 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'GREP ME:' stderr
-
-:
diff --git a/tests/python7.test b/tests/python7.test
deleted file mode 100755
index 27b2e79..0000000
--- a/tests/python7.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test detection of missing Python.
-# Same as python6.test, but requiring a version.
-
-# Python is not required for this test.
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<\EOF
-# Hopefully the Python team will never release such a version.
-AM_PATH_PYTHON(9999.9,, [echo "GREP ME$PYTHON" >&2])
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'GREP ME:' stderr
-
-:
diff --git a/tests/python8.test b/tests/python8.test
deleted file mode 100755
index 51d02ad..0000000
--- a/tests/python8.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_PATH_PYTHON(, [echo 'GREP ME' >&2])
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'GREP ME' stderr
-
-:
diff --git a/tests/python9.test b/tests/python9.test
deleted file mode 100755
index 6a91e9f..0000000
--- a/tests/python9.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
-# Same as python8.test, but requiring a version.
-
-required=python
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AM_PATH_PYTHON(0.0, [echo 'GREP ME' >&2])
-AC_OUTPUT
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'GREP ME' stderr
-
-:
diff --git a/tests/recurs.test b/tests/recurs.test
deleted file mode 100755
index 4937f4f..0000000
--- a/tests/recurs.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure recursive variable definitions die.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL(ONE, true)
-AM_CONDITIONAL(TWO, false)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = $(foo)
-foo = $(bin_PROGRAMS)
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile\.am:.*bin_PROGRAMS.*recursively defined' stderr
-
-:
diff --git a/tests/recurs2.test b/tests/recurs2.test
deleted file mode 100755
index c025984..0000000
--- a/tests/recurs2.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure recursive variable definitions die.
-# From Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-man_MANS = chgrp.1
-man_aux = $(man_MANS:.1=.x)
-EXTRA_DIST = $(man_aux) $(man_MANS)
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/regex-obsolete.test b/tests/regex-obsolete.test
deleted file mode 100755
index c283025..0000000
--- a/tests/regex-obsolete.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check tha the AM_WITH_REGEX macro is reported as obsolete.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr
-
-:
diff --git a/tests/regex.test b/tests/regex.test
deleted file mode 100755
index babd92a..0000000
--- a/tests/regex.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure AM_WITH_REGEX compiles and runs.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF
-./configure
-./configure --without-regex
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
deleted file mode 100755
index 888c9dd..0000000
--- a/tests/remake-am-pr10111.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that our remake rules doesn't give spurious successes in
-# some corner case situations where they should actually fail.
-# See automake bug#10111.
-# To be clear, we are speaking about *very* corner-case situations here,
-# and the fact that the remake rules might get confused in them is not a
-# big deal in practice (in fact, this test *currently fails*).  Still,
-# keeping the limitation exposed is a good idea anyway.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-: > foobar.am
-
-cat > Makefile.am <<'END'
-include $(srcdir)/foobar.am
-$(srcdir)/foobar.am:
-## Creative quoting is to avoid spurious matches in the grepping
-## of Makefile.in, later.
-       echo "mu =" foobar "was here =" > $@
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-# OK, so the developer wants to interactively try out how the
-# "distributed form" of his package behaves.
-$MAKE distdir
-cd $distdir
-# He's interested in trying out a VPATH build.
-mkdir build
-cd build
-../configure
-# He wants to verify that the rules he's written to rebuild a file
-# included by configure.in works also in VPATH builds.
-rm -f ../foobar.am
-$MAKE
-grep '= foobar was here =' ../Makefile.in
-$MAKE distcheck
-
-:
diff --git a/tests/remake-deleted-am-2.test b/tests/remake-deleted-am-2.test
deleted file mode 100755
index 07142f6..0000000
--- a/tests/remake-deleted-am-2.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that inclusion of `.am' fragments by automake does not suffer
-# of the "deleted header problem".  This test checks deeper inclusion
-# stacks, and use VPATH builds.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-$ACLOCAL
-$AUTOCONF
-
-cat > Makefile.am <<'END'
-include $(srcdir)/foo.am
-END
-
-cat > foo.am <<'END'
-# this is foo
-include sub/bar.am
-include baz.am
-END
-
-mkdir sub
-echo 'include $(top_srcdir)/sub/zardoz.am' > sub/bar.am
-echo '# this is zardoz' > sub/zardoz.am
-
-echo 'include fnord.am' > baz.am
-echo '# you are not seeing this' > fnord.am
-
-$AUTOMAKE
-# Sanity checks.
-$FGREP 'this is zardoz' Makefile.in
-$FGREP 'you are not seeing this' Makefile.in
-
-mkdir build
-cd build
-
-srcdir=..
-
-$srcdir/configure
-$MAKE
-
-$sleep
-echo '# this is baz' > $srcdir/baz.am
-rm -f $srcdir/fnord.am
-$MAKE
-# Sanity checks.
-$FGREP 'you are not seeing this' $srcdir/Makefile.in Makefile && Exit 1
-$FGREP 'this is baz' $srcdir/Makefile.in
-$FGREP 'this is baz' Makefile
-
-$sleep
-rm -rf $srcdir/sub $srcdir/foo.am $srcdir/baz.am
-echo '# no more inclusions' > $srcdir/Makefile.am
-$MAKE
-# Sanity checks.
-$EGREP 'this is (foo|bar|baz)' Makefile $srcdir/Makefile.in && Exit 1
-$FGREP 'no more inclusions' Makefile
-
-:
diff --git a/tests/remake-deleted-am-subdir.test 
b/tests/remake-deleted-am-subdir.test
deleted file mode 100755
index 9ed1078..0000000
--- a/tests/remake-deleted-am-subdir.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that inclusion of `.am' fragments by automake does not suffer
-# of the "deleted header problem".  This test does the check when the
-# SUBDIRS variable is involved.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOCONF
-
-cat > Makefile.am <<'END'
-include foo.am
-SUBDIRS = sub1 sub2
-END
-
-echo '# this is foo.am' > foo.am
-
-mkdir sub1 sub2
-
-echo 'include $(srcdir)/bar.am' > sub1/Makefile.am
-echo '# this is bar.am' > sub1/bar.am
-
-echo 'include $(top_srcdir)/foo.am' > sub2/Makefile.am
-
-$AUTOMAKE
-# Sanity checks.
-$FGREP 'this is foo.am' Makefile.in
-$FGREP 'this is bar.am' sub1/Makefile.in
-$FGREP 'this is foo.am' sub2/Makefile.in
-
-./configure
-$MAKE # Should be no-op.
-
-$sleep
-echo '# this is sub1/Makefile.am' > sub1/Makefile.am
-rm -f sub1/bar.am
-$MAKE all
-# Sanity checks.
-$FGREP 'this is bar' sub1/Makefile.in sub1/Makefile && Exit 1
-$FGREP 'this is sub1/Makefile.am' sub1/Makefile.in
-$FGREP 'this is sub1/Makefile.am' sub1/Makefile
-
-$sleep
-for d in . sub2; do
-  sed "s|.*include.*foo\.am.*|# this is $d/Makefile.am|" $d/Makefile.am > t
-  mv -f t $d/Makefile.am
-done
-rm -f foo.am
-$MAKE all
-# Sanity checks.
-$FGREP 'this is foo' sub*/Makefile* Makefile* && Exit 1
-for d in . sub1 sub2; do
-  $FGREP "this is $d/Makefile.am" $d/Makefile.in
-  $FGREP "this is $d/Makefile.am" $d/Makefile
-done
-
-:
diff --git a/tests/remake-deleted-am.test b/tests/remake-deleted-am.test
deleted file mode 100755
index fa5a672..0000000
--- a/tests/remake-deleted-am.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that inclusion of `.am' fragments by automake does not suffer
-# of the "deleted header problem".  Basic checks are done here.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-$ACLOCAL
-$AUTOCONF
-
-cat > Makefile.am <<'END'
-include foo.am
-include $(srcdir)/bar.am
-include $(top_srcdir)/baz.am
-END
-
-echo '# this is foo' > foo.am
-echo '# this is bar' > bar.am
-echo '# this is baz' > baz.am
-
-$AUTOMAKE
-# Sanity checks.
-$FGREP 'this is foo' Makefile.in
-$FGREP 'this is bar' Makefile.in
-$FGREP 'this is baz' Makefile.in
-
-./configure
-$MAKE # Should be no-op.
-
-$sleep
-sed '/^include foo\.am$/d' Makefile.am > t
-mv -f t Makefile.am
-rm -f foo.am
-$MAKE Makefile
-# Sanity checks.
-$FGREP 'this is foo' Makefile.in Makefile && Exit 1
-$FGREP 'this is bar' Makefile.in
-$FGREP 'this is bar' Makefile
-$FGREP 'this is baz' Makefile.in
-$FGREP 'this is baz' Makefile
-
-$sleep
-echo '# empty empty' > Makefile.am
-rm -f bar.am baz.am
-$MAKE Makefile
-# Sanity checks.
-$FGREP 'empty empty' Makefile.in
-$FGREP 'empty empty' Makefile
-grep 'this is ba[rz]' Makefile Makefile.in && Exit 1
-
-:
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
deleted file mode 100755
index 2d89c25..0000000
--- a/tests/remake-m4-pr10111.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that our remake rules doesn't give spurious successes in
-# some corner case situations where they should actually fail.
-# See automake bug#10111.
-# To be clear, we are speaking about *very* corner-case situations here,
-# and the fact that the remake rules might get confused in them is not a
-# big deal in practice (in fact, this test *currently fails*).  Still,
-# keeping the limitation exposed is a good idea anyway.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-m4_include([foobar.m4])
-AC_OUTPUT
-END
-
-: > foobar.m4
-
-cat > Makefile.am <<'END'
-$(srcdir)/foobar.m4:
-       echo ': foobar was here :' > $@
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-
-# OK, so the developer wants to interactively try out how the
-# "distributed form" of his package behaves.
-$MAKE distdir
-cd $distdir
-# He's interested in trying out a VPATH build.
-mkdir build
-cd build
-../configure
-# He wants to verify that the rules he's written to rebuild a file
-# included by configure.in works also in VPATH builds.
-rm -f ../foobar.m4
-$MAKE
-grep ': foobar was here :' ../configure
-$MAKE distcheck
-
-:
diff --git a/tests/remake-renamed-am.test b/tests/remake-renamed-am.test
deleted file mode 100755
index b3a7a41..0000000
--- a/tests/remake-renamed-am.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that inclusion of `.am' fragments by automake does not suffer
-# of the "deleted header problem".  This test checks that we can rename
-# an included .am file without confusing the remake rules.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am <<'END'
-include foo.am
-END
-
-cat > foo.am <<'END'
-all-local:
-       echo ok > has-run-1
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE
-test -f has-run-1
-
-$sleep
-rm -f has-run-1
-mv -f foo.am bar.am
-echo include bar.am > Makefile.am
-$MAKE Makefile
-$FGREP 'foo.am' Makefile Makefile.in && Exit 1
-
-$sleep
-rm -f has-run-1 bar.am
-echo 'all-local:; echo ok > has-run-2' > zardoz.am
-echo 'include $(srcdir)/zardoz.am' > Makefile.am
-using_gmake || $MAKE Makefile
-$MAKE
-test ! -f has-run-1
-test -f has-run-2
-
-:
diff --git a/tests/remake-subdir-from-subdir.test 
b/tests/remake-subdir-from-subdir.test
deleted file mode 100755
index 1e369f8..0000000
--- a/tests/remake-subdir-from-subdir.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that remake rules works for adding a new subdirectory from a
-# pre-existing subdirectory.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-m4_include([subdirs.m4])
-AC_SUBST([MAGIC], [magic])
-AC_OUTPUT
-END
-
-echo 'AC_CONFIG_FILES([sub/Makefile])' > subdirs.m4
-echo 'SUBDIRS = sub' > Makefile.am
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-
-cd sub
-$sleep
-echo 'AC_CONFIG_FILES([sub/subsub/Makefile])' >> ../subdirs.m4
-echo 'SUBDIRS = subsub' >> Makefile.am
-mkdir subsub
-cat > subsub/Makefile.am <<'END'
-all-local:
-       : > ok-it-works
-END
-using_gmake || $MAKE Makefile
-$MAKE
-test -f subsub/ok-it-works
-
-:
diff --git a/tests/remake-subdir-gnu.test b/tests/remake-subdir-gnu.test
deleted file mode 100755
index cc683f3..0000000
--- a/tests/remake-subdir-gnu.test
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that remake rules works from subdirectories, even using
-# `GNUmakefile' as makefiles name.  This obviously requires GNU
-# make.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-magic1='::MagicString::One::'
-magic2='__MagicString__Two__'
-
-debug_info ()
-{
-  grep -i magic configure GNUmakefile.in GNUmakefile \
-                sub/GNUmakefile.in sub/GNUmakefile
-}
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([GNUmakefile sub/GNUmakefile])
-AC_SUBST([MAGIC], [magic])
-AC_OUTPUT
-END
-
-cat > GNUmakefile.am <<'END'
-SUBDIRS = sub
-END
-
-mkdir sub
-: > sub/GNUmakefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-debug_info
-
-$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
-cd sub
-$MAKE
-cd ..
-debug_info
-$FGREP $magic1 configure
-$FGREP $magic1 GNUmakefile
-$FGREP $magic1 sub/GNUmakefile
-
-$sleep
-cd sub
-echo MAGIC = $magic2 >> GNUmakefile.am
-$MAKE
-cd ..
-debug_info
-$FGREP $magic2 sub/GNUmakefile
-$FGREP $magic2 sub/GNUmakefile.in
-$FGREP $magic1 sub/GNUmakefile sub/GNUmakefile.in && Exit 1
-$FGREP $magic2 GNUmakefile GNUmakefile.in && Exit 1
-
-:
diff --git a/tests/remake-subdir-long-time.test 
b/tests/remake-subdir-long-time.test
deleted file mode 100755
index 18ba732..0000000
--- a/tests/remake-subdir-long-time.test
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that remake rules from subdirectories do not hang or cycle
-# endlessly, even with build systems that takes several seconds to
-# rebuild the Makefiles.
-# This test tries to ensure a long-enough rebuild time by introducing
-# an explicit delay in the build process.
-# Suggestion by Ralf Wildenhues.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_SUBST([MAGIC], [magic])
-AC_OUTPUT
-END
-
-echo SUBDIRS = sub > Makefile.am
-mkdir sub
-: > sub/Makefile.am
-
-# Both aclocal and automake are expected to run one and just one time.
-# Create and use wrappers that will verify that.
-
-ocwd=`pwd` || fatal_ "cannot get current working directory"
-
-mkdir bin
-
-cat > bin/automake <<END
-#!/bin/sh
-set -e
-PATH='$PATH'; export PATH
-sentinel='$ocwd/automake-has-run'
-if test -f "\$sentinel"; then
-  echo "Automake has been run more than one time" >&2
-  exit 1
-else
-  echo automake has run > "\$sentinel"
-fi
-$sleep; $sleep;
-exec $AUTOMAKE \${1+"\$@"}
-END
-chmod a+x bin/automake
-
-cat > bin/aclocal <<END
-#!/bin/sh
-set -e
-PATH='$PATH'; export PATH
-sentinel='$ocwd/aclocal-has-run'
-if test -f "\$sentinel"; then
-  echo "Aclocal has been run more than one time" >&2
-  exit 1
-else
-  echo aclocal has run > "\$sentinel"
-fi
-$sleep; $sleep;
-exec $ACLOCAL \${1+"\$@"}
-END
-chmod a+x bin/aclocal
-
-# Just to be sure.
-cp bin/automake bin/automake-$APIVERSION
-cp bin/aclocal bin/aclocal-$APIVERSION
-
-PATH=$ocwd/bin$PATH_SEPARATOR$PATH; export PATH
-
-AUTOMAKE=automake ACLOCAL=aclocal; export AUTOMAKE ACLOCAL
-
-$ACLOCAL  # Should use or just-defined wrapper.
-$AUTOMAKE # Likewise.
-$AUTOCONF
-
-# Sanity check: the wrappers have been used.
-test -f automake-has-run
-test -f aclocal-has-run
-rm -f automake-has-run aclocal-has-run
-
-./configure
-# Sanity check: Makefile doesn't get updated uselessly.
-ACLOCAL=false AUTOMAKE=false AUTOCONF=false $MAKE -e
-
-$sleep
-sed "s|magic|magic2|" configure.in > t
-mv -f t configure.in
-
-cd sub
-AUTOMAKE="$AUTOMAKE" ACLOCAL="$ACLOCAL" $MAKE -e Makefile
-cd ..
-
-# For debugging.
-ls -l . sub
-grep -i magic configure Makefile.in Makefile sub/Makefile.in sub/Makefile
-# Sanity checks.
-$FGREP magic2 configure
-$FGREP magic2 Makefile
-$FGREP magic2 sub/Makefile
-
-:
diff --git a/tests/remake-subdir.test b/tests/remake-subdir.test
deleted file mode 100755
index 5bbc345..0000000
--- a/tests/remake-subdir.test
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that remake rules works from subdirectories, even with non-GNU
-# make implementations.
-
-. ./defs || Exit 1
-
-set -e
-
-if using_gmake; then
-  remake=$MAKE
-else
-  remake="$MAKE Makefile"
-fi
-
-magic1='::MagicString::One::'
-magic2='__MagicString__Two__'
-
-debug_info ()
-{
-  grep -i magic configure Makefile.in Makefile sub/Makefile.in sub/Makefile
-}
-
-cat >> configure.in <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_SUBST([MAGIC], [magic])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE
-debug_info
-
-$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
-cd sub
-$remake
-cd ..
-debug_info
-$FGREP $magic1 configure
-$FGREP $magic1 Makefile
-$FGREP $magic1 sub/Makefile
-
-$sleep
-cd sub
-echo MAGIC = $magic2 >> Makefile.am
-$remake
-cd ..
-debug_info
-$FGREP $magic2 sub/Makefile
-$FGREP $magic2 sub/Makefile.in
-$FGREP $magic1 sub/Makefile sub/Makefile.in && Exit 1
-$FGREP $magic2 Makefile Makefile.in && Exit 1
-
-:
diff --git a/tests/remake-subdir2.test b/tests/remake-subdir2.test
deleted file mode 100755
index 09d1a36..0000000
--- a/tests/remake-subdir2.test
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that remake rules works from subdirectories, even when makefiles
-# are not named "Makefile".
-
-. ./defs || Exit 1
-
-set -e
-
-magic1='::MagicString::One::'
-magic2='__MagicString__Two__'
-
-debug_info ()
-{
-  grep -i magic configure build.in build.mk sub/build.in sub/build.mk
-}
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([build.mk:build.in])
-AC_CONFIG_FILES([sub/build.mk:sub/build.in])
-AC_SUBST([MAGIC], [magic])
-AC_OUTPUT
-END
-
-cat > build.am <<'END'
-AM_MAKEFLAGS = -f build.mk
-SUBDIRS = sub
-END
-
-mkdir sub
-cat > sub/build.am <<'END'
-AM_MAKEFLAGS = -f build.mk
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-ls -l # For debugging.
-
-$MAKE -f build.mk
-debug_info
-
-$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
-cd sub
-$MAKE -f build.mk build.mk
-cd ..
-debug_info
-$FGREP $magic1 configure
-$FGREP $magic1 build.mk
-$FGREP $magic1 sub/build.mk
-
-$sleep
-cd sub
-echo MAGIC = $magic2 >> build.am
-$MAKE -f build.mk build.mk
-cd ..
-debug_info
-$FGREP $magic2 sub/build.mk
-$FGREP $magic2 sub/build.in
-$FGREP $magic1 sub/build.in sub/build.mk && Exit 1
-$FGREP $magic2 build.in build.mk && Exit 1
-
-:
diff --git a/tests/remake.test b/tests/remake.test
deleted file mode 100755
index 9c86b1b..0000000
--- a/tests/remake.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure remaking rules in subdir are correctly generated.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(sub/Makefile)
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^Makefile' sub/Makefile.in
diff --git a/tests/remake2.test b/tests/remake2.test
deleted file mode 100755
index 3b63dea..0000000
--- a/tests/remake2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure remaking rules in subdir are correct.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(sub/Makefile)
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in
diff --git a/tests/remake3.test b/tests/remake3.test
deleted file mode 100755
index 08ec16a..0000000
--- a/tests/remake3.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure remaking rules work when there is no subdir Makefile.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile sub/foo)
-END
-
-: > Makefile.am
-
-mkdir sub
-: > sub/foo.in
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^sub/foo' Makefile.in
diff --git a/tests/remake4.test b/tests/remake4.test
deleted file mode 100755
index d6dbed7..0000000
--- a/tests/remake4.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Makefile.in are up to date after make dist.
-# This is expected to work even without GNU Make (the GNU Make
-# feature that isn't supported elsewhere is the rebuild of
-# Makefile dependencies during ordinary builds).
-#
-# If this fails, this is likely to be due to a dependency being
-# given two different name.  For instance BSD Make does not know
-# that `Makefile' is the same as `./Makefile'
-#
-# Report from Akim Demaille.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-# Rebuild rule are ok until make dist, but not afterwards.
-if test ! -f rebuild_ok; then
-  ACLOCAL=false
-  AUTOMAKE=false
-  AUTOCONF=false
-fi
-AC_OUTPUT
-EOF
-
-: > rebuild_ok
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE
-$sleep
-touch aclocal.m4
-$MAKE distdir
-cd remake4-1.0
-test ! -f rebuild_ok
-./configure
-$MAKE
diff --git a/tests/remake5.test b/tests/remake5.test
deleted file mode 100755
index d353632..0000000
--- a/tests/remake5.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that AM_MAINTAINER_MODE disable some rebuild rules,
-# but not all.
-# Report from Ralf Corsepius.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_MAINTAINER_MODE
-m4_include(foo.m4)
-if test ! -f rebuild_ok; then
-  ACLOCAL=false
-  AUTOMAKE=false
-  AUTOCONF=false
-fi
-AC_OUTPUT
-EOF
-
-: > foo.m4
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE
-
-# Make sure the rules to rebuild configure/Makefile.in are not
-# triggered by default.  ($MAKE will fail if they are, because the
-# tools are set to false.)
-$sleep
-touch aclocal.m4 Makefile.am configure.in foo.m4
-$MAKE
-
-# Make sure the rebuild rule for Makefile is triggered.
-$sleep
-echo '# GrEpMe' >>Makefile.in
-$MAKE
-grep GrEpMe Makefile
-
-# Make sure the rebuild rule for config.status is triggered.
-$sleep
-grep 'AUTOCONF.*=.*false' Makefile
-: > rebuild_ok
-./configure --no-create
-$MAKE
-grep 'AUTOCONF.*=.*false' Makefile && Exit 1
-
-# Make sure rebuild rules do work if --enable-maintainer-mode is given.
-./configure --enable-maintainer-mode
-$sleep
-echo 'AC_SUBST([YIPPY_YIPPY_YEAH])' >foo.m4
-$MAKE
-grep YIPPY_YIPPY_YEAH Makefile
diff --git a/tests/remake6.test b/tests/remake6.test
deleted file mode 100755
index a25e486..0000000
--- a/tests/remake6.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure remaking rules work when subdir Makefile.in has been removed.
-
-. ./defs || Exit 1
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile sub/Makefile)
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-END
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE
-
-# Now, we are set up.  Ensure that, for either missing Makefile.in,
-# or updated Makefile.am, rebuild rules are run, and run exactly once
-# only.
-
-rm -f Makefile.in
-$MAKE >stdout
-cat stdout
-test `grep -c " --run " stdout` -eq 1
-
-rm -f sub/Makefile.in
-$MAKE >stdout
-cat stdout
-test `grep -c " --run " stdout` -eq 1
-
-$sleep  # Let touched files appear newer.
-
-touch Makefile.am
-$MAKE >stdout
-cat stdout
-test `grep -c " --run " stdout` -eq 1
-
-touch sub/Makefile.am
-$MAKE >stdout
-cat stdout
-test `grep -c " --run " stdout` -eq 1
diff --git a/tests/remake7.test b/tests/remake7.test
deleted file mode 100755
index 670f60b..0000000
--- a/tests/remake7.test
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure remaking rules fail when they should.
-
-. ./defs || Exit 1
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile sub/Makefile)
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-END
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE
-
-$sleep
-
-# Fail for broken input files.
-
-echo "if FOO" > sub/Makefile.am
-$MAKE && Exit 1
-
-: >sub/Makefile.am
-$MAKE
-
-mv Makefile.am backup
-echo "if FOO" > Makefile.am
-$MAKE && Exit 1
-
-# Fail for missing input files, with or without missing
-# Makefile.in files.
-
-cp backup Makefile.am
-mv sub/Makefile.am sub/backup
-$MAKE && Exit 1
-
-rm -f sub/Makefile.in
-$MAKE && Exit 1
-
-mv sub/backup sub/Makefile.am
-rm -f Makefile.am
-$MAKE && Exit 1
-
-rm -f Makefile.in
-$MAKE && Exit 1
-:
diff --git a/tests/req.test b/tests/req.test
deleted file mode 100755
index 39bf349..0000000
--- a/tests/req.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure macro used in m4 file is included.
-
-. ./defs || Exit 1
-
-cat > configure.in <<EOF
-AC_INIT
-AM_INIT_GUILE_MODULE
-EOF
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([AM_INIT_GUILE_MODULE],[
-. $srcdir/../GUILE-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_CONFIG_AUX_DIR(..)
-module=[$1]
-AC_SUBST(module)])
-END
-
-$ACLOCAL || Exit 1
-
-grep 'DEFUN.*INIT_AUTOMAKE' aclocal.m4
diff --git a/tests/reqd.test b/tests/reqd.test
deleted file mode 100755
index 58a8839..0000000
--- a/tests/reqd.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake will install several copies of required files if needed.
-# Reported by Marius Vollmer.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<EOF
-AC_CONFIG_FILES([one/Makefile two/Makefile])
-AC_OUTPUT
-EOF
-
-mkdir one
-mkdir two
-
-echo 'SUBDIRS = one two' > Makefile.am
-echo 'info_TEXINFOS = mumble.texi' > one/Makefile.am
-cat >one/mumble.texi <<'END'
address@hidden mumble.info
address@hidden version.texi
-END
-
-cp one/Makefile.am one/mumble.texi two
-
-$ACLOCAL
-$AUTOMAKE --add-missing --copy
-
-test -f one/mdate-sh
-test -f one/texinfo.tex
-test -f two/mdate-sh
-test -f two/texinfo.tex
diff --git a/tests/reqd2.test b/tests/reqd2.test
deleted file mode 100755
index 1bf8123..0000000
--- a/tests/reqd2.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for a bug reported by Andrew Suffield.
-# (Automake goes wild and try to rerun itself more than two time
-# to fix the Makefiles.)
-
-required='libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([req2], [1.0])
-AC_CONFIG_AUX_DIR([autoconf])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_AR
-AM_PROG_LIBTOOL
-AC_CONFIG_FILES([autoconf/Makefile main/Makefile])
-AC_OUTPUT
-END
-
-mkdir autoconf
-mkdir main
-
-: > autoconf/Makefile.am
-echo 'SUBDIRS = autoconf main' >Makefile.am
-
-cat >main/Makefile.am <<'END'
-lib_LTLIBRARIES = lib0.la
-lib0_la_SOURCES = 0.c
-END
-
-: > ar-lib
-libtoolize --force --copy
-$ACLOCAL
-$AUTOCONF
-
-test -f autoconf/ltmain.sh # Sanity check.
-rm -f autoconf/ltmain.sh
-AUTOMAKE_fails --add-missing --copy
-grep '^configure\.in:7:.* required file.*autoconf/ltmain\.sh' stderr
-
-:
diff --git a/tests/rulepat.test b/tests/rulepat.test
deleted file mode 100755
index c15e910..0000000
--- a/tests/rulepat.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure RULE_PATTERN catches strange targets.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-$(srcdir)/Makefile.am:
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-grep '^$(srcdir)/Makefile\.am' Makefile.in
diff --git a/tests/sanity.test b/tests/sanity.test
deleted file mode 100755
index ed7fe28..0000000
--- a/tests/sanity.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Unsafe absolute directory names should be diagnosed.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir 'unsafe$'
-cd 'unsafe$'
-
-mv ../configure.in .
-mv ../install-sh ../missing .
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'unsafe absolute working directory' stderr
-
-cd ..
-mkdir build
-cd build
-../unsafe$/configure 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'unsafe srcdir' stderr
-
-:
diff --git a/tests/scripts.test b/tests/scripts.test
deleted file mode 100755
index b9aed7f..0000000
--- a/tests/scripts.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Jim Meyering.
-# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-noinst_SCRIPTS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/seenc.test b/tests/seenc.test
deleted file mode 100755
index 3bfac37..0000000
--- a/tests/seenc.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure C-but-not-CC error works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-dnl AC_PROG_CC and AC_PROG_CXX missing on purpose
-AC_LIBOBJ([fsusage])
-AC_LIBOBJ([mountlist])
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = x.C
-foo_LDADD = @LIBOBJS@
-END
-
-: > fsusage.c
-: > mountlist.c
-
-$ACLOCAL
-AUTOMAKE_fails
-$FGREP CC stderr
-$FGREP CXX stderr
diff --git a/tests/self-check-env-sanitize.test 
b/tests/self-check-env-sanitize.test
deleted file mode 100755
index 9d18d9e..0000000
--- a/tests/self-check-env-sanitize.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Sanity check for the automake testsuite.
-# Make sure that the testsuite initialization code complains when
-# some testsuite-influential variables are set in the environment.
-
-set -x
-
-exec 5>&1
-for var in me parallel_tests required; do
-  env "$var=foo" /bin/sh -c '. ./defs' foo.test && exit 1
-  env "$var=foo" /bin/sh -c '. ./defs' foo.test 2>&1 1>&5 \
-    | grep "variable \`$var' is set in the environment.*unsafe" || exit 1
-done
-
-:
diff --git a/tests/self-check-report.test b/tests/self-check-report.test
deleted file mode 100755
index 639319a..0000000
--- a/tests/self-check-report.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Sanity check for the automake testsuite.
-# Test subroutines to report warnings, and to signal failures, skips
-# and hard errors.
-
-. ./defs || Exit 1
-
-set +e
-
-exec 5>&1
-
-(warn_ foobar) 2>&1 1>&5 | grep '^foobar$'             || Exit 1
-(fail_ foo); test $? -eq 1                             || Exit 1
-(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
-(skip_ foo); test $? -eq 77                            || Exit 1
-(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(framework_failure_ foo); test $? -eq 99               || Exit 1
-(framework_failure_ foo) 2>&1 1>&5 \
-  | grep "^$me: set-up failure: foo"                   || Exit 1
-
-stderr_fileno_=6
-
-(warn_ foobar) 6>&1 1>&5 | grep '^foobar$'             || Exit 1
-(fail_ foo); test $? -eq 1                             || Exit 1
-(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
-(skip_ foo); test $? -eq 77                            || Exit 1
-(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(framework_failure_ foo); test $? -eq 99               || Exit 1
-(framework_failure_ foo) 6>&1 1>&5 \
-  | grep "^$me: set-up failure: foo"                   || Exit 1
-
-:
diff --git a/tests/silent-configsite.test b/tests/silent-configsite.test
deleted file mode 100755
index a0255f5..0000000
--- a/tests/silent-configsite.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the user can control default mode of silent-rules
-# from config.site, and that this default can be overridden from
-# either the ./configure or make command line.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AM_SILENT_RULES
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-.PHONY: test-silent test-nosilent
-test-silent:
-       test x'$(AM_DEFAULT_VERBOSITY)' = x'0'
-test-nosilent:
-       test x'$(AM_DEFAULT_VERBOSITY)' = x'1'
-EOF
-
-unset enable_silent_rules || :
-
-: 'No explicit default in configure.in, enable by default in config.site'
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-echo "enable_silent_rules=\${enable_silent_rules-yes}" > config.site
-CONFIG_SITE=./config.site ./configure
-$MAKE test-silent
-$MAKE distclean
-# Command line should win over default values in config.site.
-CONFIG_SITE=./config.site ./configure --disable-silent-rules
-$MAKE test-nosilent
-$MAKE distclean
-
-: 'Disable by default in configure.in, enable by default in config.site'
-
-sed 's/^AM_SILENT_RULES/&([no])/' configure.in > configure.tmp
-mv -f configure.tmp configure.in
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-echo "enable_silent_rules=\${enable_silent_rules-yes}" > config.site
-CONFIG_SITE=./config.site ./configure
-$MAKE test-silent
-# Command line should win over default values in config.site.
-$MAKE distclean
-CONFIG_SITE=./config.site ./configure --disable-silent-rules
-$MAKE test-nosilent
-$MAKE distclean
-
-: 'Enable by default in configure.in, disable by default in config.site'
-
-sed 's/^AM_SILENT_RULES/&([yes])/' configure.in > configure.tmp
-mv -f configure.tmp configure.in
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-echo "enable_silent_rules=\${enable_silent_rules-no}" > config.site
-CONFIG_SITE=./config.site ./configure
-$MAKE test-nosilent
-$MAKE distclean
-# Command line should win over default values in config.site.
-CONFIG_SITE=./config.site ./configure --enable-silent-rules
-$MAKE test-silent
-$MAKE distclean
-
-:
diff --git a/tests/silent-lex-gcc.test b/tests/silent-lex-gcc.test
deleted file mode 100755
index 6545752..0000000
--- a/tests/silent-lex-gcc.test
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Lex, forcing gcc depmode.
-# Keep this in sync with sister test `silent-lex-generic.test'.
-
-required='flex gcc'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.l
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-LDADD = $(LEXLIB)
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.l
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CFLAGS)
-LDADD = $(LEXLIB)
-EOF
-
-cat > foo.l <<'EOF'
-%%
-"END"   return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void) { return 1; }
-int   main (void) { return 0; }
-EOF
-cp foo.l sub/bar.l
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-lex-gcc.test'.
-for config_args in \
-  am_cv_CC_dependencies_compiler_type=gcc
-do
-  ./configure $config_args --enable-silent-rules
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'LEX .*foo\.' stdout
-  grep 'LEX .*bar\.' stdout
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  # Don't look for LEX, as probably lex hasn't been re-run.
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Ensure a truly clean rebuild.
-  $MAKE clean
-  rm -f foo.c sub/bar.c
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-  grep 'ylwrap ' stdout
-
-  $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  # Don't look for ylwrap, as probably lex hasn't been re-run.
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
-  # Ensure a truly clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-  rm -f foo.c sub/bar.c
-
-done
-
-:
diff --git a/tests/silent-lex-generic.test b/tests/silent-lex-generic.test
deleted file mode 100755
index f1b1ce2..0000000
--- a/tests/silent-lex-generic.test
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Lex.
-# Keep this in sync with sister test `silent-lex-gcc.test'.
-
-required='flex'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.l
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-LDADD = $(LEXLIB)
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.l
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CFLAGS)
-LDADD = $(LEXLIB)
-EOF
-
-cat > foo.l <<'EOF'
-%{
-/* avoid non-ANSI #include of unistd.h */
-#define YY_NO_UNISTD_H 1
-%}
-%%
-"END"   return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void) { return 1; }
-int   main (void) { return 0; }
-EOF
-cp foo.l sub/bar.l
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force dependency tracking explicitly, so that slow dependency
-# extractors are not rejected.  Try also with dependency tracking
-# explicitly disabled.
-for config_args in \
-  --enable-dependency-tracking --disable-dependency-tracking
-do
-  ./configure $config_args --enable-silent-rules
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'LEX .*foo\.' stdout
-  grep 'LEX .*bar\.' stdout
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  # Don't look for LEX, as probably lex hasn't been re-run.
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Ensure a truly clean rebuild.
-  $MAKE clean
-  rm -f foo.c sub/bar.c
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-  grep 'ylwrap ' stdout
-
-  $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  # Don't look for ylwrap, as probably lex hasn't been re-run.
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
-
-  # Ensure a truly clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-  rm -f foo.c sub/bar.c
-
-done
-
-:
diff --git a/tests/silent-many-gcc.test b/tests/silent-many-gcc.test
deleted file mode 100755
index 9101675..0000000
--- a/tests/silent-many-gcc.test
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with gcc depmode and many languages at once.
-# This test partly overlaps with other silent*.test, but it serves as
-# a stress test by using many different languages at once -- so don't
-# remove this test script.
-# This test requires the GNU compilers; keep it in sync with sister test
-# `silent-many-generic.test', which should work with generic compilers.
-
-required='gcc g++ gfortran flex bison'
-. ./defs || Exit 1
-
-set -e
-
-# Avoids too much code duplication.
-do_and_check_silent_build ()
-{
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  # Avoid spurious failures with SunStudio Fortran compilers.
-  sed '/^NOTICE:/d' stdout > t
-  mv -f t stdout
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'CXX .*foo1\.' stdout
-  grep 'CXX .*baz1\.' stdout
-  grep 'FC .*foo2\.'  stdout
-  grep 'FC .*baz2\.'  stdout
-  grep 'F77 .*foo3\.' stdout
-  grep 'F77 .*baz3\.' stdout
-  grep ' CC .*foo5\.' stdout
-  grep ' CC .*baz5\.' stdout
-  grep ' CC .*foo6\.' stdout
-  grep ' CC .*baz6\.' stdout
-
-  grep 'CXXLD .*foo' stdout
-  grep 'CCLD .*bar'  stdout
-  grep 'CXXLD .*baz' stdout
-  grep 'CCLD .*bla'  stdout
-
-  if $rebuild; then :; else
-    grep 'YACC .*foo6\.' stdout
-    grep 'YACC .*baz6\.' stdout
-    grep 'LEX .*foo5\.'  stdout
-    grep 'LEX .*baz5\.'  stdout
-  fi
-
-  unset rebuild
-}
-
-# Avoids too much code duplication.
-do_and_check_verbose_build ()
-{
-
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
-
-  if $rebuild; then :; else
-    grep 'ylwrap ' stdout
-    $EGREP '(LEX|YACC) ' stdout && Exit 1
-  fi
-
-  unset rebuild
-}
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_F77
-AC_PROG_FC
-AC_PROG_LEX
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar fo2
-bar_CFLAGS = $(AM_CFLAGS)
-foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
-fo2_SOURCES = $(foo_SOURCES)
-fo2_CPPFLAGS = $(AM_CPPFLAGS)
-fo2_FFLAGS = $(AM_FFLAGS)
-fo2_FCFLAGS = $(AM_FCFLAGS)
-SUBDIRS = sub
-AM_YFLAGS = -d
-LDADD = $(LEXLIB)
-BUILT_SOURCES = foo6.h
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = baz bla ba2
-bla_CFLAGS = $(AM_CFLAGS)
-baz_SOURCES = baz1.cpp baz2.f90 baz3.f baz5.l baz6.y
-ba2_SOURCES = $(baz_SOURCES)
-ba2_CPPFLAGS = $(AM_CPPFLAGS)
-ba2_FFLAGS = $(AM_FFLAGS)
-ba2_FCFLAGS = $(AM_FCFLAGS)
-AM_YFLAGS = -d
-LDADD = $(LEXLIB)
-BUILT_SOURCES = baz6.h
-EOF
-
-cat > foo1.cpp <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cat > foo2.f90 <<'EOF'
-      subroutine foo2
-      return
-      end
-EOF
-cat > foo3.f <<'EOF'
-      subroutine foo3
-      return
-      end
-EOF
-cat > foo5.l <<'EOF'
-%%
-"END"   return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
-EOF
-cat > foo6.y <<'EOF'
-%{
-void yyerror (char *s) {}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo1.cpp bar.c
-cp foo1.cpp sub/baz.c
-cp foo1.cpp sub/bla.c
-cp foo1.cpp sub/baz1.cpp
-cp foo2.f90 sub/baz2.f90
-cp foo3.f sub/baz3.f
-cp foo5.l sub/baz5.l
-cp foo6.y sub/baz6.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-many-generic.test'.
-for config_args in \
-  am_cv_CC_dependencies_compiler_type=gcc
-do
-
-  ./configure $config_args --enable-silent-rules
-
-  do_and_check_silent_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_silent_build --rebuild
-
-  # Ensure a clean rebuild.
-  $MAKE clean
-  # This is required, since these files are not removed by `make clean'
-  # (as dictated by the GNU Coding Standards).
-  rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
-
-  do_and_check_verbose_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_verbose_build --rebuild
-
-  # Ensure a clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-
-done
-
-:
diff --git a/tests/silent-many-generic.test b/tests/silent-many-generic.test
deleted file mode 100755
index 4a234c1..0000000
--- a/tests/silent-many-generic.test
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with many languages at once.
-# This test partly overlaps with other silent*.test, but it serves as
-# a stress test by using many different languages at once -- so don't
-# remove this test script.
-# This test should work with generic compilers; keep it in sync with
-# sister test `silent-many-gcc.test', which requires the GNU compilers
-# and forces the use of gcc depmode.
-
-# FIXME: generic C++/Fortran compilers should suffice here
-required='g++ gfortran flex bison'
-. ./defs || Exit 1
-
-set -e
-
-# Avoids too much code duplication.
-do_and_check_silent_build ()
-{
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  # Avoid spurious failures with SunStudio Fortran compilers.
-  sed '/^NOTICE:/d' stdout > t
-  mv -f t stdout
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'CXX .*foo1\.' stdout
-  grep 'CXX .*baz1\.' stdout
-  grep 'FC .*foo2\.'  stdout
-  grep 'FC .*baz2\.'  stdout
-  grep 'F77 .*foo3\.' stdout
-  grep 'F77 .*baz3\.' stdout
-  grep ' CC .*foo5\.' stdout
-  grep ' CC .*baz5\.' stdout
-  grep ' CC .*foo6\.' stdout
-  grep ' CC .*baz6\.' stdout
-
-  grep 'CXXLD .*foo' stdout
-  grep 'CCLD .*bar'  stdout
-  grep 'CXXLD .*baz' stdout
-  grep 'CCLD .*bla'  stdout
-
-  if $rebuild; then :; else
-    grep 'YACC .*foo6\.' stdout
-    grep 'YACC .*baz6\.' stdout
-    grep 'LEX .*foo5\.'  stdout
-    grep 'LEX .*baz5\.'  stdout
-  fi
-
-  unset rebuild
-}
-
-# Avoids too much code duplication.
-do_and_check_verbose_build ()
-{
-
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
-
-  if $rebuild; then :; else
-    grep 'ylwrap ' stdout
-    $EGREP '(LEX|YACC) ' stdout && Exit 1
-  fi
-
-  unset rebuild
-}
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_F77
-AC_PROG_FC
-AC_PROG_LEX
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar fo2
-bar_CFLAGS = $(AM_CFLAGS)
-foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
-fo2_SOURCES = $(foo_SOURCES)
-fo2_CPPFLAGS = $(AM_CPPFLAGS)
-fo2_FFLAGS = $(AM_FFLAGS)
-fo2_FCFLAGS = $(AM_FCFLAGS)
-SUBDIRS = sub
-AM_YFLAGS = -d
-LDADD = $(LEXLIB)
-BUILT_SOURCES = foo6.h
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = baz bla ba2
-bla_CFLAGS = $(AM_CFLAGS)
-baz_SOURCES = baz1.cpp baz2.f90 baz3.f baz5.l baz6.y
-ba2_SOURCES = $(baz_SOURCES)
-ba2_CPPFLAGS = $(AM_CPPFLAGS)
-ba2_FFLAGS = $(AM_FFLAGS)
-ba2_FCFLAGS = $(AM_FCFLAGS)
-AM_YFLAGS = -d
-LDADD = $(LEXLIB)
-BUILT_SOURCES = baz6.h
-EOF
-
-cat > foo1.cpp <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cat > foo2.f90 <<'EOF'
-      subroutine foo2
-      return
-      end
-EOF
-cat > foo3.f <<'EOF'
-      subroutine foo3
-      return
-      end
-EOF
-cat > foo5.l <<'EOF'
-%%
-"END"   return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
-EOF
-cat > foo6.y <<'EOF'
-%{
-void yyerror (char *s) {}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo1.cpp bar.c
-cp foo1.cpp sub/baz.c
-cp foo1.cpp sub/bla.c
-cp foo1.cpp sub/baz1.cpp
-cp foo2.f90 sub/baz2.f90
-cp foo3.f sub/baz3.f
-cp foo5.l sub/baz5.l
-cp foo6.y sub/baz6.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force dependency tracking explicitly, so that slow dependency
-# extractors are not rejected.  Try also with dependency tracking
-# explicitly disabled.
-for config_args in \
-  --enable-dependency-tracking --disable-dependency-tracking
-do
-
-  ./configure $config_args --enable-silent-rules
-
-  do_and_check_silent_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_silent_build --rebuild
-
-  # Ensure a clean rebuild.
-  $MAKE clean
-  # This is required, since these files are not removed by `make clean'
-  # (as dictated by the GNU Coding Standards).
-  rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
-
-  do_and_check_verbose_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_verbose_build --rebuild
-
-  # Ensure a clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-
-done
-
-:
diff --git a/tests/silent-nested-vars.test b/tests/silent-nested-vars.test
deleted file mode 100755
index 0024b5d..0000000
--- a/tests/silent-nested-vars.test
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, on 'make' implementations that do not
-# support nested variables (Bug#9928, Bug#10237).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
-bar_CFLAGS = $(AM_CFLAGS)
-
-# Check that AM_V and AM_DEFAULT_V work as advertised.
-pkg_verbose = $(address@hidden@)
-pkg_verbose_ = $(address@hidden@)
-pkg_verbose_0 = @echo PKG-GEN $@;
-
-bin_SCRIPTS = oop
-oop:
-       $(pkg_verbose)echo $@ >$@
-
-mostlyclean-local:
-       rm -f oop
-EOF
-
-cat > foo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp foo.c bar.c
-
-cat >mymake <<'EOF'
-#! /bin/sh
-makerules=
-
-case $1 in
-  -f)
-    makefile=$2
-    case $2 in
-      -) makerules=`cat` || exit ;;
-    esac ;;
-  *)
-    for makefile in makefile Makefile; do
-      test -f $makefile && break
-    done ;;
-esac
-
-nested_var_pat='^[^#].*\$([^)]*\$'
-if
-  case $makefile in
-    -) printf '%s\n' "$makerules" | grep "$nested_var_pat";;
-    *) grep "$nested_var_pat" $makefile;;
-  esac
-then
-  echo >&2 "mymake: $makefile contains nested variables"
-  exit 1
-fi
-
-case $makefile in
-  -) printf '%s\n' "$makerules" | $mymake_MAKE "$@";;
-  *) exec $mymake_MAKE "$@";;
-esac
-EOF
-chmod a+x mymake
-mymake_MAKE=${MAKE-make}
-MAKE=./mymake
-export MAKE mymake_MAKE
-
-# As a sanity check, verify that `mymake' rejects Makefiles that
-# use nested variables.
-cat > Makefile <<'END'
-a = $(b$(c))
-all:
-       touch bar
-END
-$MAKE && Exit 99
-mv -f Makefile foo.mk
-$MAKE -f foo.mk && Exit 99
-cat foo.mk | $MAKE -f - && Exit 99
-test -f bar && Exit 99
-sed '/a =/d' foo.mk > Makefile
-$MAKE && test -f bar || Exit 99
-rm -f bar Makefile foo.mk
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
-  stdout
-$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
-grep '^AM_V_CC =  *\$(am__v_CC_0) *$' Makefile
-grep '^AM_V_GEN =  *\$(am__v_GEN_0) *$' Makefile
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep 'echo .*oop' stdout && Exit 1
-grep 'CC .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'PKG-GEN .*oop' stdout
-$MAKE distclean
-
-./configure --disable-silent-rules > stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \
-  stdout
-$EGREP 'CC|AM_V|GEN' Makefile # For debugging.
-grep '^AM_V_CC =  *\$(am__v_CC_1) *$' Makefile
-grep '^AM_V_GEN =  *\$(am__v_GEN_1) *$' Makefile
-
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-grep ' -o bar' stdout
-grep 'echo .*>oop' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/silent-yacc-gcc.test b/tests/silent-yacc-gcc.test
deleted file mode 100755
index 33ae8ae..0000000
--- a/tests/silent-yacc-gcc.test
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Yacc, forcing gcc depmode.
-# Keep this in sync with sister test `silent-yacc-generic.test'.
-
-required='gcc bison'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.y
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CPPFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.y
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CPPFLAGS)
-EOF
-
-cat > foo.y <<'EOF'
-%{
-void yyerror (char *s) {}
-int yylex (void) {return 0;}
-int main(void) {return 0;}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo.y sub/bar.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-yacc-gcc.test'.
-for config_args in \
-  am_cv_CC_dependencies_compiler_type=gcc
-do
-  ./configure $config_args --enable-silent-rules
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'YACC .*foo\.' stdout
-  grep 'YACC .*bar\.' stdout
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  # Don't look for YACC, as probably yacc hasn't been re-run.
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Ensure a truly clean rebuild.
-  $MAKE clean
-  rm -f foo.[ch] sub/bar.[ch]
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-  grep 'ylwrap ' stdout
-
-  $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  # Don't look for ylwrap, as probably lex hasn't been re-run.
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
-  # Ensure a truly clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-  rm -f foo.[ch] sub/bar.[ch]
-
-done
-
-:
diff --git a/tests/silent-yacc-generic.test b/tests/silent-yacc-generic.test
deleted file mode 100755
index b7489da..0000000
--- a/tests/silent-yacc-generic.test
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Yacc.
-# Keep this in sync with sister test `silent-yacc-gcc.test'.
-
-required='bison'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.y
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CFLAGS = $(AM_CPPFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.y
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CFLAGS = $(AM_CPPFLAGS)
-EOF
-
-cat > foo.y <<'EOF'
-%{
-void yyerror (char *s) {}
-int yylex (void) {return 0;}
-int main(void) {return 0;}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-cp foo.y sub/bar.y
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Force dependency tracking explicitly, so that slow dependency
-# extractors are not rejected.  Try also with dependency tracking
-# explicitly disabled.
-for config_args in \
-  --enable-dependency-tracking --disable-dependency-tracking
-do
-  ./configure $config_args --enable-silent-rules
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  grep 'YACC .*foo\.' stdout
-  grep 'YACC .*bar\.' stdout
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  $EGREP '(mv|ylwrap) ' stdout && Exit 1
-
-  # Don't look for YACC, as probably yacc hasn't been re-run.
-  grep ' CC .*foo\.' stdout
-  grep ' CC .*bar\.' stdout
-  grep 'CCLD .*foo1' stdout
-  grep 'CCLD .*bar1' stdout
-  grep 'CCLD .*foo2' stdout
-  grep 'CCLD .*bar2' stdout
-
-  # Ensure a truly clean rebuild.
-  $MAKE clean
-  rm -f foo.[ch] sub/bar.[ch]
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-  grep 'ylwrap ' stdout
-
-  $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  # Don't look for ylwrap, as probably lex hasn't been re-run.
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
-
-  # Ensure a truly clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-  rm -f foo.[ch] sub/bar.[ch]
-
-done
-
-:
diff --git a/tests/silent.test b/tests/silent.test
deleted file mode 100755
index 97d881e..0000000
--- a/tests/silent.test
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, without libtool, standard depmode case.
-
-# Please keep this file in sync with silent2.test.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
-bar_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = baz bla
-bla_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > foo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp foo.c bar.c
-cp foo.c sub/baz.c
-cp foo.c sub/bla.c
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep 'CC    .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CC .*baz\.' stdout
-grep 'CC .*bla\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'CCLD .*baz' stdout
-grep 'CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/silent2.test b/tests/silent2.test
deleted file mode 100755
index aed8546..0000000
--- a/tests/silent2.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, without libtool, non-fastdep case
-# (so that, with GCC, we also cover the other code paths in depend2).
-
-# Please keep this file in sync with silent.test.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
-bar_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = baz bla
-bla_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > foo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp foo.c bar.c
-cp foo.c sub/baz.c
-cp foo.c sub/bla.c
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep 'CC .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CC .*baz\.' stdout
-grep 'CC .*bla\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'CCLD .*baz' stdout
-grep 'CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/silent3.test b/tests/silent3.test
deleted file mode 100755
index 4d66a0a..0000000
--- a/tests/silent3.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with libtool, standard depmode case.
-
-# Please keep this file in sync with silent4.test and silent9.test.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_AR
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libbaz.la libbla.la
-libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > libfoo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a `--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-
-:
diff --git a/tests/silent4.test b/tests/silent4.test
deleted file mode 100755
index 4ef4653..0000000
--- a/tests/silent4.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with libtool, non-fastdep case
-# (so that, with GCC, we also cover the other code paths in depend2).
-
-# Please keep this file in sync with silent3.test and silent9.test.
-
-required="libtoolize gcc"
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_AR
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libbaz.la libbla.la
-libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > libfoo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a `--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-
-:
diff --git a/tests/silent6.test b/tests/silent6.test
deleted file mode 100755
index 0e474af..0000000
--- a/tests/silent6.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check user extensibility of silent-rules mode.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-my_verbose = $(my_verbose_$(V))
-my_verbose_ = $(my_verbose_$(AM_DEFAULT_VERBOSITY))
-my_verbose_0 = @echo GEN $@;
-
-all-local: foo
-
-foo: foo.in
-       $(my_verbose)cp $(srcdir)/foo.in $@
-EXTRA_DIST = foo.in
-CLEANFILES = foo
-EOF
-
-: >foo.in
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^ *GEN foo *$' stdout
-grep 'cp ' stdout && Exit 1
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN ' stdout && Exit 1
-grep 'cp \.*/foo\.in foo' stdout
-
-$MAKE distclean
-
-./configure --disable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN ' stdout && Exit 1
-grep 'cp \.*/foo\.in foo' stdout
-
-$MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '^ *GEN foo *$' stdout
-grep 'cp ' stdout && Exit 1
-
-$MAKE distclean
-
-$sleep
-# Things should also work with -Wall in AM_INIT_AUTOMAKE.
-cat > configure.in <<'END'
-AC_INIT([silent6], [1.0])
-AM_INIT_AUTOMAKE([-Wall])
-AC_CONFIG_FILES([Makefile])
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-$AUTOMAKE -Wno-error
-
-# AM_SILENT_RULES should turn off the warning
-$sleep
-echo 'AM_SILENT_RULES' >> configure.in
-$ACLOCAL
-$AUTOMAKE
-grep 'AM_V_GEN' Makefile.in
-$AUTOMAKE --force -Wno-all -Wportability
-grep 'AM_V_GEN' Makefile.in
-
-# The `silent-rules' option to AM_INIT_AUTOMAKE should work likewise.
-$sleep
-cat > configure.in <<'END'
-AC_INIT([silent6], [1.0])
-AM_INIT_AUTOMAKE([silent-rules])
-AC_CONFIG_FILES([Makefile])
-END
-$ACLOCAL
-$AUTOMAKE
-grep 'AM_V_GEN' Makefile.in
-$AUTOMAKE --force -Wno-all -Wportability
-grep 'AM_V_GEN' Makefile.in
-
-:
diff --git a/tests/silent7.test b/tests/silent7.test
deleted file mode 100755
index 5ae8ac0..0000000
--- a/tests/silent7.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check user extensibility of silent-rules mode.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-all-local: foo
-
-## And here's how you should do it in your own code:
-foo: foo.in
-       $(AM_V_GEN)cp $(srcdir)/foo.in $@
-       $(AM_V_at)echo more >> $@
-
-EXTRA_DIST = foo.in
-CLEANFILES = foo
-EOF
-
-: >foo.in
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --disable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN ' stdout && Exit 1
-grep 'cp ' stdout
-grep 'echo ' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN ' stdout && Exit 1
-grep 'cp ' stdout
-grep 'echo ' stdout
-
-$MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
-
-$MAKE distclean
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
-
-$MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'GEN ' stdout && Exit 1
-grep 'cp ' stdout
-grep 'echo ' stdout
-
-# Ensure that setting `silent-rules' in a Makefile.am produces an error.
-echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am
-AUTOMAKE_fails --force
-
-:
diff --git a/tests/silent9.test b/tests/silent9.test
deleted file mode 100755
index 76d97fc..0000000
--- a/tests/silent9.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with libtool, nodep case.
-
-# Please keep this file in sync with silent3.test and silent4.test.
-
-required="libtoolize"
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libbaz.la libbla.la
-libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > libfoo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --disable-dependency-tracking --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a `--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-
-:
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
deleted file mode 100755
index 40fc92e..0000000
--- a/tests/silentcxx.test
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for C++.
-
-required='g++' # FIXME: any decent C++ compiler should be OK
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_PROG_CXX
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.cpp baz.cxx quux.cc
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CXXFLAGS = $(AM_CXXFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.cpp
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CXXFLAGS = $(AM_CXXFLAGS)
-EOF
-
-cat > foo.cpp <<'EOF'
-using namespace std; /* C compilers fail on this */
-int main() { return 0; }
-EOF
-
-# let's try out other extensions too
-echo 'class Baz  { public: int i;  };' > baz.cxx
-echo 'class Quux { public: bool b; };' > quux.cc
-
-cp foo.cpp sub/bar.cpp
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# configure once for fastdep, once for non-fastdep, once for nodep
-for config_args in \
-  '' \
-  am_cv_CC_dependencies_compiler_type=gcc \
-  --disable-dependency-tracking
-do
-  ./configure $config_args --enable-silent-rules
-  $MAKE >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && Exit 1
-  grep 'mv ' stdout && Exit 1
-
-  grep 'CXX .*foo\.'  stdout
-  grep 'CXX .*baz\.'  stdout
-  grep 'CXX .*quux\.' stdout
-  grep 'CXX .*bar\.'  stdout
-  grep 'CXXLD .*foo1' stdout
-  grep 'CXXLD .*bar1' stdout
-  grep 'CXXLD .*foo2' stdout
-  grep 'CXXLD .*bar2' stdout
-
-  # Ensure a clean rebuild.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(CC|CXX|LD) ' stdout && Exit 1
-
-  # Ensure a clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-
-done
-
-:
diff --git a/tests/silentf77.test b/tests/silentf77.test
deleted file mode 100755
index cfdb186..0000000
--- a/tests/silentf77.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Fortran 77.
-# Keep this ins sync with the sister test silentf90.test.
-
-required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_PROG_F77
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.f
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_FFLAGS = $(AM_FFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.f
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_FFLAGS = $(AM_FFLAGS)
-EOF
-
-cat > foo.f <<'EOF'
-      program foo
-      stop
-      end
-EOF
-cp foo.f sub/bar.f
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-# Avoid spurious failures with SunStudio Fortran compilers.
-sed '/^NOTICE:/d' stdout > t
-mv -f t stdout
-cat stdout
-
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-
-grep 'F77 .*foo\.'  stdout
-grep 'F77 .*bar\.'  stdout
-grep 'F77LD .*foo1' stdout
-grep 'F77LD .*bar1' stdout
-grep 'F77LD .*foo2' stdout
-grep 'F77LD .*bar2' stdout
-
-$EGREP '(FC|FCLD) ' stdout && Exit 1
-
-# Ensure a clean rebuild.
-$MAKE clean
-
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep ' -c ' stdout
-grep ' -o ' stdout
-
-$EGREP '(F77|FC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/silentf90.test b/tests/silentf90.test
deleted file mode 100755
index 4fe1c3f..0000000
--- a/tests/silentf90.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode for Fortran 90.
-# Keep this ins sync with the sister test silentf77.test.
-
-required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_PROG_FC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2
-foo1_SOURCES = foo.f90
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_FCFLAGS = $(AM_FCLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-bin_PROGRAMS = bar1 bar2
-bar1_SOURCES = bar.f90
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_FCFLAGS = $(AM_FCLAGS)
-EOF
-
-cat > foo.f90 <<'EOF'
-      program foo
-      stop
-      end
-EOF
-cp foo.f90 sub/bar.f90
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-# Avoid spurious failures with SunStudio Fortran compilers.
-sed '/^NOTICE:/d' stdout > t
-mv -f t stdout
-cat stdout
-
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-
-grep 'FC .*foo\.'  stdout
-grep 'FC .*bar\.'  stdout
-grep 'FCLD .*foo1' stdout
-grep 'FCLD .*bar1' stdout
-grep 'FCLD .*foo2' stdout
-grep 'FCLD .*bar2' stdout
-
-$EGREP '(F77|F77LD) ' stdout && Exit 1
-
-# Ensure a clean rebuild.
-$MAKE clean
-
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-grep ' -c ' stdout
-grep ' -o ' stdout
-
-$EGREP '(F77|FC|LD) ' stdout && Exit 1
-
-:
diff --git a/tests/space.test b/tests/space.test
deleted file mode 100755
index a4ab5a8..0000000
--- a/tests/space.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test leading space on macro assignment.
-
-. ./defs || Exit 1
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-    bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/specflg-dummy.test b/tests/specflg-dummy.test
deleted file mode 100755
index d0c8ba6..0000000
--- a/tests/specflg-dummy.test
+++ /dev/null
@@ -1,249 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that even "dummy" per-target flags triggers the use of renamed
-# objects.  I.e., a definition like `foo_CFLAGS = $(AM_CFLAGS)' should
-# always cause Automake to trigger the semantics for per-target CFLAGS,
-# even if AM_CFLAGS is undefined. Similarly for other *FLAGS variables
-# (CXXFLAGS, YFLAGS, LDFLAGS, ...)
-
-. ./defs || Exit 1
-
-set -e
-
-# Disable shell globbing if possible.
-(set +f) >/dev/null 2>&1 && set +f
-
-oIFS=$IFS
-nl='
-'
-
-matches=
-add_match ()
-{
-  matches="$matches$nl$1"
-}
-
-do_check ()
-{
-  IFS=$nl
-  for string in $matches; do
-    IFS=$oIFS
-    $FGREP "$string" Makefile.in
-  done
-  IFS=$oIFS
-}
-
-# Fake libtool presence, so that we won't have to require it.
-cat > acinclude.m4 <<END
-AC_DEFUN([AC_PROG_LIBTOOL], [AC_SUBST([LIBTOOL], [dummy])])
-END
-: > ltmain.sh
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_YACC
-AC_PROG_LEX
-AC_PROG_F77
-AC_PROG_FC
-AM_PROG_GCJ
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
-AM_PROG_UPC
-AC_PROG_OBJC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS =
-lib_LIBRARIES =
-lib_LTLIBRARIES =
-END
-
-$ACLOCAL
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog1
-prog1_SOURCES = source1.c
-prog1_CFLAGS = $(AM_CFLAGS)
-END
-
-add_match 'prog1-source1.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog2
-prog2_SOURCES = source2.c
-prog2_CPPFLAGS = $(AM_CPPFLAGS)
-END
-
-add_match 'prog2-source2.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog3
-prog3_SOURCES = source3.cxx
-prog3_CXXFLAGS = $(AM_CXXFLAGS)
-END
-
-add_match 'prog3-source3.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog4
-prog4_SOURCES = source4.c++
-prog4_CPPFLAGS = $(AM_CPPFLAGS)
-END
-
-add_match 'prog4-source4.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog5
-prog5_SOURCES = source5.f
-prog5_FFLAGS = $(AM_FFLAGS)
-END
-
-add_match 'prog5-source5.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog6
-prog6_SOURCES = source6.f90
-prog6_FCFLAGS = $(AM_FCFLAGS)
-END
-
-add_match 'prog6-source6.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog7
-prog7_SOURCES = source7.r
-prog7_RFLAGS = $(AM_RFLAGS)
-END
-
-add_match 'prog7-source7.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog8
-prog8_SOURCES = source8.java
-prog8_GCJFLAGS = $(AM_GCJFLAGS)
-END
-
-add_match 'prog8-source8.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog9
-prog9_SOURCES = source9.upc
-prog9_UPCFLAGS = $(AM_UPCFLAGS)
-END
-
-add_match 'prog9-source9.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += prog10
-prog10_SOURCES = source10.m
-prog10_OBJCFLAGS = $(AM_OBJCFLAGS)
-END
-
-add_match 'prog10-source10.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += linkprog
-linkprog_SOURCES = linkprog.c
-linkprog_LDFLAGS = $(AM_LDFLAGS)
-END
-
-add_match 'linkprog_LINK ='
-
-cat >> Makefile.am <<'END'
-lib_LIBRARIES += libstatic.a
-libstatic_a_SOURCES = static123.c
-libstatic_a_CFLAGS = $(AM_CFLAGS)
-END
-
-add_match 'libstatic_a-static123.$(OBJEXT)'
-
-cat >> Makefile.am <<'END'
-lib_LTLIBRARIES += libshared1.la
-libshared1_la_SOURCES = shared1.c
-libshared1_la_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS)
-END
-
-add_match 'libshared1_la-shared1.lo'
-
-cat >> Makefile.am <<'END'
-lib_LTLIBRARIES += libshared2.la
-libshared2_la_SOURCES = shared2.cc
-libshared2_la_CXXFLAGS = $(AM_CXXFLAGS)
-END
-
-add_match 'libshared2_la-shared2.lo'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += parse1
-parse1_SOURCES = parse.y
-parse1_YFLAGS = $(AM_YFLAGS)
-END
-
-add_match 'parse1-parse.c'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += parse2
-parse2_SOURCES = parse.ypp
-parse2_YFLAGS = $(AM_YFLAGS)
-END
-
-add_match 'parse2-parse.cpp'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += lexer1
-lexer1_SOURCES = lex.l
-lexer1_LFLAGS = $(AM_YFLAGS)
-END
-
-add_match 'lexer1-lex.c'
-
-cat >> Makefile.am <<'END'
-bin_PROGRAMS += lexer2
-lexer2_SOURCES = lexer.ll
-lexer2_LFLAGS = $(AM_YFLAGS)
-END
-
-add_match 'lexer2-lexer.cc'
-
-# For debugging.
-cat Makefile.am
-
-$AUTOMAKE -a
-do_check
-
-sed '
-  s|^\(.*\)_SOURCES *= *|sub_\1_SOURCES = srcsub/|
-  s|^\(.*\)PROGRAMS *+= *|\1PROGRAMS += sub/|
-  s|^\(.*\)LIBRARIES *+= *|\1LIBRARIES += sub/|
-  s|^\(.*\)FLAGS *=|sub_\1FLAGS =|
-' Makefile.am > t
-
-cat - t > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-END
-
-rm -f t
-
-# For debugging.
-cat Makefile.am
-
-$AUTOMAKE
-do_check
-
-:
diff --git a/tests/specflg.test b/tests/specflg.test
deleted file mode 100755
index b9b2e10..0000000
--- a/tests/specflg.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of flags specific to executable.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DBAR
-END
-
-# Make sure `compile' is required.
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required.*compile' stderr
-
-: > compile
-
-$AUTOMAKE
-
-# Look for $(COMPILE) -c in .c.o rule.
-grep 'COMPILE. [^-]' Makefile.in && Exit 1
-
-# Look for foo-foo.o.
-grep '[^-]foo\.o' Makefile.in && Exit 1
-
-# Regression test for missing space.
-$FGREP ')-c' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/specflg10.test b/tests/specflg10.test
deleted file mode 100755
index efe13f5..0000000
--- a/tests/specflg10.test
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# AM_DEFAULT_SOURCE_EXT
-
-required=g++
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
-AM_CONDITIONAL([COND], [:])
-AC_OUTPUT
-END
-
-mkdir sub sub2
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub sub2
-bin_PROGRAMS = foo
-END
-
-cat > sub/Makefile.am << 'END'
-bin_PROGRAMS = bar baz
-AM_DEFAULT_SOURCE_EXT = .cpp
-END
-
-cat > sub2/Makefile.am << 'END'
-bin_PROGRAMS = bla
-if COND
-AM_DEFAULT_SOURCE_EXT = .foo .quux
-endif
-SUFFIXES = .foo .c
-.foo.c:
-       cat $< >$@
-BUILT_SOURCES = bla.c
-CLEANFILES = bla.c
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-cp foo.c sub/bar.cpp
-cp foo.c sub/baz.cpp
-cp foo.c sub2/bla.foo
-
-$ACLOCAL
-$AUTOCONF
-
-# Conditional AM_DEFAULT_SOURCE_EXT does not work yet  :-(
-# (this limitation could be lifted).
-AUTOMAKE_fails --add-missing
-grep 'defined conditionally' stderr
-
-sed '/^if/d; /^endif/d' sub2/Makefile.am > t
-mv -f t sub2/Makefile.am
-
-# AM_DEFAULT_SOURCE_EXT can only assume one value
-# (lifting this limitation is not such a good idea).
-AUTOMAKE_fails --add-missing
-grep 'at most one value' stderr
-
-sed 's/ \.quux//' sub2/Makefile.am > t
-mv -f t sub2/Makefile.am
-
-$AUTOMAKE --add-missing
-
-./configure
-$MAKE
-$MAKE distcheck
-
-:
diff --git a/tests/specflg2.test b/tests/specflg2.test
deleted file mode 100755
index f67fd7b..0000000
--- a/tests/specflg2.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test library-specific flags.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-lib_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c bar.cc
-libfoo_a_CFLAGS = -DBAR
-libfoo_a_CXXFLAGS = -DZOT
-END
-
-: > ar-lib
-
-# Make sure `compile' is required.
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required.*compile' stderr
-
-: > compile
-
-$AUTOMAKE
-
-# Look for $(COMPILE) -c in .c.o rule.
-grep 'COMPILE. [^-]' Makefile.in && Exit 1
-
-# Look for libfoo_a-foo.o.
-grep foo Makefile.in
-grep '[^-]foo\.o' Makefile.in && Exit 1
-
-# Look for libfoo_a-bar.o.
-grep bar Makefile.in
-grep '[^-]bar\.o' Makefile.in && Exit 1
-
-Exit 0
diff --git a/tests/specflg3.test b/tests/specflg3.test
deleted file mode 100755
index 60006a5..0000000
--- a/tests/specflg3.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test exe-specific flags with dependency tracking.
-
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(test, 0.1)
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-foo_CFLAGS = -DFOO
-END
-
-: > compile
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-$FGREP -e '-o foo-foo' Makefile.in || Exit 1
-
-$FGREP 'foo.o.o' Makefile.in                       && Exit 1
-$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && Exit 1
-
-$FGREP '$(foo_CFLAGS)' Makefile.in || Exit 1
-
-Exit 0
diff --git a/tests/specflg6.test b/tests/specflg6.test
deleted file mode 100755
index d858769..0000000
--- a/tests/specflg6.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Regression test for multiple rules being generated for each target when
-# conditionals are present.
-# From Richard Boulton
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_CONDITIONAL(BAR, true)
-END
-
-cat > Makefile.am << 'END'
-if BAR
-BAR_SRCS = bar.c
-endif
-
-bin_PROGRAMS = foo
-foo_CFLAGS = -DFOO
-foo_SOURCES = foo.c
-END
-
-: > compile
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
-
-cat >> Makefile.am << 'END'
-foo_SOURCES += $(BAR_SRCS)
-END
-
-$AUTOMAKE || Exit 1
-
-condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
-
-test "x$uncondval" = "x$condval"
diff --git a/tests/specflg7.test b/tests/specflg7.test
deleted file mode 100755
index e41b316..0000000
--- a/tests/specflg7.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The true/false example from the manual, plus a check for _SHORTNAME.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = false true
-true_SOURCES = false.c
-true_CFLAGS = -DAM_TRUE
-true_SHORTNAME = t
-# No false_SOURCES definition.  Use the default source.
-false_CFLAGS = -DAM_FALSE
-false_SHORTNAME = f
-END
-
-cat > false.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-#ifdef AM_TRUE
-   puts ("true");
-#else
-   puts ("false");
-#endif
-   return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-./true | grep true
-./false | grep false
-objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
-test -f ./t-false.$objext
-test -f ./f-false.$objext
diff --git a/tests/specflg8.test b/tests/specflg8.test
deleted file mode 100755
index c5a30d7..0000000
--- a/tests/specflg8.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Like the true/false example from the manual,
-# with one extra indirection in the sources (PR/315), and
-# use of _CPPFLAGS (PR/337).
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-# Using a separate variable to hold all the sources for a program is
-# common when building many flavors of this program, each with
-# different flags.
-
-cat > Makefile.am << 'END'
-TRUESOURCE = true.c
-bin_PROGRAMS = false true
-true_SOURCES = $(TRUESOURCE)
-true_CPPFLAGS = -DEXIT_CODE=0
-false_SOURCES = $(TRUESOURCE)
-false_CPPFLAGS = -DEXIT_CODE=1
-END
-
-cat > true.c << 'END'
-int main (void)
-{
-   return EXIT_CODE;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-
-./true
-./false && Exit 1
-
-objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
-test -f ./true-true.$objext
-test -f ./false-true.$objext
-
-:
diff --git a/tests/specflg9.test b/tests/specflg9.test
deleted file mode 100755
index 7f92046..0000000
--- a/tests/specflg9.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Another check for per-target flag substitutions.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zzfoo zzbar
-zzfoo_SOURCES = sub/foo.c
-zzbar_SOURCES = bar.c
-zzbar_CPPFLAGS = -Dfoo
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-$FGREP '$(AM_CFLAGS)' Makefile.in
-
-$FGREP '$(zzfoo_CFLAGS)' Makefile.in && Exit 1
-$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && Exit 1
-
-$FGREP '$(zzbar_CFLAGS)' Makefile.in && Exit 1
-$FGREP '$(zzbar_CPPFLAGS)' Makefile.in
-
-:
diff --git a/tests/spell.test b/tests/spell.test
deleted file mode 100755
index d880a62..0000000
--- a/tests/spell.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure misspellings in _SOURCES variables cause failure.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz foo
-zardoz_SOURCES = x.c
-boo_SOURCES = y.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:3:.*boo' stderr
diff --git a/tests/spell2.test b/tests/spell2.test
deleted file mode 100755
index 54298f1..0000000
--- a/tests/spell2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure misspellings in _SOURCES variables cause failure.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = x.c
-qardoz_LDADD = -ljoe
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:3:.*qardoz' stderr
diff --git a/tests/spell3.test b/tests/spell3.test
deleted file mode 100755
index 399328f..0000000
--- a/tests/spell3.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure some internal _DEPENDENCIES variables don't cause
-# errors.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-TAGS_DEPENDENCIES = joe
-## Required to avoid error.
-ETAGS_ARGS = joe
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE
diff --git a/tests/spelling.test b/tests/spelling.test
deleted file mode 100755
index ad1e232..0000000
--- a/tests/spelling.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that misspelled prefixes actually cause error.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'EOF'
-bni_PROGRAMS = zot
-EOF
-
-if $ACLOCAL || Exit 1
-$AUTOMAKE; then
-   Exit 1
-fi
-Exit 0
diff --git a/tests/spy.test b/tests/spy.test
deleted file mode 100755
index 5f1a87b..0000000
--- a/tests/spy.test
+++ /dev/null
@@ -1,108 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check whether double colon rules work.  The Unix V7 make manual
-# mentions double-colon rules, but POSIX does not.  They seem to be
-# supported by all Make implementation as far as we can tell. This test
-# case is a spy: we want to detect if there exist implementations where
-# these do not work.  We might use these rules to simplify the rebuild
-# rules (instead of the $? hack).
-
-# Tom Tromey write:
-# | In the distant past we used :: rules extensively.
-# | Fran?ois convinced me to get rid of them:
-# |
-# | Thu Nov 23 18:02:38 1995  Tom Tromey  <address@hidden>
-# | [ ... ]
-# |         * subdirs.am: Removed "::" rules
-# |         * header.am, libraries.am, mans.am, texinfos.am, footer.am:
-# |         Removed "::" rules
-# |         * scripts.am, programs.am, libprograms.am: Removed "::" rules
-# |
-# |
-# | I no longer remember the rationale for this.  It may have only been a
-# | belief that they were unportable.
-
-# On a related topic, the Autoconf manual has the following text:
-# |     `VPATH' and double-colon rules
-# |           Any assignment to `VPATH' causes Sun `make' to only execute
-# |           the first set of double-colon rules.  (This comment has been
-# |           here since 1994 and the context has been lost.  It's probably
-# |           about SunOS 4.  If you can reproduce this, please send us a
-# |           test case for illustration.)
-
-# We already know that overlapping ::-rule like
-#
-#   a :: b
-#      echo rule1 >> $@
-#   a :: c
-#      echo rule2 >> $@
-#   a :: b c
-#      echo rule3 >> $@
-#
-# do not work equally on all platforms.  It seems that in all cases
-# Make attempts to run all matching rules.  However at least GNU Make,
-# NetBSD Make, and FreeBSD Make will detect that $@ was updated by the
-# first matching rule and skip remaining matches (with the above
-# example that means that unless `a' was declared PHONY, only "rule1"
-# will be appended to `a' if both b and c have changed).  Other
-# implementations like OSF1 Make and HP-UX Make do not perform such a
-# check and execute all matching rules whatever they do ("rule1",
-# "rule2", abd "rule3" will all be appended to `a' if b and c have
-# changed).
-
-# So it seems only non-overlapping ::-rule may be portable.  This is
-# what we check now.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile <<\EOF
-a :: b
-       echo rule1 >> $@
-a :: c
-       echo rule2 >> $@
-EOF
-
-touch b c
-$sleep
-: > a
-$MAKE
-test "`cat a`" = ''
-$sleep
-touch b
-$MAKE
-test "`cat a`" = rule1
-# Ensure a is strictly newer than b, so HP-UX make does not execute rule2.
-$sleep
-: > a
-$sleep
-touch c
-$MAKE
-test "`cat a`" = rule2
-
-# Unfortunately, the following is not portable to FreeBSD/NetBSD/OpenBSD
-# make, see explanation above.
-
-#: > a
-#$sleep
-#touch b c
-#$MAKE
-#grep rule1 a
-#grep rule2 a
-
-:
diff --git a/tests/srcsub.test b/tests/srcsub.test
deleted file mode 100755
index 2f38312..0000000
--- a/tests/srcsub.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config sub in _SOURCES fails.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = x
-x_SOURCES = x.c @FOO@
-EXTRA_x_SOURCES = y.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*x_SOURCES.*substitution' stderr
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
deleted file mode 100755
index 494d0f6..0000000
--- a/tests/srcsub2.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config sub in _SOURCES fails.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = x
-bar = @FOO@
-foo = $(bar)
-x_SOURCES = x.c $(foo)
-EXTRA_x_SOURCES = y.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*bar.*substitution' stderr
-grep 'Makefile.am:2:.*x_SOURCES' stderr
diff --git a/tests/stamph2.test b/tests/stamph2.test
deleted file mode 100755
index cb96d27..0000000
--- a/tests/stamph2.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure stamp-h* files are created where we expect
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << END
-AM_CONFIG_HEADER(1.h
-                 2.h:config.hin
-                 3.h:sdir1/config1.hin)
-# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms.
-AC_CONFIG_HEADERS(sdir1/4.h
-                  sdir1/5.h:config.hin
-                  sdir1/6.h:sdir1/config1.hin
-                  sdir1/7.h:sdir2/config2.hin)
-AC_OUTPUT
-END
-
-: > Makefile.am
-mkdir sdir1
-mkdir sdir2
-: > config.hin
-: > 1.h.in
-: > sdir1/4.h.in
-: > sdir1/config1.hin
-: > sdir2/config2.hin
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-test -f stamp-h1
-test -f stamp-h2
-test -f stamp-h3
-test -f sdir1/stamp-h4
-test -f sdir1/stamp-h5
-test -f sdir1/stamp-h6
-test -f sdir1/stamp-h7
-
-# Make sure `./config.status foo' creates the right stamp file.
-# Report from Sander Niemeijer.
-
-rm -f stamp-h*
-rm -f sdir1/stamp-h*
-
-./config.status sdir1/7.h 2.h sdir1/4.h
-test ! -f stamp-h1
-test -f stamp-h2
-test ! -f stamp-h3
-test -f sdir1/stamp-h4
-test ! -f sdir1/stamp-h5
-test ! -f sdir1/stamp-h6
-test -f sdir1/stamp-h7
-
-Exit 0
diff --git a/tests/stdinc.test b/tests/stdinc.test
deleted file mode 100755
index ff914f3..0000000
--- a/tests/stdinc.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure the standard include order is stable.
-# Report by Kent Boortz.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_CONFIG_HEADERS([sub/config.h])
-AC_CONFIG_FILES([sub/bar.h])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c
-BUILT_SOURCES = bar.h
-END
-
-mkdir sub
-
-cat >foo.c <<'END'
-#include <config.h>
-#include <bar.h>
-int main() { return bar (); }
-END
-cat >bar.h <<'END'
-int bar () { return 0; }
-END
-cat >sub/bar.h.in <<'END'
-choke me
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE
-
-mkdir build
-cd build
-../configure -C
-$MAKE
-
-cd ..
-./configure -C
-$MAKE
diff --git a/tests/stdlib.test b/tests/stdlib.test
deleted file mode 100755
index 5ca9a7f..0000000
--- a/tests/stdlib.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test "not a standard library" error.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = sub/foo
-include $(srcdir)/foo.mk
-END
-
-cat > foo.mk << 'END'
-## A dummy automake comment.
-a = x \
-    y
-# A dummy make comment.
-lib_LIBRARIES = zardoz.a
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-q="[\`'\"]"
-badname='not a standard library name'
-# We're specifically testing for line-number information.
-grep "^Makefile\\.am:1:.*${q}sub/foo${q}.*$badname" stderr
-grep "^Makefile\\.am:1:.*sub/libfoo\\.a" stderr
-grep "^foo\\.mk:5:.*${q}zardoz\\.a${q}.*$badname" stderr
-grep "^foo\\.mk:5:.*libzardoz\\.a" stderr
-
-:
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
deleted file mode 100755
index 5da42ad..0000000
--- a/tests/stdlib2.test
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for AM_LDFLAGS = -module
-# Report from Kevin P. Fleming.
-required=libtool
-. ./defs || Exit 1
-
-set -e
-
-: > README
-: > NEWS
-: > AUTHORS
-: > ChangeLog
-: > ltconfig
-: > ltmain.sh
-: > config.guess
-: > config.sub
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-: > Makefile.inc
-
-cat > Makefile.am << 'END'
-include Makefile.inc
-lib_LTLIBRARIES = nonstandard.la
-nonstandard_la_SOURCES = foo.c
-FOO = -module
-END
-
-$ACLOCAL
-AUTOMAKE_fails --add-missing --gnu
-grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
-grep 'Makefile.am:2:.*libnonstandard.la' stderr
-
-# We will use -Wno-gnu to disable the warning about setting LDFLAGS (below)
-# Make sure nonstandard names are diagnosed anyway.
-AUTOMAKE_fails --add-missing --gnu -Wno-gnu
-grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
-grep 'Makefile.am:2:.*libnonstandard.la' stderr
-
-# Make sure nonstandard_la_LDFLAGS is read even if LDFLAGS is used.
-cat >Makefile.inc <<'EOF'
-LDFLAGS = -lfoo
-nonstandard_la_LDFLAGS = $(FOO)
-EOF
-$AUTOMAKE -Wno-gnu
-
-# Make sure LDFLAGS is read even if nonstandard_la_LDFLAGS is used.
-cat >Makefile.inc <<'EOF'
-LDFLAGS = $(FOO)
-nonstandard_la_LDFLAGS = -lfoo
-EOF
-$AUTOMAKE -Wno-gnu
-
-# Make sure AM_LDFLAGS is not read if foo_LDFLAGS is used.
-cat >Makefile.inc <<'EOF'
-nonstandard_la_LDFLAGS = -lfoo
-AM_LDFLAGS = -module
-EOF
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*nonstandard.la.*standard libtool library name' stderr
-grep 'Makefile.am:2:.*libnonstandard.la' stderr
-
-echo 'AM_LDFLAGS = -module' > Makefile.inc
-$AUTOMAKE
-
-# For module, Automake should not suggest the lib prefix.
-cat > Makefile.am << 'END'
-include Makefile.inc
-lib_LTLIBRARIES = nonstandard
-nonstandard_SOURCES = foo.c
-FOO = -module
-END
-
-AUTOMAKE_fails
-grep "Makefile.am:2:.*nonstandard'.*standard libtool module name" stderr
-grep 'Makefile.am:2:.*`nonstandard.la' stderr
diff --git a/tests/strip.test b/tests/strip.test
deleted file mode 100755
index 12fe6b4..0000000
--- a/tests/strip.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2007, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for install-strip.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_SCRIPTS = foo
-END
-
-cat > foo << 'END'
-#! /bin/sh
-echo Maude
-END
-
-chmod +x foo
-
-mkdir install
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-prefix=`cd install && pwd` || Exit 1
-./configure --prefix="$prefix"
-$MAKE
-$MAKE install-strip
-diff foo "$prefix"/bin/foo
-
-:
diff --git a/tests/strip2.test b/tests/strip2.test
deleted file mode 100755
index bab0a38..0000000
--- a/tests/strip2.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure install-strip works when STRIP consists of more than one word.
-# This test needs GNU binutils strip.  See sister test strip3.
-
-required=strip
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-lib_LIBRARIES = libfoo.a
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-cat > libfoo.c << 'END'
-int foo () { return 0; }
-END
-
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-prefix=`pwd`/inst
-./configure --prefix="$prefix" STRIP='strip --verbose'
-$MAKE
-$MAKE install-strip
-
-:
diff --git a/tests/strip3.test b/tests/strip3.test
deleted file mode 100755
index 34b0254..0000000
--- a/tests/strip3.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure install-strip works when STRIP consists of more than one word.
-# This test needs GNU binutils strip.  Libtool variant.
-
-required='libtoolize strip'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-lib_LTLIBRARIES = libfoo.la
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-cat > libfoo.c << 'END'
-int foo () { return 0; }
-END
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-prefix=`pwd`/inst
-./configure --prefix="$prefix" STRIP='strip --verbose'
-$MAKE
-$MAKE install-strip
-
-:
diff --git a/tests/subcond.test b/tests/subcond.test
deleted file mode 100755
index 0269cac..0000000
--- a/tests/subcond.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# It is ok to have a conditional SUBDIRS when using gettext.
-
-required=gettext
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_GNU_GETTEXT
-AM_CONDITIONAL(MAUDE, true)
-ALL_LINGUAS=
-AC_SUBST(ALL_LINGUAS)
-END
-
-mkdir po intl
-: >config.rpath
-
-cat > Makefile.am << 'END'
-if MAUDE
-SUBDIRS = po intl
-else
-SUBDIRS =
-endif
-END
-
-$ACLOCAL
-# Gettext wants config.guess etc.
-$AUTOMAKE --add-missing
diff --git a/tests/subcond2.test b/tests/subcond2.test
deleted file mode 100755
index 5086cd3..0000000
--- a/tests/subcond2.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The for conditional SUBDIRS.
-# SUBDIRS + AM_CONDITIONAL setup from the manual.
-# Lots of lines here are duplicated in subcond3.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_CONDITIONAL([COND_OPT], [test "$want_opt" = yes])
-AC_CONFIG_FILES([src/Makefile opt/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am << 'END'
-if COND_OPT
-  MAYBE_OPT = opt
-endif
-SUBDIRS = src $(MAYBE_OPT)
-
-# Testing targets.
-#
-# We want to ensure that
-#      - src/source and opt/source are always distributed.
-#      - src/result is always built
-#      - opt/result is built conditionally
-#
-# We rely on `distcheck' to run `check-local' and use
-# `sanity1' and `sanity2' as evidences that test-build was run.
-
-if COND_OPT
-test-build: all
-       test -f src/result
-       test -f opt/result
-       : > $(top_builddir)/../../sanity2
-else
-test-build: all
-       test -f src/result
-       test ! -f opt/result
-       : > $(top_builddir)/../../sanity1
-endif
-
-test-dist: distdir
-       test -f $(distdir)/src/source
-       test -f $(distdir)/opt/source
-
-check-local: test-build test-dist
-END
-
-mkdir src opt
-: > src/source
-: > opt/source
-
-cat >src/Makefile.am << 'END'
-EXTRA_DIST = source
-all-local: result
-CLEANFILES = result
-
-result: source
-       cp $(srcdir)/source result
-END
-
-# We want in opt/ the same Makefile as in src/.  Let's exercise `include'.
-cat >opt/Makefile.am << 'END'
-include ../src/Makefile.am
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE distcheck
-test -f sanity1
-DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
-test -f sanity2
diff --git a/tests/subcond3.test b/tests/subcond3.test
deleted file mode 100755
index 3506d05..0000000
--- a/tests/subcond3.test
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# The for conditional SUBDIRS.
-# SUBDIRS + AC_SUBST setup from the manual.
-# Lots of lines here are duplicated in subcond2.test.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-if test "$want_opt" = yes; then
-  MAYBE_OPT=opt
-else
-  MAYBE_OPT=
-fi
-AC_SUBST([MAYBE_OPT])
-AC_CONFIG_FILES([src/Makefile opt/Makefile])
-AC_OUTPUT
-END
-
-cat >Makefile.am << 'END'
-SUBDIRS = src $(MAYBE_OPT)
-DIST_SUBDIRS = src opt
-
-# Testing targets.
-#
-# We want to ensure that
-#      - src/source and opt/source are always distributed.
-#      - src/result is always built
-#      - opt/result is built conditionally
-#
-# We rely on `distcheck' to run `check-local' and use
-# `sanity1' and `sanity2' as evidences that test-build was run.
-
-test-build: all
-       test -f src/result
-       if test -n "$(MAYBE_OPT)"; then \
-          test -f opt/result || exit 1; \
-          : > $(top_builddir)/../../sanity2 || exit 1; \
-       else \
-          test ! -f opt/result || exit 1; \
-          : > $(top_builddir)/../../sanity1 || exit 1; \
-       fi
-
-test-dist: distdir
-       test -f $(distdir)/src/source
-       test -f $(distdir)/opt/source
-
-check-local: test-build test-dist
-END
-
-mkdir src opt
-: > src/source
-: > opt/source
-
-cat >src/Makefile.am << 'END'
-EXTRA_DIST = source
-all-local: result
-CLEANFILES = result
-
-result: source
-       cp $(srcdir)/source result
-END
-
-# We want in opt/ the same Makefile as in src/.  Let's exercise `include'.
-cat >opt/Makefile.am << 'END'
-include ../src/Makefile.am
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure
-$MAKE distcheck
-test -f sanity1
-DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
-test -f sanity2
diff --git a/tests/subdir.test b/tests/subdir.test
deleted file mode 100755
index edad4ca..0000000
--- a/tests/subdir.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure install-sh and mkinstalldirs correctly found in
-# subdirs.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir zot
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([zot/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = zot
-END
-
-cat > zot/Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-:
diff --git a/tests/subdir10.test b/tests/subdir10.test
deleted file mode 100755
index eabd1a9..0000000
--- a/tests/subdir10.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# SUDBIRS with $fail set in the environment.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >> configure.in <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-echo SUBDIRS = sub >Makefile.am
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-env fail=1 $MAKE all clean
-
-:
diff --git a/tests/subdir2.test b/tests/subdir2.test
deleted file mode 100755
index 9412054..0000000
--- a/tests/subdir2.test
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2010 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure sub-sub-dirs work correctly.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir one
-mkdir one/two
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([one/Makefile one/two/Makefile])
-AC_OUTPUT
-END
-
-# Files required because we are using `--gnu'.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-
-cat > Makefile.am << 'END'
-SUBDIRS = one
-END
-
-cat > one/Makefile.am << 'END'
-SUBDIRS = two
-END
-
-cat > one/two/Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-$ACLOCAL
-$AUTOMAKE --gnu
-
-:
diff --git a/tests/subdir3.test b/tests/subdir3.test
deleted file mode 100755
index 3da2cc8..0000000
--- a/tests/subdir3.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure subdir source file generates explicit dependency.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz widdershins
-zardoz_SOURCES = y.c x/z.c
-widdershins_SOURCES = x/z.c
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^z\.o: x/z\.c$' Makefile.in
-
-:
diff --git a/tests/subdir4.test b/tests/subdir4.test
deleted file mode 100755
index 9d4efec..0000000
--- a/tests/subdir4.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure a top-level depcomp file is found when
-# AC_CONFIG_AUX_DIR is not specified.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir lib src
-
-cat >> configure.in << 'END'
-AC_PROG_RANLIB
-AC_PROG_CC
-AM_PROG_AR
-AC_CONFIG_FILES([lib/Makefile src/Makefile])
-AC_OUTPUT
-END
-
-# Files required because we are using `--gnu'.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-
-cat > Makefile.am << 'END'
-SUBDIRS = lib src
-END
-
-cat > lib/Makefile.am << 'END'
-pkgdata_DATA =
-noinst_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-END
-
-cat > lib/foo.c << 'END'
-int foo () {}
-END
-
-cat > src/Makefile.am << 'END'
-pkgdata_DATA =
-END
-
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE --gnu
-
-# Make sure that depcomp is *not* included in the definition
-# of DIST_COMMON in lib/Makefile.in.  If you change this test
-# so that more files are included in lib's DIST_COMMON definition,
-# then you must handle the case in which depcomp is listed on a
-# continued line.
-grep '^DIST_COMMON.*depcomp' lib/Makefile.in && Exit 1
-
-:
diff --git a/tests/subdir5.test b/tests/subdir5.test
deleted file mode 100755
index 3f4dfa3..0000000
--- a/tests/subdir5.test
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that adding a new directory works.
-# This test runs `make' from the top-level directory, subdir8.test
-# do it from a subdirectory.
-# PR automake/46
-
-# This test assumes that the `make' utility is able to start
-# over and reload Makefiles which have been remade (a non-POSIX feature).
-# See also the related test subdir8.test.
-required='GNUmake gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-cat > a.c << 'END'
-#include <stdio.h>
-int main ()
-{
-   printf ("hi liver!\n");
-   return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --add-missing
-./configure
-$MAKE
-
-# Now add new directories.
-
-# First we add a new directory by modifying configure.in directly.
-# We update configure.in *before* updating sub/Makefile.am; subdir8.test
-# does it in the other way: it updates confiles.m4 (which is m4_included
-# by configure.in there) after Makefile.am.
-
-# Modified configure dependencies must be newer than config.status.
-$sleep
-sed <configure.in >configure.tmp -e '/^AC_OUTPUT$/i\
-AC_CONFIG_FILES([maude/Makefile])\
-m4_include([confile.m4])\
-' # last newline required by older OpenBSD sed
-mv -f configure.tmp configure.in
-
-cat configure.in # might be useful for debugging
-
-: > confile.m4
-
-mkdir maude
-
-cat > maude/Makefile.am << 'END'
-include_HEADERS = foo.h
-END
-
-: > maude/foo.h
-
-echo 'SUBDIRS = maude' >> Makefile.am
-
-# We want a simple rebuild to create maude/Makefile automatically.
-$MAKE
-grep '^SUBDIRS = *maude *$' Makefile.in
-grep '^SUBDIRS = *maude *$' Makefile
-test -f maude/Makefile
-
-# Then we add a new directory by modifying a file included (through
-# `m4_include') by configure.in.
-mkdir maude2
-# Modified configure dependencies must be newer than config.status.
-$sleep
-cat >> confile.m4 << 'END'
-AC_CONFIG_FILES([maude2/Makefile])
-AC_SUBST([GREPME])
-END
-: > maude2/Makefile.am
-echo 'SUBDIRS += maude2' >> Makefile.am
-
-# We want a simple rebuild to create maude2/Makefile and update
-# all other Makefiles automatically.
-$MAKE
-grep '^SUBDIRS =.* maude2' Makefile.in
-grep '^SUBDIRS =.* maude2' Makefile
-
-for ext in '.in' ''; do
-  for d in . maude maude2; do
-    grep '^GREPME =' $d/Makefile$ext
-  done
-done
-
-:
diff --git a/tests/subdir6.test b/tests/subdir6.test
deleted file mode 100755
index f3a2107..0000000
--- a/tests/subdir6.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure config headers in subdirectories are cleaned.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
-AC_OUTPUT
-END
-
-touch Makefile.am
-mkdir sub
-
-$ACLOCAL
-$AUTOCONF
-touch sub/config.hin
-$AUTOMAKE
-./configure
-test -f sub/stamp-h1
-$MAKE clean
-test -f sub/stamp-h1
-$MAKE distclean
-test -f sub/stamp-h1 && Exit 1
-
-:
diff --git a/tests/subdir7.test b/tests/subdir7.test
deleted file mode 100755
index b50b250..0000000
--- a/tests/subdir7.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Naming a subdirectory `obj/' is a bad idea.  Automake should say so.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir obj
-
-cat >>configure.in << 'END'
-AC_CONFIG_FILES([obj/Makefile])
-AC_OUTPUT
-END
-
-: > obj/Makefile.am
-echo 'SUBDIRS = obj' >Makefile.am
-
-$ACLOCAL
-
-AUTOMAKE_fails
-grep 'Makefile.am:1:.*obj.*BSD' stderr
-
-cat >Makefile.am <<'END'
-SUBDIRS = @STH@
-FOO = obj
-DIST_SUBDIRS = $(FOO)
-END
-
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*obj.*BSD' stderr
-
-:
diff --git a/tests/subdir8.test b/tests/subdir8.test
deleted file mode 100755
index b39dfe4..0000000
--- a/tests/subdir8.test
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that adding a new directory works, even from
-# subdirectories.  (subdir5.test makes sure it works when make
-# is run from the top-level directory.)
-# PR automake/46
-
-# This test assumes that the `make' utility is able to start
-# over and reload Makefiles which have been remade (a non-POSIX feature).
-# See also the related test subdir5.test.
-required='GNUmake gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-m4_include([confiles.m4])
-MORE_DEFS
-AC_OUTPUT
-END
-
-echo 'AC_CONFIG_FILES([sub/Makefile])' > confiles.m4
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-ACLOCAL_AMFLAGS = -I m4
-END
-
-mkdir sub
-
-cat > sub/Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-cat > sub/a.c << 'END'
-#include <stdio.h>
-int main ()
-{
-   printf ("hi liver!\n");
-   return 0;
-}
-END
-
-mkdir m4
-echo 'AC_DEFUN([MORE_DEFS], [])' > m4/moredefs.m4
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-./configure
-$MAKE
-
-# Now add new directories.
-
-# The first step users typically do when adding a new subdir is
-# editing configure.in.  That is already tested by subdir5.test,
-# though, so here we try to just edit a file that is included by
-# configure.in, without touching configure.in itself.
-
-mkdir sub/maude
-cat > sub/maude/Makefile.am << 'END'
-include_HEADERS = foo.h
-END
-
-: > sub/maude/foo.h
-
-echo 'SUBDIRS = maude' >> sub/Makefile.am
-
-mkdir maude
-: > maude/Makefile.am
-
-# Update confiles.m4 *after* updating sub/Makefile.am; subdir5.test do
-# it in the other way: it updates configure.in before Makefile.am.
-# We sleep here because modified configure dependencies must be newer
-# than config.status.
-$sleep
-echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4
-
-# We want a simple rebuild from sub/ to create sub/maude/Makefile
-# and maude/Makefile automatically.
-cd sub
-$MAKE
-cd ..
-grep '^SUBDIRS = *maude *$' sub/Makefile.in
-grep '^SUBDIRS = *maude *$' sub/Makefile
-test -f maude/Makefile
-test -f sub/maude/Makefile
-
-# Make sure the dependencies of aclocal.m4 or honored at least from
-# the top-level directory.
-echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
-$MAKE
-
-for ext in '.in' ''; do
-  for d in . maude sub sub/maude; do
-    grep '^GREPME =' $d/Makefile$ext
-  done
-done
-
-:
diff --git a/tests/subdir9.test b/tests/subdir9.test
deleted file mode 100755
index 403a376..0000000
--- a/tests/subdir9.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test SUDBIRS with /.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([src/subdir/Makefile src/subdir2/Makefile])
-AC_OUTPUT
-END
-
-echo SUBDIRS = src/subdir >Makefile.am
-
-mkdir src
-mkdir src/subdir
-mkdir src/subdir2
-
-: >src/subdir/foo
-: >src/subdir2/foo
-
-cat >src/subdir/Makefile.am <<'EOF'
-EXTRA_DIST = foo
-SUBDIRS = ../subdir2
-EOF
-
-cat >src/subdir2/Makefile.am <<'EOF'
-EXTRA_DIST = foo
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --copy --add-missing
-./configure
-$MAKE distdir
-test -f $distdir/src/subdir/foo
-test -f $distdir/src/subdir2/foo
-$MAKE clean
-$MAKE distclean
-test ! -f src/subdir2/Makefile
-
-:
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
deleted file mode 100755
index a6a0035..0000000
--- a/tests/subdirbuiltsources.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure when using SUBDIR that all BUILT_SOURCES are built.
-# A bug occurred where subdirs do not have all-recursive or
-# all-recursive-am which depended on BUILT_SOURCES.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir lib
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([lib/Makefile])
-AC_PROG_RANLIB
-AC_PROG_CC
-AM_PROG_AR
-AC_OUTPUT
-END
-
-# Files required because we are using `--gnu'.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-
-cat > Makefile.am << 'END'
-SUBDIRS = lib
-END
-
-cat > lib/Makefile.am << 'END'
-pkgdata_DATA =
-noinst_LIBRARIES = libfoo.a
-libfoo_a_SOURCES = foo.c
-BUILT_SOURCES=foo.h
-foo.h:
-       echo \#define FOO_DEFINE 1 >$@
-END
-
-cat > lib/foo.c << 'END'
-#include <foo.h>
-int foo () { return !FOO_DEFINE;}
-END
-
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --force-missing --add-missing --gnu
-
-./configure
-
-# Remove the comment to get a successful test.
-# $MAKE -C lib foo.h
-$MAKE
-
-:
diff --git a/tests/subobj.test b/tests/subobj.test
deleted file mode 100755
index 39dc1b9..0000000
--- a/tests/subobj.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of subdir objects with C.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = generic/a.c generic/b.c
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-# Make sure compile is installed, and that Automake says so.
-grep 'install.*compile' stderr
-test -f compile
-
-grep '^generic/a\.\$(OBJEXT):' Makefile.in
-grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
-
-# Opportunistically test for a different bug.
-grep '^generic/b\.\$(OBJEXT):.*dirstamp' Makefile.in
-
-:
diff --git a/tests/subobj10.test b/tests/subobj10.test
deleted file mode 100755
index e446fba..0000000
--- a/tests/subobj10.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# PR 492: Test asm subdir-objects.
-
-required=gcc  # avoid compiler errors.
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([subdir-objects])
-
-AM_PROG_AS
-AM_PROG_AR
-AC_PROG_RANLIB
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libfoo.a libbar.a
-libfoo_a_SOURCES = src/a.s b.s
-libbar_a_SOURCES = src/c.s d.s
-libbar_a_CCASFLAGS =
-END
-
-mkdir src
-: >src/a.s
-: >b.s
-: >src/c.s
-: >d.s
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE
-$MAKE distcheck
-
-:
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
deleted file mode 100755
index 3bf3012..0000000
--- a/tests/subobj11a.test
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that automake works around a bug of Solaris Make. The bug is the
-# following.  If we have a Makefile containg a file inclusion like this:
-#   include .//foo.mk
-# Solaris make fails with a message like:
-#   make: ... can't find `/foo.mk': No such file or directory
-#   make: fatal error ... read of include file `/foo.mk' failed
-# (even if the file `foo.mk' exists). The error disappear by collapsing
-# the repeated slash `/' characters into a single one.
-#
-# See also sister "grepping" test `subobj11b.test', and related test
-# `subobj11c.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-## the `.//' is meant
-foo_SOURCES = .//src/foo.c
-END
-
-mkdir src
-
-cat > src/foo.c << 'END'
-int main(void)
-{
-  return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure --enable-dependency-tracking
-
-depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
-if test x"$depdir" != x; then
-  depdir=src/$depdir
-else
-  echo "$me: cannot extract value of DEPDIR from Makefile" >&2
-  Exit 1
-fi
-
-ls -l "$depdir"
-test -f "$depdir"/foo.Po
-
-echo 'quux:; echo "address@hidden@z" >$@' >> "$depdir"/foo.Po
-
-$MAKE quux
-$FGREP "address@hidden@z" quux
-
-$MAKE
-
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking' $MAKE distcheck
-
-:
diff --git a/tests/subobj11b.test b/tests/subobj11b.test
deleted file mode 100755
index 1db5fab..0000000
--- a/tests/subobj11b.test
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that automake works around a bug of Solaris Make. The bug is the
-# following.  If we have a Makefile containg a file inclusion like this:
-#   include .//foo.mk
-# Solaris make fails with a message like:
-#   make: ... can't find `/foo.mk': No such file or directory
-#   make: fatal error ... read of include file `/foo.mk' failed
-# (even if the file `foo.mk' exists). The error disappear by collapsing
-# the repeated slash `/' characters into a single one.
-#
-# See also "semantic" sister test `subobj11a.test', and related test
-# `subobj11c.test'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-## The `zardoz' sources should activate a code paths in Automake that
-## cannot be sensibly tested by sister test `subobj11a.test'.  The other
-## sources provide some sort of stress testing.
-foo_SOURCES = \
-  //server/zardoz0.c \
-  //server//zardoz1.c \
-  //server/path/to/zardoz2.c \
-  //server/another//path///to////zardoz3.c \
-  /foobar0.c \
-  ///foobar1.c \
-  ////foobar2.c \
-  /sub///foobar3.c \
-  ///sub/foobar4.c \
-  .//foobar5.c \
-  .//sub/foobar6.c \
-  ./sub//foobar7.c \
-  .//sub//foobar8.c \
-  sub/sub//sub///sub////foobar9.c
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-# Be lax in the regexp, to account for automake conditionals, the
-# use of @am__include@, and similar stuff.
-grep 'include.*//.*foobar' Makefile.in && Exit 1
-
-# These checks depend on automake internals, but presently this is
-# the only way to test the code path we are interested in.
-# Please update these checks when (and if) the relevant automake
-# internals are changed.
-for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do
-  case $x in
-   */*) d=`echo $x | sed 's,[^/]*$,,'`; b=`echo $x | sed 's,^.*/,,'`;;
-     *) d=''; b=$x;;
-  esac
-  # Be a little lax in the regexp, to account for automake conditionals,
-  # quoting, and similar stuff.
-  grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in
-done
-
-# Sanity checks.
-for i in 0 1 2 3 4 5 6 7 8 9; do
-  grep "am__include.*/foobar$i\\." Makefile.in
-done
-
-:
diff --git a/tests/subobj11c.test b/tests/subobj11c.test
deleted file mode 100755
index 9262d15..0000000
--- a/tests/subobj11c.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Automatic dependency tracking with subdir-objects option active:
-# check for a pathological case of slash-collapsing in the name of
-# included makefile fragments (containing dependency info).
-# See also related tests `subobj11a.test' and `subobj11b.test'
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo
-foo_SOURCES = //zardoz.c
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-#
-# This check depends on automake internals, but presently this is
-# the only way to test the code path we are interested in.
-# Please update these checks when (and if) the relevant automake
-# internals are changed.
-#
-# Be a little lax in the regexp, to account for automake conditionals,
-# quoting, and similar stuff.
-#
-# FIXME: Are we sure this is the most sensible output in our situation?
-#
-grep '^[^/]*am__include[^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
-
-:
diff --git a/tests/subobj2.test b/tests/subobj2.test
deleted file mode 100755
index 87a4671..0000000
--- a/tests/subobj2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of subdir objects with C++.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = generic/a.cc generic/b.cxx
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-$FGREP 'generic/a.$(OBJEXT)' Makefile.in
-grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
-grep '.*-c -o' Makefile.in
-
-:
diff --git a/tests/subobj3.test b/tests/subobj3.test
deleted file mode 100755
index 4fe685c..0000000
--- a/tests/subobj3.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of subdir objects with C++.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = hello
-hello_SOURCES = sub/hello.c
-END
-
-mkdir sub
-cat > sub/hello.c << 'END'
-#include <stdio.h>
-int
-main (int argc, char *argv[])
-{
-   printf ("yeah, yeah\n");
-   return 0;
-}
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-# We use gcc and not gcc -traditional as the latter fails on some
-# Linux boxes (Red Hat 5.1 in particular).
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
-
-:
diff --git a/tests/subobj4.test b/tests/subobj4.test
deleted file mode 100755
index ead2305..0000000
--- a/tests/subobj4.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `../foo/foo.cpp' generates a rule.
-# Report from Dave Brolley.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_CONFIG_FILES([d1/Makefile d2/Makefile])
-AC_OUTPUT
-END
-
-mkdir d1 d2
-
-cat > Makefile.am << 'END'
-SUBDIRS = d1 d2
-END
-
-cat > d1/Makefile.am << 'END'
-bin_PROGRAMS = z
-z_SOURCES = ../d2/z.c
-END
-
-cat > d2/Makefile.am << 'END'
-END
-
-: > compile
-: > d2/z.c
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '\$(CC) .*\.\./d2/z\.c' d1/Makefile.in
-
-:
diff --git a/tests/subobj5.test b/tests/subobj5.test
deleted file mode 100755
index c857e73..0000000
--- a/tests/subobj5.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of subdir make dist rules.
-# From Robert Collins
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([generic/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = generic/a.c
-END
-
-mkdir generic
-: > generic/a.c
-: > generic/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --add-missing
-
-./configure
-
-$MAKE dist
-
-:
diff --git a/tests/subobj6.test b/tests/subobj6.test
deleted file mode 100755
index 228a1e9..0000000
--- a/tests/subobj6.test
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of subdir make distclean rules.
-# From Robert Collins
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = generic/a.c
-
-test-all: all
-       test -f generic/$(am__dirstamp)
-test-mostlyclean: mostlyclean
-       test ! -f generic/a.o
-test-distclean: distclean
-       test ! -f generic/$(am__dirstamp)
-END
-
-mkdir generic
-cat > generic/a.c << 'END'
-#include <stdio.h>
-int main ()
-{
-   printf ("maude!\n");
-   return 0;
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --add-missing
-
-mkdir build
-cd build
-
-../configure
-$MAKE test-all
-$MAKE test-mostlyclean
-$MAKE test-distclean
-
-cd ..
-
-# Now test without the subdir.
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-END
-
-mv generic/a.c a.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --include-deps --copy --add-missing
-
-mkdir build2
-cd build2
-
-../configure
-$MAKE
-$MAKE mostlyclean
-
-:
diff --git a/tests/subobj7.test b/tests/subobj7.test
deleted file mode 100755
index dd1a8fe..0000000
--- a/tests/subobj7.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure AM_CFLAGS appears in subdir compilation rule.
-# Report from Steve M. Robbins.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = wish
-wish_SOURCES = foo.c generic/a.c
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-grep wish_CFLAGS Makefile.in && Exit 1
-
-:
diff --git a/tests/subobj8.test b/tests/subobj8.test
deleted file mode 100755
index ae9b09b..0000000
--- a/tests/subobj8.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `compile' is included when subdir-objects is used in a subdir.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([tools])
-AM_INIT_AUTOMAKE
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_CONFIG_FILES([Makefile foo/Makefile])
-AC_OUTPUT
-END
-
-mkdir tools foo foo/bar
-
-cat > Makefile.am << 'END'
-SUBDIRS = foo
-END
-
-cat > foo/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = mumble
-mumble_SOURCES = bar/a.c
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-test -f tools/compile
-
-:
diff --git a/tests/subobj9.test b/tests/subobj9.test
deleted file mode 100755
index 39ba33e..0000000
--- a/tests/subobj9.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2004, 2005, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for PR 312.
-
-required='libtoolize g++'
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE([subdir-objects])
-AC_PROG_CXX
-AM_PROG_AR
-AM_PROG_LIBTOOL
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = src/foo.cc .//src/bar.cc  # the `.//' is meant.
-.PHONY: print
-print:
-       @echo BEG1: "$(LTCXXCOMPILE)" :1END
-       @echo BEG2: "$(CXXLINK)" :2END
-END
-
-mkdir src
-cat > src/foo.cc << 'END'
-int doit2 (void);
-int doit (void)
-{
-   return doit2();
-}
-END
-
-cat > src/bar.cc << 'END'
-int doit2 (void)
-{
-   return 23;
-}
-END
-
-
-libtoolize --force
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Skip this test on configure errors (e.g., broken C++ compilers).
-./configure || Exit 77
-
-# Ensure './libtool --help' will use the right tool versions.
-export AUTOCONF AUTOMAKE
-
-# Opportunistically check that --tag=CXX is used when supported.
-if ./libtool --help | grep tag=TAG; then
-  $MAKE print >stdout || { cat stdout; Exit 1; }
-  cat stdout
-  grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
-  grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout
-fi
-
-$MAKE
-$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
-cat output
-# GNU Make used to complain that the Makefile contained two rules
-# for `src/.dirstamp' and `.//src/.dirstamp'.
-grep 'overriding commands' output && Exit 1
-
-:
diff --git a/tests/subobjname.test b/tests/subobjname.test
deleted file mode 100755
index a8128bb..0000000
--- a/tests/subobjname.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we reuse variables whenever possible, to limit
-# combinational explosion.  (This test is named after the &subobjname
-# sub in Automake).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_CONDITIONAL([FOO1], [some test])
-AM_CONDITIONAL([FOO2], [some test])
-AM_CONDITIONAL([FOO3], [some test])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = c d
-
-if FOO1
-A1=a1.c
-endif
-
-if FOO2
-A2=a2.c
-endif
-
-if FOO3
-A3=a3.c
-endif
-
-B=$(A1) $(A2) $(A3)
-
-c_SOURCES=$(B)
-d_SOURCES=$(B)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-# Sanity check: make sure am_c_OBJECTS and am_d_OBJECTS are used
-# in the Makefile.  (This is an internal detail, so better make
-# sure we update this test if the naming changes in the future.)
-grep '^am_c_OBJECTS = ' Makefile.in
-grep '^am_d_OBJECTS = ' Makefile.in
-
-# Now the actual test.  Are both values equal?
-cobj=`sed -n '/^am_c_OBJECTS = / {
-               s/.* = \(.*\)$/\1/
-               p
-              }' Makefile.in`
-dobj=`sed -n '/^am_d_OBJECTS = / {
-               s/^.* = \(.*\)$/\1/
-               p
-              }' Makefile.in`
-test "$cobj" = "$dobj"
-
-:
diff --git a/tests/subpkg-yacc.test b/tests/subpkg-yacc.test
deleted file mode 100755
index 011d5c2..0000000
--- a/tests/subpkg-yacc.test
+++ /dev/null
@@ -1,151 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that ylwrap is installed properly, and $(YLWRAP) us defined
-# properly, when a subpackage is involved.
-
-required='cc yacc'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AC_CONFIG_SUBDIRS([lib])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib
-bin_PROGRAMS = MU
-MU_LDADD = lib/liblib.a
-# It's ok to override distdir.
-distdir = subpack-1
-# Remove a file created by rules in subdir lib.
-CLEANFILES = lib-dist-hook-has-run
-EOF
-
-cat >MU.c <<'EOF'
-int lib (void);
-int main (void)
-{
-  return lib ();
-}
-EOF
-
-mkdir lib
-mkdir lib/src
-
-cat >lib/configure.ac <<'EOF'
-AC_INIT([lib], [2.3])
-AM_INIT_AUTOMAKE
-AC_PROG_RANLIB
-AC_PROG_YACC
-dnl This comes after YACC and RANLIB checks, deliberately.
-AC_PROG_CC
-AM_PROG_AR
-AC_CONFIG_HEADERS([config.h:config.hin])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-EOF
-
-cat >lib/Makefile.am <<'EOF'
-noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES = src/x.c foo.y
-EXTRA_liblib_a_SOURCES = bar.y
-
-dist-hook:
-       test -d $(top_distdir)
-       test -d $(distdir)
-       find $(top_distdir) $(distdir) ;: For debugging.
-       test -f $(top_distdir)/MU.c
-       test ! -f $(distdir)/MU.c
-       for suf in y c; do \
-         for name in foo bar; do \
-           test -f $(distdir)/$$name.$$suf || exit 1; \
-           test ! -f $(top_distdir)/$$name.$$suf || exit 1; \
-         done; \
-       done
-       test -f $(distdir)/foo.y
-       test ! -f $(top_distdir)/foo.y
-       test -f $(distdir)/src/x.c
-       test ! -f $(top_distdir)/src/x.c
-       test -f $(YLWRAP)
-       : > $(top_builddir)/../lib-dist-hook-has-run
-EOF
-
-cat > lib/foo.y << 'END'
-%{
-int yylex (void) { return 0; }
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-cp lib/foo.y lib/bar.y
-
-cat >lib/src/x.c <<'EOF'
-#include <config.h>
-int lib (void)
-{
-  return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-override
-
-cd lib
-$ACLOCAL
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE -Wno-override --add-missing
-cd ..
-
-# Some checks here are slightly more tricky than we'd like, but we cannot
-# simply use "make distcheck", to avoid triggering a spurious failure due
-# to issues with FreeBSD make and VPATH builds (see automake bug#7884).
-
-./configure
-$MAKE
-$MAKE dist
-test -f lib-dist-hook-has-run
-test -f subpack-1.tar.gz
-test ! -d subpack-1 # Make sure "dist" cleans up after itself.
-
-mkdir workdir
-cd workdir
-gzip -c -d ../subpack-1.tar.gz | tar xf -
-test -d subpack-1
-mkdir build
-cd build
-../subpack-1/configure
-$MAKE
-$MAKE dist
-test -f lib-dist-hook-has-run
-test -f subpack-1.tar.gz
-test ! -d subpack-1 # Make sure "dist" cleans up after itself.
-
-# Don't trust non-GNU makes to do distcheck with a Yacc-using
-# package (see bug referenced above).
-if using_gmake; then
-  $MAKE distcheck || Exit 1
-fi
-
-:
diff --git a/tests/subpkg.test b/tests/subpkg.test
deleted file mode 100755
index 381fc54..0000000
--- a/tests/subpkg.test
+++ /dev/null
@@ -1,115 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check subpackage handling.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-mkdir m4
-
-cat >m4/foo.m4 <<'EOF'
-AC_DEFUN([FOO],[
-  AC_PROG_CC
-  AC_OUTPUT
-])
-EOF
-
-cat >>configure.in <<'END'
-AC_CONFIG_SUBDIRS([lib])
-FOO
-END
-
-cat >Makefile.am <<'EOF'
-SUBDIRS = lib
-# Yes, This program is named LDADD.  So what?
-bin_PROGRAMS = LDADD
-LDADD_LDADD = lib/liblib.a
-
-# It's ok to override distdir.
-distdir = subpack-1
-
-# Make sure $(distdir) and $(top_distdir) work as expected.
-dist-hook:
-       test -f $(distdir)/LDADD.c
-       test -f $(top_distdir)/LDADD.c
-
-ACLOCAL_AMFLAGS = -I m4
-EOF
-
-cat >LDADD.c <<'EOF'
-int lib (void);
-int main (void)
-{
-  return lib ();
-}
-EOF
-
-mkdir lib
-mkdir lib/src
-
-cat >lib/configure.ac <<'EOF'
-AC_INIT([lib], [2.3])
-AM_INIT_AUTOMAKE
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_CONFIG_HEADERS([config.h:config.hin])
-AC_CONFIG_FILES([Makefile])
-FOO
-EOF
-
-cat >lib/Makefile.am <<'EOF'
-noinst_LIBRARIES = liblib.a
-liblib_a_SOURCES = src/x.c
-
-dist-hook:
-       test ! -f $(distdir)/LDADD.c
-       test -f $(top_distdir)/LDADD.c
-       test -f $(distdir)/src/x.c
-       test ! -f $(top_distdir)/src/x.c
-
-ACLOCAL_AMFLAGS = -I ../m4
-EOF
-
-cat >lib/src/x.c <<'EOF'
-#include <config.h>
-int lib (void)
-{
-  return 0;
-}
-EOF
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE -Wno-override
-
-cd lib
-$ACLOCAL -I ../m4
-$FGREP 'm4_include([../m4/foo.m4])' aclocal.m4
-$AUTOCONF
-$AUTOHEADER
-$AUTOMAKE -Wno-override --add-missing
-cd ..
-
-./configure
-$MAKE
-$MAKE distcheck
-test ! -d subpack-1 # Make sure distcheck cleans up after itself.
-test -f subpack-1.tar.gz
-
-:
diff --git a/tests/subpkg2.test b/tests/subpkg2.test
deleted file mode 100755
index ebbc69b..0000000
--- a/tests/subpkg2.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Try a DIST_SUBDIRS subpackage with no SUBDIRS.
-# Report from Gary V. Vaughan.
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir m4
-
-cat >m4/foo.m4 <<'EOF'
-AC_DEFUN([FOO],[
-  AC_OUTPUT
-])
-EOF
-
-cat >>configure.in <<'END'
-AC_CONFIG_SUBDIRS([sub])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'EOF'
-DIST_SUBDIRS = sub
-dist-hook:
-       test -f $(distdir)/sub/script.in
-EOF
-
-mkdir sub
-
-cat >sub/configure.ac <<'EOF'
-AC_INIT([sub], [2.3])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([script])
-FOO
-EOF
-
-: >sub/script.in
-echo ACLOCAL_AMFLAGS = -I ../m4 > sub/Makefile.am
-
-$ACLOCAL -I m4
-$AUTOCONF
-$AUTOMAKE
-
-cd sub
-$ACLOCAL -I ../m4
-$FGREP 'm4_include([../m4/foo.m4])' aclocal.m4
-$AUTOCONF
-$AUTOMAKE -Wno-override
-cd ..
-
-./configure
-$MAKE distcheck
diff --git a/tests/subpkg3.test b/tests/subpkg3.test
deleted file mode 100755
index d57ee37..0000000
--- a/tests/subpkg3.test
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# make sure different subpackages may share files and directories.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am <<'END'
-SUBDIRS = subpkg
-EXTRA_DIST = subpkg/foobar
-END
-
-cat >>configure.in <<'END'
-AC_CONFIG_SUBDIRS([subpkg])
-AC_OUTPUT
-END
-
-mkdir subpkg
-
-echo foobar >subpkg/foobar
-
-echo SUBDIRS = >subpkg/Makefile.am
-
-cat >subpkg/configure.in <<'END'
-AC_INIT([subpkg], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-cd subpkg
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd ..
-
-./configure
-$MAKE distcheck
diff --git a/tests/subpkg4.test b/tests/subpkg4.test
deleted file mode 100755
index 1a6835a..0000000
--- a/tests/subpkg4.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure `distdir' fixes the mode of files and directories
-# copied into `$(distdir)', even with sub-packages.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am <<'END'
-SUBDIRS = subpkg
-test-distdir-is-readable:
-       bad_dirs=`find $(distdir) -type d ! -perm -755 -print`; \
-       if test -n "$$bad_dirs"; then \
-         echo "directories not permissive: $$bad_dirs" >&2; \
-         exit 1; \
-       fi
-       bad_files=`find $(distdir) ! -type d ! -perm -444 -print`; \
-       if test -n "$$bad_files"; then \
-         echo "file not permissive: $$bad_files" >&2; \
-         exit 1; \
-       fi
-END
-
-cat >>configure.in <<'END'
-AC_CONFIG_SUBDIRS([subpkg])
-AC_OUTPUT
-END
-
-mkdir subpkg subpkg/dir
-echo foobar >subpkg/foobar
-echo baz > subpkg/dir/baz
-
-chmod go-rwx subpkg/foobar subpkg/dir/baz subpkg/dir
-
-cat >subpkg/Makefile.am <<'END'
-EXTRA_DIST = foobar dir
-END
-
-cat >subpkg/configure.in <<'END'
-AC_INIT([subpkg], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-cd subpkg
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd ..
-
-./configure
-$MAKE distdir
-$MAKE test-distdir-is-readable
diff --git a/tests/subst.test b/tests/subst.test
deleted file mode 100755
index ebc73ca..0000000
--- a/tests/subst.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that AC_SUBST($1) does something sensible.  From Ulrich
-# Drepper.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-dnl This test used to have the following lines, which cannot have
-dnl worked sensibly with Autoconf for years, however:
-dnl AC_SUBST($1)
-dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
-dnl
-AC_DEFUN([FOO],
-[AC_SUBST([$1])])
-FOO([BAR])
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-grep '^\$1' Makefile.in && Exit 1
-
-:
diff --git a/tests/subst2.test b/tests/subst2.test
deleted file mode 100755
index 2bbabdd..0000000
--- a/tests/subst2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure a multi-line definition cannot be terminated by an empty
-# line (when there are @substitutions@ inside).
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([ABCDEFGHIJKLMNOPQRSTUVWX])
-AC_SUBST([ABCDEFGHIJKLMNOPQRSTUVWXY])
-AC_SUBST([ABCDEFGHIJKLMNOPQRSTUVWXYZ])
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = x @ABCDEFGHIJKLMNOPQRSTUVWX@ @ABCDEFGHIJKLMNOPQRSTUVWXY@ 
@ABCDEFGHIJKLMNOPQRSTUVWXYZ@
-EXTRA_PROGRAMS =
-
-EXEEXT = .bin
-
-print-programs:
-       @echo BEG: $(bin_PROGRAMS) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-EXEEXT=.bin $MAKE print-programs >foo
-cat foo
-grep 'BEG: x.bin :END' foo
-EXEEXT=.bin am__empty=X $MAKE -e print-programs >foo
-cat foo
-grep 'BEG: x.bin X :END' foo
-
-# Test for another bug, where EXTRA_PROGRAMS was removed because it was empty.
-grep EXTRA_PROGRAMS Makefile.in
diff --git a/tests/subst3.test b/tests/subst3.test
deleted file mode 100755
index c7adc8c..0000000
--- a/tests/subst3.test
+++ /dev/null
@@ -1,178 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008  Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test installation with substitutions.  This test is based on nobase.test.
-
-required='gcc'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-if test -n "$doit"; then
-  AC_SUBST([basehdr], [sub/base.h])
-  AC_SUBST([nobasehdr], [sub/nobase.h])
-  AC_SUBST([basedata], [sub/base.dat])
-  AC_SUBST([nobasedata], [sub/nobase.dat])
-  AC_SUBST([basescript], [sub/base.sh])
-  AC_SUBST([nobasescript], [sub/nobase.sh])
-  AC_SUBST([baseprog], ['sub/base$(EXEEXT)'])
-  AC_SUBST([nobaseprog], ['sub/nobase$(EXEEXT)'])
-  AC_SUBST([baselib], [sub/libbase.a])
-  AC_SUBST([nobaselib], [sub/libnobase.a])
-fi
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'EOF'
-foodir = $(prefix)/foo
-fooexecdir = $(prefix)/foo
-
-foo_HEADERS = @basehdr@
-nobase_foo_HEADERS = @nobasehdr@
-EXTRA_HEADERS = sub/base.h sub/nobase.h
-
-dist_foo_DATA = @basedata@
-nobase_dist_foo_DATA = @nobasedata@
-
-dist_fooexec_SCRIPTS = @basescript@
-nobase_dist_fooexec_SCRIPTS = @nobasescript@
-EXTRA_SCRIPTS = sub/base.sh sub/nobase.sh
-
-fooexec_PROGRAMS = @baseprog@
-nobase_fooexec_PROGRAMS = @nobaseprog@
-EXTRA_PROGRAMS = sub/base sub/nobase
-sub_base_SOURCES = source.c
-sub_nobase_SOURCES = source.c
-
-fooexec_LIBRARIES = @baselib@
-nobase_fooexec_LIBRARIES = @nobaselib@
-EXTRA_LIBRARIES = sub/libbase.a sub/libnobase.a
-sub_libbase_a_SOURCES = source.c
-sub_libnobase_a_SOURCES = source.c
-
-test-install-data: install-data
-       test   -f inst/foo/sub/nobase.h
-       test ! -f inst/foo/nobase.h
-       test   -f inst/foo/base.h
-       test   -f inst/foo/sub/nobase.dat
-       test ! -f inst/foo/nobase.dat
-       test   -f inst/foo/base.dat
-       test ! -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/pbase.sh
-       test ! -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pbase$(EXEEXT)
-       test ! -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libbase.a
-
-test-install-exec: install-exec
-       test   -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/pnobase.sh
-       test   -f inst/foo/pbase.sh
-       test   -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pnobase$(EXEEXT)
-       test   -f inst/foo/pbase$(EXEEXT)
-       test   -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libnobase.a
-       test   -f inst/foo/libbase.a
-
-test-install-nothing-data: install-data
-       test ! -f inst/foo/sub/nobase.h
-       test ! -f inst/foo/nobase.h
-       test ! -f inst/foo/base.h
-       test ! -f inst/foo/sub/nobase.dat
-       test ! -f inst/foo/nobase.dat
-       test ! -f inst/foo/base.dat
-       test ! -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/pbase.sh
-       test ! -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pbase$(EXEEXT)
-       test ! -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libbase.a
-
-test-install-nothing-exec: install-exec
-       test ! -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/pnobase.sh
-       test ! -f inst/foo/pbase.sh
-       test ! -f inst/foo/sub/pnobase$(EXEEXT)
-       test ! -f inst/foo/pnobase$(EXEEXT)
-       test ! -f inst/foo/pbase$(EXEEXT)
-       test ! -f inst/foo/sub/libnobase.a
-       test ! -f inst/foo/libnobase.a
-       test ! -f inst/foo/libbase.a
-EOF
-
-mkdir sub
-
-: > sub/base.h
-: > sub/nobase.h
-: > sub/base.dat
-: > sub/nobase.dat
-: > sub/base.sh
-: > sub/nobase.sh
-
-cat >source.c <<'EOF'
-int
-main (int argc, char *argv[])
-{
-  return 0;
-}
-EOF
-cp source.c source2.c
-
-rm -f install-sh
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a --copy
-./configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
-
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-$MAKE clean
-
-test `find inst/foo -type f -print | wc -l` = 0
-
-./configure --prefix "`pwd`/inst" --program-prefix=p doit=
-
-$MAKE
-$MAKE test-install-nothing-data
-$MAKE test-install-nothing-exec
-$MAKE uninstall
-
-
-# Likewise, in a VPATH build.
-
-$MAKE distclean
-mkdir build
-cd build
-../configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
-$MAKE
-$MAKE test-install-data
-$MAKE test-install-exec
-$MAKE uninstall
-test `find inst/foo -type f -print | wc -l` = 0
-
-../configure --prefix "`pwd`/inst" --program-prefix=p doit=
-$MAKE
-$MAKE test-install-nothing-data
-$MAKE test-install-nothing-exec
diff --git a/tests/subst4.test b/tests/subst4.test
deleted file mode 100755
index 5f3fdd6..0000000
--- a/tests/subst4.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test AM_SUBST_NOTMAKE.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'EOF'
-myrule="\
-foo: bar
-       echo making \$@ from bar
-       echo \$@ > \$@
-"
-AC_SUBST([myrule])
-AM_SUBST_NOTMAKE([myrule])
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
address@hidden@
-EOF
-: > bar
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE foo
-test -f foo
-:
diff --git a/tests/substre2.test b/tests/substre2.test
deleted file mode 100755
index ffe9e8b..0000000
--- a/tests/substre2.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in variable substitution references, where
-# undefined variables break later substitutions.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-
-foo = foo.a foo.b $(doesnt_exist)
-bar = bar.a bar.b
-var1 = $(foo:.a=1.c) $(doesnt_exist:.b=2.c) $(bar:.a=3.c)
-var2 = $(var1:.b=4.c)
-
-bin_PROGRAMS = foo
-foo_SOURCES = $(var2)
-
-OBJEXT = obj
-echorule:
-       @echo BEG: $(foo_OBJECTS) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE echorule >output || { cat output; Exit 1; }
-cat output
-$FGREP 'BEG: foo1.obj foo4.obj bar3.obj bar4.obj :END' output
-
-:
diff --git a/tests/substref.test b/tests/substref.test
deleted file mode 100755
index 6bbe8b1..0000000
--- a/tests/substref.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug in variable substitution references when left hand
-# pattern is null.
-# Report from Richard Boulton
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat > hello.c << 'END'
-END
-
-cat > Makefile.am << 'END'
-
-var1 = dlmain
-
-var2 = $(var1:=.)
-
-helldl_SOURCES = $(var2:=c)
-
-bin_PROGRAMS = helldl
-
-got:
-       @echo $(helldl_SOURCES) $(helldl_OBJECTS) >got
-
-END
-
-# Ignore user CFLAGS.
-CFLAGS=
-export CFLAGS
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
-echo dlmain.c dlmain.$objext >exp
-$MAKE got
-cat got
-diff exp got
-
-# This is unrelated to the rest of this test.  But while we are
-# at it, make sure we don't use am__helldl_SOURCES_DIST here, since
-# it's not needed.  DIST_SOURCES should contain $(helldl_SOURCES).
-grep am__helldl_SOURCES_DIST Makefile && Exit 1
-grep 'DIST_SOURCES.*\$(helldl_SOURCES)' Makefile
-
-:
diff --git a/tests/substtarg.test b/tests/substtarg.test
deleted file mode 100755
index 34db19f..0000000
--- a/tests/substtarg.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that substitutions in variables work.
-# From Lars J. Aas.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SOURCE([fakelib.c])
-AC_PROG_CC
-AM_PROG_AR
-RANLIB=:
-AC_SUBST([RANLIB])
-SUBST=hei
-AC_SUBST([SUBST])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = address@hidden@.a
-
address@hidden@_a_SOURCES = abra.c kadabra.c
-
-# then we override the target rule:
address@hidden@.a: Makefile $(address@hidden@_a_OBJECTS) 
$(address@hidden@_a_DEPENDENCIES)
-       @echo here we do some custom stuff, instead of invoking the linker
-END
-
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'address@hidden@.a' stderr
-$AUTOMAKE -Wno-override
-num=`grep 'address@hidden@.a:' Makefile.in | wc -l`
-test $num -eq 1
diff --git a/tests/suffix.test b/tests/suffix.test
deleted file mode 100755
index c790c66..0000000
--- a/tests/suffix.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure a suffix rule for C compilation is produced.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-noinst_PROGRAMS = foo
-END
-
-$ACLOCAL
-
-$AUTOMAKE -i
-grep '^\.c\.o' Makefile.in
-
-$AUTOMAKE
-grep '^\.c\.o' Makefile.in
-
-:
diff --git a/tests/suffix10.test b/tests/suffix10.test
deleted file mode 100755
index bdc4928..0000000
--- a/tests/suffix10.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that derivations work with .lo too.
-# (related to PR/37)
-
-required='libtoolize bison'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AC_PROG_YACC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-
-cat >Makefile.am << 'END'
-lib_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = foo.x_
-
-.x_.y:
-       cp $< $@
-
-print:
-       echo BEGIN: $(libfoo_la_OBJECTS) :END
-END
-
-libtoolize --force
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-
-$MAKE print >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep 'BEGIN: foo.lo :END' stdout
-
-:
diff --git a/tests/suffix11.test b/tests/suffix11.test
deleted file mode 100755
index 91d2cf4..0000000
--- a/tests/suffix11.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Tests that Automake understands multiple suffix rules on the same line.
-# PR/371 and PR/372: Reported by Duncan Gibson.
-# We also check for suffixes containing `-'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat >Makefile.am << 'END'
-bin_PROGRAMS = foo bar baz
-foo_SOURCES = foo.x_
-bar_SOURCES = bar.y-z
-baz_SOURCES = baz1.x_ baz2.y-z
-.y-z.c .x_.c:
-       cp $< $@
-  .z_.c   .w_.x_ :
-       cp $< $@
-
-.PHONY: print
-print:
-       @echo BEGIN: $(foo_OBJECTS) :END
-       @echo BEGIN: $(bar_OBJECTS) :END
-       @echo BEGIN: $(baz_OBJECTS) :END
-END
-
-$ACLOCAL
-$AUTOCONF
-
-# What we do is not portable.  Automake should warn.
-AUTOMAKE_fails -a
-grep '[iI]nference rules can have only one target before the colon' stderr
-
-# But this should work anyway.
-$AUTOMAKE -a -Wno-portability
-
-./configure
-
-OBJEXT=foo $MAKE -e print >stdout || { cat stdout; Exit 1; }
-cat stdout
-$FGREP 'BEGIN: foo.foo :END' stdout
-$FGREP 'BEGIN: bar.foo :END' stdout
-$FGREP 'BEGIN: baz1.foo baz2.foo :END' stdout
-
-:
diff --git a/tests/suffix12.test b/tests/suffix12.test
deleted file mode 100755
index 21089a5..0000000
--- a/tests/suffix12.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Tests that Automake understands suffix rules with subdir objects.
-# Reported by John Ratliff.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat >Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-SUFFIXES = .baz .o
-# we fake here:
-.baz.o:
-       cp $< $@
-
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c sub/bar.baz
-
-.PHONY: print
-print:
-       @echo BEGIN: $(foo_OBJECTS) :END
-END
-
-mkdir sub
-: > sub/bar.baz
-: > foo.c
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-OBJEXT=OBJ $MAKE -e print >stdout || { cat stdout; Exit 1; }
-cat stdout
-$FGREP 'BEGIN: foo.OBJ sub/bar.OBJ :END' stdout
-
-:
diff --git a/tests/suffix13.test b/tests/suffix13.test
deleted file mode 100755
index 8120024..0000000
--- a/tests/suffix13.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Tests that Automake understands suffix rules with renamed objects
-# and subdir objects.
-# Reported by Florian Briegel.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<EOF
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat >Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-SUFFIXES = .baz .c
-.baz.c:
-       case $@ in sub/*) $(MKDIR_P) sub;; *) :;; esac
-## Account for VPATH issues on weaker make implementations (e.g. IRIX 6.5)
-       cp `test -f '$<' || echo $(srcdir)/`$< $@
-
-DISTCLEANFILES = sub/bar.c
-
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c sub/bar.baz
-foo_CFLAGS =
-END
-
-mkdir sub
-cat > sub/bar.baz <<'END'
-extern int foo ();
-int main () { return foo (); }
-END
-cat > foo.c <<'END'
-int foo () { return 0; }
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-./configure
-$MAKE
-
-$MAKE distcheck
-$MAKE distclean
-
-# Should also work without subdir-objects
-
-sed '/subdir-objects/d' < Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE --force
-./configure
-$MAKE
-$MAKE distcheck
-
-:
diff --git a/tests/suffix2.test b/tests/suffix2.test
deleted file mode 100755
index f55d965..0000000
--- a/tests/suffix2.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure .c.o rule is only included once.
-required=libtoolize
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-lib_LTLIBRARIES = libltdl.la
-libltdl_la_SOURCES = ltdl.c ltdl.h
-END
-
-# Create all the files created libtoolize so we don't run libtoolize.
-# We don't want the user to need libtool to run this test.
-: > ltconfig
-: > ltmain.sh
-: > config.guess
-: > config.sub
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test `grep -c '^\.c\.o:' Makefile.in` -eq 1
-test `grep -c '^\.c\.obj:' Makefile.in` -eq 1
-
-:
diff --git a/tests/suffix3.test b/tests/suffix3.test
deleted file mode 100755
index fc445bf..0000000
--- a/tests/suffix3.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that suffix rules chain.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-END
-
-cat > Makefile.am << 'END'
-SUFFIXES = .zoo
-.zoo.cc:
-       convert-zoo whatever
-bin_PROGRAMS = foo
-foo_SOURCES = foo.zoo
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# The foo.cc intermediate step is implicit, it's a mistake if
-# Automake requires this file somewhere.
-$FGREP foo.cc Makefile.in && Exit 1
-# However Automake must figure that foo.zoo is eventually
-# transformed into foo.o, and use this latter file (to link foo).
-$FGREP 'foo.$(OBJEXT)' Makefile.in
-
-:
diff --git a/tests/suffix4.test b/tests/suffix4.test
deleted file mode 100755
index e952283..0000000
--- a/tests/suffix4.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure Automake doesn't abort on user-defined extensions.
-# Based on a report from Dmitry Mikhin <address@hidden>.
-
-# Also make sure that .SUFFIXES is automatically adjusted with
-# extensions from implicit rules.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-.k.o:
-       echo $< > $@
-
-bin_PROGRAMS = foo
-foo_SOURCES = foo.k
-END
-
-$ACLOCAL
-$AUTOMAKE
-grep '.SUFFIXES:.*\.k' Makefile.in
-
-:
diff --git a/tests/suffix5.test b/tests/suffix5.test
deleted file mode 100755
index 2cf0afa..0000000
--- a/tests/suffix5.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure Automake include libtool objects resulting
-# from user-defined implicit rules.
-# Based on a report from Arkadiusz Miskiewicz <address@hidden>.
-
-required=libtool
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_AR
-AC_PROG_LIBTOOL
-END
-
-cat > Makefile.am << 'END'
-.k.lo:
-       echo $< > $@
-
-noinst_LTLIBRARIES = libfoo.la
-libfoo_la_SOURCES = foo.k
-END
-
-: > ltmain.sh
-: > config.guess
-: > config.sub
-: > ar-lib
-
-$ACLOCAL
-$AUTOMAKE
-grep '_OBJECTS.*foo\.lo' Makefile.in
-
-:
diff --git a/tests/suffix6.test b/tests/suffix6.test
deleted file mode 100755
index ab7cf64..0000000
--- a/tests/suffix6.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure Automake supports implicit rules with dot-less
-# extensions.  Also make sure that `.o' is handled like `.$(OBJEXT)'.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUFFIXES = a b .$(OBJEXT) c .o
-bin_PROGRAMS = foo
-foo_SOURCES = fooa fuc
-ab:
-        cp $< $@
-b.$(OBJEXT):
-       cp $< $@
-c.o:
-       cp $< $@
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# Automake must figure that fooa translates to foo.$(OBJEXT) and
-# foo.$(OBJEXT) using the following rules:
-#  fooa --[ab]--> foob --[b.$(OBJEXT)]--> foo.$(OBJEXT)
-grep '_OBJECTS.* foo\.\$(OBJEXT)' Makefile.in
-#  fuc --[c.o]--> fu.$(OBJEXT)  ## This is really meant !
-grep '_OBJECTS.* fu\.\$(OBJEXT)' Makefile.in
-
-:
diff --git a/tests/suffix7.test b/tests/suffix7.test
deleted file mode 100755
index eb67195..0000000
--- a/tests/suffix7.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure Automake supports implicit rules "confusing"
-# extensions.  Inspired by a mail from Alex Hornby.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUFFIXES = .idl S.cpp C.h
-SUFFIXES += C.cpp S.h
-.idlC.cpp:
-       cp $< $@
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-# Make sure Automake has NOT recognized .cpp and .idlC as two new
-# extensions.
-grep 'SUFFIXES.* \.cpp' Makefile.in && Exit 1
-grep 'SUFFIXES.* \.idlC' Makefile.in && Exit 1
-
-:
diff --git a/tests/suffix8.test b/tests/suffix8.test
deleted file mode 100755
index 4110056..0000000
--- a/tests/suffix8.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2010, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure Automake supports multiple derivations for the same suffix.
-# PR/37
-
-required='gcc libtoolize'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AM_PROG_AR
-AM_PROG_LIBTOOL
-AC_OUTPUT
-END
-
-cat >Makefile.am << 'END'
-bin_PROGRAMS = foo
-lib_LTLIBRARIES = libfoo.la
-
-foo_SOURCES = foo.x_
-libfoo_la_SOURCES = bar.x_
-
-.x_.y_:
-       cp $< $@
-
-.y_.o:
-       cp $< $@
-
-.y_.obj:
-       cp $< $@
-
-.y_.z_:
-       cp $< $@
-
-.z_.lo:
-       cp $< $@
-
-# Add explicit dependencies to help make implementations that
-# don't otherwise chain implicit rules (e.g., Sun make).
-foo.$(OBJEXT): foo.y_
-bar.lo: bar.z_
-bar.z_: bar.y_
-
-print:
-       @echo BEGIN: $(foo_OBJECTS) :END
-       @echo BEGIN: $(libfoo_la_OBJECTS) :END
-
-test: $(foo_OBJECTS) $(libfoo_la_OBJECTS)
-       test -f foo.$(OBJEXT)
-       test -f bar.lo
-END
-
-echo 'int main() { return 0; }' > foo.x_
-cp foo.x_ bar.x_
-
-libtoolize
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-OBJEXT=foo $MAKE -e print >stdout || { cat stdout; Exit 1; }
-cat stdout
-$FGREP 'BEGIN: foo.foo :END' stdout
-$FGREP 'BEGIN: bar.lo :END' stdout
-
-$MAKE test
-
-:
diff --git a/tests/suffix9.test b/tests/suffix9.test
deleted file mode 100755
index 815ec56..0000000
--- a/tests/suffix9.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Automake choose the shorter route between suffixes
-# (related to PR/37)
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in << 'END'
-AC_PROG_CC
-END
-
-$ACLOCAL
-
-#  x_ -> y -> c -> o
-#   \________/
-#
-# Automake should follow the bottom route: x_ -> c -> o because
-# it is shorter.
-#
-# It should not take the "-> y ->" route.  We use `y' here so that
-# then Automake will complains that YACC is not defined and the test will
-# fail when this happens.
-
-cat >Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.x_
-
-.x_.y:
-       cp $< $@
-.x_.c:
-       cp $< $@
-END
-
-$AUTOMAKE -a
-
-# Idem with the rules the another order.
-
-cat >Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.x_
-
-.x_.c:
-       cp $< $@
-.x_.y:
-       cp $< $@
-END
-
-$AUTOMAKE -a
-
-:
diff --git a/tests/symlink.test b/tests/symlink.test
deleted file mode 100755
index a9b12c5..0000000
--- a/tests/symlink.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2004  Free Software Foundation, 
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we get an error if symlink creation fails.
-# Reported by Joerg-Martin Schwarz
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f install-sh
-rm -f mkinstalldirs
-
-: > Makefile.am
-
-cat > configure.in << 'END'
-AC_INIT([symlink], [1.0])
-AC_CONFIG_AUX_DIR(sub)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
-$ACLOCAL
-AUTOMAKE_fails --add-missing
-grep 'error while making link' stderr
diff --git a/tests/symlink2.test b/tests/symlink2.test
deleted file mode 100755
index 97a3d26..0000000
--- a/tests/symlink2.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that `automake -a' redirects dangling symlinks.
-
-. ./defs || Exit 1
-
-set -e
-
-rm -f install-sh
-ln -s Zardoz install-sh || {
-  echo "$me: cannot create broken symlinks" >&2
-  Exit 77
-}
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-test -f install-sh
-test ! -r Zardoz
-
-:
diff --git a/tests/syntax.test b/tests/syntax.test
deleted file mode 100755
index 23fa792..0000000
--- a/tests/syntax.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for error for bad syntax.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-foo = q \
-
-bin_SCRIPTS = foo.sh
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wnone
-grep '^Makefile\.am:2:.*blank line following trailing backslash' stderr
-
-:
diff --git a/tests/tags.test b/tests/tags.test
deleted file mode 100755
index 1eaf569..0000000
--- a/tests/tags.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Harlan Stenn: the tags target doesn't work
-# when there are only headers in a directory.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-noinst_HEADERS = iguana.h
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^ID:' Makefile.in
diff --git a/tests/tagsub.test b/tests/tagsub.test
deleted file mode 100755
index bcf752d..0000000
--- a/tests/tagsub.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003
-#   Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure tags and subdirs work correctly.  Bug report by
-# François Pinard, and later by Akim Demaille.
-
-required=etags
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-echo 'SUBDIRS = sub' > Makefile.am
-mkdir sub
-echo 'noinst_HEADERS = iguana.h' > sub/Makefile.am
-: > sub/iguana.h
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE tags
-test -f sub/TAGS
-test -f TAGS
-$FGREP sub/TAGS TAGS
-$FGREP iguana.h sub/TAGS
-
-$MAKE distclean
-test ! -f sub/TAGS
-test ! -f TAGS
diff --git a/tests/tar-override.test b/tests/tar-override.test
deleted file mode 100755
index b08c9f8..0000000
--- a/tests/tar-override.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the user can override the tar program used by "make dist"
-# at runtime, by redefining the `TAR' environment variable.
-# FIXME: currently this works only when the tar format used is `v7'
-# FIXME: (which is the default one).
-
-. ./defs || Exit 1
-
-set -e
-
-cwd=`pwd` || fatal_ "couldn't get current working directory"
-
-echo AC_OUTPUT >> configure.in
-
-cat > am--tar <<'END'
-#!/bin/sh
-echo $1 > am--tar-has-run
-shift
-exec tar "$@"
-END
-chmod a+x am--tar
-
-cat > Makefile.am <<'END'
-check-local: dist
-       test -f am--tar-has-run
-CLEANFILES = am--tar-has-run
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-$MAKE dist
-test -f $me-1.0.tar.gz
-ls | grep has-run && Exit 1
-
-rm -f *.tar.* *has-run*
-
-TAR="$cwd/am--tar foo" $MAKE distcheck
-test -f $me-1.0.tar.gz
-test "`cat am--tar-has-run`" = foo
-
-rm -f *.tar.* *has-run*
-
-TAR=; unset TAR
-# Creative use of eval to pacify maintainer checks.
-eval \$'MAKE dist "TAR=./am--tar mu"'
-test -f $me-1.0.tar.gz
-test "`cat am--tar-has-run`" = mu
-
-:
diff --git a/tests/tar.test b/tests/tar.test
deleted file mode 100755
index dc5353c..0000000
--- a/tests/tar.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check the tar-ustar option.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([tar], [1.0])
-AM_INIT_AUTOMAKE([tar-ustar])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-grep 'am__tar.*false' Makefile && Exit 77
-
-$MAKE distcheck
-test -f tar-1.0.tar.gz
diff --git a/tests/tar2.test b/tests/tar2.test
deleted file mode 100755
index e62f0cc..0000000
--- a/tests/tar2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check the tar-pax option.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([tar2], [1.0])
-AM_INIT_AUTOMAKE([tar-pax])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-grep 'am__tar.*false' Makefile && Exit 77
-
-$MAKE distcheck
-test -f tar2-1.0.tar.gz
diff --git a/tests/tar3.test b/tests/tar3.test
deleted file mode 100755
index de66754..0000000
--- a/tests/tar3.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check the tar options diagnostics.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([tar2], [1.0])
-AM_INIT_AUTOMAKE([tar-pax tar-v7])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'configure.in:2:.*mutually exclusive' stderr
-
-rm -rf autom4te.cache
-
-cat > configure.in << 'END'
-AC_INIT([tar2], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-echo 'AUTOMAKE_OPTIONS = tar-pax' > Makefile.am
-
-AUTOMAKE_fails
-grep 'Makefile.am:1:.*tar-pax.*AM_INIT_AUTOMAKE' stderr
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
deleted file mode 100755
index b324568..0000000
--- a/tests/target-cflags.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure target specific CFLAGS work
-# Assar Westerlund <address@hidden>
-
-required=gcc
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT(foo.c)
-AM_INIT_AUTOMAKE(target-cflags,0.0)
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-
-bin_PROGRAMS = foo bar
-foo_CFLAGS   = -DFOO
-END
-
-cat > foo.c << 'END'
-#include <stdio.h>
-#ifdef FOO
-int main(void) {
-  return 0;
-}
-#endif
-END
-
-cat > bar.c << 'END'
-#ifndef FOO
-int main(void)
-{
-  return 0;
-}
-#endif
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-mkdir build
-
-cd build
-../configure
-$MAKE
-./foo
-./bar
-cd ..
-
-./configure
-$MAKE
-./foo
-./bar
diff --git a/tests/targetclash.test b/tests/targetclash.test
deleted file mode 100755
index 0433b41..0000000
--- a/tests/targetclash.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that target clashes are diagnosed.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = ctags
-END
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails -a
-grep 'redefinition.*ctags' stderr
diff --git a/tests/test-extensions-cond.test b/tests/test-extensions-cond.test
deleted file mode 100755
index 26409a8..0000000
--- a/tests/test-extensions-cond.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Expose bug in conditional definition of TEST_EXTENSIONS.
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND], [:])
-AM_CONDITIONAL([COND2], [:])
-END
-
-$ACLOCAL
-
-cat > 1.am << 'END'
-TESTS =
-if COND
-## lineno 4
-TEST_EXTENSIONS = .foo
-endif
-END
-
-cat > 2.am << 'END'
-TESTS =
-## lineno 3
-TEST_EXTENSIONS = .foo
-if COND
-# Do nothing.
-else
-TEST_EXTENSIONS += .bar
-endif
-END
-
-cat > 3.am << 'END'
-TESTS =
-if COND
-if !COND2
-TESTS = x
-else
-## lineno 7
-TEST_EXTENSIONS = .foo
-endif
-endif
-END
-
-: > test-driver
-
-for i in 1 2 3; do
-  AUTOMAKE_fails $i
-  lineno=`sed -n 's/^## lineno //p' $i.am` \
-    && test 0 -lt "$lineno" \
-    || Exit 99
-  grep "^$i\\.am:$lineno:.*TEST_EXTENSIONS.*conditional content" stderr
-done
-
-:
diff --git a/tests/test-extensions.test b/tests/test-extensions.test
deleted file mode 100755
index 901d872b..0000000
--- a/tests/test-extensions.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Automake diagnose invalid entries in TEST_EXTENSIONS,
-# and do not diagnose valid (albeit more unusual) ones.
-# See automake bug#9400.
-
-parallel_tests=yes
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-$ACLOCAL
-$AUTOCONF
-
-valid_extensions='sh T t1 _foo BAR x_Y_z _'
-
-echo TESTS = > Makefile.am
-echo " $valid_extensions" \
-  | sed -e 's/ / ./g' -e 's/^/TEST_EXTENSIONS =/' >> Makefile.am
-cat Makefile.am # For debugging.
-
-$AUTOMAKE
-
-grep -i 'log' Makefile.in # For debugging.
-
-for lc in $valid_extensions; do
-  uc=`echo $lc | tr '[a-z]' '[A-Z]'`
-  $FGREP "\$(${uc}_LOG_COMPILER)" Makefile.in
-  grep "^${uc}_LOG_COMPILE =" Makefile.in
-  grep "^\.${lc}\.log:" Makefile.in
-done
-
-# The produced Makefile is not broken.
-./configure
-$MAKE all check
-
-cat > Makefile.am << 'END'
-TESTS = foo.test bar.sh
-TEST_EXTENSIONS  = .test mu .x-y a-b .t.1 .sh .6c .0 .11 .= @suf@ 
address@hidden@
-TEST_EXTENSIONS += .= .t33 address@hidden _&_
-END
-
-AUTOMAKE_fails
-for suf in mu .x-y a-b .t.1 .6c .0 .11  @suf@ address@hidden@ '.=' '_&_'; do
-  suf2=`printf '%s\n' "$suf" | sed -e 's/\./\\./'`
-  $EGREP "^Makefile\.am:2:.*invalid test extension.* $suf2( |$)" stderr
-done
-
-# Verify that we accept valid suffixes, even if intermixed with
-# invalid ones.
-$EGREP '\.(sh|test|t33)' stderr && Exit 1
-
-# Verify that we don't try to handle invalid suffixes.
-$EGREP '(LOG_COMPILER|non-POSIX var|bad character)' stderr && Exit 1
-
-:
diff --git a/tests/tests-environment-backcompat.test 
b/tests/tests-environment-backcompat.test
deleted file mode 100755
index ecf1b16..0000000
--- a/tests/tests-environment-backcompat.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# With old serial testsuite driver, TESTS_ENVIRONMENT can be used to
-# define the "test runner", i.e. the program that the test scripts must
-# be run by (with the parallel-tests driver one should use LOG_COMPILER
-# for this).  The behaviour tested here is also documented in the manual.
-
-parallel_tests=no
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<END
-AC_SUBST([PERL], ['$PERL'])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS_ENVIRONMENT = $(PERL) -Mstrict -w
-TESTS = foo.pl bar.pl baz.pl
-XFAIL_TESTS = baz.pl
-EXTRA_DIST = $(TESTS)
-END
-
-echo 'exit (0);' > foo.pl
-echo 'exit (0);' > bar.pl
-
-cat > baz.pl << 'END'
-# With "use strict" enacted, this will cause an error, since the
-# variable `$x' is not declared with `my' nor specified with an
-# explicit package name.
-$x = 0;
-exit ($x);
-END
-
-chmod a+x *.pl
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-$MAKE check
-$MAKE distcheck
-
-:
diff --git a/tests/transform.test b/tests/transform.test
deleted file mode 100755
index 02fdd61..0000000
--- a/tests/transform.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008  Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that --program-transform works.
-
-required=gcc
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'EOF'
-bin_PROGRAMS = h
-bin_SCRIPTS = h.sh
-man_MANS = h.1
-
-test-install: install
-       test -f inst/bin/gnu-h$(EXEEXT)
-       test -f inst/bin/gnu-h.sh
-       test -f inst/man/man1/gnu-h.1
-EOF
-
-cat >h.c <<'EOF'
-int
-main ()
-{
-  return 0;
-}
-EOF
-
-: > h.sh
-: > h.1
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --program-prefix=gnu- --prefix "`pwd`/inst" --mandir 
"`pwd`/inst/man"
-$MAKE
-$MAKE test-install
-$MAKE uninstall
-test `find inst -type f -print | wc -l` = 0
-
-# Opportunistically test for installdirs.
-rm -rf inst
-$MAKE installdirs
-test -d inst/bin
-test -d inst/man/man1
diff --git a/tests/transform2.test b/tests/transform2.test
deleted file mode 100755
index 07943bc..0000000
--- a/tests/transform2.test
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008, 2012 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that --program-transform works even when multiple files are
-# collapsed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<'END'
-AC_PROG_CC
-AC_OUTPUT
-END
-
-cat >Makefile.am <<'EOF'
-bin_PROGRAMS = p1 p2
-bin_SCRIPTS = s1.sh s2.sh
-man_MANS = m1.1 m2.1
-
-test-install: install
-       test -f inst/bin/p$(EXEEXT)
-       test -f inst/bin/s.sh
-       test -f inst/man/man1/m.1
-
-test-install-foo: install
-       test -f inst/bin/foo$(EXEEXT)
-       test -f inst/bin/foo
-       test -f inst/man/man1/foo.1
-       test ! -f inst/bin/p1$(EXEEXT)
-       test ! -f inst/bin/p2$(EXEEXT)
-       test ! -f inst/bin/s1.sh
-       test ! -f inst/bin/s2.sh
-       test ! -f inst/man/man/m1.1
-       test ! -f inst/man/man/m2.1
-EOF
-
-cat >p1.c <<'EOF'
-int
-main ()
-{
-  return 0;
-}
-EOF
-
-cp p1.c p2.c
-
-: > s1.sh
-: > s2.sh
-: > m1.1
-: > m2.1
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure --program-transform-name='s/[12]//' --prefix "`pwd`/inst" --mandir 
"`pwd`/inst/man"
-$MAKE
-$MAKE test-install
-$MAKE uninstall
-test `find inst -type f -print | wc -l` = 0
-
-# Also squash all file types in question.
-
-# On newer Cygwin versions, that won't work, likely due to overly
-# aggressive appending of '.exe' suffix when copying/renaming Windows
-# executables).  So let's skip this part of the test if we detect the
-# faulty heuristic is present.  See also:
-# <http://lists.gnu.org/archive/html/automake-patches/2010-08/msg00153.html>
-# <http://thread.gmane.org/gmane.os.cygwin/119380>
-echo Foo > foo
-echo Bar > bar.exe
-chmod a+x foo bar.exe
-cp foo bar && cmp foo bar \
-  || skip_ "your Cygwin is too aggressive in tweaking '.exe' suffixes"
-
-./configure --program-transform-name='s/.*/foo/' --prefix "`pwd`/inst" 
--mandir "`pwd`/inst/man"
-$MAKE
-$MAKE test-install-foo
-$MAKE uninstall
-test `find inst -type f -print | wc -l` = 0
-
-:
diff --git a/tests/txinfo.test b/tests/txinfo.test
deleted file mode 100755
index b764e53..0000000
--- a/tests/txinfo.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2011 Free
-# Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure texinfo.tex is included in distribution.  Bug report by
-# Jim Meyering.
-
-required=makeinfo
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-.PHONY: test1 test2
-test1:
-       @echo DISTFILES = $(DISTFILES)
-       echo ' ' $(DISTFILES) ' ' | grep '[ /]texinfo\.tex '
-test2: distdir
-       ls -l $(distdir)
-       test -f $(distdir)/texinfo.tex
-END
-
-echo '@setfilename textutils.info' > textutils.texi
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test1 test2
-
-:
diff --git a/tests/txinfo10.test b/tests/txinfo10.test
deleted file mode 100755
index 7432c7f..0000000
--- a/tests/txinfo10.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure dvi target recurses into subdir.
-# Reported by Pavel Roskin
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-END
-
-mkdir sub
-cat > sub/Makefile.am << 'END'
-info_TEXINFOS = maude.texi
-END
-
-echo '@setfilename maude.info' > sub/maude.texi
-: > sub/texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-grep dvi-recursive Makefile.in
-grep '[^-]info-recursive' Makefile.in
-grep '[^n]install-info-recursive' Makefile.in
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
deleted file mode 100755
index 81b39e4..0000000
--- a/tests/txinfo13.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2006, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check for subdir Texinfo (PR/343)
-# Also make sure we do not distribute too much foo.info* files (Report
-# from Vincent Lefevre)
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = subdir/main.texi
-subdir_main_TEXINFOS = subdir/inc.texi
-
-installcheck-local:
-       test -f "$(infodir)/main.info"
-check-local:
-       test ! -f $(srcdir)/subdir/main.info.bak
-END
-
-mkdir subdir
-
-cat > subdir/main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden inc.texi
address@hidden
-END
-
-cat > subdir/inc.texi << 'END'
-I'm included.
-END
-
-touch subdir/main.info.bak
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE distcheck
-test -f ../subdir/main.info
-test ! -f subdir/main.info
-test -f ../subdir/main.info.bak
diff --git a/tests/txinfo16.test b/tests/txinfo16.test
deleted file mode 100755
index 4c14aba..0000000
--- a/tests/txinfo16.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2008, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that info files are normally built in $(srcdir),
-# not in $(builddir).
-
-required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f ../main.info
-test ! -f main.info
-test -f ../stamp-vti
-test ! -f stamp-vti
-test -f ../version.texi
-test ! -f version.texi
-
-cd ..
-rm -rf build make.info* stamp-vti version.texi
-./configure
-$MAKE
-test -f main.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree.)
-# This is needed to test the "subtle" issue described below.
-test -f stamp-vti
-test -f version.texi
-$sleep
-touch stamp-vti
-
-$MAKE distclean
-test -f stamp-vti
-test -f version.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# main.info should not be rebuilt in the current directory, since
-# it's up-to-date in $(srcdir).
-# This can be caused by a subtle issue related to VPATH handling
-# of version.texi (see also the comment in texi-vers.am): because
-# stamp-vti is newer than version.texi, the `version.texi: stamp-vti'
-# rule is always triggered.  Still that's not a reason for `make'
-# to think `version.texi' has been created...
-test ! -f main.info
-$MAKE dvi
-test -f main.dvi
-
-$MAKE distcheck
-
-:
diff --git a/tests/txinfo17.test b/tests/txinfo17.test
deleted file mode 100755
index 62408be..0000000
--- a/tests/txinfo17.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake uses the _first_ @setfilname it sees.
-# Report from Karl Berry.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = texinfo.texi
-END
-
-cat > texinfo.texi << 'END'
address@hidden texinfo
-...
address@hidden
address@hidden example.info
address@hidden verbatim
-...
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-
-grep 'example' Makefile.in && Exit 1
-grep 'texinfo:' Makefile.in
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
deleted file mode 100755
index 8dc8961..0000000
--- a/tests/txinfo18.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2008, 2009, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we clean index files, even if they are not used at the top-level.
-# Only *new* indexes need to be declared at the top-level.
-# PR/375.
-
-required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-main_TEXINFOS = sub.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden au
address@hidden sa
address@hidden sb
address@hidden sa sb
address@hidden Top
-Hello walls.
address@hidden sub.texi
address@hidden
-END
-
-cat > sub.texi << 'END'
address@hidden foo
-foo
address@hidden bar
-bar
address@hidden baz
-baz
address@hidden sa
-sa
address@hidden sb
-sb
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-
-$MAKE dvi
-ls -l           # for debugging
-test -f main.sa # sanity check
-$MAKE clean
-ls -l           # for debugging
-test x"`echo main.*`" = x"main.texi"
-
-TAR_OPTIONS= $MAKE distcheck
-
-:
diff --git a/tests/txinfo19.test b/tests/txinfo19.test
deleted file mode 100755
index aabe4be..0000000
--- a/tests/txinfo19.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test support for DJGPP's .iNN info files.
-
-required='makeinfo tex'
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure "--infodir=`pwd`/_inst"
-$MAKE
-
-# Make sure .iNN files are installed.
-: > main.i1
-: > main.i21
-$MAKE install
-test -f _inst/main.i1
-test -f _inst/main.i21
-
-# They should be uninstalled too.
-$MAKE uninstall
-test ! -f _inst/main.i1
-test ! -f _inst/main.i21
-
-# Make sure rebuild rules erase old .iNN files when they run makeinfo.
-$sleep
-touch main.texi
-test -f main.i1
-test -f main.i21
-$MAKE
-test ! -f main.i1
-test ! -f main.i21
-
-# Finally, we also want them erased by maintainer-clean.
-: > main.i7
-: > main.i39
-$MAKE maintainer-clean
-test ! -f main.i7
-test ! -f main.i39
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
deleted file mode 100755
index f51d0b6..0000000
--- a/tests/txinfo2.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to ensure that a ".info~" file doesn't end up in the
-# distribution.  Bug report from Greg McGary.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-.PHONY: test
-test:
-       @echo DISTFILES = $(DISTFILES)
-       case '$(DISTFILES)' in *'~'*) exit 1;; *) exit 0;; esac
-END
-
-: > texinfo.tex
-echo '@setfilename textutils.info' > textutils.texi
-: > textutils.info~
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-./configure
-$MAKE test
-
-:
diff --git a/tests/txinfo20.test b/tests/txinfo20.test
deleted file mode 100755
index 5f6de57..0000000
--- a/tests/txinfo20.test
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure info files survive makeinfo errors.
-
-required=makeinfo
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi sub/main.texi
-END
-
-mkdir sub
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-
-cp main.texi sub/main.texi
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-$MAKE
-
-# Feign more info files.
-: > main-1
-: > sub/main-1
-
-# Break main.texi
-$sleep
-cp main.texi main.old
-cat > main.texi << 'END'
-\input texinfo
address@hidden main
address@hidden main
address@hidden Top
address@hidden walls.}
address@hidden
-END
-
-# makeinfo will bail out, but we should conserve the old info files.
-$MAKE && Exit 1
-test -f main
-test -f main-1
-
-# Restore main.texi, and break sub/main.texi
-cp main.texi sub/main.texi
-mv main.old main.texi
-$MAKE && Exit 1
-test -f main
-test ! -f main-1
-test -f sub/main
-test -f sub/main-1
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
deleted file mode 100755
index ae1d985..0000000
--- a/tests/txinfo21.test
+++ /dev/null
@@ -1,176 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test support for building HTML documentation, and the many
-# install-DOC flavors.
-
-required='makeinfo-html tex texi2dvi'
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<\EOF
-AC_CONFIG_FILES([rec/Makefile])
-
-# At the time of writing, Autoconf does not supplies any of these
-# definitions (and those below are purposedly not those of the standard).
-AC_SUBST([dvidir],  ['${datadir}/${PACKAGE}/dvi'])
-AC_SUBST([htmldir], ['${datadir}/${PACKAGE}/html'])
-AC_SUBST([pdfdir],  ['${datadir}/${PACKAGE}/pdf'])
-AC_SUBST([psdir],   ['${datadir}/${PACKAGE}/ps'])
-
-AC_OUTPUT
-EOF
-
-cat > Makefile.am << 'END'
-SUBDIRS = rec
-info_TEXINFOS = main.texi sub/main2.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-
-mkdir sub
-cat > sub/main2.texi << 'END'
-\input texinfo
address@hidden main2.info
address@hidden main2
address@hidden Top
-Hello walls.
address@hidden
-END
-
-mkdir rec
-cat > rec/main3.texi << 'END'
-\input texinfo
address@hidden main3.info
address@hidden main3
address@hidden Top
-Hello walls.
address@hidden
-END
-
-cat > rec/Makefile.am << 'END'
-info_TEXINFOS = main3.texi
-
-install-pdf-local:
-       @$(MKDIR_P) "$(pdfdir)"
-       :> "$(pdfdir)/hello"
-uninstall-local:
-       rm -f "$(pdfdir)/hello"
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-
-$MAKE
-
-$sleep
-# Test production of split-per-node HTML.
-$MAKE html
-test -d main.html
-test -d sub/main2.html
-test -d rec/main3.html
-
-# Rebuilding main.html should cause its timestamp to be updated.
-is_newest main.html main.texi
-$sleep
-touch main.texi
-$MAKE html
-is_newest main.html main.texi
-
-$MAKE clean
-test ! -d main.html
-test ! -d sub/main2.html
-test ! -d rec/main3.html
-
-# Test production of a single HTML file.
-MAKEINFOFLAGS=--no-split $MAKE -e html
-test -f main.html
-test -f sub/main2.html
-test -f rec/main3.html
-$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -f rec/main3.html
-
-# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
-cat >>Makefile.am <<\EOF
-AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
-AM_MAKEINFOFLAGS = --unsupported-option
-EOF
-$AUTOMAKE
-./configure --prefix "`pwd`"
-$MAKE html
-test -f main.html
-test -f sub/main2.html
-test -d rec/main3.html
-$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -d rec/main3.html
-
-$MAKE install-html
-test -f share/txinfo21/html/main.html
-test -f share/txinfo21/html/main2.html
-test -d share/txinfo21/html/main3.html
-$MAKE uninstall
-test ! -f share/txinfo21/html/main.html
-test ! -f share/txinfo21/html/main2.html
-test ! -d share/txinfo21/html/main3.html
-
-$MAKE install-dvi
-test -f share/txinfo21/dvi/main.dvi
-test -f share/txinfo21/dvi/main2.dvi
-test -f share/txinfo21/dvi/main3.dvi
-$MAKE uninstall
-test ! -f share/txinfo21/dvi/main.dvi
-test ! -f share/txinfo21/dvi/main2.dvi
-test ! -f share/txinfo21/dvi/main3.dvi
-
-(dvips --help 2>/dev/null >/dev/null) || Exit 77
-
-$MAKE install-ps
-test -f share/txinfo21/ps/main.ps
-test -f share/txinfo21/ps/main2.ps
-test -f share/txinfo21/ps/main3.ps
-$MAKE uninstall
-test ! -f share/txinfo21/ps/main.ps
-test ! -f share/txinfo21/ps/main2.ps
-test ! -f share/txinfo21/ps/main3.ps
-
-(pdfetex --help 2>/dev/null >/dev/null) ||
-  (pdftex --help 2>/dev/null >/dev/null) || Exit 77
-
-$MAKE install-pdf
-test -f share/txinfo21/pdf/main.pdf
-test -f share/txinfo21/pdf/main2.pdf
-test -f share/txinfo21/pdf/main3.pdf
-test -f share/txinfo21/pdf/hello
-$MAKE uninstall
-test ! -f share/txinfo21/pdf/main.pdf
-test ! -f share/txinfo21/pdf/main2.pdf
-test ! -f share/txinfo21/pdf/main3.pdf
-test ! -f share/txinfo21/pdf/hello
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
deleted file mode 100755
index c2f23e1..0000000
--- a/tests/txinfo22.test
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the user can override TEXINFO_TEX.
-# Also make sure TEXINFO_TEX is not distributed.
-# Report from Tom Tromey.
-
-required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([aux1])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TEXINFO_TEX = $(srcdir)/tex/texinfo.tex
-info_TEXINFOS = main.texi
-sure_it_exists:
-       test -f $(TEXINFO_TEX)
-sure_it_is_not_distributed: distdir
-       test ! -f $(distdir)/tex/texinfo.tex
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-END
-
-mkdir aux1
-mkdir tex
-cp "$testsrcdir/../lib/texinfo.tex" tex
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-test ! -f texinfo.tex
-test ! -f aux1/texinfo.tex
-test -f tex/texinfo.tex
-
-./configure
-
-$MAKE sure_it_exists
-$MAKE distcheck
-$MAKE sure_it_is_not_distributed
-
-:
diff --git a/tests/txinfo23.test b/tests/txinfo23.test
deleted file mode 100755
index 660487d..0000000
--- a/tests/txinfo23.test
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2007, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that info files are built in builddir when needed.
-# Test with subdir Texinfo.
-# (Similar to txinfo13.test, plus DISTCLEANFILES.)
-# (See also txinfo24.test and txinfo25.test)
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-DISTCLEANFILES = subdir/*.info*
-info_TEXINFOS = subdir/main.texi
-subdir_main_TEXINFOS = subdir/inc.texi
-
-installcheck-local:
-       test -f "$(infodir)/main.info"
-END
-
-mkdir subdir
-
-cat > subdir/main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden inc.texi
address@hidden
-END
-
-cat > subdir/inc.texi << 'END'
-I'm included.
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE distcheck
-test -f subdir/main.info
-test ! -f ../subdir/main.info
-
-:
diff --git a/tests/txinfo24.test b/tests/txinfo24.test
deleted file mode 100755
index fc9f9d1..0000000
--- a/tests/txinfo24.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that info files are built in builddir when needed.
-# (Similar to txinfo16.test, plus CLEANFILES.)
-# (See also txinfo23.test and txinfo25.test)
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-CLEANFILES = main.info
-info_TEXINFOS = main.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test ! -f ../main.info
-test -f main.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree.)
-test -f stamp-vti
-test -f version.texi
-$sleep
-touch stamp-vti
-
-$MAKE distclean
-test -f stamp-vti
-test -f version.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# main.info should be rebuilt in the current directory
-test -f main.info
-test ! -f ../main.info
-$MAKE dvi
-test -f main.dvi
-
-$MAKE distcheck
-
-:
diff --git a/tests/txinfo25.test b/tests/txinfo25.test
deleted file mode 100755
index f80b035..0000000
--- a/tests/txinfo25.test
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that info files are built in builddir and in srcdir can safely
-# co-exist.  This setup is obtained by having two info files, only one
-# of which being cleaned.
-# (Similar to txinfo16.test, plus CLEANFILES.)
-# (See also txinfo23.test and txinfo24.test)
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-CLEANFILES = [a-m]*.info
-info_TEXINFOS = main.texi other.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-cat > other.texi << 'END'
-\input texinfo
address@hidden other.info
address@hidden other
address@hidden Top
-Hello walls.
address@hidden version2.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f main.info
-test ! -f ../main.info
-test ! -f other.info
-test -f ../other.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-test -f other.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree.)
-# This is needed to test the "subtle" issue described below.
-test -f stamp-vti
-test -f version.texi
-test -f stamp-1
-test -f version2.texi
-$sleep
-touch stamp-vti
-touch stamp-1
-
-$MAKE distclean
-test -f stamp-vti
-test -f stamp-1
-test -f version.texi
-test -f version2.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# other.info should not be rebuilt in the current directory, since
-# it's up-to-date in $(srcdir).
-# This can be caused by a subtle issue related to VPATH handling
-# of version.texi (see also the comment in texi-vers.am): because
-# stamp-vti is newer than version.texi, the `version.texi: stamp-vti'
-# rule is always triggered.  Still that's not a reason for `make'
-# to think `version.texi' has been created...
-test -f main.info
-test ! -f other.info
-$MAKE dvi
-test -f main.dvi
-test -f other.dvi
-
-$MAKE distcheck
-
-:
diff --git a/tests/txinfo26.test b/tests/txinfo26.test
deleted file mode 100755
index e5e8f84..0000000
--- a/tests/txinfo26.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Texinfo installation works when absolute --srcdir is used.
-# PR/408
-
-required='makeinfo'
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-END
-
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-$MAKE
-$MAKE distclean
-
-# We do not require this to work with a directory that contains white space.
-case `pwd` in
-  *\ * | *\    *) Exit 77;;
-esac
-
-mkdir build
-cd build
-../configure "--srcdir=`pwd`/.." "--prefix=`pwd`/_inst" 
"--infodir=`pwd`/_inst/info"
-$MAKE install
-test -f ../main.info
-test ! -f ./main.info
-test -f _inst/info/main.info
-
-$MAKE uninstall
-test ! -f _inst/info/main.info
-test -f ../main.info
-
-# multiple uninstall should not fail.
-$MAKE uninstall
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
deleted file mode 100755
index 0769fa5..0000000
--- a/tests/txinfo27.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2007  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure install-info works even if no-installinfo is given.
-
-required='makeinfo'
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-AUTOMAKE_OPTIONS = no-installinfo
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure "--prefix=`pwd`/inst" "--infodir=`pwd`/inst/info"
-$MAKE install-info
-test -f inst/info/main.info
diff --git a/tests/txinfo28.test b/tests/txinfo28.test
deleted file mode 100755
index 1fd702b..0000000
--- a/tests/txinfo28.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that info files are built in builddir when needed.
-# Similar to txinfo24.test, but obfuscating filenames with variable references.
-# Report from Ralf Corsepius.
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-# This setting, when honored by GNU ls, used to cause an infinite loop
-# in mdate-sh.
-TIME_STYLE="+%Y-%m-%d %H:%M:%S"
-export TIME_STYLE
-
-echo AC_OUTPUT >> configure.in
-
-cat > Makefile.am << 'END'
-MA = ma
-IN = in
-PROJ = $(MA)$(IN)
-include fragment.mk
-info_TEXINFOS = ma$(IN).texi
-END
-
-echo 'CLEANFILES = $(PROJ).info' > fragment.mk
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f main.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree.)
-test -f stamp-vti
-test -f version.texi
-$sleep
-touch stamp-vti
-
-$MAKE distclean
-test -f stamp-vti
-test -f version.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# main.info should be rebuilt in the current directory
-test -f main.info
-test ! -f ../main.info
-$MAKE dvi
-test -f main.dvi
-
-$MAKE distcheck
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
deleted file mode 100755
index 42dd3ab..0000000
--- a/tests/txinfo29.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that INFO_DEPS can be overridden.
-# Report from Bruce Korb.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-INFO_DEPS = foo.info
-info_TEXINFOS = bar.texi
-END
-
-echo '@setfilename baz.info' > bar.texi
-
-$ACLOCAL
-AUTOMAKE_fails --add-missing
-grep '^Makefile\.am:1:.*user variable.*INFO_DEPS' stderr
-grep 'overrides Automake variable.*INFO_DEPS' stderr
-
-$AUTOMAKE -Wno-override
-
-# There is only one definition of INFO_DEPS
-test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l`
-# and it is the right one.
-grep '^INFO_DEPS *= *foo.info *$' Makefile.in
-
-# Likewise with AC_SUBST.
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = bar.texi
-END
-cat >> configure.in << 'END'
-AC_SUBST([INFO_DEPS])
-END
-rm -rf autom4te.cache # Make sure autoconf sees the configure.in update.
-AUTOMAKE_fails
-
-grep '^configure\.in:4:.*user variable.*INFO_DEPS' stderr
-grep 'overrides Automake variable.*INFO_DEPS' stderr
-
-$AUTOMAKE -Wno-override
-
-# There is only one definition of INFO_DEPS
-test 1 = `grep '^INFO_DEPS.*=' Makefile.in | wc -l`
-# and it is the right one.
-grep '^INFO_DEPS *= address@hidden@ *$' Makefile.in
-
-:
diff --git a/tests/txinfo3.test b/tests/txinfo3.test
deleted file mode 100755
index 6af712f..0000000
--- a/tests/txinfo3.test
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2008, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure .info-less @setfilename works.
-
-required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi <<EOF
-\input texinfo
address@hidden textutils
address@hidden main
address@hidden Top
-Hello walls.
address@hidden
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-grep '^INFO_DEPS.*textutils$' Makefile.in
-
-# We should not use single suffix inference rules (with separate
-# dependencies), this confuses Solaris make.
-grep '^\.texi:$' Makefile.in && Exit 1
-grep 'textutils: *textutils\.texi' Makefile.in
-
-./configure
-$MAKE distcheck
-
-:
diff --git a/tests/txinfo30.test b/tests/txinfo30.test
deleted file mode 100755
index 296180d..0000000
--- a/tests/txinfo30.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure `missing texinfo' does not create empty files.
-# Report from Bob Proulx.
-
-. ./defs || Exit 1
-
-set -e
-
-echo info_TEXINFOS = bar.texi >Makefile.am
-echo grepme >bar.info
-$sleep
-cat >bar.texi <<EOF
address@hidden bar.info
-EOF
-
-echo AC_OUTPUT >>configure.in
-
-cat >makeinfo <<\EOF
-#!/bin/sh
-# This script
-# 1. fails so `missing' can take over
-# 2. does not understand `--version' so `missing' thinks `makeinfo' isn't
-#    installed
-exec false
-EOF
-
-chmod +x makeinfo
-
-PATH=`pwd`$PATH_SEPARATOR$PATH
-export PATH
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-
-./configure
-$MAKE
-grep grepme bar.info
-test -f bar.info
-
-# We should not create a missing bar.info.
-rm -f bar.info
-$MAKE && Exit 1
-test ! -f bar.info
diff --git a/tests/txinfo31.test b/tests/txinfo31.test
deleted file mode 100755
index cb8df94..0000000
--- a/tests/txinfo31.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure file extensions are matched correctly.
-# Report from Eric Dorland.
-
-. ./defs || Exit 1
-
-set -e
-
-echo info_TEXINFOS = bar.texi >Makefile.am
-cat >bar.texi <<EOF
address@hidden bar-1.9.info
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
diff --git a/tests/txinfo32.test b/tests/txinfo32.test
deleted file mode 100755
index 6b63ad8..0000000
--- a/tests/txinfo32.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the documentation targets work as required with BSD make,
-# even in the presence of subdirs (requires presence of default *-am rules).
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-cat >>configure.in <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-cat >Makefile.am <<'END'
-SUBDIRS = sub
-END
-: >sub/Makefile.am
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure "--prefix=`pwd`/inst"
-$MAKE html dvi ps pdf info \
-      install-html install-dvi install-ps install-pdf install-info \
-      install-man install-data install-exec install uninstall
-
-Exit 0
diff --git a/tests/txinfo33.test b/tests/txinfo33.test
deleted file mode 100755
index 4657a94..0000000
--- a/tests/txinfo33.test
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# DVIS, PDFS, PSS, HTMLS should not be cleaned upon `mostlyclean'.
-# Similar to txinfo25.test.
-
-required='makeinfo tex texi2dvi-o dvips'
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi other.texi sub/another.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-cat > other.texi << 'END'
-\input texinfo
address@hidden other.info
address@hidden other
address@hidden Top
-Hello walls.
address@hidden version2.texi
address@hidden
-END
-
-cat > sub/another.texi << 'END'
-\input texinfo
address@hidden another.info
address@hidden another
address@hidden Top
-Hello walls.
address@hidden version3.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# In-tree build.
-./configure
-$MAKE dvi ps pdf html
-
-test -f main.dvi
-test -f main.ps
-test -f main.html || test -d main.html
-test -f main.pdf
-test -f other.pdf
-test -f sub/another.pdf
-
-test -f other.dvi
-test -f other.html || test -d other.html
-test -f other.ps
-test -f sub/another.dvi
-test -f sub/another.html || test -d sub/another.html
-test -f sub/another.ps
-
-$MAKE mostlyclean
-
-ls *.aux && Exit 1
-ls sub/*.aux && Exit 1
-
-test -f main.dvi
-test -f main.ps
-test -f main.html || test -d main.html
-test -f main.pdf
-test -f other.pdf
-test -f sub/another.pdf
-
-test -f other.dvi
-test -f other.html || test -d other.html
-test -f other.ps
-test -f sub/another.dvi
-test -f sub/another.html || test -d sub/another.html
-test -f sub/another.ps
-
-$MAKE clean
-
-test ! -f main.dvi
-test ! -f main.ps
-test ! -f main.html && test ! -d main.html
-test ! -f main.pdf
-test ! -f other.pdf
-test ! -f sub/another.pdf
-test ! -f sub/yetanother.pdf
-
-test ! -f other.dvi
-test ! -f other.html && test ! -d other.html
-test ! -f other.ps
-test ! -f sub/another.dvi
-test ! -f sub/another.html && test ! -d sub/another.html
-test ! -f sub/another.ps
-
-./configure
-$MAKE
-
-$MAKE distcheck
-
-:
diff --git a/tests/txinfo4.test b/tests/txinfo4.test
deleted file mode 100755
index 0c55a1c..0000000
--- a/tests/txinfo4.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2003, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure non-empty, non-info suffixes are diagnosed.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-echo '@setfilename textutils.frob' > textutils.texi
-: > texinfo.tex
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'textutils\.texi:1:.*textutils\.frob.*extension' stderr
-
-:
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
deleted file mode 100755
index 0b3ea68..0000000
--- a/tests/txinfo5.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that texinfo.tex is not required by --cygnus.
-# Also check that TEXINFOS + cygnus work without requiring the
-# `-Wno-override' option.
-# See also sister test txinfo5b.test.
-# Report from Ian Taylor.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = ian.texi
-END
-
-echo '@setfilename ian.info' > ian.texi
-
-$ACLOCAL
-$AUTOMAKE --cygnus
-
-:
diff --git a/tests/txinfo5b.test b/tests/txinfo5b.test
deleted file mode 100755
index f14eadb..0000000
--- a/tests/txinfo5b.test
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure that texinfo.tex is not required by --cygnus.
-# See also sister test txinfo5.test.
-# Report from Ian Taylor.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_MAINTAINER_MODE
-END
-
-cat > Makefile.am << 'END'
-# Disable `override' warning to work around an unrelated
-# texi+cygnus bug.
-AUTOMAKE_OPTIONS = -Wno-override
-info_TEXINFOS = ian.texi
-END
-
-echo '@setfilename ian.info' > ian.texi
-
-$ACLOCAL
-$AUTOMAKE --cygnus
-$AUTOMAKE -a --cygnus
-test ! -f texinfo.tex
-
-:
diff --git a/tests/txinfo6.test b/tests/txinfo6.test
deleted file mode 100755
index f5b8c0b..0000000
--- a/tests/txinfo6.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure `.txi' extension works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.txi
-END
-
-echo '@setfilename foo.info' > foo.txi
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^\.txi\.info: *$' Makefile.in
-
-:
diff --git a/tests/txinfo7.test b/tests/txinfo7.test
deleted file mode 100755
index 9a1dd5c..0000000
--- a/tests/txinfo7.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure texinfo.tex correctly installed by -a.  Bug report
-# by Per Cederqvist.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-echo '@setfilename textutils.info' > textutils.texi
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test -f texinfo.tex
-
-:
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
deleted file mode 100755
index 13c8e31..0000000
--- a/tests/txinfo8.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure texinfo.tex is correctly installed and disted by
-# -a when we're using AC_CONFIG_AUX_DIR.  Bug report by by Per
-# Cederqvist.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AC_CONFIG_AUX_DIR([auxdir])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-.PHONY: test1 test2
-test1:
-       @echo DISTFILES = $(DISTFILES)
-       echo ' ' $(DISTFILES) ' ' | grep '[ /]auxdir/texinfo\.tex '
-test2: distdir
-       ls -l $(distdir)/*
-       test -f $(distdir)/auxdir/texinfo.tex
-END
-
-echo '@setfilename textutils.info' > textutils.texi
-
-mkdir auxdir
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-test -f auxdir/texinfo.tex
-
-./configure
-
-# Create textutils.info by hand, so that we don't have to require
-# makeinfo.  Also ensure it's really newer than textutils.texi, so
-# that make won't try to re-create it.
-$sleep
-: > textutils.info
-
-$MAKE test1 test2
-
-:
diff --git a/tests/txinfo9.test b/tests/txinfo9.test
deleted file mode 100755
index 71b5efb..0000000
--- a/tests/txinfo9.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure we only create texinfo-related targets once.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = maude.texi liver.txi heart.texinfo
-END
-
-echo '@setfilename maude.info' > maude.texi
-echo '@setfilename liver.info' > liver.txi
-echo '@setfilename heart.info' > heart.texinfo
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-# These are just examples -- basically for many targets in texinfos.am
-# we only want them to appear once.  But grepping them all would be
-# overkill.
-for t in info dist-info dvi-am install-html uninstall-pdf-am; do
-  $EGREP "(^| )$t*.:" Makefile.in # help in debugging
-  test `$EGREP -c "(^| )$t(:| *.:)" Makefile.in` -eq 1
-done
-
-:
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
deleted file mode 100755
index 529d8f3..0000000
--- a/tests/uninstall-fail.test
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# "make uninstall" complains and errors out on failures.
-
-# FIXME: this test only deal with DATA primary; maybe we need sister
-# tests for other primaries too?  E.g., SCRIPTS, PROGRAMS, LISP, PYTHON,
-# etc...
-
-. ./defs || Exit 1
-
-set -e
-
-mkdir d
-: > d/f
-chmod a-w d || skip "cannot make directories unwritable"
-
-# On Solaris 10, if `/bin/rm' is run with the `-f' option, it doesn't
-# print any error message when failing to remove a file (due to e.g.,
-# "Permission denied").  Yikes.  We'll cater to this incompatibility
-# by relaxing a test below if a faulty `rm' is detected.
-st=0; rm -f d/f 2>stderr || st=$?
-cat stderr >&2
-test $st -gt 0 || skip_ "can delete files from unwritable directories"
-if grep 'rm:' stderr; then
-  rm_f_is_silent_on_error=no
-else
-  rm_f_is_silent_on_error=yes
-fi
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-data_DATA = foobar.txt
-END
-
-: > foobar.txt
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-inst=__inst-dir__
-
-./configure --prefix="`pwd`/$inst"
-
-mkdir $inst $inst/share
-: > $inst/share/foobar.txt
-
-chmod a-w $inst/share
-$MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
-cat output
-if test $rm_f_is_silent_on_error = yes; then
-  : "rm -f" is silent on errors, skip the grepping of make output
-else
-  grep "rm: .*foobar\.txt" output
-fi
-
-chmod a-rwx $inst/share
-(cd $inst/share) && skip_ "cannot make directories fully unreadable"
-
-$MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
-cat output
-#
-# Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report
-# the name of the `cd' builtin upon a chdir error:
-#
-#   $ /bin/sh -c 'cd /none'
-#   /bin/sh: /none: does not exist
-#
-# In addition, some shells, like Solaris 10 /usr/xpg4/bin/sh, also print
-# a line number in the error message *if the command contains newlines*:
-#
-#   $ /usr/xpg4/bin/sh -c 'cd unreadable'
-#   /usr/xpg4/bin/sh: unreadable: permission denied
-#   $ /usr/xpg4/bin/sh -c '\
-#   > \
-#   > cd unreadable'
-#   /usr/xpg4/bin/sh[3]: unreadable: permission denied
-#
-$EGREP "(cd|sh)(\[[0-9]*[0-9]\])?: .*$inst/share" output
-
-:
diff --git a/tests/uninstall-pr9578.test b/tests/uninstall-pr9578.test
deleted file mode 100755
index 9aea52d..0000000
--- a/tests/uninstall-pr9578.test
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check against automake bug#9578: "make uninstall" issued before
-# "make install" or after a mere "make install-data" or a mere
-# "make install-exec" failed spuriously.
-#
-# FIXME: this test only deal with DATA and script primaries; maybe we
-# need sister tests for other primaries too?  E.g., PROGRAMS, LISP,
-# PYTHON, etc...
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_OUTPUT
-END
-
-: > foo
-: > bar
-
-cat > Makefile.am << 'END'
-bin_SCRIPTS = foo
-data_DATA = bar
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure --prefix="`pwd`/inst"
-
-$MAKE uninstall
-test ! -d inst
-
-rm -rf inst
-
-$MAKE install-exec
-test -f inst/bin/foo || Exit 99 # Sanity check.
-$MAKE uninstall
-test ! -f inst/bin/foo
-
-$MAKE install-data
-test -f inst/share/bar || Exit 99 # Sanity check.
-$MAKE uninstall
-test ! -f inst/share/bar
-
-rm -rf inst
-
-$MAKE install-exec
-test -f inst/bin/foo || Exit 99 # Sanity check.
-$MAKE uninstall
-test ! -f inst/bin/foo
-
-:
diff --git a/tests/unused.test b/tests/unused.test
deleted file mode 100755
index f406b43..0000000
--- a/tests/unused.test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2002, 2003, 2008, 2010 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for failing check for unused macros.  From Johan Danielsson.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-MACRO_1
-MACRO_1_2
-MACRO_1_2_3
-END
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([MACRO_1], echo 1)
-AC_DEFUN([MACRO_1_2], echo 12)
-AC_DEFUN([MACRO_1_2_3], echo 123)
-END
-
-$ACLOCAL 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-test ! -s stderr
diff --git a/tests/upc.test b/tests/upc.test
deleted file mode 100755
index 3c55ccb..0000000
--- a/tests/upc.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# A simple Hello World for UPC.
-
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AM_PROG_UPC
-AC_OUTPUT
-END
-
-cat > hello.upc << 'END'
-#include <stdio.h>
-#include <upc.h>
-int
-main (void)
-{
-  printf ("Thread %d says, 'Hello.'\n", MYTHREAD);
-  return 0;
-}
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.upc
-hello_LDADD = -lm
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE distcheck
diff --git a/tests/upc2.test b/tests/upc2.test
deleted file mode 100755
index 6b717fd..0000000
--- a/tests/upc2.test
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that Automake suggests using AM_PROG_UPC if Unified Parallel C
-# sources are used.
-
-. ./defs || Exit 1
-
-set -e
-
-echo AC_PROG_CC >>configure.in
-
-cat >Makefile.am <<'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.upc
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep AM_PROG_UPC stderr
diff --git a/tests/upc3.test b/tests/upc3.test
deleted file mode 100755
index f575b9a..0000000
--- a/tests/upc3.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that C and Unified Parallel C link safely.
-
-. ./defs || Exit 1
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_UPC
-AC_OUTPUT
-END
-
-cat > hello.upc << 'END'
-#include <stdio.h>
-#include <upc.h>
-#include "message.h"
-int
-main (void)
-{
-  printf ("Thread %d says, '%s'\n", MYTHREAD, message());
-  return 0;
-}
-END
-
-cat > message.h << 'END'
-const char *message (void);
-END
-
-cat > mix.c << 'END'
-#include "message.h"
-const char *
-message (void)
-{
-  return "Hello.";
-}
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.upc mix.c message.h
-hello_LDADD = -lm
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE distcheck
diff --git a/tests/vala-mix.test b/tests/vala-mix.test
deleted file mode 100755
index fe48f26..0000000
--- a/tests/vala-mix.test
+++ /dev/null
@@ -1,126 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Vala sources and C sources in the same program.  Functional test.
-
-required='valac cc GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_VALAC([0.7.3])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz mu baz
-AM_VALAFLAGS = --profile=posix
-zardoz_SOURCES = foo.vala bar.c
-mu_SOURCES = 1.vala 2.c
-mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
-mu_CFLAGS = -DHAVE_MU
-baz_SOURCES = baz.c
-END
-
-if cross_compiling; then :; else
-  unindent >> Makefile.am <<'END'
-    check-local:
-       ./zardoz
-       ./mu
-       ./zardoz | grep "foo is alive"
-       ./mu | grep "Howdy, World!"
-END
-fi
-
-cat > foo.vala <<'END'
-int main ()
-{
-  stdout.printf ("foo is alive\n");
-  return 0;
-}
-END
-
-echo 'extern int i = 0;' > bar.c
-
-cat > 1.vala <<'END'
-int run ()
-{
-  stdout.printf ("Howdy, World!\n");
-  return 0;
-}
-END
-
-cat > 2.c <<'END'
-#ifdef HAVE_MU
-int all_is_ok = 1;
-#else
-#error "HAVE_MU no defined"
-chocke me
-#endif
-END
-
-# For automake bug#11229.
-cat > baz.c <<'END'
-int main (void)
-{
-  return 0;
-}
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-./configure
-
-$MAKE all
-ls -l # For debugging.
-$MAKE check
-
-have_generated_files ()
-{
-  test -f mu_vala.stamp
-  test -f zardoz_vala.stamp
-  test -f foo.c
-  test -f 1.c
-}
-
-# Our vala-related rules must create stamp files and intermediate
-# C files.
-have_generated_files
-
-# Remake rules are not uselessly triggered.
-$MAKE -q
-$MAKE -n | $FGREP vala.stamp && Exit 1
-
-# Check the distribution.
-$MAKE distcheck
-
-# Stamp files and intermediate C files should *not* be removed
-# by "make clean".
-$MAKE clean
-have_generated_files
-
-# But stamp files should be removed by "maintainer-clean" (the
-# behaviour w.r.t. intermediate C files is still unclear, and
-# better left undefined for the moment).
-$MAKE maintainer-clean
-ls *vala*.stamp | grep . && Exit 1
-
-:
diff --git a/tests/vala-mix2.test b/tests/vala-mix2.test
deleted file mode 100755
index 298f88d..0000000
--- a/tests/vala-mix2.test
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Vala sources, C and C++ sources and C and C++ headers in the same
-# program.  Functional test.  See automake bug#10894.
-
-required='valac cc c++ GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_VALAC([0.7.3])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-AM_VALAFLAGS = --profile=posix
-zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
-END
-
-cat > zardoz.vala <<'END'
-int main ()
-{
-  stdout.printf ("foo is alive\n");
-  return 0;
-}
-END
-
-cat > foo.h <<'END'
-int foo;
-int bar (void);
-int baz (void);
-END
-
-cat > bar.c <<'END'
-#include "foo.h"
-int bar (void) { return foo + baz (); }
-END
-
-cat > baz.c <<'END'
-#include "foo.h"
-extern int foo = 0;
-int baz (void) { return 0; }
-END
-
-cat > zen.hh <<'END'
-#include <iostream>
-END
-
-cat > master.cxx <<'END'
-#include "zen.hh"
-void chatty (void) { std::cout << "Hello, stranger!\n"; }
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-./configure
-
-$MAKE all
-ls -l # For debugging.
-
-have_generated_files ()
-{
-  test -f zardoz_vala.stamp
-  test -f zardoz.c
-}
-
-# Our vala-related rules must create stamp files and intermediate
-# C files.
-have_generated_files
-
-# Remake rules are not uselessly triggered.
-$MAKE -q
-$MAKE -n | $FGREP vala.stamp && Exit 1
-
-# But are triggered when they should.
-for file in zardoz.vala foo.h bar.c baz.c zen.hh master.cxx; do
-  $sleep
-  echo '& choke me !' >> $file
-  $MAKE && Exit 1
-  $sleep
-  sed '$d' $file > t
-  mv -f t $file
-  $MAKE
-done
-
-# Check the distribution.
-$MAKE distcheck
-
-# Stamp files and intermediate C files should *not* be removed
-# by "make clean".
-$MAKE clean
-ls -l # For debugging.
-have_generated_files
-
-# But stamp files should be removed by "maintainer-clean" (the
-# behaviour w.r.t. intermediate C files is still unclear, and
-# better left undefined for the moment).
-$MAKE maintainer-clean
-ls *vala*.stamp | grep . && Exit 1
-
-:
diff --git a/tests/vala-vapi.test b/tests/vala-vapi.test
deleted file mode 100755
index 46e0dd4..0000000
--- a/tests/vala-vapi.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test and that vapi files are correctly handled by Vala support.
-
-required='valac cc GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_VALAC([0.7.3])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-AM_VALAFLAGS = --profile=posix
-zardoz_SOURCES = zardoz.vala foo.vapi foo.h
-END
-
-cat > zardoz.vala <<'END'
-int main ()
-{
-    stdout.printf (BARBAR);
-    return 0;
-}
-END
-
-echo '#define BARBAR "Zardoz!\n"' > foo.h
-
-cat > foo.vapi <<'END'
-[CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
-public const string BARBAR;
-END
-
-if cross_compiling; then :; else
-  unindent >> Makefile.am <<'END'
-    check-local: test2
-    .PHONY: test1 test2
-    test1:
-       ./zardoz
-       ./zardoz | grep 'Zardoz!'
-    test2:
-       ./zardoz
-       ./zardoz | grep 'Quux!'
-END
-fi
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-
-./configure --enable-dependency-tracking
-
-$MAKE
-ls -l        # For debugging.
-cat zardoz.c # Likewise.
-grep 'BARBAR' zardoz.c
-$MAKE test1
-
-# Simple check on remake rules.
-$sleep
-echo '#define BAZBAZ "Quux!\n"' > foo.h
-sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
-$MAKE && Exit 1
-sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
-$MAKE
-cat zardoz.c # For debugging.
-grep 'BAZBAZ' zardoz.c
-$MAKE test2
-
-# Check the distribution.
-$MAKE distcheck
-
-:
diff --git a/tests/vala-vpath.test b/tests/vala-vpath.test
deleted file mode 100755
index 311eb3a..0000000
--- a/tests/vala-vpath.test
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure vala support handles from-scratch VPATH builds.
-# See automake bug#8753.
-
-required="valac GNUmake"
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_CONFIG_SRCDIR([hello.vala])
-AC_PROG_CC
-AM_PROG_VALAC([0.7.3])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo
-foo_VALAFLAGS = --profile=posix
-foo_SOURCES = hello.vala
-END
-
-cat > hello.vala <<'END'
-void main ()
-{
-  stdout.printf ("foofoofoo\n");
-}
-END
-
-$ACLOCAL  || framework_failure_ "aclocal error"
-$AUTOCONF || framework_failure_ "autoconf error"
-$AUTOMAKE || framework_failure_ "automake error"
-
-mkdir build
-cd build
-../configure || Exit 77
-$MAKE
-grep foofoofoo ../hello.c
-$MAKE distcheck
-
-# Rebuild rules work also in VPATH builds.
-cat > ../hello.vala <<'END'
-int main ()
-{
-  stdout.printf ("barbarbar\n");
-  return 0;
-}
-END
-
-$MAKE
-grep barbarbar ../hello.c
-
-# Rebuild rules are not uselessly triggered.
-$MAKE -q
-$MAKE -n | grep '\.stamp' && Exit 1
-
-:
diff --git a/tests/vala.test b/tests/vala.test
deleted file mode 100755
index 2c7dae1..0000000
--- a/tests/vala.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2012 Free Software
-# Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Basic "grepping" test on vala support.
-
-. ./defs || Exit 1
-
-set -e
-
-# So that we won't require libtool macros.
-cat > acinclude.m4 <<'END'
-AC_DEFUN([AC_PROG_LIBTOOL],
-         [AC_SUBST([LIBTOOL], [:])])
-END
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AM_PROG_VALAC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.vala
-zardoz_VALAFLAGS = --debug
-
-lib_LTLIBRARIES = libzardoz.la
-libzardoz_la_SOURCES = zardoz-foo.vala zardoz-bar.vala
-END
-
-mkdir sub
-
-cat > sub/Makefile.am <<'END'
-bin_PROGRAMS = foo
-foo_SOURCES = bar.vala baz.vala mu.c zap.cxx
-END
-
-: > ltmain.sh
-: > config.sub
-: > config.guess
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '\$(VALAC).* \$(AM_VALAFLAGS) \$(VALAFLAGS) ' Makefile.in
-grep '\$(VALAC).* \$(zardoz_VALAFLAGS) \$(VALAFLAGS) ' Makefile.in
-$FGREP 'am_zardoz_OBJECTS' Makefile.in
-$FGREP 'am_libzardoz_la_OBJECTS' Makefile.in
-$FGREP 'zardoz_vala.stamp:' Makefile.in
-$FGREP 'libzardoz_la_vala.stamp:' Makefile.in
-test `$FGREP -c '.stamp:' Makefile.in` -eq 2
-$FGREP 'zardoz.c' Makefile.in
-$FGREP 'zardoz-foo.c' Makefile.in
-$FGREP 'zardoz-bar.c' Makefile.in
-
-grep '\$(VALAC).* \$(AM_VALAFLAGS) \$(VALAFLAGS) ' sub/Makefile.in
-$FGREP 'foo_VALAFLAGS' sub/Makefile.in && Exit 1
-$FGREP 'am_foo_OBJECTS' sub/Makefile.in
-$FGREP 'bar.c' sub/Makefile.in
-$FGREP 'baz.c' sub/Makefile.in
-$FGREP 'foo_vala.stamp:' sub/Makefile.in
-test `$FGREP -c '.stamp:' sub/Makefile.in` -eq 1
-
-# Check against regression for weird bug due to unescaped '@'
-# characters used in a "..." perl string when writing the vala
-# rules from automake.in.
-grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
-
-:
diff --git a/tests/vala1.test b/tests/vala1.test
deleted file mode 100755
index b2c9e16..0000000
--- a/tests/vala1.test
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test to make sure intermediate .c files are built from vala sources
-# in non-recursive automake mode.
-
-required="libtool"
-. ./defs || Exit 1
-
-set -e
-
-cat >> 'configure.in' << 'END'
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AM_PROG_VALAC
-AC_OUTPUT
-END
-
-cat > 'Makefile.am' <<'END'
-bin_PROGRAMS = src/zardoz
-src_zardoz_SOURCES = src/zardoz.vala
-
-lib_LTLIBRARIES = src/libzardoz.la
-src_libzardoz_la_SOURCES = src/zardoz-foo.vala src/zardoz-bar.vala
-END
-
-: > ltmain.sh
-: > config.sub
-: > config.guess
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep 'VALAC' Makefile.in
-grep 'src_zardoz_OBJECTS' Makefile.in
-grep 'src_libzardoz_la_OBJECTS' Makefile.in
-grep 'src_zardoz_vala.stamp' Makefile.in
-grep 'src_libzardoz_la_vala.stamp' Makefile.in
-grep 'zardoz\.c' Makefile.in
-grep 'src/zardoz-foo\.c' Makefile.in
diff --git a/tests/vala2.test b/tests/vala2.test
deleted file mode 100755
index a8a3d90..0000000
--- a/tests/vala2.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test to make sure compiling Vala code really works with recursive make.
-
-required="libtool libtoolize pkg-config valac gcc GNUmake"
-. ./defs || Exit 1
-
-set -e
-
-mkdir src
-
-cat >> 'configure.in' << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
-AC_CONFIG_FILES([src/Makefile])
-AC_OUTPUT
-END
-
-cat > 'Makefile.am' <<'END'
-SUBDIRS = src
-END
-
-cat > 'src/Makefile.am' <<'END'
-bin_PROGRAMS = zardoz
-zardoz_VALAFLAGS = -H zardoz.h
-zardoz_CFLAGS = $(GOBJECT_CFLAGS)
-zardoz_LDADD = $(GOBJECT_LIBS)
-zardoz_SOURCES = zardoz.vala
-END
-
-cat > 'src/zardoz.vala' <<'END'
-using GLib;
-
-public class Zardoz {
-  public static void main () {
-    stdout.printf ("Zardoz!\n");
-  }
-}
-END
-
-libtoolize
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure || Exit 77
-$MAKE
-
-# test rebuild rules
-rm -f src/zardoz.h
-$MAKE -C src zardoz.h
-
-$MAKE distcheck
-$MAKE distclean
-mkdir build
-cd build
-../configure
-$MAKE
-$MAKE distcheck
-
-# Test rebuild rules from builddir.
-rm -f ../src/zardoz.c
-$MAKE
-grep 'Zardoz!' ../src/zardoz.c
-sed 's/Zardoz!/FooBar!/' ../src/zardoz.c > t
-mv -f t ../src/zardoz.c
-$MAKE
-grep 'FooBar!' ../src/zardoz.c
-grep 'Zardoz!' ../src/zardoz.c && Exit 1
-
-:
diff --git a/tests/vala3.test b/tests/vala3.test
deleted file mode 100755
index 138e853..0000000
--- a/tests/vala3.test
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test to make sure compiling Vala code really works with non-recursive make.
-
-required="libtool libtoolize pkg-config valac gcc GNUmake"
-. ./defs || Exit 1
-
-set -e
-
-mkdir src
-
-cat >> 'configure.in' << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
-AC_OUTPUT
-END
-
-cat > 'src/zardoz.vala' <<'END'
-using GLib;
-
-public class Zardoz {
-  public static void main () {
-    stdout.printf ("Zardoz!\n");
-  }
-}
-END
-
-cat > 'Makefile.am' <<'END'
-bin_PROGRAMS = src/zardoz
-src_zardoz_CFLAGS = $(GOBJECT_CFLAGS)
-src_zardoz_LDADD = $(GOBJECT_LIBS)
-src_zardoz_SOURCES = src/zardoz.vala
-END
-
-libtoolize
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure || Exit 77
-$MAKE
-$MAKE distcheck
-$MAKE distclean
-mkdir build
-cd build
-../configure
-$MAKE
-$MAKE distcheck
-
-cd ..
-rm -rf build
-
-# Try again with subdir-objects.
-
-cat > 'Makefile.am' <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-
-bin_PROGRAMS = src/zardoz
-src_zardoz_CFLAGS = $(GOBJECT_CFLAGS)
-src_zardoz_LDADD = $(GOBJECT_LIBS)
-src_zardoz_SOURCES = src/zardoz.vala
-END
-
-libtoolize
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure || Exit 77
-$MAKE
-$MAKE distcheck
-$MAKE distclean
-mkdir build
-cd build
-../configure
-$MAKE
-$MAKE distcheck
-
-
diff --git a/tests/vala4.test b/tests/vala4.test
deleted file mode 100755
index 7a15ebe..0000000
--- a/tests/vala4.test
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test AM_PROG_VALAC.
-
-required=libtoolize
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AM_PROG_VALAC([0.0.1])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-cat > valac << 'END'
-#! /bin/sh
-if test "x$1" = x--version; then
-  echo 1.2.3
-fi
-exit 0
-END
-chmod +x valac
-
-cwd=`pwd`
-
-# Use $cwd instead of `pwd` in the && list below to avoid a bug in
-# the way Solaris/Heirloom Sh handles `set -e'.
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-./configure "VALAC=$cwd/valac"
-
-sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.in >t
-mv -f t configure.in
-$AUTOCONF --force
-./configure "VALAC=$cwd/valac" && Exit 1
-
-sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.in >t
-mv -f t configure.in
-$AUTOCONF --force
-./configure "VALAC=$cwd/valac"
-:
diff --git a/tests/vala5.test b/tests/vala5.test
deleted file mode 100755
index 2206b25..0000000
--- a/tests/vala5.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2012 Free Software
-# Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Test per-target flags.
-
-required="pkg-config valac gcc GNUmake"
-. ./defs || Exit 1
-
-set -e
-
-mkdir src
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.10])
-AC_CONFIG_FILES([src/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = src
-END
-
-cat > src/Makefile.am <<'END'
-bin_PROGRAMS = foo bar
-foo_CFLAGS = $(GOBJECT_CFLAGS)
-foo_LDADD = $(GOBJECT_LIBS)
-foo_SOURCES = xfoo.vala
-bar_SOURCES = xbar.vala
-bar_VALAFLAGS = -D BAR
-bar_CFLAGS = $(GOBJECT_CFLAGS)
-bar_LDADD = $(GOBJECT_LIBS)
-END
-
-cat > src/xfoo.vala <<'END'
-int main ()
-{
-  stdout.printf ("foo\n");
-  return 0;
-}
-END
-
-cat > src/xbar.vala <<'END'
-void main ()
-{
-#if BAR
-  stdout.printf ("bar\n");
-#else
-  stdout.oops_an_invalid_method ();
-#endif
-}
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
-
-./configure
-$MAKE
-
-if cross_compiling; then :; else
-  ./src/foo
-  ./src/bar
-  test `./src/foo` = foo
-  test `./src/bar` = bar
-fi
-
-:
diff --git a/tests/vars.test b/tests/vars.test
deleted file mode 100755
index 6163a8d..0000000
--- a/tests/vars.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test various variable definitions that include an '=' sign
-# From Raja R Harinath
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-MY_FLAGS_1=-DABC=345
-MY_FLAGS_2= -DABC=345
-MY_FLAGS_3 =-DABC=345
-MY_FLAGS_4 = -DABC=345
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/vars3.test b/tests/vars3.test
deleted file mode 100755
index 6b738ab..0000000
--- a/tests/vars3.test
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that Automake warns about variables containing spaces
-# and other non-POSIX characters.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >Makefile.am <<'EOF'
-L01 = $(shell echo *)
-L02 = $$(not an error)
-L03 = $$(this is)$${ok too}
-L04 = $(nextvariableisbad)$(addsuffix .a, $(A))
-L05 = "$(bad boy)"
-L06 = $(this:is= ok)
-L07 = ${three errors}${on this} $(long line)
-L08$(o u c h): $(wildcard *.c)
-       ${another error}
-       echo $${ok-this is}
-L11: $(thisis) $(ok)
-       ${here}
-EOF
-
-$ACLOCAL
-# Make sure this warning is print in the `portability' category.
-$AUTOMAKE --warnings=no-error,none,portability 2>stderr \
-  || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-
-# Lines number are printed in error message.
-# Use them to make sure errors are diagnosed against the right lines.
-
-# No error expected for these lines.
-grep 1: stderr
-grep 2: stderr && Exit 1
-grep 3: stderr && Exit 1
-grep 4: stderr
-grep 5: stderr
-grep 6: stderr && Exit 1
-grep 7: stderr
-grep 8: stderr
-grep 9: stderr
-grep 10: stderr && Exit 1
-grep 11: stderr && Exit 1
-grep 12: stderr && Exit 1
-
-# Now check some individual values.
-grep 'shell echo' stderr
-grep 'nextvariableisbad' stderr && Exit 1
-grep 'addsuffix' stderr
-grep 'bad boy' stderr
-grep 'ok' stderr && Exit 1
-grep 'three errors' stderr
-grep 'on this' stderr
-grep 'long line' stderr
-grep 'o u c h' stderr
-grep 'wildcard' stderr
-grep 'another error' stderr
-grep 'thisis' stderr && Exit 1
-grep 'here' stderr && Exit 1
-
-# None of these errors be diagnosed with -Wno-portability
-$AUTOMAKE -Wno-portability
-
-# Likewise if we add this in the Makefile.am
-# (although this makes some difference internally: AUTOMAKE_OPTIONS is
-# processed far later).
-echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
diff --git a/tests/vartar.test b/tests/vartar.test
deleted file mode 100755
index 3a18d77..0000000
--- a/tests/vartar.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Targets and macros are two different name spaces.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-install = install
-install:
-       $(install) install
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-override
-
-grep '^install = install$' Makefile.in
-
-cat > target.expected <<'EOF'
-install:
-       $(install) install
-EOF
-sed -n '/^install:/,/^ /p' Makefile.in > target.value
-diff target.expected target.value
diff --git a/tests/version.test b/tests/version.test
deleted file mode 100755
index a894a75..0000000
--- a/tests/version.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure [...] is ok in version number.  Report from Jim
-# Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE([sh-utils], [1.12o])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-# Files required by Gnits.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-$AUTOMAKE --gnits
diff --git a/tests/version2.test b/tests/version2.test
deleted file mode 100755
index a25b82b..0000000
--- a/tests/version2.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in
-# version.  From Joel Weber.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE([sh-utils], [1.12o], [no])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-: > Makefile.am
-
-# Files required by Gnits.
-: > INSTALL
-: > NEWS
-: > README
-: > COPYING
-: > AUTHORS
-: > ChangeLog
-: > THANKS
-
-$ACLOCAL
-$AUTOMAKE --gnits
diff --git a/tests/version3.test b/tests/version3.test
deleted file mode 100755
index b7d356d..0000000
--- a/tests/version3.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure version in AUTOMAKE_OPTIONS works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = 9.9x
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:1:.*Automake 9.9x' stderr
diff --git a/tests/version4.test b/tests/version4.test
deleted file mode 100755
index f8ceafe..0000000
--- a/tests/version4.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure we are compatible with the 1.4-p1 series.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = 1.4-p3
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/version6.test b/tests/version6.test
deleted file mode 100755
index 6993c06..0000000
--- a/tests/version6.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure the current version can be required.
-
-. ./defs || Exit 1
-
-set -e
-
-amver=`$AUTOMAKE --version | sed -e 's/.* //;1q'`
-
-cat > Makefile.am << END
-AUTOMAKE_OPTIONS = $amver
-END
-
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/version7.test b/tests/version7.test
deleted file mode 100755
index 4df84ed..0000000
--- a/tests/version7.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for a special setup where the package's version isn't defined
-# in configure.in.  We want GNU Make for this test (part of the test
-# is to make sure Makefile.ins get rebuilt when a m4_included file
-# changes -- we don't support this feature on non-GNU Makes).
-
-required='makeinfo tex texi2dvi GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat >configure.in <<'END'
-m4_include([version.m4])
-AC_INIT([version7], [THE_VERSION])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-echo 'm4_define([THE_VERSION], [2.718])' > version.m4
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = zardoz.texi
-
-check:
-       test -f $(srcdir)/version.m4
-END
-
-cat > zardoz.texi << 'END'
-\input texinfo
address@hidden zardoz.info
address@hidden Zardoz
address@hidden Top
-Hello walls.
address@hidden version.texi
address@hidden
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE --add-missing
-./configure --version | grep '2\.718'
-./configure
-$MAKE
-grep '2\.718' version.texi
-
-
-$sleep
-echo 'm4_define([THE_VERSION], [3.141])' > version.m4
-$MAKE distcheck
-./configure --version | grep '3\.141'
-grep '3\.141' version.texi
diff --git a/tests/version8.test b/tests/version8.test
deleted file mode 100755
index 91b11a0..0000000
--- a/tests/version8.test
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Calling AM_AUTOMAKE_VERSION by hand is a bug.
-
-. ./defs || Exit 1
-
-set -e
-echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.in
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 0; }
-cat stderr >&2
-$FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr
diff --git a/tests/vpath.test b/tests/vpath.test
deleted file mode 100755
index a95f5b2..0000000
--- a/tests/vpath.test
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure VPATH can be overridden.
-# Report from Anthony Green.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-VPATH = zardoz
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'address@hidden@' Makefile.in && Exit 1
-Exit 0
diff --git a/tests/vtexi.test b/tests/vtexi.test
deleted file mode 100755
index e9a4511..0000000
--- a/tests/vtexi.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Basic checks and some regressions testing on `version.texi'
-# support for texinfo files.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
address@hidden version.texi
address@hidden textutils.info
-END
-
-# Required when using Texinfo.
-: > mdate-sh
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-# Test for bug reported by Jim Meyering:
-# When I ran automake-0.29 on textutils,
-# I noticed that doc/Makefile.in had
-#   textutils.info: textutils.texi
-# instead of
-#   textutils.info: textutils.texi version.texi
-# Today this should be:
-#   $(srcdir)/textutils.info: $(srcdir)/version.texi
-# or:
-#   $(srcdir)/textutils.info: version.texi
-grep '^\$(srcdir)/textutils\.info:.*[ /]version\.texi *$' Makefile.in
-
-# Test for bug reported by Lars Hecking:
-# When running the first version of configure.ac aware automake,
-# @CONFIGURE_AC@ was not properly substituted.
-$EGREP 'stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
-$EGREP 'stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in
-
-# Check that the path to mdate-sh is correct.  Over escaping of `$'
-# etc. once led to `\$\(srcdir\)/mdate-sh'.
-# Filter out '$(srcdir)/mdate-sh'; there should be no occurrences
-# of `.../mdate-sh' left then.
-sed 's,\$(srcdir)/mdate-sh,,g' Makefile.in | grep '/mdate-sh' && Exit 1
-
-:
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
deleted file mode 100755
index 00e4c1e..0000000
--- a/tests/vtexi2.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002, 2011 Free Software Foundation,
-# Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Glenn Amerine:
-#   When automake sees version.texi is being included by a texi file,
-#   version.texi gets listed as a dependency for the .info file but
-#   not the .dvi file.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = zardoz.texi
-END
-
-cat > zardoz.texi << 'END'
address@hidden zardoz
address@hidden version.texi
-END
-
-# Required when using Texinfo.
-: > mdate-sh
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^zardoz\.dvi:.*[ /]version.texi' Makefile.in
-
-:
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
deleted file mode 100755
index 4b0f45d..0000000
--- a/tests/vtexi3.test
+++ /dev/null
@@ -1,126 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that vers*.texi files are automatically created and distributed
-# if @included into a texi source.  Also check that they correctly contain
-# the @values definitions they are advertised to.
-# See also the related test `vtexi4.test', which does similar checks, but
-# for version.texi only, and requires makeinfo, tex and texi2dvi.
-
-. ./defs || Exit 1
-
-set -e
-
-# We are going to override package version in AC_INIT, so we need
-# to redefine the name of the distdir as well.
-distdir=$me-7.45.3a
-
-# This should work without tex, texinfo or makeinfo
-TEX=false TEXI2DVI=false MAKEINFO=false
-export TEX TEXI2DVI MAKEINFO
-
-cat > configure.in << END
-AC_INIT([$me], [7.45.3a])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foobar.texi quux.texi zardoz.texi
-.PHONY: echo-distfiles
-echo-distfiles:
-       @echo ' ' $(DISTFILES) ' '
-END
-
-cat > foobar.texi << 'END'
address@hidden foobar.info
-random text
address@hidden version.texi
-END
-
-cat > quux.texi << 'END'
address@hidden quux.info
address@hidden version-quux.texi
-random text
-END
-
-cat > zardoz.texi << 'END'
address@hidden zardoz.info
-some randome text
address@hidden vers1a_2b.texi
-more random text
-END
-
-# Required when using Texinfo.
-: > texinfo.tex
-cp "$testsrcdir/../lib/mdate-sh" .
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-day='([1-9]|1[0-9]|2[0-9]|3[01])'
-month='(January|February|March|April|May|June|July|August|September|October|November|December)'
-year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
-date="$day $month $year"
-
-do_check ()
-{
-  # Basename of the vers*.texi file.
-  vfile=$1
-  # The $(srcdir) of the current build.
-  srcdir=$2
-  # The vers*.texi file must be created in $(srcdir).
-  $MAKE $srcdir/$vfile.texi
-  cat $srcdir/$vfile.texi
-  # EDITION and VERSION are synonyms, as per documentation.
-  grep "address@hidden EDITION 7\\.45\\.3a$" $srcdir/$vfile.texi
-  grep "address@hidden VERSION 7\\.45\\.3a$" $srcdir/$vfile.texi
-  # Check that UPDATED seems right, and that UPDATED and UPDATED-MONTH
-  # are consistent.
-  $EGREP "address@hidden UPDATED $date$" $srcdir/$vfile.texi
-  vmonth=`grep 'address@hidden UPDATED ' $srcdir/$vfile.texi | awk '{print $4, 
$5}'`
-  grep "address@hidden UPDATED-MONTH $vmonth$" $srcdir/$vfile.texi
-  # Check that the vers*.texi file is distributed according
-  # to $(DISTFILES).
-  $MAKE echo-distfiles # For debugging.
-  $MAKE -s echo-distfiles | grep "[ /]$vfile\\.texi"
-}
-
-mkdir build
-cd build
-../configure
-
-do_check version ..
-do_check version-quux ..
-do_check vers1a_2b ..
-
-# The various $(srcdir)/*.info are required for the distribution
-# and they must be newer than version.texi, so that make won't try
-# to rebuild them.
-$sleep
-touch ../foobar.info
-touch ../quux.info
-touch ../zardoz.info
-# Check that the vers*.texi files are really distributed.
-$MAKE distdir
-ls -l $distdir
-diff ../version.texi $distdir/version.texi
-diff ../version-quux.texi $distdir/version-quux.texi
-diff ../version.texi $distdir/vers1a_2b.texi
-
-:
diff --git a/tests/vtexi4.test b/tests/vtexi4.test
deleted file mode 100755
index 3c8ab41..0000000
--- a/tests/vtexi4.test
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the version.texi file is automatically created and distributed
-# if @included into a texi source.  Also check that is correctly defined
-# @values definitions it is advertised to.
-# See also the related test `vtexi3.test', which does similar checks, but
-# for more vers*.texi files, and does not require makeinfo, tex and
-# texi2dvi.
-
-required='makeinfo tex texi2dvi-o'
-. ./defs || Exit 1
-
-set -e
-
-case `LC_ALL=C date '+%u'` in
-  [1-7]) date_is_posix=:;;
-      *) date_is_posx=false;;
-esac
-$date_is_posix \
-  && day=`LC_ALL=C date '+%d'` && test -n "$day" \
-  && month=`LC_ALL=C date '+%B'` && test -n "$month" \
-  && year=`LC_ALL=C date '+%Y'`&& test -n "$year" \
-  || { echo "$me: 'date' is not POSIX-compliant enough"; Exit 77; }
-day=`echo "$day" | sed 's/^0//'`
-
-# This test requires a grep program that can work on non-text input.
-(echo 'x' | grep x) || {
-  echo "$me: grep doesn't work on input that is not pure text" >&2
-  Exit 77
-}
-
-cat > configure.in << END
-AC_INIT([$me], [123.456])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > defs.am <<END
-my_date_rx = $day $month $year
-my_month_rx = $month $year
-my_version_rx = 123\.456
-END
-
-cat > Makefile.am << 'END'
-include defs.am
-info_TEXINFOS = foo.texi
-test-grepinfo:
-## Not useless uses of cat: we only tested that grep worked on
-## non-text input when that's given from a pipe.
-       cat $(srcdir)/foo.info | grep 'GREPVERSION=$(my_version_rx)='
-       cat $(srcdir)/foo.info | grep 'GREPEDITION=$(my_version_rx)='
-       cat $(srcdir)/foo.info | grep 'GREPDATE=$(my_date_rx)='
-       cat $(srcdir)/foo.info | grep 'GREPMONTH=$(my_month_rx)='
-test-distfiles:
-       @echo DISTFILES = $(DISTFILES)
-       echo ' ' $(DISTFILES) ' ' | grep '[ /]version.texi '
-test-distdir: distdir
-       ls -l $(distdir)
-       diff $(srcdir)/version.texi $(distdir)/version.texi
-.PHONY: test-grepinfo test-distfiles test-distdir
-check-local: test-grepinfo test-distfiles test-distdir
-END
-
-cat > foo.texi << 'END'
-\input texinfo
address@hidden %**start of header
address@hidden foo.info
address@hidden Zardoz
address@hidden %**end of header
-
address@hidden Top
address@hidden version.texi
-
address@hidden
-
address@hidden
-
address@hidden
-
address@hidden
-
address@hidden
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE all dvi
-
-# debugging & sanity checks
-ls -l
-cat version.texi
-cat foo.info
-test -f foo.dvi
-
-$MAKE test-grepinfo
-$MAKE test-distfiles
-$MAKE test-distdir
-$MAKE distcheck
-
-:
diff --git a/tests/warnopts.test b/tests/warnopts.test
deleted file mode 100755
index 6d96400..0000000
--- a/tests/warnopts.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that we can enable or disable warnings on a per-file basis.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<END
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-
-# These two Makefile contain the same errors, but have different
-# warnings disabled.
-
-cat >Makefile.am <<END
-AUTOMAKE_OPTIONS = -Wno-obsolete
-INCLUDES = -Ifoo
-foo_SOURCES = unused
-SUBDIRS = sub
-END
-
-cat >sub/Makefile.am <<END
-AUTOMAKE_OPTIONS = -Wno-syntax
-INCLUDES = -Ifoo
-foo_SOURCES = unused
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-# The expected diagnostic is
-#   Makefile.am:3: unused variable: `foo_SOURCES'
-#   sub/Makefile.am:2: `INCLUDES' is the old name for `AM_CPPFLAGS'
-grep '^Makefile.am:.*foo_SOURCES' stderr
-grep '^sub/Makefile.am:.*INCLUDES' stderr
-grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1
-grep '^Makefile.am:.*INCLUDES' stderr && Exit 1
-# Only three lines of warnings.
-test `wc -l < stderr` = 3
-
-# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
-# used.  We could do `$sleep', but it's faster to erase the
-# directory.  (Erase autom4te*.cache, not autom4te.cache, because some
-# bogus installations of Autoconf use a versioned cache.)
-rm -rf autom4te*.cache
-
-# If we add a global -Wnone, all warnings should disappear.
-cat >configure.in <<END
-AC_INIT([warnopts], [1.0])
-AM_INIT_AUTOMAKE([-Wnone])
-AC_CONFIG_FILES([Makefile sub/Makefile])
-AC_OUTPUT
-END
-$ACLOCAL
-$AUTOMAKE
diff --git a/tests/werror.test b/tests/werror.test
deleted file mode 100755
index 355f9d2..0000000
--- a/tests/werror.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure --Werror and --add-missing work together.
-
-. ./defs || Exit 1
-
-set -e
-
-: > Makefile.am
-
-rm -f install-sh depcomp missing mkinstalldirs
-
-$ACLOCAL
-$AUTOMAKE --Werror --add-missing
diff --git a/tests/werror2.test b/tests/werror2.test
deleted file mode 100755
index 6b6d011..0000000
--- a/tests/werror2.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2009  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that Makefile.in is not overwritten on error.  Otherwise
-# although the rebuilding rules would fail on error, they would
-# succeed if make is run a second time immediately afterwards.
-# Report from Harlan Stenn.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-echo AC_OUTPUT>>configure.in
-
-: > Makefile.am
-
-$ACLOCAL
-# Create Makefile.in before configure.  configure ensures files
-# generated by it or later are newer than configure, so this allows
-# us to avoid a $sleep before updating Makefile.am below.
-$AUTOMAKE
-$AUTOCONF
-
-./configure
-$MAKE
-
-cat >Makefile.am <<END
-AUTOMAKE_OPTIONS = -Werror
-INCLUDES = -Ifoo
-foo_SOURCES = unused
-END
-
-$MAKE && Exit 1
-
-$MAKE && Exit 1
-
-:
diff --git a/tests/werror3.test b/tests/werror3.test
deleted file mode 100755
index 96b4ff3..0000000
--- a/tests/werror3.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure a per-Makefile.am -Werror setting is not carried over
-# to another Makefile.am.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >>configure.in <<\END
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-cat >sub/Makefile.am <<\END
-AUTOMAKE_OPTIONS = -Werror
-END
-cat >Makefile.am <<\END
-VAR = foo
-VAR = bar
-END
-
-$ACLOCAL
-
-# The issue would not manifest with threaded execution.
-unset AUTOMAKE_JOBS || :
-AUTOMAKE_run 0 -Wno-error
-grep 'VAR multiply defined' stderr
-
-AUTOMAKE_JOBS=2
-export AUTOMAKE_JOBS
-AUTOMAKE_run 0 -Wno-error
-grep 'VAR multiply defined' stderr
-:
diff --git a/tests/whoami.test b/tests/whoami.test
deleted file mode 100755
index 37bd81a..0000000
--- a/tests/whoami.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998, 2002, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure aclocal doesn't barf on "WHO_AM_I=...".  Report
-# from Johan Danielsson (and a very nice bug report, too, I might
-# add).
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-WHO_AM_I=17
-END
-
-$ACLOCAL
diff --git a/tests/xsource.test b/tests/xsource.test
deleted file mode 100755
index df140a5..0000000
--- a/tests/xsource.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-#   Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure multiple source files with the same object
-# file causes error.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = z.c x/z.c
-END
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-mkdir x
-
-: > z.c
-: > x/z.c
-
-$ACLOCAL
-AUTOMAKE_fails
-$FGREP 'z.$(OBJEXT)' stderr
diff --git a/tests/xz.test b/tests/xz.test
deleted file mode 100755
index f442711..0000000
--- a/tests/xz.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check support for no-dist-gzip with xz
-
-required=xz
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([xz], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-test: distcheck
-       test $(DIST_ARCHIVES) = xz-1.0.tar.xz
-       test -f $(DIST_ARCHIVES)
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-$MAKE test
diff --git a/tests/yacc-dist-nobuild-subdir.test 
b/tests/yacc-dist-nobuild-subdir.test
deleted file mode 100755
index b6811d7..0000000
--- a/tests/yacc-dist-nobuild-subdir.test
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that VPATH builds and "make distcheck" works with packages
-# using yacc and the automake 'subdir-objects' option.
-# Exposes automake bug#8485.
-
-required=yacc
-. ./defs || Exit 1
-
-set -e
-
-distdir=$me-1.0
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-mkdir sub
-
-cat > sub/parse.y << 'END'
-%{
-int yylex () { return 0; }
-void yyerror (char *s) { return; }
-%}
-%%
-x : 'x' {};
-%%
-int main (void)
-{
-  return yyparse ();
-}
-END
-
-cat > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = foo bar
-foo_SOURCES = sub/parse.y
-bar_SOURCES = $(foo_SOURCES)
-AM_YFLAGS = -d
-bar_YFLAGS =
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE distdir
-
-# Yacc-derived C source and header files must be built and distributed
-
-test   -f sub/parse.c
-test   -f sub/parse.h
-test   -f sub/bar-parse.c
-test ! -r sub/bar-parse.h
-
-test   -f $distdir/sub/parse.c
-test   -f $distdir/sub/parse.h
-test   -f $distdir/sub/bar-parse.c
-test ! -r $distdir/sub/bar-parse.h
-
-# But they shouldn't be rebuilt in VPATH builds.
-
-mkdir $distdir/build
-chmod -R a-w $distdir
-cd $distdir/build
-chmod u+w .
-# Try to enable dependency tracking even with slow dependency
-# extractors, to improve coverage.
-../configure --enable-dependency-tracking YACC=false
-YACC=false $MAKE -e
-ls -l sub/*.[ch] && Exit 1
-
-env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
-
-:
diff --git a/tests/yacc.test b/tests/yacc.test
deleted file mode 100755
index bf6782f..0000000
--- a/tests/yacc.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure intermediate .c file is built from yacc source.
-# Bug from Thomas Morgan.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_YACC
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.y
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep 'zardoz.c' Makefile.in
diff --git a/tests/yacc2.test b/tests/yacc2.test
deleted file mode 100755
index a095edc..0000000
--- a/tests/yacc2.test
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure intermediate .h file is not generated nor removed
-# if (AM_)?YFLAGS do not contain -d.  Requested by Jim Meyering.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_YACC
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.y
-END
-
-# Don't redefine several times the same variable.
-cp Makefile.am Makefile.src
-
-$ACLOCAL
-$AUTOMAKE -a
-
-# If zardoz.h IS mentioned, fail
-grep 'zardoz.h' Makefile.in > /dev/null && Exit 1
-
-
-
-cp Makefile.src Makefile.am
-echo 'AM_YFLAGS = -d' >> Makefile.am
-
-$AUTOMAKE
-
-# If zardoz.h is NOT mentioned, fail
-grep 'zardoz.h' Makefile.in > /dev/null
-
-
-
-cp Makefile.src Makefile.am
-echo 'AM_YFLAGS = ' >> Makefile.am
-
-$AUTOMAKE
-
-# If zardoz.h IS mentioned, fail
-grep 'zardoz.h' Makefile.in > /dev/null && Exit 1
-
-
-
-cp Makefile.src Makefile.am
-echo 'YFLAGS = -d' >> Makefile.am
-
-# YFLAGS is a use variable.
-AUTOMAKE_fails
-grep 'YFLAGS' stderr
-$AUTOMAKE -Wno-gnu
-
-# If zardoz.h is NOT mentioned, fail
-grep 'zardoz.h' Makefile.in > /dev/null
-
-
-
-cp Makefile.src Makefile.am
-echo 'YFLAGS = ' >> Makefile.am
-
-$AUTOMAKE -Wno-gnu
-
-# If zardoz.h IS mentioned, fail
-grep 'zardoz.h' Makefile.in > /dev/null && Exit 1
-
-:
diff --git a/tests/yacc3.test b/tests/yacc3.test
deleted file mode 100755
index 86d897c..0000000
--- a/tests/yacc3.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure that generated .h file is distributed iff we have -d in
-# (AM_)?YFLAGS.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_YACC
-END
-
-cat > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = no-dependencies
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.y
-magic:
-       @echo $(DIST_COMMON)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-# It should not be disted here
-grep 'zardoz.h' Makefile.in && Exit 1
-
-cp Makefile.am Save
-# Test all available flags to make sure header is distributed with
-# `-d'.
-for flag in YFLAGS AM_YFLAGS zardoz_YFLAGS; do
-   cp Save Makefile.am
-   echo "$flag = -d" >> Makefile.am
-
-   $AUTOMAKE -Wno-gnu
-   grep 'zardoz.h' Makefile.in
-done
diff --git a/tests/yacc4.test b/tests/yacc4.test
deleted file mode 100755
index 0435ec0..0000000
--- a/tests/yacc4.test
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Some simple tests of ylwrap functionality.
-
-required='bison gcc'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE(foo, 0.1)
-PACKAGE=foo
-VERSION=0.1
-AC_PROG_CC
-AC_PROG_YACC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = parse.y foo.c
-bar_SOURCES = bar.y foo.c
-END
-
-# First parser.
-cat > parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-# Second parser.
-cat > bar.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-test -f ylwrap
-
-mkdir sub
-cd sub
-
-../configure
-$MAKE
-
-grep '^#.*/sub/\.\./' bar.c && Exit 1
-grep '^#.*/sub/\.\./' parse.c && Exit 1
-
-# Make distclean must not erase bar.c nor parse.c (by GNU standards) ...
-$MAKE distclean
-test -f bar.c
-test -f parse.c
-# ... but maintainer-clean should.
-../configure
-$MAKE maintainer-clean
-test ! -f bar.c
-test ! -f parse.c
-:
-
-Exit 0
diff --git a/tests/yacc5.test b/tests/yacc5.test
deleted file mode 100755
index f428396..0000000
--- a/tests/yacc5.test
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test of yacc functionality, derived from GNU binutils
-# by Tim Van Holder.
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude
-maude_SOURCES = sub/maude.y
-END
-
-mkdir sub
-
-: > sub/maude.y
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '^maude\.c:.*maude\.y' Makefile.in
-
-
-## Try again with subdir-objects.
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = maude
-maude_SOURCES = sub/maude.y
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-# No rule needed, the default .y.c: inference rule is enough
-# (but there may be an additional dependency on a dirstamp file).
-grep '^sub/maude\.c:.*maude\.y' Makefile.in && Exit 1
-
-
-## Try again with per-exe flags.
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude
-maude_SOURCES = sub/maude.y
-## A particularly trickey case.
-maude_YFLAGS = -d
-END
-
-$ACLOCAL || Exit 1
-$AUTOMAKE -a || Exit 1
-
-# Rule should use maude_YFLAGS.
-grep 'AM_YFLAGS.*maude' Makefile.in && Exit 1
-
-# Silly regression.
-grep 'maudec' Makefile.in && Exit 1
-
-# Make sure the .o file is required.
-grep '^am_maude_OBJECTS.*maude' Makefile.in
-
-:
diff --git a/tests/yacc6.test b/tests/yacc6.test
deleted file mode 100755
index f10effd..0000000
--- a/tests/yacc6.test
+++ /dev/null
@@ -1,108 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007  Free Software
-# Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure ylwrap put in right location.
-# Report from Tim Van Holder.
-# Also make sure depcomp does not needlessly update headers.
-# Report from Paolo Bonzini.
-
-required='gcc bison GNUmake'
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([yacc6], [1.0])
-AC_CONFIG_AUX_DIR([aux1])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-
-test-time-unchanged:
-       test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = z
-test-time-changed:
-       test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = sub/main.$(OBJEXT)
-END
-
-mkdir aux1 sub
-
-cat > sub/Makefile.am << 'END'
-bin_PROGRAMS = foo bar
-AM_YFLAGS = -d
-foo_SOURCES = foo.y main.c
-foo_CPPFLAGS = -DFOO
-bar_SOURCES = bar.y main.c
-BUILT_SOURCES = foo.h bar.h
-END
-
-cat > sub/foo.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%token TOKEN
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-cp sub/foo.y sub/bar.y
-
-cat >sub/main.c <<'EOF'
-#ifdef FOO
-#  include "foo.h"
-#else
-#  include "bar.h"
-#endif
-
-int
-main()
-{
-  return 0;
-}
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-test -f aux1/ylwrap
-test ! -f ylwrap
-test ! -f sub/ylwrap
-$FGREP '(top_srcdir)/aux1/ylwrap' sub/Makefile.in
-./configure
-$MAKE
-grep '#.*line.*foo.y' sub/foo.c
-grep '#.*line.*bar.y' sub/bar.c
-
-$sleep
-: > z
-$sleep
-touch sub/bar.y
-$MAKE
-$MAKE test-time-unchanged
-$sleep
-sed s/TOKEN/TEKON/g sub/bar.y >sub/bar.yt
-mv -f sub/bar.yt sub/bar.y
-$MAKE
-$MAKE test-time-changed
diff --git a/tests/yacc7.test b/tests/yacc7.test
deleted file mode 100755
index 2edd15c..0000000
--- a/tests/yacc7.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure dependencies are generated correctly for .h files.
-# Report from Richard Boulton.
-#
-# Also check that the sources of the generated parser are distributed.
-# PR/47.
-
-required=bison
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = foo.y
-AM_YFLAGS = -d
-
-check-dist: distdir
-       test -f $(distdir)/foo.y
-       test -f $(distdir)/foo.c
-       test -f $(distdir)/foo.h
-END
-
-# The %union will cause Bison to output `#line's in y.tab.h too.
-cat > foo.y << 'END'
-%union
-{
-  int i;
-  char c;
-}
-%%
-WORD: "up";
-%%
-END
-
-set -e
-
-$ACLOCAL
-$AUTOMAKE -a
-$AUTOCONF
-./configure
-
-$MAKE foo.h
-
-test -f foo.h
-
-rm -f foo.h foo.c
-$MAKE check-dist
-
-# We should be able to recover if foo.h is deleted.
-
-rm -f foo.h
-$MAKE foo.h
-test -f foo.h
-
-# Make sure `#line ... y.tab.h' gets replaced.
-$FGREP 'y.tab.h' foo.h && Exit 1
-
-# Make distclean must not erase foo.c nor foo.h (by GNU standards) ...
-$MAKE foo.c
-test -f foo.h
-test -f foo.c
-$MAKE distclean
-test -f foo.h
-test -f foo.c
-# ... but maintainer-clean should.
-./configure
-$MAKE maintainer-clean
-test ! -f foo.h
-test ! -f foo.c
-:
diff --git a/tests/yacc8.test b/tests/yacc8.test
deleted file mode 100755
index 979415c..0000000
--- a/tests/yacc8.test
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for subdir parsers.
-
-required="gcc bison"
-
-. ./defs || Exit 1
-
-set -e
-
-cat > configure.in << 'END'
-AC_INIT([yacc8], [1.0])
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = foo/foo
-foo_foo_SOURCES = foo/parse.y
-AM_YFLAGS = -d
-
-obj: foo/parse.$(OBJEXT)
-
-test1: obj
-       test -f foo/parse.c
-       test -f foo/parse.$(OBJEXT)
-
-test2: obj
-       test -f foo/parse.c
-       test -f foo/parse.$(OBJEXT)
-END
-
-mkdir foo
-
-cat > foo/parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir sub
-cd sub
-
-../configure
-$MAKE test1
-
-# Aside of the rest of this test, let's see if we can recover from
-# parse.h removal
-test -f foo/parse.h
-rm -f foo/parse.h
-$MAKE foo/parse.h
-test -f foo/parse.h
-
-# Make sure foo/parse.h is not updated, unless when needed.
-$sleep
-: > z
-$sleep
-touch ../foo/parse.y
-$MAKE obj
-test `ls -1t foo/parse.h z | sed 1q` = z
-$sleep
-sed 's/%%/%token TOKEN\n%%/g' ../foo/parse.y >../foo/parse.yt
-mv -f ../foo/parse.yt ../foo/parse.y
-$MAKE obj
-test `ls -1t foo/parse.h z | sed 1q` = foo/parse.h
-
-# Now, adds another parser to test ylwrap.
-
-cd ..
-
-# Sleep some to make sure timestamp of Makefile.am will change.
-$sleep
-
-cp foo/parse.y foo/parse2.y
-cat >> Makefile.am << 'END'
-EXTRA_foo_foo_SOURCES = foo/parse2.y
-END
-
-$AUTOMAKE -a
-test -f ./ylwrap || Exit 1
-
-cd sub
-# Regenerate Makefile (automatic in GNU Make, but not in other Makes)
-./config.status
-$MAKE test2
diff --git a/tests/yaccdry.test b/tests/yaccdry.test
deleted file mode 100755
index d2e7632..0000000
--- a/tests/yaccdry.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Removal recovery rules for headers should not remove files with `make -n'.
-
-required=bison
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_PROG_YACC
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-AM_YFLAGS = -d
-bin_PROGRAMS = foo
-foo_SOURCES = foo.c parse.y
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-cat > parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-./configure
-$MAKE
-
-rm -f parse.h
-$MAKE -n parse.h
-test -f parse.c
-test ! -f parse.h
-
-:
diff --git a/tests/yaccpp.test b/tests/yaccpp.test
deleted file mode 100755
index 9013f40..0000000
--- a/tests/yaccpp.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1997, 2001, 2002, 2006  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure yacc + c++ works.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AC_PROG_CXX
-AC_PROG_YACC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = zardoz.yy
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep zardoz.cc Makefile.in
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
deleted file mode 100755
index 6db5fd7..0000000
--- a/tests/yaccvpath.test
+++ /dev/null
@@ -1,106 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This test checks that dependent files are updated before including
-# in the distribution. `parse.c' depends on `parce.y'. The later is
-# updated so that `parse.c' should be rebuild. Then we are running
-# `make' and `make distdir' and check whether the version of `parse.c'
-# to be distributed is up to date.
-
-required='gcc bison'
-. ./defs || Exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE(foo, 0.1)
-PACKAGE=foo
-VERSION=0.1
-AC_PROG_CC
-AC_PROG_YACC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_SOURCES = parse.y foo.c
-END
-
-# Original parser, with `foobar'
-cat > parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-cat > foo.c << 'END'
-int main () { return 0; }
-END
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-$YACC parse.y
-mv y.tab.c parse.c
-
-mkdir sub
-cd sub
-../configure
-
-# A delay is needed to make sure that the new parse.y is indeed newer
-# than parse.c, i.e. the they don't have the same timestamp.
-$sleep
-
-# New parser, with `fubar'
-cat > ../parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' {};
-END
-
-$MAKE
-$MAKE distdir
-grep fubar foo-0.1/parse.c
-
-#
-# Now check to make sure that `make dist' will rebuild the parser.
-#
-
-# A delay is needed to make sure that the new parse.y is indeed newer
-# than parse.c, i.e. the they don't have the same timestamp.
-$sleep
-
-# New parser, with `maude'
-cat > ../parse.y << 'END'
-%{
-int yylex () {return 0;}
-void yyerror (char *s) {}
-%}
-%%
-maude : 'm' 'a' 'u' 'd' 'e' {};
-END
-
-$MAKE distdir
-grep maude foo-0.1/parse.c
diff --git a/tests/yflags.test b/tests/yflags.test
deleted file mode 100755
index dbc3a73..0000000
--- a/tests/yflags.test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
-# $(foo_YFLAGS).
-# Please keep this in sync with the sister tests yflags2.test, lflags.test
-# and lflags2.test
-
-. ./defs || Exit 1
-
-set -e
-
-cat >fake-yacc <<'END'
-#!/bin/sh
-echo '/*' "$*" '*/' >y.tab.c
-echo 'extern int dummy;' >> y.tab.c
-END
-chmod a+x fake-yacc
-
-# Remove Yacc from the environment, so that it won't interfere
-# with `make -e' below.
-unset YACC || :
-
-cat >> configure.in <<'END'
-AC_PROG_CC
-# Simulate presence of Yacc using our fake-yacc script.
-AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = main.c foo.y
-bar_SOURCES = main.c bar.y
-AM_YFLAGS = __am_flags__
-bar_YFLAGS = __bar_flags__
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
-grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
-
-echo 'int main(void){ return 0; }' > main.c
-: > foo.y
-: > bar.y
-
-$AUTOCONF
-./configure
-env YFLAGS=__user_flags__ $MAKE -e
-
-ls -l
-
-cat foo.c
-grep '__am_flags__.*__user_flags__' foo.c
-cat bar-bar.c
-grep '__bar_flags__.*__user_flags__' bar-bar.c
-
-:
diff --git a/tests/yflags2.test b/tests/yflags2.test
deleted file mode 100755
index 02aed8d..0000000
--- a/tests/yflags2.test
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
-# $(foo_YFLAGS).
-# Please keep this in sync with the sister tests yflags.test, lflags.test
-# and lflags2.test
-
-required=g++ # FIXME: any working C++ compiler should be OK
-. ./defs || Exit 1
-
-set -e
-
-cat >fake-yacc <<'END'
-#!/bin/sh
-echo '/*' "$*" '*/' >y.tab.c
-echo 'extern int dummy;' >> y.tab.c
-END
-chmod a+x fake-yacc
-
-# Remove Yacc from the environment, so that it won't interfere
-# with `make -e' below.
-unset YACC || :
-
-cat >> configure.in <<'END'
-AC_PROG_CXX
-# Simulate presence of Yacc using our fake-yacc script.
-AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo bar
-foo_SOURCES = main.cc foo.yy
-bar_SOURCES = main.cc bar.y++
-AM_YFLAGS = __am_flags__
-bar_YFLAGS = __bar_flags__
-END
-
-$ACLOCAL
-$AUTOMAKE -a
-
-grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
-grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
-
-echo 'int main(void) { return 0; }' > main.cc
-: > foo.yy
-: > bar.y++
-
-$AUTOCONF
-./configure
-env YFLAGS=__user_flags__ $MAKE -e
-
-ls -l
-
-cat foo.cc
-grep '__am_flags__.*__user_flags__' foo.cc
-cat bar-bar.c++
-grep '__bar_flags__.*__user_flags__' bar-bar.c++
-
-:


hooks/post-receive
-- 
GNU Automake