dsp Sat, 11 Jul 2009 02:47:38 +0000
ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283786
Changed paths:
U php/php-src/branches/PHP_5_2/buildconf
Log:
MFH: Get rid of PHP 4 related buildconf and moving around directories. As we
switched to svn ZE2 is in Zend by default.
Modified: php/php-src/branches/PHP_5_2/buildconf
===================================================================
--- php/php-src/branches/PHP_5_2/buildconf 2009-07-11 01:55:41 UTC (rev
283785)
+++ php/php-src/branches/PHP_5_2/buildconf 2009-07-11 02:47:38 UTC (rev
283786)
@@ -32,38 +32,11 @@
echo "use buildconf --force to override this check."
exit 1
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
rm -f generated_lists
if test "$debug" = "yes"; then
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+ ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
else
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR"
+ ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
