diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 56 | ||||
| -rw-r--r-- | configure.ac | 15 |
4 files changed, 7 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog index 64b93efed8..60eefba740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2014-03-13 Mike Frysinger <vapier@gentoo.org> + * config.make.in (have-ksh): Delete. + (KSH): Delete. + * configure.ac (libc_cv_have_ksh): Delete. + * configure: Regenerate. + +2014-03-13 Mike Frysinger <vapier@gentoo.org> + * elf/Makefile: Delete $(have-ksh) check. ($(objpfx)sotruss): Change KSH to BASH. * elf/sotruss.ksh: Rename to ... diff --git a/config.make.in b/config.make.in index b5308d85b8..4ca250d3bf 100644 --- a/config.make.in +++ b/config.make.in @@ -74,7 +74,6 @@ multi-arch = @multi_arch@ mach-interface-list = @mach_interface_list@ have-bash2 = @libc_cv_have_bash2@ -have-ksh = @libc_cv_have_ksh@ sizeof-long-double = @sizeof_long_double@ @@ -125,7 +124,6 @@ MSGFMT = @MSGFMT@ # Script execution tools. BASH = @BASH_SHELL@ -KSH = @KSH@ AWK = @AWK@ PERL = @PERL@ diff --git a/configure b/configure index 3ee1848b30..1781860ab6 100755 --- a/configure +++ b/configure @@ -616,8 +616,6 @@ libc_cv_cc_with_libunwind BISON INSTALL_INFO PERL -libc_cv_have_ksh -KSH libc_cv_have_bash2 BASH_SHELL libc_cv_gcc_static_libgcc @@ -5329,60 +5327,6 @@ else fi -if test "$BASH_SHELL" = no; then - # Extract the first word of "ksh", so it can be a program name with args. -set dummy ksh; 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_KSH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $KSH in - [\\/]* | ?:[\\/]*) - ac_cv_path_KSH="$KSH" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_KSH="$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_KSH" && ac_cv_path_KSH="no" - ;; -esac -fi -KSH=$ac_cv_path_KSH -if test -n "$KSH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KSH" >&5 -$as_echo "$KSH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "$KSH" = no; then - libc_cv_have_ksh=no - else - libc_cv_have_ksh=yes - fi -else - KSH="$BASH_SHELL" - - libc_cv_have_ksh=yes -fi - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index 59dbb5e1b2..df3e177cdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1108,21 +1108,6 @@ else fi AC_SUBST(libc_cv_have_bash2) -dnl We need a ksh compatible shell for tzselect. -if test "$BASH_SHELL" = no; then - AC_PATH_PROG(KSH, ksh, no) - if test "$KSH" = no; then - libc_cv_have_ksh=no - else - libc_cv_have_ksh=yes - fi -else - KSH="$BASH_SHELL" - AC_SUBST(KSH) - libc_cv_have_ksh=yes -fi -AC_SUBST(libc_cv_have_ksh) - AC_PATH_PROG(PERL, perl, no) if test "$PERL" != no && (eval `$PERL -V:apiversion`; test `expr "$apiversion" \< 5` -ne 0); then |