sas Wed Jun 25 09:01:09 2003 EDT
Modified files: (Branch: PHP_4)
/php-src buildconf
Log:
make ze1/ze2 coexist
Index: php-src/buildconf
diff -u php-src/buildconf:1.57.4.1 php-src/buildconf:1.57.4.1.4.1
--- php-src/buildconf:1.57.4.1 Mon May 19 07:45:02 2003
+++ php-src/buildconf Wed Jun 25 09:01:09 2003
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: buildconf,v 1.57.4.1 2003/05/19 11:45:02 wez Exp $
+# $Id: buildconf,v 1.57.4.1.4.1 2003/06/25 13:01:09 sas Exp $
eval `grep '^EXTRA_VERSION=' configure.in`
case "$EXTRA_VERSION" in
@@ -18,11 +18,6 @@
automake_flags=--copy
fi
- if test "$1" = "--ZendEngine2"; then
- ZENDDIR=ZendEngine2
- echo "Using Zend Engine 2 code"
- fi
-
if test "$1" = "--force"; then
devok=1
echo "Forcing buildconf"
@@ -38,6 +33,28 @@
fi
if test -z "$ZENDDIR"; then
+ if grep "PHP_MAJOR_VERSION 5" main/php_version.h >/dev/null; then
+ v=5
+ else
+ v=4
+ fi
+
+ if test "$v" = "5"; then
+ if test -r "Zend/OBJECTS2_HOWTO"; then
+ :
+ else
+ mv Zend ZendEngine1 2>/dev/null
+ mv ZendEngine2 Zend
+ fi
+ else
+ if test -r "Zend/zend_execute_globals.h"; then
+ :
+ else
+ mv Zend ZendEngine2 2>/dev/null
+ mv ZendEngine1 Zend
+ fi
+ fi
+
ZENDDIR=Zend
echo "using default Zend directory"
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
