FYI: fix for `export amtraces=autoconf' failures

[Alexandre Duret-Lutz]

This patch fixes the following failures under `export amtraces=autoconf':

FAIL: ansi5.test
FAIL: distcommon2.test
FAIL: ext.test
FAIL: libobj.test
FAIL: libobj2.test
FAIL: libobj6.test
FAIL: libobj9.test
FAIL: libobj10.test
FAIL: obsolete.test
FAIL: suffix5.test

Among the fixes I'm removing libobj.test, libobj6.test,
libobj9.test, and part of obsolete.test, simply because they
test for some feature that won't be supported once Automake
switches to --trace.

2002-04-12  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (scan_autoconf_traces) <AC_SUBST>: Ignore ANSI2KNR
        and AMDEPBACKSLASH.
        * tests/distcommon2.test: Use a full configure.in that calls AC_INIT.
        * tests/ext.test: Enable dependencies for OBJC.
        * tests/libobj.test, tests/libobj6.test, tests/libobj9.test:
        Delete.  They tests for different flavors of $LIBOBJS assignments
        that wont be supported anymore.
        * tests/libobj2.test, tests/libobj10.test: Use AC_LIBOBJ.
        * tests/obsolete.test: Don't test Automake.
        * tests/suffix5.test: Require libtool.
        * tests/Makefile.am (TESTS): Remove libobj.test, libobj6.test and
        libobj9.test.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1287
diff -u -r1.1287 automake.in
--- automake.in 30 Mar 2002 00:31:43 -0000      1.1287
+++ automake.in 12 Apr 2002 15:21:26 -0000
@@ -4697,7 +4697,13 @@
        {
          $seen_prog_lex = $here;
        }
