jason Tue Apr 3 21:41:02 2001 EDT
Modified files:
/php4/build buildcheck.sh
Log:
This is a temporary fix to the previous patch that breaks the build.
This keeps the functionality of searching for glibtool or libtool,
but have you checked the rest of the build process to see if this is
compatible? Regardless, 'which' returns a value on some os's when nothing is
found which breaks the previous patches test. Also the unary negation after
an if is not compatible with true bourne.
-Jason
Index: php4/build/buildcheck.sh
diff -u php4/build/buildcheck.sh:1.4 php4/build/buildcheck.sh:1.5
--- php4/build/buildcheck.sh:1.4 Tue Apr 3 12:07:32 2001
+++ php4/build/buildcheck.sh Tue Apr 3 21:41:01 2001
@@ -16,7 +16,7 @@
# | Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: buildcheck.sh,v 1.4 2001/04/03 19:07:32 wsanchez Exp $
+# $Id: buildcheck.sh,v 1.5 2001/04/04 04:41:01 jason Exp $
#
echo "buildconf: checking installation..."
@@ -58,7 +58,8 @@
fi
# libtool 1.3.3 or newer
-if ! libtool=`which glibtool`; then libtool=`which libtool`; fi
+libtool=`which libtool`
+if test ! -f "$libtool"; then libtool=`which glibtool`; fi
lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
if test "$lt_pversion" = ""; then
echo "buildconf: libtool not found."
@@ -79,7 +80,7 @@
fi
am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
-lt_prefix=`which libtool | sed -e 's#/[^/]*/[^/]*$##'`
+lt_prefix=`which $libtool | sed -e 's#/[^/]*/[^/]*$##'`
if test "$am_prefix" != "$lt_prefix"; then
echo "WARNING: automake and libtool are installed in different"
echo " directories. This may cause aclocal to fail."
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
