reverse bad patch

james, when you send me email about your patch which does not work,
why don't you wait for a reply first before committing the non-working
stuff?

diff --git a/buildconf b/buildconf
index 69a4e8b16ff3f3c1b44b9ee042e92b522ce2ce27..fafd5dcc22e8a0ec2b1d540b77c1c21fcd46b58d 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -1,18 +1,6 @@
 #!/bin/sh
 # $Id$
 
-amv=`automake --version | grep GNU |cut -d ' ' -f 4`
-
-if expr $amv '>=' 2.5; then
-    echo "cleaning checkout to force rebuild, due to bad AutoMake"
-    ./cvsclean
-fi
-
-
-if test -d "Zend"; then
-    ZENDVER=`cat Zend/zend.h | grep ZEND_VERSION | cut -d ' ' -f 3 | sed -e 's/"//' | cut -d . -f 1`
-fi
-
 while test $# -gt 0; do
     if test "$1" = "--copy"; then
         automake_flags=--copy
@@ -20,28 +8,9 @@ while test $# -gt 0; do
 
     if test "$1" = "--ZendEngine2"; then
         ZENDDIR=ZendEngine2
-
-       if test $ZENDVER != 2; then
-           mv Zend Zend_old
-
-           if test -d "ZendEngine2"; then
-               mv ZendEngine2 Zend
-           fi  
-       fi    
         echo "Using Zend Engine 2 code"
     fi
 
-    if test "$1" = "--Zend"; then
-       ZENDDIR=Zend
-       
-       if test $ZENDVER != 1; then
-           echo "The default Zend directory exists, but it doesn't seem to be Zend Engine 1"
-           exit
-       else
-           echo "Using default Zend directory"
-       fi      
-    fi 
-
     shift
 done
 
@@ -65,4 +34,4 @@ fi
 
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"