clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Moved --disable-zend-memory-manager where it belongs

Browse Source
This commit is contained in:
foobar 2005-06-07 17:22:40 +00:00
parent 8e2efc351b
commit eaa3d6c5ec
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zend/Zend.m4
View File

@ -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"

10
configure.in
View File

@ -623,16 +623,6 @@ else
ZEND_DEBUG=no
fi
PHP_ARG_ENABLE(zend-memory-manager,whether to enable the Zend memory manager,
[ --disable-zend-memory-manager
Disable the Zend memory manager (DEVELOPERS ONLY)],yes, no)
if test "$PHP_ZEND_MEMORY_MANAGER" = "yes"; then
AC_DEFINE(USE_ZEND_ALLOC, 1, [ ])
else
AC_DEFINE(USE_ZEND_ALLOC, 0, [ ])
fi
PHP_ARG_WITH(layout,[layout of installed files],
[ --with-layout=TYPE Set how installed files will be laid out. Type is
one of "PHP" or "GNU" [TYPE=PHP]], PHP, no)