From c36c585e1bdcec69ac4f9d3397e3a6de81bb2680 Mon Sep 17 00:00:00 2001
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 1 Apr 2011 13:43:39 +0000
Subject: [PATCH] * configure.ac: Remove code setting CONFIG_SHELL,
config_shell and moveifchange. * configure: Regenerate. *
Makefile.tpl: Use @SHELL@ not @config_shell@. * Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171830 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog | 8 ++++++++
Makefile.in | 2 +-
Makefile.tpl | 2 +-
configure | 38 --------------------------------------
configure.ac | 37 -------------------------------------
5 files changed, 10 insertions(+), 77 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 436516918ad9..2af6c0d8a938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-01 Joseph Myers <joseph@codesourcery.com>
+
+ * configure.ac: Remove code setting CONFIG_SHELL, config_shell and
+ moveifchange.
+ * configure: Regenerate.
+ * Makefile.tpl: Use @SHELL@ not @config_shell@.
+ * Makefile.in: Regenerate.
+
2011-04-01 Joseph Myers <joseph@codesourcery.com>
* configure.ac (*-*-sysv4*): Don't enable libgomp.
diff --git a/Makefile.in b/Makefile.in
index 128691f9893b..e64f0763025c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -320,7 +320,7 @@ HOST_LIBELFINC = @libelfinc@
# Programs producing files for the BUILD machine
# ----------------------------------------------
-SHELL = @config_shell@
+SHELL = @SHELL@
# pwd command to use. Allow user to override default by setting PWDCMD in
# the environment to account for automounters. The make variable must not
diff --git a/Makefile.tpl b/Makefile.tpl
index 09ac8639c55c..f7312d9e8cef 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -323,7 +323,7 @@ HOST_LIBELFINC = @libelfinc@
# Programs producing files for the BUILD machine
# ----------------------------------------------
-SHELL = @config_shell@
+SHELL = @SHELL@
# pwd command to use. Allow user to override default by setting PWDCMD in
# the environment to account for automounters. The make variable must not
diff --git a/configure b/configure
index 46e9caeffc66..fea4aa70e09c 100755
--- a/configure
+++ b/configure
@@ -604,7 +604,6 @@ LEX
M4
BISON
YACC
-config_shell
WINDRES_FOR_BUILD
WINDMC_FOR_BUILD
RANLIB_FOR_BUILD
@@ -2608,42 +2607,6 @@ fi
done
-### we might need to use some other shell than /bin/sh for running subshells
-### If we are on Windows, search for the shell. This will permit people
-### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
-### without also having to set CONFIG_SHELL. This code will work when
-### using bash, which sets OSTYPE.
-case "${OSTYPE}" in
-*win32*)
- if test x${CONFIG_SHELL} = x ; then
- if test ! -f /bin/sh ; then
- if test x${SHELL} != x && test -f ${SHELL} ; then
- CONFIG_SHELL=${SHELL}
- export CONFIG_SHELL
- else
- for prog in sh sh.exe bash bash.exe; do
- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
- for dir in $PATH; do
- test -z "$dir" && dir=.
- if test -f $dir/$prog; then
- CONFIG_SHELL=$dir/$prog
- export CONFIG_SHELL
- break
- fi
- done
- IFS="$save_ifs"
- test -n "${CONFIG_SHELL}" && break
- done
- fi
- fi
- fi
- ;;
-esac
-
-config_shell=${CONFIG_SHELL-/bin/sh}
-
-moveifchange=${srcdir}/move-if-change
-
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
# We pass INSTALL explicitly to sub-makes. Make sure that it is not
@@ -7507,7 +7470,6 @@ done
-
# Generate default definitions for YACC, M4, LEX and other programs that run
# on the build machine. These are used if the Makefile can't locate these
# programs in objdir.
diff --git a/configure.ac b/configure.ac
index 32df4932cb40..2564ce5ad346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,42 +89,6 @@ AC_PROG_LN_S
AC_PROG_SED
AC_PROG_AWK
-### we might need to use some other shell than /bin/sh for running subshells
-### If we are on Windows, search for the shell. This will permit people
-### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
-### without also having to set CONFIG_SHELL. This code will work when
-### using bash, which sets OSTYPE.
-case "${OSTYPE}" in
-*win32*)
- if test x${CONFIG_SHELL} = x ; then
- if test ! -f /bin/sh ; then
- if test x${SHELL} != x && test -f ${SHELL} ; then
- CONFIG_SHELL=${SHELL}
- export CONFIG_SHELL
- else
- for prog in sh sh.exe bash bash.exe; do
- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
- for dir in $PATH; do
- test -z "$dir" && dir=.
- if test -f $dir/$prog; then
- CONFIG_SHELL=$dir/$prog
- export CONFIG_SHELL
- break
- fi
- done
- IFS="$save_ifs"
- test -n "${CONFIG_SHELL}" && break
- done
- fi
- fi
- fi
- ;;
-esac
-
-config_shell=${CONFIG_SHELL-/bin/sh}
-
-moveifchange=${srcdir}/move-if-change
-
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
# We pass INSTALL explicitly to sub-makes. Make sure that it is not
@@ -2985,7 +2949,6 @@ AC_SUBST(NM_FOR_BUILD)
AC_SUBST(RANLIB_FOR_BUILD)
AC_SUBST(WINDMC_FOR_BUILD)
AC_SUBST(WINDRES_FOR_BUILD)
-AC_SUBST(config_shell)
# Generate default definitions for YACC, M4, LEX and other programs that run
# on the build machine. These are used if the Makefile can't locate these
--
GitLab