summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-06-14 11:41:48 +0000
committerfoobar <sniper@php.net>2005-06-14 11:41:48 +0000
commitfb95a19824c6bf1be33468ecee1de906ca1a64fa (patch)
treeb2470f2e0656e81d144c3833f855ce1450410d7f
parent1ef7bf69979b599828cac65e3248674e9036e6f7 (diff)
downloadphp-git-fb95a19824c6bf1be33468ecee1de906ca1a64fa.tar.gz
fix standalone build
-rw-r--r--Zend/Zend.m49
-rw-r--r--Zend/acinclude.m43
2 files changed, 10 insertions, 2 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index a1b4b8351f..b14deb5787 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -121,9 +121,14 @@ AC_ARG_ENABLE(debug,
AC_DEFUN([LIBZEND_OTHER_CHECKS],[
-PHP_ARG_WITH(zend-vm,[virtual machine dispatch method],
+AC_ARG_WITH(zend-vm,
[ --with-zend-vm=TYPE Set virtual machine dispatch method. Type is
- one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]], CALL, no)
+ one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]]
+[
+ PHP_ZEND_VM=$withval
+],[
+ PHP_ZEND_VM=CALL
+])
case $PHP_ZEND_VM in
SWITCH)
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index fe3aabcab0..10adede7a1 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -6,6 +6,9 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
# we only support certain bison versions
bison_version_list="1.28 1.35 1.75 1.875 2.0"
+ # for standalone build of Zend Engine
+ test -z "$SED" && SED=sed
+
if test "$YACC"; then
AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /'|tr -d a-z`