cvs: php4 / buildconf

sas Sat Jul 20 10:33:09 2002 EDT Modified files: /php4 buildconf Log: 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? Index: php4/buildconf diff -u php4/buildconf:1.54 php4/buildconf:1.55 --- php4/buildconf:1.54 Sat Jul 20 00:02:44 2002 +++ php4/buildconf Sat Jul 20 10:33:09 2002 @@ -1,17 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.54 2002/07/20 04:02:44 imajes Exp $ - -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 +# $Id: buildconf,v 1.55 2002/07/20 14:33:09 sas Exp $ while test $# -gt 0; do if test "$1" = "--copy"; then @@ -20,28 +8,9 @@ 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 @@ 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"