Re: Automake 1.7h uploaded (fourth beta for Automake 1.8)

[Alexandre Duret-Lutz]

>>> "Pavel" == Pavel Roskin <address@hidden> writes:

[...]

 Pavel> One little nitpick.  Either the message about underquoted macros in
 Pavel> aclocal should cause aclocal to fail, or there should be a word 
"WARNING"
 Pavel> in the message.  I actually mistook this message for the reason why
 Pavel> autogen.sh failed (the reason was unrelated to Automake).  I mean this
 Pavel> code in aclocal.in:

I'm installing the following.

 Pavel> print STDERR "$file:$.: underquoted definition of $2\n";
 Pavel> print STDERR "$file:$.: run info '(automake)Extending aclocal'\n"
 Pavel> . "or see http://sources.redhat.com/automake/";
 Pavel> . "automake.html#Extending%20aclocal\n"

 Pavel> By the way, wouldn't the "warn" function in Perl more
 Pavel> appropriate?  It's used elsewhere in aclocal.in.  It
 Pavel> doesn't add "WARNING" though.

We should switch to Automake::Channels::msg, but that will be
for another time.

2003-12-05  Alexandre Duret-Lutz  <address@hidden>

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

Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.95
diff -u -r1.95 aclocal.in
--- aclocal.in  6 Oct 2003 22:42:23 -0000       1.95
+++ aclocal.in  5 Dec 2003 21:21:12 -0000
@@ -106,16 +106,12 @@
 # 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 @@
        {
          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;
--
Alexandre Duret-Lutz