* bin/autoreconf.in (&autoreconf): Remove debugging code.

(&parse_args): Pass verbosity/debugging options to subtools when
--debug, not when --verbose.
* lib/autom4te.in (Autoreconf-preselections): New.
(Autoconf): Use it.

diff --git a/ChangeLog b/ChangeLog
index 1cb05a4ca1aea6519f0093651311d1ecb88c2af0..73e0d2a9395eb5a28d7f1e2df79af1d07b0ebaf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-08  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoreconf.in (&autoreconf): Remove debugging code.
+       (&parse_args): Pass verbosity/debugging options to subtools when
+       --debug, not when --verbose.
+       * lib/autom4te.in (Autoreconf-preselections): New.
+       (Autoconf): Use it.
+
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * bin/autoreconf.in (autoreconf): Run libtoolize when appropriate.
@@ -7,7 +15,6 @@
        * doc/autoconf.texi (autoreconf Invocation): Adjust.
        * bin/autoreconf.in (autoreconf): Run gettextize when appropriate.
 
-       
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * tests/tools.at (AT_CHECK_PERL_SYNTAX): Check autoreconf.
@@ -16,7 +23,6 @@
        bother with $force since...
        * lib/Autom4te/General.pm: does.
 
-       
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * bin/autoreconf.in: Rewrite in Perl.
@@ -34,7 +40,6 @@
        (m4_strip, m4_version_unletter): Use it.
        * tests/atspecific.m4 (AT_DATA_M4SUGAR, AT_DATA_M4SH): Likewise.
 
-       
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/autoconf.m4, lib/autoconf/general.m4,
@@ -45,7 +50,6 @@
        m4_bregexp, m4_bpatsubst, and m4_bmatch.
        * doc/autoconf.texi (Redefined M4 Macros): Adjust.
 
-       
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * lib/m4sugar/m4sh.m4: Use AS_REQUIRE.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index bc8b9910ea265cda520ce297b6f838acffc8d9e3..44becf2be1c9504084dadb5e9a9d4cd01c2e45dd 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -150,11 +150,23 @@ sub parse_args ()
   # --localdir
   $autoconf   .= " --include=$autoconf_dir --include=$localdir";
   $autoheader .= " --include=$autoconf_dir --include=$localdir";
+  # --install and --symlink;
+  if ($install)
+    {
+      $automake .= ' --add-missing';
+      $automake .= ' --copy'
+       unless $symlink;
+      $gettextize .= ' --copy'
+       unless $symlink;
+      $libtoolize .= ' --copy'
+       unless $symlink;
+    }
   # --force;
   if ($force)
     {
       $autoconf   .= ' --force';
       $autoheader .= ' --force';
+      $automake   .= ' --force-missing';
       $gettextize .= ' --force';
       $libtoolize .= ' --force';
     }
@@ -162,32 +174,15 @@ sub parse_args ()
     {
       $automake .= ' --no-force';
     }
-  # --verbose
-  if ($verbose)
-    {
-      $autoconf   .= ' --verbose';
-      $autoheader .= ' --verbose';
-      $aclocal    .= ' --verbose';
-    }
   # --debug;
   if ($debug)
     {
-      $autoconf   .= ' --debug';
-      $autoheader .= ' --debug';
+      $autoconf   .= ' --verbose --debug';
+      $autoheader .= ' --verbose --debug';
       $automake   .= ' --verbose';
+      $aclocal    .= ' --verbose';
       $libtoolize .= ' --debug';
     }
-  # --install and --symlink;
-  if ($install)
-    {
-      $automake .= ' --add-missing';
-      $automake .= ' --copy'
-       unless $symlink;
-      $gettextize .= ' --copy'
-       unless $symlink;
-      $libtoolize .= ' --copy'
-       unless $symlink;
-    }
 }
 
 
@@ -198,7 +193,6 @@ sub autoreconf ()
 {
   # If there it's not `configure.ac' or `configure.in', we are not
   # interested in the directory.
-  verbose "{$_}\n";
   return
     if !/^configure\.(ac|in)$/;
 
@@ -247,7 +241,7 @@ sub autoreconf ()
   # -------------------- #
 
   my $uses_libtool = 0;
-  my $traces = new Autom4te::XFile "$autoconf --trace=AM_PROG_LIBTOOL |";
+  $traces = new Autom4te::XFile "$autoconf --trace=AM_PROG_LIBTOOL |";
   while ($_ = $traces->getline)
     {
       $uses_libtool = 1
@@ -331,7 +325,7 @@ sub autoreconf ()
   # is used too.
   # Just as for autoconf, up to date ness is performed by the tool itself.
   my $uses_autoheader = 0;
-  my $traces = new Autom4te::XFile "$autoconf --trace=AC_CONFIG_HEADERS |";
+  $traces = new Autom4te::XFile "$autoconf --trace=AC_CONFIG_HEADERS |";
   while ($_ = $traces->getline)
     {
       $uses_autoheader = 1

diff --git a/lib/autom4te.in b/lib/autom4te.in
index 31b0b24a4a080afbc64bf83eb11b9dec03b6734f..dd893ef30b0dbe3f1863d747d424e2761bfab207 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -43,6 +43,17 @@ args: --preselect AC_CONFIG_FILES
 end-language: "Automake-preselections"
 
 
+## -------------------------- ##
+## Autoreconf-preselections.  ##
+## -------------------------- ##
+
+begin-language: "Autoreconf-preselections"
+args: --preselect AC_PROG_LIBTOOL
+args: --preselect AM_PROG_LIBTOOL
+args: --preselect AM_GNU_GETTEXT
+end-language: "Autoreconf-preselections"
+
+
 ## ------------------------ ##
 ## Autoscan-preselections.  ##
 ## ------------------------ ##
@@ -125,8 +136,9 @@ args: --mode 777
 args: --warning syntax
 args: --normalize
 args: --language Autoheader-preselections
-args: --language Autoscan-preselections
 args: --language Automake-preselections
+args: --language Autoreconf-preselections
+args: --language Autoscan-preselections
 end-language: "Autoconf"