* 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 9ffd162..0e5fbd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,41 @@
 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
        AM_INIT_AUTOMAKE, AM_CONDITIONAL.
        Let @args have a more natural M4 correspondence: $1 is args[1], no

diff --git a/tests/aclibobj.test b/tests/aclibobj.test
index 1bcbc5e..e37a2c2 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 7192fda..3b423b6 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 b35efcf..4b7364f 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 d20c881..f5c7b82 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 28d542b..3c2488d 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 4aa8286..7fe90f4 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 6497eb0..ea34e3a 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 a3ae6ee..7327dd6 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 a3122a4..4add83d 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 4513500..3df612e 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 db6fa5e..804b9ee 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 f43b353..f8d1214 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 bf1f910..7e7ccd0 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 222b08c..90b909f 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 6e761a5..530512e 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 a491dcd..ca7f31b 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 9da9ac4..348618f 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 8e4ee5b..271ae01 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 e98ab24..053e779 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 02e2be8..438764e 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 05eccf2..cfa9906 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 d32f197..22482a6 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 ce3cc14..0d89682 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 044dfbf..45ec245 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 97918ca..4e8ed50 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 8e4a0ce..92c2ad5 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 2e0778f..df38b39 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 3deb95d..dff9bc4 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 28219ab..c482eec 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 35964b5..f60ad0c 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 2fe15ae..e0cdefa 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 6072853..f7297de 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 4e46141..11edf29 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 781d8e2..19bc453 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 703d6c6..b5d7cef 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 9f50e29..2e74149 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 21f5207..cbdb389 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 2ec2a9e..20ab0a6 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 c576cfb..6474667 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 6a185cb..9573f67 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 1dd1fa3..bc5643e 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 e931205..40d7014 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 ceca716..8d78fe3 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 fa9412f..d42e793 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 92e9dbb..71f9693 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 0a22168..f59ff69 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 fb2163b..e770e2e 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 e204676..02ff6f3 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 3e51294..56b5480 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 85f1bb4..d179cfc 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 39b1b9c..88e1739 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 5b07f19..937c959 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 941378a..4fa2ec8 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 f01b949..3a94b99 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 fe1ce80..01d197c 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 f2372f1..04340e5 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 76cce15..a5f2219 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 22223bc..3908b06 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 b584881..4a381a1 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 893e078..e152b7a 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 452d25d..a880526 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 987165d..b74ced6 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 60aff2b..1ff84d8 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 6554602..a5241a0 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 f709497..cbf4e75 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