Diff for /embedaddon/php/Zend/Zend.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:47:52 version 1.1.1.2, 2012/05/29 12:34:35
Line 176  AC_ARG_ENABLE(inline-optimization, Line 176  AC_ARG_ENABLE(inline-optimization,
   ZEND_INLINE_OPTIMIZATION=yes    ZEND_INLINE_OPTIMIZATION=yes
 ])  ])
   
 AC_ARG_ENABLE(zend-multibyte,  
 [  --enable-zend-multibyte Compile with zend multibyte support], [  
   ZEND_MULTIBYTE=$enableval  
 ],[  
   ZEND_MULTIBYTE=no  
 ])  
   
 AC_MSG_CHECKING([virtual machine dispatch method])  AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)  AC_MSG_RESULT($PHP_ZEND_VM)
   
Line 195  AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION) Line 188  AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 AC_MSG_CHECKING(whether to enable Zend debugging)  AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)  AC_MSG_RESULT($ZEND_DEBUG)
   
 AC_MSG_CHECKING(whether to enable Zend multibyte)  
 AC_MSG_RESULT($ZEND_MULTIBYTE)  
   
 case $PHP_ZEND_VM in  case $PHP_ZEND_VM in
   SWITCH)    SWITCH)
     AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])      AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
Line 232  if test "$ZEND_MAINTAINER_ZTS" = "yes"; then Line 222  if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   LIBZEND_CPLUSPLUS_CHECKS    LIBZEND_CPLUSPLUS_CHECKS
 fi    fi  
   
 if test "$ZEND_MULTIBYTE" = "yes"; then  
   AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])  
 fi  
   
 changequote({,})  changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then  if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
   INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`    INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
Line 406  int main() Line 392  int main()
   
 AC_CHECK_FUNCS(mremap)  AC_CHECK_FUNCS(mremap)
   
   
   AC_ARG_ENABLE(zend-signals,
   [  --enable-zend-signals   Use zend signal handling],[
     ZEND_SIGNALS=$enableval
   ],[
     ZEND_SIGNALS=no
   ])  
   
   AC_CHECK_FUNC(sigaction, [
           AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
   ], [
           ZEND_SIGNALS=no
 ])  ])
   if test "$ZEND_SIGNALS" = "yes"; then
           AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
           CFLAGS="$CFLAGS -DZEND_SIGNALS"
   fi
   
   AC_MSG_CHECKING(whether to enable zend signal handling)
   AC_MSG_RESULT($ZEND_SIGNALS)
   
   ])
   
 AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[  AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
   
 ])  ])
Line 419  if test -r "/dev/urandom" && test -c "/dev/urandom"; t Line 425  if test -r "/dev/urandom" && test -c "/dev/urandom"; t
   AC_MSG_RESULT(yes)     AC_MSG_RESULT(yes) 
 else   else 
   AC_MSG_RESULT(no)     AC_MSG_RESULT(no) 
     AC_MSG_CHECKING(whether /dev/arandom exists) 
     if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
       AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
       AC_MSG_RESULT(yes) 
     else 
       AC_MSG_RESULT(no) 
     fi 
 fi   fi 

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>