- make version-checks more robust if '--version' is not supported

- removed libtool-check: libtool is shipped with boinc, this check therefore pointless

svn path=/trunk/boinc/; revision=9340
This commit is contained in:
Reinhard Prix 2006-01-30 11:23:27 +00:00
parent d5e56eb23d
commit 29149c2140
1 changed files with 9 additions and 14 deletions

View File

@ -35,11 +35,14 @@ check_version()
version=0 version=0
success=no success=no
else else
cmdline="$fullpath --version 2>/dev/null"; cmdline="$fullpath --version";
version=`$cmdline`; if ! version=`($cmdline 2>/dev/null)` 2>/dev/null; then
version="0";
fi
if [ -n "${version}" ]; then if [ -n "${version}" ]; then
version=`echo $version | awk '{ for (i=1;i<=NF;i++) { split($i,j,"."); m=j[1]"."j[2] ; if ((m*1)>0) { print m ; break; } } }'` version=`echo $version | awk '{ for (i=1;i<=NF;i++) { split($i,j,"."); m=j[1]"."j[2] ; if ((m*1)>0) { print m ; break; } } }'`
success=`echo $version $desired | awk '{ if ($1 >= $2) { print "yes";} else {print "no";}} '` if [ -z "$version" ]; then version=0; fi
success=`echo "$version" "$desired" | awk '{ if ($1 >= $2) { print "yes";} else {print "no";}} '`
else else
version=0 version=0
success=no success=no
@ -63,17 +66,17 @@ check_version()
echo "Bootstrapping configure script and makefiles:" echo "Bootstrapping configure script and makefiles:"
## ---------- first check santity of the installed versions of the build-system ## ---------- first check santity of the installed versions of the build-system
## in case there's GNU drop-in tools available, set these
## some sorry systems don't have proper GNU-make... build one ## some sorry systems don't have proper GNU-make...
if check_version make 3.79; then if check_version make 3.79; then
echo >/dev/null echo >/dev/null
else else
if check_version gmake 3.79; then if check_version gmake 3.79; then
echo >/dev/null have_gmake=yes;
else else
echo "Couldn't find a new-enough version of GNU 'make', please install one!"; echo "Couldn't find a new-enough version of GNU 'make', please install one!";
exit 1; exit 1;
# build_lsc_aux "make-3.80"
fi fi
fi fi
@ -86,14 +89,6 @@ check_version()
# build_lsc_aux "m4-1.4.1" # build_lsc_aux "m4-1.4.1"
fi fi
if check_version libtool 1.4; then
echo >/dev/null
else
echo "Couldn't find a new-enough version of 'libtool', please install one!";
exit 1;
# build_lsc_aux "libtool-1.5.6"
fi
if check_version pkg-config 0.15; then if check_version pkg-config 0.15; then
echo >/dev/null echo >/dev/null
else else