* aclocal.in (check_acinclude): Output `warning:' in front

of warnings.
Report from Pavel Roskin.

diff --git a/ChangeLog b/ChangeLog
index 80e6022..0a350e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * aclocal.in (check_acinclude): Output `warning:' in front
+       of warnings.
+       Report from Pavel Roskin.
+
 2003-12-04  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * TODO: Remove some old entries.

diff --git a/aclocal.in b/aclocal.in
index 72a0281..dd170c4 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -106,16 +106,12 @@ $m4_include_rx = "(?:m4_)?s?include\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)";
 # Check macros in acinclude.m4.  If one is not used, warn.
 sub check_acinclude ()
 {
-    local ($key);
-
-    foreach $key (keys %map)
+  foreach my $key (keys %map)
     {
-       next unless $map{$key} eq 'acinclude.m4';
-       if (! $macro_seen{$key})
-       {
-           # FIXME: should print line number of acinclude.m4.
-           warn "aclocal: macro `$key' defined in acinclude.m4 but never used\n";
-       }
+      # FIXME: should print line number of acinclude.m4.
+      warn ("aclocal: warning: macro `$key' defined in "
+           . "acinclude.m4 but never used\n")
+       if $map{$key} eq 'acinclude.m4' && ! $macro_seen{$key};
     }
 }
 
@@ -285,9 +281,9 @@ sub scan_file ($)
        {
          if (! defined $1)
            {
-             print STDERR "$file:$.: underquoted definition of $2\n";
-             print STDERR "$file:$.: run info '(automake)Extending aclocal'\n"
-               . "or see http://sources.redhat.com/automake/"
+             print STDERR "$file:$.: warning: underquoted definition of $2\n";
+             print STDERR "  run info '(automake)Extending aclocal'\n"
+               . "  or see http://sources.redhat.com/automake/"
                . "automake.html#Extending%20aclocal\n"
                unless $underquoted_manual_once;
              $underquoted_manual_once = 1;