* 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'.

diff --git a/ChangeLog b/ChangeLog
index 9ffd162a7e2ec02209e277f14ede0f1b8c10204c..0e5fbd2e9c17d6e50b105856ab1e4874d014c5a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2001-10-20  Akim Demaille  <akim@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * automake.in (&scan_autoconf_traces): Add support for

diff --git a/tests/aclibobj.test b/tests/aclibobj.test
index 1bcbc5e387cd138588962dc8f2291f6864e7e100..e37a2c284074b041c91ece6b5c75849ec19bc2f5 100755 (executable)
--- a/tests/aclibobj.test
+++ b/tests/aclibobj.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > X << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AC_PROG_RANLIB

diff --git a/tests/aclocal.test b/tests/aclocal.test
index 7192fdaad06a75eb04b3f188c7a24ef4ec07f515..3b423b64beb69b21d43a3a8c4b40f16e5ff00db8 100755 (executable)
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -4,8 +4,5 @@
 # Alexandre Oliva.
 . $srcdir/defs || exit 1
 
-# configure.in has to have some macro that aclocal can find.
-echo 'AM_INIT_AUTOMAKE' >> configure.in
-
 $ACLOCAL --output=fred || exit 1
 test -f fred

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index b35efcfc192c784e1b486368a0b6b7d0475e0d49..4b7364f9f49b2920d936d3fb793f5077da466fd3 100755 (executable)
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -9,6 +9,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/acoutput.test b/tests/acoutput.test
index d20c881c03c6554c17666067fcfa072ee3e91ccf..f5c7b8240c520283b2bea42c7a414e71bb947063 100755 (executable)
--- a/tests/acoutput.test
+++ b/tests/acoutput.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/acoutput2.test b/tests/acoutput2.test
index 28d542b7021e1bacc20dfbcf4621d40fd06b6c4c..3c2488db27d58fc5ab1a5e44063b71cae3c4100b 100755 (executable)
--- a/tests/acoutput2.test
+++ b/tests/acoutput2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_OUTPUT([subdir/Makefile subdir/foo Makefile foo], [true])
 END

diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 4aa8286f67ece353fbd4a81be6000b16ccc7b84c..7fe90f468092ab10701737929c162374bf56d893 100755 (executable)
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/acouttbs.test b/tests/acouttbs.test
index 6497eb07310f624f759f6476e8185ab2bdb0cc67..ea34e3a6ed0df403e487ae259ce3e6e75222d939 100755 (executable)
--- a/tests/acouttbs.test
+++ b/tests/acouttbs.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/acsilent.test b/tests/acsilent.test
index a3ae6eed527c36c3445456e35dc68868c73da65d..7327dd638c8b086cd100727e04f73b3d1a0c4bea 100755 (executable)
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -4,7 +4,10 @@
 
 . $srcdir/defs || exit 1
 
