From: foobar <sniper@php.net>
Date: Tue, 7 Jun 2005 17:22:56 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.0.5RC1~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ae330cd00e4d707f5fb85059635f888a886ba2d;p=php

MFH
---

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 7f917c2419..5140d1733e 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -136,6 +136,15 @@ AC_ARG_ENABLE(debug,
 
 AC_DEFUN([LIBZEND_OTHER_CHECKS],[
 
+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
@@ -165,6 +174,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)
 
@@ -195,6 +207,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"
diff --git a/configure.in b/configure.in
index 2032238eb3..d17899b9cf 100644
--- a/configure.in
+++ b/configure.in
@@ -677,16 +677,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      Sets how installed files will be laid out.  Type is
                           one of "PHP" (default) or "GNU"], PHP, no)