* aclocal.in (write_aclocal): Make sure $map_traced_defs{$m} exists

before using it.  Suppress a warning observable in test/acloca16.test.
Report from Ralf Wildenhues.

diff --git a/ChangeLog b/ChangeLog
index 92350ef..5438a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-03  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * aclocal.in (write_aclocal): Make sure $map_traced_defs{$m} exists
+       before using it.  Suppress a warning observable in test/acloca16.test.
+       Report from Ralf Wildenhues.
+
 2004-11-01  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/XFile.pm (lock): Make sure $ENV{'MAKEFLAGS'} exists
@@ -805,8 +811,8 @@
        %map_traced_defs.
        (write_aclocal): Use $map_traced_defs to filter out unused
        definitions.
-       * tests/acloca15.test: New file.
-       * tests/Makefile.am (TESTS): Add acloca15.test.
+       * tests/acloca16.test: New file.
+       * tests/Makefile.am (TESTS): Add acloca16.test.
 
 2004-04-12  Alexandre Duret-Lutz  <adl@gnu.org>
 

diff --git a/aclocal.in b/aclocal.in
index e2ec464..b6ffce6 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -465,7 +465,9 @@ sub write_aclocal ($@)
   # instead.)
   for my $m (@macros)
     {
-      $files{$map{$m}} = 1 if $map{$m} eq $map_traced_defs{$m};
+      $files{$map{$m}} = 1
+       if (exists $map_traced_defs{$m}
+           && $map{$m} eq $map_traced_defs{$m});
     }
   $files{'acinclude.m4'} = 1 if -f 'acinclude.m4';
   %files = strip_redundant_includes %files;