summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorJames Cox <imajes@php.net>2002-07-20 04:02:44 (GMT)
committerJames Cox <imajes@php.net>2002-07-20 04:02:44 (GMT)
commitdd164448493d93d17026524f7ccb3ac47825d201 (patch)
tree0380d4cfd996942ef3d0dad9ba66f7354d5025e1 /buildconf
parentaef27e37e16d946d9598a00911c37b6ad1bd13ca (diff)
downloadphp-dd164448493d93d17026524f7ccb3ac47825d201.tar.gz
more work for buildconf. forces a cvsclean if using a bad am. more ZE/zE2 tests.
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf33
1 files changed, 32 insertions, 1 deletions
diff --git a/buildconf b/buildconf
index fafd5dc..69a4e8b 100755
--- a/buildconf
+++ b/buildconf
@@ -1,6 +1,18 @@
#!/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
@@ -8,9 +20,28 @@ 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
@@ -34,4 +65,4 @@ fi
rm -f generated_lists
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"