From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 5 Dec 2003 21:22:36 +0000 (+0000)
Subject: * aclocal.in (check_acinclude): Output `warning:' in front
X-Git-Tag: Release-1-8~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f433132f20a5c094d6edba0bd1701ffe02909837;p=thirdparty%2Fautomake.git

* aclocal.in (check_acinclude): Output `warning:' in front
of warnings.
Report from Pavel Roskin.
---

diff --git a/ChangeLog b/ChangeLog
index 80e602257..0a350e489 100644
--- 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 72a028110..dd170c466 100644
--- 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;