diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-03-01 22:17:30 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-03-01 22:17:30 +0000 |
commit | 9119916ea4b701addae8c6e3342b818d42e04893 (patch) | |
tree | 1d292e72c51e1e8bee74d5f554254cf7e8d88c4c /aclocal.in | |
parent | e74ab22392f945d629f099386db6280bfe0668cf (diff) | |
download | automake-9119916ea4b701addae8c6e3342b818d42e04893.tar.gz automake-9119916ea4b701addae8c6e3342b818d42e04893.tar.bz2 automake-9119916ea4b701addae8c6e3342b818d42e04893.zip |
Fix for PR automake/450:
* aclocal.in (trace_used_macros): Do not explicitly trace files
included by configure.ac.
* tests/acloca19.test: New file.
* tests/Makefile.am (TESTS): Add acloca19.test.
Report from Peter Breitenlohner.
Diffstat (limited to 'aclocal.in')
-rw-r--r-- | aclocal.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/aclocal.in b/aclocal.in index ccbf2c0f3..5792a09d8 100644 --- a/aclocal.in +++ b/aclocal.in @@ -396,7 +396,7 @@ sub add_file ($) my $underquoted_manual_once = 0; # scan_file ($TYPE, $FILE, $WHERE) -# ------------------------- +# -------------------------------- # Scan a single M4 file ($FILE), and all files it includes. # Return the list of included files. # $TYPE is one of FT_USER, FT_AUTOMAKE, or FT_SYSTEM, depending @@ -589,6 +589,8 @@ sub trace_used_macros () { my %files = map { $map{$_} => 1 } keys %macro_seen; $files{'acinclude.m4'} = 1 if -f 'acinclude.m4'; + # File included by $configure_ac are redundant. + $files{$configure_ac} = 1; %files = strip_redundant_includes %files; # configure.ac is implicitly included. delete $files{$configure_ac}; |