From 0ae6b72e54160c695bf4e0dfcad86510c721feff Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 20 Jun 2013 07:43:41 -0700 Subject: [PATCH] Remove bash requirement as it is no longer needed. --- Makefile.am | 2 -- Makefile.in | 3 +-- configure | 42 ------------------------------------------ configure.ac | 1 - 4 files changed, 1 insertion(+), 47 deletions(-) diff --git a/Makefile.am b/Makefile.am index 67ca54d..def8a41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,8 +17,6 @@ # along with Cycript. If not, see . # }}} -SHELL = @_BASH@ - .DELETE_ON_ERROR: AUTOMAKE_OPTIONS = subdir-objects diff --git a/Makefile.in b/Makefile.in index ea6fd00..9ae3867 100644 --- a/Makefile.in +++ b/Makefile.in @@ -399,14 +399,13 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -SHELL = @_BASH@ +SHELL = @SHELL@ SO = @SO@ STRIP = @STRIP@ TIME = @TIME@ VERSION = @VERSION@ WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ WEBKIT_LIBS = @WEBKIT_LIBS@ -_BASH = @_BASH@ _LIPO = @_LIPO@ _NM = @_NM@ _OTOOL = @_OTOOL@ diff --git a/configure b/configure index 8641c3f..958d55a 100755 --- a/configure +++ b/configure @@ -675,7 +675,6 @@ FLEX BISON TIME GIT -_BASH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -15898,47 +15897,6 @@ $as_echo "no" >&6; } fi fi -# Extract the first word of "bash", so it can be a program name with args. -set dummy bash; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path__BASH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $_BASH in - [\\/]* | ?:[\\/]*) - ac_cv_path__BASH="$_BASH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path__BASH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path__BASH" && ac_cv_path__BASH="as_fn_error $? "missing \"bash\"" "$LINENO" 5" - ;; -esac -fi -_BASH=$ac_cv_path__BASH -if test -n "$_BASH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_BASH" >&5 -$as_echo "$_BASH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "git", so it can be a program name with args. set dummy git; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index b694b61..e1a13bb 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ AC_LANG([C++]) PKG_PROG_PKG_CONFIG([0.22]) -AC_PATH_PROG([_BASH], [bash], [AC_MSG_ERROR([missing "bash"])]) AC_PATH_PROG([GIT], [git]) AC_PATH_PROG([TIME], [time]) -- 2.47.2