FYYI: autoreconf

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * 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.

Index: bin/autoreconf.in
===================================================================
RCS file: /cvs/autoconf/bin/autoreconf.in,v
retrieving revision 1.77
diff -u -u -r1.77 autoreconf.in
--- bin/autoreconf.in 2001/10/08 08:27:15 1.77
+++ bin/autoreconf.in 2001/10/08 09:39:56
@@ -150,11 +150,23 @@
   # --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 @@
     {
       $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 @@
 {
   # 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 @@
   # -------------------- #
 
   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 @@
   # 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
Index: lib/autom4te.in
===================================================================
RCS file: /cvs/autoconf/lib/autom4te.in,v
retrieving revision 1.6
diff -u -u -r1.6 autom4te.in
--- lib/autom4te.in 2001/09/23 17:16:02 1.6
+++ lib/autom4te.in 2001/10/08 09:39:56
@@ -43,6 +43,17 @@
 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: --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"