# HG changeset patch # User John W. Eaton # Date 1371060568 14400 # Node ID eb1a22446662365b78900299e95598d0d37ccd97 # Parent cbfe5d38ff2ccd66862bd71481549e296060a2d9 substitute SHELL diff -r cbfe5d38ff2c -r eb1a22446662 Makefile.in --- a/Makefile.in Wed Jun 12 13:50:50 2013 -0400 +++ b/Makefile.in Wed Jun 12 14:09:28 2013 -0400 @@ -86,7 +86,7 @@ PKG_MIRROR := s3.amazonaws.com/mxe-pkg PKG_CDN := d1yihgixbnrglp.cloudfront.net -SHELL := bash +SHELL := @SHELL@ INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch diff -r cbfe5d38ff2c -r eb1a22446662 configure.ac --- a/configure.ac Wed Jun 12 13:50:50 2013 -0400 +++ b/configure.ac Wed Jun 12 14:09:28 2013 -0400 @@ -37,10 +37,10 @@ ### ensure /bin/sh is the default shell so this can be safely ignored by ### almost everyone. However, when building for Android, for example, ### this will need to be set. -SHELL_PATH=/bin/sh +SHELL=bash AC_ARG_WITH([shell], [AS_HELP_STRING([--with-shell=SHELL], - [use SHELL as the shell interpreter (default: /bin/sh)])]) + [use SHELL as the shell interpreter (default: bash)])]) case $with_shell in no) AC_MSG_ERROR([A shell interpreter is required]) @@ -48,11 +48,10 @@ yes | "") ;; *) - SHELL_PATH=$with_shell + SHELL=$with_shell ;; esac -AC_DEFINE_UNQUOTED([SHELL_PATH], ["$SHELL_PATH"], - [Define this to be the path to the shell command interpreter.]) +AC_SUBST(SHELL) ### If possible, use a 64-bit integer type for array dimensions and indexing.