On Fri, 25 Mar 2011, Paolo Bonzini wrote:
> On 03/24/2011 08:49 PM, Joseph S. Myers wrote:
> > Related to that point, I notice a piece of code starting "we might need to
> > use some other shell than /bin/sh for running subshells" that tries to
> > determine a shell on Windows hosts. It's autoconf's job to find a
> > suitable shell, so if this code is still relevant I think there's
> > something missing in autoconf.
>
> That code is dead because
>
> if test x${CONFIG_SHELL} = x ; then
>
> will never be true.
OK to commit this patch to remove this code?
2011-04-01 Joseph Myers <[email protected]>
* configure.ac: Remove code setting CONFIG_SHELL, config_shell and
moveifchange.
* configure: Regenerate.
* Makefile.tpl: Use @SHELL@ not @config_shell@.
* Makefile.in: Regenerate.
Index: configure.ac
===================================================================
--- configure.ac (revision 171827)
+++ configure.ac (working copy)
@@ -89,42 +89,6 @@
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
@@ -3019,7 +2983,6 @@
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
Index: Makefile.tpl
===================================================================
--- Makefile.tpl (revision 171827)
+++ Makefile.tpl (working copy)
@@ -323,7 +323,7 @@
# 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
--
Joseph S. Myers
[email protected]
