From: Akim Demaille Date: Sat, 20 Oct 2001 11:15:36 +0000 (+0000) Subject: * tests/defs (configure.in): Use credible AM_INIT_AUTOMAKE X-Git-Tag: Release-1-5b~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adb7a5ec0cf2e47c547423156effca485b315f17;p=thirdparty%2Fautomake.git * 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 9ffd162a7..0e5fbd2e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2001-10-20 Akim Demaille + + * 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 * automake.in (&scan_autoconf_traces): Add support for diff --git a/tests/aclibobj.test b/tests/aclibobj.test index 1bcbc5e38..e37a2c284 100755 --- 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 7192fdaad..3b423b64b 100755 --- 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 b35efcfc1..4b7364f9f 100755 --- 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 d20c881c0..f5c7b8240 100755 --- 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 28d542b70..3c2488db2 100755 --- 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 4aa8286f6..7fe90f468 100755 --- 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 6497eb073..ea34e3a6e 100755 --- 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 a3ae6eed5..7327dd638 100755 --- 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 < acinclude.m4 << 'END' AC_DEFUN([AM_INIT_GUILE_MODULE],[ diff --git a/tests/alpha.test b/tests/alpha.test index a3122a426..4add83d19 100755 --- 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 451350025..3df612e15 100755 --- 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 db6fa5e2c..804b9ee90 100755 --- 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 f43b3534d..f8d12149b 100755 --- 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 bf1f91069..7e7ccd071 100755 --- 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 222b08cc9..90b909f8e 100755 --- 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 6e761a514..530512e5f 100755 --- 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 a491dcdcf..ca7f31b77 100755 --- 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 9da9ac4b1..348618f18 100755 --- 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 8e4ee5b36..271ae01af 100755 --- 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 e98ab24b8..053e77976 100755 --- 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 02e2be862..438764e23 100755 --- 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 05eccf2c0..cfa9906d3 100755 --- 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 d32f197dd..22482a6b1 100755 --- 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 ce3cc14d8..0d8968234 100755 --- 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 044dfbfcc..45ec24543 100755 --- 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 97918ca29..4e8ed5090 100755 --- 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 8e4a0ce43..92c2ad5cb 100755 --- 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 2e0778f77..df38b39bf 100755 --- 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 3deb95d7c..dff9bc4b0 100755 --- 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 28219ab22..c482eec53 100644 --- 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 35964b5fa..f60ad0c32 100755 --- 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 2fe15ae15..e0cdefafe 100755 --- 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 6072853f0..f7297de59 100755 --- 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 4e46141c4..11edf2939 100755 --- 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 781d8e263..19bc453a3 100755 --- 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 703d6c66e..b5d7cef82 100755 --- 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 9f50e299b..2e74149e0 100755 --- 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 21f52071f..cbdb389f6 100755 --- 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 2ec2a9eb7..20ab0a61f 100755 --- 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 c576cfb9a..6474667b8 100755 --- 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 6a185cbea..9573f67b7 100755 --- 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 1dd1fa3c0..bc5643e98 100755 --- 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 e9312050b..40d701424 100755 --- 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 ceca716fd..8d78fe308 100755 --- 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 fa9412fef..d42e793c4 100755 --- 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 92e9dbb36..71f969375 100755 --- 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 0a2216869..f59ff6918 100755 --- 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 fb2163be0..e770e2e75 100755 --- 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 e2046769e..02ff6f3f3 100755 --- 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 3e5129481..56b5480e0 100755 --- 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 85f1bb46e..d179cfc00 100755 --- 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 39b1b9cc6..88e1739f1 100755 --- 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 5b07f191d..937c959f1 100755 --- 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 941378a70..4fa2ec8a1 100755 --- 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 f01b94927..3a94b992c 100755 --- 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 fe1ce8034..01d197c6a 100755 --- 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 f2372f1d1..04340e5f6 100755 --- 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 < acinclude.m4 << 'END' AC_DEFUN([AM_INIT_GUILE_MODULE],[ diff --git a/tests/scripts.test b/tests/scripts.test index 76cce1524..a5f2219bd 100755 --- 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 22223bc2b..3908b0603 100755 --- 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 b5848812a..4a381a18b 100755 --- 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 893e0784d..e152b7aed 100755 --- 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 452d25d8b..a880526b0 100755 --- 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 987165d0e..b74ced614 100755 --- 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 60aff2b47..1ff84d85c 100755 --- 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 655460219..a5241a039 100755 --- 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 f70949713..cbf4e7582 100755 --- 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