Fix AC_CONFIG_SUBDIRS tracing in autoreconf.

* bin/autoreconf.in (autoreconf_current_directory): Collapse
newlines in the autoconf trace output, similar to how automake
invokes autoconf, so that newlines do not matter in the argument
to AC_CONFIG_SUBDIRS.
* tests/torture.at (Deep Package): Expose this issue in the
test.
* THANKS: Update.
Report by Nathan Schulte.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 77e9d4ec57864ffe0c1a4ed23032ea19216da229..778f2ce5157375597ac0812fab80d55f5e55fc75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix AC_CONFIG_SUBDIRS tracing in autoreconf.
+       * bin/autoreconf.in (autoreconf_current_directory): Collapse
+       newlines in the autoconf trace output, similar to how automake
+       invokes autoconf, so that newlines do not matter in the argument
+       to AC_CONFIG_SUBDIRS.
+       * tests/torture.at (Deep Package): Expose this issue in the
+       test.
+       * THANKS: Update.
+       Report by Nathan Schulte.
+
 2009-11-09  Eric Blake  <ebb9@byu.net>
 
        Fix AC_FUNC_MMAP for cygwin.

diff --git a/THANKS b/THANKS
index f63509f62cada6a8d05ce8c58bba470250a75100..d1ca487d3989b36b4eef76f2a1e346c80fc1034b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -264,6 +264,7 @@ Momchil Velkov              velco@fadata.bg
 Monty Taylor                mordred@inaugust.com
 Morten Eriksen              mortene@sim.no
 Motoyuki Kasahara           m-kasahr@sra.co.jp
+Nathan Schulte              reklipz@gmail.com
 Nathanael Nerode            neroden@gcc.gnu.org
 Nelson H. F. Beebe          beebe@math.utah.edu
 Nicolas Joly                njoly@pasteur.fr

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 9f6d7066c9c372ec2ee6d0dd598af61fd35dc408..4aeca01593e1ba4a16f4e0f450cbd5983f804c73 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -454,12 +454,13 @@ sub autoreconf_current_directory ()
   verb "$configure_ac: tracing";
   my $traces = new Autom4te::XFile
     ("$autoconf"
-     . join (' --trace=', '',
+     . join (' ',
+            map { ' --trace=' . $_ . ':\$n::\${::}%' }
             # If you change this list, update the
             # `Autoreconf-preselections' section of autom4te.in.
-            'AC_CONFIG_AUX_DIR:AC_CONFIG_AUX_DIR:\$1',
+            'AC_CONFIG_AUX_DIR',
             'AC_CONFIG_HEADERS',
-            'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1',
+            'AC_CONFIG_SUBDIRS',
             'AC_INIT',
             'AC_PROG_LIBTOOL',
             'LT_INIT',
@@ -470,14 +471,17 @@ sub autoreconf_current_directory ()
      . ' |');
   while ($_ = $traces->getline)
     {
-      $aux_dir = $1                 if /AC_CONFIG_AUX_DIR:(.*)/;
-      $uses_autoconf = 1            if /AC_INIT/;
-      $uses_gettext_via_traces = 1  if /AM_GNU_GETTEXT/;
-      $uses_libtool = 1             if /(AC_PROG_LIBTOOL|LT_INIT)/;
-      $uses_libltdl = 1             if /LT_CONFIG_LTDL_DIR/;
-      $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
-      $uses_automake = 1            if /AM_INIT_AUTOMAKE/;
-      push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/ && $recursive;
+      my ($macro, @args) = split (/::/);
+      $aux_dir = $args[0]           if $macro eq "AC_CONFIG_AUX_DIR";
+      $uses_autoconf = 1            if $macro eq "AC_INIT";
+      $uses_gettext_via_traces = 1  if $macro eq "AM_GNU_GETTEXT";
+      $uses_libtool = 1             if $macro eq "AC_PROG_LIBTOOL"
+                                       || $macro eq "LT_INIT";
+      $uses_libltdl = 1             if $macro eq "LT_CONFIG_LTDL_DIR";
+      $uses_autoheader = 1          if $macro eq "AC_CONFIG_HEADERS";
+      $uses_automake = 1            if $macro eq "AM_INIT_AUTOMAKE";
+      push @subdir, split (' ', $args[0])
+                                    if $macro eq "AC_CONFIG_SUBDIRS" && $recursive;
     }
 
   # The subdirs are *optional*, they may not exist.

diff --git a/tests/torture.at b/tests/torture.at
index ea3acd499b7c1b584155914c706e301d8b2acdb8..6fdf7e7cbd54cc16efa8b37ed4c40bd626358949 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1359,7 +1359,10 @@ AT_DATA([install-sh], [])
 AT_DATA([configure.in],
 [[AC_INIT(GNU Outer, 1.0)
 AC_ARG_VAR([OUTER], [an outer variable])
-AC_CONFIG_SUBDIRS([inner inner2])
+AC_CONFIG_SUBDIRS([
+  inner
+  inner2
+])
 AC_OUTPUT
 ]])