From b8b5f65631cc72ae3aa73c9c80d81e25c29e49b0 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 12 Oct 2004 19:39:05 +0000 Subject: [PATCH] * configure.ac: Export @am_AUTOCONF@. * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@, so the test suite runs `autoconf' and not `missing --run autoconf'. * tests/missing.test, tests/missing2.test: Arrange for missing to be used in front of autoconf even if the user has exported AUTOCONF. This fixes two spurious failures reported by Mark D. Baushke. --- ChangeLog | 8 ++++++++ Makefile.in | 1 + configure | 12 +++++++----- configure.ac | 8 ++++---- doc/Makefile.in | 1 + lib/Automake/Makefile.in | 1 + lib/Automake/tests/Makefile.in | 1 + lib/Makefile.in | 1 + lib/am/Makefile.in | 1 + m4/Makefile.in | 1 + tests/Makefile.in | 1 + tests/defs.in | 2 +- tests/missing.test | 15 +++++++++++---- tests/missing2.test | 12 +++++++++--- 14 files changed, 48 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index b00ac8f5..7536657e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2004-10-12 Alexandre Duret-Lutz + * configure.ac: Export @am_AUTOCONF@. + * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@, + so the test suite runs `autoconf' and not `missing --run autoconf'. + * tests/missing.test, tests/missing2.test: Arrange for missing + to be used in front of autoconf even if the user has exported + AUTOCONF. This fixes two spurious failures reported by + Mark D. Baushke. + * lib/compile: Handle output.obj in addition to output.o. * tests/compile.test: Check for this. diff --git a/Makefile.in b/Makefile.in index b04402dc..c0259f80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,6 +117,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/configure b/configure index c50a066f..663c0f5b 100755 --- a/configure +++ b/configure @@ -506,7 +506,7 @@ PACKAGE_STRING='GNU Automake 1.9a' PACKAGE_BUGREPORT='bug-automake@gnu.org' ac_unique_file="automake.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1534,10 +1534,11 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; -# this way we can run Autoconf tests from configure without being -# bothered by `missing'. -am_AUTOCONF=${AUTOCONF-autoconf} +# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this +# way we can run Autoconf tests from configure (or from the test +# suite) without being bothered by `missing'. +am_AUTOCONF="${AUTOCONF-autoconf}" + am__api_version="1.9a" # Find a good install program. We prefer a C program (faster), @@ -3153,6 +3154,7 @@ s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t s,@build_os@,$build_os,;t t +s,@am_AUTOCONF@,$am_AUTOCONF,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t diff --git a/configure.ac b/configure.ac index 7458e9dd..2ee14103 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,10 @@ AC_CONFIG_AUX_DIR(lib) AC_CANONICAL_BUILD -# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; -# this way we can run Autoconf tests from configure without being -# bothered by `missing'. -am_AUTOCONF=${AUTOCONF-autoconf} +# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this +# way we can run Autoconf tests from configure (or from the test +# suite) without being bothered by `missing'. +AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"]) AM_INIT_AUTOMAKE([1.8a dist-bzip2 filename-length-max=99]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 526ee4f2..050c131e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -108,6 +108,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index c1bf0437..bcfc3b85 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -111,6 +111,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index a59bf638..fd74b802 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -90,6 +90,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 225d9d5d..e44c29c6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -114,6 +114,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index cfa63096..77e4d305 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -101,6 +101,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/m4/Makefile.in b/m4/Makefile.in index 15edff41..a21814a6 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -101,6 +101,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/tests/Makefile.in b/tests/Makefile.in index fbf67303..99b0d5a0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -91,6 +91,7 @@ STRIP = @STRIP@ TEX = @TEX@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +am_AUTOCONF = @am_AUTOCONF@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/tests/defs.in b/tests/defs.in index a384cb23..8a7dd283 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -70,7 +70,7 @@ export SHELL # User can override various tools used. test -z "$PERL" && PERL='@PERL@' test -z "$MAKE" && MAKE=make -test -z "$AUTOCONF" && AUTOCONF="@AUTOCONF@" +test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@" test -z "$AUTOHEADER" && AUTOHEADER="@AUTOHEADER@" test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate test -z "$MISSING" && MISSING=`pwd`/../lib/missing diff --git a/tests/missing.test b/tests/missing.test index 3993d617..5e6e5832 100755 --- a/tests/missing.test +++ b/tests/missing.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -34,7 +34,14 @@ EOF $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -./configure + +# Make sure we do use missing, even if the user exported AUTOCONF. +# (We cannot export this new value, because it would be used by Automake +# when tracing, and missing is no good for this.) +MYAUTOCONF="`pwd`/missing --run $AUTOCONF" +unset AUTOCONF + +./configure AUTOCONF="$MYAUTOCONF" $MAKE $sleep # Hopefully the install version of Autoconf cannot compete with this one... @@ -43,10 +50,10 @@ $MAKE distdir # Run again, but without missing, to ensure that timestamps were updated. export AUTOMAKE ACLOCAL -./configure +./configure AUTOCONF="$MYAUTOCONF" $MAKE -# Make sure $MAKE fail when timestamps aren't updated and missing is not used. +# Make sure $MAKE fails when timestamps aren't updated and missing is not used. $sleep touch aclocal.m4 $MAKE && exit 1 diff --git a/tests/missing2.test b/tests/missing2.test index 7d0a6643..79d877a7 100755 --- a/tests/missing2.test +++ b/tests/missing2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -37,7 +37,13 @@ EOF $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -./configure + +# See missing.test for explanations about this. +MYAUTOCONF="`pwd`/missing --run $AUTOCONF" +unset AUTOCONF + +./configure AUTOCONF="$MYAUTOCONF" + $MAKE $sleep # Hopefully the install version of Autoconf cannot compete with this one... @@ -46,7 +52,7 @@ $MAKE distdir # Run again, but without missing, to ensure that timestamps were updated. export AUTOMAKE ACLOCAL -./configure +./configure AUTOCONF="$MYAUTOCONF" $MAKE # Make sure $MAKE fail when timestamps aren't updated and missing is not used. -- 2.43.5