- Fixed some weird crashes causd by the new default behaviour

  of libtool 1.4.3
- Require libtool 1.4.3 or newer from now on.

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index e1344da347aa90ec12928d5d2cb6cb00ee2b6a73..e459f24016542cbd4c687cc603697eea8ba99ce7 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.22 2003-01-13 10:27:50 sas Exp $ 
+# $Id: buildcheck.sh,v 1.23 2003-02-11 21:11:42 sniper Exp $ 
 #
 
 echo "buildconf: checking installation..."
@@ -70,26 +70,32 @@ else
 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=`./build/shtool path glibtool 2> /dev/null`
 if test ! -f "$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."
-echo "           You need libtool version 1.4 or newer installed"
+echo "           You need libtool version 1.4.3 or newer installed"
 echo "           to build PHP from CVS."
 exit 1
 fi
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '
 
-if test "$1" -gt "1" || test "$2" -ge "4";
+if test "$3" = ""; then
+  third=0
+else
+  third=$3
+fi
+
+if test "$1" -gt "1" || test "$2" -ge "5" || (test "$2" -ge "4" && test "$third" -ge "3")
 then
 echo "buildconf: libtool version $lt_pversion (ok)"
 else
 echo "buildconf: libtool version $lt_pversion found."
-echo "           You need libtool version 1.4 or newer installed"
+echo "           You need libtool version 1.4.3 or newer installed"
 echo "           to build PHP from CVS."
 exit 1
 fi

diff --git a/configure.in b/configure.in
index 6d8ca5da0c4457355e052c7d30159e03f03d47b9..44b856b9f18da723b77cf16a13c96ae133928529 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1065,6 +1065,8 @@ if test "$enable_debug" != "yes"; then
   PHP_SET_LIBTOOL_VARIABLE([--silent])
 fi
 
+dnl libtool 1.4.3 needs this.
+PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps])
 
 test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
 test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'