If the user's login shell is something crazy like, oooh,

/bin/tcsh, trying to execute bourne shell helper scripts with
the `$SHELL /path/to/helper $helper_flags' idiom incase the
execute bits were lost by say, eeer, cvs, is gonna blow up in
our faces.  This changeset tries to save these people from
their shells^H^H^H^H^H^H^H^H^Hmselves :->

* tests/defs.m4sh (SHELL): Move definition from here...
* config/general.m4sh (SHELL): ...to here.

diff --git a/ChangeLog b/ChangeLog
index beebceaaf1b448b786bbe23cbc9c96a91423e138..6e3cb1bd7832cfec5d8ab9222a768607b393a854 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-23  Gary V. Vaughan  <gary@gnu.org>
+
+       If the user's login shell is something crazy like, oooh,
+       /bin/tcsh, trying to execute bourne shell helper scripts with
+       the `$SHELL /path/to/helper $helper_flags' idiom incase the
+       execute bits were lost by say, eeer, cvs, is gonna blow up in
+       our faces.  This changeset tries to save these people from
+       their shells^H^H^H^H^H^H^H^H^Hmselves :->
+
+       * tests/defs.m4sh (SHELL): Move definition from here...
+       * config/general.m4sh (SHELL): ...to here.
+
 2004-11-23  Gary V. Vaughan  <gary@gnu.org>
 
        The ltdl.h header is the published interface to libltdl, and

diff --git a/config/general.m4sh b/config/general.m4sh
index 23880ccdf7fec97ad75cbb827b1656d9eefde993..46ddbaa7b649e014a4480593fafbb696b603aef5 100644 (file)
--- a/config/general.m4sh
+++ b/config/general.m4sh
@@ -36,6 +36,7 @@ m4_if([# general.m4sh -- general shell script boiler plate -*- Autoconf -*-
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 : ${SED="@SED@"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e s/^X//"}
 
 # Global variables:

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index e3b154df91d5f72f462348aa534f9f3ccdc41a5f..0c2ba85291a6611f7065446f08ba3971f0d600c9 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -32,7 +32,6 @@ m4_include([general.m4sh])
 
 : ${AUTOCONF="autoconf"}
 : ${LIBTOOL="../libtool"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e s/^X//"