From d235db335eaae0934ede72698395f8591d115f9a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 29 May 2011 10:42:00 +0200 Subject: 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. --- aclocal.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'aclocal.in') 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 (' ', -- cgit v1.2.1