automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE

Currently, the Automake's own configure script allow definition
of AUTOCONF and AUTOM4TE, expected to point respectively to an
autoconf and autom4te programs.  But while these definitions are
honoured in the Automake's build systems and test suite, they
were *not* honoured in the generated `automake' and `aclocal'
scripts.  This behaviour, apart from being wrong in that it does
not allow the user enough freedom in choosing his tools, also
caused inconsistencies in the test suite, brining to spurious
failures.

Problem reported by Graham Reitz on the automake list; see thread:
<http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>

* automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'.
* aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'.
* Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and
`@am_AUTOM4TE'.
* NEWS: Update.
* THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index dd6f5727f34dbc2f9d8638b3b77f7321be712aca..cd0f593c5182425389a1d8d769d37e00b23210f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
+       Currently, the Automake's own configure script allow definition
+       of AUTOCONF and AUTOM4TE, expected to point respectively to an
+       autoconf and autom4te programs.  But while these definitions are
+       honoured in the Automake's build systems and test suite, they
+       were *not* honoured in the generated `automake' and `aclocal'
+       scripts.  This behaviour, apart from being wrong in that it does
+       not allow the user enough freedom in choosing his tools, also
+       caused inconsistencies in the test suite, brining to spurious
+       failures.
+       Problem reported by Graham Reitz on the automake list; see thread:
+       <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>
+       * automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'.
+       * aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'.
+       * Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and
+       `@am_AUTOM4TE'.
+       * NEWS: Update.
+       * THANKS: Update.
+
 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too

diff --git a/Makefile.am b/Makefile.am
index 6e8b7dfdc2e575a13287bd3fca01ddadaa7246de..195927c0be0fdd57738bb0f22ff3f25a89302056 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,8 @@ do_subst = sed \
   -e 's,[@]PERL[@],$(PERL),g' \
   -e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
   -e 's,[@]SHELL[@],$(SHELL),g' \
+  -e 's,[@]am_AUTOCONF[@],$(am_AUTOCONF),g' \
+  -e 's,[@]am_AUTOM4TE[@],$(am_AUTOM4TE),g' \
   -e 's,[@]VERSION[@],$(VERSION),g' \
   -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
   -e 's,[@]datadir[@],$(datadir),g'

diff --git a/Makefile.in b/Makefile.in
index dfb9e73dd9a0c72640b07a4d4d920fcb2752e3b4..326530a370b417805529ec7cac20383810c89c19 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,6 +264,8 @@ do_subst = sed \
   -e 's,[@]PERL[@],$(PERL),g' \
   -e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
   -e 's,[@]SHELL[@],$(SHELL),g' \
+  -e 's,[@]am_AUTOCONF[@],$(am_AUTOCONF),g' \
+  -e 's,[@]am_AUTOM4TE[@],$(am_AUTOM4TE),g' \
   -e 's,[@]VERSION[@],$(VERSION),g' \
   -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
   -e 's,[@]datadir[@],$(datadir),g'

diff --git a/NEWS b/NEWS
index c8219bd418d5f77d0b1f257d4d6409c4a2cd59f0..b7f9b541c67d623c4b886baacd4a77c1529bff36 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,10 @@ Bugs fixed in 1.11.0a:
 
   - Java sources specified with check_JAVA are not compiled anymore upon
     "make all", but only upon "make check".
+
+  - Now aclocal and automake, when they've to spawn autoconf or autom4te
+    processes, honour the configure-time definitions of AUTOCONF and
+    AUTOM4TE.
 \f
 New in 1.11:
 

diff --git a/THANKS b/THANKS
index 593ebc50bc214fe0798481216f7354b21132d2d5..16a1ef8062acd57f341983969bcf2f893040abfc 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -117,6 +117,7 @@ Geoffrey Keating    geoffk@apple.com
 Glenn Amerine          glenn@pie.mhsc.org
 Gord Matzigkeit                gord@gnu.ai.mit.edu
 Gordon Sadler          gbsadler1@lcisp.com
+Graham Reitz           grahamreitz@me.com
 Greg A. Woods          woods@most.weird.com
 Greg Schafer           gschafer@zip.com.au
 Guido Draheim          guidod@gmx.de

diff --git a/aclocal.in b/aclocal.in
index 2210fe3ada02b331335e46203f16deecc3de20f5..4b63c1afae9fe491dfa6754d361d2b820dff9692 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -663,7 +663,7 @@ sub trace_used_macros ()
   my %files = map { $map{$_} => 1 } keys %macro_seen;
   %files = strip_redundant_includes %files;
 
-  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
+  my $traces = ($ENV{AUTOM4TE} || '@am_AUTOM4TE@');
   $traces .= " --language Autoconf-without-aclocal-m4 ";
   # All candidate files.
   $traces .= join (' ',

diff --git a/automake.in b/automake.in
index a8ec749e115a687f23c9d14d9e8bef50c96ba9da..26694189b6236a2558c8f1986eef40d0a4d80c9b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5281,7 +5281,7 @@ sub scan_autoconf_traces ($)
                sinclude => 1,
              );
 
-  my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
+  my $traces = ($ENV{AUTOCONF} || '@am_AUTOCONF@') . " ";
 
   # Use a separator unlikely to be used, not `:', the default, which
   # has a precise meaning for AC_CONFIG_FILES and so on.