sniper Tue Jun 14 07:41:49 2005 EDT
Modified files:
/ZendEngine2 Zend.m4 acinclude.m4
Log:
fix standalone build
http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.55&r2=1.56&ty=u
Index: ZendEngine2/Zend.m4
diff -u ZendEngine2/Zend.m4:1.55 ZendEngine2/Zend.m4:1.56
--- ZendEngine2/Zend.m4:1.55 Tue Jun 7 13:22:40 2005
+++ ZendEngine2/Zend.m4 Tue Jun 14 07:41:48 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: Zend.m4,v 1.55 2005/06/07 17:22:40 sniper Exp $
+dnl $Id: Zend.m4,v 1.56 2005/06/14 11:41:48 sniper Exp $
dnl
dnl This file contains Zend specific autoconf functions.
dnl
@@ -121,9 +121,14 @@
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)
http://cvs.php.net/diff.php/ZendEngine2/acinclude.m4?r1=1.14&r2=1.15&ty=u
Index: ZendEngine2/acinclude.m4
diff -u ZendEngine2/acinclude.m4:1.14 ZendEngine2/acinclude.m4:1.15
--- ZendEngine2/acinclude.m4:1.14 Tue Jun 7 12:47:33 2005
+++ ZendEngine2/acinclude.m4 Tue Jun 14 07:41:48 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.14 2005/06/07 16:47:33 sniper Exp $
+dnl $Id: acinclude.m4,v 1.15 2005/06/14 11:41:48 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -6,6 +6,9 @@
# 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`
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
