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

diff --git a/ChangeLog b/ChangeLog
index 4cf63fe20cea073ee40cea08a2bf5a13bbe74bd8..7fc031964cc3be9bb26b24d7e05a39e6e57fd81b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-21  Akim Demaille  <akim@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * m4/lex.m4: Don't run AC_DECL_YYTEXT, Autoconf does.

diff --git a/tests/libobj.test b/tests/libobj.test
index 006e53930e71874a5a1674ce41e5b3bfe3755554..d111dd44f790acb3ee6c256df7046636773cfce9 100755 (executable)
--- a/tests/libobj.test
+++ b/tests/libobj.test
@@ -9,8 +9,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 LIBOBJS="$LIBOBJS fsusage.o mountlist.o"

diff --git a/tests/libobj10.test b/tests/libobj10.test
index 527192759e5a4c2a58633fba610fd22db6f0ed7e..6ac2dfed1e3bbc7c74b09a14216ab1e069823aff 100755 (executable)
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 LIBOBJS="$LIBOBJS foo.o"

diff --git a/tests/libobj2.test b/tests/libobj2.test
index 41d8488a9e6586dd039bd8038e83750bd36139b8..a19330b928fb86a6b1de79672cf5d28139080077 100755 (executable)
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 LIBOBJS="$LIBOBJS fsusage.o"

diff --git a/tests/libobj6.test b/tests/libobj6.test
index 50c8fcabd189443aa7ad02429aaa6ff4fa02274d..491f92c6088fedd023478ad0a341965cefcad0a6 100755 (executable)
--- a/tests/libobj6.test
+++ b/tests/libobj6.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 LIBOBJS="fsusage.o mountlist.o $LIBOBJS"

diff --git a/tests/libobj9.test b/tests/libobj9.test
index 0174c4ccd7d967093e5a952c5e1e215d04175f56..5ac4e376ff723aad6db81a97c525f116921240df 100755 (executable)
--- a/tests/libobj9.test
+++ b/tests/libobj9.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_EXEEXT

diff --git a/tests/libtool.test b/tests/libtool.test
index 03cc5b946ec04cdcd3dba3fbf58ed3b9c997f00c..4a731bf19d7d59ac6705e5833a36695711697a33 100755 (executable)
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -2,7 +2,7 @@
 
 # Make sure libtool is removed.
 # Report from Kevin Dalley
-
+required=libtool
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'

diff --git a/tests/libtool2.test b/tests/libtool2.test
index f02802ccd6db9447915356fc70834dfa4a469f9b..a8a1505874338cc10751f81dde99be3c17f75291 100755 (executable)
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -2,7 +2,7 @@
 
 # Make sure libtool clean targets exist.
 # Report from Eric Magnien.
-
+required=libtool
 . $srcdir/defs || exit 1
 
 # This test requires libtoolize.

diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 1a2ea93c57fe49be055f2c927b3e554b23dc5820..1c71bf04607ae2079d290aa0b786fac2db1acfb9 100755 (executable)
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -2,7 +2,7 @@
 
 # Test to make sure libtool library dependencies are correct.
 # Report from Lars J. Aas.
-
+required=libtool
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'

diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index fed7ae280d7f23f47f63111fe55d9a452128beb3..ba83a94d9724c234e8bd2c6c7fbf336ac7165261 100755 (executable)
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -2,7 +2,7 @@
 
 # Test to make sure LTLIBOBJS alone works ok.
 # Report from Vadim Zeitlin.
-
+required=libtool
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'

diff --git a/tests/nolink.test b/tests/nolink.test
index ed13cfe2d63ad0b35c3f7e91ab0c033eba2c5de7..0a276b722a01fce627931ebf0142407fa1207a0b 100755 (executable)
--- a/tests/nolink.test
+++ b/tests/nolink.test
@@ -4,12 +4,6 @@
 
 . $srcdir/defs || exit 1
 
-cat >> configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE([meal],[123])
-AC_OUTPUT([Makefile])
-END
-
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = no-exeext
 

diff --git a/tests/obsolete.test b/tests/obsolete.test
index 306cf1356b3fd11ddcef02a1bd4b6b10f4e6788b..d139124e3630b754706a6b1ca17b8c4655507cc0 100755 (executable)
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -4,11 +4,8 @@
 
 . $srcdir/defs || exit 1
 
-cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
+cat >> configure.in << 'END'
 fp_PROG_INSTALL
-AC_OUTPUT(Makefile one/Makefile one/two/Makefile)
 END
 
 : > Makefile.am

diff --git a/tests/pr72.test b/tests/pr72.test
index 75d1dcd1b0aed733cdca028a1a714a1c1dad8759..44ecbc396f5496e53a8116d04e70fa1cc4334318 100755 (executable)
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Test for PR 72
-
+required=libtool
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'

diff --git a/tests/sinclude.test b/tests/sinclude.test
index 684e1fb89fb3e61e090b05797782a7f0bf370a58..0ca04ac6c36e204e6c096e68eee4fa3899e88c1b 100755 (executable)
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -4,10 +4,6 @@
 
 . $srcdir/defs || exit 1
 
-cat > aclocal.m4 << 'END'
-sinclude(sub/p.m4)
-END
-
 mkdir sub
 cat > sub/p.m4 << 'END'
 AC_SUBST(MAGICALPIG)
@@ -16,6 +12,8 @@ END
 : > Makefile.am
 
 $ACLOCAL || exit 1
+echo 'sinclude(sub/p.m4)' >> aclocal.m4
+
 $AUTOMAKE --Wno-error || exit 1
 
 grep MAGICALPIG Makefile.in

diff --git a/tests/subdircond.test b/tests/subdircond.test
index fcdd11dfa3920a713c80d799c34be9f978bd54bc..b7306c88d74ae00e4f6c104ffe509cfb42eb0516 100755 (executable)
--- a/tests/subdircond.test
+++ b/tests/subdircond.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # It is ok to have a conditional SUBDIRS when using gettext.
-
+required=gettext
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'

diff --git a/tests/subobj4.test b/tests/subobj4.test
index eb9cf21595f817dbf048497daa509f2b378c4523..724563a065f5fe607b351bd4dae2aaf69b8c5d2e 100755 (executable)
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -6,14 +6,10 @@
 . $srcdir/defs || exit 1
 
 cat >> configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AM_PROG_CC_C_O
 AC_PROG_CC
 AC_PROG_CXX
-AC_OUTPUT(Makefile d1/Makefile d2/Makefile)
+AC_OUTPUT(d1/Makefile d2/Makefile)
 END
 
 mkdir d1 d2