* lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Quote the

argument to `--prefix' for sub-configure scripts.
Pass `--silent' to sub-configure scripts.
* tests/torture.at (Configuring subdirectories): Add tests
for both changes.
* doc/autoconf.texi (Setting Output Variables): Fix example to
not show `--silent' being passed to a `configure' re-run.

diff --git a/ChangeLog b/ChangeLog
index 054a0d8733e66f459e97f3842b40c9795b7d2e9f..f189ca99ce0923e0ac8622cd199956f493a2b902 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Quote the
+       argument to `--prefix' for sub-configure scripts.
+       Pass `--silent' to sub-configure scripts.
+       * tests/torture.at (Configuring subdirectories): Add tests
+       for both changes.
+       * doc/autoconf.texi (Setting Output Variables): Fix example to
+       not show `--silent' being passed to a `configure' re-run.
+
 2006-09-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index bfc0bf96c091bc27a97c2fbb7bad7495e7149f86..5d3cb79df4988b474d2c354d3e6eae320d9780b0 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -8415,7 +8415,7 @@ line argument, including when no cache is used:
 @example
 $ @kbd{CC=/usr/bin/cc ./configure undeclared_var=raboof --silent}
 $ @kbd{./config.status --recheck}
-running /bin/sh ./configure undeclared_var=raboof --silent \
+running CONFIG_SHELL=/bin/sh /bin/sh ./configure undeclared_var=raboof \
   CC=/usr/bin/cc  --no-create --no-recursion
 @end example
 @end itemize

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 522dbc6d152957db76b0e304a918993c220c5ebc..7f39190678e474376c64ac42728e3026738c6bda 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -983,7 +983,12 @@ if test "$no_recursion" != yes; then
   case $ac_arg in
   *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
-  ac_sub_configure_args="$ac_arg $ac_sub_configure_args"
+  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
+
+  # Pass --silent
+  if test "$silent" = yes; then
+    ac_sub_configure_args="--silent $ac_sub_configure_args"
+  fi
 
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue

diff --git a/tests/torture.at b/tests/torture.at
index e4c6daf2379bca7128a75346d81465d4420d84d8..436842f6c8ea76a258108d6063d1ef05d2d0499a 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -876,6 +876,21 @@ top_srcdir=../../../inner
 prefix=/good
 ])
 
+# Make sure --prefix is properly quoted
+AT_CHECK([cd builddir && ../configure --prefix "/a  b c$ 'd"], 0, [ignore])
+AT_CHECK([cat builddir/inner/innermost/config], 0,
+[INNER=inner
+srcdir=../../../inner/innermost
+top_srcdir=../../../inner
+prefix=/a  b c$ 'd
+])
+
+# Make sure --silent is properly passed...
+AT_CHECK([cd builddir && ../configure --silent], 0, [])
+# ...but not stored in config.status.
+AT_CHECK([cd builddir && ./config.status --recheck], 0, [stdout])
+AT_CHECK([grep 'creating \./config.status' stdout], 0, [ignore])
+
 # Make sure we can run autoreconf on a subdirectory
 rm -f configure configure.in
 AT_CHECK([autoreconf inner], [], [], [ignore])