diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-05-29 10:42:00 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-05-30 23:51:35 +0200 |
| commit | d235db335eaae0934ede72698395f8591d115f9a (patch) | |
| tree | c05b73aa1fbbbf65ca3913d06feb1fef4ee9f916 /aclocal.in | |
| parent | 8a8890a9152528a4fc348bb15b27ebb2a4c3b7cb (diff) | |
| download | automake-d235db335eaae0934ede72698395f8591d115f9a.tar.gz | |
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.
Diffstat (limited to 'aclocal.in')
| -rw-r--r-- | aclocal.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 (' ', |