Fix problem with going to automake 2.14

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3af112db1566fb4878284b75dda609b73ff63713..8209dc8821e1eca2e74837c80e9a7dd38a555f8f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+1999-09-14  Michael Meissner  <meissner@cygnus.com>
+
+       * configure.in (Canonicalization of target names): Remove adding
+       ${CONFIG_SHELL} in front of $ac_config_sub, since autoconfig 2.14
+       generates $ac_config_sub with a ${CONFIG_SHELL} already.
+       * configure: Regenerate.
+
 1999-09-14  Donn Terry  <donn@interix.com>
 
        * emultempl/pe.em (gld_${EMULATION_NAME}_after_open): allow for 

diff --git a/ld/configure b/ld/configure
index f2baf1db600e676e67d797b6a8e42309cc7b8703..d907e9fb55d3cf4ae5e2ecfc1e8fd3d3eb7ff14a 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -4474,7 +4474,7 @@ fi
 
 
 case "${host}" in
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows)
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
   cat >> confdefs.h <<\EOF
 #define USE_BINARY_FOPEN 1
 EOF
@@ -4769,7 +4769,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
        targ=$result
     else

diff --git a/ld/configure.in b/ld/configure.in
index a3546c767142a8225f44ac357d6a6d425cda18d1..a0fef19f7905d9098ff078690e53cc0121ec3c13 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -105,7 +105,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
        targ=$result
     else