* bin/autoreconf.in: New option `--no-recursive'.

Improve wording for subpackages a bit.
* doc/autoconf.texi (autoreconf Invocation): Updated.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index 6ffa2043f5279ea7e7cb2f0ce1233cc577f01543..f8c4f12949cc9f7041aefd2150d47ad4176f6954 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * bin/autoreconf.in: New option `--no-recursive'.
+       Improve wording for subpackages a bit.
+       * doc/autoconf.texi (autoreconf Invocation): Updated.
+       * NEWS: Updated.
+
        * doc/install.texi (Defining Variables): Put `CONFIG_SHELL'
        in environment of `configure', not the command line.
        Reported by Howard Chu <hyc@highlandsun.com>.

diff --git a/NEWS b/NEWS
index 587702727be258457cc26088579d34935b0be2e7..f82dad533ee97627607a666708bae35bccca9f74 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,9 @@
   as in `${LIBOBJDIR}alloca.o'.  LIBOBJDIR is meant to be defined from
   `Makefile.in' in case the object files lie in a different directory.
 
+** autoreconf
+  Supports --no-recursive now.
+
 * Major changes in Autoconf 2.59b
 
   Released 2004-08-20, by Paul Eggert.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index ab83d52b2632f9a4ec3eaf12bd695c968bb4135a..3f7a22f0e1d8fd02456029ad349a0a1d246355fc 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -74,6 +74,7 @@ Operation modes:
   -d, --debug              don't remove temporary files
   -f, --force              consider all files obsolete
   -i, --install            copy missing auxiliary files
+      --no-recursive       don't rebuild sub-packages
   -s, --symlink            with -i, install symbolic links instead of copies
   -m, --make               when applicable, re-run ./configure && make
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
@@ -129,6 +130,9 @@ my @warning;
 # Rerun `./configure && make'?
 my $make = 0;
 
+# Recurse into subpackages
+my $recursive = 1;
+
 ## ---------- ##
 ## Routines.  ##
 ## ---------- ##
@@ -146,7 +150,8 @@ sub parse_args ()
          'B|prepend-include=s'  => \@prepend_include,
          'i|install'            => \$install,
          's|symlink'            => \$symlink,
-         'm|make'               => \$make);
+         'm|make'               => \$make,
+         'recursive!'           => \$recursive);
 
   # Split the warnings as a list of elements instead of a list of
   # lists.
@@ -459,7 +464,7 @@ sub autoreconf_current_directory ()
       $uses_libtool = 1             if /(AC_PROG_LIBTOOL|LT_INIT)/;
       $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
       $uses_automake = 1            if /AM_INIT_AUTOMAKE/;
-      push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
+      push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/ && $recursive;
     }
 
   # The subdirs are *optional*, they may not exist.
@@ -467,7 +472,7 @@ sub autoreconf_current_directory ()
     {
       if (-d)
        {
-         verb "$configure_ac: subdirectory $_ to autoreconf";
+         verb "$configure_ac: adding subdirectory $_ to autoreconf";
          autoreconf ($_);
        }
       else

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 8396b06da45cdbe23a15de87afe074d7ce5bd558..6ed2030d96a8ec2480081246d3bddb678969803b 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1516,6 +1516,10 @@ If deemed appropriate, this option triggers calls to
 @samp{automake --add-missing},
 @samp{libtoolize}, @samp{autopoint}, etc.
 
+@item --no-recursive
+Do not rebuild files in subdirectories to configure (see @ref{Subdirectories},
+macro @code{AC_CONFIG_SUBDIRS}).
+
 @item --symlink
 @itemx -s
 When used with @option{--install}, install symbolic links to the missing