dsp             Sat, 11 Jul 2009 01:54:08 +0000

ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283784

Changed paths:
        U   php/php-src/trunk/buildconf

Log:
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/trunk/buildconf
===================================================================
--- php/php-src/trunk/buildconf 2009-07-11 01:10:51 UTC (rev 283783)
+++ php/php-src/trunk/buildconf 2009-07-11 01:54:08 UTC (rev 283784)
@@ -33,37 +33,10 @@
   exit 1
 fi

-if test -z "$ZENDDIR"; then
-  if grep "PHP_MAJOR_VERSION 6" 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

Reply via email to