23-fyi-fix-tests.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

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

Index: tests/libobj.test
--- tests/libobj.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/libobj.test Sun, 21 Oct 2001 11:21:38 +0200 akim
@@ -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"
Index: tests/libobj10.test
--- tests/libobj10.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/libobj10.test Sun, 21 Oct 2001 11:23:22 +0200 akim
@@ -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"
Index: tests/libobj2.test
--- tests/libobj2.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/libobj2.test Sun, 21 Oct 2001 11:22:46 +0200 akim
@@ -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"
Index: tests/libobj6.test
--- tests/libobj6.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/libobj6.test Sun, 21 Oct 2001 11:22:59 +0200 akim
@@ -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"
Index: tests/libobj9.test
--- tests/libobj9.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/libobj9.test Sun, 21 Oct 2001 11:23:12 +0200 akim
@@ -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
Index: tests/libtool.test
--- tests/libtool.test Tue, 07 Aug 2001 20:20:45 +0200 akim
+++ tests/libtool.test Sun, 21 Oct 2001 11:23:37 +0200 akim
@@ -2,7 +2,7 @@

 # Make sure libtool is removed.
 # Report from Kevin Dalley
-
+required=libtool
 . $srcdir/defs || exit 1

 cat >> configure.in << 'END'
Index: tests/libtool2.test
--- tests/libtool2.test Tue, 07 Aug 2001 20:20:45 +0200 akim
+++ tests/libtool2.test Sun, 21 Oct 2001 11:23:52 +0200 akim
@@ -2,7 +2,7 @@

 # Make sure libtool clean targets exist.
 # Report from Eric Magnien.
-
+required=libtool
 . $srcdir/defs || exit 1

 # This test requires libtoolize.
Index: tests/ltdeps.test
--- tests/ltdeps.test Tue, 07 Aug 2001 20:20:45 +0200 akim
+++ tests/ltdeps.test Sun, 21 Oct 2001 11:24:11 +0200 akim
@@ -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'
Index: tests/ltlibobjs.test
--- tests/ltlibobjs.test Wed, 14 Mar 2001 23:12:52 +0100 akim
+++ tests/ltlibobjs.test Sun, 21 Oct 2001 11:24:25 +0200 akim
@@ -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'
Index: tests/nolink.test
--- tests/nolink.test Tue, 07 Aug 2001 20:20:45 +0200 akim
+++ tests/nolink.test Sun, 21 Oct 2001 11:25:01 +0200 akim
@@ -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

Index: tests/obsolete.test
--- tests/obsolete.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/obsolete.test Sun, 21 Oct 2001 11:25:22 +0200 akim
@@ -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
Index: tests/pr72.test
--- tests/pr72.test Wed, 14 Mar 2001 23:12:52 +0100 akim
+++ tests/pr72.test Sun, 21 Oct 2001 11:25:58 +0200 akim
@@ -1,7 +1,7 @@
 #! /bin/sh

 # Test for PR 72
-
+required=libtool
 . $srcdir/defs || exit 1

 cat >> configure.in << 'END'
Index: tests/sinclude.test
--- tests/sinclude.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/sinclude.test Sun, 21 Oct 2001 11:27:01 +0200 akim
@@ -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 @@
 : > Makefile.am

 $ACLOCAL || exit 1
+echo 'sinclude(sub/p.m4)' >> aclocal.m4
+
 $AUTOMAKE --Wno-error || exit 1

 grep MAGICALPIG Makefile.in
Index: tests/subdircond.test
--- tests/subdircond.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/subdircond.test Sun, 21 Oct 2001 11:27:23 +0200 akim
@@ -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'
Index: tests/subobj4.test
--- tests/subobj4.test Sat, 20 Oct 2001 12:23:13 +0200 akim
+++ tests/subobj4.test Sun, 21 Oct 2001 11:28:09 +0200 akim
@@ -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