looks like solaris' test doesn't short circuit

This commit is contained in:
Bill Currie 2002-04-07 03:31:20 +00:00
parent db75da7733
commit eaccc6ea8b

View file

@ -2,7 +2,8 @@
cd `dirname $0`
# Check libtoolize version, fix for Debian/Woody
lt=`which libtoolize`
if [ -n "$lt" -a -x "$lt" ]; then
if [ -n "$lt" ]; then
if [ -x "$lt" ]; then
LTIZE_VER=`libtoolize --version | head -1 | sed 's/^[^0-9]*//'`
LTIZE_VER_MAJOR=`echo $LTIZE_VER | cut -f1 -d'.'`
LTIZE_VER_MINOR=`echo $LTIZE_VER | cut -f2 -d'.'`
@ -10,11 +11,13 @@ if [ -n "$lt" -a -x "$lt" ]; then
if [ "$LTIZE_VER_MAJOR" -lt "2" -a "$LTIZE_VER_MINOR" -lt "4" ]; then
WOODY_FIX="yes";
fi
fi
fi
# Check Autoconf version
ac=`which autoconf`
if [ -n "$ac" -a -x "$ac" ]; then
if [ -n "$ac" ]; then
if [ -x "$ac" ]; then
AC_VER=`autoconf --version | head -1 | sed 's/^[^0-9]*//'`
AC_VER_MAJOR=`echo $AC_VER | cut -f1 -d'.'`
AC_VER_MINOR=`echo $AC_VER | cut -f2 -d'.' | sed 's/[^0-9]*$//'`
@ -41,6 +44,7 @@ if [ -n "$ac" -a -x "$ac" ]; then
else
rm -f configure.in
fi
fi
else
echo Autoconf not found. QuakeForge CVS requires autoconf to bootstrap itself.
exit 1