summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2009-07-11 01:55:41 (GMT)
committerDavid Soria Parra <dsp@php.net>2009-07-11 01:55:41 (GMT)
commit098d0fcf556e9ce5dd8cba3f110837c43dec3577 (patch)
tree0ef321c4a7aad59c95f57ac262998b993a256d9c /buildconf
parentba0e26f2c1625448a686dac028c75ee526079ead (diff)
downloadphp-098d0fcf556e9ce5dd8cba3f110837c43dec3577.tar.gz
MFH: Get rid of PHP 4 related buildconf and moving around directories. As we switched to svn ZE2 is in Zend by default.
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf31
1 files changed, 2 insertions, 29 deletions
diff --git a/buildconf b/buildconf
index 5eb4562..9d4621f 100755
--- a/buildconf
+++ b/buildconf
@@ -32,38 +32,11 @@ if test "$dev" = "0" -a "$devok" = "0"; then
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