From a8100d5bb4759ac2d306ff0cd03a8b0f880a7b02 Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Tue, 14 Sep 1999 23:16:48 +0000 Subject: [PATCH] Fix problem with going to automake 2.14 --- ld/ChangeLog | 7 +++++++ ld/configure | 4 ++-- ld/configure.in | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 3af112db15..8209dc8821 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +1999-09-14 Michael Meissner + + * 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 * emultempl/pe.em (gld_${EMULATION_NAME}_after_open): allow for diff --git a/ld/configure b/ld/configure index f2baf1db60..d907e9fb55 100755 --- 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 a3546c7671..a0fef19f79 100644 --- 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