* libtool.m4: Don't quote CONFIG_SHELL nor ORIGINAL_CONFIG_SHELL.

Quote $@ properly so that the shell expands it, not m4.

diff --git a/ChangeLog b/ChangeLog
index 838031a5e44ea5eedd5d0a7dfe9848d87fb5b4d0..d239c83d5c8e78bbf62fdd34bf57b7e304ef43bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>
 
+       * libtool.m4: Don't quote CONFIG_SHELL nor ORIGINAL_CONFIG_SHELL.
+       Quote $@ properly so that the shell expands it, not m4.
+
        * libtool.m4: Don't quote SHELL when `re-exec'ing, so that SHELL
        can be `/path/to/shell -x'.
 

diff --git a/libtool.m4 b/libtool.m4
index 4c42dc05e9894dc309d0f7c54a513a806d6b0a40..a5fa41ab1d11271e756f913f48c683e5d3f14aae 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -286,11 +286,11 @@ else
     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
         test "X$CONFIG_SHELL" != X/bin/ksh; then
       # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
       export ORIGINAL_CONFIG_SHELL
       CONFIG_SHELL=/bin/ksh
       export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "[$]0" --no-reexec ${1+"$@"}
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
     else
       # Try using printf.
       lt_echo='printf %s\n'
@@ -299,18 +299,18 @@ else
         test "X$lt_echo_testing_string" = "X$lt_echo_test_string"; then
        # Cool, printf works
        :
-      elif lt_echo_testing_string=`("$ORIGINAL_CONFIG_SHELL" "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+      elif lt_echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
           test "X$lt_echo_testing_string" = 'X\t' &&
-          lt_echo_testing_string=`("$ORIGINAL_CONFIG_SHELL" "[$]0" --fallback-echo "$lt_echo_test_string") 2>/dev/null` &&
+          lt_echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$lt_echo_test_string") 2>/dev/null` &&
           test "X$lt_echo_testing_string" = "X$lt_echo_test_string"; then
-       CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
+       CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
        export CONFIG_SHELL
        SHELL="$CONFIG_SHELL"
        export SHELL
        lt_echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif lt_echo_testing_string=`("$CONFIG_SHELL" "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+      elif lt_echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
           test "X$lt_echo_testing_string" = 'X\t' &&
-          lt_echo_testing_string=`("$CONFIG_SHELL" "[$]0" --fallback-echo "$lt_echo_test_string") 2>/dev/null` &&
+          lt_echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$lt_echo_test_string") 2>/dev/null` &&
           test "X$lt_echo_testing_string" = "X$lt_echo_test_string"; then
        lt_echo="$CONFIG_SHELL [$]0 --fallback-echo"
       else
@@ -328,7 +328,7 @@ else
        if test "$prev" != 'sed 50q "[$]0"'; then
          lt_echo_test_string=`eval $prev`
          export lt_echo_test_string
-         exec "${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}}" "[$]0" ${1+"$@"}
+         exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
        else
          # Oops.  We lost completely, so just stick with echo.
          lt_echo=echo