From d521e44b1bba69bf4041dba2d487bba6f3450921 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 21 Nov 2004 19:53:05 +0000 Subject: [PATCH] * aclocal.in (%file_seen): Rename as ... (%file_added): ... this, and move it close to add_file(), the only function that uses it. --- ChangeLog | 4 ++++ aclocal.in | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f2f29149..b29cd8b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-17 Alexandre Duret-Lutz + * aclocal.in (%file_seen): Rename as ... + (%file_added): ... this, and move it close to add_file(), the only + function that uses it. + * aclocal.in (version): Remove initial blank line and reproduce the layout of automake --version. From Art Haas. diff --git a/aclocal.in b/aclocal.in index dedba3d0c..3cbee97de 100644 --- a/aclocal.in +++ b/aclocal.in @@ -74,9 +74,6 @@ my $force_output = 0; # Which macros have been seen. my %macro_seen = (); -# Which files have been seen. -my %file_seen = (); - # Remember the order into which we scanned the files. # It's important to output the contents of aclocal.m4 in the opposite order. # (Definitions in first files we have scanned should override those from @@ -275,14 +272,17 @@ sub scan_configure_dep ($) &scan_configure_dep (File::Spec->rel2abs ($_, $dirname)) foreach (@ilist); } -# Add a file to output. +# add_file ($FILE) +# ---------------- +# Add $FILE to output. +my %file_added = (); # files which have already been added. sub add_file ($) { my ($file) = @_; # Only add a file once. - return if ($file_seen{$file}); - $file_seen{$file} = 1; + return if ($file_added{$file}); + $file_added{$file} = 1; scan_configure_dep $file; } -- 2.47.2