Unbreak ffed6142d652bb8154dbeac565000ea3673722a0

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index fdcda7c3187a553d686548d238c66e00c8998eab..5050e0234c2f3975e0d92ea035f2102240796c95 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -269,22 +269,22 @@ echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 
-if which wget >/dev/null 2>&1; then
+if wget --version >/dev/null 2>&1; then
     echo "WGET = `which wget` -c --passive" >> config.mak
-elif which curl >/dev/null 2>&1; then
+elif test -z `curl --version >/dev/null 2>&1`; then
     echo "WGET = `which curl` -L -O" >> config.mak
 else
     echo "You need at least wget or curl to fetch the packages." >&2
     exit 1
 fi
 
-if which svn >/dev/null 2>&1; then
+if svn --version >/dev/null 2>&1; then
     echo "SVN = `which svn`" >> config.mak
 else
     echo "You do not have a subversion client in your PATH." >&2
 fi
 
-if which git >/dev/null 2>&1; then
+if git --version>/dev/null 2>&1; then
     echo "GIT = `which git`" >> config.mak
 else
     echo "You do not have a Git client in your PATH." >&2