* m4/libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): Since CONFIG_SHELL may

not actually be set, we should use SHELL here, also make darn sure
that SHELL is set to something. Bug from Willem Jan Palenstijn
<wpalenst@math.leidenuniv.nl>.

diff --git a/ChangeLog b/ChangeLog
index 344c88282a26e28195c0d4ec8f2729f62b934b29..07ddab787bd5c569a3e93fd6df2ff76d296f5022 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-04  Peter O'Gorman  <peter@pogma.com>
+
+       * m4/libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): Since CONFIG_SHELL may
+       not actually be set, we should use SHELL here, also make darn sure
+       that SHELL is set to something. Bug from Willem Jan Palenstijn
+       <wpalenst@math.leidenuniv.nl>.
+
 2004-08-03  Jacob Meuser <jakemsr@jakemsr.com>
 
        * ltmain.in: Allow some static libraries to be used in generating a

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f0be3e05c41955e191c6314b6c39632e4129ac3a..bee3b7e3a9fb7d94787636933fa468d198d51f93 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1135,10 +1135,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     for i in 1 2 3 4 5 6 7 8 ; do
       teststring=$teststring$teststring
     done
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
               = "XX$teststring$teststring") >/dev/null 2>&1 &&
            test $i != 17 # 1/2 MB should be enough
     do