From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 30 Oct 2008 14:13:56 +0000 (+0100)
Subject: Pass CONFIG_SHELL down to generated scripts, and re-export SHELL.
X-Git-Tag: v2.63b~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e664439cacf579477788e60a272f045d43e005;p=thirdparty%2Fautoconf.git

Pass CONFIG_SHELL down to generated scripts, and re-export SHELL.

* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): If proceeding
with a given CONFIG_SHELL, move it to SHELL.
(AS_INIT_GENERATED): Re-export SHELL.
---

diff --git a/ChangeLog b/ChangeLog
index e19a3f601..89c2214bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-30  Paolo Bonzini  <bonzini@gnu.org>
+
+	Pass CONFIG_SHELL down to generated scripts, and re-export SHELL.
+	* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): If proceeding
+	with a given CONFIG_SHELL, move it to SHELL.
+	(AS_INIT_GENERATED): Re-export SHELL.
+
 2008-10-30  Eric Blake  <ebb9@byu.net>
 
 	Work around Solaris /bin/sh case bug.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 1f1f5999d..e0870ab8c 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -265,6 +265,9 @@ Then install a modern shell, or manually run the script under such a
 shell if you do have one.], [$[]0: ], [], [62])")
   fi
       AS_EXIT(1)])])
+else
+  SHELL=$CONFIG_SHELL
+  export SHELL
 fi
 _m4_popdef([AS_EXIT])])# _AS_DETECT_BETTER_SHELL
 
@@ -1863,6 +1866,7 @@ cat >$1 <<_ASEOF || as_write_fail=1
 # Generated by $as_me.
 $2
 SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
 _ASEOF
 cat >>$1 <<\_ASEOF || as_write_fail=1
 _AS_SHELL_SANITIZE