-echo AM_INIT_GUILE_MODULE > configure.in
+cat >configure.in <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+EOF
 
 cat > acinclude.m4 << 'END'
 AC_DEFUN([AM_INIT_GUILE_MODULE],[

diff --git a/tests/alpha.test b/tests/alpha.test
index a3122a426c1c20bb4e4bbc2acba63ed2ddbe32b2..4add83d1947aa3be44852ede84e6a5bdd263922e 100755 (executable)
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(zardoz, 1.5e)
 END
 

diff --git a/tests/colon.test b/tests/colon.test
index 451350025cb998579faaa0e562e1ff5d3454e934..3df612e15c468efe235e87d7c33d39d6f6beb92b 100755 (executable)
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon2.test b/tests/colon2.test
index db6fa5e2c6abf22083c183748833c459bc38040e..804b9ee908b95f0636170b1a2bc4fa1372657c3f 100755 (executable)
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon3.test b/tests/colon3.test
index f43b3534d9b5779cb8d7782806f834c661a145e2..f8d12149bf39dc37d015b3cd6664d61d497e7818 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon4.test b/tests/colon4.test
index bf1f91069c027f9c679ce826e813967b1f58bc41..7e7ccd071ae22447f657b8b45b136f184a30949c 100755 (executable)
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -7,6 +7,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon5.test b/tests/colon5.test
index 222b08cc92dbcaaa8e6fb516d53ad844abb3d7e1..90b909f8edaa78f0ff78ebecc722649f12616ecc 100755 (executable)
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon6.test b/tests/colon6.test
index 6e761a5146f00e9b972a8e70e68b4f839f7a3159..530512e5fc1b794cdc5a699586020c12482ae0b4 100755 (executable)
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/colon7.test b/tests/colon7.test
index a491dcdcfb57a3ac2f7730c703f968c7daf49946..ca7f31b77141d7f4c8580a48bf84ceee1e455d9b 100755 (executable)
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/cond.test b/tests/cond.test
index 9da9ac4b1449a545de3855aa4cd11c238c7208c1..348618f1883ad2e290adb1a245e7b96405d862b4 100755 (executable)
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AM_CONDITIONAL(TEST, true)
 AC_OUTPUT(Makefile)

diff --git a/tests/cond2.test b/tests/cond2.test
index 8e4ee5b3656fab8056f147f4d2eb8c3750f866bf..271ae01af41e64204df216fe170a82ffd9db1891 100755 (executable)
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AM_CONDITIONAL(TEST, true)
 AC_OUTPUT(Makefile)

diff --git a/tests/cond3.test b/tests/cond3.test
index e98ab24b86da19cd12ee2e1077a2cc9a1c498a63..053e779765f1a9c6bd230b877fe937fa5517b1fc 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AM_CONDITIONAL(ONE, true)

diff --git a/tests/cond5.test b/tests/cond5.test
index 02e2be86267e78b0456c2f55a64727f794c676c8..438764e23e2b50e3bdb33ca6780e6f3b8231e16f 100755 (executable)
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AM_CONDITIONAL(ONE, true)

diff --git a/tests/conf2.test b/tests/conf2.test
index 05eccf2c064c55e53aa08fac8a37243566dc0306..cfa9906d35e92bb2626ac347c2abf71b52e0569f 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AM_CONFIG_HEADER(config.h two.h)
 PACKAGE=nonesuch

diff --git a/tests/confh.test b/tests/confh.test
index d32f197ddb0a3a321e0e0fe7262dfef5ec884f14..22482a6b15f7aa51cf0c0bef6479a8e1b355847e 100755 (executable)
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/confh2.test b/tests/confh2.test
index ce3cc14d830b2a4adba9dd84259bbf117e38cecb..0d8968234dfa302343c4af461a174f09a3d5f8a0 100755 (executable)
--- a/tests/confh2.test
+++ b/tests/confh2.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/confh3.test b/tests/confh3.test
index 044dfbfcce02e12d6563108295ab552a34230531..45ec24543a58c3ff703a90fb924c8dbde443e530 100755 (executable)
--- a/tests/confh3.test
+++ b/tests/confh3.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/confh4.test b/tests/confh4.test
index 97918ca29a29c335c516b386859f34f9a0d0c508..4e8ed509061dd66639ba86c99fd568c689bf10c5 100755 (executable)
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_ARG_PROGRAM
 AC_PROG_INSTALL

diff --git a/tests/config.test b/tests/config.test
index 8e4a0ce43b78c92e81559254ca55c30dcfeb6566..92c2ad5cb536a9a42db1469e30ce0d625d1f3c98 100755 (executable)
--- a/tests/config.test
+++ b/tests/config.test
@@ -7,12 +7,12 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-AM_CONFIG_HEADER(subdir/config.h)
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch
+AM_CONFIG_HEADER(subdir/config.h)
 AC_PROG_CC
-AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)

diff --git a/tests/confsub.test b/tests/confsub.test
index 2e0778f77307d051b1d342b8a7033e477e359f35..df38b39bf83923138f5ef9591ab8ec4be277fbb1 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_MAKE_SET
 AM_CONFIG_HEADER(subdir/config.h)

diff --git a/tests/ctarget1.test b/tests/ctarget1.test
index 3deb95d7c52378f93ee2c51a4f6062022bd87b4b..dff9bc4b013a2a101e7527aa91c59a308527c32a 100755 (executable)
--- a/tests/ctarget1.test
+++ b/tests/ctarget1.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AM_CONDITIONAL(TEST, true)
 AC_OUTPUT(Makefile)

diff --git a/tests/defs b/tests/defs
index 28219ab2283c59f4810578467e1210865a0d982c..c482eec5382c26899f2cfab3d57319fa96d86c29 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -34,10 +34,9 @@ cd ./testSubDir
 
 # Build appropriate environment in test directory.  Eg create
 # configure.in, touch all necessary files, etc.
-cat > configure.in << 'END'
+cat > configure.in << END
 AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_ARG_PROGRAM
+AM_INIT_AUTOMAKE($me, 1.0)
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile)

diff --git a/tests/depcomp.test b/tests/depcomp.test
index 35964b5fad831764abe03f230c62c59e8fba645b..f60ad0c326a35c29581260ed069882e44ed1a0c7 100755 (executable)
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/depend3.test b/tests/depend3.test
index 2fe15ae15ae22f845fbaaf4d3d17ab5cadafd78b..e0cdefafe84445dee017610061ac0517dddc9559 100755 (executable)
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_ARG_PROGRAM
 AC_PROG_INSTALL

