fix standalone build

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index a1b4b8351f30f26d33935a1fc66de12a92697fb7..b14deb5787eedbe43cea0ebedd4af4506dd4f5af 100644 (file)
--- 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 fe3aabcab020f635424c25ae84de3483795ad0ce..10adede7a155ac7f5715f843bb29f11a8fbf5714 100644 (file)
--- 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`