cvs: php4(PHP_4_3) /build buildcheck.sh

sniper Mon May 19 09:14:06 2003 EDT Modified files: (Branch: PHP_4_3) /php4/build buildcheck.sh Log: MFH Index: php4/build/buildcheck.sh diff -u php4/build/buildcheck.sh:1.21.2.2 php4/build/buildcheck.sh:1.21.2.3 --- php4/build/buildcheck.sh:1.21.2.2 Wed Apr 16 08:05:43 2003 +++ php4/build/buildcheck.sh Mon May 19 09:14:06 2003 @@ -12,11 +12,11 @@ # | obtain it through the world-wide-web, please send a note to | # | license@php.net so we can mail you a copy immediately. | # +----------------------------------------------------------------------+ -# | Authors: Stig Bakken <ssb@fast.no> | +# | Authors: Stig Bakken <ssb@php.net> | # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.21.2.2 2003/04/16 12:05:43 jan Exp $ +# $Id: buildcheck.sh,v 1.21.2.3 2003/05/19 13:14:06 sniper Exp $ # echo "buildconf: checking installation..." @@ -70,10 +70,10 @@ echo "buildconf: automake version $am_version (ok)" fi -# libtool 1.4 or newer +# libtool 1.4.3 or newer # Prefer glibtool over libtool for Mac OS X compatibility -libtool=which glibtool 2> /dev/null -if test ! -r "$libtool"; then libtool=which libtool; fi +libtool=./build/shtool path glibtool 2> /dev/null +if test ! -r "$libtool"; then libtool=./build/shtool path libtool; fi lt_pversion=$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p' if test "$lt_pversion" = ""; then echo "buildconf: libtool not found." @@ -100,7 +100,7 @@ exit 1 fi -am_prefix=which automake | sed -e 's#/[^/]*/[^/]*$##' +am_prefix=./build/shtool path automake | sed -e 's#/[^/]*/[^/]*$##' lt_prefix=echo $libtool | sed -e 's#/[^/]*/[^/]*$##' if test "$am_prefix" != "$lt_prefix"; then echo "WARNING: automake and libtool are installed in different"