From: Stefano Lattarini Date: Sun, 29 May 2011 08:42:00 +0000 (+0200) Subject: automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE X-Git-Tag: ng-0.5a~173^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d235db335eaae0934ede72698395f8591d115f9a;p=thirdparty%2Fautomake.git 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: * 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 dd6f5727f..cd0f593c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2011-05-29 Stefano Lattarini + + 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: + + * 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 build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too diff --git a/Makefile.am b/Makefile.am index 6e8b7dfdc..195927c0b 100644 --- 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 dfb9e73dd..326530a37 100644 --- 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 c8219bd41..b7f9b541c 100644 --- 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. New in 1.11: diff --git a/THANKS b/THANKS index 593ebc50b..16a1ef806 100644 --- 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 2210fe3ad..4b63c1afa 100644 --- 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 a8ec749e1..26694189b 100755 --- 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.