[SCM] GNU Autoconf source repository branch, master, updated. v2.64-86-g8733bad

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=8733bad075b6b4340a8504496b488d48d0b9f354

The branch, master has been updated
       via  8733bad075b6b4340a8504496b488d48d0b9f354 (commit)
      from  19629fa9fcb209d60012a75ba087a295d4b3c734 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8733bad075b6b4340a8504496b488d48d0b9f354
Author: Ralf Wildenhues <[email protected]>
Date:   Sat Nov 14 12:40:07 2009 +0100

    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 <[email protected]>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   12 ++++++++++++
 THANKS            |    1 +
 bin/autoreconf.in |   26 +++++++++++++++-----------
 tests/torture.at  |    5 ++++-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77e9d4e..778f2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-14  Ralf Wildenhues  <[email protected]>
+
+	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  <[email protected]>
 
 	Fix AC_FUNC_MMAP for cygwin.
diff --git a/THANKS b/THANKS
index f63509f..d1ca487 100644
--- a/THANKS
+++ b/THANKS
@@ -264,6 +264,7 @@ Momchil Velkov              [email protected]
 Monty Taylor                [email protected]
 Morten Eriksen              [email protected]
 Motoyuki Kasahara           [email protected]
+Nathan Schulte              [email protected]
 Nathanael Nerode            [email protected]
 Nelson H. F. Beebe          [email protected]
 Nicolas Joly                [email protected]
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 9f6d706..4aeca01 100644
--- 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 ea3acd4..6fdf7e7 100644
--- 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
 ]])
 


hooks/post-receive
-- 
GNU Autoconf source repository