cvs: ZendEngine2 / Zend.m4

sniper Tue Jun 14 08:23:26 2005 EDT Modified files: /ZendEngine2 Zend.m4 Log: reordered + added msg to configure output for PHP_ZEND_VM http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.57&r2=1.58&ty=u Index: ZendEngine2/Zend.m4 diff -u ZendEngine2/Zend.m4:1.57 ZendEngine2/Zend.m4:1.58 --- ZendEngine2/Zend.m4:1.57 Tue Jun 14 07:47:57 2005 +++ ZendEngine2/Zend.m4 Tue Jun 14 08:23:26 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: Zend.m4,v 1.57 2005/06/14 11:47:57 sniper Exp $ +dnl $Id: Zend.m4,v 1.58 2005/06/14 12:23:26 sniper Exp $ dnl dnl This file contains Zend specific autoconf functions. dnl @@ -129,18 +129,6 @@ PHP_ZEND_VM=CALL ]) -case $PHP_ZEND_VM in - SWITCH) - AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method]) - ;; - GOTO) - AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method]) - ;; - *) - AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method]) - ;; -esac - AC_ARG_ENABLE(zend-memory-manager, [ --disable-zend-memory-manager Disable the Zend memory manager - FOR DEVELOPERS ONLY!!], @@ -179,6 +167,9 @@ ZEND_MULTIBYTE=no ]) +AC_MSG_CHECKING([virtual machine dispatch method]) +AC_MSG_RESULT($PHP_ZEND_VM) + AC_MSG_CHECKING(whether to enable the Zend memory manager) AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC) @@ -197,6 +188,19 @@ AC_MSG_CHECKING(whether to enable Zend multibyte) AC_MSG_RESULT($ZEND_MULTIBYTE) +case $PHP_ZEND_VM in + SWITCH) + AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method]) + ;; + GOTO) + AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method]) + ;; + *) + PHP_ZEND_VM=CALL + AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method]) + ;; +esac + if test "$ZEND_DEBUG" = "yes"; then AC_DEFINE(ZEND_DEBUG,1,[ ]) echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"