diff options
| author | foobar <sniper@php.net> | 2005-06-07 17:22:40 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-06-07 17:22:40 +0000 |
| commit | eaa3d6c5ec0bf98e5b2c462e48a0e328e5bfce97 (patch) | |
| tree | 1970fcd75daa91c64774aeb54e7bfb85463235c9 /Zend/Zend.m4 | |
| parent | 8e2efc351bce7c046f23b2fda7e24b421c543c92 (diff) | |
| download | php-git-eaa3d6c5ec0bf98e5b2c462e48a0e328e5bfce97.tar.gz | |
-Moved --disable-zend-memory-manager where it belongs
Diffstat (limited to 'Zend/Zend.m4')
| -rw-r--r-- | Zend/Zend.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index e265a2aa63..a1b4b8351f 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -137,6 +137,15 @@ case $PHP_ZEND_VM in ;; esac +AC_ARG_ENABLE(zend-memory-manager, +[ --disable-zend-memory-manager + Disable the Zend memory manager - FOR DEVELOPERS ONLY!!], +[ + ZEND_USE_ZEND_ALLOC=$enableval +], [ + ZEND_USE_ZEND_ALLOC=yes +]) + AC_ARG_ENABLE(maintainer-zts, [ --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[ ZEND_MAINTAINER_ZTS=$enableval @@ -166,6 +175,9 @@ AC_ARG_ENABLE(zend-multibyte, ZEND_MULTIBYTE=no ]) +AC_MSG_CHECKING(whether to enable the Zend memory manager) +AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC) + AC_MSG_CHECKING(whether to enable thread-safety) AC_MSG_RESULT($ZEND_MAINTAINER_ZTS) @@ -196,6 +208,12 @@ fi test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" +if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then + AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager]) +else + AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager]) +fi + if test "$ZEND_MAINTAINER_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) CFLAGS="$CFLAGS -DZTS" |