From b9ccfe5e75fde52e7316a495404c7b4e958cefba Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 12 Apr 2002 15:28:15 +0000 Subject: [PATCH] * automake.in (scan_autoconf_traces) : 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. --- ChangeLog | 15 +++++++++++++++ automake.in | 8 +++++++- tests/Makefile.am | 3 --- tests/Makefile.in | 3 --- tests/distcommon2.test | 8 +++----- tests/ext.test | 1 + tests/libobj.test | 28 ---------------------------- tests/libobj10.test | 8 +++----- tests/libobj2.test | 2 +- tests/libobj6.test | 27 --------------------------- tests/libobj9.test | 27 --------------------------- tests/obsolete.test | 3 --- tests/suffix5.test | 2 ++ 13 files changed, 32 insertions(+), 103 deletions(-) delete mode 100755 tests/libobj.test delete mode 100755 tests/libobj6.test delete mode 100755 tests/libobj9.test diff --git a/ChangeLog b/ChangeLog index 7799a35..307eba3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2002-04-12 Alexandre Duret-Lutz + + * automake.in (scan_autoconf_traces) : 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. + 2002-04-10 Alexandre Duret-Lutz * configure.in (APIVERSION): Fix definition. diff --git a/automake.in b/automake.in index bd60ba1..4f5cc2f 100755 --- a/automake.in +++ b/automake.in @@ -4697,7 +4697,13 @@ sub scan_autoconf_traces ($) { $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. diff --git a/tests/Makefile.am b/tests/Makefile.am index d6f8314..4155874 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -188,15 +188,12 @@ lex2.test \ 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 \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 926588e..fd653f1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -278,15 +278,12 @@ lex2.test \ 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 \ diff --git a/tests/distcommon2.test b/tests/distcommon2.test index de0ce72..76a9b56 100755 --- a/tests/distcommon2.test +++ b/tests/distcommon2.test @@ -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' diff --git a/tests/ext.test b/tests/ext.test index 8b826bc..9ebaad0 100755 --- a/tests/ext.test +++ b/tests/ext.test @@ -6,6 +6,7 @@ cat >> configure.in << 'END' AC_PROG_F77 +_AM_DEPENDENCIES(OBJC) AC_SUBST(OBJC) END diff --git a/tests/libobj.test b/tests/libobj.test deleted file mode 100755 index d111dd4..0000000 --- a/tests/libobj.test +++ /dev/null @@ -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 diff --git a/tests/libobj10.test b/tests/libobj10.test index 6ac2dfe..7244645 100755 --- a/tests/libobj10.test +++ b/tests/libobj10.test @@ -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' diff --git a/tests/libobj2.test b/tests/libobj2.test index a19330b..972cc0d 100755 --- a/tests/libobj2.test +++ b/tests/libobj2.test @@ -10,7 +10,7 @@ AC_INIT AM_INIT_AUTOMAKE(nonesuch, nonesuch) AC_PROG_CC AC_PROG_RANLIB -LIBOBJS="$LIBOBJS fsusage.o" +AC_LIBOBJ([fsusage]) AC_OUTPUT(subdir/Makefile) END diff --git a/tests/libobj6.test b/tests/libobj6.test deleted file mode 100755 index 491f92c..0000000 --- a/tests/libobj6.test +++ /dev/null @@ -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 diff --git a/tests/libobj9.test b/tests/libobj9.test deleted file mode 100755 index 5ac4e37..0000000 --- a/tests/libobj9.test +++ /dev/null @@ -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 diff --git a/tests/obsolete.test b/tests/obsolete.test index f8a0505..59b38e3 100755 --- a/tests/obsolete.test +++ b/tests/obsolete.test @@ -13,7 +13,4 @@ END $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 diff --git a/tests/suffix5.test b/tests/suffix5.test index 7a805dd..b90f553 100755 --- a/tests/suffix5.test +++ b/tests/suffix5.test @@ -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 . -- 2.7.4