* aclocal.in: Rename "verbosity" to "verbose". Always prepend

"aclocal: " to the verbose output.

diff --git a/ChangeLog b/ChangeLog
index 7929f55..8adcb22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-01  Pavel Roskin  <proski@gnu.org>
 
+       * aclocal.in: Rename "verbosity" to "verbose". Always prepend
+       "aclocal: " to the verbose output.
+
        * automake.in: Remove all debugging messages.
 
 2001-01-31  Akim Demaille  <akim@epita.fr>

diff --git a/aclocal.in b/aclocal.in
index 5c205f3..5eb051a 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -61,7 +61,7 @@ $output_file = 'aclocal.m4';
 %file_contents = ();
 
 # How much to say.
-$verbosity = 0;
+$verbose = 0;
 
 # Map from obsolete macros to hints for new macros.
 # If you change this, change the corresponding list in automake.in.
@@ -177,7 +177,7 @@ sub parse_arguments
        }
        elsif ($arglist[0] eq '--verbose')
        {
-           ++$verbosity;
+           ++$verbose;
        }
        elsif ($arglist[0] eq '--version')
        {
@@ -354,7 +354,7 @@ sub add_macro
        return;
     }
 
-    print STDERR "saw macro $macro\n" if $verbosity;
+    print STDERR "aclocal: saw macro $macro\n" if $verbose;
     $macro_seen{$macro} = 1;
     &add_file ($map{$macro});
 }
@@ -430,7 +430,7 @@ sub scan_file
                warn "aclocal: $file: $.: duplicated macro \`$1'\n";
                $exit_status = 1;
            }
-           print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
+           print STDERR "aclocal: found macro $1 in $file: $.\n" if $verbose;
        }
     }
     close (FILE);
@@ -445,7 +445,7 @@ sub write_aclocal
 {
     return if ! length ($output);
 
-    print STDERR "Writing $output_file\n" if $verbosity;
+    print STDERR "aclocal: writing $output_file\n" if $verbose;
 
     open (ACLOCAL, "> " . $output_file)
        || die "aclocal: couldn't open \`$output_file' for writing: $!\n";