summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-31 12:53:50 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:37:32 +0000
commit92ff8a25005f21c36398ab72e6b00a92183338be (patch)
tree4aa27791edd4fab532f743c1ab9ae9856b0cb996
parentacf75d733708f2275cc363566c2457f5c4486362 (diff)
configure: dispose of which.test
just use 'which' and be done with it. the script was rather arcane, and worked around deficiencies of cygwin (no longer relevant) and solaris (assumed to be somewhat sane meanwhile). Change-Id: I2e11ea3c87ac06a85604ac8d58d8fee95eae2e15 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rwxr-xr-xconfig.tests/unix/which.test39
-rwxr-xr-xconfigure4
2 files changed, 1 insertions, 42 deletions
diff --git a/config.tests/unix/which.test b/config.tests/unix/which.test
deleted file mode 100755
index 37c858c2f7..0000000000
--- a/config.tests/unix/which.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-HOME=/dev/null
-export HOME
-
-unset which
-
-WHICH=`which which 2>/dev/null`
-if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
- WHICH=which
-elif [ -z "$WHICH" ]; then
- if which which >/dev/null 2>&1; then
- WHICH=which
- else
- for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
- if [ -x $a/which ]; then
- WHICH=$a/which
- break;
- fi
- done
- fi
-fi
-
-if [ -z "$WHICH" ]; then
- IFS=:
- for a in $PATH; do
- if [ -x $a/$1 ]; then
- echo "$a/$1"
- exit 0
- fi
- done
-else
- a=`"$WHICH" "$1" 2>/dev/null`
- if [ ! -z "$a" -a -x "$a" ]; then
- echo "$a"
- exit 0
- fi
-fi
-exit 1
diff --git a/configure b/configure
index bf37224d24..08b49a8d12 100755
--- a/configure
+++ b/configure
@@ -40,9 +40,7 @@ relpath=`(cd "$relpath"; /bin/pwd)`
# the current directory is the "build tree" or "object tree"
outpath=`/bin/pwd`
-# where to find which..
-unixtests="$relpath/config.tests/unix"
-WHICH="$unixtests/which.test"
+WHICH="which"
PERL=`$WHICH perl 2>/dev/null`