From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 10 Nov 2005 18:57:58 +0000 (+0000)
Subject: * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Pass
X-Git-Tag: AUTOCONF-2.59c~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fffd9421d84cce5686f14cd236aa67e4874b6977;p=thirdparty%2Fautoconf.git

* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Pass
CONFIG_SHELL in the environment of the configure rerun.
* doc/autoconf.texi (Here-Documents, config.status Invocation):
Suggest passing CONFIG_SHELL absolute, and in the environment
rather than as option.
---

diff --git a/ChangeLog b/ChangeLog
index 126717ee3..b0db338b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Pass
+	CONFIG_SHELL in the environment of the configure rerun.
+	* doc/autoconf.texi (Here-Documents, config.status Invocation):
+	Suggest passing CONFIG_SHELL absolute, and in the environment
+	rather than as option.
+
 2005-11-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE):
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3b75db505..88a42e737 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -9958,8 +9958,8 @@ example, Solaris @command{dtksh}, which is derived from Korn shell
 version M-12/28/93d, mishandles variable expansion that occurs on
 1024-byte buffer boundaries within a here-document.  Users can generally
 fix these problems by using a faster or more reliable shell, e.g., by
-using the command @samp{bash ./configure CONFIG_SHELL=bash} rather than
-plain @samp{./configure}.
+using the command @samp{CONFIG_SHELL=/bin/bash /bin/bash ./configure} rather
+than plain @samp{./configure}.
 
 Some shells can be extremely inefficient when there are a lot of
 here-documents inside a single statement.  For instance if your
@@ -14149,9 +14149,9 @@ The shell with which to run @command{configure} for the @option{--recheck}
 option.  It must be Bourne-compatible.  The default is a shell that
 supports @code{LINENO} if available, and @file{/bin/sh} otherwise.
 Invoking @command{configure} by hand bypasses this setting, so you may
-need to use a command like @samp{/bin/bash ./configure
-CONFIG_SHELL=/bin/bash} to insure that the same shell is used
-everywhere.
+need to use a command like @samp{CONFIG_SHELL=/bin/bash /bin/bash ./configure}
+to insure that the same shell is used everywhere.  The absolute name of the
+shell should be passed.
 @end defvar
 
 @defvar CONFIG_STATUS
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 233d0443b..a1a20394f 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1256,7 +1256,9 @@ exec AS_MESSAGE_LOG_FD>>config.log
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  echo "running $SHELL $[0] " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&AS_MESSAGE_FD
+  echo "running CONFIG_SHELL=$SHELL $SHELL $[0] " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&AS_MESSAGE_FD
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
   exec $SHELL $[0] $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 m4_ifdef([_AC_OUTPUT_COMMANDS_INIT],