MFH: Get rid of PHP 4 related buildconf and moving around directories. As we switched...

diff --git a/buildconf b/buildconf
index 5eb45628aa23d3688986f872b8837c6c1f3a51c8..9d4621f923c700d723136b9748cd3131d0c4c59d 100755 (executable)
--- 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