diff --git a/tests/distcommon.test b/tests/distcommon.test
index 6072853f0f89a9f55f6f59320c8fcff23835da77..f7297de599152b57fe6e3e7cbf8271d7b4186730 100755 (executable)
--- a/tests/distcommon.test
+++ b/tests/distcommon.test
@@ -7,6 +7,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << EOF
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_OUTPUT(subdir/bar \
          Makefile \

diff --git a/tests/dup3.test b/tests/dup3.test
index 4e46141c4afbec9832d142bd6563ed5ae5c6b3e5..11edf2939c0ecf83be91a624e1336112ed2d3c39 100755 (executable)
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -5,12 +5,13 @@
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE
 END
 
 mkdir zoo
 cat > zoo/zoo.m4 << 'END'
-AC_DEFUN(AM_INIT_AUTOMAKE, zardoz)
+AC_DEFUN([AM_INIT_AUTOMAKE], zardoz)
 END
 
 $ACLOCAL -I zoo || exit 1

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index 781d8e263aadf965388db778b52dfb8f34be8dc9..19bc453a3f4bf016339b7a3f876f3fd0c86bd834 100755 (executable)
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 703d6c66e97ef51c3ac1f4964d819a84896ffdf6..b5d7cef82f304509f303126b7a6a473817d99fc7 100755 (executable)
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/header.test b/tests/header.test
index 9f50e299b88a5f7305070e555f324a75d182c194..2e74149e07772d34dfe8d1b83665dfcb773eeebc 100755 (executable)
--- a/tests/header.test
+++ b/tests/header.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/ldflags.test b/tests/ldflags.test
index 21f52071faf81f8548b2e162892cfbee13d22030..cbdb389f6f79c9371255a6d26be08be02fb4645c 100755 (executable)
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(no, 0)
 AC_PROG_CC
 AC_ARG_PROGRAM

diff --git a/tests/libobj.test b/tests/libobj.test
index 2ec2a9eb77c759b4bb00b7f98618f2612bc29cd1..20ab0a61fa6b61fc18ff73a5d8fdf3de5ce3ccd5 100755 (executable)
--- a/tests/libobj.test
+++ b/tests/libobj.test
@@ -7,6 +7,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj10.test b/tests/libobj10.test
index c576cfb9a20b5834ec2ee6ae84eddb56430f24da..6474667b8b26fa39bafdab13a3bcd34e910fbc20 100755 (executable)
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj2.test b/tests/libobj2.test
index 6a185cbea37395254d39a660730360dc1681cf0a..9573f67b7b0ce0b518e21fb2822ff84b309571ed 100755 (executable)
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj6.test b/tests/libobj6.test
index 1dd1fa3c063ea644fce50edb951c6057f6243d38..bc5643e98384e99ef0e8d6c78300c9b8f9c1ad97 100755 (executable)
--- a/tests/libobj6.test
+++ b/tests/libobj6.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj7.test b/tests/libobj7.test
index e9312050b2650faddaa6b7437ab167c443fb3b78..40d701424eb905ebb39efee5ef3c9aaa2e19e1b2 100755 (executable)
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj8.test b/tests/libobj8.test
index ceca716fdbf480564cdf231f239f334c43f65c2d..8d78fe308c91a1cc266a73dfd6949867b5737c25 100755 (executable)
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/libobj9.test b/tests/libobj9.test
index fa9412feffd626f23c176889dca0798a0dbc064e..d42e793c4b9017769a42b2f9cee8fcebed48af16 100755 (executable)
--- a/tests/libobj9.test
+++ b/tests/libobj9.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/output.test b/tests/output.test
index 92e9dbb366bab1c1c28b6d339928518f45527940..71f9693750e56aaa8d97ca73d1d764ba2f659fef 100755 (executable)
--- a/tests/output.test
+++ b/tests/output.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/output2.test b/tests/output2.test
index 0a22168694cc3ed89c75be27222e49312cf6fb98..f59ff6918cd9eefee78f2e2f0e6e582ff683edc2 100755 (executable)
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/output3.test b/tests/output3.test
index fb2163be09eba74dbfa5fff8035f7bc4b26d2214..e770e2e75af87dc00ff28c72ec0d2cd57a163618 100755 (executable)
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/output4.test b/tests/output4.test
index e2046769e4d8d8b896465ab6cbf072f2163e41a4..02ff6f3f3fc7c41af05177d5a85056147914bda9 100755 (executable)
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/parse.test b/tests/parse.test
index 3e5129481ad97a0bbad74933c85de192f54ac653..56b5480e03b0987691ccb583d032ae652d6620f2 100755 (executable)
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/pr2.test b/tests/pr2.test
index 85f1bb46e022f348206da9286104a8615608f292..d179cfc00f295839d4a8d94a6936eb0dfb9c5bf3 100755 (executable)
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/recurs.test b/tests/recurs.test
index 39b1b9cc6d7618f7d61e168914c6a3368c3368a5..88e1739f113360ab7dbcd613ed135816e7708913 100755 (executable)
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AM_CONDITIONAL(ONE, true)

diff --git a/tests/recurs2.test b/tests/recurs2.test
index 5b07f191dde1b5dbde3265617e49709c8121b5fc..937c959f1cba5013ceb7cbf03aad1924855b697e 100755 (executable)
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AC_OUTPUT(Makefile)

diff --git a/tests/remake.test b/tests/remake.test
index 941378a70c9af4979137a1d5f09db721beed0400..4fa2ec8a1e4c18b18f7d7ff99de2743b95f47d27 100755 (executable)
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/remake2.test b/tests/remake2.test
index f01b94927e0aac819c6ef6d084226817a80022b5..3a94b992c6f8e05bbed27c22ff422bd072d42892 100755 (executable)
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/remake3.test b/tests/remake3.test
index fe1ce80343a14de0a583d28aeba4a19ab60fef63..01d197c6a7ade00af50c9855b06141e5b402ef61 100755 (executable)
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -5,6 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/req.test b/tests/req.test
index f2372f1d1cc3c4ccd6ec0942abf7ef756d86a753..04340e5f6472de8d7fdb750febd4c60201690fe6 100755 (executable)
--- a/tests/req.test
+++ b/tests/req.test
@@ -4,7 +4,10 @@
 
 . $srcdir/defs || exit 1
 
-echo AM_INIT_GUILE_MODULE > configure.in
+cat > configure.in <<EOF
+AC_INIT
+AM_INIT_GUILE_MODULE
+EOF
 
 cat > acinclude.m4 << 'END'
 AC_DEFUN([AM_INIT_GUILE_MODULE],[

diff --git a/tests/scripts.test b/tests/scripts.test
index 76cce1524f44d7d1d7090cc52d9535dad78f3bcc..a5f2219bd2c04579de977c77020c3ecbf51c4aa1 100755 (executable)
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/subdir.test b/tests/subdir.test
index 22223bc2bd7b7a4d0d96d3cc8802722657a39046..3908b0603da4a211909447a9259396aef8621331 100755 (executable)
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -8,6 +8,7 @@
 mkdir zot
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/subdir2.test b/tests/subdir2.test
index b5848812af772d852bc76e0034f08af903edfc2f..4a381a18ba4d2aa6d1f2b235880b94d045ed5e55 100755 (executable)
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -8,6 +8,7 @@ mkdir one
 mkdir one/two
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/subdir4.test b/tests/subdir4.test
index 893e0784df517145ec6ae8c5991a0697c00c16b4..e152b7aedd670a6d7529811fc848feb009705298 100755 (executable)
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -8,6 +8,7 @@
 mkdir lib src
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/subobj4.test b/tests/subobj4.test
index 452d25d8b02379cb6b953ce0b5341a48760de791..a880526b0e86c8d1692bef11f04084cdf991ddb0 100755 (executable)
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/tagsub.test b/tests/tagsub.test
index 987165d0ed93885a4b99686a79777a0737698349..b74ced61497a9238ca175145c556e75415b4fc77 100755 (executable)
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -18,6 +18,7 @@ END
 : > sub/iguana.h
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index 60aff2b470f95389b58e24da6b3a08e06bd601de..1ff84d85c923b9d37983276a85eb3332211bc2af 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -7,6 +7,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 PACKAGE=nonesuch
 VERSION=nonesuch

diff --git a/tests/version.test b/tests/version.test
index 655460219da112d060f6ec65c0d2a79563348bbc..a5241a039a57e161ad0d15a732e57cae13b3e1a6 100755 (executable)
--- a/tests/version.test
+++ b/tests/version.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE([sh-utils], [1.12o])
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/version2.test b/tests/version2.test
index f70949713ea036bc56f36d5b3aa466839b9581ab..cbf4e7582bd9ab744947c4df1afab7c5e95327a4 100755 (executable)
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -6,6 +6,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
+AC_INIT
 AM_INIT_AUTOMAKE([sh-utils], 1.12o, no)
 AC_OUTPUT(Makefile)
 END