cvs: php4 / buildconf

imajes Sun Jun 23 12:31:54 2002 EDT Modified files: /php4 buildconf Log: some people would prefer to be able to specify. So, we specify --ZendEngine2 for ZE2 builds, Zend for the rest. Index: php4/buildconf diff -u php4/buildconf:1.51 php4/buildconf:1.52 --- php4/buildconf:1.51 Sun Jun 23 11:47:39 2002 +++ php4/buildconf Sun Jun 23 12:31:54 2002 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.51 2002/06/23 15:47:39 imajes Exp $ +# $Id: buildconf,v 1.52 2002/06/23 16:31:54 imajes Exp $ supplied_flag=$1 @@ -7,10 +7,16 @@ automake_flags=--copy fi -if test -d "ZendEngine2"; then - mv ZendEngine2 Zend +if test "$supplied_flag" = "--ZendEngine2"; then + ZENDDIR=ZendEngine2 + echo "Using Zend Engine 2 code" fi +if test "$ZENDDIR" = ""; then + ZENDDIR=Zend + echo "using Zend Engine 1 code" +fi + ## build.mk does not check aclocal exit status yet ## #mv aclocal.m4 aclocal.m4.old 2>/dev/null @@ -37,4 +43,4 @@ ./build/bsd_makefile;; esac -${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" +${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"