cvs: php-src / buildconf

sas Wed Jun 25 08:56:40 2003 EDT Modified files: /php-src buildconf Log: First shot at making ze1/ze2 coexist Index: php-src/buildconf diff -u php-src/buildconf:1.59 php-src/buildconf:1.60 --- php-src/buildconf:1.59 Mon May 19 07:54:00 2003 +++ php-src/buildconf Wed Jun 25 08:56:40 2003 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.59 2003/05/19 11:54:00 sniper Exp $ +# $Id: buildconf,v 1.60 2003/06/25 12:56:40 sas Exp $ eval grep '^EXTRA_VERSION=' configure.in case "$EXTRA_VERSION" in @@ -33,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