From: Akim Demaille Date: Sun, 21 Oct 2001 18:04:32 +0000 (+0000) Subject: * tests/subdircond.test: Requires gettext. X-Git-Tag: Release-1-5b~97 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fe781791ce4e1ad0617dc772ac177d1d9bbd539b;p=automake.git * 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 4cf63fe2..7fc03196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-10-21 Akim Demaille + + * 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 * m4/lex.m4: Don't run AC_DECL_YYTEXT, Autoconf does. diff --git a/tests/libobj.test b/tests/libobj.test index 006e5393..d111dd44 100755 --- 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 52719275..6ac2dfed 100755 --- 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 41d8488a..a19330b9 100755 --- 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 50c8fcab..491f92c6 100755 --- 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 0174c4cc..5ac4e376 100755 --- 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 03cc5b94..4a731bf1 100755 --- 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 f02802cc..a8a15058 100755 --- 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 1a2ea93c..1c71bf04 100755 --- 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 fed7ae28..ba83a94d 100755 --- 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 ed13cfe2..0a276b72 100755 --- 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 306cf135..d139124e 100755 --- 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 75d1dcd1..44ecbc39 100755 --- 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 684e1fb8..0ca04ac6 100755 --- 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 fcdd11df..b7306c88 100755 --- 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 eb9cf215..724563a0 100755 --- 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