autoreconf: impement -vv

diff --git a/ChangeLog b/ChangeLog
index 1acbb083068eb8579370424db2ebe28ee2c867f3..08dcdc17b1d7085ec38366affe8d67b04446bf93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-01  Noah Misch  <noah@cs.caltech.edu>
+
+       * bin/autoreconf.in (parse_args): Multiple -v send --verbose to
+       subordinate tools.
+       * lib/Autom4te/General.pm (getopt): Make -v and -d incremental.
+       * doc/autoconf.texi (autoreconf Invocation): Document it.
+
 2006-04-01  Noah Misch  <noah@cs.caltech.edu>
 
        * doc/autoconf.texi: Use `Cygwin', `MinGW', and `license' consistently.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 3f7a22f0e1d8fd02456029ad349a0a1d246355fc..4243cb7c7ea913937c265652b27fccc961bae847 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -216,13 +216,18 @@ sub parse_args ()
       $automake .= ' --no-force'
        if $aclocal_supports_force;
     }
-  # --debug;
-  if ($debug)
+  # --verbose --verbose or --debug;
+  if ($verbose > 1 || $debug)
     {
-      $autoconf   .= ' --verbose --debug';
-      $autoheader .= ' --verbose --debug';
+      $autoconf   .= ' --verbose';
+      $autoheader .= ' --verbose';
       $automake   .= ' --verbose';
       $aclocal    .= ' --verbose';
+    }
+  if ($debug)
+    {
+      $autoconf   .= ' --debug';
+      $autoheader .= ' --debug';
       $libtoolize .= ' --debug';
     }
   # --warnings;

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 8c56463ed0a55a8618a935a278a5b6cc4fc8f0ef..ecf36b36535174171e1dafe122bb79834834badd 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1501,8 +1501,9 @@ Print a summary of the command line options and exit.
 Print the version number of Autoconf and exit.
 
 @item --verbose
-Print the name of each directory where @command{autoreconf} runs
-@command{autoconf} (and @command{autoheader}, if appropriate).
+Print the name of each directory @command{autoreconf} examines and the
+commands it runs.  If given two or more times, pass @option{--verbose}
+to subordinate tools that support it.
 
 @item --debug
 @itemx -d

diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index 970baf9fbf3f59e1d0429086dad27c36735cf5d5..d06f4d5a12b0a2569f08185c8f11f77e98293a4a 100644 (file)
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -273,9 +273,9 @@ sub getopt (%)
   %option = ("h|help"     => sub { print $help; exit 0 },
             "V|version"  => sub { print $version; exit 0 },
 
-            "v|verbose"    => \$verbose,
-            "d|debug"      => \$debug,
-            'f|force'      => \$force,
+            "v|verbose"  => sub { ++$verbose },
+            "d|debug"    => sub { ++$debug },
+            'f|force'    => \$force,
 
             # User options last, so that they have precedence.
             %option);