-      elsif ($macro eq 'AC_SUBST')
+      elsif ($macro eq 'AC_SUBST'
+            # Explicitly avoid ANSI2KNR -- we AC_SUBST that in
+            # protos.m4, but later define it elsewhere.  This is
+            # pretty hacky.  We also explicitly avoid AMDEPBACKSLASH:
+            # it might be subst'd by `\', which certainly would not be
+            # appreciated by Make.
+            && ! grep { $_ eq $args[1] } (qw(ANSI2KNR AMDEPBACKSLASH)))
        {
          # Just check for alphanumeric in AC_SUBST.  If you do
          # AC_SUBST(5), then too bad.
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.385
diff -u -r1.385 Makefile.am
--- tests/Makefile.am   2 Apr 2002 13:33:44 -0000       1.385
+++ tests/Makefile.am   12 Apr 2002 15:21:26 -0000
@@ -188,15 +188,12 @@
 lex3.test \
 lex4.test \
 lex5.test \
-libobj.test \
 libobj2.test \
 libobj3.test \
 libobj4.test \
 libobj5.test \
-libobj6.test \
 libobj7.test \
 libobj8.test \
-libobj9.test \
 libobj10.test \
 libobj11.test \
 library.test \
Index: tests/distcommon2.test
===================================================================
RCS file: /cvs/automake/automake/tests/distcommon2.test,v
retrieving revision 1.1
diff -u -r1.1 distcommon2.test
--- tests/distcommon2.test      9 Nov 2001 17:17:47 -0000       1.1
+++ tests/distcommon2.test      12 Apr 2002 15:21:26 -0000
@@ -5,12 +5,10 @@
 
 . $srcdir/defs || exit 1
 
-cat > configure.in << 'END'
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
+cat >> configure.in << 'END'
 AC_PROG_CC
-AC_OUTPUT(Makefile subdir/Makefile)
+AC_CONFIG_FILES([subdir/Makefile])
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
Index: tests/ext.test
===================================================================
RCS file: /cvs/automake/automake/tests/ext.test,v
retrieving revision 1.2
diff -u -r1.2 ext.test
--- tests/ext.test      9 Apr 2001 14:50:51 -0000       1.2
+++ tests/ext.test      12 Apr 2002 15:21:26 -0000
@@ -6,6 +6,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_F77
+_AM_DEPENDENCIES(OBJC)
 AC_SUBST(OBJC)
 END
 
Index: tests/libobj.test
===================================================================
RCS file: tests/libobj.test
diff -N tests/libobj.test
--- tests/libobj.test   21 Oct 2001 18:04:33 -0000      1.12
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Test for bug reported by Jim Meyering:
-# automake-0.29 didn't handle this line properly.
-#   LIBOBJS="$LIBOBJS fsusage.o mountlist.o"
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_PROG_RANLIB
-LIBOBJS="$LIBOBJS fsusage.o mountlist.o"
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > fsusage.c
-: > mountlist.c
-
-$ACLOCAL || exit 1
-$AUTOMAKE
Index: tests/libobj10.test
===================================================================
RCS file: /cvs/automake/automake/tests/libobj10.test,v
retrieving revision 1.7
diff -u -r1.7 libobj10.test
--- tests/libobj10.test 21 Oct 2001 18:04:33 -0000      1.7
+++ tests/libobj10.test 12 Apr 2002 15:21:26 -0000
@@ -5,13 +5,11 @@
 
 . $srcdir/defs || exit 1
 
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_RANLIB
-LIBOBJS="$LIBOBJS foo.o"
-AC_OUTPUT(Makefile)
+AC_LIBOBJ([foo])
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
Index: tests/libobj2.test
===================================================================
RCS file: /cvs/automake/automake/tests/libobj2.test,v
retrieving revision 1.13
diff -u -r1.13 libobj2.test
--- tests/libobj2.test  21 Oct 2001 18:04:33 -0000      1.13
+++ tests/libobj2.test  12 Apr 2002 15:21:26 -0000
@@ -10,7 +10,7 @@
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_PROG_CC
 AC_PROG_RANLIB
-LIBOBJS="$LIBOBJS fsusage.o"
+AC_LIBOBJ([fsusage])
 AC_OUTPUT(subdir/Makefile)
 END
 
Index: tests/libobj6.test
===================================================================
RCS file: tests/libobj6.test
diff -N tests/libobj6.test
--- tests/libobj6.test  21 Oct 2001 18:04:33 -0000      1.7
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-# Test for a bug reported by Akim Demaille.
-# LIBOBJS specified in the "wrong order" aren't seen.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_PROG_RANLIB
-LIBOBJS="fsusage.o mountlist.o $LIBOBJS"
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > fsusage.c
-: > mountlist.c
-
-$ACLOCAL || exit 1
-$AUTOMAKE
Index: tests/libobj9.test
===================================================================
RCS file: tests/libobj9.test
diff -N tests/libobj9.test
--- tests/libobj9.test  21 Oct 2001 18:04:33 -0000      1.7
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-# Test for report from Jim Meyering.
-# LIBOBJS must handle $ac_objext.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_EXEEXT
-LIBOBJS="$LIBOBJS mountlist.$ac_objext"
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = @LIBOBJS@
-END
-
-: > mountlist.c
-
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
Index: tests/obsolete.test
===================================================================
RCS file: /cvs/automake/automake/tests/obsolete.test,v
retrieving revision 1.5
diff -u -r1.5 obsolete.test
--- tests/obsolete.test 21 Oct 2001 18:05:22 -0000      1.5
+++ tests/obsolete.test 12 Apr 2002 15:21:26 -0000
@@ -13,7 +13,4 @@
 $ACLOCAL  2>stderr          && exit 1
 grep AC_PROG_INSTALL stderr || exit 1
 
-$AUTOMAKE 2>stderr          && exit 1
-grep AC_PROG_INSTALL stderr || exit 1
-
 exit 0
Index: tests/suffix5.test
===================================================================
RCS file: /cvs/automake/automake/tests/suffix5.test,v
retrieving revision 1.2
diff -u -r1.2 suffix5.test
--- tests/suffix5.test  8 Nov 2001 08:52:31 -0000       1.2
+++ tests/suffix5.test  12 Apr 2002 15:21:26 -0000
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+required=libtool
+
 # Test to make sure Automake include libtool objects resulting
 # from user-defined implicit rules.
 # Based on a report from Arkadiusz Miskiewicz <address@hidden>.
-- 
Alexandre Duret-Lutz